sparql 3.0.1 → 3.1.4

data/lib/sparql/grammar/parser11.rb

@@ -6,8 +6,8 @@ module SPARQL::Grammar
   ##
   # A parser for the SPARQL 1.1 grammar.
   #
-  # @see http://www.w3.org/TR/sparql11-query/#grammar
-  # @see http://en.wikipedia.org/wiki/LR_parser
+  # @see https://www.w3.org/TR/sparql11-query/#grammar
+  # @see https://en.wikipedia.org/wiki/LR_parser
   class Parser
     include SPARQL::Grammar::Meta
     include SPARQL::Grammar::Terminals
@@ -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
 
@@ -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
@@ -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
@@ -698,9 +701,9 @@ module SPARQL::Grammar
       end
     end
 
-    # [60]  Bind                    ::= 'BIND' '(' Expression 'AS' Var ')'
+    # [60]  Bind                    ::= 'BIND' '(' (Expression || EmbTP) 'AS' Var ')'
     production(:Bind) do |input, data, callback|
-      add_prod_datum :extend, [data[:Expression].unshift(data[:Var].first)]
+      add_prod_datum :extend, [(data[:Expression] || data[:pattern]).unshift(data[:Var].first)]
     end
 
     # [61]  InlineData	            ::= 'VALUES' DataBlock
@@ -856,25 +859,30 @@ 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])
       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)
           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 +894,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 +905,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]
@@ -1109,6 +1112,11 @@ module SPARQL::Grammar
       data.values.each {|v| add_prod_datum(:VarOrTerm, v)}
     end
 
+    # [106s]  	VarOrTermOrEmbTP        ::= Var | GraphTerm | EmbTP
+    production(:VarOrTermOrEmbTP) do |input, data, callback|
+      data.values.each {|v| add_prod_datum(:VarOrTerm, v)}
+    end
+
     # [107]  	VarOrIri	  ::=  	Var | iri
     production(:VarOrIri) do |input, data, callback|
       data.values.each {|v| add_prod_datum(:VarOrIri, v)}
@@ -1124,6 +1132,22 @@ 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])
@@ -1420,7 +1444,7 @@ module SPARQL::Grammar
         str = lit.delete(:string)
         lit[:datatype] = lit.delete(:iri) if lit[:iri]
         lit[:language] = lit.delete(:language).last.downcase if lit[:language]
-        input[:literal] = RDF::Literal.new(str, lit) if str
+        input[:literal] = RDF::Literal.new(str, **lit) if str
       end
     end
 
@@ -1463,25 +1487,19 @@ 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
     # @return [SPARQL::Grammar::Parser]
-    def initialize(input = nil, options = {}, &block)
+    def initialize(input = nil, **options, &block)
       @input = case input
       when IO, StringIO then input.read
       else input.to_s.dup
       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}
@@ -1532,30 +1550,17 @@ module SPARQL::Grammar
     # @param [Symbol, #to_s] prod The starting production for the parser.
     #   It may be a URI from the grammar, or a symbol representing the local_name portion of the grammar URI.
     # @return [Array]
-    # @see http://www.w3.org/TR/sparql11-query/#sparqlAlgebra
-    # @see http://axel.deri.ie/sparqltutorial/ESWC2007_SPARQL_Tutorial_unit2b.pdf
+    # @see https://www.w3.org/TR/sparql11-query/#sparqlAlgebra
+    # @see https://axel.deri.ie/sparqltutorial/ESWC2007_SPARQL_Tutorial_unit2b.pdf
     def parse(prod = START)
-      ll1_parse(@input, prod.to_sym, @options.merge(branch: BRANCH,
-                                                    first: FIRST,
-                                                    follow: FOLLOW,
-                                                    whitespace: WS)
-      ) 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
+      ll1_parse(@input,
+        prod.to_sym,
+        branch: BRANCH,
+        first: FIRST,
+        follow: FOLLOW,
+        whitespace: WS,
+        **@options
+      )
 
       # The last thing on the @prod_data stack is the result
       @result = case
@@ -1723,9 +1728,7 @@ module SPARQL::Grammar
 
       if id
         @vars[id] ||= begin
-          v = RDF::Query::Variable.new(id)
-          v.distinguished = distinguished
-          v
+          RDF::Query::Variable.new(id, distinguished: distinguished)
         end
       else
         unless distinguished
@@ -1733,9 +1736,7 @@ module SPARQL::Grammar
           id = @nd_var_gen
           @nd_var_gen = id.succ
         end
