From 64ca6c8311daa7c5b1eaa24717525ed7b4d1ac33 Mon Sep 17 00:00:00 2001
From: Gregg Kellogg <gregg@greggkellogg.net>
Date: Thu, 1 Mar 2018 16:19:11 -0800
Subject: [PATCH 01/15] Keep a cache of found readers, so not constantly
 re-initializing.

---
 lib/rdf/rdfa/reader.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/rdf/rdfa/reader.rb b/lib/rdf/rdfa/reader.rb
index a44b0236..fef85970 100644
--- a/lib/rdf/rdfa/reader.rb
+++ b/lib/rdf/rdfa/reader.rb
@@ -414,7 +414,9 @@ def extract_script(el, input, type, options, &block)
             rescue LoadError
             end
 
-            if reader = RDF::Reader.for(content_type: type.to_s)
+            @readers ||= {}
+            reader = @readers[type.to_s] = RDF::Reader.for(content_type: type.to_s) unless @readers.has_key?(type.to_s)
+            if reader = @readers[type.to_s]
               add_debug(el, "=> reader #{reader.to_sym}")
               # Wrap input in a RemoteDocument with appropriate content-type and base
               doc = if input.is_a?(String)

From a43c395d3ec8a5f4d858ce69cdeaa398844c38ae Mon Sep 17 00:00:00 2001
From: Gregg Kellogg <gregg@greggkellogg.net>
Date: Tue, 7 Aug 2018 16:58:54 -0700
Subject: [PATCH 02/15] Remove gemspec deprecations.

---
 rdf-rdfa.gemspec | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/rdf-rdfa.gemspec b/rdf-rdfa.gemspec
index 5d0e3e78..22948f82 100755
--- a/rdf-rdfa.gemspec
+++ b/rdf-rdfa.gemspec
@@ -17,7 +17,6 @@ Gem::Specification.new do |gem|
   gem.platform              = Gem::Platform::RUBY
   gem.files                 = %w(AUTHORS README.md UNLICENSE VERSION) + Dir.glob('lib/**/*.rb')
   gem.require_paths         = %w(lib)
-  gem.has_rdoc              = false
 
   gem.required_ruby_version = '>= 2.2.2'
   gem.requirements          = []
@@ -25,8 +24,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency     'rdf',                 '~> 3.0'
   gem.add_runtime_dependency     'haml',                '~> 5.0'
   gem.add_runtime_dependency     'rdf-xsd',             '~> 3.0'
-  #gem.add_runtime_dependency     'rdf-aggregate-repo',  '~> 3.0'
-  gem.add_runtime_dependency     'rdf-aggregate-repo',  '>= 2.2', '< 4.0'
+  gem.add_runtime_dependency     'rdf-aggregate-repo',  '~> 3.0'
   gem.add_runtime_dependency     'htmlentities',        '~> 4.3'
 
   #gem.add_development_dependency 'json-ld',             '~> 3.0'
@@ -41,8 +39,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rdf-tabular',         '>= 2.2', '< 4.0'
   #gem.add_development_dependency 'rdf-rdfxml',          '~> 3.0'
   gem.add_development_dependency 'rdf-rdfxml',          '>= 2.2', '< 4.0'
-  #gem.add_development_dependency 'sparql',              '~> 3.0'
-  gem.add_development_dependency 'sparql',              '>= 2.2', '< 4.0'
+  gem.add_development_dependency 'sparql',              '~> 3.0'
   gem.add_development_dependency 'yard' ,               '~> 0.9.12'
 
   gem.post_install_message  = nil

From e6d38f2b270ebf04a7a0ac60d44aa9b7c43b97e7 Mon Sep 17 00:00:00 2001
From: Gregg Kellogg <gregg@greggkellogg.net>
Date: Sat, 11 Aug 2018 14:57:27 -0700
Subject: [PATCH 03/15] Remove gemspec deprecations.

---
 rdf-rdfa.gemspec | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/rdf-rdfa.gemspec b/rdf-rdfa.gemspec
index 22948f82..d04b392f 100755
--- a/rdf-rdfa.gemspec
+++ b/rdf-rdfa.gemspec
@@ -24,7 +24,8 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency     'rdf',                 '~> 3.0'
   gem.add_runtime_dependency     'haml',                '~> 5.0'
   gem.add_runtime_dependency     'rdf-xsd',             '~> 3.0'
-  gem.add_runtime_dependency     'rdf-aggregate-repo',  '~> 3.0'
+  #gem.add_runtime_dependency     'rdf-aggregate-repo',  '~> 3.0'
+  gem.add_runtime_dependency     'rdf-aggregate-repo',  '>= 2.2', '< 4.0'
   gem.add_runtime_dependency     'htmlentities',        '~> 4.3'
 
   #gem.add_development_dependency 'json-ld',             '~> 3.0'

From 408dbc5627da53e9ae527528a121acc5461336f1 Mon Sep 17 00:00:00 2001
From: Gregg Kellogg <gregg@greggkellogg.net>
Date: Mon, 20 Aug 2018 17:50:33 -0700
Subject: [PATCH 04/15] Update language and base attribute detection.

---
 lib/rdf/rdfa/reader/nokogiri.rb | 14 +++++---------
 lib/rdf/rdfa/reader/rexml.rb    | 10 +++++-----
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/lib/rdf/rdfa/reader/nokogiri.rb b/lib/rdf/rdfa/reader/nokogiri.rb
index 2ac2bded..16dec850 100644
--- a/lib/rdf/rdfa/reader/nokogiri.rb
+++ b/lib/rdf/rdfa/reader/nokogiri.rb
@@ -35,12 +35,10 @@ def initialize(node, parent = nil)
         # @return [String]
         def language
           language = case
-          when @node.document.is_a?(::Nokogiri::HTML::Document) && @node.attributes["xml:lang"]
-            @node.attributes["xml:lang"].to_s
-          when @node.document.is_a?(::Nokogiri::HTML::Document) && @node.attributes["lang"]
-            @node.attributes["lang"].to_s
           when @node.attribute_with_ns("lang", RDF::XML.to_s)
             @node.attribute_with_ns("lang", RDF::XML.to_s)
+          when @node.attribute("xml:lang")
+            @node.attribute("xml:lang").to_s
           when @node.attribute("lang")
             @node.attribute("lang").to_s
           end
@@ -51,7 +49,7 @@ def language
         #
         # @return [String]
         def base
-          @node.attribute_with_ns("base", RDF::XML.to_s)
+          @node.attribute_with_ns("base", RDF::XML.to_s) || @node.attribute('xml:base')
         end
 
         def display_path
@@ -202,8 +200,6 @@ def detect_host_language_version(input, options)
           doc_type_string = input.children.detect {|c| c.is_a?(::Nokogiri::XML::DTD)}
           version_attr = input.root && input.root.attribute("version").to_s
           root_element = input.root.name.downcase
-          root_namespace = input.root.namespace.to_s
-          root_attrs = input.root.attributes
           content_type = case
           when root_element == "html" && input.is_a?(::Nokogiri::HTML::Document)
             "text/html"
@@ -226,7 +222,7 @@ def detect_host_language_version(input, options)
           doc_type_string = head.match(%r(<!DOCTYPE[^>]*>)m).to_s
           root = head.match(%r(<[^!\?>]*>)m).to_s
           root_element = root.match(%r(^<(\S+)[ >])) ? $1 : ""
