rdf-do 0.3.1 → 0.3.2

data/README

@@ -32,6 +32,8 @@ The greatly preferred installation method is via RubyGems:
 
 Manual downloads are available at <http://github.com/bhuga/rdf-do/downloads>
 
+Ruby 1.8.6 is not supported, but the tests pass with the backports gem.  Godspeed.
+
 ## Connecting:
     require 'do_postgres'
     require 'do_sqlite3'

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/lib/rdf/do.rb

@@ -195,7 +195,7 @@ module RDF
       # @param [Proc] &block
       # @return [Enumerable::Enumerator, void]
       def each(&block)
-        return RDF::Enumerator.new(self,:each) unless block_given?
+        return enum_for(:each) unless block_given?
         reader = result(@adapter.each_sql)
         while reader.next!
           block.call(RDF::Statement.new(
@@ -213,7 +213,7 @@ module RDF
       # @param [Proc] &block
       # @return [Enumerable::Enumerator, void]
       def each_subject(&block) 
-        return RDF::Enumerator.new(self,:each_subject) unless block_given?
+        return enum_for(:each_subject) unless block_given?
         reader = result(@adapter.each_subject_sql)
         while reader.next!
           block.call(unserialize(reader.values[0]))
@@ -227,7 +227,7 @@ module RDF
       # @param [Proc] &block
       # @return [Enumerable::Enumerator, void]
       def each_predicate(&block)
-        return RDF::Enumerator.new(self,:each_predicate) unless block_given?
+        return enum_for(:each_predicate) unless block_given?
         reader = result(@adapter.each_predicate_sql)
         while reader.next!
           block.call(unserialize(reader.values[0]))
@@ -241,7 +241,7 @@ module RDF
       # @param [Proc] &block
       # @return [Enumerable::Enumerator, void]
       def each_object(&block)
-        return RDF::Enumerator.new(self,:each_object) unless block_given?
+        return enum_for(:each_object) unless block_given?
         reader = result(@adapter.each_object_sql)
         while reader.next!
           block.call(unserialize(reader.values[0]))
@@ -255,7 +255,7 @@ module RDF
       # @param [Proc] &block
       # @return [Enumerable::Enumerator, void]
       def each_context(&block)
-        return RDF::Enumerator.new(self,:each_context) unless block_given?
+        return enum_for(:each_context) unless block_given?
         reader = result(@adapter.each_context_sql)
         while reader.next!
           context = unserialize(reader.values[0])
@@ -274,32 +274,15 @@ module RDF
       # @param [RDF::Statement, Hash, Array] pattern
       # @return [RDF::Enumerable, void]  
       # @see RDF::Queryable#query
-      def query(pattern, &block)
-        case pattern
-          when RDF::Statement
-            query(pattern.to_hash, &block)
-          when Array
-            query(RDF::Statement.new(*pattern), &block)
-          when Hash
-            statements = []
-            reader = @adapter.query(self,pattern)
-            while reader.next!
-              statements << RDF::Statement.new(
-                      :subject   => unserialize(reader.values[0]),
-                      :predicate => unserialize(reader.values[1]),
-                      :object    => unserialize(reader.values[2]),
-                      :context   => unserialize(reader.values[3]))
-            end
-            case block_given?
-              when true
-                statements.each(&block)
-              else
-                statements.extend(RDF::Enumerable, RDF::Queryable)
-            end
-          else
-            super(pattern) 
+      def query_pattern(pattern, &block)
+        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]))
         end
-
       end
 
       ##

data/lib/rdf/do/version.rb

@@ -2,7 +2,7 @@ module RDF::DataObjects
   module VERSION
     MAJOR = 0
     MINOR = 3
-    TINY  = 1
+    TINY  = 2
     EXTRA = nil
 
     STRING = [MAJOR, MINOR, TINY].join('.')

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Ben Lavender
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-09 00:00:00 +02:00
+date: 2010-06-18 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,13 +22,13 @@ dependencies:
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 1
-        - 7
-        version: 0.1.7
+        - 2
+        - 0
+        version: 0.2.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -41,8 +41,8 @@ dependencies:
         segments: 
         - 0
         - 10
-        - 1
-        version: 0.10.1
+        - 2
+        version: 0.10.2
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -50,13 +50,13 @@ dependencies:
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 1
+        - 2
         - 6
-        version: 0.1.6
+        version: 0.2.6
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency