Update RDF dependencies to 2.0. Allows use of an external database for test and development.

Author: gkellogg

Gemfile.lock

@@ -3,10 +3,11 @@ PATH
   specs:
     sparqlight (0.0.1)
       blacklight (~> 6.0)
-      json-ld (~> 1.99)
+      json-ld (~> 2.0)
       rails (~> 4.2)
-      rdf (~> 1.99)
-      sparql-client (~> 1.99)
+      rdf (~> 2.0)
+      rdf-turtle (~> 2.0)
+      sparql-client (~> 2.0)
 
 GEM
   remote: https://rubygems.org/
@@ -63,9 +64,7 @@ GEM
     bootstrap-sass (3.3.6)
       autoprefixer-rails (>= 5.2.1)
       sass (>= 3.3.4)
-    bson (1.12.5)
-    bson_ext (1.12.5)
-      bson (~> 1.12.5)
+    bson (4.0.4)
     builder (3.2.2)
     byebug (8.2.4)
     coffee-rails (4.1.1)
@@ -80,13 +79,15 @@ GEM
     deprecation (1.0.0)
       activesupport
     diff-lcs (1.2.5)
-    ebnf (1.0.0)
-      rdf (~> 1.1)
-      sxp (~> 0.1, >= 0.1.3)
+    ebnf (1.0.1)
+      rdf (~> 2.0)
+      sxp (~> 1.0)
     erubis (2.7.0)
     execjs (2.6.0)
     globalid (0.3.6)
       activesupport (>= 4.1.0)
+    hamster (3.0.0)
+      concurrent-ruby (~> 1.0)
     i18n (0.7.0)
     jbuilder (2.4.1)
       activesupport (>= 3.0.0, < 5.1)
@@ -96,9 +97,9 @@ GEM
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     json (1.8.3)
-    json-ld (1.99.2)
+    json-ld (2.0.0.1)
       multi_json (~> 1.11)
-      rdf (~> 1.99)
+      rdf (~> 2.0)
     kaminari (0.16.3)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
@@ -112,8 +113,8 @@ GEM
     mime-types-data (3.2016.0221)
     mini_portile2 (2.0.0)
     minitest (5.8.4)
-    mongo (1.12.5)
-      bson (= 1.12.5)
+    mongo (2.2.4)
+      bson (~> 4.0)
     multi_json (1.11.2)
     net-http-persistent (2.9.4)
     nokogiri (1.6.7.2)
@@ -146,18 +147,19 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (11.1.2)
-    rdf (1.99.1)
+    rdf (2.0.0)
+      hamster (~> 3.0)
       link_header (~> 0.0, >= 0.0.8)
-    rdf-aggregate-repo (1.99.0)
-      rdf (~> 1.99)
-    rdf-mongo (1.99.0)
-      mongo (~> 1.10)
-      rdf (~> 1.99)
-    rdf-turtle (1.99.0)
-      ebnf (~> 1.0)
-      rdf (~> 1.99)
-    rdf-xsd (1.99.0)
-      rdf (~> 1.99)
+    rdf-aggregate-repo (2.0.0)
+      rdf (~> 2.0)
+    rdf-mongo (2.0.0)
+      mongo (~> 2.2)
+      rdf (~> 2.0)
+    rdf-turtle (2.0.0)
+      ebnf (~> 1.0, >= 1.0.1)
+      rdf (~> 2.0)
+    rdf-xsd (2.0.0)
+      rdf (~> 2.0)
     rdoc (4.2.2)
       json (~> 1.4)
     rsolr (1.0.13)
@@ -202,17 +204,17 @@ GEM
     sdoc (0.4.1)
       json (~> 1.7, >= 1.7.7)
       rdoc (~> 4.0)
-    sparql (1.99.1)
+    sparql (2.0.0)
       builder (~> 3.2)
-      ebnf (~> 1.0)
-      rdf (~> 1.99)
-      rdf-aggregate-repo (~> 1.99)
-      rdf-xsd (~> 1.1)
-      sparql-client (~> 1.1)
-      sxp (~> 0.1)
-    sparql-client (1.99.0)
+      ebnf (~> 1.0, >= 1.0.1)
+      rdf (~> 2.0)
+      rdf-aggregate-repo (~> 2.0)
+      rdf-xsd (~> 2.0)
+      sparql-client (~> 2.0)
+      sxp (~> 1.0)
+    sparql-client (2.0.0)
       net-http-persistent (~> 2.9)
-      rdf (~> 1.1)
+      rdf (~> 2.0)
     spring (1.7.1)
     sprockets (3.6.0)
       concurrent-ruby (~> 1.0)
