sparql 3.2.1 → 3.2.3

data/lib/sparql/grammar/terminals11.rb

@@ -91,7 +91,7 @@ module SPARQL::Grammar
     ANON                 = /\[#{WS}*\]/m.freeze
 
     # String terminals, case insensitive
-    STR_EXPR = %r(ABS|ADD|ALL|ASC|ASK|AS|AVG|BASE|BINDINGS|BIND
+    STR_EXPR = %r(ABS|ADD|ADJUST|ALL|ASC|ASK|AS|AVG|BASE|BINDINGS|BIND
                  |BNODE|BOUND|BY|CEIL|CLEAR|COALESCE|CONCAT
                  |CONSTRUCT|CONTAINS|COPY|COUNT|CREATE|DATATYPE|DAY
                  |DEFAULT|DELETE#{WS}DATA|DELETE#{WS}WHERE|DELETE
@@ -117,7 +117,7 @@ module SPARQL::Grammar
               )xim.freeze
 
     # Map terminals to canonical form
-    STR_MAP = (%w{ABS ADD ALL ASC ASK AS AVG BASE BINDINGS BIND
+    STR_MAP = (%w{ABS ADD ADJUST ALL ASC ASK AS AVG BASE BINDINGS BIND
       BNODE BOUND BY CEIL CLEAR COALESCE CONCAT
       CONSTRUCT CONTAINS COPY COUNT CREATE DATATYPE DAY
       DEFAULT DELETE

data/lib/sparql/grammar.rb

@@ -184,7 +184,7 @@ module SPARQL
   #       (?age ?src)
   #       (bgp
   #        (triple ?bob foaf:name "Bob")
-  #        (triple (triple ?bob foaf:age ?age) dct:source ?src)) ))
+  #        (triple (qtriple ?bob foaf:age ?age) dct:source ?src)) ))
   #
   # SPARQL:
   #
@@ -212,11 +212,11 @@ module SPARQL
   #      (construct
   #       (
   #        (triple ?bob foaf:name "Bob")
-  #        (triple (triple ?bob foaf:age ?age) dct:creator <http://example.com/crawlers#c1>)
-  #        (triple (triple ?bob foaf:age ?age) dct:source ?src))
+  #        (triple (qtriple ?bob foaf:age ?age) dct:creator <http://example.com/crawlers#c1>)
+  #        (triple (qtriple ?bob foaf:age ?age) dct:source ?src))
   #       (bgp
   #        (triple ?bob foaf:name "Bob")
-  #        (triple (triple ?bob foaf:age ?age) dct:source ?src)) ))
+  #        (triple (qtriple ?bob foaf:age ?age) dct:source ?src)) ))
   
 
   # ## Implementation Notes
@@ -248,6 +248,7 @@ module SPARQL
     #   Query may be an array of lexed tokens, a lexer, or a
     #   string or open file.
     # @param  [Hash{Symbol => Object}] options
+    # @option options (see SPARQL::Grammar::Parser#initialize)
     # @return [Parser]
     # @raise  [Parser::Error] on invalid input
     def self.parse(query, **options, &block)
@@ -261,6 +262,7 @@ module SPARQL
     # @param  [Hash{Symbol => Object}] options
     #   any additional options (see `RDF::Reader#initialize` and `RDF::Format.for`)
     # @option options [Symbol] :format (:ntriples)
+    # @option options (see parse)
     # @yield  [reader]
     # @yieldparam  [RDF::Reader] reader
     # @yieldreturn [void] ignored

data/lib/sparql/results.rb

@@ -10,7 +10,7 @@ module SPARQL
       csv: 'text/csv',
       tsv: 'text/tab-separated-values'
     }
-    
+
     ##
     # Generate Solutions as JSON
     # @return [String]
@@ -234,12 +234,13 @@ module SPARQL
       case format
       when :json
         require 'json' unless defined?(::JSON)
-        {boolean: solutions}.to_json
+        {head: {}, boolean: solutions}.to_json
       when :xml
         require 'builder' unless defined?(::Builder)
         xml = ::Builder::XmlMarkup.new(indent: 2)
         xml.instruct!
         xml.sparql(xmlns: "http://www.w3.org/2005/sparql-results#") do
+          xml.head
           xml.boolean(solutions.to_s)
         end
       when :html

data/lib/sparql/server.rb

@@ -0,0 +1,93 @@
+require 'sinatra/sparql'
+
+module SPARQL
+  module Server
+    # A SPARQL Protocol and Graph Store server.
+    #
+    # Note, this is a trivial server and implementations may consider implementing integrating it into their own Rack or Sinatra server using {Rack::SPARQL} or {Sinatra::SPARQL}.
+    #
+    # Implements [SPARQL 1.1 Protocol](https://www.w3.org/TR/2013/REC-sparql11-protocol-20130321/)
+    # and [SPARQL 1.1 Graph Store HTTP Protocol](https://www.w3.org/TR/2013/REC-sparql11-http-rdf-update-20130321/).
+    #
+    # Protocol-specified dataset parameters create a merged repository as described in {Sinatra::SPARQL::Helpers#dataset} and {SPARQL::Algebra::Operator::Dataset}.
+    #
+    # @param [RDF::Dataset] dataset (RDF::Repository.new)
+    # @param [Hash{Symbol => Object}] options
+    # @return [Sinatra::Base]
+    def application(dataset: RDF::Repository.new, **options)
+      Sinatra.new do
+        register Sinatra::SPARQL
+        set :repository, dataset
+        enable :logging
+        disable :raise_errors, :show_exceptions if settings.production?
+
+        mime_type :jsonld, "application/ld+json"
+        mime_type :normalize, "application/normalized+n-quads"
+        mime_type :sparql, "application/sparql-query"
+        mime_type :ttl, "text/turtle"
+        mime_type :sse, "application/sse+sparql-query"
+
+        configure :development, :test do
+          set :logging, 0
+        end
+
+        get '/' do
+          opts = params.inject({}) {|memo, (k,v)| memo.merge(k.to_sym => v)}
+          if opts[:query]
+            query = opts[:query]
+            halt 403, "Update not possible using GET" if opts[:update]
+            repo = dataset(logger: request.logger, **opts)
+            url = RDF::URI(request.url).tap {|u| u.query = nil}
+            query = begin
+              SPARQL.parse(query, base_uri: url)
+            rescue SPARQL::Grammar::Parser::Error => e
+              halt 400, "Error parsing query: #{e.message}"
+            end
+            res = query.execute(repo, 
+                                logger: request.logger,
+                                **options.merge(opts))
+            res.is_a?(RDF::Literal::Boolean) ? [res] : res
+          elsif opts[:update]
+            halt 406, "Inappropriate update option using GET"
+          else
+            settings.sparql_options.replace(standard_prefixes: true)
+            settings.sparql_options.merge!(prefixes: {
+              ssd: "http://www.w3.org/ns/sparql-service-description#",
+              void: "http://rdfs.org/ns/void#"
+            })
+            repo = dataset(logger: request.logger, **options)
+            service_description(repo: repo, endpoint: url)
+          end
+        end
+
+        post '/' do
+          opts = params.inject({}) {|memo, (k,v)| memo.merge(k.to_sym => v)}
+          # Note, this depends on the Rack::SPARQL::ContentNegotiation middleware to rewrite application/x-www-form-urlencoded to be conformat with either application/sparql-query or application/sparql-update.
+          query = begin
+            update = case request.content_type
+            when %r(application/sparql-query) then false
+            when %r(application/sparql-update) then true
+            else
+              halt 406, "No query found for #{request.content_type}"
+            end
+
+            # XXX Rack always sets input to ASCII-8BIT
+            #unless request.body.external_encoding == Encoding::UTF_8
+            #  halt 400, "improper body encoding: #{request.body.external_encoding}"
+            #end
+            SPARQL.parse(request.body, base_uri: url, update: update)
+          rescue SPARQL::Grammar::Parser::Error => e
+            halt 400, "Error parsing #{update ? 'update' : 'query'}: #{e.message}"
+          end
+          repo = dataset(logger: request.logger, **opts)
+          url = RDF::URI(request.url).tap {|u| u.query = nil}
+          res = query.execute(repo,
+                              logger: request.logger,
+                              **options.merge(opts))
+          res.is_a?(RDF::Literal::Boolean) ? [res] : res
+        end
+      end
+    end
+    module_function :application
+  end
+end

data/lib/sparql.rb

@@ -10,6 +10,7 @@ module SPARQL
   autoload :Algebra, 'sparql/algebra'
   autoload :Grammar, 'sparql/grammar'
   autoload :Results, 'sparql/results'
+  autoload :Server,  'sparql/server'
   autoload :VERSION, 'sparql/version'
 
   # @see https://rubygems-client
@@ -25,13 +26,14 @@ module SPARQL
   # @param  [Hash{Symbol => Object}] options
   # @option options [Boolean] :update (false)
   #   Parse starting with UpdateUnit production, QueryUnit otherwise.
-  # @return [SPARQL::Query]
+  # @option options (see SPARQL::Grammar::Parser#initialize)
+  # @return [RDF::Queryable]
   #   The resulting query may be executed against
   #   a `queryable` object such as an RDF::Graph
   #   or RDF::Repository. 
-  # @raise  [Parser::Error] on invalid input
+  # @raise  [SPARQL::Grammar::Parser::Error] on invalid input
   def self.parse(query, **options)
-    query = Grammar::Parser.new(query, **options).parse(options[:update] ? :UpdateUnit : :QueryUnit)
+    Grammar::Parser.new(query, **options).parse(options[:update] ? :UpdateUnit : :QueryUnit)
   end
 
   ##
@@ -63,11 +65,12 @@ module SPARQL
   #   One or more URIs used to initialize a new instance of `queryable` in the default graph. One or more URIs used to initialize a new instance of `queryable` in the default graph.
   # @option options [RDF::URI, String, Array<RDF::URI, String>] :named_graph_uri
   #   One or more URIs used to initialize the `queryable` as a named graph.
+  # @option options (see parse)
   # @yield  [solution]
   #   each matching solution, statement or boolean
   # @yieldparam  [RDF::Statement, RDF::Query::Solution, Boolean] solution
   # @yieldreturn [void] ignored
-  # @return [RDF::Graph, Boolean, RDF::Query::Solutions::Enumerator]
+  # @return [RDF::Graph, Boolean, RDF::Query::Solutions]
   #   Note, results may be used with {SPARQL.serialize_results} to obtain appropriate output encoding.
   # @raise  [SPARQL::MalformedQuery] on invalid input
   def self.execute(query, queryable, **options, &block)
@@ -88,7 +91,7 @@ module SPARQL
         queryable.load(uri, graph_name: uri)
       end
     end
-    query.execute(queryable, &block)
+    query.execute(queryable, **options, &block)
   rescue SPARQL::Grammar::Parser::Error => e
     raise MalformedQuery, e.message
   rescue TypeError => e

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sparql
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.2.3
 platform: ruby
 authors:
 - Gregg Kellogg
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-19 00:00:00.000000000 Z
+date: 2022-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -20,7 +20,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.3
+        version: 3.2.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -30,7 +30,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.3
+        version: 3.2.7
 - !ruby/object:Gem::Dependency
   name: rdf-aggregate-repo
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +52,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -59,6 +62,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.3.1
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
@@ -79,14 +85,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: sxp
   requirement: !ruby/object:Gem::Requirement
@@ -96,7 +102,7 @@ dependencies:
         version: '1.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +112,7 @@ dependencies:
         version: '1.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.2.2
 - !ruby/object:Gem::Dependency
   name: sparql-client
   requirement: !ruby/object:Gem::Requirement
@@ -114,6 +120,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -121,6 +130,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.1
 - !ruby/object:Gem::Dependency
   name: rdf-xsd
   requirement: !ruby/object:Gem::Requirement
@@ -141,14 +153,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -197,42 +209,42 @@ 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: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '3.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '3.11'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -274,6 +286,7 @@ files:
 - lib/sparql/algebra/operator.rb
 - lib/sparql/algebra/operator/abs.rb
 - lib/sparql/algebra/operator/add.rb
+- lib/sparql/algebra/operator/adjust.rb
 - lib/sparql/algebra/operator/alt.rb
 - lib/sparql/algebra/operator/and.rb
 - lib/sparql/algebra/operator/asc.rb
@@ -358,7 +371,9 @@ files:
 - lib/sparql/algebra/operator/path.rb
 - lib/sparql/algebra/operator/path_opt.rb
 - lib/sparql/algebra/operator/path_plus.rb
+- lib/sparql/algebra/operator/path_range.rb
 - lib/sparql/algebra/operator/path_star.rb
+- lib/sparql/algebra/operator/path_zero.rb
 - lib/sparql/algebra/operator/plus.rb
 - lib/sparql/algebra/operator/predicate.rb
 - lib/sparql/algebra/operator/prefix.rb
@@ -394,6 +409,7 @@ 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
@@ -412,11 +428,17 @@ files:
 - lib/sparql/grammar/parser11.rb
 - lib/sparql/grammar/terminals11.rb
 - lib/sparql/results.rb
+- lib/sparql/server.rb
 - lib/sparql/version.rb
 homepage: https://github.com/ruby-rdf/sparql
 licenses:
 - Unlicense
-metadata: {}
+metadata:
+  documentation_uri: https://ruby-rdf.github.io/sparql
+  bug_tracker_uri: https://github.com/ruby-rdf/sparql/issues
+  homepage_uri: https://github.com/ruby-rdf/sparql
+  mailing_list_uri: https://lists.w3.org/Archives/Public/public-rdf-ruby/
+  source_code_uri: https://github.com/ruby-rdf/sparql
 post_install_message:
 rdoc_options: []
 require_paths: