rdf-microdata 0.2.3.1 → 0.2.4

data/README

@@ -85,7 +85,7 @@ see <http://unlicense.org/> or the accompanying {file:UNLICENSE} file.
 
 * gregg@kellogg-assoc.com
 * <http://rubygems.org/rdf-microdata>
-* <http://github.com/gkellogg/rdf-microdata>
+* <http://github.com/ruby-rdf/rdf-microdata>
 * <http://lists.w3.org/Archives/Public/public-rdf-ruby/>
 
 [RDF.rb]:           http://rdf.rubyforge.org/
@@ -94,4 +94,4 @@ see <http://unlicense.org/> or the accompanying {file:UNLICENSE} file.
 [PDD]:              http://lists.w3.org/Archives/Public/public-rdf-ruby/2010May/0013.html
 [Microdata]:        http://dev.w3.org/html5/md/Overview.html                                      "HTML Microdata"
 [Microdata RDF]:    https://dvcs.w3.org/hg/htmldata/raw-file/default/microdata-rdf/index.html     "Microdata to RDF"
-[Microdata doc]:    http://rubydoc.info/github/gkellogg/rdf-microdata/frames
+[Microdata doc]:    http://rubydoc.info/github/ruby-rdf/rdf-microdata/frames

data/VERSION

@@ -1 +1 @@
-0.2.3.1
+0.2.4

data/etc/registry.json

@@ -31,9 +31,5 @@
     "properties": {
       "categories": {"multipleValues": "list"}
     }
-  },
-  "http://n.whatwg.org/work": {
-    "propertyURI":    "contextual",
-    "multipleValues": "list"
   }
 }

data/lib/rdf/microdata/reader.rb

@@ -45,15 +45,21 @@ module RDF::Microdata
       ##
       # Initialize the registry from a URI or file path
       #
-      # @param [Hash] json
-      def self.load_registry(json)
+      # @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 = {}
         json.each do |prefix, elements|
+          next unless elements.is_a?(Hash)
           propertyURI = elements.fetch("propertyURI", "vocabulary").to_sym
           multipleValues = elements.fetch("multipleValues", "unordered").to_sym
           properties = elements.fetch("properties", {})
           @prefixes[prefix] = Registry.new(prefix, propertyURI, multipleValues, properties)
         end
+        @registry_uri = registry_uri
       end
       
       ##
@@ -99,26 +105,30 @@ module RDF::Microdata
       # @return [RDF::URI]
       def predicateURI(name, ec)
         u = RDF::URI(name)
+        # 1) If _name_ is an _absolute URL_, return _name_ as a _URI reference_
         return u if u.absolute?
         
         n = frag_escape(name)
         if ec[:current_type].nil?
+          # 2) If current type from context is null, there can be no current vocabulary.
+          #    Return the URI reference that is the document base with its fragment set to
+          #    the fragment-escaped value of name
           u = RDF::URI(ec[:document_base].to_s)
           u.fragment = frag_escape(name)
           u
         elsif @scheme == :vocabulary
-          # If scheme is vocabulary return the URI reference constructed by appending the fragment escaped value of name
-          # to current vocabulary, separated by a U+0023 NUMBER SIGN character (#) unless the current vocabulary ends
-          # with either a U+0023 NUMBER SIGN character (#) or SOLIDUS U+002F (/).
+          # 4) If scheme is vocabulary return the URI reference constructed by appending the fragment escaped value of name
+          #    to current vocabulary, separated by a U+0023 NUMBER SIGN character (#) unless the current vocabulary ends
+          #    with either a U+0023 NUMBER SIGN character (#) or SOLIDUS U+002F (/).
           RDF::URI(@property_base + n)
         else  # @scheme == :contextual
-          if ec[:current_type].to_s.index(@property_base) == 0
-            # return the concatenation of s, a U+002E FULL STOP character (.) and the fragment-escaped value of name.
-            RDF::URI(@property_base + '.' + n)
+          if ec[:current_name].to_s.index(@property_base) == 0
+            # 5.2) return the concatenation of s, a U+002E FULL STOP character (.) and the fragment-escaped value of name.
+            RDF::URI(ec[:current_name] + '.' + n)
           else
-            # return the concatenation of http://www.w3.org/ns/md?type=, the fragment-escaped value of s,
+            # 5.3) return the concatenation of http://www.w3.org/ns/md?type=, the fragment-escaped value of current type,
             # the string &prop=, and the fragment-escaped value of name
-            RDF::URI(@property_base + frag_escape(ec[:current_type]) + '?prop=' + n)
+            RDF::URI(@property_base + frag_escape(ec[:current_type]) + '&prop=' + n)
           end
         end
       end
@@ -215,14 +225,11 @@ module RDF::Microdata
         add_debug(@doc, "library = #{@library}")
 
         # Load registry