@@ -222,7 +224,8 @@ GEM
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     sqlite3 (1.3.11)
-    sxp (0.1.5)
+    sxp (1.0.0)
+      rdf (~> 2.0)
     thor (0.19.1)
     thread_safe (0.3.5)
     tilt (2.0.2)
@@ -247,21 +250,19 @@ PLATFORMS
 
 DEPENDENCIES
   blacklight (= 6.0.1)
-  bson_ext
   byebug
   coffee-rails (~> 4.1.0)
   jbuilder (~> 2.0)
   jquery-rails
-  rdf-mongo (~> 1.99)
-  rdf-turtle (~> 1.99)
+  rdf-mongo (~> 2.0)
   rspec
   rspec-activemodel-mocks
   rspec-collection_matchers
   rspec-its
   rspec-rails
   sass-rails (~> 5.0)
   sdoc (~> 0.4.0)
-  sparql (~> 1.99)
+  sparql (~> 2.0)
   sparqlight!
   spring
   sqlite3

config/blacklight.yml

@@ -1,15 +1,15 @@
 # SPARQL::Client configuration.
-# Production references the SPARQL endpoint. Development and test use the local SQLite3 service initialized with test data
+# Production references the SPARQL endpoint. Development and test use the local Mongo service initialized with test data
 
 development:
   adapter: Sparql
   url: <%= ENV['SPARQL_URL'] %>
-  repository: "mongo"
-  collection: "nomisma_full"
+  repository: "mongodb://127.0.0.1:27017/quadb/nomisma_full"
 test: &test
   adapter: Sparql
-  repository: "mongo"
-  collection: "nomisma"
+  url: <%= ENV['SPARQL_URL'] %>
+  repository: "mongodb://127.0.0.1:27017/quadb/nomisma"
 production:
   adapter: Sparql
   url: <%= ENV['SPARQL_URL'] || "http://127.0.0.1/FIXME" %>
+  repository: "mongodb://127.0.0.1:27017/quadb/nomisma_full"

db/seeds.rb

@@ -11,6 +11,7 @@
 repo = connection.url
 if repo.is_a?(RDF::Repository)
   repo.clear!
+  require 'rdf/turtle'
   RDF::Reader.open(Rails.env == "test" ? "db/nomisma.ttl" : "db/nomisma-full.ttl") do |reader|
     reader.each_statement do |statement|
       begin

lib/blacklight/sparql/repository.rb

@@ -227,17 +227,17 @@ def build_connection
           SPARQL::Client.new(connection_config[:url])
         elsif connection_config[:repository]
           # Create a new repository to use as client
-          case repo_config = connection_config[:repository]
+          case repo_uri = connection_config[:repository]
           when /sqlite3|postgres/
             require 'rdf/do'
-            require 'do_sqlite3' if repo_config.include?("sqlite3")
-            require 'do_postgres' if repo_config.include?("postgres")
+            require 'do_sqlite3' if repo_uri.include?("sqlite3")
+            require 'do_postgres' if repo_uri.include?("postgres")
 
             # Open a local repository and use as a SPARQL client
-            SPARQL::Client.new RDF::DataObjects::Repository.new(repo_config)
+            SPARQL::Client.new RDF::DataObjects::Repository.new(uri: repo_uri, logger: false)
           when /mongo/
             require 'rdf/mongo'
-            SPARQL::Client.new RDF::Mongo::Repository.new(connection_config)
+            SPARQL::Client.new RDF::Mongo::Repository.new(uri: repo_uri, logger: false)
           else
           end
         else

sparqlite.gemspec

@@ -17,14 +17,13 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "rails",          '~> 4.2'
   spec.add_dependency 'blacklight',     '~> 6.0'
-  spec.add_dependency 'json-ld',        '~> 1.99'
-  spec.add_dependency 'rdf',            '~> 1.99'
-  spec.add_dependency "rdf-turtle",     '~> 1.99'
-  spec.add_dependency 'sparql-client',  '~> 1.99'
+  spec.add_dependency 'json-ld',        '~> 2.0'
+  spec.add_dependency 'rdf',            '~> 2.0'
+  spec.add_dependency "rdf-turtle",     '~> 2.0'
+  spec.add_dependency 'sparql-client',  '~> 2.0'
 
-  spec.add_development_dependency "sparql",    '~> 1.99'
-  spec.add_development_dependency 'rdf-mongo', '~> 1.99'
-  spec.add_development_dependency 'bson_ext'
+  spec.add_development_dependency "sparql",    '~> 2.0'
+  spec.add_development_dependency 'rdf-mongo', '~> 2.0'
   spec.add_development_dependency 'sqlite3'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rspec-rails'