sparql 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 900c6694040cb2734dd37b95a0ef83d4472b15dab000b9a46d906826e704eb42
-  data.tar.gz: deb1166c8c7dd97955fbf9365db30c704d91f568581e12a9eac898a69cb8319a
+  metadata.gz: 580566c94580d213820adba65200fe89f481d405cbf27d65fe17a4c8eaf3ccd3
+  data.tar.gz: ab7b0abec9d6bd8aba6f3dd53f79fd53f78e29e0cde8871453d7186adb6c35a0
 SHA512:
-  metadata.gz: b43b92f8a74e1e05531af98e98565341e7e2514f2fbcc517e06d46658f0067845c992f998c919f375ace373ac56e75d3427e772330dd45657e61718d55eb5961
-  data.tar.gz: 3aa55a0112712092b6fdf21d2e26c52d8ee5719bc128e511caf8dee371e916c891517e6dc8acf0bddf030bf71b6fba540b1798ff417a2490d62dd2d471c4874a
+  metadata.gz: b66443f1a4cad8aa4691466dcfb05b42dc7c2b411b7a31dc913510d89e4e05972bee60f189ec7dc0b171734c801adc200d7f1eb13869e6636784218e6e4e1a15
+  data.tar.gz: 873f1bb69fee25a53f992a7a42e977f44da82f7ddca9b9030e05c1be485da6b9350f8feebcd2390e76116b3596cebf112da59752e4486517f2d9e602c2b7a7c4

data/VERSION

@@ -1 +1 @@
-3.0.1
+3.0.2

data/lib/sparql/grammar/parser11.rb

@@ -216,7 +216,7 @@ module SPARQL::Grammar
       unless resolve_iris?
         # Only output if we're not resolving URIs internally
         add_prod_datum(:BaseDecl, data[:BaseDecl])
-        add_prod_datum(:PrefixDecl, data[:PrefixDecl]) if data[:PrefixDecl]
+        add_prod_datum(:PrefixDecl, data[:PrefixDecl])
       end
     end
 
@@ -624,11 +624,14 @@ module SPARQL::Grammar
         if (lhs = (input.delete(:query) || []).first) && !lhs.empty?
           query = SPARQL::Algebra::Operator::Join.new(lhs, query)
         end
+        if data[:path]
+          query = SPARQL::Algebra::Operator::Join.new(query, Array(data[:path]).first)
+        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
+      elsif data[:path]
         add_prod_datum(:query, data[:path])
       end
     end
@@ -856,11 +859,8 @@ module SPARQL::Grammar
       data[:Subject] = prod_data[:Subject]
       error(nil, "Expected Subject", production: :ObjectList) if !prod_data[:Subject] && validate?
       error(nil, "Expected Verb", production: :ObjectList) if !(prod_data[:Verb] || prod_data[:VerbPath]) && validate?
-      if prod_data[:Verb]
-        data[:Verb] = prod_data[:Verb]
-      else
-        data[:VerbPath] = prod_data[:VerbPath]
-      end
+      data[:Verb] = prod_data[:Verb] if prod_data[:Verb]
+      data[:VerbPath] = prod_data[:VerbPath] if prod_data[:VerbPath]
     end
     production(:ObjectList) do |input, data, callback|
       add_prod_datum(:pattern, data[:pattern])
@@ -874,7 +874,7 @@ module SPARQL::Grammar
         if prod_data[:Verb]
           add_pattern(:Object, subject: prod_data[:Subject], predicate: prod_data[:Verb], object: object)
           add_prod_datum(:pattern, data[:pattern])
-        else
+        elsif prod_data[:VerbPath]
           add_prod_datum(:path,
             SPARQL::Algebra::Expression(:path,
                                         prod_data[:Subject].first,
@@ -886,11 +886,8 @@ module SPARQL::Grammar
 
     # [81]	TriplesSameSubjectPath	::=	VarOrTerm PropertyListPathNotEmpty | TriplesNode PropertyListPath
     production(:TriplesSameSubjectPath) do |input, data, callback|
-      if data[:pattern]
-        add_prod_datum(:pattern, data[:pattern])
-      else
-        add_prod_datum(:path, data[:path])
-      end
+      add_prod_datum(:pattern, data[:pattern])
+      add_prod_datum(:path, data[:path])
     end
 
     # [83]  	PropertyListPathNotEmpty	  ::=  	( VerbPath | VerbSimple ) ObjectList ( ';' ( ( VerbPath | VerbSimple ) ObjectList )? )*
@@ -900,16 +897,14 @@ module SPARQL::Grammar
       data[:Subject] = subject
     end
     production(:PropertyListPathNotEmpty) do |input, data, callback|
-      if data[:pattern]
-        add_prod_datum(:pattern, data[:pattern])
-      else
-        add_prod_datum(:path, data[:path])
-      end
+      add_prod_datum(:pattern, data[:pattern])
+      add_prod_datum(:path, data[:path])
     end
 
     # [84]  	VerbPath	  ::=  	Path
     production(:VerbPath) do |input, data, callback|
       if data[:Path]
+        input.delete(:Verb)
         input[:VerbPath] = data[:Path]
       else
         input[:Verb] = data[:iri]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sparql
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Gregg Kellogg
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-10 00:00:00.000000000 Z
+date: 2018-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -175,22 +175,16 @@ dependencies:
   name: linkeddata
   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: open-uri-cached
   requirement: !ruby/object:Gem::Requirement