sparql 3.1.0 → 3.1.2

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
@@ -701,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
@@ -1104,11 +1104,21 @@ 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)}
     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|
@@ -1119,6 +1129,17 @@ module SPARQL::Grammar
                       data[:NIL])
     end
 
+    # [1xx] EmbTP ::= '<<' VarOrBlankNodeOrIriOrEmbTP Verb VarOrTermOrEmbTP '>>'
+    production(:EmbTP) do |input, data, callback|
+      subject = data[:VarOrBlankNodeOrIriOrEmbTP]
+      predicate = data[:Verb]
+      object = data[:VarOrTerm]
+      add_pattern(:EmbTP,
+                  subject: subject,
+                  predicate: predicate,
+                  object: object)
+    end
+
     # [110]  	Expression	  ::=  	ConditionalOrExpression
     production(:Expression) do |input, data, callback|
       add_prod_datum(:Expression, data[:Expression])
@@ -1527,8 +1548,8 @@ 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,

data/lib/sparql/grammar/terminals11.rb

@@ -110,6 +110,7 @@ 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: {
+              s: format.call(value.subject),
+              p: format.call(value.predicate),
+              o: 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.s {format.call(s.subject)}
+            xml.p {format.call(s.predicate)}
+            xml.o {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,7 +139,7 @@ module SPARQL
     ##
     # Generate Solutions as CSV
     # @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_csv
       require 'csv' unless defined?(::CSV)
       bnode_map = {}
@@ -135,7 +156,7 @@ module SPARQL
                 this
               end
             else
-              solution[n].to_s
+              solution[n].to_s.strip
             end
           end
         end
@@ -144,11 +165,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|
@@ -159,7 +178,7 @@ module SPARQL
           when nil
             ""
           else
-            RDF::NTriples.serialize(term)
+            RDF::NTriples.serialize(term).strip
           end
         end.join("\t")
       end
@@ -226,7 +245,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})
@@ -280,7 +299,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!

data/lib/sparql/version.rb

@@ -1,6 +1,6 @@
 module SPARQL
   module VERSION
-    VERSION_FILE = File.join(File.expand_path(File.dirname(__FILE__)), "..", "..", "VERSION")
+    VERSION_FILE = File.expand_path("../../../VERSION", __FILE__)
     MAJOR, MINOR, TINY, EXTRA = File.read(VERSION_FILE).chomp.split(".")
 
     STRING = [MAJOR, MINOR, TINY, EXTRA].compact.join('.')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sparql
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.2
 platform: ruby
 authors:
 - Gregg Kellogg
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-13 00:00:00.000000000 Z
+date: 2020-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -18,6 +18,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -25,6 +28,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.2
 - !ruby/object:Gem::Dependency
   name: rdf-aggregate-repo
   requirement: !ruby/object:Gem::Requirement
@@ -43,16 +49,16 @@ dependencies:
   name: ebnf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
@@ -404,7 +410,7 @@ files:
 - lib/sparql/grammar/terminals11.rb
 - lib/sparql/results.rb
 - lib/sparql/version.rb
-homepage: http://github.com/ruby-rdf/sparql
+homepage: https://github.com/ruby-rdf/sparql
 licenses:
 - Unlicense
 metadata: {}
@@ -423,7 +429,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.3
 signing_key: 
 specification_version: 4
 summary: SPARQL Query and Update library for Ruby.