sparql 3.1.6 → 3.2.1

data/lib/sparql/grammar/parser11.rb

@@ -197,7 +197,7 @@ module SPARQL::Grammar
     # [2]  	Query	  ::=  	Prologue
     #                     ( SelectQuery | ConstructQuery | DescribeQuery | AskQuery )
     production(:Query) do |input, data, callback|
-      query = data[:query].first
+      query = data[:query].first if data[:query]
 
       # Add prefix
       if data[:PrefixDecl]
@@ -754,7 +754,7 @@ module SPARQL::Grammar
       end
     end
 
-    # [65]  DataBlockValue	        ::= EmbTD | iri | RDFLiteral | NumericLiteral | BooleanLiteral | 'UNDEF'
+    # [65]  DataBlockValue	        ::= QuotedTriple | iri | RDFLiteral | NumericLiteral | BooleanLiteral | 'UNDEF'
     production(:DataBlockValue) do |input, data, callback|
       add_prod_datum :DataBlockValue, data.values.first
     end
@@ -806,7 +806,7 @@ module SPARQL::Grammar
 
     # [70]  	FunctionCall	  ::=  	iri ArgList
     production(:FunctionCall) do |input, data, callback|
-      add_prod_data(:Function, Array(data[:iri]) + data[:ArgList])
+      add_prod_data(:Function, SPARQL::Algebra::Operator::FunctionCall.new(data[:iri], *data[:ArgList]))
     end
 
     # [71]  	ArgList	  ::=  	NIL
@@ -833,7 +833,7 @@ module SPARQL::Grammar
       add_prod_datum(:ConstructTemplate, data[:ConstructTemplate])
     end
 
-    # [75]  	TriplesSameSubject	  ::=  	VarOrTermOrEmbTP PropertyListNotEmpty
+    # [75]  	TriplesSameSubject	  ::=  	VarOrTermOrQuotedTP PropertyListNotEmpty
     #                                 |	TriplesNode PropertyList
     production(:TriplesSameSubject) do |input, data, callback|
       add_prod_datum(:pattern, data[:pattern])
@@ -842,8 +842,8 @@ module SPARQL::Grammar
     # [77]  	PropertyListNotEmpty	  ::=  	Verb ObjectList
     #                                       ( ';' ( Verb ObjectList )? )*
     start_production(:PropertyListNotEmpty) do |input, data, callback|
-      subject = input[:VarOrTermOrEmbTP] || input[:TriplesNode] || input[:GraphNode]
-      error(nil, "Expected VarOrTermOrEmbTP or TriplesNode or GraphNode", production: :PropertyListNotEmpty) if validate? && !subject
+      subject = input[:VarOrTermOrQuotedTP] || input[:TriplesNode] || input[:GraphNode]
+      error(nil, "Expected VarOrTermOrQuotedTP or TriplesNode or GraphNode", production: :PropertyListNotEmpty) if validate? && !subject
       data[:Subject] = subject
     end
     production(:PropertyListNotEmpty) do |input, data, callback|
@@ -899,7 +899,7 @@ module SPARQL::Grammar
       add_prod_datum(:pattern, data[:pattern])
     end
 
-    # [81]	TriplesSameSubjectPath	::=	VarOrTermOrEmbTP PropertyListPathNotEmpty | TriplesNode PropertyListPath
+    # [81]	TriplesSameSubjectPath	::=	VarOrTermOrQuotedTP PropertyListPathNotEmpty | TriplesNode PropertyListPath
     production(:TriplesSameSubjectPath) do |input, data, callback|
       add_prod_datum(:pattern, data[:pattern])
       add_prod_datum(:path, data[:path])
@@ -907,8 +907,8 @@ module SPARQL::Grammar
 
     # [83]  	PropertyListPathNotEmpty	  ::=  	( VerbPath | VerbSimple ) ObjectList ( ';' ( ( VerbPath | VerbSimple ) ObjectList )? )*
     start_production(:PropertyListPathNotEmpty) do |input, data, callback|
