rdf-rdfa 2.2.4 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 65decdbbe451753089e298d2fd57ed0397015480
-  data.tar.gz: 2581b1de4f47366fb7c5282b5e25caaa40707866
+SHA256:
+  metadata.gz: 417ba955ce570c72bfe1754246a214b35597c0c8ab65df29457f28b21f0e89ef
+  data.tar.gz: a266a47e8d0548e57f4033d183235139c658d0663b3983080af492555d52150d
 SHA512:
-  metadata.gz: e8d93f082142bdf9b755d0b497c37712ef772a98ed5af70eacc8ae6acc7db0b774388f5c6897ca16000107e8722769b1f915f4242c5f0ca77bacbb5cfc906267
-  data.tar.gz: 9f6f4cbcc873ac0390d192488580c3cdc8c64a57f2fb1127cd1e22e93451a8607ffcff1209950fbee68b64e8e5346ca72a1dce3d9d6f84b80fa7f182e96ca6b3
+  metadata.gz: d5103efb22006992f5e8f63d27cecd868563a6352a0432e112a19ff9a531f7e2eeeb1fa8ccaef3f3d7db381942065bb931957f97fcd539d6c4b35c8a0998db0b
+  data.tar.gz: b5edc843e6b115cce6a5ccb9207e53beb3590c5007465336953b11fced26fffe955602cbd62b28352eddadc2aea3d651ec98aeb6318d0556b4c6783568430dda

data/AUTHORS

@@ -1 +1 @@
-* Gregg Kellogg <gregg@kellogg-assoc.com>
+* Gregg Kellogg <gregg@greggkellogg.net>

data/README.md

