rdf 0.1.5 → 0.1.6

data/README

@@ -6,6 +6,7 @@ This is a pure-Ruby library for working with [Resource Description Framework
 
 * <http://github.com/bendiken/rdf>
 * <http://blog.datagraph.org/2010/03/rdf-for-ruby>
+* <http://blog.datagraph.org/2010/04/rdf-repository-howto>
 
 Features
 --------
@@ -28,11 +29,11 @@ Examples
 
 ### Creating an RDF statement
 
-    s = RDF::URI.parse("http://rubygems.org/gems/rdf")
+    s = RDF::URI("http://rubygems.org/gems/rdf")
     p = RDF::DC.creator
-    o = RDF::URI.parse("http://ar.to/#self")
+    o = RDF::URI("http://ar.to/#self")
     
-    stmt = RDF::Statement.new(s, p, o)
+    stmt = RDF::Statement(s, p, o)
 
 ### Using pre-defined RDF vocabularies
 
@@ -55,7 +56,7 @@ Examples
 
 ### Reading N-Triples data
 
-    RDF::NTriples::Reader.open("spec/data/test.nt") do |reader|
+    RDF::Reader.open("spec/data/test.nt") do |reader|
       reader.each_statement do |statement|
         puts statement.inspect
       end

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.1.6

data/lib/rdf/mixin/mutable.rb

@@ -36,15 +36,20 @@ module RDF
     def load(filename, options = {})
       raise TypeError.new("#{self} is immutable") if immutable?
 
-      count = 0
       Reader.open(filename, options) do |reader|
-        reader.each_statement do |statement|
-          statement.context = options[:context] if options[:context]
-          insert_statement(statement)
-          count += 1
+        if options[:context]
+          statements = []
+          reader.each_statement do |statement|
+            statement.context = options[:context]
+            statements << statement
+          end
+          insert_statements(statements)
+          statements.size
+        else
+          insert_statements(reader)
+          nil # FIXME
         end
       end
-      count
     end
 
     alias_method :load!, :load
@@ -58,7 +63,8 @@ module RDF
       raise TypeError.new("#{self} is immutable") if immutable?
 
       insert_statement(create_statement(statement))
-      self
+
+      return self
     end
 
     ##
@@ -70,14 +76,21 @@ module RDF
     def insert(*statements)
       raise TypeError.new("#{self} is immutable") if immutable?
 
-      statements.each do |statement|
-        if (statement = create_statement(statement)).valid?
-          insert_statement(statement)
-        else
-          raise ArgumentError.new # FIXME
+      statements.map! do |value|
+        case
+          when value.respond_to?(:each_statement)
+            insert_statements(value)
+            nil
+          when (statement = create_statement(value)).valid?
+            statement
+          else
+            raise ArgumentError.new("not a valid statement: #{value.inspect}")
         end
       end
-      self
+      statements.compact!
+      insert_statements(statements) unless statements.empty?
+
+      return self
     end
 
     alias_method :insert!, :insert
@@ -91,16 +104,22 @@ module RDF
     def delete(*statements)
       raise TypeError.new("#{self} is immutable") if immutable?
 
-      statements.each do |statement|
-        if (statement = create_statement(statement)).valid?
-          delete_statement(statement)
-        else
-          query(statement) do |statement|
-            delete_statement(statement)
-          end
+      statements.map! do |value|
+        case
+          when value.respond_to?(:each_statement)
+            delete_statements(value)
+            nil
+          when (statement = create_statement(value)).valid?
+            statement
+          else
+            delete_statements(query(value))
+            nil
         end
       end
-      self
+      statements.compact!
+      delete_statements(statements) unless statements.empty?
+
+      return self
     end
 
     alias_method :delete!, :delete
@@ -174,6 +193,22 @@ module RDF
       raise NotImplementedError
     end
 
+    ##
+    # Inserts a list of RDF statement into the underlying storage.
+    #
+    # Subclasses of {RDF::Repository} may implement this method if they can
+    # efficiently insert multiple statements at once. This will otherwise
+    # default to invoking {#insert_statement} for each given statement.
+    #
+    # @param  [RDF::Enumerable, #each] statements
+    # @return [void]
+    def insert_statements(statements)
+      each = statements.respond_to?(:each_statement) ? :each_statement : :each
+      statements.__send__(each) do |statement|
+        insert_statement(statement)
+      end
+    end
+
     ##
     # Deletes an RDF statement from the underlying storage.
     #
@@ -187,8 +222,26 @@ module RDF
       raise NotImplementedError
     end
 
+    ##
+    # Deletes a list of RDF statement from the underlying storage.
+    #
+    # Subclasses of {RDF::Repository} may implement this method if they can
+    # efficiently delete multiple statements at once. This will otherwise
+    # default to invoking {#delete_statement} for each given statement.
+    #
+    # @param  [RDF::Enumerable, #each] statements
+    # @return [void]
+    def delete_statements(statements)
+      each = statements.respond_to?(:each_statement) ? :each_statement : :each
+      statements.__send__(each) do |statement|
+        delete_statement(statement)
+      end
+    end
+
     protected :create_statement
     protected :insert_statement
+    protected :insert_statements
     protected :delete_statement
+    protected :delete_statements
   end
 end

data/lib/rdf/model/statement.rb

@@ -201,7 +201,7 @@ module RDF
     alias_method :to_ary, :to_triple
 
     ##
-    # Returns the components of this statement as a `Hash`.
+    # Returns the terms of this statement as a `Hash`.
     #
     # @param  [Symbol] subject_key
     # @param  [Symbol] predicate_key
@@ -237,5 +237,21 @@ module RDF
         buffer.string
       end
     end
+
+    ##
+    # Returns a graph containing this statement in reified form.
+    #
+    # @param  [Hash{Symbol => Object}] options
+    # @return [RDF::Graph]
+    # @see    http://www.w3.org/TR/rdf-primer/#reification
+    def reified(options = {})
+      RDF::Graph.new(options[:context]) do |graph|
+        subject = options[:subject] || RDF::Node.new(options[:id])
+        graph << [subject, RDF.type,      RDF[:Statement]]
+        graph << [subject, RDF.subject,   self.subject]
+        graph << [subject, RDF.predicate, self.predicate]
+        graph << [subject, RDF.object,    self.object]
+      end
+    end
   end
 end

data/lib/rdf/model/value.rb

@@ -3,7 +3,7 @@ module RDF
   # An RDF value.
   #
   # This is the base class for the RDF.rb class hierarchy. The class of
-  # every object that can be a component of {RDF::Statement statements} is a
+  # every object that can be a term of {RDF::Statement statements} is a
   # subclass of this class.
   #
   # @example Checking if a value is a resource (blank node or URI reference)

data/lib/rdf/query.rb

@@ -52,15 +52,18 @@ module RDF
     # @return [Array<Hash{Symbol => Value}>] An unordered sequence of query solutions.
     attr_accessor :solutions
 
+    # @return [Hash]
+    attr_reader :options
+
     ##
     # @param  [Hash{Symbol => Object}] options
     # @yield  [query]
     # @yieldparam [Query]
     def initialize(options = {}, &block)
-      @variables = options.delete(:variables) || {}
-      @patterns  = options.delete(:patterns)  || []
-      @solutions = options.delete(:solutions) || []
-      @options   = options
+      @options   = options.dup
+      @variables = @options.delete(:variables) || {}
+      @patterns  = @options.delete(:patterns)  || []
+      @solutions = @options.delete(:solutions) || []
 
       if block_given?
         case block.arity
@@ -77,8 +80,13 @@ module RDF
     # @yieldparam [Solution]
     # @return [Enumerator]
     def each_solution(&block)
-      solutions.each do |bindings|
-        block.call(Solution.new(bindings))
+      unless block_given?
+        require 'enumerator' unless defined?(::Enumerable::Enumerator)
+        ::Enumerable::Enumerator.new(self, :each_solution)
+      else
+        solutions.each do |solution|
+          block.call(solution.is_a?(Solution) ? solution : Solution.new(solution))
+        end
       end
     end
 
@@ -88,11 +96,11 @@ module RDF
     # Returns the number of query solutions.
     #
     # @return [Integer]
-    def size
+    def count
       solutions.size
     end
 
-    alias_method :count, :size
+    alias_method :size, :count
 
     ##
     # Filters the solution sequence by the given criteria.
@@ -104,13 +112,14 @@ module RDF
     # @return [Query]
     def filter(criteria = {}, &block)
       if block_given?
-        solutions.reject! do |bindings|
-          !block.call(Solution.new(bindings))
+        solutions.reject! do |solution|
+          !block.call(solution.is_a?(Solution) ? solution : Solution.new(solution))
         end
       else
-        solutions.reject! do |bindings|
+        solutions.reject! do |solution|
+          solution = solution.is_a?(Solution) ? solution : Solution.new(solution)
           results = criteria.map do |name, value|
-            bindings[name] == value
+            solution[name] == value
           end
           !results.all?
         end
@@ -151,7 +160,7 @@ module RDF
       unless variables.empty?
         variables.map! { |variable| variable.to_sym }
         solutions.each do |bindings|
-          bindings.delete_if { |k, v| !variables.include?(k) }
+          bindings.delete_if { |k, v| !variables.include?(k) } # FIXME
         end
       end
       self
@@ -176,31 +185,35 @@ module RDF
     # Limits the solution sequence to bindings starting from the `start`
     # offset in the overall solution sequence.
     #
-    # @param  [Integer] start
+    # @param  [Integer, #to_i] start
     # @return [Query]
     def offset(start)
-      slice(start, solutions.size - start)
+      slice(start, solutions.size - start.to_i)
     end
 
+    alias_method :offset!, :offset
+
     ##
     # Limits the number of solutions to `length`.
     #
-    # @param  [Integer] length
+    # @param  [Integer, #to_i] length
     # @return [Query]
     def limit(length)
       slice(0, length)
     end
 
+    alias_method :limit!, :limit
+
     ##
     # Limits the solution sequence to `length` bindings starting from the
     # `start` offset in the overall solution sequence.
     #
-    # @param  [Integer] start
-    # @param  [Integer] length
+    # @param  [Integer, #to_i] start
+    # @param  [Integer, #to_i] length
     # @return [Query]
     def slice(start, length)
-      if start < solutions.size
-        solutions.slice!(start, length)
+      if (start = start.to_i) < solutions.size
+        solutions.slice!(start, length.to_i)
       else
         solutions = []
       end

data/lib/rdf/query/solution.rb

@@ -28,7 +28,7 @@ class RDF::Query
     ##
     # @param  [Hash{Symbol => Value}] bindings
     def initialize(bindings = {})
-      @bindings = bindings
+      @bindings = bindings.to_hash
     end
 
     ##

data/lib/rdf/version.rb

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

metadata

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