rdf 1.1.11 → 1.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7d765dce315d0c9f719adae387e1cec7f945958
-  data.tar.gz: 9446ae5e871f78abf5a43e783e4a90d193160984
+  metadata.gz: 424861a5701eb72e91b109582c0fa5a822a55077
+  data.tar.gz: 6e3bb83de003042827fc25fd5b77522fa957c6a8
 SHA512:
-  metadata.gz: 0b9b5e08ba70b4574a955c30154bc4702ba0ca5767b734aafdeb2d1919da2fe961ab93c74122d1ab89e023bb710943e5dbfc5a2072141db5f219a4d9756f91ca
-  data.tar.gz: 1dd2bae743a05599b83ddaa860817aa9afd2a4bc1e47dc6606a79aaf9b01e87583ef61ac3e9c0cba89fc0fbd31bd4c78be85e8c2e3c3bab9b260f72d75e8a83e
+  metadata.gz: cab68b2efe3db88ea4f11b71818c2966ccda4f41a3a41aeff008d41535bec2798c4e03e9db39219f767b3255974291243f14aeb5798b5733629e829a5a1bc74d
+  data.tar.gz: e7edd05ebdeec991a7403d26debf884a98ff94dbf74985c77b092aafe61f53bdc7f937b6ac77266d6506cebc01f0de1bbf2b832811ef6a3e9afecd4a55247239

data/VERSION

@@ -1 +1 @@
-1.1.11
+1.1.12

data/lib/rdf.rb

@@ -44,7 +44,7 @@ module RDF
   autoload :NQuads,      'rdf/nquads'
 
   # RDF storage
-  autoload :Dataset,     'rdf/model/dataset'
+  autoload :Dataset,     'rdf/model/repository'
   autoload :Repository,  'rdf/repository'
   autoload :Transaction, 'rdf/transaction'
 

data/lib/rdf/model/value.rb

@@ -37,7 +37,7 @@ module RDF
     end
 
     ##
-    # Returns `true` if `self` is a {RDF::Statement}.
+    # Is this a {RDF::Statement}?
     #
     # @return [Boolean]
     def statement?
@@ -45,7 +45,7 @@ module RDF
     end
 
     ##
-    # Returns `true` if `self` is a {RDF::List}.
+    # Is this a {RDF::List}?
     #
     # @return [Boolean]
     def list?
@@ -53,7 +53,7 @@ module RDF
     end
 
     ##
-    # Returns `true` if `self` is a {RDF::Term}.
+    # Is this a {RDF::Term}?
     #
     # @return [Boolean]
     def term?
@@ -61,7 +61,7 @@ module RDF
     end
 
     ##
-    # Returns `true` if `self` is a {RDF::Resource}.
+    # Is this a {RDF::Resource}?
     #
     # @return [Boolean]
     def resource?
@@ -69,7 +69,7 @@ module RDF
     end
 
     ##
-    # Returns `true` if `self` is a {RDF::Literal}.
+    # Is this a {RDF::Literal}?
     #
     # @return [Boolean]
     def literal?
@@ -77,7 +77,7 @@ module RDF
     end
 
     ##
-    # Returns `true` if `self` is a {RDF::Node}.
+    # Is this a {RDF::Node}, or does it contain a node?
     #
     # @return [Boolean]
     def node?
@@ -85,7 +85,7 @@ module RDF
     end
 
     ##
-    # Returns `true` if `self` is an IRI reference.
+    # Is this an {RDF::IRI}?
     #
     # By default this is simply an alias for {RDF::Value#uri?}.
     #
@@ -95,7 +95,7 @@ module RDF
     end
 
     ##
-    # Returns `true` if `self` is a {RDF::URI}.
+    # Is this an {RDF::URI}?
     #
     # @return [Boolean]
     def uri?
@@ -103,7 +103,7 @@ module RDF
     end
 
     ##
-    # Returns `true` this value is a {RDF::Query::Variable}, or is contains a variable.
+    # Is this a {RDF::Query::Variable}, or does it contain a variable?
     #
     # @return [Boolean]
     # @since  0.1.7
@@ -112,7 +112,9 @@ module RDF
     end
 
     ##