@@ -3,8 +3,8 @@ This repository uses [Git Flow](https://github.com/nvie/gitflow) to mange develo
 
 [RDFa][RDFa 1.1 Core] parser for RDF.rb.
 
-[![Gem Version](https://badge.fury.io/rb/rdf-rdfa.png)](http://badge.fury.io/rb/rdf-rdfa)
-[![Build Status](https://travis-ci.org/ruby-rdf/rdf-rdfa.png?branch=master)](http://travis-ci.org/ruby-rdf/rdf-rdfa)
+[![Gem Version](https://badge.fury.io/rb/rdf-rdfa.png)](https://badge.fury.io/rb/rdf-rdfa)
+[![Build Status](https://travis-ci.org/ruby-rdf/rdf-rdfa.png?branch=master)](https://travis-ci.org/ruby-rdf/rdf-rdfa)
 [![Coverage Status](https://coveralls.io/repos/ruby-rdf/rdf-rdfa/badge.svg)](https://coveralls.io/r/ruby-rdf/rdf-rdfa)
 
 ## DESCRIPTION
@@ -15,8 +15,8 @@ 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.
+  * Writer uses user-replaceable [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 a pure-HTML5 parser with better error detection.
 
 Install with `gem install rdf-rdfa`
 
@@ -37,7 +37,7 @@ This version fully supports the limited syntax of [RDFa Lite 1.1][]. This includ
 One of the issues with vocabularies was that they discourage re-use of existing vocabularies when terms from several vocabularies are used at the same time. As it is common (encouraged) for RDF vocabularies to form sub-class and/or sub-property relationships with well defined vocabularies, the RDFa vocabulary expansion mechanism takes advantage of this.
 
 As an optional part of RDFa processing, an RDFa processor will perform limited
-[OWL 2 RL Profile entailment](http://www.w3.org/TR/2009/REC-owl2-profiles-20091027/#Reasoning_in_OWL_2_RL_and_RDF_Graphs_using_Rules),
+[OWL 2 RL Profile entailment](https://www.w3.org/TR/2009/REC-owl2-profiles-20091027/#Reasoning_in_OWL_2_RL_and_RDF_Graphs_using_Rules),
 specifically rules prp-eqp1, prp-eqp2, cax-sco, cax-eqc1, and
 cax-eqc2. This causes sub-classes and sub-properties of type and property IRIs to be added
 to the output graph.
@@ -123,24 +123,24 @@ The @typeof attribute has changed; previously, it always created a new subject,
 
 For example:
 
-    <div typeof="foaf:Person" about="http://greggkellogg.net/foaf#me">
+    <div typeof="foaf:Person" about="https://greggkellogg.net/foaf#me">
       <p property="name">Gregg Kellogg</span>
-      <a rel="knows" typeof="foaf:Person" href="http://manu.sporny.org/#this">
+      <a rel="knows" typeof="foaf:Person" href="https://manu.sporny.org/#this">
         <span property="name">Manu Sporny</span>
       </a>
     </div>
 
 results in
 
-    <http://greggkellogg.net/foaf#me> a foaf:Person;
+    <https://greggkellogg.net/foaf#me> a foaf:Person;
       foaf:name "Gregg Kellogg";
-      foaf:knows <http://manu.sporny.org/#this> .
-    <http://manu.sporny.org/#this> a foaf:Person;
+      foaf:knows <https://manu.sporny.org/#this> .
+    <https://manu.sporny.org/#this> a foaf:Person;
       foaf:name "Manu Sporny" .
 
 Note that if the explicit @href is not present, i.e.,
 
-    <div typeof="foaf:Person" about="http://greggkellogg.net/foaf#me">
+    <div typeof="foaf:Person" about="https://greggkellogg.net/foaf#me">
       <p property="name">Gregg Kellogg</span>
       <a href="knows" typeof="foaf:Person">
         <span property="name">Manu Sporny</span>
@@ -149,7 +149,7 @@ Note that if the explicit @href is not present, i.e.,
 
 this results in
 
-    <http://greggkellogg.net/foaf#me> a foaf:Person;
+    <https://greggkellogg.net/foaf#me> a foaf:Person;
       foaf:name "Gregg Kellogg";
       foaf:knows [ 
             a foaf:Person;
@@ -397,24 +397,18 @@ The template hash defines four Haml templates:
     }
 
 ## Dependencies
-* [Ruby](http://ruby-lang.org/) (>= 2.2)
-* [RDF.rb](http://rubygems.org/gems/rdf) (>= 2.2)
-* [Haml](https://rubygems.org/gems/haml) (>= 4.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](https://ruby-lang.org/) (>= 2.4)
+* [RDF.rb](https://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](https://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]
 
 ### Principle Classes
 * {RDF::RDFa::Format}
-  * {RDF::RDFa::HTML}
-    Asserts :html format, text/html mime-type and .html file extension.
-  * {RDF::RDFa::XHTML}
-    Asserts :html format, application/xhtml+xml mime-type and .xhtml file extension.
-  * {RDF::RDFa::SVG}
-    Asserts :svg format, image/svg+xml mime-type and .svg file extension.
 * {RDF::RDFa::Reader}
   * {RDF::RDFa::Reader::Nokogiri}
   * {RDF::RDFa::Reader::REXML}
@@ -422,11 +416,6 @@ Full documentation available on [Rubydoc.info][RDFa doc]
 * {RDF::RDFa::Expansion}
 * {RDF::RDFa::Writer}
 
-### Additional vocabularies
-* {RDF::RDFA}
-* {RDF::XML}
-* {RDF::XSI}
-
 ## TODO
 * Add support for LibXML and REXML bindings, and use the best available
 * Consider a SAX-based parser for improved performance
@@ -438,13 +427,13 @@ Full documentation available on [Rubydoc.info][RDFa doc]
 * [History](file:History.md)
 * [RDFa 1.1 Core][RDFa 1.1 Core]
 * [XHTML+RDFa 1.1][XHTML+RDFa 1.1]
-* [RDFa-test-suite](http://rdfa.info/test-suite/              "RDFa test suite")
+* [RDFa-test-suite](https://rdfa.info/test-suite/              "RDFa test suite")
 
 ## Author
-* [Gregg Kellogg](http://github.com/gkellogg) - <http://greggkellogg.net/>
+* [Gregg Kellogg](https://github.com/gkellogg) - <https://greggkellogg.net/>
 
 ## Contributors
-* [Nicholas Humfrey](http://github.com/njh) - <http://njh.me/>
+* [Nicholas Humfrey](https://github.com/njh) - <https://njh.me/>
 
 ## Contributing
 This repository uses [Git Flow](https://github.com/nvie/gitflow) to mange development and release activity. All submissions _must_ be on a feature branch based on the _develop_ branch to ease staging and integration.
@@ -464,27 +453,27 @@ This repository uses [Git Flow](https://github.com/nvie/gitflow) to mange develo
 ## License
 
 This is free and unencumbered public domain software. For more information,
-see <http://unlicense.org/> or the accompanying [UNLICENSE](UNLICENSE) file.
+see <https://unlicense.org/> or the accompanying [UNLICENSE](UNLICENSE) file.
 
 ## FEEDBACK
 
 * gregg@greggkellogg.net
-* <http://rubygems.org/rdf-rdfa>
-* <http://github.com/ruby-rdf/rdf-rdfa>
-* <http://lists.w3.org/Archives/Public/public-rdf-ruby/>
-
-[RDF.rb]:           http://rubygems.org/gems/rdf
-[YARD]:             http://yardoc.org/
-[YARD-GS]:          http://rubydoc.info/docs/yard/file/docs/GettingStarted.md
-[PDD]:              http://lists.w3.org/Archives/Public/public-rdf-ruby/2010May/0013.html
-[RDFa 1.1 Core]:    http://www.w3.org/TR/2012/REC-rdfa-core-20120607/                    "RDFa 1.1 Core"
-[RDFa Lite 1.1]:    http://www.w3.org/TR/2012/REC-rdfa-lite-20120607/                    "RDFa Lite 1.1"
-[XHTML+RDFa 1.1]:   http://www.w3.org/TR/2012/REC-xhtml-rdfa-20120607/                   "XHTML+RDFa 1.1"
-[HTML+RDFa 1.1]:    http://www.w3.org/TR/rdfa-in-html/                                   "HTML+RDFa 1.1"
-[RDFa-test-suite]:  http://rdfa.info/test-suite/                                         "RDFa test suite"
-[Role Attr]:        http://www.w3.org/TR/role-attribute/                                 "Role Attribute"
-[RDFa doc]:         http://rubydoc.info/github/ruby-rdf/rdf-rdfa/frames
-[Haml]:             http://haml-lang.com/
-[Turtle]:           http://www.w3.org/TR/2011/WD-turtle-20110809/
-[Nokogiri]:         http://www.nokogiri.org
+* <https://rubygems.org/rdf-rdfa>
+* <https://github.com/ruby-rdf/rdf-rdfa>
+* <https://lists.w3.org/Archives/Public/public-rdf-ruby/>
+
+[RDF.rb]:           https://rubygems.org/gems/rdf
+[YARD]:             https://yardoc.org/
+[YARD-GS]:          https://rubydoc.info/docs/yard/file/docs/GettingStarted.md
+[PDD]:              https://lists.w3.org/Archives/Public/public-rdf-ruby/2010May/0013.html
+[RDFa 1.1 Core]:    https://www.w3.org/TR/2012/REC-rdfa-core-20120607/                    "RDFa 1.1 Core"
+[RDFa Lite 1.1]:    https://www.w3.org/TR/2012/REC-rdfa-lite-20120607/                    "RDFa Lite 1.1"
+[XHTML+RDFa 1.1]:   https://www.w3.org/TR/2012/REC-xhtml-rdfa-20120607/                   "XHTML+RDFa 1.1"
+[HTML+RDFa 1.1]:    https://www.w3.org/TR/rdfa-in-html/                                   "HTML+RDFa 1.1"
+[RDFa-test-suite]:  https://rdfa.info/test-suite/                                         "RDFa test suite"
+[Role Attr]:        https://www.w3.org/TR/role-attribute/                                 "Role Attribute"
+[RDFa doc]:         https://rubydoc.info/github/ruby-rdf/rdf-rdfa/frames
+[Haml]:             https://haml-lang.com/
+[Turtle]:           https://www.w3.org/TR/2011/WD-turtle-20110809/
+[Nokogiri]:         https://www.nokogiri.org
 [Nokogumbo]:        https://github.com/rubys/nokogumbo/#readme

data/UNLICENSE

@@ -21,4 +21,4 @@ OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
 ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 OTHER DEALINGS IN THE SOFTWARE.
 
-For more information, please refer to <http://unlicense.org/>
+For more information, please refer to <https://unlicense.org/>

data/VERSION

@@ -1 +1 @@
-2.2.4
+3.1.2

data/lib/rdf/rdfa.rb

@@ -15,13 +15,13 @@ module RDF
   #     end
   #   end
   #
-  # @see http://rubygems.org/gems/rdf
-  # @see http://www.w3.org/TR/rdfa-syntax/#s_model RDFa 1.0
-  # @see http://www.w3.org/TR/2012/REC-rdfa-core-20120607/
-  # @see http://www.w3.org/TR/2012/CR-xhtml-rdfa-20120313/
-  # @see http://dev.w3.org/html5/rdfa/
+  # @see https://rubygems.org/gems/rdf
+  # @see https://www.w3.org/TR/rdfa-syntax/#s_model RDFa 1.0
+  # @see https://www.w3.org/TR/2012/REC-rdfa-core-20120607/
+  # @see https://www.w3.org/TR/2012/CR-xhtml-rdfa-20120313/
+  # @see https://dev.w3.org/html5/rdfa/
   #
-  # @author [Gregg Kellogg](http://kellogg-assoc.com/)
+  # @author [Gregg Kellogg](https://greggkellogg.net/)
   module RDFa
     require 'rdf/rdfa/format'
     require 'rdf/rdfa/vocab'

data/lib/rdf/rdfa/context.rb

@@ -40,7 +40,7 @@ module RDF::RDFa
     # @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 @@ module RDF::RDFa
       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)

data/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

data/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 @@ class RDF::RDFa::Context
           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

data/lib/rdf/rdfa/context/xml.rb

@@ -4,8 +4,9 @@
 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#",
           csvw:    "http://www.w3.org/ns/csvw#",
           ctag:    "http://commontag.org/ns#",
@@ -13,11 +14,17 @@ class RDF::RDFa::Context
           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/ns/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#",
+          jsonld:  "http://www.w3.org/ns/json-ld#",
+          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 +41,9 @@ class RDF::RDFa::Context
           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#",
@@ -48,7 +58,7 @@ class RDF::RDFa::Context
           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

data/lib/rdf/rdfa/expansion.rb

@@ -12,12 +12,12 @@ module RDF::RDFa
     #   Vocabulary expansion uses the built-in reasoner using included vocabularies from RDF.rb.
     #
     # @param [RDF::Repository] repository
-    # @see [OWL2 PROFILES](http://www.w3.org/TR/2009/REC-owl2-profiles-20091027/#Reasoning_in_OWL_2_RL_and_RDF_Graphs_using_Rules)
+    # @see [OWL2 PROFILES](https://www.w3.org/TR/2009/REC-owl2-profiles-20091027/#Reasoning_in_OWL_2_RL_and_RDF_Graphs_using_Rules)
     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
@@ -45,7 +45,7 @@ module RDF::RDFa
     # Subsequently, remove reference rdfa:Pattern objects.
     #
     # @param [RDF::Repository] repository
-    # @see [HTML+RDFa](http://www.w3.org/TR/rdfa-in-html/#rdfa-reference-folding)
+    # @see [HTML+RDFa](https://www.w3.org/TR/rdfa-in-html/#rdfa-reference-folding)
     def copy_properties(repository)
       add_debug("expand") {"Repository has #{repository.size} statements"}
       fold(repository)

data/lib/rdf/rdfa/format.rb

@@ -16,7 +16,7 @@ module RDF::RDFa
   # @example Obtaining serialization format file extension mappings
   #   RDF::Format.file_extensions    #=> {xhtml: "application/xhtml+xml"}
   #
-  # @see http://www.w3.org/TR/rdf-testcases/#ntriples
+  # @see https://www.w3.org/TR/rdf-testcases/#ntriples
   class Format < RDF::Format
     content_encoding 'utf-8'
     content_type     'text/html;q=0.5',

data/lib/rdf/rdfa/reader.rb

@@ -16,15 +16,15 @@ module RDF::RDFa
   # can explicitly override the used implementation by passing in a
   # `:library` option to `Reader.new` or `Reader.open`.
   #
-  # [Nokogiri]: http://nokogiri.org/
+  # [Nokogiri]: https://nokogiri.org/
   #
   # Based on processing rules described here:
-  # @see http://www.w3.org/TR/rdfa-syntax/#s_model RDFa 1.0
-  # @see http://www.w3.org/TR/2012/REC-rdfa-core-20120607/
-  # @see http://www.w3.org/TR/2012/CR-xhtml-rdfa-20120313/
-  # @see http://dev.w3.org/html5/rdfa/
+  # @see https://www.w3.org/TR/rdfa-syntax/#s_model RDFa 1.0
+  # @see https://www.w3.org/TR/2012/REC-rdfa-core-20120607/
+  # @see https://www.w3.org/TR/2012/CR-xhtml-rdfa-20120313/
+  # @see https://dev.w3.org/html5/rdfa/
   #
-  # @author [Gregg Kellogg](http://kellogg-assoc.com/)
+  # @author [Gregg Kellogg](https://greggkellogg.net/)
   class Reader < RDF::Reader
     format Format
     include Expansion
@@ -46,9 +46,9 @@ module RDF::RDFa
     }
 
     # This expression matches an NCName as defined in
-    # [XML-NAMES](http://www.w3.org/TR/2009/REC-xml-names-20091208/#NT-NCName)
+    # [XML-NAMES](https://www.w3.org/TR/2009/REC-xml-names-20091208/#NT-NCName)
     #
-    # @see http://www.w3.org/TR/2009/REC-xml-names-20091208/#NT-NCName
+    # @see https://www.w3.org/TR/2009/REC-xml-names-20091208/#NT-NCName
     NC_REGEXP = Regexp.new(
       %{^
         (  [a-zA-Z_]
@@ -61,11 +61,11 @@ module RDF::RDFa
       Regexp::EXTENDED)
 
     # This expression matches an term as defined in
-    # [RDFA-CORE](http://www.w3.org/TR/2012/REC-rdfa-core-20120607/#s_terms)
+    # [RDFA-CORE](https://www.w3.org/TR/2012/REC-rdfa-core-20120607/#s_terms)
     #
     # For the avoidance of doubt, this definition means a 'term'
     # in RDFa is an XML NCName that also permits slash as a non-leading character.
-    # @see http://www.w3.org/TR/2012/REC-rdfa-core-20120607/#s_terms
+    # @see https://www.w3.org/TR/2012/REC-rdfa-core-20120607/#s_terms
     TERM_REGEXP = Regexp.new(
       %{^
         (?!\\\\u0301)             # &#x301; is a non-spacing acute accent.
@@ -245,7 +245,7 @@ module RDF::RDFa
 
     ##
     # RDFa Reader options
-    # @see http://www.rubydoc.info/github/ruby-rdf/rdf/RDF/Reader#options-class_method
+    # @see https://www.rubydoc.info/github/ruby-rdf/rdf/RDF/Reader#options-class_method
     def self.options
       super + [
         RDF::CLI::Option.new(
@@ -297,7 +297,7 @@ module RDF::RDFa
     # @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 @@ module RDF::RDFa
         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 @@ module RDF::RDFa
         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
@@ -381,6 +381,38 @@ module RDF::RDFa
       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,52 +432,9 @@ module RDF::RDFa
           # 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
-
-            if reader = RDF::Reader.for(content_type: 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
@@ -455,7 +444,7 @@ module RDF::RDFa
             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
@@ -775,6 +764,7 @@ module RDF::RDFa
         rev
         role
         src
+        type
         typeof
         value
         vocab
@@ -830,6 +820,15 @@ module RDF::RDFa
       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]
@@ -1392,13 +1391,13 @@ module RDF::RDFa
     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}"}
@@ -1419,7 +1418,7 @@ module RDF::RDFa
         # 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
@@ -1458,7 +1457,7 @@ module RDF::RDFa
     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)