rdf-rdfa 2.1.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f187314f46c58533e2e502410bcb4fc619c299cc
-  data.tar.gz: a6db308c5c755593287d7be19657d484e94e9f36
+  metadata.gz: efe1e914ab5f68689c7d747eaedbeac80e2284d9
+  data.tar.gz: dd152d38c8f15bb6844aac06008256502be2a840
 SHA512:
-  metadata.gz: 62f0033e9eb902cb3784ef015e1b100fe5bb8c257efeb39345a73ed1f680dc8e61035d391960ff3c6121dcb08847bf09974644f4435a0e3b39bdd6d901c9ada9
-  data.tar.gz: c3961199f1ea7153257c17368e3434343975a95f731a4569417244e9dcf4640abf85290191e3230301888d2e29e4eb0a147837665e5f8787c4907375542a04da
+  metadata.gz: 9ce2b653872a4d6e2d9f2e3fd8d02de3e6b596eba1faa4407ecc8199be14db84525f0766b1477f41b41813137434c04084e727c6d856e227d662a537dbfd2c8e
+  data.tar.gz: 1b4f7148e069c17d1e4169b6ff9e94a685be46df0539b26f5eecc856ce82b9411836b8aff183b6dc8f34f2a3f5ae34344e6055c3888c204e6c658509631a3b7c

data/README.md

@@ -16,14 +16,15 @@ 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
+* 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.
 
 Install with `gem install rdf-rdfa`
 
 ### Pure Ruby
-In order to run as pure ruby (not requiring any C modules), this gem does not directly depend on [Nokogiri](http://www.nokogiri.org)
-and falls back to using REXML. As REXML is not really an HTML parsing library, the results will only be useful if the HTML is well-formed.
-For best performance, install the Nokogiri gem as well.
+In order to run as pure ruby (not requiring any C modules), this gem does not directly depend on [Nokogiri][] or [Nokogumbo][]
+and falls back to using REXML. [Nokogumbo][] uses the [Gumbo pure-C HTML5 parser](https://github.com/google/gumbo-parser#readme).
+As REXML is not really an HTML parsing library, the results will only be useful if the HTML is well-formed.
+For best performance, install the [Nokogiri][] and [Nokogumbo][] gems as well.
 
 ### Important changes from previous versions
 RDFa is an evolving standard, undergoing some substantial recent changes partly due to perceived competition
@@ -396,11 +397,12 @@ The template hash defines four Haml templates:
     }
 
 ## Dependencies
-* [Ruby](http://ruby-lang.org/) (>= 2.0)
-* [RDF.rb](http://rubygems.org/gems/rdf) (>= 2.0)
+* [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.6.8)
+* Soft dependency on [Nokogiri](http://rubygems.org/gems/nokogiri) (>= 1.7.1)
+* Soft dependency on [Nokogumbo](https://github.com/rubys/nokogumbo) (>= 1.4.10)
 
 ## Documentation
 Full documentation available on [Rubydoc.info][RDFa doc]
@@ -484,4 +486,5 @@ see <http://unlicense.org/> or the accompanying [UNLICENSE](UNLICENSE) file.
 [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/
-[Backports]:        http://rubygems.org/gems/backports
+[Nokogiri]:         http://www.nokogiri.org
+[Nokogumbo]:        https://github.com/rubys/nokogumbo/#readme

data/VERSION

@@ -1 +1 @@
-2.1.1
+2.2.0

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

@@ -174,8 +174,16 @@ module RDF::RDFa
           options[:encoding] = options[:encoding].to_s if options[:encoding]
 
           case @host_language
-          when :html4, :html5
+          when :html4
             ::Nokogiri::HTML.parse(input, base_uri.to_s, options[:encoding])
+          when :html5
+            begin
+              require 'nokogumbo' unless defined?(::Nokogumbo)
+              input = input.read if input.respond_to?(:read)
+              ::Nokogiri::HTML5(input.force_encoding(options[:encoding]))
+            rescue LoadError
+              ::Nokogiri::HTML.parse(input, base_uri.to_s, options[:encoding])
+            end
           else
             ::Nokogiri::XML.parse(input, base_uri.to_s, options[:encoding])
           end
@@ -281,7 +289,11 @@ module RDF::RDFa
       def doc_errors
         # FIXME: Nokogiri version 1.5 thinks many HTML5 elements are invalid, so just ignore all Tag errors.
         # Nokogumbo might make this simpler
-        @doc.errors.reject {|e| e.to_s =~ /(?:Tag \w+ invalid)|(?:Missing attribute name)/}
+        if @host_language == :html5
+          @doc.errors
+        else
+          @doc.errors.reject {|e| e.to_s =~ /(?:Tag \w+ invalid)|(?:Missing attribute name)/}
+        end
       end
       
       ##

data/lib/rdf/rdfa/writer/haml_templates.rb

@@ -195,13 +195,20 @@ module RDF::RDFa
             %table.properties
               - predicates.each do |predicate|
                 != yield(predicate)
-        - else
+        - elsif rel
           %td{rel: rel, resource: (about || resource), typeof: typeof, inlist: inlist}
             - if typeof
               %span.type!= typeof
             %table.properties
               - predicates.each do |predicate|
                 != yield(predicate)
+        - else
+          %div{resource: (about || resource), typeof: typeof, inlist: inlist}
+            - if typeof
+              %span.type!= typeof
+            %table.properties
+              - predicates.each do |predicate|
+                != yield(predicate)
       ),
 
       # Output for single-valued properties

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdf-rdfa
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0
 platform: ruby
 authors:
 - Gregg
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-24 00:00:00.000000000 Z
+date: 2017-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
@@ -45,28 +45,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rdf-aggregate-repo
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement
@@ -121,14 +121,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
@@ -149,42 +149,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rdf-tabular
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rdf-turtle
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rdf-rdfxml
   requirement: !ruby/object:Gem::Requirement
@@ -205,14 +205,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rdf-isomorphic
   requirement: !ruby/object:Gem::Requirement
@@ -233,28 +233,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
 description: RDF::RDFa is an RDFa reader/writer for Ruby using the RDF.rb library
   suite.
 email: public-rdf-ruby@w3.org
@@ -301,7 +301,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rdf-rdfa
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: RDFa reader/writer for RDF.rb.