-    # Returns `true` if this value is constant.
+    # Is this constant, or are all of its components constant?
+    #
+    # Same as `!variable?`
     #
     # @return [Boolean] `true` or `false`
     # @see    #variable?
@@ -121,7 +123,7 @@ module RDF
     end
 
     ##
-    # Is this an anonymous value?
+    # Is this value named?
     #
     # @return [Boolean] `true` or `false`
     def anonymous?
@@ -129,7 +131,7 @@ module RDF
     end
 
     ##
-    # Returns `true` if the value has a valid representation
+    # Is this value valid, and composed only of valid components?
     #
     # @return [Boolean] `true` or `false`
     # @since  0.3.9
@@ -138,7 +140,7 @@ module RDF
     end
 
     ##
-    # Returns `true` if value is not valid
+    # Is this value invalid, or is it composed of any invalid components?
     #
     # @return [Boolean] `true` or `false`
     # @since  0.2.1

data/lib/rdf/query.rb

@@ -64,10 +64,10 @@ module RDF
   #   _:a foaf:name "Alice" .
   #   _:a foaf:mbox <mailto:alice@work.example.org> .
   #
-  #   
   # @see http://www.w3.org/TR/rdf-sparql-query/#rdfDataset
   # @since 0.3.0
   class Query
+    include Enumerable
     autoload :Pattern,   'rdf/query/pattern'
     autoload :Solution,  'rdf/query/solution'
     autoload :Solutions, 'rdf/query/solutions'
@@ -313,8 +313,8 @@ module RDF
       unless context.nil?
         if patterns.empty?
           patterns = [Pattern.new(nil, nil, nil, :context => context)]
-        elsif patterns.first.context.nil?
-          patterns.first.context = context
+        else
+          apply_context(context)
         end
       end
 
@@ -431,6 +431,28 @@ module RDF
       options[:context]
     end
 
+    # Apply the context specified (or configured) to all patterns that have no context
+    # @param [RDF::IRI, RDF::Query::Variable] context (self.context)
+    def apply_context(context = options[:context])
+      patterns.each {|pattern| pattern.context = context if pattern.context.nil?} unless context.nil?
+    end
+
+    ##
+    # Returns `true` if any pattern contains a variable.
+    #
+    # @return [Boolean]
+    def variable?
+      patterns.any?(&:variable?) || context && context.variable?
+    end
+
+    ##
+    # Returns `true` if any pattern contains a blank node.
+    #
+    # @return [Boolean]
+    def has_blank_nodes?
+      patterns.any?(&:has_blank_nodes?) || context && context.node?
+    end
+
     # Query has no patterns
     # @return [Boolean]
     def empty?
@@ -448,6 +470,17 @@ module RDF
     end
     alias_method :each, :each_solution
 
+    ##
+    # Enumerates over each statement (pattern).
+    #
+    # @yield  [RDF::Query::Pattern]
+    # @yieldparam [::Query::Pattern] pattern
+    # @return [Enumerator]
+    def each_statement(&block)
+      apply_context
+      patterns.each(&block)
+    end
+
     ##
     # Duplicate query, including patterns and solutions
     # @return [RDF::Query]

data/lib/rdf/query/pattern.rb

@@ -231,6 +231,20 @@ module RDF; class Query
       variables
     end
 
+    ##
+    # Binds the pattern to a solution, making it no longer variable if all variables are resolved to bound variables
+    #
+    # @param [RDF::Query::Solution] solution
+    # @return [self]
+    def bind(solution)
+      self.to_quad.each_with_index do |term, index|
+        if term && term.variable? && solution[term]
+          self[index] = solution[term] 
+        end
+      end
+      self
+    end
+
     ##
     # Returns `true` if this pattern contains bindings.
     #

data/lib/rdf/util/file.rb

@@ -228,7 +228,7 @@ module RDF; module Util
 
           remote_document = RemoteDocument.new(response.body, document_options)
         else
-          raise IOError, "<#{base_uri}>: #{response.code}"
+          raise IOError, "<#{base_uri}>: #{response.status}"
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdf
 version: !ruby/object:Gem::Version
-  version: 1.1.11
+  version: 1.1.12
 platform: ruby
 authors:
 - Arto Bendiken
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-05 00:00:00.000000000 Z
+date: 2015-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: link_header