RubyGems - rdf-microdata - Versions diffs - 1.0.3 → 1.1.0 - Mend

rdf-microdata 1.0.3 → 1.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (8) hide show

checksums.yaml +6 -14
data/README +5 -9
data/VERSION +1 -1
data/etc/doap.html +3 -2
data/lib/rdf/microdata/reader.rb +3 -20
data/lib/rdf/microdata/vocab.rb +0 -2
metadata +46 -61
data/lib/rdf/microdata/reader/rexml.rb +0 -277

checksums.yaml CHANGED Viewed

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    OWFjODE4YWU4YTVjMGRlNWM5OGVhODZlZGIxZGRlN2FhNWY5ODIzYQ==
-  data.tar.gz: !binary |-
-    M2RlOGIwMmZmZTZlNTE2YWY1NzYzYzQxYzFiNjdkM2M1YTViODNiOA==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    OTRjNzBmOTU3YzZjNzM3YmNjN2E0NGMyOWVjMzk4OWNkOWUzMDc1Y2ZjZGUw
-    YmU3OTMwNzcyNzE2ODVhYzQxZmRjZGI3M2VjOGUzNTZlNzJmNjAwODM3MzA1
-    Nzg0YTg1ZDc0MTdiNjQ5NzMyYjlkMzQ4ZDI2NGY4ZmYzNmQxZjk=
-  data.tar.gz: !binary |-
-    N2QyMTMwYTlmMTVlY2M1N2ZmYzM0YzNkZTkzZWI0Yzg4MWU3MWI3OTJhMTM0
-    NjNlZTg3Yzg0MTAwN2Y5MzQyOWExYWRkNmEzYTE2MTk2NzlkOTdhMzg5M2Yw
-    MzAwNzU3MjExOTY2Nzg0Njk2M2RmODJkMDRkYTgyMTEwY2UxMGU=
+SHA1:
+  metadata.gz: c11ca4f8b2d95abe7fcd1c55b68f667cc5ed814b
+  data.tar.gz: 27d2a085d5862f01a7080d364804ffc1eda971a4
+SHA512:
+  metadata.gz: a3ec50424a823fe88c0f665f34fae0c52383ab7660f8ff6c57ec7c42f40c2d44923c8c80303e4079a5e8f1694e75a72cfb9ffe0f89176a1a593392bb8233e6b9
+  data.tar.gz: 2b3cce242ba4902d390adeae2b24be479a86aab392717187b53a2ff7fe57c20d4914cb06419ab905a4f8dd3cb6c6796b18832db7ba65541895b5bb60e77c2005

data/README CHANGED Viewed

@@ -12,7 +12,7 @@ RDF::Microdata is a Microdata reader for Ruby using the [RDF.rb][RDF.rb] library
 RDF::Microdata parses [Microdata][] into statements or triples using the rules defined in [Microdata RDF][].
 * Microdata parser.
-* If available, Uses Nokogiri for parsing HTML/SVG, falls back to REXML otherwise (and for JRuby)
+* Uses Nokogiri for parsing HTML
 Install with 'gem install rdf-microdata'
@@ -36,10 +36,11 @@ GRDDL-type triple generation, such as for html>head>title anchor tags.
 If the `RDFa` parser is available, {RDF::Microdata::Format} will not assert content type `text/html` or file extension `.html`, as this is also asserted by RDFa. Instead, the RDFa reader will invoke the microdata reader if an `@itemscope` attribute is detected.
 ## Dependencies