-      subject = input[:VarOrTermOrEmbTP] || input[:TriplesNode] || input[:GraphNode]
-      error(nil, "Expected VarOrTermOrEmbTP, got nothing", production: :PropertyListPathNotEmpty) if validate? && !subject
+      subject = input[:VarOrTermOrQuotedTP] || input[:TriplesNode] || input[:GraphNode]
+      error(nil, "Expected VarOrTermOrQuotedTP, got nothing", production: :PropertyListPathNotEmpty) if validate? && !subject
       data[:Subject] = subject
     end
     production(:PropertyListPathNotEmpty) do |input, data, callback|
@@ -954,7 +954,7 @@ module SPARQL::Grammar
       data[:Verb] = Array(input[:Verb]).first
     end
     production(:ObjectPath) do |input, data, callback|
-      object = data[:VarOrTermOrEmbTP] || data[:TriplesNode] || data[:GraphNode]
+      object = data[:VarOrTermOrQuotedTP] || data[:TriplesNode] || data[:GraphNode]
       if object
         if prod_data[:Verb]
           if data[:pattern] && data[:path]
@@ -1116,24 +1116,24 @@ module SPARQL::Grammar
       add_prod_datum(:path, data[:path])
     end
 
-    # [104]  	GraphNode	  ::=  	VarOrTermOrEmbTP |	TriplesNode
+    # [104]  	GraphNode	  ::=  	VarOrTermOrQuotedTP |	TriplesNode
     production(:GraphNode) do |input, data, callback|
-      term = data[:VarOrTermOrEmbTP] || data[:TriplesNode]
+      term = data[:VarOrTermOrQuotedTP] || data[:TriplesNode]
       add_prod_datum(:pattern, data[:pattern])
       add_prod_datum(:GraphNode, term)
     end
 
-    # [105]	GraphNodePath	::=	VarOrTermOrEmbTP | TriplesNodePath
+    # [105]	GraphNodePath	::=	VarOrTermOrQuotedTP | TriplesNodePath
     production(:GraphNodePath) do |input, data, callback|
-      term = data[:VarOrTermOrEmbTP] || data[:TriplesNode]
+      term = data[:VarOrTermOrQuotedTP] || data[:TriplesNode]
       add_prod_datum(:pattern, data[:pattern])
       add_prod_datum(:path, data[:path])
       add_prod_datum(:GraphNode, term)
     end
 
-    # [106s]  	VarOrTermOrEmbTP        ::= Var | GraphTerm | EmbTP
-    production(:VarOrTermOrEmbTP) do |input, data, callback|
-      data.values.each {|v| add_prod_datum(:VarOrTermOrEmbTP, v)}
+    # [106s]  	VarOrTermOrQuotedTP        ::= Var | GraphTerm | EmbTP
+    production(:VarOrTermOrQuotedTP) do |input, data, callback|
+      data.values.each {|v| add_prod_datum(:VarOrTermOrQuotedTP, v)}
     end
 
     # [107]  	VarOrIri	  ::=  	Var | iri
@@ -1151,22 +1151,6 @@ module SPARQL::Grammar
                       data[:NIL])
     end
 
-    # [174] EmbTP ::= '<<' EmbSubjectOrObject Verb EmbSubjectOrObject '>>'
-    production(:EmbTP) do |input, data, callback|
-      subject, object = data[:EmbSubjectOrObject]
-      predicate = data[:Verb]
-      add_pattern(:EmbTP,
-                  subject: subject,
-                  predicate: predicate,
-                  object: object)
-    end
-
-    # [175] EmbSubjectOrObject ::=	Var | BlankNode | iri | RDFLiteral
-    #                            | NumericLiteral | BooleanLiteral | EmbTP
-    production(:EmbSubjectOrObject) do |input, data, callback|
-      data.values.each {|v| add_prod_datum(:EmbSubjectOrObject, v)}
-    end
-
     # [110]  	Expression	  ::=  	ConditionalOrExpression
     production(:Expression) do |input, data, callback|
       add_prod_datum(:Expression, data[:Expression])
@@ -1306,7 +1290,7 @@ module SPARQL::Grammar
     #                                 | iriOrFunction | RDFLiteral
     #                                 | NumericLiteral | BooleanLiteral
     #                                 | Var