-        unless Registry.loaded?
-          registry = options[:registry_uri] || DEFAULT_REGISTRY
-          begin
-            json = RDF::Util::File.open_file(registry) { |f| JSON.load(f) }
-          rescue JSON::ParserError => e
-            raise RDF::ReaderError, "Failed to parse registry: #{e.message}"
-          end
-          Registry.load_registry(json)
+        begin
+          registry_uri = options[:registry_uri] || DEFAULT_REGISTRY
+          Registry.load_registry(registry_uri)
+        rescue JSON::ParserError => e
+          raise RDF::ReaderError, "Failed to parse registry: #{e.message}"
         end
         
         if block_given?
@@ -381,70 +388,77 @@ module RDF::Microdata
         add_triple(item, subject, RDF.type, t)
       end
       
-      # 5) If type is not an absolute URL, set it to current type from the Evaluation Context if not empty.
+      # 5) If type is an absolute URL, set current name in evaluation context to null.
+      ec[:current_name] = nil if type
+
+      # 6) Otherwise, set type to current type from the Evaluation Context if not empty.
       type ||= ec[:current_type]
-      add_debug(item)  {"gentrips(5): type=#{type.inspect}"}
+      add_debug(item)  {"gentrips(6): type=#{type.inspect}"}
 
-      # 6) If the registry contains a URI prefix that is a character for character match of type up to the length of the
+      # 7) If the registry contains a URI prefix that is a character for character match of type up to the length of the
       #    URI prefix, set vocab as that URI prefix
       vocab = Registry.find(type)
 
