rdf-do 1.1.0 → 1.99.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3f5a7e32c1a1f8ad358bb472b9787e954b05248
-  data.tar.gz: c466c119908f87fd26870416c9a50b480af5f945
+  metadata.gz: 3802161e6db4773dc64f60c6b5b723dac84106ff
+  data.tar.gz: d6ebd5979c580823d612bc9846eefbad20eb1837
 SHA512:
-  metadata.gz: b033431e5e9d72ebcdcdc345459d5576aa7f49bc1cb1ecffe263af640077f3996feeac1fd3ca4294724de44737dfe0729fc5f51a19b3c722ffaa8da82feb51b1
-  data.tar.gz: 907ecb2401a5f72384c7b24a65b251cd73f3e6bf0c38a563556e7f7af00eb211c3310c644f86b16fe35c6d25e3cad9a416594e5937f3f8866b70113525c4d74f
+  metadata.gz: 7501062411761e66bd694a42d753522013d9e3490d42283086d1c1d5b9d3e731ac905c5685113fbab1137679febb7dd4d2d849d2e105cca68d3bcab4c2708760
+  data.tar.gz: d54e69113b0f9e3a64473284acf5e0d03813cf399e07d3860ca8f2edb1e39eada8ed9f865fb3d178bdc92bf77bb3b7145918b4759bb52c44d82019d3bc0c2e15

data/README

@@ -73,13 +73,13 @@ Example:
     #=> #<RDF::URI(http://datagraph.org/jhacker/foaf)>
 
     # Delete everything to do with it
-    jhacker_statements = repo.query(:subject => jhacker) 
+    jhacker_statements = repo.query(subject: jhacker) 
     repo.delete *jhacker_statements
     repo.count
     #=> 7
 
     # with Postgres, we could have done this, but SQLite gives us a locking error:
-    # repo.delete(*repo.query(:subject => jhacker))
+    # repo.delete(*repo.query(subject: jhacker))
 
     # Changed our mind--bring it back
     repo.insert *jhacker_statements

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.99.0

data/lib/rdf/do.rb

@@ -59,7 +59,7 @@ module RDF
       # @see RDF::Mutable#insert_statement
       def supports?(feature)
         case feature.to_sym
-          when :context then true
+          when :graph_name then true
           else false
         end
       end
@@ -124,14 +124,14 @@ module RDF
           count = 0
           statements.__send__(each) do |s|
             count += 1
-            args += [serialize(s.subject),serialize(s.predicate), serialize(s.object), serialize(s.context)]
+            args += [serialize(s.subject),serialize(s.predicate), serialize(s.object), serialize(s.graph_name)]
           end
           query = @adapter.multiple_insert_sql(count)
           exec(query,*(args.flatten))
         else
           query = @adapter.insert_sql
           statements.each do |s|
-            exec(query, serialize(s.subject),serialize(s.predicate), serialize(s.object), serialize(s.context)) 
+            exec(query, serialize(s.subject),serialize(s.predicate), serialize(s.object), serialize(s.graph_name)) 
           end
         end
       end
@@ -145,7 +145,7 @@ module RDF
       def delete_statements(statements)
         query = @adapter.delete_sql
         statements.each do |s|
-          exec(query, serialize(s.subject), serialize(s.predicate), serialize(s.object), serialize(s.context)) 
+          exec(query, serialize(s.subject), serialize(s.predicate), serialize(s.object), serialize(s.graph_name)) 
         end
       end
 
@@ -222,10 +222,10 @@ module RDF
         reader = result(@adapter.each_sql)
         while reader.next!
           block.call(RDF::Statement.new(
-                     :subject   => unserialize(reader.values[0]),
-                     :predicate => unserialize(reader.values[1]),
-                     :object    => unserialize(reader.values[2]),
-                     :context   => unserialize(reader.values[3])))
+                     subject:    unserialize(reader.values[0]),
+                     predicate:  unserialize(reader.values[1]),
+                     object:     unserialize(reader.values[2]),
+                     graph_name: unserialize(reader.values[3])))
         end
       end
 
@@ -275,18 +275,21 @@ module RDF
       end
 
       ##