-* [RDF.rb](http://rubygems.org/gems/rdf) (>= 1.0)
-* [RDF::XSD](http://rubygems.org/gems/rdf-xsd) (>= 1.0)
+* [RDF.rb](http://rubygems.org/gems/rdf) (>= 1.1)
+* [RDF::XSD](http://rubygems.org/gems/rdf-xsd) (>= 1.1)
+* [Nokogiri](http://rubygems.org/gems/nokogiri) (>= 1.5.9)
 * [HTMLEntities](https://rubygems.org/gems/htmlentities) ('>= 4.3.0')
-* Soft dependency on [Nokogiri](http://rubygems.org/gems/nokogiri) (>= 1.5.0)
+* Soft dependency on [Nokogiri](http://rubygems.org/gems/nokogiri) (>= 1.5.9)
 ## Documentation
 Full documentation available on [Rubydoc.info][Microdata doc]
@@ -49,14 +50,9 @@ Full documentation available on [Rubydoc.info][Microdata doc]
   Asserts :html format, text/html mime-type and .html file extension.
 * {RDF::Microdata::Reader}
   * {RDF::Microdata::Reader::Nokogiri}
-  * {RDF::Microdata::Reader::REXML}
 ### Additional vocabularies
-## TODO
-* Add support for LibXML and REXML bindings, and use the best available
-* Consider a SAX-based parser for improved performance
 ## Resources
 * [RDF.rb][RDF.rb]
 * [Documentation](http://rdf.rubyforge.org/microdata)

data/VERSION CHANGED Viewed

	@@ -1 +1 @@
1	- 1.0.3
1	+ 1.1.0

data/etc/doap.html CHANGED Viewed

@@ -2,8 +2,9 @@
 <html itemscope itemid="http://rubygems.org/gems/rdf-microdata" itemtype="http://usefulinc.com/ns/doap#Project">
   <head>
     <title lang="en" itemprop="shortdesc">Microdata reader for Ruby.</title>
+    <meta http-equiv="Content-Type" content="text/html;charset=utf-8" >
   </head>
-  <body about="" typeof="Project">
+  <body>
     <p>Project description for <span itemprop="name">RDF::Microdata</span>.</p>
     <p lang="en" itemprop="description">
       RDF::Microdata is an Microdata reader for Ruby using the RDF.rb library suite.
@@ -13,7 +14,7 @@
         <a itemprop="http://purl.org/dc/terms/creator developer documenter maintainer http://xmlns.com/foaf/0.1/creator" href="http://greggkellogg.net/foaf#me"
         >Gregg Kellogg</a>
       </dd>
-      <dt>Created</dt><time itemprop="created" datetime="2011-08-29"/></dd>
+      <dt>Created</dt><dd><time itemprop="created" datetime="2011-08-29">2011-08-29</time></dd>
       <dt>Blog</dt><dd><a href="http://greggkellogg.net/" itemprop="blog">http://greggkellogg.net/</a></dd>
       <dt>Bug DB</dt><dd>
         <a href="http://github.com/ruby-rdf/rdf-microdata/issues" itemprop="bug-database">

data/lib/rdf/microdata/reader.rb CHANGED Viewed

@@ -1,9 +1,4 @@
-begin
-  raise LoadError, "not with java" if RUBY_PLATFORM == "java"
-  require 'nokogiri'
-rescue LoadError => e
-  :rexml
-end
+require 'nokogiri'
 require 'rdf/xsd'
 require 'json'
@@ -204,8 +199,6 @@ module RDF::Microdata
     #   the input stream to read
     # @param  [Hash{Symbol => Object}] options
     #   any additional options
-    # @option options [Symbol] :library (:nokogiri)
-    #   One of :nokogiri or :rexml. If nil/unspecified uses :nokogiri if available, :rexml otherwise.
     # @option options [Encoding] :encoding     (Encoding::UTF_8)
     #   the encoding of the input stream (Ruby 1.9+)
     # @option options [Boolean]  :validate     (false)
@@ -231,20 +224,10 @@ module RDF::Microdata
         @debug = options[:debug]
         @vocab_expansion = options.fetch(:vocab_expansion, true)
-        @library = case options[:library]
-          when nil
-            (defined?(::Nokogiri) && RUBY_PLATFORM != 'java') ? :nokogiri : :rexml
-          when :nokogiri, :rexml
-            options[:library]
-          else
-            raise ArgumentError.new("expected :rexml or :nokogiri, but got #{options[:library].inspect}")
-        end
+        @library = :nokogiri
         require "rdf/microdata/reader/#{@library}"
-        @implementation = case @library
-          when :nokogiri then Nokogiri
-          when :rexml    then REXML
-        end
+        @implementation = Nokogiri
         self.extend(@implementation)
         initialize_html(input, options) rescue raise RDF::ReaderError.new($!.message)

data/lib/rdf/microdata/vocab.rb CHANGED Viewed

@@ -1,7 +1,5 @@
 module RDF
   class MD < Vocabulary("http://www.w3.org/ns/md#"); end
-  class Schema < Vocabulary("http://schema.org/"); end
-  class XHV < Vocabulary("http://www.w3.org/1999/xhtml/vocab#"); end
   class HCard < Vocabulary("http://microformats.org/profile/hcard#"); end
   class HCalendar < Vocabulary("http://microformats.org/profile/hcalendar"); end
 end

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdf-microdata
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Gregg
@@ -9,120 +9,106 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-10-29 00:00:00.000000000 Z
+date: 2013-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.7
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.7
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.7.7
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.7.7
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: rdf-xsd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 4.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 4.3.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.5.9
+        version: 1.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.5.9
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: open-uri-cached
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.0.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.0.5
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.8.5
+        version: 0.8.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.8.5
+        version: 0.8.7
 - !ruby/object:Gem::Dependency
   name: spira
   requirement: !ruby/object:Gem::Requirement
@@ -141,72 +127,72 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.14.0
 - !ruby/object:Gem::Dependency
   name: rdf-spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: rdf-rdfa
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: rdf-turtle
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.7
+        version: 1.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.7
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: rdf-isomorphic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.0
 description: Microdata reader for Ruby.
 email: public-rdf-ruby@w3.org
 executables: []
@@ -220,7 +206,6 @@ files:
 - lib/rdf/microdata/expansion.rb
 - lib/rdf/microdata/format.rb
 - lib/rdf/microdata/reader/nokogiri.rb
-- lib/rdf/microdata/reader/rexml.rb
 - lib/rdf/microdata/reader.rb
 - lib/rdf/microdata/version.rb
 - lib/rdf/microdata/vocab.rb
@@ -237,17 +222,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.8.1
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: rdf-microdata
-rubygems_version: 2.0.5
+rubygems_version: 2.1.11
 signing_key:
 specification_version: 4
 summary: Microdata reader for Ruby.

data/lib/rdf/microdata/reader/rexml.rb DELETED Viewed

@@ -1,277 +0,0 @@
-require 'htmlentities'
-module RDF::Microdata
-  class Reader < RDF::Reader
-    ##
-    # REXML implementation of an HTML parser.
-    #
-    # @see http://www.germane-software.com/software/rexml/
-    module REXML
-      ##
-      # Returns the name of the underlying XML library.
-      #
-      # @return [Symbol]
-      def self.library
-        :rexml
-      end
-      # Proxy class to implement uniform element accessors
-      class NodeProxy
-        attr_reader :node
-        attr_reader :parent
-        def initialize(node, parent = nil)
-          @node = node
-          @parent = parent
-        end
-        ##
-        # Element language
-        #
-        # From HTML5 3.2.3.3
-        #   If both the lang attribute in no namespace and the lang attribute in the XML namespace are set
-        #   on an element, user agents must use the lang attribute in the XML namespace, and the lang
-        #   attribute in no namespace must be ignored for the purposes of determining the element's
-        #   language.
-        #
-        # @return [String]
-        def language
-          language = case
-          when @node.attribute("lang")
-            @node.attribute("lang").to_s
-          else
-            parent && parent.element? && parent.language
-          end
-        end
-        ##
-        # Return xml:base on element, if defined
-        #
-        # @return [String]
-        def base
-          if @base.nil?
-            @base = attributes['xml:base'] ||
-            (parent && parent.element? && parent.base) ||
-            false
-          end
-          @base == false ? nil : @base
-        end
-        def display_path
-          @display_path ||= begin
-            path = []
-            path << parent.display_path if parent
-            path << @node.name
-            case @node
-            when ::REXML::Element   then path.join("/")
-            when ::REXML::Attribute then path.join("@")
-            else path.join("?")
-            end
-          end
-        end
-        ##
-        # Return true of all child elements are text
-        #
-        # @return [Array<:text, :element, :attribute>]
-        def text_content?
-          @node.children.all? {|c| c.is_a?(::REXML::Text)}
-        end
-        ##
-        # Retrieve XMLNS definitions for this element
-        #
-        # @return [Hash{String => String}]
-        def namespaces
-          ns_decls = {}
-          @node.attributes.each do |name, attr|
-            next unless name =~ /^xmlns(?:\:(.+))?/
-            ns_decls[$1] = attr
-          end
-          ns_decls
-        end
-        ##
-        # Children of this node
-        #
-        # @return [NodeSetProxy]
-        def children
-          NodeSetProxy.new(@node.children, self)
-        end
-        ##
-        # Elements of this node
-        #
-        # @return [NodeSetProxy]
-        def elements
-          NodeSetProxy.new(@node.children.select {|c| c.is_a?(::REXML::Element)}, self)
-        end
-        ##
-        # Inner text of an element
-        #
-        # @see http://apidock.com/ruby/REXML/Element/get_text#743-Get-all-inner-texts
-        # @return [String]
-        def inner_text
-          coder = HTMLEntities.new
-          ::REXML::XPath.match(@node,'.//text()').map { |e|
-            coder.decode(e)
-          }.join
-        end
-        ##
-        # Inner text of an element
-        #
-        # @see http://apidock.com/ruby/REXML/Element/get_text#743-Get-all-inner-texts
-        # @return [String]
-        def inner_html
-          @node.children.map(&:to_s).join
-        end
-        ##
-        # Node type accessors
-        #
-        # @return [Boolean]
-        def element?
-          @node.is_a?(::REXML::Element)
-        end
-        def has_attribute?(attr)
-          !!node.attribute(attr)
-        end
-        ##
-        # Proxy for everything else to @node
-        def method_missing(method, *args)
-          @node.send(method, *args)
-        end
-      end
-      ##
-      # NodeSet proxy
-      class NodeSetProxy
-        attr_reader :node_set
-        attr_reader :parent
-        def initialize(node_set, parent)
-          @node_set = node_set
-          @parent = parent
-        end
-        ##
-        # Return a proxy for each child
-        #
-        # @yield child
-        # @yieldparam [NodeProxy] child
-        def each
-          @node_set.each do |c|
-            yield NodeProxy.new(c, parent)
-          end
-        end
-        ##
-        # Return proxy for first element and remove it
-        # @return [NodeProxy]
-        def shift
-          (e = node_set.shift) && NodeProxy.new(e, parent)
-        end
-        ##
-        # Add NodeSetProxys
-        # @param [NodeSetProxy, REXML::Element] other
-        # @return [NodeSetProxy]
-        def +(other)
-          new_ns = node_set.clone
-          other.node_set.each {|n| new_ns << n}
-          NodeSetProxy.new(new_ns, parent)
-        end
-        ##
-        # Add a NodeProxy
-        # @param [NodeProxy, REXML::Element] elem
-        # @return [NodeSetProxy]
-        def <<(elem)
-          node_set << (elem.is_a?(NodeProxy) ? elem.node : elem)
-          self
-        end
-        def inspect
-          @node_set.map {|c| NodeProxy.new(c, parent).display_path}.inspect
-        end
-        ##
-        # Proxy for everything else to @node_set
-        def method_missing(method, *args)
-          @node_set.send(method, *args)
-        end
-      end
-      ##
-      # Initializes the underlying XML library.
-      #
-      # @param  [Hash{Symbol => Object}] options
-      # @return [void]
-      def initialize_html(input, options = {})
-        require 'rexml/document' unless defined?(::REXML)
-        @doc = case input
-        when ::REXML::Document
-          input
-        else
-          # Try to detect charset from input
-          options[:encoding] ||= input.charset if input.respond_to?(:charset)
-          # Otherwise, default is utf-8
-          options[:encoding] ||= 'utf-8'
-          # Set xml:base for the document element, if defined
-          @base_uri = base_uri ? base_uri.to_s : nil
-          # Only parse as XML, no HTML mode
-          doc = ::REXML::Document.new(input.respond_to?(:read) ? input.read : input.to_s)
-        end
-      end
-      # Accessor methods to mask native elements & attributes
-      ##
-      # Return proxy for document root
-      def root
-        @root ||= NodeProxy.new(@doc.root) if @doc && @doc.root
-      end
-      ##
-      # Document errors
-      def doc_errors
-        []
-      end
-      ##
-      # Find value of document base
-      #
-      # @param [String] base Existing base from URI or :base_uri
-      # @return [String]
-      def doc_base(base)
-        # find if the document has a base element
-        base_el = ::REXML::XPath.first(@doc, "/html/head/base")
-        base = base_el.attribute("href").to_s.split("#").first if base_el
-        base || @base_uri
-      end
-      ##
-      # Based on Microdata element.getItems
-      #
-      # @see http://www.w3.org/TR/2011/WD-microdata-20110525/#top-level-microdata-items
-      def getItems
-        ::REXML::XPath.match(@doc, "//[@itemscope]").select {|el| !el.attribute('itemprop')}.map {|n| NodeProxy.new(n)}
-      end
-      ##
-      # Look up an element in the document by id
-      def find_element_by_id(id)
-        (e = ::REXML::XPath.first(@doc, "//[@id='#{id}']")) && NodeProxy.new(e)
-      end
-    end
-  end
-end