-          version_attr = root.match(/version\s+=\s+(\S+)[\s">]/m) ? $1 : ""
+          version_attr = root.match(/version\s*=\s*"([^"]+)"/m) ? $1 : ""
           head_element = head.match(%r(<head.*<\/head>)mi)
           head_doc = ::Nokogiri::HTML.parse(head_element.to_s)
 
@@ -308,7 +304,7 @@ def doc_base(base)
           base_el = @doc.at_css("html>head>base")
           base = base.join(base_el.attribute("href").to_s.split("#").first) if base_el
         else
-          xml_base = root.attribute_with_ns("base", RDF::XML.to_s) if root
+          xml_base = root.attribute_with_ns("base", RDF::XML.to_s) || root.attribute('xml:base') if root
           base = base.join(xml_base) if xml_base
         end
 
diff --git a/lib/rdf/rdfa/reader/rexml.rb b/lib/rdf/rdfa/reader/rexml.rb
index cf317739..43c701c8 100644
--- a/lib/rdf/rdfa/reader/rexml.rb
+++ b/lib/rdf/rdfa/reader/rexml.rb
@@ -39,6 +39,8 @@ def language
           language = case
           when @node.attribute("lang", RDF::XML.to_s)
             @node.attribute("lang", RDF::XML.to_s)
+          when @node.attribute("xml:lang")
+            @node.attribute("xml:lang").to_s
           when @node.attribute("lang")
             @node.attribute("lang").to_s
           end
@@ -49,7 +51,7 @@ def language
         #
         # @return [String]
         def base
-          @node.attribute("base", RDF::XML.to_s)
+          @node.attribute("base", RDF::XML.to_s) || @node.attribute('xml:base')
         end
 
         def display_path
@@ -238,8 +240,6 @@ def detect_host_language_version(input, options)
           doc_type_string = input.doctype.to_s
           version_attr = input.root && input.root.attribute("version").to_s
           root_element = input.root.name.downcase
-          root_namespace = input.root.namespace.to_s
-          root_attrs = input.root.attributes
           content_type = "application/xhtml+html" # FIXME: what about other possible XML types?
         else
           content_type = input.content_type if input.respond_to?(:content_type)
@@ -257,7 +257,7 @@ def detect_host_language_version(input, options)
           doc_type_string = head.match(%r(<!DOCTYPE[^>]*>)m).to_s
           root = head.match(%r(<[^!\?>]*>)m).to_s
           root_element = root.match(%r(^<(\S+)[ >])) ? $1 : ""
-          version_attr = root.match(/version\s+=\s+(\S+)[\s">]/m) ? $1 : ""
+          version_attr = root.match(/version\s*=\s*"([^"]+)"/m) ? $1 : ""
           head_element = head.match(%r(<head.*<\/head>)mi)
           head_doc = ::REXML::Document.new(head_element.to_s)
 
@@ -331,7 +331,7 @@ def doc_base(base)
           base_el = ::REXML::XPath.first(@doc, "/html/head/base") rescue nil
           base = base.join(base_el.attribute("href").to_s.split("#").first) if base_el
         else
-          xml_base = root.attribute("base", RDF::XML.to_s) if root
+          xml_base = root.attribute("base", RDF::XML.to_s) || root.attribute('xml:base') if root
           base = base.join(xml_base) if xml_base
         end
 

From c0ab882a5ebe4bec2b26ddc189c97e2ab1999374 Mon Sep 17 00:00:00 2001
From: Gregg Kellogg <gregg@greggkellogg.net>
Date: Mon, 20 Aug 2018 17:51:35 -0700
Subject: [PATCH 05/15] Do script extraction from within traverse so that base
 (and potentially language) can be passed in as an option.

---
 lib/rdf/rdfa/reader.rb | 89 ++++++++++++++++++-------------------
 spec/reader_spec.rb    | 99 +++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 141 insertions(+), 47 deletions(-)

diff --git a/lib/rdf/rdfa/reader.rb b/lib/rdf/rdfa/reader.rb
index fef85970..b36fce77 100644
--- a/lib/rdf/rdfa/reader.rb
+++ b/lib/rdf/rdfa/reader.rb
@@ -381,6 +381,38 @@ def initialize(input = $stdin, options = {}, &block)
       end
     end
 
+    ##
+    # Extracts RDF from script element, or embeded RDF/XML
+    def extract_script(el, input, type, **options, &block)
+      add_debug(el, "script element of type #{type}")
+      begin
+        # Formats don't exist unless they've been required
+        case type.to_s
+        when 'application/csvm+json' then require 'rdf/tabular'
+        when 'application/ld+json'   then require 'json/ld'
+        when 'application/rdf+xml'   then require 'rdf/rdfxml'
+        when 'text/ntriples'         then require 'rdf/ntriples'
+        when 'text/turtle'           then require 'rdf/turtle'
+        end
+      rescue LoadError
+      end
+
+      @readers ||= {}
+      reader = @readers[type.to_s] = RDF::Reader.for(content_type: type.to_s) unless @readers.has_key?(type.to_s)
+      if reader = @readers[type.to_s]
+        add_debug(el, "=> reader #{reader.to_sym}")
+        # Wrap input in a RemoteDocument with appropriate content-type and base
+        doc = if input.is_a?(String)
+          RDF::Util::File::RemoteDocument.new(input, content_type: type.to_s, **options)
+        else
+          input
+        end
+        reader.new(doc, options).each(&block)
+      else
+        add_debug(el, "=> no reader found")
+      end
+    end
+
     ##
     # Iterates the given block for each RDF statement in the input.
     #
@@ -400,54 +432,9 @@ def each_statement(&block)
           # parse
           parse_whole_document(@doc, RDF::URI(base_uri))
 
-          def extract_script(el, input, type, options, &block)
-            add_debug(el, "script element of type #{type}")
-            begin
-              # Formats don't exist unless they've been required
-              case type.to_s
-              when 'application/csvm+json' then require 'rdf/tabular'
-              when 'application/ld+json'   then require 'json/ld'
-              when 'application/rdf+xml'   then require 'rdf/rdfxml'
-              when 'text/ntriples'         then require 'rdf/ntriples'
-              when 'text/turtle'           then require 'rdf/turtle'
-              end
-            rescue LoadError
-            end
-
-            @readers ||= {}
-            reader = @readers[type.to_s] = RDF::Reader.for(content_type: type.to_s) unless @readers.has_key?(type.to_s)
-            if reader = @readers[type.to_s]
-              add_debug(el, "=> reader #{reader.to_sym}")
-              # Wrap input in a RemoteDocument with appropriate content-type and base
-              doc = if input.is_a?(String)
-                RDF::Util::File::RemoteDocument.new(input,
-                                                    options.merge(
-                                                      content_type: type.to_s,
-                                                      base_uri: base_uri
-                                                    ))
-              else
-                input
-              end
-              reader.new(doc, options).each(&block)
-            else
-              add_debug(el, "=> no reader found")
-            end
-          end
-
           # Look for Embedded RDF/XML
           unless @root.xpath("//rdf:RDF", "rdf" => "http://www.w3.org/1999/02/22-rdf-syntax-ns#").empty?
-            extract_script(@root, @doc, "application/rdf+xml", @options) do |statement|
-              @repository << statement
-            end
-          end
-
-          # Look for Embedded scripts
-          @root.css("script[type]").each do |el|
-            type = el.attribute("type")
-
-            text = el.inner_html.sub(%r(\A\s*\<!\[CDATA\[)m, '').sub(%r(\]\]>\s*\Z)m, '')
-
-            extract_script(el, text, type, @options) do |statement|
+            extract_script(@root, @doc, "application/rdf+xml", @options.merge(base_uri: base_uri)) do |statement|
               @repository << statement
             end
           end
@@ -777,6 +764,7 @@ def traverse(element, evaluation_context)
         rev
         role
         src
+        type
         typeof
         value
         vocab
@@ -832,6 +820,15 @@ def traverse(element, evaluation_context)
       language = nil if language.to_s.empty?
       add_debug(element) {"HTML5 [3.2.3.3] lang: #{language.inspect}"} if language
 
+      # Embedded scripts
+      if element.name == 'script'
+        text = element.inner_html.sub(%r(\A\s*\<!\[CDATA\[)m, '').sub(%r(\]\]>\s*\Z)m, '')
+
+        extract_script(element, text, attrs[:type], @options.merge(base_uri: base)) do |statement|
+          @repository << statement
+        end
+      end
+
       # From HTML5, if the property attribute and the rel and/or rev attribute exists on the same element, the non-CURIE and non-URI rel and rev values are ignored. If, after this, the value of rel and/or rev becomes empty, then the processor must act as if the respective attribute is not present.
       if [:html5, :xhtml5].include?(@host_language) && attrs[:property] && (attrs[:rel] || attrs[:rev])
         old_rel, old_rev = attrs[:rel], attrs[:rev]
diff --git a/spec/reader_spec.rb b/spec/reader_spec.rb
index 36075246..2852cde3 100644
--- a/spec/reader_spec.rb
+++ b/spec/reader_spec.rb
@@ -1681,6 +1681,103 @@
                 gr:hasLegalName "Hepp Industries Ltd."^^xsd:string .
             )
           ],
+          "application/ld+json with doc base" => [
+            %q(
+              <script type="application/ld+json"><![CDATA[
+                {
+                  "@context": {
+                    "foo": "http://example/xyz#",
+                    "gr": "http://purl.org/goodrelations/v1#",
+                    "xsd": "http://www.w3.org/2001/XMLSchema#",
+                    "rdfs": "http://www.w3.org/2000/01/rdf-schema#"
+                  },
+                  "@id": "myCompany",
+                  "@type": "gr:BusinessEntity",
+                  "rdfs:seeAlso": {"@id": "http://example/xyz"},
+                  "gr:hasLegalName": "Hepp Industries Ltd."
+                }
+              ]]></script>
+            ),
+            %q(
+              @prefix foo:  <http://example/xyz#> .
+              @prefix gr:   <http://purl.org/goodrelations/v1#> .
+              @prefix xsd:  <http://www.w3.org/2001/XMLSchema#> .
+              @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
+
+              <http://example/myCompany>
+                a gr:BusinessEntity ;
+                rdfs:seeAlso <http://example/xyz> ;
+                gr:hasLegalName "Hepp Industries Ltd."^^xsd:string .
+            )
+          ],
+          "application/ld+json with base element" => [
+            %q(
+              <html>
+              <head>
+              <base href="http://example.org/" />
+              <script type="application/ld+json"><![CDATA[
+                {
+                  "@context": {
+                    "foo": "http://example/xyz#",
+                    "gr": "http://purl.org/goodrelations/v1#",
+                    "xsd": "http://www.w3.org/2001/XMLSchema#",
+                    "rdfs": "http://www.w3.org/2000/01/rdf-schema#"
+                  },
+                  "@id": "myCompany",
+                  "@type": "gr:BusinessEntity",
+                  "rdfs:seeAlso": {"@id": "http://example/xyz"},
+                  "gr:hasLegalName": "Hepp Industries Ltd."
+                }
+              ]]></script>
+              </head>
+              </html>
+            ),
+            %q(
+              @prefix foo:  <http://example/xyz#> .
+              @prefix gr:   <http://purl.org/goodrelations/v1#> .
+              @prefix xsd:  <http://www.w3.org/2001/XMLSchema#> .
+              @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
+
+              <http://example.org/myCompany>
+                a gr:BusinessEntity ;
+                rdfs:seeAlso <http://example/xyz> ;
+                gr:hasLegalName "Hepp Industries Ltd."^^xsd:string .
+            )
+          ],
+          "application/ld+json with @xml:base" => [
+            %q(
+              <html xmlns="http://www.w3.org/1999/xhtml" version="XHTML+RDFa 1.1">
+              <head>
+                <meta http-equiv="content-type" content="application/xhtml+xml"/>
+              <script xml:base="http://example.org/" type="application/ld+json"><![CDATA[
+                {
+                  "@context": {
+                    "foo": "http://example/xyz#",
+                    "gr": "http://purl.org/goodrelations/v1#",
+                    "xsd": "http://www.w3.org/2001/XMLSchema#",
+                    "rdfs": "http://www.w3.org/2000/01/rdf-schema#"
+                  },
+                  "@id": "myCompany",
+                  "@type": "gr:BusinessEntity",
+                  "rdfs:seeAlso": {"@id": "http://example/xyz"},
+                  "gr:hasLegalName": "Hepp Industries Ltd."
+                }
+              ]]></script>
+              </head>
+              </html>
+            ),
+            %q(
+              @prefix foo:  <http://example/xyz#> .
+              @prefix gr:   <http://purl.org/goodrelations/v1#> .
+              @prefix xsd:  <http://www.w3.org/2001/XMLSchema#> .
+              @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
+
+              <http://example.org/myCompany>
+                a gr:BusinessEntity ;
+                rdfs:seeAlso <http://example/xyz> ;
+                gr:hasLegalName "Hepp Industries Ltd."^^xsd:string .
+            )
+          ],
           "application/ld+json with junk" => [
             %q(
               <script type="application/ld+json"><![CDATA[
@@ -1711,7 +1808,7 @@
                 gr:hasLegalName "Hepp Industries Ltd."^^xsd:string .
             )
           ]
-        }.each do |title, (input,result)|
+        }.each do |title, (input, result)|
           it title do
             expect(parse(input, base_uri: "http://example/")).to be_equivalent_graph(result, logger: logger)
           end

