sparql 3.1.4 → 3.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ddc77cee587255c81cfcb3cd9d05759a3c98398821e23a25c3111f71e9b44c9
-  data.tar.gz: 48290eb8ba7ab1539c73c2fc3477b4004b8a15c5f09624ef24de5e3fe692ab03
+  metadata.gz: 27f805f342a0db67d53df5b59f045adbf206e846cf4100b3918e9fb7933413d0
+  data.tar.gz: 3afbfd95de7fb479e8d06c20a758d636ff23e699db48ed25e5906497bc2e254b
 SHA512:
-  metadata.gz: 71b0e62c9d8d418e508befea92ca5723a24a0ccce9fcebf43f40ce7ee4a8299c81fdad5ae4302465defd04708abd04ef10c863ef1538f25c71c5a24ea45e826a
-  data.tar.gz: 6c1b568ed72dcdda4f68f613bcbf3de38512b8cde4b1c6b2a20d51370fb5bd4efce7dee766e3cfde64222853c52937890d5fcbeb48d4448a2694f0dce0729d0c
+  metadata.gz: 12ce7f125ff98950f7fdd9e63e42645fc9bd23e79146971526e78413f254d979a1e202ac90cca1f83b8721ca43f7c6e8e88bf6029a5138bc8337ad2c2a85de72
+  data.tar.gz: 1b8bb78258345466d763a3fdfbc19b40cc759a6c2a7b8189cccd6e7cecbbbcbb2cdb1fc04869063bcdbc33ecd532292b3d4e25bc426256c63f1e804044aa8cbb

data/README.md