-      # Iterate over all RDF::Resource contexts in this repository.
+      # Iterate over all RDF::Resource graph names in this repository.
       #
-      # @see RDF::Enumerable#each_context
-      # @yield context
-      # @yieldparam [RDF::Resource] context
+      # @see RDF::Enumerable#each_graph
+      # @yield graph
+      # @yieldparam [RDF::Graph] graph
       # @return [Enumerable::Enumerator, void]
-      def each_context(&block)
-        return enum_for(:each_context) unless block_given?
+      def each_graph(&block)
+        return enum_for(:each_graph) unless block_given?
+
+        # Default graph
+        yield RDF::Graph.new(nil, data: self)
         reader = result(@adapter.each_context_sql)
         while reader.next!
-          context = unserialize(reader.values[0])
-          block.call(context) unless context.nil?
+          graph_name = unserialize(reader.values[0])
+          yield RDF::Graph.new(graph_name, data: self)
         end
       end
 
@@ -320,10 +323,10 @@ module RDF
         reader = @adapter.query(self,pattern.to_hash)
         while reader.next!
           yield RDF::Statement.new(
-              :subject   => unserialize(reader.values[0]),
-              :predicate => unserialize(reader.values[1]),
-              :object    => unserialize(reader.values[2]),
-              :context   => unserialize(reader.values[3]))
+              subject:    unserialize(reader.values[0]),
+              predicate:  unserialize(reader.values[1]),
+              object:     unserialize(reader.values[2]),
+              graph_name: unserialize(reader.values[3]))
         end
       end
 

data/lib/rdf/do/adapters/defaults.rb

@@ -49,23 +49,24 @@ module RDF::DataObjects
       # Supports `false` for a specifically nil value representing the default context.
       #
       # @example
-      #     adapter.query(repository, :predicate => predicate)
+      #     adapter.query(repository, predicate: predicate)
       # @return [DataObjects::Result]
       def query(repository, hash = {})
         return repository.result(each_sql) if hash.empty?
         conditions = []
         params = []
-        [:subject, :predicate, :object, :context].each do |resource|
+        [:subject, :predicate, :object, :graph_name].each do |resource|
+          do_resource = resource == :graph_name ? :context : resource
           unless hash[resource].nil?
             case hash[resource]
             when Symbol, RDF::Query::Variable
-              conditions << "#{resource.to_s} != 'nil'"
+              conditions << "#{do_resource} != 'nil'"
               next
             when false
-              conditions << "#{resource.to_s} = 'nil'"
+              conditions << "#{do_resource} = 'nil'"
               next
             else
-              conditions << "#{resource.to_s} = ?"
+              conditions << "#{do_resource} = ?"
             end
             params     << repository.serialize(hash[resource])
           end

metadata

@@ -1,114 +1,128 @@
 --- !ruby/object:Gem::Specification
 name: rdf-do
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.99.0
 platform: ruby
 authors:
 - Ben Lavender
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-06 00:00:00.000000000 Z
+date: 2015-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.99'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.99'
 - !ruby/object:Gem::Dependency
   name: data_objects
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.11
+        version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.11
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: do_sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.11
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.11
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: do_postgres
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.11
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.11
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: rdf-spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: rspec-its
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.3
-description: RDF.rb plugin providing a DataObjects storage adapter.
+        version: '0.8'
+description: RDF.rb extension providing a DataObjects storage adapter.
 email: public-rdf-ruby@w3.org
 executables: []
 extensions: []
@@ -118,11 +132,11 @@ files:
 - README
 - UNLICENSE
 - VERSION
+- lib/rdf/do.rb
 - lib/rdf/do/adapters/defaults.rb
 - lib/rdf/do/adapters/postgres.rb
 - lib/rdf/do/adapters/sqlite3.rb
 - lib/rdf/do/version.rb
-- lib/rdf/do.rb
 homepage: http://ruby-rdf.github.com/rdf-do
 licenses:
 - Public Domain
@@ -133,19 +147,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: rdf
-rubygems_version: 2.1.11
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
-summary: RDF.rb plugin providing a DataObjects storage adapter.
+summary: RDF.rb extension providing a DataObjects storage adapter.
 test_files: []
 has_rdoc: false