-        v = RDF::Query::Variable.new(id)
-        v.distinguished = distinguished
-        v
+        RDF::Query::Variable.new(id, distinguished: distinguished)
       end
     end
 
@@ -1763,7 +1764,7 @@ module SPARQL::Grammar
     end
 
     # Create a literal
-    def literal(value, options = {})
+    def literal(value, **options)
       options = options.dup
       # Internal representation is to not use xsd:string, although it could arguably go the other way.
       options.delete(:datatype) if options[:datatype] == RDF::XSD.string
@@ -1772,7 +1773,7 @@ module SPARQL::Grammar
         "options: #{options.inspect}, " +
         "validate: #{validate?.inspect}, "
       end
-      RDF::Literal.new(value, options.merge(validate: validate?))
+      RDF::Literal.new(value, validate: validate?, **options)
     end
 
     # Take collection of objects and create RDF Collection using rdf:first, rdf:rest and rdf:nil
@@ -1803,7 +1804,7 @@ module SPARQL::Grammar
     #
     # @param [String] production Production generating pattern
     # @param [Hash{Symbol => Object}] options
-    def add_pattern(production, options)
+    def add_pattern(production, **options)
       progress(production, "[:pattern, #{options[:subject]}, #{options[:predicate]}, #{options[:object]}]")
       triple = {}
       options.each_pair do |r, v|
@@ -1885,8 +1886,7 @@ module SPARQL::Grammar
               avf.first
             else
               # Allocate a temporary variable for this function, and retain the mapping for outside the group
-              av = RDF::Query::Variable.new(".#{agg}")
-              av.distinguished = false
+              av = RDF::Query::Variable.new(".#{agg}", distinguished: false)
               agg += 1
               aggregates << [av, function]
               av

data/lib/sparql/grammar/terminals11.rb

@@ -110,6 +110,8 @@ module SPARQL::Grammar
                  |isBLANK|isIRI|isURI|isLITERAL|isNUMERIC|sameTerm
                  |true
                  |false
+                 |<<|>>
+                 |\{\||\|\}
                  |&&|!=|!|<=|>=|\^\^|\|\||[\(\),.;\[\]\{\}\+\-=<>\?\^\|\*\/a]
               )xim.freeze
 

data/lib/sparql/results.rb

@@ -14,28 +14,38 @@ module SPARQL
     ##
     # Generate Solutions as JSON
     # @return [String]
-    # @see http://www.w3.org/TR/rdf-sparql-json-res/
+    # @see https://www.w3.org/TR/rdf-sparql-json-res/
     def to_json
       require 'json' unless defined?(::JSON)
-      
-      bindings = self.map do |solution|
-        variable_names.inject({}) do |memo, n|
-          memo.merge case s = solution[n]
-          when RDF::URI
-            {n => {type: "uri", value: s.to_s }}
-          when RDF::Node
-            {n => {type: "bnode", value: s.id }}
-          when RDF::Literal
-            if s.datatype?
-              {n => {type: "typed-literal", datatype: s.datatype.to_s, value: s.to_s }}
-            elsif s.language
-              {n => {type: "literal", "xml:lang" => s.language.to_s, value: s.to_s }}
-            else
-              {n => {type: "literal", value: s.to_s }}
-            end
+
+      format = ->(value) do
+        case value
+        when RDF::URI then {type: "uri", value: value.to_s }
+        when RDF::Node then {type: "bnode", value: value.id }
+        when RDF::Literal
+          if value.datatype?
+            {type: "typed-literal", datatype: value.datatype.to_s, value: value.to_s }
+          elsif value.language?
+            {type: "literal", "xml:lang" => value.language.to_s, value: value.to_s }
           else
-            {}
+            {type: "literal", value: value.to_s }
           end
+        when RDF::Statement
+          {
+            type: 'triple',
+            value: {
+              subject: format.call(value.subject),
+              predicate: format.call(value.predicate),
+              object: format.call(value.object)
+            }
+          }
+        end
+      end
+
+      bindings = self.map do |solution|
+        variable_names.inject({}) do |memo, n|
+          rep = format.call(solution[n])
+          rep ? memo.merge(n => rep) : memo
         end
       end
 
@@ -48,12 +58,36 @@ module SPARQL
     ##
     # Generate Solutions as XML
     # @return [String]
-    # @see http://www.w3.org/TR/rdf-sparql-XMLres/
+    # @see https://www.w3.org/TR/rdf-sparql-XMLres/
     def to_xml
       require 'builder' unless defined?(::Builder)
       
       xml = ::Builder::XmlMarkup.new(indent: 2)
       xml.instruct!
