rdf-rdfa 3.0.1 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5bdb70755898ce8bc3abeee0c7ed88456d187f1560842d004fcb15288de6cdbc
-  data.tar.gz: a7659c93eb5c51b652e67dc24f3cb9e1a5f6b3c948b501c055b0b93cdd1e1ff3
+  metadata.gz: 41a438683b553f9eaa31a244a4fbbeeb2413b999f040b4a46980fe939d1891d2
+  data.tar.gz: a191ff7cf36e120aa52491c8eea5b4cab05b48d5595c0486a6e9ed774093b39e
 SHA512:
-  metadata.gz: 752ced4f5c431a3affbb7847e7244bb82cd809f68c855d14d0c5adb09e57d190a5da3432d53caa1ca6941b0c55e3981d2767b759247b3eb2dba16c2368942b3c
-  data.tar.gz: d19b8da81d8930d53db82e17f4c8eb4fa1fe14e1aca7e0661980df999b820d57d7eb61ff22245b791074af01fcf9d2c78c5e377eee75ff319adbc80f00fdcd29
+  metadata.gz: 4e95a2ef75396bfead46f171d2366bf4019c7a6ffd9be70e1ae24614671d7f20719eb00476906ef17047bbf9ef9ed1ac7f711b5905e42c64094ac85134a48469
+  data.tar.gz: b1cd79507874df6cb7f516a6ad87450b9d0e14e63784fe90191c862cd38c35a5520b33c315b287483aadc14800de677b200d7e94dcdb5ae6c54ae9fbf0c282d1

data/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`
 
@@ -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]

data/VERSION

@@ -1 +1 @@
-3.0.1
+3.1.0

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,16 @@ 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#",
+          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 @@ 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 +57,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

@@ -17,7 +17,7 @@ module RDF::RDFa
       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

data/lib/rdf/rdfa/reader.rb

@@ -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)

data/lib/rdf/rdfa/reader/nokogiri.rb

@@ -35,12 +35,10 @@ module RDF::RDFa
         # @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 @@ module RDF::RDFa
         #
         # @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
@@ -160,7 +158,7 @@ module RDF::RDFa
       #
       # @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
@@ -191,7 +189,7 @@ module RDF::RDFa
       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
@@ -202,8 +200,6 @@ module RDF::RDFa
           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 @@ module RDF::RDFa
           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 @@ module RDF::RDFa
           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
 

data/lib/rdf/rdfa/reader/rexml.rb

@@ -39,6 +39,8 @@ module RDF::RDFa
           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 @@ module RDF::RDFa
         #
         # @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
@@ -206,7 +208,7 @@ module RDF::RDFa
       #
       # @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
@@ -227,7 +229,7 @@ module RDF::RDFa
       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
@@ -238,8 +240,6 @@ module RDF::RDFa
           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 @@ module RDF::RDFa
           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 @@ module RDF::RDFa
           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
 

data/lib/rdf/rdfa/writer.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdf-rdfa
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.1.0
 platform: ruby
 authors:
 - Gregg
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-11 00:00:00.000000000 Z
+date: 2019-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -17,62 +17,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: rdf-xsd
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rdf-aggregate-repo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement
@@ -91,180 +85,156 @@ dependencies:
   name: json-ld
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.1'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.1'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.9'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rdf-spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rdf-turtle
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rdf-vocab
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rdf-isomorphic
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rdf-tabular
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rdf-rdfxml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: sparql
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.12
+        version: 0.9.20
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.12
+        version: 0.9.20
 description: RDF::RDFa is an RDFa reader/writer for Ruby using the RDF.rb library
   suite.
 email: public-rdf-ruby@w3.org
@@ -303,15 +273,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.2
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: RDFa reader/writer for RDF.rb.