sparql 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84911416a944de1280b0bf9b4285bf1cd23f97e9
-  data.tar.gz: 30953eec58386a4c8521991d1d289ba3aa233ab0
+  metadata.gz: 24d94464b57369281dd9908469fa33bdb33a3422
+  data.tar.gz: 75252c58c49ada1abf1ea695fe2a12e0a714f26b
 SHA512:
-  metadata.gz: 31a9a2e2ac55b09f500672ca061a93b3c73a69898483d0d9c9d9abee68032722a4cd0743284333804948e8bb9db1471be2a71889fd5295565f16ada3c11a9fc8
-  data.tar.gz: e7e4e75b03646731dcba4f0c02b362c19ce3077e2b8a0913694fff7e5e6d4be9011ed496f6664dd99c3688186b6e4477f48f5e7cdb652bdc9736242c854ea927
+  metadata.gz: 3a8fe5ad88942280d9bfa678ec2592b379f88205099ca3dc2040371f6799cbedb2a3d771e19a23feefe338cf754142a0599495fa32ae4a3d1159d50b5410fb19
+  data.tar.gz: 351cb78773845db66d68650b7377a872965cabf2bdc2c3d90a90edc554fcd8b6b5ef1a4e07d685e73e90f79d9cded9363823856fae9d90f60ac06f478a10f0ab

data/VERSION

@@ -1 +1 @@
-2.2.0
+2.2.1

data/lib/rack/sparql/conneg.rb

@@ -76,7 +76,8 @@ module Rack; module SPARQL
         headers = headers.merge(VARY).merge('Content-Type' => results.content_type) # FIXME: don't overwrite existing Vary headers
         [status, headers, [results]]
       rescue RDF::WriterError => e
-        not_acceptable(e.message)
+        # Use this instead of not_acceptable so that headers are not lost.
+        http_error(406, e.message, headers.merge(VARY))
       end
     end
 

data/lib/sparql/grammar/parser11.rb

@@ -615,9 +615,12 @@ module SPARQL::Grammar
           end
         end
         if (lhs = (input.delete(:query) || []).first) && !lhs.empty?
-          query = SPARQL::Algebra::Expression.for(:join, lhs, query)
+          query = SPARQL::Algebra::Operator::Join.new(lhs, query)
         end
         add_prod_datum(:query, query)
+      elsif !Array(data[:query]).empty?
+        # Join query and path
+        add_prod_datum(:query, SPARQL::Algebra::Operator::Join.new(data[:path].first, data[:query].first))
       else
         add_prod_datum(:query, data[:path])
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sparql
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Gregg Kellogg
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-28 00:00:00.000000000 Z
+date: 2017-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -17,28 +17,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rdf-aggregate-repo
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: ebnf
   requirement: !ruby/object:Gem::Requirement
@@ -87,14 +87,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rdf-xsd
   requirement: !ruby/object:Gem::Requirement
@@ -115,34 +115,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.4.6
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.4.6
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
@@ -163,28 +157,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rdf-spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: open-uri-cached
   requirement: !ruby/object:Gem::Requirement
@@ -211,14 +205,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.6'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
@@ -239,14 +233,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
 description: |2-
 
       Implements SPARQL grammar parsing to SPARQL Algebra, SPARQL Algebra processing
@@ -430,7 +424,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: sparql
-rubygems_version: 2.6.8
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: SPARQL Query and Update library for Ruby.