From 4ca5edf60ab8927f0320ec966eef11e0737b5c2f Mon Sep 17 00:00:00 2001
From: Gregg Kellogg <gregg@greggkellogg.net>
Date: Mon, 15 Oct 2018 10:33:33 -0700
Subject: [PATCH 06/15] Run 2.2.2 on Travis.

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 85963c0e..8c6f89bd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,7 @@ gemfile:
   - Gemfile
   - Gemfile-pure
 rvm:
-  - 2.2
+  - 2.2.2
   - 2.3
   - 2.4
   - 2.5

From c8f8ceaa0f8c8649ebd653363317af21bb91ccf9 Mon Sep 17 00:00:00 2001
From: Gregg Kellogg <gregg@greggkellogg.net>
Date: Thu, 20 Dec 2018 16:51:46 -0800
Subject: [PATCH 07/15] Update travis config to deal with rubygems not
 supporting ruby < 2.3 any longer.

See https://github.com/rubygems/rubygems/issues/2534.
---
 .travis.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 8c6f89bd..26cf6753 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,9 @@
 language: ruby
 bundler_args: --without debug
 script: "bundle exec rspec spec"
-before_install: "gem update --system"
+before_install: 
+  - 'gem update --system --conservative || (gem i "rubygems-update:~>2.7" --no-document && update_rubygems)'
+  - 'gem update bundler --conservative'
 env:
   - CI=true
 gemfile:

From ea25025c71ee30794a8320cf75caf296c7b08b0f Mon Sep 17 00:00:00 2001
From: Gregg Kellogg <gregg@greggkellogg.net>
Date: Mon, 24 Dec 2018 12:18:48 -0800
Subject: [PATCH 08/15] Test on 2.6 and add temporary pull of webmock from
 GitHub until 2.6 support is added.

---
 .travis.yml  | 1 +
 Gemfile      | 3 +++
 Gemfile-pure | 3 +++
 README.md    | 2 +-
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 26cf6753..0045e4e3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,6 +14,7 @@ rvm:
   - 2.3
   - 2.4
   - 2.5
+  - 2.6
   - jruby-9
   - rbx-3
 cache: bundler
diff --git a/Gemfile b/Gemfile
index ac795dea..7ab928c2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -22,6 +22,9 @@ group :development, :test do
   gem 'sparql',             github: "ruby-rdf/sparql",              branch: "develop"
   gem 'sparql-client',      github: "ruby-rdf/sparql-client",       branch: "develop"
   gem 'sxp',                github: "dryruby/sxp.rb",               branch: "develop"
+
+  # Until version >= 3.4.2 with support for Ruby 2.6
+  gem "webmock",        git: "https://github.com/bblimke/webmock"
 end
 
 group :test do
diff --git a/Gemfile-pure b/Gemfile-pure
index 8d36316b..4c9f482b 100644
--- a/Gemfile-pure
+++ b/Gemfile-pure
@@ -20,6 +20,9 @@ group :development, :test do
   gem 'sparql',             github: "ruby-rdf/sparql",              branch: "develop"
   gem 'sparql-client',      github: "ruby-rdf/sparql-client",       branch: "develop"
   gem 'sxp',                github: "dryruby/sxp.rb",               branch: "develop"
+
+  # Until version >= 3.4.2 with support for Ruby 2.6
+  gem "webmock",        git: "https://github.com/bblimke/webmock"
 end
 
 group :test do
diff --git a/README.md b/README.md
index db5d4db3..7b6dfd8a 100755
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ RDF::RDFa parses [RDFa][RDFa 1.1 Core] into statements or triples.
 * Fully compliant RDFa 1.1 parser.
 * Template-based Writer to generate XHTML+RDFa.
   * Writer uses user-replacable [Haml][Haml]-based templates to generate RDFa.
-* If available, uses [Nokogiri][] for parsing HTML/SVG, falls back to REXML otherwise. For HTML5, include the [Nokogumbo][] gem for are pure-HTML5 parser with better error detection.
+* If available, uses [Nokogiri][] for parsing HTML/SVG, falls back to REXML otherwise. For HTML5, include the [Nokogumbo][] gem for a pure-HTML5 parser with better error detection.
 
 Install with `gem install rdf-rdfa`
 

From 74b60100bc6ac09320d39f180272b8850ed3a089 Mon Sep 17 00:00:00 2001
From: Gregg Kellogg <gregg@greggkellogg.net>
Date: Tue, 1 Jan 2019 12:21:54 -0800
Subject: [PATCH 09/15] Update Gemfile.

---
 Gemfile      | 11 -----------
 Gemfile-pure | 12 ------------
 2 files changed, 23 deletions(-)

diff --git a/Gemfile b/Gemfile
index 7ab928c2..75c6f1af 100644
--- a/Gemfile
+++ b/Gemfile
@@ -22,9 +22,6 @@ group :development, :test do
   gem 'sparql',             github: "ruby-rdf/sparql",              branch: "develop"
   gem 'sparql-client',      github: "ruby-rdf/sparql-client",       branch: "develop"
   gem 'sxp',                github: "dryruby/sxp.rb",               branch: "develop"
-
-  # Until version >= 3.4.2 with support for Ruby 2.6
-  gem "webmock",        git: "https://github.com/bblimke/webmock"
 end
 
 group :test do
@@ -33,9 +30,6 @@ group :test do
   gem 'psych',          platforms: [:mri, :rbx]
 end
 
-# Bundle gems for the local environment. Make sure to
-# put test-only gems in this group so their generators
-# and rake tasks are available in development mode:
 group :debug do
   gem "syntax"
   gem "byebug", platforms: :mri
@@ -43,11 +37,6 @@ group :debug do
   gem "rake"
 end
 
-platforms :rbx do
-  gem 'rubysl', '~> 2.0'
-  gem 'rubinius', '~> 2.0'
-end
-
 platforms :jruby do
   gem 'gson',     '~> 0.6'
 end
diff --git a/Gemfile-pure b/Gemfile-pure
index 4c9f482b..3acd39a9 100644
--- a/Gemfile-pure
+++ b/Gemfile-pure
@@ -31,20 +31,8 @@ group :test do
   gem 'psych',          platforms: [:mri, :rbx]
 end
 
-# Bundle gems for the local environment. Make sure to
-# put test-only gems in this group so their generators
-# and rake tasks are available in development mode:
 group :debug do
   gem "syntax"
   gem "byebug", platforms: :mri
   gem "ruby-debug", platforms: :jruby
 end
-
-platforms :rbx do
-  gem 'rubysl', '~> 2.0'
-  gem 'rubinius', '~> 2.0'
-end
-
-platforms :jruby do
-  gem 'gson',     '~> 0.6'
-end

From 565101950892b86609ecb2b305d13300c2b6dfc3 Mon Sep 17 00:00:00 2001
From: Gregg Kellogg <gregg@kellogg-assoc.com>
Date: Tue, 26 Nov 2019 16:00:05 -0500
Subject: [PATCH 10/15] Use Nokogumbo 2.0 for tests.

---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 75c6f1af..3195fd90 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,7 +6,7 @@ gem "rdf",            github: "ruby-rdf/rdf",      branch: "develop"
 gem "rdf-spec",       github: "ruby-rdf/rdf-spec", branch: "develop"
 gem "rdf-xsd",        github: "ruby-rdf/rdf-xsd",  branch: "develop"
 gem "nokogiri",       '~> 1.8'
