rdf-microdata 0.2.4 → 0.2.5

data/AUTHORS

@@ -1 +1 @@
-* Gregg Kellogg <gregg@kellogg-assoc.com>
+* Gregg Kellogg <gregg@greggkellogg.net>

data/README

@@ -60,7 +60,7 @@ Full documentation available on [Rubydoc.info][Microdata doc]
 * [Microdata RDF][]
 
 ## Author
-* [Gregg Kellogg](http://github.com/gkellogg) - <http://kellogg-assoc.com/>
+* [Gregg Kellogg](http://github.com/gkellogg) - <http://greggkellogg.net/>
 
 ## Contributing
 
@@ -83,7 +83,7 @@ see <http://unlicense.org/> or the accompanying {file:UNLICENSE} file.
 
 ## FEEDBACK
 
-* gregg@kellogg-assoc.com
+* gregg@greggkellogg.net
 * <http://rubygems.org/rdf-microdata>
 * <http://github.com/ruby-rdf/rdf-microdata>
 * <http://lists.w3.org/Archives/Public/public-rdf-ruby/>

data/VERSION

@@ -1 +1 @@
-0.2.4
+0.2.5

data/etc/doap.html

@@ -16,8 +16,8 @@
       <dt>Created</dt><time itemprop="created" datetime="2011-08-29"/></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/gkellogg/rdf-microdata/issues" itemprop="bug-database">
-          http://github.com/gkellogg/rdf-microdata/issues
+        <a href="http://github.com/ruby-rdf/rdf-microdata/issues" itemprop="bug-database">
+          http://github.com/ruby-rdf/rdf-microdata/issues
         </a>
       </dd>
       <dt>Category</dt><dd itemprop="category">
@@ -28,8 +28,8 @@
       <dt>Download</dt><dd><a href="http://rubygems.org/gems/rdf-microdata" itemprop="download-page">
         http://rubygems.org/gems/rdf-microdata
       </a></dd>
-      <dt>Home Page</dt><dd><a href="http://github.com/gkellogg/rdf-microdata" itemprop="homepage">
-        http://github.com/gkellogg/rdf-microdata
+      <dt>Home Page</dt><dd><a href="http://github.com/ruby-rdf/rdf-microdata" itemprop="homepage">
+        http://github.com/ruby-rdf/rdf-microdata
       </a></dd>
       <dt>License</dt><dd>
         <a href="http://creativecommons.org/licenses/publicdomain/" itemprop="license">Public Domain</a>

data/lib/rdf/microdata.rb

@@ -18,7 +18,7 @@ module RDF
   # @see http://rdf.rubyforge.org/
   # @see http://www.w3.org/TR/2011/WD-microdata-20110525/
   #
-  # @author [Gregg Kellogg](http://kellogg-assoc.com/)
+  # @author [Gregg Kellogg](http://greggkellogg.net/)
   module Microdata
     require 'rdf/microdata/format'
     require 'rdf/microdata/vocab'

data/lib/rdf/microdata/format.rb

@@ -15,7 +15,11 @@ module RDF::Microdata
   # @see http://www.w3.org/TR/rdf-testcases/#ntriples
   class Format < RDF::Format
     content_encoding 'utf-8'
-    content_type     'text/html', :extension => :html
+
+    # Only define content type if RDFa is not available.
+    # The Microdata processor will be launched from there
+    # otherwise.
+    content_type     'text/html', :extension => :html unless RDF::Format.for(:rdfa)
     reader { RDF::Microdata::Reader }
   
     ##

data/lib/rdf/microdata/reader.rb

@@ -14,7 +14,7 @@ module RDF::Microdata
   # Based on processing rules, amended with the following:
   #
   # @see https://dvcs.w3.org/hg/htmldata/raw-file/0d6b89f5befb/microdata-rdf/index.html
-  # @author [Gregg Kellogg](http://kellogg-assoc.com/)
+  # @author [Gregg Kellogg](http://greggkellogg.net/)
   class Reader < RDF::Reader
     format Format
     URL_PROPERTY_ELEMENTS = %w(a area audio embed iframe img link object source track video)
@@ -81,7 +81,8 @@ module RDF::Microdata
         @properties = properties
         if @scheme == :vocabulary
           @property_base = prefixURI.to_s
-          @property_base += '#' unless %w(/ #).include?(@property_base[-1,1]) # Append a '#' for fragment if necessary
+          # Append a '#' for fragment if necessary
+          @property_base += '#' unless %w(/ #).include?(@property_base[-1,1])
         else
           @property_base = 'http://www.w3.org/ns/md?type='
         end
@@ -283,8 +284,8 @@ module RDF::Microdata
     
     # Add debug event to debug array, if specified
     #
-    # @param [Nokogiri::XML::Node, #to_s] node:: XML Node or string for showing context
-    # @param [String] message::
+    # @param [Nokogiri::XML::Node, #to_s] node XML Node or string for showing context
+    # @param [String] message
     # @yieldreturn [String] appended to message, to allow for lazy-evaulation of message
     def add_debug(node, message = "")
       return unless ::RDF::Microdata.debug? || @debug
@@ -300,12 +301,12 @@ module RDF::Microdata
     
     # add a statement, object can be literal or URI or bnode
     #
-    # @param [Nokogiri::XML::Node, any] node:: XML Node or string for showing context
-    # @param [URI, BNode] subject:: the subject of the statement
-    # @param [URI] predicate:: the predicate of the statement
-    # @param [URI, BNode, Literal] object:: the object of the statement
-    # @return [Statement]:: Added statement
-    # @raise [ReaderError]:: Checks parameter types and raises if they are incorrect if parsing mode is _validate_.
+    # @param [Nokogiri::XML::Node, any] node XML Node or string for showing context
+    # @param [URI, BNode] subject the subject of the statement
+    # @param [URI] predicate the predicate of the statement
+    # @param [URI, BNode, Literal] object the object of the statement
+    # @return [Statement] Added statement
+    # @raise [ReaderError] Checks parameter types and raises if they are incorrect if parsing mode is _validate_.
     def add_triple(node, subject, predicate, object)
       statement = RDF::Statement.new(subject, predicate, object)
       add_debug(node) {"statement: #{RDF::NTriples.serialize(statement)}"}

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

@@ -141,7 +141,7 @@ module RDF::Microdata
 
         ##
         # Add NodeSetProxys
-        # @param [NodeSetProxy, Nokogiri::XML::Node]
+        # @param [NodeSetProxy, Nokogiri::XML::Node] other
         # @return [NodeSetProxy]
         def +(other)
           NodeSetProxy.new(self.node_set + other.node_set, parent)
@@ -149,7 +149,7 @@ module RDF::Microdata
 
         ##
         # Add a NodeProxy
-        # @param [NodeProxy, Nokogiri::XML::Node]
+        # @param [NodeProxy, Nokogiri::XML::Node] elem
         # @return [NodeSetProxy]
         def <<(elem)
           node_set << (elem.is_a?(NodeProxy) ? elem.node : elem)

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

@@ -179,7 +179,7 @@ module RDF::Microdata
 
         ##
         # Add NodeSetProxys
-        # @param [NodeSetProxy, Nokogiri::XML::Node]
+        # @param [NodeSetProxy, Nokogiri::XML::Node] other
         # @return [NodeSetProxy]
         def +(other)
           new_ns = node_set.clone
@@ -189,7 +189,7 @@ module RDF::Microdata
 
         ##
         # Add a NodeProxy
-        # @param [NodeProxy, Nokogiri::XML::Node]
+        # @param [NodeProxy, Nokogiri::XML::Node] elem
         # @return [NodeSetProxy]
         def <<(elem)
           node_set << (elem.is_a?(NodeProxy) ? elem.node : elem)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdf-microdata
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-14 00:00:00.000000000Z
+date: 2012-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
-  requirement: &70185697963060 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,15 @@ dependencies:
         version: 0.3.4
   type: :runtime
   prerelease: false
-  version_requirements: *70185697963060
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.4
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70185697962540 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +38,15 @@ dependencies:
         version: 1.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *70185697962540
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.1
 - !ruby/object:Gem::Dependency
   name: rdf-xsd
-  requirement: &70185697962060 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +54,15 @@ dependencies:
         version: 0.3.4
   type: :runtime
   prerelease: false
-  version_requirements: *70185697962060
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.4
 - !ruby/object:Gem::Dependency
   name: htmlentities
-  requirement: &70185697961580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +70,15 @@ dependencies:
         version: 4.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70185697961580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 4.3.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70185697960380 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +86,15 @@ dependencies:
         version: 1.5.0
   type: :development
   prerelease: false
-  version_requirements: *70185697960380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
-  requirement: &70185697959860 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +102,15 @@ dependencies:
         version: 0.2.8
   type: :development
   prerelease: false
-  version_requirements: *70185697959860
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.2.8
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70185697959400 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +118,15 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *70185697959400
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: spira
-  requirement: &70185697958860 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +134,15 @@ dependencies:
         version: 0.0.12
   type: :development
   prerelease: false
-  version_requirements: *70185697958860
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.12
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70185697958300 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +150,15 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70185697958300
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: rdf-spec
-  requirement: &70185697957720 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +166,15 @@ dependencies:
         version: 0.3.4
   type: :development
   prerelease: false
-  version_requirements: *70185697957720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.4
 - !ruby/object:Gem::Dependency
   name: rdf-turtle
-  requirement: &70185697957140 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +182,15 @@ dependencies:
         version: 0.1.0
   type: :development
   prerelease: false
-  version_requirements: *70185697957140
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: rdf-isomorphic
-  requirement: &70185697956660 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,7 +198,12 @@ dependencies:
         version: 0.3.4
   type: :development
   prerelease: false
-  version_requirements: *70185697956660
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.4
 description: Microdata reader for Ruby.
 email: public-rdf-ruby@w3.org
 executables: []
@@ -184,7 +244,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rdf-microdata
-rubygems_version: 1.8.17
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Microdata reader for Ruby.