sparql 2.2.2 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5dacac58b3db16753e3ed0365462b605a4909dd
-  data.tar.gz: 45acd0a253aeb302237303bc1a6d9c72830ea237
+  metadata.gz: 0bff4a7c42287bdfe66a68fe8b9749ba03a28c79
+  data.tar.gz: 1922e7c06a6387ec9dd8b4797fb262f8d8b2b70d
 SHA512:
-  metadata.gz: 3343521fb78230e10d214f0665d74873494ae9ce5e55ce575034c2f57a4e11e8503fed433cfd32d1b4afdad9907527cac8470b226b070681419f53eb3cb7640b
-  data.tar.gz: fb3605b0d8c28a9915f9f6d72f70b1e630674c011f4e5a7932e43c37b061aaadd4768081e994c1055af4077aca8ae78c2b250dbf4176d7493da28bd91ae2c061
+  metadata.gz: 12f7636ac3e765bebe48ffff2de8255bdc8465279576a4a7ceeea7c196412ee0410b115418646bcc329b9a187e204469438b2d0f01676d0c7e9332bae9797b9c
+  data.tar.gz: 0f7cba620c3a2548d1e7645b25713f1071135290f34ba583a2c70054700a9e0c1b5ea7d0176d3fc049f0e7dfc2c0e334108893fd2d491f5354c01a03821408d8

data/README.md

@@ -257,19 +257,19 @@ Full documentation available on [Rubydoc.info][SPARQL doc]
 
 ## Dependencies
 