-gem "nokogumbo",      '~> 1.5'
+gem "nokogumbo",      '~> 2.0'
 gem 'equivalent-xml', '~> 0.5'
 
 group :development, :test do

From 4772d7a82c39988b8fc139a47c24a8eddf58ae62 Mon Sep 17 00:00:00 2001
From: Gregg Kellogg <gregg@greggkellogg.net>
Date: Tue, 9 Apr 2019 18:16:19 -0700
Subject: [PATCH 11/15] Update RDFa initial context.

---
 lib/rdf/rdfa/context/xml.rb | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/lib/rdf/rdfa/context/xml.rb b/lib/rdf/rdfa/context/xml.rb
index 9b9df117..531ec9f5 100644
--- a/lib/rdf/rdfa/context/xml.rb
+++ b/lib/rdf/rdfa/context/xml.rb
@@ -6,6 +6,7 @@ def self.find_with_rdfa_1_1(uri)
     if uri.to_s == "http://www.w3.org/2011/rdfa-context/rdfa-1.1"
       @_rdfa_1_1_prof ||= RDF::RDFa::Context.new(RDF::URI("http://www.w3.org/2011/rdfa-context/rdfa-1.1"), {
         prefixes: {
+          as:      "https://www.w3.org/ns/activitystreams#",
           cc:      "http://creativecommons.org/ns#",
           csvw:    "http://www.w3.org/ns/csvw#",
           ctag:    "http://commontag.org/ns#",
@@ -13,11 +14,16 @@ def self.find_with_rdfa_1_1(uri)
           dc11:    "http://purl.org/dc/elements/1.1/",
           dcat:    "http://www.w3.org/ns/dcat#",
           dcterms: "http://purl.org/dc/terms/",
+          dqv:     "http://www.w3.org/ns/dqv#",
+          duv:     "https://www.w3.org/TR/vocab-duv#",
           foaf:    "http://xmlns.com/foaf/0.1/",
           gr:      "http://purl.org/goodrelations/v1#",
           grddl:   "http://www.w3.org/2003/g/data-view#",
           ical:    "http://www.w3.org/2002/12/cal/icaltzd#",
+          ldp:     "http://www.w3.org/ns/ldp#",
           ma:      "http://www.w3.org/ns/ma-ont#",
+          oa:      "http://www.w3.org/ns/oa#",
+          odrl:    "http://www.w3.org/ns/odrl/2/",
           og:      "http://ogp.me/ns#",
           org:     "http://www.w3.org/ns/org#",
           owl:     "http://www.w3.org/2002/07/owl#",
@@ -34,6 +40,9 @@ def self.find_with_rdfa_1_1(uri)
           sioc:    "http://rdfs.org/sioc/ns#",
           skos:    "http://www.w3.org/2004/02/skos/core#",
           skosxl:  "http://www.w3.org/2008/05/skos-xl#",
+          sosa:    "http://www.w3.org/ns/sosa/",
+          ssn:     "http://www.w3.org/ns/ssn/",
+          time:    "http://www.w3.org/2006/time#",
           v:       "http://rdf.data-vocabulary.org/#",
           vcard:   "http://www.w3.org/2006/vcard/ns#",
           void:    "http://rdfs.org/ns/void#",

From 0c6ac1c5b4d9cd08bf6225c0c2bf07ab95095c6a Mon Sep 17 00:00:00 2001
From: Gregg Kellogg <gregg@greggkellogg.net>
Date: Mon, 24 Jun 2019 10:34:26 -0700
Subject: [PATCH 12/15] Fix script/tc and enable some test cases.

---
 script/tc          | 12 ++++++------
 spec/suite_spec.rb |  1 -
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/script/tc b/script/tc
index 81d09e21..97c93063 100755
--- a/script/tc
+++ b/script/tc
@@ -17,8 +17,8 @@ def run_tc(tc, options)
 
   if options[:verbose]
     puts("\nTestCase: #{tc.inspect}") 
-    puts("\nInput:\n" + Kernel.open(input_uri) {|f| f.read}) 
-    puts("\nQuery:\n" + Kernel.open(results_uri) {|f| f.read})
+    puts("\nInput:\n" + RDF::Util::File.open_file(input_uri) {|f| f.read}) 
+    puts("\nQuery:\n" + RDF::Util::File.open_file(results_uri) {|f| f.read})
   end
 
   pg = RDF::Graph.new if options[:processor_graph]
@@ -36,7 +36,7 @@ def run_tc(tc, options)
       options[opt] = arg
     end
 
-    reader = RDF::RDFa::Reader.new(Kernel.open(input_uri), options)
+    reader = RDF::RDFa::Reader.open(input_uri, options)
 
     graph = RDF::Repository.new << reader
   rescue Exception => e
@@ -50,10 +50,10 @@ def run_tc(tc, options)
     end
   end
   
-  puts("\nResult:\n" + graph.dump(options[:format])) unless options[:quiet]
+  puts("\nResult:\n" + graph.dump(options[:format], validate: false)) unless options[:quiet]
   
   begin
-    result = SPARQL::Grammar.parse(Kernel.open(results_uri)).execute(graph)
+    result = SPARQL::Grammar.open(results_uri).execute(graph)
   rescue Exception => e
     options[:result_count]["exception"] ||= 0
     options[:result_count]["exception"] += 1
@@ -116,7 +116,7 @@ def help(options)
   puts "      --quiet:              Minimal output"
   puts "      --validate:           Validate input"
   puts "      --verbose:            Verbose processing"
-  puts "      --version:            Version of processor to use (rdf1.0, rdf1.1). Defaults to #{options[:version]}"
+  puts "      --version:            Version of processor to use (rdfa1.0, rdfa1.1). Defaults to #{options[:version]}"
   puts "      --help,-?:            This message"
   exit(0)
 end
diff --git a/spec/suite_spec.rb b/spec/suite_spec.rb
index 1defe446..7e46cfc5 100644
--- a/spec/suite_spec.rb
+++ b/spec/suite_spec.rb
@@ -13,7 +13,6 @@
             describe "that are #{classification}" do
               Fixtures::TestCase.for_specific(host_language, version, Fixtures::TestCase::Test.send(classification)) do |t|
                 specify "test #{t.num}: #{t.description}#{",  (negative test)" if t.expectedResults.false?}" do
-                  pending "Invalid SPARQL query" if %w(0279 0284).include?(t.num)
                   skip "CDN messes up email addresses" if %w(0065 0176).include?(t.num)
                   pending "Nokogumbo error" if t.num == "0216" && host_language == "xhtml5"
                   skip "XMLLiteral" if %w(0198 0212).include?(t.num)

From 9e30dc8b87e6924f95e6445fc00ec1a20b288531 Mon Sep 17 00:00:00 2001
From: Gregg Kellogg <gregg@greggkellogg.net>
Date: Thu, 12 Dec 2019 15:41:34 -0800
Subject: [PATCH 13/15] Updates for 3.1 and Ruby 2.7 calling sequences.

---
 .travis.yml                     | 12 +++---------
 README.md                       | 12 ++++++------
 VERSION                         |  2 +-
 lib/rdf/rdfa/context.rb         |  4 ++--
 lib/rdf/rdfa/context/html.rb    |  4 ++--
 lib/rdf/rdfa/context/xhtml.rb   |  4 ++--
 lib/rdf/rdfa/context/xml.rb     |  6 +++---
 lib/rdf/rdfa/expansion.rb       |  2 +-
 lib/rdf/rdfa/reader.rb          | 24 ++++++++++++------------
 lib/rdf/rdfa/reader/nokogiri.rb |  4 ++--
 lib/rdf/rdfa/reader/rexml.rb    |  4 ++--
 lib/rdf/rdfa/writer.rb          | 32 ++++++++++++++++----------------
 rdf-rdfa.gemspec                | 22 ++++++++++------------
 script/intern_context           |  4 ++--
 script/parse                    | 10 +++++-----
 script/tc                       |  4 ++--
 spec/expansion_spec.rb          |  6 ++----
 spec/reader_spec.rb             |  8 ++++----
 spec/suite_helper.rb            |  6 +++---
 spec/suite_spec.rb              |  2 +-
 spec/writer_spec.rb             | 10 +++++-----
 21 files changed, 86 insertions(+), 96 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0045e4e3..2b531323 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,26 +1,20 @@
 language: ruby
 bundler_args: --without debug
 script: "bundle exec rspec spec"
-before_install: 
-  - 'gem update --system --conservative || (gem i "rubygems-update:~>2.7" --no-document && update_rubygems)'
-  - 'gem update bundler --conservative'
 env:
   - CI=true
 gemfile:
   - Gemfile
   - Gemfile-pure
 rvm:
-  - 2.2.2
-  - 2.3
   - 2.4
   - 2.5
   - 2.6
-  - jruby-9
-  - rbx-3
+  - 2.7
+  - jruby
 cache: bundler
 sudo: false
 matrix:
   allow_failures:
-    - rvm: jruby-9
-    - rvm: rbx-3
+    - rvm: jruby
 dist: trusty
diff --git a/README.md b/README.md
index 7b6dfd8a..fea07b56 100755
--- a/README.md
+++ b/README.md
@@ -397,12 +397,12 @@ The template hash defines four Haml templates:
     }
 
 ## Dependencies
-* [Ruby](http://ruby-lang.org/) (>= 2.2)
-* [RDF.rb](http://rubygems.org/gems/rdf) (~> 3.0)
-* [Haml](https://rubygems.org/gems/haml) (~> 5.0)
-* [HTMLEntities](https://rubygems.org/gems/htmlentities) (>= 4.3.1)
-* Soft dependency on [Nokogiri](http://rubygems.org/gems/nokogiri) (>= 1.7.1)
-* Soft dependency on [Nokogumbo](https://github.com/rubys/nokogumbo) (>= 1.4.10)
+* [Ruby](http://ruby-lang.org/) (>= 2.4)
+* [RDF.rb](http://rubygems.org/gems/rdf) (~> 3.1)
+* [Haml](https://rubygems.org/gems/haml) (~> 5.1)
+* [HTMLEntities](https://rubygems.org/gems/htmlentities) (>= 4.3)
+* Soft dependency on [Nokogiri](http://rubygems.org/gems/nokogiri) (>= 1.10)
+* Soft dependency on [Nokogumbo](https://github.com/rubys/nokogumbo) (>= 2.0)
 
 ## Documentation
 Full documentation available on [Rubydoc.info][RDFa doc]
diff --git a/VERSION b/VERSION
index cb2b00e4..fd2a0186 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.0.1
+3.1.0
diff --git a/lib/rdf/rdfa/context.rb b/lib/rdf/rdfa/context.rb
index 7261cc9c..607628f5 100644
--- a/lib/rdf/rdfa/context.rb
+++ b/lib/rdf/rdfa/context.rb
@@ -40,7 +40,7 @@ class Context
     # @yieldparam [RDF::RDFa::Context] context
     # @yieldreturn [void] ignored
     # @return [RDF::RDFa::Context]
-    def initialize(uri, options = {}, &block)
+    def initialize(uri, **options, &block)
       @uri = RDF::URI.intern(uri)
       @prefixes = options.fetch(:prefixes, {})
       @terms = options.fetch(:terms, {})
@@ -97,7 +97,7 @@ def self.find(uri)
       cache[uri] = new(uri) do |context|
         log_debug("process_context: retrieve context <#{uri}>") if respond_to?(:log_debug)
         Context.load(uri)
-        context.parse(repository.query(graph_name: uri))
+        context.parse(repository.query({graph_name: uri}))
       end
     rescue Exception => e
       if respond_to?(:log_fatal)
diff --git a/lib/rdf/rdfa/context/html.rb b/lib/rdf/rdfa/context/html.rb
index 57c3e1db..8ef3d9e3 100644
--- a/lib/rdf/rdfa/context/html.rb
+++ b/lib/rdf/rdfa/context/html.rb
@@ -4,8 +4,8 @@
 class RDF::RDFa::Context
   def self.find_with_html_rdfa_1_1(uri)
     if uri.to_s == "http://www.w3.org/2011/rdfa-context/html-rdfa-1.1"
-      @_html_rdfa_1_1_prof ||= RDF::RDFa::Context.new(RDF::URI("http://www.w3.org/2011/rdfa-context/html-rdfa-1.1"), {
-      })
+      @_html_rdfa_1_1_prof ||= RDF::RDFa::Context.new(RDF::URI("http://www.w3.org/2011/rdfa-context/html-rdfa-1.1"),
+      )
     else
       find_without_html_rdfa_1_1(uri)
     end
diff --git a/lib/rdf/rdfa/context/xhtml.rb b/lib/rdf/rdfa/context/xhtml.rb
index 843323f1..f048504a 100644
--- a/lib/rdf/rdfa/context/xhtml.rb
+++ b/lib/rdf/rdfa/context/xhtml.rb
@@ -4,7 +4,7 @@
 class RDF::RDFa::Context
   def self.find_with_xhtml_rdfa_1_1(uri)
     if uri.to_s == "http://www.w3.org/2011/rdfa-context/xhtml-rdfa-1.1"
-      @_xhtml_rdfa_1_1_prof ||= RDF::RDFa::Context.new(RDF::URI("http://www.w3.org/2011/rdfa-context/xhtml-rdfa-1.1"), {
+      @_xhtml_rdfa_1_1_prof ||= RDF::RDFa::Context.new(RDF::URI("http://www.w3.org/2011/rdfa-context/xhtml-rdfa-1.1"),
         terms: {
           alternate:  "http://www.w3.org/1999/xhtml/vocab#alternate",
           appendix:   "http://www.w3.org/1999/xhtml/vocab#appendix",
@@ -32,7 +32,7 @@ def self.find_with_xhtml_rdfa_1_1(uri)
           top:        "http://www.w3.org/1999/xhtml/vocab#top",
           up:         "http://www.w3.org/1999/xhtml/vocab#up",
         },
-      })
+      )
     else
       find_without_xhtml_rdfa_1_1(uri)
     end
diff --git a/lib/rdf/rdfa/context/xml.rb b/lib/rdf/rdfa/context/xml.rb
index 531ec9f5..be5aaa30 100644
--- a/lib/rdf/rdfa/context/xml.rb
+++ b/lib/rdf/rdfa/context/xml.rb
@@ -4,7 +4,7 @@
 class RDF::RDFa::Context
   def self.find_with_rdfa_1_1(uri)
     if uri.to_s == "http://www.w3.org/2011/rdfa-context/rdfa-1.1"
-      @_rdfa_1_1_prof ||= RDF::RDFa::Context.new(RDF::URI("http://www.w3.org/2011/rdfa-context/rdfa-1.1"), {
+      @_rdfa_1_1_prof ||= RDF::RDFa::Context.new(RDF::URI("http://www.w3.org/2011/rdfa-context/rdfa-1.1"),
         prefixes: {
           as:      "https://www.w3.org/ns/activitystreams#",
           cc:      "http://creativecommons.org/ns#",
@@ -15,7 +15,7 @@ def self.find_with_rdfa_1_1(uri)
           dcat:    "http://www.w3.org/ns/dcat#",
           dcterms: "http://purl.org/dc/terms/",
           dqv:     "http://www.w3.org/ns/dqv#",
-          duv:     "https://www.w3.org/TR/vocab-duv#",
+          duv:     "https://www.w3.org/ns/duv#",
           foaf:    "http://xmlns.com/foaf/0.1/",
           gr:      "http://purl.org/goodrelations/v1#",
           grddl:   "http://www.w3.org/2003/g/data-view#",
@@ -57,7 +57,7 @@ def self.find_with_rdfa_1_1(uri)
           license:     "http://www.w3.org/1999/xhtml/vocab#license",
           role:        "http://www.w3.org/1999/xhtml/vocab#role",
         },
-      })
+      )
     else
       find_without_rdfa_1_1(uri)
     end
diff --git a/lib/rdf/rdfa/expansion.rb b/lib/rdf/rdfa/expansion.rb
index 14eb9a98..b22d9367 100644
--- a/lib/rdf/rdfa/expansion.rb
+++ b/lib/rdf/rdfa/expansion.rb
@@ -17,7 +17,7 @@ def expand(repository)
       add_debug("expand") {"Repository has #{repository.count} statements"}
 
       # Load missing vocabularies
-      vocabs = repository.query(predicate: RDF::RDFA.usesVocabulary).to_a.map(&:object)
+      vocabs = repository.query({predicate: RDF::RDFA.usesVocabulary}).to_a.map(&:object)
       vocabs.map! do |vocab|
         begin
           # Create the name with a predictable name so that it is enumerated and can be found
diff --git a/lib/rdf/rdfa/reader.rb b/lib/rdf/rdfa/reader.rb
index b36fce77..1dfc291d 100644
--- a/lib/rdf/rdfa/reader.rb
+++ b/lib/rdf/rdfa/reader.rb
@@ -297,7 +297,7 @@ def self.options
     # @yieldparam  [RDF::Reader] reader
     # @yieldreturn [void] ignored
     # @raise [RDF::ReaderError] if _validate_
-    def initialize(input = $stdin, options = {}, &block)
+    def initialize(input = $stdin, **options, &block)
       super do
         @options = {reference_folding: true}.merge(@options)
         @repository = RDF::Repository.new
@@ -327,7 +327,7 @@ def initialize(input = $stdin, options = {}, &block)
         end
         self.extend(@implementation)
 
-        detect_host_language_version(input, options)
+        detect_host_language_version(input, **options)
 
         parse_lib = if @library == :nokogiri && @host_language == :html5
           begin
@@ -344,7 +344,7 @@ def initialize(input = $stdin, options = {}, &block)
         add_info(@doc, "version = #{@version},  host_language = #{@host_language}, library = #{parse_lib}, rdfagraph = #{@options[:rdfagraph].inspect}, expand = #{@options[:vocab_expansion]}")
 
         begin
-          initialize_xml(input, options)
+          initialize_xml(input, **options)
         rescue
           add_error(nil, "Malformed document: #{$!.message}")
         end
@@ -407,7 +407,7 @@ def extract_script(el, input, type, **options, &block)
         else
           input
         end
-        reader.new(doc, options).each(&block)
+        reader.new(doc, **options).each(&block)
       else
         add_debug(el, "=> no reader found")
       end
@@ -434,7 +434,7 @@ def each_statement(&block)
 
           # Look for Embedded RDF/XML
           unless @root.xpath("//rdf:RDF", "rdf" => "http://www.w3.org/1999/02/22-rdf-syntax-ns#").empty?
-            extract_script(@root, @doc, "application/rdf+xml", @options.merge(base_uri: base_uri)) do |statement|
+            extract_script(@root, @doc, "application/rdf+xml", **@options.merge(base_uri: base_uri)) do |statement|
               @repository << statement
             end
           end
@@ -444,7 +444,7 @@ def each_statement(&block)
             begin
               require 'rdf/microdata'
               add_debug(@doc, "process microdata")
-              @repository << RDF::Microdata::Reader.new(@doc, options)
+              @repository << RDF::Microdata::Reader.new(@doc, **options)
             rescue LoadError
               add_debug(@doc, "microdata detected, not processed")
             end
@@ -824,7 +824,7 @@ def traverse(element, evaluation_context)
       if element.name == 'script'
         text = element.inner_html.sub(%r(\A\s*\<!\[CDATA\[)m, '').sub(%r(\]\]>\s*\Z)m, '')
 
-        extract_script(element, text, attrs[:type], @options.merge(base_uri: base)) do |statement|
+        extract_script(element, text, attrs[:type], **@options.merge(base_uri: base)) do |statement|
           @repository << statement
         end
       end
@@ -1391,13 +1391,13 @@ def traverse(element, evaluation_context)
     end
 
     # space-separated TERMorCURIEorAbsIRI or SafeCURIEorCURIEorIRI
-    def process_uris(element, value, evaluation_context, base, options)
+    def process_uris(element, value, evaluation_context, base, **options)
       return [] if value.to_s.empty?
       add_debug(element) {"process_uris: #{value}"}
-      value.to_s.split(/\s+/).map {|v| process_uri(element, v, evaluation_context, base, options)}.compact
+      value.to_s.split(/\s+/).map {|v| process_uri(element, v, evaluation_context, base, **options)}.compact
     end
 
-    def process_uri(element, value, evaluation_context, base, options = {})
+    def process_uri(element, value, evaluation_context, base, **options)
       return if value.nil?
       restrictions = options[:restrictions]
       add_debug(element) {"process_uri: #{value}, restrictions = #{restrictions.inspect}"}
@@ -1418,7 +1418,7 @@ def process_uri(element, value, evaluation_context, base, options = {})
         # TERMorCURIEorAbsIRI
         # If the value is an NCName, then it is evaluated as a term according to General Use of Terms in
         # Attributes. Note that this step may mean that the value is to be ignored.
-        uri = process_term(element, value.to_s, options)
+        uri = process_term(element, value.to_s, **options)
         add_debug(element) {"process_uri: #{value} => term => #{uri ? uri.to_base : 'nil'}"}
         uri
       else
@@ -1457,7 +1457,7 @@ def process_uri(element, value, evaluation_context, base, options = {})
     end
 
     # [7.4.3] General Use of Terms in Attributes
-    def process_term(element, value, options)
+    def process_term(element, value, **options)
       if options[:vocab]
         # If there is a local default vocabulary, the IRI is obtained by concatenating that value and the term
         return uri(options[:vocab] + value)
diff --git a/lib/rdf/rdfa/reader/nokogiri.rb b/lib/rdf/rdfa/reader/nokogiri.rb
index 16dec850..fc69bb04 100644
--- a/lib/rdf/rdfa/reader/nokogiri.rb
+++ b/lib/rdf/rdfa/reader/nokogiri.rb
@@ -158,7 +158,7 @@ def method_missing(method, *args)
       #
       # @param  [Hash{Symbol => Object}] options
       # @return [void]
-      def initialize_xml(input, options = {})
+      def initialize_xml(input, **options)
         require 'nokogiri' unless defined?(::Nokogiri)
         @doc = case input
         when ::Nokogiri::HTML::Document, ::Nokogiri::XML::Document
@@ -189,7 +189,7 @@ def initialize_xml(input, options = {})
       end
 
       # Determine the host language and/or version from options and the input document
-      def detect_host_language_version(input, options)
+      def detect_host_language_version(input, **options)
         @host_language = options[:host_language] ? options[:host_language].to_sym : nil
         @version = options[:version] ? options[:version].to_sym : nil
         return if @host_language && @version
diff --git a/lib/rdf/rdfa/reader/rexml.rb b/lib/rdf/rdfa/reader/rexml.rb
index 43c701c8..4673dfbf 100644
--- a/lib/rdf/rdfa/reader/rexml.rb
+++ b/lib/rdf/rdfa/reader/rexml.rb
@@ -208,7 +208,7 @@ def method_missing(method, *args)
       #
       # @param  [Hash{Symbol => Object}] options
       # @return [void]
-      def initialize_xml(input, options = {})
+      def initialize_xml(input, **options)
         require 'rexml/document' unless defined?(::REXML)
         @doc = case input
         when ::REXML::Document
@@ -229,7 +229,7 @@ def initialize_xml(input, options = {})
       end
 
       # Determine the host language and/or version from options and the input document
-      def detect_host_language_version(input, options)
+      def detect_host_language_version(input, **options)
         @host_language = options[:host_language] ? options[:host_language].to_sym : nil
         @version = options[:version] ? options[:version].to_sym : nil
         return if @host_language && @version
diff --git a/lib/rdf/rdfa/writer.rb b/lib/rdf/rdfa/writer.rb
index 4f08802f..692502fc 100644
--- a/lib/rdf/rdfa/writer.rb
+++ b/lib/rdf/rdfa/writer.rb
@@ -116,7 +116,7 @@ def self.options
     #   Options to pass to Haml::Engine.new.
     # @yield  [writer]
     # @yieldparam [RDF::Writer] writer
-    def initialize(output = $stdout, options = {}, &block)
+    def initialize(output = $stdout, **options, &block)
       super do
         @uri_to_term_or_curie = {}
         @uri_to_prefix = {}
@@ -175,7 +175,7 @@ def write_epilogue
       doc_title = nil
       titles = {}
       heading_predicates.each do |pred|
-        @graph.query(predicate: pred) do |statement|
+        @graph.query({predicate: pred}) do |statement|
           titles[statement.subject] ||= statement.object
         end
       end
@@ -220,14 +220,14 @@ def write_epilogue
     # @yieldreturn [:ignored]
     # @return String
     #   The rendered document is returned as a string
-    def render_document(subjects, options = {})
+    def render_document(subjects, **options)
       template = options[:haml] || :doc
       options = {
         prefix: nil,
         subjects: subjects,
         title: nil,
       }.merge(options)
-      hamlify(template, options) do |subject|
+      hamlify(template, **options) do |subject|
         yield(subject) if block_given?
       end.gsub(/^\s+$/m, '')
     end
@@ -265,7 +265,7 @@ def render_document(subjects, options = {})
     # @return String
     #   The rendered document is returned as a string
     # Return Haml template for document from `haml_template[:subject]`
-    def render_subject(subject, predicates, options = {})
+    def render_subject(subject, predicates, **options)
       template = options[:haml] || :subject
       options = {
         about:      (get_curie(subject) unless options[:rel]),
@@ -278,7 +278,7 @@ def render_subject(subject, predicates, options = {})
         subject:    subject,
         typeof:     nil,
       }.merge(options)
-      hamlify(template, options) do |predicate|
+      hamlify(template, **options) do |predicate|
         yield(predicate) if block_given?
       end
     end
@@ -303,7 +303,7 @@ def render_subject(subject, predicates, options = {})
     #   The block should only return a string for recursive object definitions.
     # @return String
     #   The rendered document is returned as a string
-    def render_property(predicate, objects, options = {}, &block)
+    def render_property(predicate, objects, **options, &block)
       log_debug {"render_property(#{predicate}): #{objects.inspect}, #{options.inspect}"}
       # If there are multiple objects, and no :property_values is defined, call recursively with
       # each object
@@ -319,7 +319,7 @@ def render_property(predicate, objects, options = {}, &block)
       unless list_objects.empty?
         # Render non-list objects
         log_debug {"properties with lists: #{list_objects} non-lists: #{objects - list_objects}"}
-        nl = log_depth {render_property(predicate, objects - list_objects, options, &block)} unless objects == list_objects
+        nl = log_depth {render_property(predicate, objects - list_objects, **options, &block)} unless objects == list_objects
         return nl.to_s + list_objects.map do |object|
           # Render each list as multiple properties and set :inlist to true
           list = RDF::List.new(subject: object, graph: @graph)
@@ -327,7 +327,7 @@ def render_property(predicate, objects, options = {}, &block)
 
           log_debug {"list: #{list.inspect} #{list.to_a}"}
           log_depth do
-            render_property(predicate, list.to_a, options.merge(inlist: "true")) do |object|
+            render_property(predicate, list.to_a, **options.merge(inlist: "true")) do |object|
               yield(object, true) if block_given?
             end
           end
@@ -337,7 +337,7 @@ def render_property(predicate, objects, options = {}, &block)
       if objects.length > 1 && template.nil?
         # If there is no property_values template, render each property using property_value template
         objects.map do |object|
-          log_depth {render_property(predicate, [object], options, &block)}
+          log_depth {render_property(predicate, [object], **options, &block)}
         end.join(" ")
       else
         log_fatal("Missing property template", exception: RDF::WriterError) if template.nil?
@@ -406,7 +406,7 @@ def order_subjects
       top_classes.
       select {|s| !seen.include?(s)}.
       each do |class_uri|
-        graph.query(predicate: RDF.type, object: class_uri).map {|st| st.subject}.sort.uniq.each do |subject|
+        graph.query({predicate: RDF.type, object: class_uri}).map {|st| st.subject}.sort.uniq.each do |subject|
           #log_debug {"order_subjects: #{subject.inspect}"}
           subjects << subject
           seen[subject] = true
@@ -490,7 +490,7 @@ def reset
     # @option options [RDF::Resource] :rel (nil)
     #   Optional @rel property
     # @return [String]
-    def subject(subject, options = {})
+    def subject(subject, **options)
       return if is_done?(subject)
 
       subject_done(subject)
@@ -503,14 +503,14 @@ def subject(subject, options = {})
 
       render_opts = {typeof: typeof, property_values: properties}.merge(options)
 
-      render_subject_template(subject, prop_list, render_opts)
+      render_subject_template(subject, prop_list, **render_opts)
     end
 
     # @param [RDF::Resource] subject
     # @return [Hash{String => Object}]
     def properties_for_subject(subject)
       properties = {}
-      @graph.query(subject: subject) do |st|
+      @graph.query({subject: subject}) do |st|
         key = st.predicate.to_s.freeze
         properties[key] ||= []
         properties[key] << st.object
@@ -545,7 +545,7 @@ def type_of(type, subject)
     # @param [Array] prop_list
     # @param [Hash] render_opts
     # @return [String]
-    def render_subject_template(subject, prop_list, render_opts)
+    def render_subject_template(subject, prop_list, **render_opts)
       # See if there's a template based on the sorted concatenation of all types of this subject
       # or any type of this subject
       tmpl = find_template(subject)
@@ -555,7 +555,7 @@ def render_subject_template(subject, prop_list, render_opts)
       # If :rel is specified and :typeof is nil, use @resource instead of @about.
       # Pass other options from calling context
       with_template(tmpl) do
-        render_subject(subject, prop_list, render_opts) do |pred|
+        render_subject(subject, prop_list, **render_opts) do |pred|
           log_depth do
             pred = RDF::URI(pred) if pred.is_a?(String)
             values = render_opts[:property_values][pred.to_s]
diff --git a/rdf-rdfa.gemspec b/rdf-rdfa.gemspec
index d04b392f..dc55b932 100755
--- a/rdf-rdfa.gemspec
+++ b/rdf-rdfa.gemspec
@@ -18,22 +18,20 @@ Gem::Specification.new do |gem|
   gem.files                 = %w(AUTHORS README.md UNLICENSE VERSION) + Dir.glob('lib/**/*.rb')
   gem.require_paths         = %w(lib)
 
-  gem.required_ruby_version = '>= 2.2.2'
+  gem.required_ruby_version = '>= 2.4'
   gem.requirements          = []
 
-  gem.add_runtime_dependency     'rdf',                 '~> 3.0'
-  gem.add_runtime_dependency     'haml',                '~> 5.0'
+  gem.add_runtime_dependency     'rdf',                 '~> 3.1'
+  gem.add_runtime_dependency     'haml',                '~> 5.1'
   gem.add_runtime_dependency     'rdf-xsd',             '~> 3.0'
-  #gem.add_runtime_dependency     'rdf-aggregate-repo',  '~> 3.0'
-  gem.add_runtime_dependency     'rdf-aggregate-repo',  '>= 2.2', '< 4.0'
+  gem.add_runtime_dependency     'rdf-aggregate-repo',  '~> 3.1'
   gem.add_runtime_dependency     'htmlentities',        '~> 4.3'
 
-  #gem.add_development_dependency 'json-ld',             '~> 3.0'
-  gem.add_development_dependency 'json-ld',             '>= 2.1', '< 4.0'
-  gem.add_development_dependency 'rspec',               '~> 3.7'
-  gem.add_development_dependency 'rspec-its',           '~> 1.2'
-  gem.add_development_dependency 'rdf-spec',            '~> 3.0'
-  gem.add_development_dependency 'rdf-turtle',          '~> 3.0'
+  gem.add_development_dependency 'json-ld',             '>= 3.1'
+  gem.add_development_dependency 'rspec',               '~> 3.9'
+  gem.add_development_dependency 'rspec-its',           '~> 1.3'
+  gem.add_development_dependency 'rdf-spec',            '~> 3.1'
+  gem.add_development_dependency 'rdf-turtle',          '~> 3.1'
   gem.add_development_dependency 'rdf-vocab',           '~> 3.0'
   gem.add_development_dependency 'rdf-isomorphic',      '~> 3.0'
   #gem.add_development_dependency 'rdf-tabular',         '~> 3.0'
@@ -41,7 +39,7 @@ Gem::Specification.new do |gem|
   #gem.add_development_dependency 'rdf-rdfxml',          '~> 3.0'
   gem.add_development_dependency 'rdf-rdfxml',          '>= 2.2', '< 4.0'
   gem.add_development_dependency 'sparql',              '~> 3.0'
-  gem.add_development_dependency 'yard' ,               '~> 0.9.12'
+  gem.add_development_dependency 'yard' ,               '~> 0.9.20'
 
   gem.post_install_message  = nil
 end
diff --git a/script/intern_context b/script/intern_context
index 3900fedb..516c2052 100755
--- a/script/intern_context
+++ b/script/intern_context
@@ -62,7 +62,7 @@ ARGV.each do |file|
 class RDF::RDFa::Context
   def self.find_with_#{context_short}(uri)
     if uri.to_s == "#{file}"
-      @_#{context_short}_prof ||= RDF::RDFa::Context.new(RDF::URI("#{file}"), {
+      @_#{context_short}_prof ||= RDF::RDFa::Context.new(RDF::URI("#{file}"),
 START
 
     output.puts %{#{preceeding}vocabulary: "#{context.vocabulary},"} if context.vocabulary
@@ -81,7 +81,7 @@ START
     end
     
     output.puts <<END
-      })
+      )
     else
       find_without_#{context_short}(uri)
     end
diff --git a/script/parse b/script/parse
index 3cdd4941..197be884 100755
--- a/script/parse
+++ b/script/parse
@@ -13,7 +13,7 @@ end
 require 'getoptlong'
 require 'open-uri'
 
-def run(input, options)
+def run(input, **options)
   reader_class = RDF::Reader.for(options[:input_format].to_sym)
   raise "Reader not found for #{$input_format}" unless reader_class
   
@@ -25,7 +25,7 @@ def run(input, options)
   num = 0
 
   if options[:output_format] == :ntriples || options[:quiet]
-    reader_class.new(input, options).each do |statement|
+    reader_class.new(input, **options).each do |statement|
       num += 1
       if options[:quiet]
         #print "."
@@ -34,12 +34,12 @@ def run(input, options)
       end
     end
   elsif options[:output_format] == :inspect
-    reader_class.new(input, options).each do |statement|
+    reader_class.new(input, **options).each do |statement|
       num += 1
       options[:output].puts statement.inspect
     end
   else
-    r = reader_class.new(input, options)
+    r = reader_class.new(input, **options)
     g = RDF::Repository.new << r
     num = g.count
     STDERR.puts "graph: #{g.dump(:ttl)}" if options[:verbose]
@@ -111,7 +111,7 @@ end
 if ARGV.empty?
   s = input ? input : $stdin.read
   options[:base_uri] ||= "http://example.com/"
-  run(StringIO.new(s), options)
+  run(StringIO.new(s), **options)
 else
   ARGV.each do |test_file|
     tf_opt = options.dup
diff --git a/script/tc b/script/tc
index 97c93063..f04650ec 100755
--- a/script/tc
+++ b/script/tc
@@ -8,7 +8,7 @@ require File.expand_path(File.join(File.dirname(__FILE__), "..", 'spec', 'spec_h
 require File.expand_path(File.join(File.dirname(__FILE__), "..", 'spec', 'suite_helper'))
 require 'getoptlong'
 
-def run_tc(tc, options)
+def run_tc(tc, **options)
   input_uri = tc.input(options[:host_language], options[:version])
   results_uri = tc.results(options[:host_language], options[:version])
   res = nil
@@ -36,7 +36,7 @@ def run_tc(tc, options)
       options[opt] = arg
     end
 
-    reader = RDF::RDFa::Reader.open(input_uri, options)
+    reader = RDF::RDFa::Reader.open(input_uri, **options)
 
     graph = RDF::Repository.new << reader
   rescue Exception => e
diff --git a/spec/expansion_spec.rb b/spec/expansion_spec.rb
index 61ead2e4..d148875d 100644
--- a/spec/expansion_spec.rb
+++ b/spec/expansion_spec.rb
@@ -511,9 +511,7 @@ def parse(ttl)
     end
   end
 
-  def parse(input, options = {})
-    RDF::Graph.new << RDF::RDFa::Reader.new(input, options.merge(
-      logger: logger, vocab_expansion: true
-    ))
+  def parse(input, **options)
+    RDF::Graph.new << RDF::RDFa::Reader.new(input, logger: logger, vocab_expansion: true, **options)
   end
 end
diff --git a/spec/reader_spec.rb b/spec/reader_spec.rb
index 2852cde3..76831cc9 100644
--- a/spec/reader_spec.rb
+++ b/spec/reader_spec.rb
@@ -1715,7 +1715,7 @@
               <html>
               <head>
               <base href="http://example.org/" />
-              <script type="application/ld+json"><![CDATA[
+              <script type="application/ld+json">
                 {
                   "@context": {
                     "foo": "http://example/xyz#",
@@ -1728,7 +1728,7 @@
                   "rdfs:seeAlso": {"@id": "http://example/xyz"},
                   "gr:hasLegalName": "Hepp Industries Ltd."
                 }
-              ]]></script>
+              </script>
               </head>
               </html>
             ),
@@ -2662,9 +2662,9 @@
     end
   end
 
-  def parse(input, options = {})
+  def parse(input, **options)
     graph = RDF::Graph.new
-    RDF::RDFa::Reader.new(input, options.merge(logger: logger, library: @library)).each do |statement|
+    RDF::RDFa::Reader.new(input, logger: logger, library: @library, **options).each do |statement|
       graph << statement rescue fail "SPEC: #{$!}"
     end
     graph
diff --git a/spec/suite_helper.rb b/spec/suite_helper.rb
index 950d09a5..f39b5817 100644
--- a/spec/suite_helper.rb
+++ b/spec/suite_helper.rb
@@ -22,7 +22,7 @@ class << self
     #   HTTP Request headers.
     # @return [IO] File stream
     # @yield [IO] File stream
-    def self.open_file(filename_or_url, options = {}, &block)
+    def self.open_file(filename_or_url, **options, &block)
       case
       when filename_or_url.to_s =~ /^file:/
         path = filename_or_url[5..-1]
@@ -57,14 +57,14 @@ def self.open_file(filename_or_url, options = {}, &block)
         # For overriding content type from test data
         document_options[:headers][:content_type] = options[:contentType] if options[:contentType]
 
-        remote_document = RDF::Util::File::RemoteDocument.new(response.read, document_options)
+        remote_document = RDF::Util::File::RemoteDocument.new(response.read, **document_options)
         if block_given?
           yield remote_document
         else
           remote_document
         end
       else
-        original_open_file(filename_or_url, options, &block)
+        original_open_file(filename_or_url, **options, &block)
       end
     end
   end
diff --git a/spec/suite_spec.rb b/spec/suite_spec.rb
index 7e46cfc5..a7dde27b 100644
--- a/spec/suite_spec.rb
+++ b/spec/suite_spec.rb
@@ -32,7 +32,7 @@
 
                     validate = %w(0239 0279 0295 0284).none? {|n| t.input(host_language, version).to_s.include?(n)}
                     graph = RDF::Repository.new
-                    RDF::Reader.open(t.input(host_language, version), options.merge(validate: validate)) do |reader|
+                    RDF::Reader.open(t.input(host_language, version), **options.merge(validate: validate)) do |reader|
                       expect(reader).to be_a RDF::RDFa::Reader
 
                       # Some allowances for REXML
diff --git a/spec/writer_spec.rb b/spec/writer_spec.rb
index 4c804c74..b94bd04b 100644
--- a/spec/writer_spec.rb
+++ b/spec/writer_spec.rb
@@ -564,7 +564,7 @@ class EX < RDF::Vocabulary("http://example/"); end
             logger.info result.force_encoding("utf-8")
             graph2 = parse(result, format: :rdfa, logger: logger)
             # Need to put this in to avoid problems with added markup
-            statements = graph2.query(object: RDF::URI("http://rdf.kellogg-assoc.com/css/distiller.css")).to_a
+            statements = graph2.query({object: RDF::URI("http://rdf.kellogg-assoc.com/css/distiller.css")}).to_a
             statements.each {|st| graph2.delete(st)}
             #puts graph2.dump(:ttl)
             expect(graph2).to be_equivalent_graph(@graph, logger: logger)
@@ -575,20 +575,20 @@ class EX < RDF::Vocabulary("http://example/"); end
   end unless ENV['CI'] # Not for continuous integration
 
   require 'rdf/turtle'
-  def parse(input, options = {})
+  def parse(input, **options)
     reader_class = RDF::Reader.for(options[:format]) if options[:format]
     reader_class ||= options.fetch(:reader, RDF::Reader.for(detect_format(input)))
 
     graph = RDF::Repository.new
-    reader_class.new(input, options).each do |statement|
+    reader_class.new(input, **options).each do |statement|
       graph << statement
     end
     graph
   end
 
   # Serialize  @graph to a string and compare against regexps
-  def serialize(options = {})
-    result = RDF::RDFa::Writer.buffer({logger: logger, standard_prefixes: true}.merge(options)) do |writer|
+  def serialize(**options)
+    result = RDF::RDFa::Writer.buffer(logger: logger, standard_prefixes: true, **options) do |writer|
       writer << @graph
     end
     require 'cgi'

From d0647b943589e0db38776eb9f72e194208438ec1 Mon Sep 17 00:00:00 2001
From: Gregg Kellogg <gregg@greggkellogg.net>
Date: Sat, 14 Dec 2019 10:39:57 -0800
Subject: [PATCH 14/15] Fix bundler args in travis.

---
 .travis.yml          |  1 -
 Gemfile              |  4 ++--
 spec/suite_helper.rb | 12 ++++++------
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2b531323..55c863b3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,4 @@
 language: ruby
-bundler_args: --without debug
 script: "bundle exec rspec spec"
 env:
   - CI=true
diff --git a/Gemfile b/Gemfile
index 3195fd90..2b3781a6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -25,8 +25,8 @@ group :development, :test do
 end
 
 group :test do
-  gem 'simplecov',      require: false
-  gem 'coveralls',      require: false
+  gem 'simplecov',      platforms: :mri
+  gem 'coveralls',      '~> 0.8', platforms: :mri
   gem 'psych',          platforms: [:mri, :rbx]
 end
 
diff --git a/spec/suite_helper.rb b/spec/suite_helper.rb
index f39b5817..4d75f853 100644
--- a/spec/suite_helper.rb
+++ b/spec/suite_helper.rb
@@ -45,12 +45,12 @@ def self.open_file(filename_or_url, **options, &block)
         document_options[:headers][:content_type] = case filename_or_url.to_s
         when /\.html$/    then 'text/html'
         when /\.xhtml$/   then 'application/xhtml+xml'
-        when /\.xml$/    then 'application/xml'
-        when /\.svg$/    then 'image/svg+xml'
-        when /\.ttl$/    then 'text/turtle'
-        when /\.ttl$/    then 'text/turtle'
-        when /\.jsonld$/ then 'application/ld+json'
-        else                  'unknown'
+        when /\.xml$/     then 'application/xml'
+        when /\.svg$/     then 'image/svg+xml'
+        when /\.ttl$/     then 'text/turtle'
+        when /\.ttl$/     then 'text/turtle'
+        when /\.jsonld$/  then 'application/ld+json'
+        else                   'unknown'
         end
 
         document_options[:headers][:content_type] = response.content_type if response.respond_to?(:content_type)

From 8b6dab15e0574a26b0f2858d2725ee01a6be1800 Mon Sep 17 00:00:00 2001
From: Gregg Kellogg <gregg@greggkellogg.net>
Date: Mon, 16 Dec 2019 13:31:56 -0800
Subject: [PATCH 15/15] Update dependencies.

---
 rdf-rdfa.gemspec | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/rdf-rdfa.gemspec b/rdf-rdfa.gemspec
index dc55b932..96540ace 100755
--- a/rdf-rdfa.gemspec
+++ b/rdf-rdfa.gemspec
@@ -23,22 +23,20 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency     'rdf',                 '~> 3.1'
   gem.add_runtime_dependency     'haml',                '~> 5.1'
-  gem.add_runtime_dependency     'rdf-xsd',             '~> 3.0'
+  gem.add_runtime_dependency     'rdf-xsd',             '~> 3.1'
   gem.add_runtime_dependency     'rdf-aggregate-repo',  '~> 3.1'
   gem.add_runtime_dependency     'htmlentities',        '~> 4.3'
 
-  gem.add_development_dependency 'json-ld',             '>= 3.1'
+  gem.add_development_dependency 'json-ld',             '~> 3.1'
   gem.add_development_dependency 'rspec',               '~> 3.9'
   gem.add_development_dependency 'rspec-its',           '~> 1.3'
   gem.add_development_dependency 'rdf-spec',            '~> 3.1'
   gem.add_development_dependency 'rdf-turtle',          '~> 3.1'
-  gem.add_development_dependency 'rdf-vocab',           '~> 3.0'
-  gem.add_development_dependency 'rdf-isomorphic',      '~> 3.0'
-  #gem.add_development_dependency 'rdf-tabular',         '~> 3.0'
-  gem.add_development_dependency 'rdf-tabular',         '>= 2.2', '< 4.0'
-  #gem.add_development_dependency 'rdf-rdfxml',          '~> 3.0'
-  gem.add_development_dependency 'rdf-rdfxml',          '>= 2.2', '< 4.0'
-  gem.add_development_dependency 'sparql',              '~> 3.0'
+  gem.add_development_dependency 'rdf-vocab',           '~> 3.1'
+  gem.add_development_dependency 'rdf-isomorphic',      '~> 3.1'
+  gem.add_development_dependency 'rdf-tabular',         '~> 3.1'
+  gem.add_development_dependency 'rdf-rdfxml',          '~> 3.1'
+  gem.add_development_dependency 'sparql',              '~> 3.1'
   gem.add_development_dependency 'yard' ,               '~> 0.9.20'
 
   gem.post_install_message  = nil