rdf-microdata 2.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7797313b5b2b13d2c97e2ca613839ca72525064
-  data.tar.gz: 6b955e34556a727e14b88a9b776b10b0d14f2f29
+  metadata.gz: b1d1b0be6be75b9604495e5571840eae3d760b5c
+  data.tar.gz: 72ea12e35779e10447eabd3965238533e892816b
 SHA512:
-  metadata.gz: 4a68bb3d267426ffaa041f84f5f1b6cf195f15546593701c95c9bcfc672903726c421bed60546d330d80437c23adcd264b1b2c0ac7b27baeb11422744d3c1d3e
-  data.tar.gz: da17e2b59b28bca0ca9c65476ef44486ce81058254655389bea7fa447860ec562100783c81d24b0597487def25443f135e132eb0b0148d6b6db1bd614dfb6f59
+  metadata.gz: 1bb225e865fe2e48b4606d67ccb04f5bce62b4dfa30c5a29d99217e4007ab290f273725eedf1682cb9d8e3e3a9facc2df4de6c1b8f22014d0bab951214a97967
+  data.tar.gz: 0f8cad8716484382a1b0286d66245698c37d8e4e81456d2cc3a0018be1e23fe13ff4875e0bf598a9df94359a3ae24547db14913571c69011fc0964cd40f94071

data/VERSION

@@ -1 +1 @@
-2.0
+2.0.1

data/etc/doap.html

@@ -22,11 +22,14 @@
           http://github.com/ruby-rdf/rdf-microdata/issues
         </a>
       </dd>
-      <dt>Category</dt><dd itemprop="category">
-        <a href="http://dbpedia.org/resource/Resource_Description_Framework">Resource Description Framework</a>
+      <dt>Category</dt><dd>
+        <a itemprop="category" href="http://dbpedia.org/resource/Resource_Description_Framework">Resource Description Framework</a>
         for
         <a itemprop="programming-language" href="http://dbpedia.org/resource/Ruby_(programming_language)">Ruby</a>
       </dd>
+      <dt>Implements</dt><dd>
+        <a itemprop="implements" href="http://www.w3.org/TR/microdata-rdf/">Microdata to RDF</a>
+      </dd>
       <dt>Download</dt><dd><a href="http://rubygems.org/gems/rdf-microdata" itemprop="download-page">
         http://rubygems.org/gems/rdf-microdata
       </a></dd>

data/etc/doap.nt

@@ -2,7 +2,6 @@
 <http://rubygems.org/gems/rdf-microdata> <http://usefulinc.com/ns/doap#shortdesc> "Microdata reader for Ruby."@en .
 <http://rubygems.org/gems/rdf-microdata> <http://usefulinc.com/ns/doap#description> "\n      RDF::Microdata is an Microdata reader for Ruby using the RDF.rb library suite.\n    "@en .
 <http://rubygems.org/gems/rdf-microdata> <http://usefulinc.com/ns/doap#name> "RDF::Microdata" .
-<http://rubygems.org/gems/rdf-microdata> <http://usefulinc.com/ns/doap#category> "\n        Resource Description Framework\n        for\n        Ruby\n      " .
 <http://rubygems.org/gems/rdf-microdata> <http://purl.org/dc/terms/creator> <http://greggkellogg.net/foaf#me> .
 <http://rubygems.org/gems/rdf-microdata> <http://usefulinc.com/ns/doap#developer> <http://greggkellogg.net/foaf#me> .
 <http://rubygems.org/gems/rdf-microdata> <http://usefulinc.com/ns/doap#documenter> <http://greggkellogg.net/foaf#me> .
@@ -11,7 +10,9 @@
 <http://rubygems.org/gems/rdf-microdata> <http://usefulinc.com/ns/doap#created> "2011-08-29"^^<http://www.w3.org/2001/XMLSchema#date> .
 <http://rubygems.org/gems/rdf-microdata> <http://usefulinc.com/ns/doap#blog> <http://greggkellogg.net/> .
 <http://rubygems.org/gems/rdf-microdata> <http://usefulinc.com/ns/doap#bug-database> <http://github.com/ruby-rdf/rdf-microdata/issues> .
+<http://rubygems.org/gems/rdf-microdata> <http://usefulinc.com/ns/doap#category> <http://dbpedia.org/resource/Resource_Description_Framework> .
 <http://rubygems.org/gems/rdf-microdata> <http://usefulinc.com/ns/doap#programming-language> <http://dbpedia.org/resource/Ruby_(programming_language)> .