-    #                                 | EmbTP
+    #                                 | ExprQuotedTP
     production(:PrimaryExpression) do |input, data, callback|
       if data[:Expression]
         add_prod_datum(:Expression, data[:Expression])
@@ -1453,7 +1437,7 @@ module SPARQL::Grammar
     production(:iriOrFunction) do |input, data, callback|
       if data.has_key?(:ArgList)
         # Function is (func arg1 arg2 ...)
-        add_prod_data(:Function, Array(data[:iri]) + data[:ArgList])
+        add_prod_data(:Function, SPARQL::Algebra::Operator::FunctionCall.new(data[:iri], *data[:ArgList]))
       else
         input[:iri] = data[:iri]
       end
@@ -1492,15 +1476,38 @@ module SPARQL::Grammar
       add_prod_datum(:UnaryExpression, data[:UnaryExpression])
     end
 
-    # [177]	AnnotationPattern	      ::=	'{|' PropertyListNotEmpty '|}'
-    #start_production(:AnnotationPattern) do |input, data, callback|
-    #  data[:TriplesNode] = prod_data[:TriplesNode].first
-    #end
-    #production(:AnnotationPattern) do |input, data, callback|
-    #  add_prod_datum(:pattern, data[:pattern])
-    #end
+    # [174] QuotedTP ::= '<<' qtSubjectOrObject Verb qtSubjectOrObject '>>'
+    production(:QuotedTP) do |input, data, callback|
+      subject, object = data[:qtSubjectOrObject]
+      predicate = data[:Verb]
+      add_pattern(:QuotedTP,
+                  subject: subject,
+                  predicate: predicate,
+                  object: object)
+    end
 
-    # [178]	AnnotationPatternPath	      ::=	'{|' PropertyListPathNotEmpty '|}'
+    # [175] QuotedTriple ::= '<<' DataValueTerm (iri | 'a') DataValueTerm '>>'
+    production(:QuotedTriple) do |input, data, callback|
+      subject, object = data[:DataValueTerm]
+      predicate = data[:iri]
+      add_pattern(:QuotedTriple,
+                  subject: subject,
+                  predicate: predicate,
+                  object: object)
+    end
+
+    # [176] qtSubjectOrObject ::=	Var | BlankNode | iri | RDFLiteral
+    #                            | NumericLiteral | BooleanLiteral | QuotedTP
+    production(:qtSubjectOrObject) do |input, data, callback|
+      data.values.each {|v| add_prod_datum(:qtSubjectOrObject, v)}
+    end
+
+    # [177] DataValueTerm           ::= iri | RDFLiteral | NumericLiteral | BooleanLiteral | QuotedTriple
+    production(:DataValueTerm) do |input, data, callback|
+      add_prod_datum :DataValueTerm, data.values.first
+    end
+
+    # [180]	AnnotationPatternPath	      ::=	'{|' PropertyListPathNotEmpty '|}'
     start_production(:AnnotationPatternPath) do |input, data, callback|
       data[:TriplesNode] = input[:TriplesNode]
     end
@@ -1514,21 +1521,21 @@ module SPARQL::Grammar
       end
     end
 
