Many fixes for hash arguments at last position being handled differently in Ruby 2.7.

Prep for 3.1 release.

Author: gkellogg

Gemfile

@@ -12,6 +12,7 @@ group :development do
   gem 'rack-linkeddata',    git: "https://github.com/ruby-rdf/rack-linkeddata",     branch: "develop"
   gem 'rdf-spec',           git: "https://github.com/ruby-rdf/rdf-spec",            branch: "develop"
   gem 'rdf-isomorphic',     git: "https://github.com/ruby-rdf/rdf-isomorphic",      branch: "develop"
+  gem 'rdf-turtle',           git: "https://github.com/ruby-rdf/rdf-turtle",            branch: "develop"
   gem 'rdf-trig',           git: "https://github.com/ruby-rdf/rdf-trig",            branch: "develop"
   gem 'rdf-vocab',          git: "https://github.com/ruby-rdf/rdf-vocab",           branch: "develop"
   gem 'rdf-xsd',            git: "https://github.com/ruby-rdf/rdf-xsd",             branch: "develop"

README.md

@@ -502,9 +502,9 @@ Note, the API method signatures differed in versions before 1.0, in that they al
   * {JSON::LD::Writer}
 
 ## Dependencies
-* [Ruby](https://ruby-lang.org/) (>= 2.2.2)
-* [RDF.rb](https://rubygems.org/gems/rdf) (~> 3.0)
-* [JSON](https://rubygems.org/gems/json) (>= 2.1)
+* [Ruby](https://ruby-lang.org/) (>= 2.4)
+* [RDF.rb](https://rubygems.org/gems/rdf) (~> 3.1)
+* [JSON](https://rubygems.org/gems/json) (>= 2.2)
 
 ## Installation
 The recommended installation method is via [RubyGems](https://rubygems.org/).

VERSION

@@ -1 +1 @@
-3.0.2
+3.1.0

json-ld.gemspec

@@ -24,9 +24,9 @@ Gem::Specification.new do |gem|
   gem.require_paths         = %w(lib)
   gem.test_files            = Dir.glob('spec/**/*.rb') + Dir.glob('spec/test-files/*')
 
-  gem.required_ruby_version = '>= 2.2.2'
+  gem.required_ruby_version = '>= 2.4'
   gem.requirements          = []
-  gem.add_runtime_dependency     'rdf',             '~> 3.0', '>= 3.0.13'
+  gem.add_runtime_dependency     'rdf',             '~> 3.1'
   gem.add_runtime_dependency     'multi_json',      '~> 1.14'
   gem.add_runtime_dependency     'i18n',            '<= 1.5.1' if ruby_version < "2.3"
   gem.add_runtime_dependency     'link_header',     '~> 0.0', '>= 0.0.8'
@@ -39,9 +39,9 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'yajl-ruby',       '~> 1.4'  unless is_java
   gem.add_development_dependency 'rack-test',       '~> 1.1'
   gem.add_development_dependency 'rdf-isomorphic',  '~> 3.0'
-  gem.add_development_dependency 'rdf-spec',        '~> 3.0'
-  gem.add_development_dependency 'rdf-trig',        '~> 3.0'
-  gem.add_development_dependency 'rdf-turtle',      '~> 3.0'
+  gem.add_development_dependency 'rdf-spec',        '~> 3.1'
+  gem.add_development_dependency 'rdf-trig',        '~> 3.1'
+  gem.add_development_dependency 'rdf-turtle',      '~> 3.1'
   gem.add_development_dependency 'rdf-vocab',       '~> 3.0'
   gem.add_development_dependency 'rdf-xsd',         '~> 3.0'
   gem.add_development_dependency 'rspec',           '~> 3.9'

lib/json/ld/api.rb

@@ -121,7 +121,7 @@ def initialize(input, context, rename_bnodes: true, unique_bnodes: false, **opti
 
         case remote_doc.document
         when String
-          MultiJson.load(remote_doc.document, options)
+          MultiJson.load(remote_doc.document, **options)
         else
           # Already parsed
           remote_doc.document
@@ -130,7 +130,7 @@ def initialize(input, context, rename_bnodes: true, unique_bnodes: false, **opti
 
       # If not provided, first use context from document, or from a Link header
       context ||= context_ref || {}
-      @context = Context.parse(context || {}, @options)
+      @context = Context.parse(context || {}, **@options)
 
       if block_given?
         case block.arity
@@ -164,7 +164,7 @@ def initialize(input, context, rename_bnodes: true, unique_bnodes: false, **opti
     # @see https://www.w3.org/TR/json-ld11-api/#expansion-algorithm
     def self.expand(input, framing: false, **options, &block)
       result, doc_base = nil
-      API.new(input, options[:expandContext], options) do
+      API.new(input, options[:expandContext], **options) do
         result = self.expand(self.value, nil, self.context,
           ordered: @options[:ordered],
           framing: framing)
@@ -217,7 +217,7 @@ def self.compact(input, context, expanded: false, **options)
 
       # 1) Perform the Expansion Algorithm on the JSON-LD input.
       #    This removes any existing context to allow the given context to be cleanly applied.
-      expanded_input = expanded ? input : API.expand(input, options.merge(ordered: false)) do |res, base_iri|
+      expanded_input = expanded ? input : API.expand(input, ordered: false, **options) do |res, base_iri|
         options[:base] ||= base_iri if options[:compactToRelative]
         res
       end
@@ -264,7 +264,7 @@ def self.flatten(input, context, expanded: false, **options)
       }.merge(options)
 
       # Expand input to simplify processing
-      expanded_input = expanded ? input : API.expand(input, options) do |result, base_iri|
+      expanded_input = expanded ? input : API.expand(input, **options) do |result, base_iri|
         options[:base] ||= base_iri if options[:compactToRelative]
         result
       end
@@ -368,13 +368,13 @@ def self.frame(input, frame, expanded: false, **options)
       end
 
       # Expand input to simplify processing
-      expanded_input = expanded ? input : API.expand(input, options.merge(ordered: false)) do |res, base_iri|
+      expanded_input = expanded ? input : API.expand(input, ordered: false, **options) do |res, base_iri|
         options[:base] ||= base_iri if options[:compactToRelative]
         res
       end
 
       # Expand frame to simplify processing
-      expanded_frame = API.expand(frame, options.merge(framing: true, ordered: false))
+      expanded_frame = API.expand(frame, framing: true, ordered: false, **options)
 
       # Initialize input using frame as context
       API.new(expanded_input, frame['@context'], no_default_base: true, **options) do
@@ -463,7 +463,7 @@ def self.toRdf(input, expanded: false, **options, &block)
       unless block_given?
         results = []
         results.extend(RDF::Enumerable)
-        self.toRdf(input, options) do |stmt|
+        self.toRdf(input, **options) do |stmt|
           results << stmt
         end
         return results
@@ -474,9 +474,9 @@ def self.toRdf(input, expanded: false, **options, &block)
       }.merge(options)
 
       # Expand input to simplify processing
-      expanded_input = expanded ? input : API.expand(input, options.merge(ordered: false))
+      expanded_input = expanded ? input : API.expand(input, ordered: false, **options)
 
-      API.new(expanded_input, nil, options) do
+      API.new(expanded_input, nil, **options) do
         # 1) Perform the Expansion Algorithm on the JSON-LD input.
         #    This removes any existing context to allow the given context to be cleanly applied.
         log_debug(".toRdf") {"expanded input: #{expanded_input.to_json(JSON_STATE) rescue 'malformed json'}"}
@@ -518,7 +518,7 @@ def self.toRdf(input, expanded: false, **options, &block)
     def self.fromRdf(input, useRdfType: false, useNativeTypes: false, **options, &block)
       result = nil
 
-      API.new(nil, nil, options) do
+      API.new(nil, nil, **options) do
         result = from_statements(input,
           useRdfType: useRdfType,
           useNativeTypes: useNativeTypes,
@@ -622,7 +622,7 @@ def self.loadRemoteDocument(url,
             end
           else
             validate_input(remote_doc.document, url: remote_doc.documentUrl) if validate
-            MultiJson.load(remote_doc.document, options)
+            MultiJson.load(remote_doc.document, **options)
           end
         end
 
@@ -667,7 +667,7 @@ def self.documentLoader(url, extractAllScripts: false, profile: nil, requestProf
           contentType: content_type,
           contextUrl: context_url))
       else
-        RDF::Util::File.open_file(url, options, &block)
+        RDF::Util::File.open_file(url, **options, &block)
       end
     end
 
@@ -710,7 +710,7 @@ def self.load_html(input, url:,
         self.extend(@implementation)
 
         input = begin
-          initialize_html(input, options)
+          initialize_html(input, **options)
         rescue
           raise JSON::LD::JsonLdError::LoadingDocumentFailed, "Malformed HTML document: #{$!.message}"
         end
@@ -733,7 +733,7 @@ def self.load_html(input, url:,
         raise JSON::LD::JsonLdError::InvalidScriptElement, "Script tag has type=#{element.attributes['type']}" unless element.attributes['type'].to_s.start_with?('application/ld+json')
         content = element.inner_html
         validate_input(content, url: url) if options[:validate]
-        MultiJson.load(content, options)
+        MultiJson.load(content, **options)
       elsif extractAllScripts
         res = []
         elements = if profile
@@ -747,7 +747,7 @@ def self.load_html(input, url:,
         elements.each do |element|
           content = element.inner_html
           validate_input(content, url: url) if options[:validate]
-          r = MultiJson.load(content, options)
+          r = MultiJson.load(content, **options)
           if r.is_a?(Hash)
             res << r
           elsif r.is_a?(Array)
@@ -761,7 +761,7 @@ def self.load_html(input, url:,
         element ||= input.at_xpath("//script[starts-with(@type, 'application/ld+json')]")
         content = element ? element.inner_html : "[]"
         validate_input(content, url: url) if options[:validate]
-        MultiJson.load(content, options)
+        MultiJson.load(content, **options)
       end
     rescue JSON::LD::JsonLdError::LoadingDocumentFailed, MultiJson::ParseError => e
       raise JSON::LD::JsonLdError::InvalidScriptElement, e.message

lib/json/ld/conneg.rb

@@ -33,7 +33,7 @@ class ContentNegotiation
     # @return [void]
     def self.registered(app)
       options = {}
-      app.use(JSON::LD::Rack, options)
+      app.use(JSON::LD::Rack, **options)
     end
 
     def initialize(app)

lib/json/ld/context.rb

@@ -318,7 +318,7 @@ def inspect
     #   on a remote context load error, syntax error, or a reference to a term which is not defined.
     # @return [Context]
     def self.parse(local_context, protected: false, override_protected: false, propagate: true, **options)
-      self.new(options).parse(local_context, protected: false, override_protected: override_protected, propagate: propagate)
+      self.new(**options).parse(local_context, protected: false, override_protected: override_protected, propagate: propagate)
     end
 
     ##
@@ -492,7 +492,7 @@ def vocab=(value, **options)
     #
     # @param [Boolean] value
     def propagate=(value, **options)
-      raise JsonLdError::InvalidContextMember, "@propagate may only be set in 1.1 mode}" if processingMode("json-ld-1.0")
+      raise JsonLdError::InvalidContextMember, "@propagate may only be set in 1.1 mode" if processingMode("json-ld-1.0")
       raise JsonLdError::InvalidPropagateValue, "@propagate must be boolean valued: #{value.inspect}" unless value.is_a?(TrueClass) || value.is_a?(FalseClass)
       value
     end
@@ -530,7 +530,7 @@ def parse(local_context, remote_contexts: [], protected: false, override_protect
         when nil
           # 3.1 If the `override_protected` is  false, and the active context contains protected terms, an error is raised.
           if override_protected || result.term_definitions.values.none?(&:protected?)
-            null_context = Context.new(options)
+            null_context = Context.new(**options)
             null_context.previous_context = result unless propagate
             result = null_context
           else
@@ -559,10 +559,8 @@ def parse(local_context, remote_contexts: [], protected: false, override_protect
 
           # 3.2.1) Set context to the result of resolving value against the base IRI which is established as specified in section 5.1 Establishing a Base URI of [RFC3986]. Only the basic algorithm in section 5.2 of [RFC3986] is used; neither Syntax-Based Normalization nor Scheme-Based Normalization are performed. Characters additionally allowed in IRI references are treated in the same way that unreserved characters are treated in URI references, per section 6.5 of [RFC3987].
           context = RDF::URI(result.context_base || options[:base]).join(context)
-          context_canon = RDF::URI(context).canonicalize
-          if context_canon.scheme == 'https'
-            context_canon = RDF::URI(context_canon.to_h.merge(scheme: 'http'))
-          end
+          context_canon = context.canonicalize
+          context_canon.scheme == 'http' if context_canon.scheme == 'https'
 
           remote_contexts << context.to_s
           raise JsonLdError::ContextOverflow, "#{context}" if remote_contexts.length >= MAX_CONTEXTS_LOADED
@@ -589,7 +587,7 @@ def parse(local_context, remote_contexts: [], protected: false, override_protect
                 requestProfile: 'http://www.w3.org/ns/json-ld#context',
                 base: nil)
               #context_opts.delete(:headers)
-              JSON::LD::API.loadRemoteDocument(context.to_s, context_opts) do |remote_doc|
+              JSON::LD::API.loadRemoteDocument(context.to_s, **context_opts) do |remote_doc|
                 # 3.2.5) Dereference context. If the dereferenced document has no top-level JSON object with an @context member, an invalid remote context has been detected and processing is aborted; otherwise, set context to the value of that member.
                 raise JsonLdError::InvalidRemoteContext, "#{context}" unless remote_doc.document.is_a?(Hash) && remote_doc.document.has_key?('@context')
                 context = remote_doc.document['@context']
@@ -637,7 +635,7 @@ def parse(local_context, remote_contexts: [], protected: false, override_protect
                   requestProfile: 'http://www.w3.org/ns/json-ld#context',
                   base: nil)
                 context_opts.delete(:headers)
-                JSON::LD::API.loadRemoteDocument(source, context_opts) do |remote_doc|
+                JSON::LD::API.loadRemoteDocument(source, **context_opts) do |remote_doc|
                   # Dereference source. If the dereferenced document has no top-level JSON object with an @context member, an invalid remote context has been detected and processing is aborted; otherwise, set context to the value of that member.
                   raise JsonLdError::InvalidRemoteContext, "#{source}" unless remote_doc.document.is_a?(Hash) && remote_doc.document.has_key?('@context')
                   import_context = remote_doc.document['@context']
@@ -666,7 +664,6 @@ def parse(local_context, remote_contexts: [], protected: false, override_protect
             # ... where key is not @base, @vocab, @language, or @version
             result.create_term_definition(context, key, defined,
                                           override_protected: override_protected,
-                                          propagate: propagate,
                                           protected: context.fetch('@protected', protected)) unless NON_TERMDEF_KEYS.include?(key)
           end
         else
@@ -732,7 +729,7 @@ def merge!(context)
     # @raise [JsonLdError]
     #   Represents a cyclical term dependency
     # @see https://www.w3.org/TR/json-ld11-api/index.html#create-term-definition
-    def create_term_definition(local_context, term, defined, override_protected: false, propagate: true, protected: false)
+    def create_term_definition(local_context, term, defined, override_protected: false, protected: false)
       # Expand a string value, unless it matches a keyword
       #log_debug("create_term_definition") {"term = #{term.inspect}"}