+
+      format = ->(s) do
+        case s
+        when RDF::URI
+          xml.uri(s.to_s)
+        when RDF::Node
+          xml.bnode(s.id)
+        when RDF::Literal
+          if s.datatype?
+            xml.literal(s.to_s, "datatype" => s.datatype.to_s)
+          elsif s.language
+            xml.literal(s.to_s, "xml:lang" => s.language.to_s)
+          else
+            xml.literal(s.to_s)
+          end
+        when RDF::Statement
+          xml.triple do
+            xml.subject {format.call(s.subject)}
+            xml.predicate {format.call(s.predicate)}
+            xml.object {format.call(s.object)}
+          end
+        end
+      end
+
       xml.sparql(xmlns: "http://www.w3.org/2005/sparql-results#") do
         xml.head do
           variable_names.each do |n|
@@ -67,20 +101,7 @@ module SPARQL
                 s = solution[n]
                 next unless s
                 xml.binding(name: n) do
-                  case s
-                  when RDF::URI
-                    xml.uri(s.to_s)
-                  when RDF::Node
-                    xml.bnode(s.id)
-                  when RDF::Literal
-                    if s.datatype?
-                      xml.literal(s.to_s, "datatype" => s.datatype.to_s)
-                    elsif s.language
-                      xml.literal(s.to_s, "xml:lang" => s.language.to_s)
-                    else
-                      xml.literal(s.to_s)
-                    end
-                  end
+                  format.call(s)
                 end
               end
             end
@@ -118,10 +139,9 @@ module SPARQL
     ##
     # Generate Solutions as CSV
     # @return [String]
-    # @see http://www.w3.org/TR/rdf-sparql-json-res/#results
-    def to_csv
+    # @see https://www.w3.org/TR/2013/REC-sparql11-results-csv-tsv-20130321/
+    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
@@ -134,8 +154,12 @@ 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
+              solution[n].to_s.strip
             end
           end
         end
@@ -144,11 +168,9 @@ module SPARQL
     ##
     # Generate Solutions as TSV
     # @return [String]
-    # @see http://www.w3.org/TR/rdf-sparql-json-res/#results
+    # @see https://www.w3.org/TR/2013/REC-sparql11-results-csv-tsv-20130321/
     def to_tsv
       require 'csv' unless defined?(::CSV)
-      bnode_map = {}
-      bnode_gen = "_:a"
       results = [
         variable_names.map {|v| "?#{v}"}.join("\t")
       ] + self.map do |solution|
@@ -156,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)
+            RDF::NTriples.serialize(term).strip.gsub(/[\t\n\r]/, "\t" => '\t', "\n" => '\n', "\r" => '\r')
           end
         end.join("\t")
       end
@@ -185,7 +212,7 @@ module SPARQL
   # @return [String]
   #   String with serialized results and `#content_type`
   # @raise [RDF::WriterError] when inappropriate formatting options are used
-  def serialize_results(solutions, options = {})
+  def serialize_results(solutions, **options)
     format = options[:format].to_sym if options[:format]
     content_type = options[:content_type].to_s.split(';').first
     content_types = Array(options[:content_types] || '*/*')
@@ -226,7 +253,7 @@ module SPARQL
     when RDF::Queryable
       begin
         require 'linkeddata'
-      rescue LoadError => e
+      rescue LoadError
         require 'rdf/ntriples'
       end
       fmt = RDF::Format.for(format ? format.to_sym : {content_type: content_type})
@@ -236,7 +263,7 @@ module SPARQL
       end
       format ||= fmt.to_sym
       content_type ||= fmt.content_type.first
-      results = solutions.dump(format, options)
+      results = solutions.dump(format, **options)
       raise RDF::WriterError, "Unknown format #{fmt.inspect} for #{solutions.class}" unless results
       results
     when RDF::Query::Solutions
@@ -280,7 +307,7 @@ module SPARQL
   # @param [Array<String>] available
   # @return [String]
   #
-  # @see http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.1
+  # @see https://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.1
   def first_content_type(acceptable, available)
     return acceptable.first if available.empty?
     available.flatten!
@@ -306,7 +333,7 @@ module SPARQL
   #   May also be an RDF::Writer content_type to serialize DESCRIBE or CONSTRUCT results
   # @return [String]
   #   String with serialized results and #content_type
-  def serialize_exception(exception, options = {})
+  def serialize_exception(exception, **options)
     format = options[:format]
     content_type = options[:content_type]
     content_type ||= SPARQL::Results::MIME_TYPES[format]