sparql 3.1.3 → 3.1.4

data/lib/sparql/grammar/parser11.rb

@@ -586,7 +586,7 @@ module SPARQL::Grammar
     production(:GroupGraphPatternSub) do |input, data, callback|
       debug("GroupGraphPatternSub") {"q #{data[:query].inspect}"}
 
-      res = case data[:query].length
+      res = case Array(data[:query]).length
       when 0 then SPARQL::Algebra::Operator::BGP.new
       when 1 then data[:query].first
       when 2
@@ -867,9 +867,17 @@ module SPARQL::Grammar
       add_prod_datum(:path, data[:path])
     end
 
-    # [80]  	Object	  ::=  	GraphNode
+    # [177]	AnnotationPattern	      ::=	'{|' PropertyListNotEmpty '|}'
+    start_production(:AnnotationPattern) do |input, data, callback|
+      data[:TriplesNode] = prod_data[:pattern].first
+    end
+    production(:AnnotationPattern) do |input, data, callback|
+      add_prod_datum(:pattern, data[:pattern])
+    end
+
+    # [80]  	Object	  ::=  	GraphNode | EmbTP
     production(:Object) do |input, data, callback|
-      object = data[:VarOrTerm] || data[:TriplesNode] || data[:GraphNode]
+      object = data[:GraphNode] || data[:EmbTP]
       if object
         if prod_data[:Verb]
           add_pattern(:Object, subject: prod_data[:Subject], predicate: prod_data[:Verb], object: object)
@@ -1114,11 +1122,6 @@ module SPARQL::Grammar
       data.values.each {|v| add_prod_datum(:VarOrIri, v)}
     end
 
-    # [107s]  	VarOrBlankNodeOrIriOrEmbTP ::= Var | BlankNode| iri | EmbTP
-    production(:VarOrBlankNodeOrIriOrEmbTP) do |input, data, callback|
-      data.values.each {|v| add_prod_datum(:VarOrBlankNodeOrIriOrEmbTP, v)}
-    end
-
     # [109]  	GraphTerm	  ::=  	iri |	RDFLiteral |	NumericLiteral
     #                         |	BooleanLiteral |	BlankNode |	NIL
     production(:GraphTerm) do |input, data, callback|
@@ -1129,17 +1132,22 @@ module SPARQL::Grammar
                       data[:NIL])
     end
 
-    # [1xx] EmbTP ::= '<<' VarOrBlankNodeOrIriOrEmbTP Verb VarOrTermOrEmbTP '>>'
+    # [174] EmbTP ::= '<<' EmbSubjectOrObject Verb EmbSubjectOrObject '>>'
     production(:EmbTP) do |input, data, callback|
-      subject = data[:VarOrBlankNodeOrIriOrEmbTP]
+      subject, object = data[:EmbSubjectOrObject]
       predicate = data[:Verb]
-      object = data[:VarOrTerm]
       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])
@@ -1479,10 +1487,8 @@ module SPARQL::Grammar
     #   definitions.
     # @option options [Boolean]  :validate     (false)
     #   whether to validate the parsed statements and values
-    # @option options [Boolean] :progress
-    #   Show progress of parser productions
-    # @option options [Boolean] :debug
-    #   Detailed debug output
+    # @option options [Logger, #write, #<<] :logger
+    #   Record error/info/debug output
     # @yield  [parser] `self`
     # @yieldparam  [SPARQL::Grammar::Parser] parser
     # @yieldreturn [void] ignored
@@ -1494,10 +1500,6 @@ module SPARQL::Grammar
       end
       @input.encode!(Encoding::UTF_8) if @input.respond_to?(:encode!)
       @options = {anon_base: "b0", validate: false}.merge(options)
-      @options[:debug] ||= case
-      when options[:progress] then 2
-      when options[:validate] then 1
-      end
 
       debug("base IRI") {base_uri.inspect}
       debug("validate") {validate?.inspect}
@@ -1558,23 +1560,7 @@ module SPARQL::Grammar
         follow: FOLLOW,
         whitespace: WS,
         **@options