+<http://rubygems.org/gems/rdf-microdata> <http://usefulinc.com/ns/doap#implements> <http://www.w3.org/TR/microdata-rdf/> .
 <http://rubygems.org/gems/rdf-microdata> <http://usefulinc.com/ns/doap#download-page> <http://rubygems.org/gems/rdf-microdata> .
 <http://rubygems.org/gems/rdf-microdata> <http://usefulinc.com/ns/doap#homepage> <http://github.com/ruby-rdf/rdf-microdata> .
 <http://rubygems.org/gems/rdf-microdata> <http://usefulinc.com/ns/doap#license> <http://creativecommons.org/licenses/publicdomain/> .

data/etc/doap.ttl

@@ -0,0 +1,27 @@
+@prefix dc: <http://purl.org/dc/terms/> .
+@prefix doap: <http://usefulinc.com/ns/doap#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+
+<http://rubygems.org/gems/rdf-microdata> a doap:Project;
+   dc:creator <http://greggkellogg.net/foaf#me>;
+   doap:blog <http://greggkellogg.net/>;
+   doap:bug-database <http://github.com/ruby-rdf/rdf-microdata/issues>;
+   doap:category <http://dbpedia.org/resource/Resource_Description_Framework>;
+   doap:created "2011-08-29"^^xsd:date;
+   doap:description """
+      RDF::Microdata is an Microdata reader for Ruby using the RDF.rb library suite.
+    """@en;
+   doap:developer <http://greggkellogg.net/foaf#me>;
+   doap:documenter <http://greggkellogg.net/foaf#me>;
+   doap:download-page <http://rubygems.org/gems/rdf-microdata>;
+   doap:homepage <http://github.com/ruby-rdf/rdf-microdata>;
+   doap:implements <http://www.w3.org/TR/microdata-rdf/>;
+   doap:license <http://creativecommons.org/licenses/publicdomain/>;
+   doap:mailing-list <http://lists.w3.org/Archives/Public/public-rdf-ruby/>;
+   doap:maintainer <http://greggkellogg.net/foaf#me>;
+   doap:name "RDF::Microdata";
+   doap:programming-language <http://dbpedia.org/resource/Ruby_(programming_language)>;
+   doap:shortdesc "Microdata reader for Ruby."@en;
+   foaf:creator <http://greggkellogg.net/foaf#me> .

data/lib/rdf/microdata/reader.rb

@@ -49,7 +49,7 @@ module RDF::Microdata
       # @param [String] registry_uri
       def self.load_registry(registry_uri)
         return if @registry_uri == registry_uri
-        
+
         json = RDF::Util::File.open_file(registry_uri) { |f| JSON.load(f) }
 
         @prefixes = {}
@@ -187,7 +187,7 @@ module RDF::Microdata
 
         # Load registry
         begin
-          registry_uri = options.fetch(:registry, DEFAULT_REGISTRY)
+          registry_uri = options[:registry] || DEFAULT_REGISTRY
           add_debug(@doc, "registry = #{registry_uri.inspect}")
           Registry.load_registry(registry_uri)
         rescue JSON::ParserError => e
@@ -391,6 +391,7 @@ module RDF::Microdata
 
           # 9.1.5) If an entry exists in the registry for name in the vocabulary associated with vocab having the key subPropertyOf or equivalentProperty
           vocab.expand(predicate) do |equiv|
+            add_debug(item) {"gentrips(9.1.5): equiv=#{equiv.inspect}"}
             # for each such value equiv, generate the following triple
             add_triple(item, subject, equiv, value)
           end 
@@ -441,11 +442,9 @@ module RDF::Microdata
     #   List of property elements for an item
     def item_properties(item, reverse = false)
       add_debug(item, "item_properties (#{reverse.inspect})")
-      results, errors = crawl_properties(item, [], reverse)
-      raise CrawlFailure, "item_props: errors=#{errors}" if errors > 0
-      results
+      crawl_properties(item, [], reverse)
     rescue CrawlFailure => e
-      add_error(element, e.message)
+      add_error(item, e.message)
       return []
     end
     
@@ -455,48 +454,42 @@ module RDF::Microdata
     # @param [Nokogiri::XML::Element] root
     # @param [Array<Nokokogiri::XML::Element>] memory
     # @param [Boolean] reverse crawl reverse properties