-* [Ruby](http://ruby-lang.org/) (>= 1.9.3)
-* [RDF.rb](http://rubygems.org/gems/rdf) (>= 1.1.12)
-* [SPARQL::Client](https://rubygems.org/gems/sparql-client) (>= 1.1.3)
-* [SXP](https://rubygems.org/gems/sxp) (>= 0.1.3)
+* [Ruby](http://ruby-lang.org/) (>= 2.2.2)
+* [RDF.rb](http://rubygems.org/gems/rdf) (~> 3.0)
+* [SPARQL::Client](https://rubygems.org/gems/sparql-client) (~> 3.0)
+* [SXP](https://rubygems.org/gems/sxp) (~> 1.0)
 * [Builder](https://rubygems.org/gems/builder) (>= 3.0.0)
 * [JSON](https://rubygems.org/gems/json) (>= 1.8.2)
-* Soft dependency on [Linked Data][] (>= 1.1)
-* Soft dependency on [Nokogiri](http://rubygems.org/gems/nokogiri) (>= 1.6.6)
+* Soft dependency on [Linked Data][] (>= 3.0)
+* Soft dependency on [Nokogiri](http://rubygems.org/gems/nokogiri) (>= 1.7)
   Falls back to REXML for XML parsing Builder for XML serializing. Nokogiri is much more efficient
 * Soft dependency on [Equivalent XML](https://rubygems.org/gems/equivalent-xml) (>= 0.3.0)
   Equivalent XML performs more efficient comparisons of XML Literals when Nokogiri is included
-* Soft dependency on [Rack][] (>= 1.6.0)
-* Soft dependency on [Sinatra][] (>= 1.4.6)
+* Soft dependency on [Rack][] (>= 2.0)
+* Soft dependency on [Sinatra][] (>= 2.0)
 
 ## Installation
 

data/VERSION

@@ -1 +1 @@
-2.2.2
+3.0.0

data/lib/sparql/algebra/extensions.rb

@@ -325,18 +325,25 @@ class RDF::Query
   end
 
   ##
-  # Return the non-destinguished variables contained within patterns
+  # Return the non-destinguished variables contained within patterns and graph name
   # @return [Array<RDF::Query::Variable>]
   def ndvars
-    patterns.map(&:ndvars).flatten
+    vars.reject(&:distinguished?)
   end
 
   ##
-  # Return the variables contained within patterns
+  # Return the variables contained within patterns and graph name
   # @return [Array<RDF::Query::Variable>]
   def vars
-    patterns.map(&:vars).flatten
+    variables.values
   end
+
+  ##
+  # Returns `true` if this is executable (i.e., contains a graph patterns), `false`
+  # otherwise.
+  #
+  # @return [Boolean] `true` or `false`
+  def executable?; true; end
 end
 
 class RDF::Query::Pattern

data/lib/sparql/algebra/query.rb

@@ -22,7 +22,7 @@ module SPARQL; module Algebra
     #
     # @return [Hash{Symbol => RDF::Query::Variable}]
     def variables
-      operands.inject({}) {|hash, o| o.executable? ? hash.merge!(o.variables) : hash}
+      operands.inject({}) {|hash, o| o.executable? ? hash.merge(o.variables) : hash}
     end
 
     ##

data/lib/sparql/algebra/update.rb

@@ -22,7 +22,7 @@ module SPARQL; module Algebra
     #
     # @return [Hash{Symbol => RDF::Query::Variable}]
     def variables
-      operands.inject({}) {|hash, o| o.executable? ? hash.merge!(o.variables) : hash}
+      operands.inject({}) {|hash, o| o.executable? ? hash.merge(o.variables) : hash}
     end
 
     ##

data/lib/sparql/grammar/parser11.rb

@@ -586,12 +586,20 @@ module SPARQL::Grammar
     production(:GroupGraphPatternSub) do |input, data, callback|
       debug("GroupGraphPatternSub") {"q #{data[:query].inspect}"}
 
-      res = data[:query].first
+      res = case data[:query].length
+      when 0 then SPARQL::Algebra::Operator::BGP.new
+      when 1 then data[:query].first
+      when 2
+        SPARQL::Algebra::Operator::Join.new(*data[:query])
+      else
+        error(nil, "Expected 0-2 queryies, got #{data[:query].length}", production: :GroupGraphPatternSub)
+        SPARQL::Algebra::Operator::BGP.new
+      end
       debug("GroupGraphPatternSub(pre-filter)") {"res: #{res.inspect}"}
 
       if data[:filter]
         expr, query = flatten_filter(data[:filter])
-        query = res || SPARQL::Algebra::Operator::BGP.new
+        query = res
         # query should be nil
         res = SPARQL::Algebra::Operator::Filter.new(expr, query)
       end
@@ -647,6 +655,11 @@ module SPARQL::Grammar
         lhs.operands.first.concat(data[:extend])
         add_prod_datum(:query, lhs)
       elsif data[:extend]
+        # The variable assigned in a BIND clause must not be already in-use within the immediately preceding TriplesBlock within a GroupGraphPattern.
+        # None of the variables on the lhs of data[:extend] may be used in lhs
+        data[:extend].each do |(v, _)|
+          error(nil, "BIND Variable #{v} used in pattern", production: :GraphPatternNotTriples) if lhs.vars.map(&:to_sym).include?(v.to_sym)
+        end
         add_prod_datum(:query, SPARQL::Algebra::Expression.for(:extend, data[:extend], lhs))
       elsif data[:leftjoin]
         add_prod_datum(:query, SPARQL::Algebra::Expression.for(:leftjoin, lhs, *data[:leftjoin]))
@@ -1831,14 +1844,14 @@ module SPARQL::Grammar
 
       # extension variables must not appear in projected variables.
       # Add them to the projection otherwise
-      extensions.each do |(var, expr)|
+      extensions.each do |(var, _)|
         raise Error, "Extension variable #{var} also in SELECT" if vars.map(&:to_s).include?(var.to_s)
         vars << var
       end
 
       # If any extension contains an aggregate, and there is now group, implicitly group by 1
       if !data[:group] &&
-         extensions.any? {|(var, function)| function.aggregate?} ||
+         extensions.any? {|(_, function)| function.aggregate?} ||
          having.any? {|c| c.aggregate? }
         debug {"Implicit group"}
         data[:group] = [[]]
@@ -1868,7 +1881,7 @@ module SPARQL::Grammar
 
           # Replace aggregates in expr as above
           expr.replace_aggregate! do |function|
-            if avf = aggregates.detect {|(v, f)| f == function}
+            if avf = aggregates.detect {|(_, f)| f == function}
               avf.first
             else
               # Allocate a temporary variable for this function, and retain the mapping for outside the group

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sparql
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 3.0.0
 platform: ruby
 authors:
 - Gregg Kellogg
@@ -9,28 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-13 00:00:00.000000000 Z
+date: 2017-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rdf-aggregate-repo
   requirement: !ruby/object:Gem::Requirement
@@ -97,42 +91,30 @@ dependencies:
   name: sparql-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.1'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.1'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rdf-xsd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -167,36 +149,30 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
-  name: linkeddata
+  name: rdf-spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: rdf-spec
+  name: linkeddata
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -269,14 +245,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.9.12
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.9.12
 description: |2-
 
       Implements SPARQL grammar parsing to SPARQL Algebra, SPARQL Algebra processing