-      ) do |context, *data|
-        case context
-        when :trace
-          level, lineno, depth, *args = data
-          message = args.to_sse
-          d_str = depth > 100 ? ' ' * 100 + '+' : ' ' * depth
-          str = "[#{lineno}](#{level})#{d_str}#{message}".chop
-          case @options[:debug]
-          when Array
-            @options[:debug] << str unless level > 2
-          when TrueClass
-            $stderr.puts str
-          when Integer
-            $stderr.puts(str) if level <= @options[:debug]
-          end
-        end
-      end
+      )
 
       # The last thing on the @prod_data stack is the result
       @result = case

data/lib/sparql/grammar/terminals11.rb

@@ -111,6 +111,7 @@ module SPARQL::Grammar
                  |true
                  |false
                  |<<|>>
+                 |\{\||\|\}
                  |&&|!=|!|<=|>=|\^\^|\|\||[\(\),.;\[\]\{\}\+\-=<>\?\^\|\*\/a]
               )xim.freeze
 

data/lib/sparql/results.rb

@@ -34,9 +34,9 @@ module SPARQL
           {
             type: 'triple',
             value: {
-              s: format.call(value.subject),
-              p: format.call(value.predicate),
-              o: format.call(value.object)
+              subject: format.call(value.subject),
+              predicate: format.call(value.predicate),
+              object: format.call(value.object)
             }
           }
         end
@@ -81,9 +81,9 @@ module SPARQL
           end
         when RDF::Statement
           xml.triple do
-            xml.s {format.call(s.subject)}
-            xml.p {format.call(s.predicate)}
-            xml.o {format.call(s.object)}
+            xml.subject {format.call(s.subject)}
+            xml.predicate {format.call(s.predicate)}
+            xml.object {format.call(s.object)}
           end
         end
       end
@@ -140,9 +140,8 @@ module SPARQL
     # Generate Solutions as CSV
     # @return [String]
     # @see https://www.w3.org/TR/2013/REC-sparql11-results-csv-tsv-20130321/
-    def to_csv
+    def to_csv(bnode_map: {})
       require 'csv' unless defined?(::CSV)
-      bnode_map = {}
       bnode_gen = "_:a"
       CSV.generate(row_sep: "\r\n") do |csv|
         csv << variable_names.to_a
@@ -155,6 +154,10 @@ module SPARQL
                 bnode_gen = bnode_gen.succ
                 this
               end
+            when RDF::Statement
+              RDF::Query::Solutions(
+                RDF::Query::Solution.new(subject: term.subject, predicate: term.predicate, object: term.object)
+              ).to_csv(bnode_map: bnode_map).split.last.strip
             else
               solution[n].to_s.strip
             end
@@ -175,10 +178,15 @@ module SPARQL
           case term = solution[n]
           when RDF::Literal::Integer, RDF::Literal::Decimal, RDF::Literal::Double
             term.canonicalize.to_s
+          when RDF::Statement
+            emb_stmt = RDF::Query::Solutions(
+              RDF::Query::Solution.new(subject: term.subject, predicate: term.predicate, object: term.object)
+            ).to_tsv.split("\n").last.strip
+            emb_stmt.gsub(/[\t\n\r]/, "\t" => '\t', "\n" => '\n', "\r" => '\r')
           when nil
             ""
           else
-            RDF::NTriples.serialize(term).strip
+            RDF::NTriples.serialize(term).strip.gsub(/[\t\n\r]/, "\t" => '\t', "\n" => '\n', "\r" => '\r')
           end
         end.join("\t")
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sparql
 version: !ruby/object:Gem::Version
-  version: 3.1.3
+  version: 3.1.4
 platform: ruby
 authors:
 - Gregg Kellogg
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-13 00:00:00.000000000 Z
+date: 2020-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -20,7 +20,7 @@ dependencies:
         version: '3.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.2
+        version: 3.1.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -30,7 +30,7 @@ dependencies:
         version: '3.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.2
+        version: 3.1.8
 - !ruby/object:Gem::Dependency
   name: rdf-aggregate-repo
   requirement: !ruby/object:Gem::Requirement
@@ -49,16 +49,16 @@ dependencies:
   name: ebnf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
@@ -177,48 +177,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: open-uri-cached
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
@@ -239,14 +219,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.20
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.20
+        version: '0.9'
 description: |2-
 
       Implements SPARQL grammar parsing to SPARQL Algebra, SPARQL Algebra processing