-      # 7) Otherwise, if type is not empty, construct vocab by removing everything following the last
-      #    SOLIDUS U+002F ("/") or NUMBER SIGN U+0023 ("#") from type.
+      # 8) Otherwise, if type is not empty, construct vocab by removing everything following the last
+      #    SOLIDUS U+002F ("/") or NUMBER SIGN U+0023 ("#") from the path component of type.
       vocab ||= begin
         type_vocab = type.to_s.sub(/([\/\#])[^\/\#]*$/, '\1')
-        add_debug(item)  {"gentrips(7): typtype_vocab=#{type_vocab.inspect}"}
+        add_debug(item)  {"gentrips(8): type_vocab=#{type_vocab.inspect}"}
         Registry.new(type_vocab) # if type
       end
 
-      # 8) Update evaluation context setting current vocabulary to vocab.
+      # 9) Update evaluation context setting current vocabulary to vocab.
       ec[:current_vocabulary] = vocab
 
-      # 9) Set property list to an empty mapping between properties and one or more ordered values as established below.
+      # 10) Set property list to an empty mapping between properties and one or more ordered values as established below.
       property_list = {}
 
-      # 10. For each element _element_ that has one or more property names and is one of the
+      # 11. For each element _element_ that has one or more property names and is one of the
       #    properties of the item _item_, in the order those elements are given by the algorithm
       #    that returns the properties of an item, run the following substep:
       props = item_properties(item)
-      # 10.1. For each name name in element's property names, run the following substeps:
+      # 11.1. For each name name in element's property names, run the following substeps:
       props.each do |element|
         element.attribute('itemprop').to_s.split(' ').compact.each do |name|
-          add_debug(element) {"gentrips(10.1): name=#{name.inspect}, type=#{type}"}
-          # Let context be a copy of evaluation context with current type set to type and current vocabulary set to vocab.
+          add_debug(item) {"gentrips(11.1): name=#{name.inspect}, type=#{type}"}
+          # 11.1.1) Let context be a copy of evaluation context with current type set to type and current vocabulary set to vocab.
           ec_new = ec.merge({:current_type => type, :current_vocabulary => vocab})
           
+          # 11.1.2) Let predicate be the result of generate predicate URI using context and name. Update context by setting current name to predicate.
           predicate = vocab.predicateURI(name, ec_new)
           ec_new[:current_name] = predicate
-          add_debug(element) {"gentrips(10.1.2): predicate=#{predicate}"}
+          add_debug(item) {"gentrips(11.1.2): predicate=#{predicate}"}
           
-          # 10.1.3) Let value be the property value of element.
+          # 11.1.3) Let value be the property value of element.
           value = property_value(element)
-          add_debug(element) {"gentrips(10.1.3) value=#{value.inspect}"}
+          add_debug(item) {"gentrips(11.1.3) value=#{value.inspect}"}
           
-          # 10.1.4) If value is an item, then generate the triples for value using a copy of evaluation context with
-          #       current type set to type. Replace value by the subject returned from those steps.
+          # 11.1.4) If value is an item, then generate the triples for value context.
+          #         Replace value by the subject returned from those steps.
           if value.is_a?(Hash)
             value = generate_triples(element, ec_new) 
-            add_debug(element) {"gentrips(10.1.4): value=#{value.inspect}"}
+            add_debug(item) {"gentrips(11.1.4): value=#{value.inspect}"}
           end
 
+          # 11.1.5) Add value to property list for predicate
           property_list[predicate] ||= []
           property_list[predicate] << value
         end
       end
       
-      # 11) For each predicate in property list
+      # 12) For each predicate in property list
       property_list.each do |predicate, values|
-        generatePropertyValues(item, subject, predicate, values, ec)
+        generatePropertyValues(item, subject, predicate, values)
       end
       
       subject
     end
 
-    def generatePropertyValues(element, subject, predicate, values, ec)
-      registry = ec[:current_vocabulary]
-      if registry.as_list(predicate)
+    def generatePropertyValues(element, subject, predicate, values)
+      # If the registry contains a URI prefix that is a character for character match of predicate up to the length
+      # of the URI prefix, set vocab as that URI prefix. Otherwise set vocab to null
+      registry = Registry.find(predicate)
+      if registry && registry.as_list(predicate)
         value = generateRDFCollection(element, values)
         add_triple(element, subject, predicate, value)
       else

data/lib/rdf/microdata/vocab.rb

@@ -2,4 +2,6 @@ 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

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdf-microdata
 version: !ruby/object:Gem::Version
-  version: 0.2.3.1
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-18 00:00:00.000000000 Z
+date: 2012-05-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
-  requirement: &2156220160 !ruby/object:Gem::Requirement
+  requirement: &70185697963060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 0.3.4
   type: :runtime
   prerelease: false
-  version_requirements: *2156220160
+  version_requirements: *70185697963060
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2156191060 !ruby/object:Gem::Requirement
+  requirement: &70185697962540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 1.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *2156191060
+  version_requirements: *70185697962540
 - !ruby/object:Gem::Dependency
   name: rdf-xsd
-  requirement: &2156190000 !ruby/object:Gem::Requirement
+  requirement: &70185697962060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 0.3.4
   type: :runtime
   prerelease: false
-  version_requirements: *2156190000
+  version_requirements: *70185697962060
 - !ruby/object:Gem::Dependency
   name: htmlentities
-  requirement: &2156188860 !ruby/object:Gem::Requirement
+  requirement: &70185697961580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: 4.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156188860
+  version_requirements: *70185697961580
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2156184760 !ruby/object:Gem::Requirement
+  requirement: &70185697960380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: 1.5.0
   type: :development
   prerelease: false
-  version_requirements: *2156184760
+  version_requirements: *70185697960380
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
-  requirement: &2156183840 !ruby/object:Gem::Requirement
+  requirement: &70185697959860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: 0.2.8
   type: :development
   prerelease: false
-  version_requirements: *2156183840
+  version_requirements: *70185697959860
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2156176780 !ruby/object:Gem::Requirement
+  requirement: &70185697959400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,21 +88,32 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *2156176780
+  version_requirements: *70185697959400
+- !ruby/object:Gem::Dependency
+  name: spira
+  requirement: &70185697958860 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.12
+  type: :development
+  prerelease: false
+  version_requirements: *70185697958860
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156173520 !ruby/object:Gem::Requirement
+  requirement: &70185697958300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *2156173520
+  version_requirements: *70185697958300
 - !ruby/object:Gem::Dependency
   name: rdf-spec
-  requirement: &2156171040 !ruby/object:Gem::Requirement
+  requirement: &70185697957720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +121,10 @@ dependencies:
         version: 0.3.4
   type: :development
   prerelease: false
-  version_requirements: *2156171040
+  version_requirements: *70185697957720
 - !ruby/object:Gem::Dependency
   name: rdf-turtle
-  requirement: &2156170340 !ruby/object:Gem::Requirement
+  requirement: &70185697957140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +132,10 @@ dependencies:
         version: 0.1.0
   type: :development
   prerelease: false
-  version_requirements: *2156170340
+  version_requirements: *70185697957140
 - !ruby/object:Gem::Dependency
   name: rdf-isomorphic
-  requirement: &2156162920 !ruby/object:Gem::Requirement
+  requirement: &70185697956660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,7 +143,7 @@ dependencies:
         version: 0.3.4
   type: :development
   prerelease: false
-  version_requirements: *2156162920
+  version_requirements: *70185697956660
 description: Microdata reader for Ruby.
 email: public-rdf-ruby@w3.org
 executables: []
@@ -152,7 +163,7 @@ files:
 - lib/rdf/microdata.rb
 - etc/doap.html
 - etc/registry.json
-homepage: http://github.com/gkellogg/rdf-microdata
+homepage: http://github.com/ruby-rdf/rdf-microdata
 licenses:
 - Public Domain
 post_install_message: 
@@ -173,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rdf-microdata
-rubygems_version: 1.8.10
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Microdata reader for Ruby.