@@ -4,7 +4,7 @@ This is a [Ruby][] implementation of [SPARQL][] for [RDF.rb][].
 
 [![Gem Version](https://badge.fury.io/rb/sparql.png)](https://badge.fury.io/rb/sparql)
 [![Build Status](https://github.com/ruby-rdf/sparql/workflows/CI/badge.svg?branch=develop)](https://github.com/ruby-rdf/sparql/actions?query=workflow%3ACI)
-[![Coverage Status](https://coveralls.io/repos/ruby-rdf/sparql/badge.svg)](https://coveralls.io/r/ruby-rdf/sparql)
+[![Coverage Status](https://coveralls.io/repos/ruby-rdf/sparql/badge.svg?branch=develop)](https://coveralls.io/r/ruby-rdf/sparql?branch=develop)
 [![Gitter chat](https://badges.gitter.im/ruby-rdf/rdf.png)](https://gitter.im/ruby-rdf/rdf)
 
 ## Features

data/VERSION

@@ -1 +1 @@
-3.1.4
+3.1.5

data/lib/sparql/algebra/expression.rb

@@ -53,7 +53,7 @@ module SPARQL; module Algebra
     def self.open(filename, **options, &block)
       RDF::Util::File.open_file(filename, **options) do |file|
         options[:base_uri] ||= filename
-        Expression.parse(file, options, &block)
+        Expression.parse(file, **options, &block)
       end
     end
 
@@ -114,8 +114,11 @@ module SPARQL; module Algebra
 
       debug(options) {"#{operator.inspect}(#{operands.map(&:inspect).join(',')})"}
       options.delete_if {|k, v| [:debug, :logger, :depth, :prefixes, :base_uri, :update, :validate].include?(k) }
-      operands << options unless options.empty?
-      operator.new(*operands)
+      begin
+        operator.new(*operands, **options)
+      rescue ArgumentError => e
+        error(options) {"Operator=#{operator.inspect}: #{e}"}
+      end
     end
 
     ##
@@ -332,7 +335,7 @@ module SPARQL; module Algebra
     # @param [Hash{Symbol => Object}] options ({})
     #   options passed from query
     # @return [Expression] `self`
-    def evaluate(bindings, options = {})
+    def evaluate(bindings, **options)
       self
     end
 

data/lib/sparql/algebra/extensions.rb

@@ -320,7 +320,7 @@ module RDF::Queryable
   # @yieldreturn [void] ignored
   # @return [Enumerator]
   # @see    RDF::Queryable#query_pattern
-  def query(pattern, options = {}, &block)
+  def query(pattern, **options, &block)
     raise TypeError, "#{self} is not queryable" if respond_to?(:queryable?) && !queryable?
 
     if pattern.is_a?(SPARQL::Algebra::Operator) && pattern.respond_to?(:execute)

data/lib/sparql/algebra/operator.rb

@@ -336,8 +336,8 @@ module SPARQL; module Algebra
     #   @option options [Boolean] :memoize (false)
     #     whether to memoize results for particular operands
     # @raise  [TypeError] if any operand is invalid
-    def initialize(*operands)
-      @options  = operands.last.is_a?(Hash) ? operands.pop.dup : {}
+    def initialize(*operands, **options)
+      @options  = options.dup
       @operands = operands.map! do |operand|
         case operand
           when Array
@@ -358,7 +358,7 @@ module SPARQL; module Algebra
     ##
     # Deep duplicate operands
     def deep_dup
-      self.class.new(*operands.map(&:deep_dup), @options)
+      self.class.new(*operands.map(&:deep_dup), **@options)
     end
 
     ##
@@ -745,7 +745,7 @@ module SPARQL; module Algebra
       ##
       # @param  [Hash{Symbol => Object}] options
       #   any additional options (see {Operator#initialize})
-      def initialize(options = {})
+      def initialize(**options)
         super
       end
     end # Nullary
@@ -764,7 +764,7 @@ module SPARQL; module Algebra
       #   the operand
       # @param  [Hash{Symbol => Object}] options
       #   any additional options (see {Operator#initialize})
-      def initialize(arg, options = {})
+      def initialize(arg, **options)
         super
       end
     end # Unary
@@ -785,7 +785,7 @@ module SPARQL; module Algebra
       #   the second operand
       # @param  [Hash{Symbol => Object}] options
       #   any additional options (see {Operator#initialize})
-      def initialize(arg1, arg2, options = {})
+      def initialize(arg1, arg2, **options)
         super
       end
     end # Binary
@@ -808,7 +808,7 @@ module SPARQL; module Algebra
       #   the third operand
       # @param  [Hash{Symbol => Object}] options
       #   any additional options (see {Operator#initialize})
-      def initialize(arg1, arg2, arg3, options = {})
+      def initialize(arg1, arg2, arg3, **options)
         super
       end
     end # Ternary
@@ -833,7 +833,7 @@ module SPARQL; module Algebra
       #   the forth operand
       # @param  [Hash{Symbol => Object}] options
       #   any additional options (see {Operator#initialize})
-      def initialize(arg1, arg2, arg3, arg4, options = {})
+      def initialize(arg1, arg2, arg3, arg4, **options)
         super
       end
     end # Ternary

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

@@ -16,6 +16,13 @@ module SPARQL; module Algebra
 
       NAME = :avg
 
+      def initialize(*operands, **options)
+        raise ArgumentError,
+          "avg operator accepts at most one argument with an optional :distinct" if
+          (operands - %i{distinct}).length != 1
+        super
+      end
+
       ##
       # The Avg set function calculates the average value for an expression over a group. It is defined in terms of Sum and Count.
       #

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

@@ -22,7 +22,7 @@ module SPARQL; module Algebra
       # @yieldparam  [RDF::Query::Solution] solution
       # @yieldreturn [void] ignored
       # @return [RDF::Query]
-      def self.new(*patterns, &block)
+      def self.new(*patterns, **options, &block)
         RDF::Query.new(*patterns, graph_name: false, &block)
       end
     end # BGP

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

@@ -36,7 +36,7 @@ module SPARQL; module Algebra
       #   @param [Array<RDF::Query::Pattern>] patterns
       #     Quads
       # @return [RDF::Query]
-      def self.new(name, patterns, options = {}, &block)
+      def self.new(name, patterns, **options, &block)
         case patterns
         when RDF::Query
           # Record that the argument as a (bgp) for re-serialization back to SSE

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

@@ -37,6 +37,10 @@ module SPARQL; module Algebra
       def execute(queryable, **options, &block)
         filter = operand(2)
 
+        raise ArgumentError,
+          "leftjoin operator accepts at most two arguments with an optional filter" if
+          operands.length < 2 || operands.length > 3
+
         debug(options) {"LeftJoin"}
         left = queryable.query(operand(0), depth: options[:depth].to_i + 1, **options)
         debug(options) {"=>(leftjoin left) #{left.inspect}"}

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

@@ -16,6 +16,13 @@ module SPARQL; module Algebra
 
       NAME = :max
 
+      def initialize(*operands, **options)
+        raise ArgumentError,
+          "max operator accepts at most one argument with an optional :distinct" if
+          (operands - %i{distinct}).length != 1
+        super
+      end
+
       ##
       # Max is a SPARQL set function that return the maximum value from a group respectively.
       #

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

@@ -16,6 +16,13 @@ module SPARQL; module Algebra
 
       NAME = :min
 
+      def initialize(*operands, **options)
+        raise ArgumentError,
+          "min operator accepts at most one argument with an optional :distinct" if
+          (operands - %i{distinct}).length != 1
+        super
+      end
+
       ##
       # Min is a SPARQL set function that return the minimum value from a group respectively.
       #

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

@@ -12,11 +12,18 @@ module SPARQL; module Algebra
     #             (bgp (triple ?s :dec ?o)))))))
     #
     # @see https://www.w3.org/TR/sparql11-query/#defn_aggSample
-    class Sample < Operator::Unary
+    class Sample < Operator
       include Aggregate
 
       NAME = :sample
 
+      def initialize(*operands, **options)
+        raise ArgumentError,
+          "sample operator accepts at most one argument with an optional :distinct" if
+          (operands - %i{distinct}).length != 1
+        super
+      end
+
       ##
       # Sample is a set function which returns an arbitrary value from the multiset passed to it.
       #

data/lib/sparql/extensions.rb

@@ -25,11 +25,7 @@ module RDF::Queryable
   #
   # Used to implement the SPARQL `DESCRIBE` operator.
   #
-  # @overload concise_bounded_description(*terms, &block)
-  #   @param [Array<RDF::Term>] terms
-  #     List of terms to include in the results.
-  #
-  # @overload concise_bounded_description(*terms, options, &block)
+  # @overload concise_bounded_description(*terms, **options, &block)
   #   @param [Array<RDF::Term>] terms
   #     List of terms to include in the results.
   #   @param [Hash{Symbol => Object}] options
@@ -44,16 +40,14 @@ module RDF::Queryable
   # @return [RDF::Graph]
   #
   # @see https://www.w3.org/Submission/CBD/
-  def concise_bounded_description(*terms, &block)
-    options = terms.last.is_a?(Hash) ? terms.pop.dup : {}
-
+  def concise_bounded_description(*terms, **options, &block)
     graph = options[:graph] || RDF::Graph.new
 
     if options[:non_subjects]
       query_terms = terms.dup
 
       # Find terms not in self as a subject and recurse with their subjects
-      terms.reject {|term| self.first(subject: term)}.each do |term|
+      terms.reject {|term| self.first({subject: term})}.each do |term|
         self.query({predicate: term}) do |statement|
           query_terms << statement.subject
         end
@@ -67,7 +61,7 @@ module RDF::Queryable
     end
 
     # Don't consider term if already in graph
-    terms.reject {|term| graph.first(subject: term)}.each do |term|
+    terms.reject {|term| graph.first({subject: term})}.each do |term|
       # Find statements from queryiable with term as a subject
       self.query({subject: term}) do |statement|
         yield(statement) if block_given?
@@ -84,13 +78,13 @@ module RDF::Queryable
         }, **{}).execute(self).each do |solution|
           # Recurse to include this subject
           recurse_opts = options.merge(non_subjects: false, graph: graph)
-          self.concise_bounded_description(solution[:s], recurse_opts, &block)
+          self.concise_bounded_description(solution[:s], **recurse_opts, &block)
         end
 
         # Recurse if object is a BNode and it is not already in subjects
         if statement.object.node?
           recurse_opts = options.merge(non_subjects: false, graph: graph)
-          self.concise_bounded_description(statement.object, recurse_opts, &block)
+          self.concise_bounded_description(statement.object, **recurse_opts, &block)
         end
       end
     end

data/lib/sparql/grammar.rb

@@ -292,7 +292,7 @@ module SPARQL
     # @raise  [RDF::FormatError] if no reader found for the specified format
     def self.open(filename, **options, &block)
       RDF::Util::File.open_file(filename, **options) do |file|
-        self.parse(file, options, &block)
+        self.parse(file, **options, &block)
       end
     end
 
@@ -326,7 +326,7 @@ module SPARQL
     # @return [Lexer]
     # @raise  [Lexer::Error] on invalid input
     def self.tokenize(query, **options, &block)
-      Lexer.tokenize(query, options, &block)
+      Lexer.tokenize(query, **options, &block)
     end
   end # Grammar
 end # SPARQL

data/lib/sparql/grammar/parser11.rb

@@ -878,10 +878,10 @@ module SPARQL::Grammar
     # [80]  	Object	  ::=  	GraphNode | EmbTP
     production(:Object) do |input, data, callback|
       object = data[:GraphNode] || data[:EmbTP]
+      add_prod_datum(:pattern, data[:pattern])
       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])
         elsif prod_data[:VerbPath]
           add_prod_datum(:path,
             SPARQL::Algebra::Expression(:path,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sparql
 version: !ruby/object:Gem::Version
-  version: 3.1.4
+  version: 3.1.5
 platform: ruby
 authors:
 - Gregg Kellogg
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-25 00:00:00.000000000 Z
+date: 2021-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -94,6 +94,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
@@ -101,6 +104,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.2
 - !ruby/object:Gem::Dependency
   name: rdf-xsd
   requirement: !ruby/object:Gem::Requirement
@@ -227,10 +233,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
-description: |2-
-
-      Implements SPARQL grammar parsing to SPARQL Algebra, SPARQL Algebra processing
-      and includes SPARQL Client for accessing remote repositories.
+description: SPARQL Implements SPARQL 1.1 Query, Update and result formats for the
+  Ruby RDF.rb library suite.
 email: public-rdf-ruby@w3.org
 executables:
 - sparql
@@ -409,7 +413,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.0.8
 signing_key:
 specification_version: 4
 summary: SPARQL Query and Update library for Ruby.