Update some calling sequences.

Author: gkellogg

lib/rdf/turtle/writer.rb

@@ -349,7 +349,7 @@ def order_subjects
 
       # Add distinguished classes
       top_classes.each do |class_uri|
-        graph.query(predicate:  RDF.type, object:  class_uri).
+        graph.query({predicate:  RDF.type, object:  class_uri}).
           map {|st| st.subject}.
           sort.
           uniq.
@@ -595,7 +595,7 @@ def objectList(objects)
     # @return [Integer] the number of properties serialized
     def predicateObjectList(subject, from_bpl = false)
       properties = {}
-      @graph.query(subject:  subject) do |st|
+      @graph.query({subject:  subject}) do |st|
         (properties[st.predicate.to_s] ||= []) << st.object
       end
 

script/parse

@@ -19,7 +19,7 @@ require 'rdf/ntriples'
 require 'ebnf/ll1/parser'
 require 'getoptlong'
 
-def run(input, options)
+def run(input, **options)
   if options[:profile]
     require 'profiler'
   end
@@ -31,7 +31,7 @@ def run(input, options)
   num = 0
   Profiler__::start_profile if options[:profile]
   if options[:output_format] == :ntriples || options[:quiet] || options[:benchmark]
-    r = reader_class.new(input, options[:parser_options])
+    r = reader_class.new(input, **options[:parser_options])
     r.each do |statement|
       num += 1
       if options[:errors] && statement.invalid?
@@ -45,15 +45,15 @@ def run(input, options)
       end
     end
   elsif options[:output_format] == :inspect
-    reader_class.new(input, options[:parser_options]).each do |statement|
+    reader_class.new(input, **options[:parser_options]).each do |statement|
       num += 1
       options[:output].puts statement.inspect
     end
   else
-    r = reader_class.new(input, options[:parser_options])
+    r = reader_class.new(input, **options[:parser_options])
     g = RDF::Graph.new << r
     num = g.count
-    options[:output].puts g.dump(options[:output_format], {prefixes:  r.prefixes}.merge(options[:writer_options]))
+    options[:output].puts g.dump(options[:output_format], prefixes:  r.prefixes, **options[:writer_options])
   end
   if options[:profile]
     Profiler__::stop_profile
@@ -137,10 +137,10 @@ end
 
 if ARGV.empty?
   s = input ? input : $stdin.read
-  run(StringIO.new(s), options)
+  run(StringIO.new(s), **options)
 else
   ARGV.each do |test_file|
-    run(Kernel.open(test_file), options)
+    run(Kernel.open(test_file), **options)
   end
 end
 puts

script/tc

@@ -12,7 +12,7 @@ require 'getoptlong'
 ASSERTOR = "https://greggkellogg.net/foaf#me"
 RUN_TIME = Time.now
 
-def earl_preamble(options)
+def earl_preamble(**options)
   options[:output].write File.read(File.expand_path("../../etc/doap#{'-ntriples' if options[:ntriples]}.ttl", __FILE__))
   options[:output].puts %(
 <> foaf:primaryTopic <https://rubygems.org/gems/rdf#{'-turtle' unless options[:ntriples]}> ;
@@ -43,7 +43,7 @@ def earl_preamble(options)
 )
 end
 
-def run_tc(tc, options)
+def run_tc(tc, **options)
   STDERR.write "run #{tc.name}"
 
   if options[:verbose]
@@ -64,7 +64,7 @@ def run_tc(tc, options)
       logger: logger
     }.merge(options)
 
-    reader = RDF::Reader.for(tc.action).new(tc.input, options)
+    reader = RDF::Reader.for(tc.action).new(tc.input, **options)
 
     graph = RDF::Repository.new
     result = nil
@@ -139,7 +139,7 @@ opts = GetoptLong.new(
   ["--verbose", "-v", GetoptLong::NO_ARGUMENT]
 )
 
-def help(options)
+def help(**options)
   puts "Usage: #{$0} [options] [test-number ...]"
   puts "Options:"
   puts "      --debug:              Display detailed debug output"
@@ -157,7 +157,7 @@ end
 
 opts.each do |opt, arg|
   case opt
-  when '--help'             then help(options)
+  when '--help'             then help(**options)
   when '--dbg'              then options[:level] = Logger::DEBUG
   when '--earl'
     options[:quiet] = options[:earl] = true
@@ -175,14 +175,14 @@ end
 
 manifest = (options[:ntriples] ? Fixtures::SuiteTest::NTBASE : Fixtures::SuiteTest::BASE) + "manifest.ttl"
 
-earl_preamble(options) if options[:earl]
+earl_preamble(**options) if options[:earl]
 
 result_count = {}
 
 Fixtures::SuiteTest::Manifest.open(manifest) do |m|
   m.entries.each do |tc|
     next unless ARGV.empty? || ARGV.any? {|n| tc.name.match(/#{n}/)}
-    run_tc(tc, options.merge(result_count: result_count))
+    run_tc(tc, result_count: result_count, **options)
   end
 end