-    # [179] EmbTD                   ::= '<<' DataValueTerm ( iri | 'a' ) DataValueTerm '>>'
-    production(:EmbTD) do |input, data, callback|
-      subject, object = data[:DataValueTerm]
-      predicate = data[:iri]
-      add_pattern(:EmbTD,
+    # [181] ExprQuotedTP ::= '<<' ExprVarOrTerm Verb ExprVarOrTerm '>>'
+    production(:ExprQuotedTP) do |input, data, callback|
+      subject, object = data[:ExprVarOrTerm]
+      predicate = data[:Verb]
+      add_pattern(:ExprQuotedTP,
                   subject: subject,
                   predicate: predicate,
                   object: object)
     end
 
-    # [180] DataValueTerm           ::= EmbTD | iri | RDFLiteral | NumericLiteral | BooleanLiteral
-    production(:DataValueTerm) do |input, data, callback|
-      add_prod_datum :DataValueTerm, data.values.first
+    # [182] ExprVarOrTerm ::=	iri | RDFLiteral | NumericLiteral | BooleanLiteral | Var | ExprQuotedTP
+    production(:ExprVarOrTerm) do |input, data, callback|
+      data.values.each {|v| add_prod_datum(:ExprVarOrTerm, v)}
     end
-    
+
     ##
     # Initializes a new parser instance.
     #
@@ -1805,8 +1812,8 @@ module SPARQL::Grammar
       value = RDF::URI(value)
       if base_uri && value.relative?
         u = base_uri.join(value)
-        u.lexical = "<#{value}>" unless resolve_iris?
-        u
+        #u.lexical = "<#{value}>" unless resolve_iris?
+        #u
       else
         value
       end
@@ -1818,8 +1825,8 @@ module SPARQL::Grammar
       debug {"ns(#{prefix.inspect}): base: '#{base}', suffix: '#{suffix}'"}
       iri = iri(base + suffix.to_s)
       # Cause URI to be serialized as a lexical
-      iri.lexical = "#{prefix}:#{suffix}" unless resolve_iris?
-      iri
+      #iri.lexical = "#{prefix}:#{suffix}" unless resolve_iris?
+      #iri
     end
 
     # Create a literal

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sparql
 version: !ruby/object:Gem::Version
-  version: 3.1.6
+  version: 3.2.1
 platform: ruby
 authors:
 - Gregg Kellogg
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-21 00:00:00.000000000 Z
+date: 2022-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -17,48 +17,48 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.12
+        version: 3.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.12
+        version: 3.2.3
 - !ruby/object:Gem::Dependency
   name: rdf-aggregate-repo
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: ebnf
   requirement: !ruby/object:Gem::Requirement
     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: builder
   requirement: !ruby/object:Gem::Requirement
@@ -74,81 +74,95 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
-  name: sxp
+  name: logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
-  name: sparql-client
+  name: sxp
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '1.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.2
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '1.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.2
+        version: 1.2.1
+- !ruby/object:Gem::Dependency
+  name: sparql-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rdf-xsd
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rack
   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: rack-test
   requirement: !ruby/object:Gem::Requirement
@@ -169,14 +183,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: linkeddata
   requirement: !ruby/object:Gem::Requirement
@@ -297,6 +311,7 @@ files:
 - lib/sparql/algebra/operator/extend.rb
 - lib/sparql/algebra/operator/filter.rb
 - lib/sparql/algebra/operator/floor.rb
+- lib/sparql/algebra/operator/function_call.rb
 - lib/sparql/algebra/operator/graph.rb
 - lib/sparql/algebra/operator/greater_than.rb
 - lib/sparql/algebra/operator/greater_than_or_equal.rb
@@ -379,7 +394,6 @@ files:
 - lib/sparql/algebra/operator/sum.rb
 - lib/sparql/algebra/operator/table.rb
 - lib/sparql/algebra/operator/timezone.rb
-- lib/sparql/algebra/operator/triple.rb
 - lib/sparql/algebra/operator/tz.rb
 - lib/sparql/algebra/operator/ucase.rb
 - lib/sparql/algebra/operator/union.rb
@@ -411,14 +425,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: SPARQL Query and Update library for Ruby.

data/lib/sparql/algebra/operator/triple.rb

@@ -1,27 +0,0 @@
-module SPARQL; module Algebra
-  class Operator
-    ##
-    # The SPARQL `triple` operator.
-    #
-    # If the 3-tuple (term1, term2, term3) is an RDF-star triple, the function returns this triple. If the 3-tuple is not an RDF-star triple, then the function raises an error.
-    #
-    # @see https://w3c.github.io/rdf-star/rdf-star-cg-spec.html#triple
-    class Triple < Operator::Ternary
-      include Evaluatable
-
-      NAME = :triple
-
-      ##
-      # @param  [RDF::Term] subject
-      # @param  [RDF::Term] predicate
-      # @param  [RDF::Term] object
-      # @return [RDF::URI]
-      # @raise  [TypeError] if the operand is not a simple literal
-      def apply(subject, predicate, object)
-        triple = RDF::Statement(subject, predicate, object)
-        raise TypeError, "valid components, but got #{triple.inspect}" unless triple.valid?
-        triple
-      end
-    end # Triple
-  end # Operator
-end; end # SPARQL::Algebra