rdf 0.1.7 → 0.1.8

data/VERSION

@@ -1 +1 @@
-0.1.7
+0.1.8

data/lib/rdf.rb

@@ -1,7 +1,11 @@
+require 'enumerator'  # @since Ruby 1.8.1
 require 'open-uri'
 require 'rdf/version'
 
 module RDF
+  # For compatibility with both Ruby 1.8.x and Ruby 1.9.x:
+  Enumerator = defined?(::Enumerator) ? ::Enumerator : ::Enumerable::Enumerator
+
   # RDF mixins
   autoload :Durable,    'rdf/mixin/durable'
   autoload :Enumerable, 'rdf/mixin/enumerable'

data/lib/rdf/mixin/enumerable.rb

@@ -132,8 +132,7 @@ module RDF
     # @return [Enumerator]
     # @see #each_statement
     def enum_statement
-      require_enumerator!
-      ::Enumerable::Enumerator.new(self, :each_statement)
+      Enumerator.new(self, :each_statement)
     end
 
     alias_method :enum_statements, :enum_statement
@@ -191,8 +190,7 @@ module RDF
     # @return [Enumerator]
     # @see #each_triple
     def enum_triple
-      require_enumerator!
-      ::Enumerable::Enumerator.new(self, :each_triple)
+      Enumerator.new(self, :each_triple)
     end
 
     alias_method :enum_triples, :enum_triple
@@ -251,8 +249,7 @@ module RDF
     # @return [Enumerator]
     # @see #each_quad
     def enum_quad
-      require_enumerator!
-      ::Enumerable::Enumerator.new(self, :each_quad)
+      Enumerator.new(self, :each_quad)
     end
 
     alias_method :enum_quads, :enum_quad
@@ -318,8 +315,7 @@ module RDF
     # @return [Enumerator]
     # @see #each_subject
     def enum_subject
-      require_enumerator!
-      ::Enumerable::Enumerator.new(self, :each_subject)
+      Enumerator.new(self, :each_subject)
     end
 
     alias_method :enum_subjects, :enum_subject
@@ -385,8 +381,7 @@ module RDF
     # @return [Enumerator]
     # @see #each_predicate
     def enum_predicate
-      require_enumerator!
-      ::Enumerable::Enumerator.new(self, :each_predicate)
+      Enumerator.new(self, :each_predicate)
     end
 
     alias_method :enum_predicates, :enum_predicate
@@ -452,8 +447,7 @@ module RDF
     # @return [Enumerator]
     # @see #each_object
     def enum_object
-      require_enumerator!
-      ::Enumerable::Enumerator.new(self, :each_object)
+      Enumerator.new(self, :each_object)
     end
 
     alias_method :enum_objects, :enum_object
@@ -519,8 +513,7 @@ module RDF
     # @return [Enumerator]
     # @see #each_context
     def enum_context
-      require_enumerator!
-      ::Enumerable::Enumerator.new(self, :each_context)
+      Enumerator.new(self, :each_context)
     end
 
     alias_method :enum_contexts, :enum_context
@@ -543,12 +536,5 @@ module RDF
       end
       result
     end
-
-    private
-
-      def require_enumerator! # @private
-        require 'enumerator' unless defined?(::Enumerable::Enumerator)
-      end
-
   end
 end

data/lib/rdf/query.rb

@@ -77,12 +77,11 @@ module RDF
     # Enumerates over each query solution.
     #
     # @yield  [solution]
-    # @yieldparam [Solution]
+    # @yieldparam [Solution] solution
     # @return [Enumerator]
     def each_solution(&block)
       unless block_given?
-        require 'enumerator' unless defined?(::Enumerable::Enumerator)
-        ::Enumerable::Enumerator.new(self, :each_solution)
+        Enumerator.new(self, :each_solution)
       else
         solutions.each do |solution|
           block.call(solution.is_a?(Solution) ? solution : Solution.new(solution))

data/lib/rdf/version.rb

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

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 7
-  version: 0.1.7
+  - 8
+  version: 0.1.8
 platform: ruby
 authors: 
 - Arto Bendiken
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-16 00:00:00 +02:00
+date: 2010-04-18 00:00:00 +02:00
 default_executable: rdf
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,8 +28,8 @@ dependencies:
         segments: 
         - 0
         - 1
-        - 6
-        version: 0.1.6
+        - 8
+        version: 0.1.8
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency