More changes to keyword arguments with **options.

ruby-rdf · Jan 4, 2023 · f86971f · f86971f
1 parent 6af0702
commit f86971f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/lib/sparql/algebra/operator/extend.rb b/lib/sparql/algebra/operator/extend.rb
@@ -93,8 +93,7 @@ def execute(queryable, **options, &block)
           operand(0).each do |(var, expr)|
             begin
               val = expr.evaluate(solution, queryable: queryable,
-                                            depth: options[:depth].to_i + 1,
-                                            **options)
+                                            **options.merge(depth: options[:depth].to_i + 1))
               debug(options) {"===> + #{var} => #{val.inspect}"}
               val = val.dup.bind(solution) if val.is_a?(RDF::Query::Pattern)
               solution.bindings[var.to_sym] = val

diff --git a/lib/sparql/algebra/operator/path.rb b/lib/sparql/algebra/operator/path.rb
@@ -50,8 +50,7 @@ def execute(queryable, **options, &block)
           subject: subject,
           object: object,
           graph_name: options.fetch(:graph_name, false),
-          depth: options[:depth].to_i + 1,
-          **options
+          **options.merge(depth: options[:depth].to_i + 1)
         ) do |solution|
           @solutions << solution
         end

diff --git a/spec/support/matchers/generate.rb b/spec/support/matchers/generate.rb
@@ -4,7 +4,7 @@
 RSpec::Matchers.define :generate do |expected, options|
   def parser(**options)
     Proc.new do |query|
-      parser = SPARQL::Grammar::Parser.new(query, logger: options[:logger], resolve_iris: true, **options)
+      parser = SPARQL::Grammar::Parser.new(query, resolve_iris: true, **options)
       options[:production] ? parser.parse(options[:production]) : parser.parse
     end
   end