-    # @return [Array<Array<Nokogiri::XML::Element>, Integer>]
-    #   Resultant elements and error count
+    # @return [Array<Nokogiri::XML::Element>]
+    #   Resultant elements
     def crawl_properties(root, memory, reverse)
-      
       # 1. If root is in memory, then the algorithm fails; abort these steps.
       raise CrawlFailure, "crawl_props mem already has #{root.inspect}" if memory.include?(root)
       
       # 2. Collect all the elements in the item root; let results be the resulting list of elements, and errors be the resulting count of errors.
-      results, errors = elements_in_item(root)
-      add_debug(root) {"crawl_properties reverse=#{reverse.inspect} results=#{results.map {|e| node_path(e)}.inspect}, errors=#{errors}"}
+      results = elements_in_item(root)
+      add_debug(root) {"crawl_properties reverse=#{reverse.inspect} results=#{results.map {|e| node_path(e)}.inspect}"}
 
       # 3. Remove any elements from results that do not have an @itemprop (@itemprop-reverse) attribute specified.
       results = results.select {|e| e.has_attribute?(reverse ? 'itemprop-reverse' : 'itemprop')}
       
       # 4. Let new memory be a new list consisting of the old list memory with the addition of root.
+      raise CrawlFailure, "itemref recursion" if memory.detect {|n| root.node.object_id == n.node.object_id}
       new_memory = memory + [root]
       
       # 5. For each element in results that has an @itemscope attribute specified, crawl the properties of the element, with new memory as the memory.
       results.select {|e| e.has_attribute?('itemscope')}.each do |element|
-        begin
-          crawl_properties(element, new_memory, reverse)
-        rescue CrawlFailure => e
-          # If this fails, then remove the element from results and increment errors. (If it succeeds, the return value is discarded.)
-          memory -= element
-          add_error(element, e.message)
-          errors += 1
-        end
+        crawl_properties(element, new_memory, reverse)
       end
       
-      [results, errors]
+      results
     end
 
     ##
-    # To collect all the elements in the item root, the user agent must run these steps. They return a list of elements and a count of errors.
+    # To collect all the elements in the item root, the user agent must run these steps. They return a list of elements.
     #
     # @param [Nokogiri::XML::Element] root
-    # @return [Array<Array<Nokogiri::XML::Element>, Integer>]
+    # @return Array<Nokogiri::XML::Element>]
     #   Resultant elements and error count
+    # @raise CrawlFailure on element recursion
     def elements_in_item(root)
       # Let results and pending be empty lists of elements.
       # Let errors be zero.
-      results, errors = [], 0
+      results, memory, errors = [], [], 0
       
       # Add all the children elements of root to pending.
       pending = root.elements
@@ -514,20 +507,19 @@ module RDF::Microdata
 
       # Loop: Remove an element from pending and let current be that element.
       while current = pending.shift
-        if results.include?(current)
-          # If current is already in results, increment errors.
-          add_error(current, "elements_in_item: results already includes #{current.inspect}")
-          errors += 1
+        if memory.include?(current)
+          raise CrawlFailure, "elements_in_item: results already includes #{current.inspect}"
         elsif !current.has_attribute?('itemscope')
           # If current is not already in results and current does not have an itemscope attribute, then: add all the child elements of current to pending.
           pending += current.elements
         end
+        memory << current
         
         # If current is not already in results, then: add current to results.
         results << current unless results.include?(current)
       end
 
-      [results, errors]
+      results
     end
 
     ##
@@ -540,8 +532,7 @@ module RDF::Microdata
         {}
       when element.name == 'meta'
         RDF::Literal.new(element.attribute('content').to_s, :language => element.language)
-      when %w(data meter).include?(element.name)
-        RDF::Literal.new(element.attribute('value').to_s, :language => element.language)
+      when %w(data meter).include?(element.name) && element.attribute('value')
         # Lexically scan value and assign appropriate type, otherwise, leave untyped
         v = element.attribute('value').to_s
         datatype = %w(Integer Float Double).map {|t| RDF::Literal.const_get(t)}.detect do |dt|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdf-microdata
 version: !ruby/object:Gem::Version
-  version: '2.0'
+  version: 2.0.1
 platform: ruby
 authors:
 - Gregg
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-16 00:00:00.000000000 Z
+date: 2015-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -247,6 +247,7 @@ files:
 - VERSION
 - etc/doap.html
 - etc/doap.nt
+- etc/doap.ttl
 - etc/registry.json
 - lib/rdf/microdata.rb
 - lib/rdf/microdata/expansion.rb