Merge remote-tracking branch 'origin/master' into gk-master

.travis.yml

@@ -0,0 +1,13 @@
+language: ruby
+bundler_args: --without debug
+script: "bundle exec rspec spec"
+env:
+  - CI=true
+rvm:
+  - ree
+  - 1.8.7
+  - 1.9.3
+  - jruby-18mode # JRuby in 1.8 mode
+  - jruby-19mode # JRuby in 1.9 mode
+  - rbx-18mode
+  - rbx-19mode

Gemfile

@@ -2,6 +2,6 @@ source "http://rubygems.org"
 
 gemspec :name => ""
 
-group :development do
+group :debug do
   gem "wirble"
 end

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rdf-microdata (0.2.4)
+    rdf-microdata (0.2.5)
       htmlentities (>= 4.3.0)
       json (>= 1.6.1)
       rdf (>= 0.3.4)

History.md

@@ -1,3 +1,12 @@
+### 0.2.5
+* If RDFa is loaded, don't assert text/html and :html content-type/extension, as RDFa will call out based on presence of @itemscope
+
+### 0.2.4
+* Update contextual case based on LC spec change to use current_name instead of current_type when creating a predicate URI in contextual.
+* Add hCard and hCalendar vocabulary definitions.
+* Make sure registry_uri is processed for each invocation, allowing it to be passed as a parameter.
+* Add --registry argument to script/parse to allow it to be specified.
+
 ### 0.2.3
 * Update to latest processing rules, including the use of a registry.
 * Updated microdata namespace.

README.md

@@ -28,7 +28,9 @@ The parser uses a build-in version of the [Microdata RDF][] registry.
 
 ## Note
 This spec is based on the W3C HTML Data Task Force specification and does not support
-GRDDL-type triple generation, such as for html>head>title and <a>
+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) (>= 0.3.4)

VERSION

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

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 }
 
     ##

lib/rdf/microdata/reader.rb

@@ -81,7 +81,8 @@ def initialize(prefixURI, propertyURI = :vocabulary, multipleValues = :unordered
         @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 @@ def node_path(node)
 
     # 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 @@ def add_error(node, message)
 
     # 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)}"}

lib/rdf/microdata/reader/nokogiri.rb

@@ -141,15 +141,15 @@ def shift
 
         ##
         # 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)
         end
 
         ##
         # 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)

lib/rdf/microdata/reader/rexml.rb

@@ -179,7 +179,7 @@ def shift
 
         ##
         # 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 @@ def +(other)
 
         ##
         # 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)

spec/test-suite

@@ -0,0 +1 @@
+../../htmldata/microdata-rdf/tests/