rdf-rdfa 0.3.15 → 0.3.16

data/README

@@ -1,4 +1,5 @@
 # RDF::RDFa reader/writer
+[![Build Status](https://secure.travis-ci.org/ruby-rdf/rdf-rdfa.png?branch=master)](http://travis-ci.org/ruby-rdf/rdf-rdfa)
 
 [RDFa][RDFa 1.1 Core] parser for RDF.rb.
 
@@ -278,11 +279,11 @@ use the same prefix definitions found during parsing:
     puts graph.dump(:rdfa, :prefixes => prefixes)
 
 ### Template-based Writer
-The RDFa writer uses [Haml][Haml] templates for code generation. This allows fully
-customizable RDFa output in a variety of host languages.
-The [default template]({RDF::RDFa::Writer::DEFAULT_HAML}) generates human readable HTML5
-output. A [minimal template]({RDF::RDFa::Writer::MIN_HAML}) generates HTML, which is not
-intended for human consumption.
+The RDFa writer uses [Haml][Haml] templates for code generation. This allows
+fully customizable RDFa output in a variety of host languages. The [default
+template]({RDF::RDFa::Writer::DEFAULT_HAML}) generates human readable HTML5
+output. A [minimal template]({RDF::RDFa::Writer::MIN_HAML}) generates HTML,
+which is not intended for human consumption.
 
 To specify an alternative Haml template, consider the following:
 
@@ -398,10 +399,10 @@ The template hash defines four Haml templates:
 
 ## Dependencies
 * [Ruby](http://ruby-lang.org/) (>= 1.9) or (>= 1.8.1 with [Backports][])
-* [RDF.rb](http://rubygems.org/gems/rdf) (>= 0.3.1)
-* [Haml](https://rubygems.org/gems/haml) (>= 3.0.0)
-* [HTMLEntities](https://rubygems.org/gems/htmlentities) ('>= 4.3.0')
-* Soft dependency on [Nokogiri](http://rubygems.org/gems/nokogiri) (>= 1.3.3)
+* [RDF.rb](http://rubygems.org/gems/rdf) (>= 0.3.11)
+* [Haml](https://rubygems.org/gems/haml) (>= 3.1.7)
+* [HTMLEntities](https://rubygems.org/gems/htmlentities) ('>= 4.3.1')
+* Soft dependency on [Nokogiri](http://rubygems.org/gems/nokogiri) (>= 1.5.5)
 
 ## Documentation
 Full documentation available on [Rubydoc.info][RDFa doc]
@@ -436,16 +437,16 @@ Full documentation available on [Rubydoc.info][RDFa doc]
 * [RDF.rb][RDF.rb]
 * [Distiller](http://rdf.greggkellogg.net/distiller)
 * [Documentation][RDFa doc]
-* [History]{file:History.markdown}
+* [History](file:History.markdown)
 * [RDFa 1.1 Core][RDFa 1.1 Core]
 * [XHTML+RDFa 1.1][XHTML+RDFa 1.1]
 * [RDFa-test-suite](http://rdfa.info/test-suite/              "RDFa test suite")
 
 ## Author
-* [Gregg Kellogg](http://github.com/gkellogg) - <http://kellogg-assoc.com/>
+* [Gregg Kellogg](http://github.com/gkellogg) - <http://greggkellogg.net/>
 
 ## Contributors
-* [Nicholas Humfrey](http://github.com/njh)
+* [Nicholas Humfrey](http://github.com/njh) - <http://njh.me/>
 
 ## Contributing
 
@@ -486,3 +487,4 @@ see <http://unlicense.org/> or the accompanying {file:UNLICENSE} file.
 [RDFa doc]:         http://rubydoc.info/github/ruby-rdf/rdf-rdfa/frames
 [Haml]:             http://haml-lang.com/
 [Turtle]:           http://www.w3.org/TR/2011/WD-turtle-20110809/
+[Backports]:        http://rubygems.org/gems/backports

data/VERSION

@@ -1 +1 @@
-0.3.15
+0.3.16

data/lib/rdf/rdfa.rb

@@ -17,7 +17,7 @@ module RDF
   #
   # @see http://rubygems.org/gems/rdf
   # @see http://www.w3.org/TR/rdfa-syntax/#s_model RDFa 1.0
-  # @see http://www.w3.org/TR/2012/CR-rdfa-core-20120313/
+  # @see http://www.w3.org/TR/2012/REC-rdfa-core-20120607/
   # @see http://www.w3.org/TR/2012/CR-xhtml-rdfa-20120313/
   # @see http://dev.w3.org/html5/rdfa/
   #

data/lib/rdf/rdfa/expansion.rb

@@ -10,7 +10,7 @@ module RDF::RDFa
     ##
     # Perform vocabulary expansion on the resulting default graph.
     #
-    #   Vocabulary expansion relies on a sub-set of OWL [OWL2-PROFILES] entailment to add
+    #   Vocabulary expansion relies on a sub-set of OWL entailment to add
     #   triples to the default graph based on rules and property/class relationships
     #   described in referenced vocabularies.
     #

data/lib/rdf/rdfa/reader.rb

@@ -21,7 +21,7 @@ module RDF::RDFa
   #
   # Based on processing rules described here:
   # @see http://www.w3.org/TR/rdfa-syntax/#s_model RDFa 1.0
-  # @see http://www.w3.org/TR/2012/CR-rdfa-core-20120313/
+  # @see http://www.w3.org/TR/2012/REC-rdfa-core-20120607/
   # @see http://www.w3.org/TR/2012/CR-xhtml-rdfa-20120313/
   # @see http://dev.w3.org/html5/rdfa/
   #
@@ -61,11 +61,11 @@ module RDF::RDFa
       Regexp::EXTENDED)
 
     # This expression matches an term as defined in
-    # [RDFA-CORE](# @see http://www.w3.org/TR/2012/CR-rdfa-core-20120313/#s_terms)
+    # [RDFA-CORE](http://www.w3.org/TR/2012/REC-rdfa-core-20120607/#s_terms)
     #
     # For the avoidance of doubt, this definition means a 'term'
     # in RDFa is an XML NCName that also permits slash as a non-leading character.
-    # @see http://www.w3.org/TR/2012/CR-rdfa-core-20120313/#s_terms
+    # @see http://www.w3.org/TR/2012/REC-rdfa-core-20120607/#s_terms
     TERM_REGEXP = Regexp.new(
       %{^
         (?!\\\\u0301)             # ́ is a non-spacing acute accent.
@@ -235,7 +235,7 @@ module RDF::RDFa
     # @option options [Symbol] :library
     #   One of :nokogiri or :rexml. If nil/unspecified uses :nokogiri if available, :rexml otherwise.
     # @option options [Boolean]  :vocab_expansion (false)
-    #   whether to perform RDFS expansion on the resulting graph
+    #   whether to perform OWL2 expansion on the resulting graph
     # @option options [:xml, :xhtml1, :xhtml5, :html4, :html5, :svg] :host_language (:html5)
     #   Host Language
     # @option options [:"rdfa1.0", :"rdfa1.1"] :version (:"rdfa1.1")
@@ -253,7 +253,7 @@ module RDF::RDFa
     # @yield  [reader] `self`
     # @yieldparam  [RDF::Reader] reader
     # @yieldreturn [void] ignored
-    # @raise [Error]:: Raises RDF::ReaderError if _validate_
+    # @raise [RDF::ReaderError] if _validate_
     def initialize(input = $stdin, options = {}, &block)
       super do
         @debug = options[:debug]
@@ -498,8 +498,9 @@ module RDF::RDFa
     # @raise [RDF::ReaderError] Checks parameter types and raises if they are incorrect if parsing mode is _validate_.
     def add_triple(node, subject, predicate, object, context = nil)
       statement = RDF::Statement.new(subject, predicate, object)
+      add_error(node, "statement #{RDF::NTriples.serialize(statement)} is invalid") unless statement.valid?
       add_info(node, "statement: #{RDF::NTriples.serialize(statement)}")
-      @callback.call(statement) if @options[:rdfagraph].include?(:output) && statement.valid?
+      @callback.call(statement) if @options[:rdfagraph].include?(:output)
     end
 
     # Parsing an RDFa document (this is *not* the recursive method)
@@ -788,60 +789,61 @@ module RDF::RDFa
         else
           # If the current element contains no @rel or @rev attribute, then the next step is to establish a value for new subject.
           # This step has two possible alternatives.
-          #  1. If the current element contains the @property attribute, but does not contain the @content
-          #     or the @datatype attribute
+          #  1. If the current element contains the @property attribute, but does not contain the @content or the @datatype attributes, then
           if attrs[:property] && !(attrs[:content] || attrs[:datatype])
-            new_subject = process_uri(element, attrs[:about], evaluation_context, base,
-                        :uri_mappings => uri_mappings,
-                        :restrictions => SafeCURIEorCURIEorIRI.fetch(@version, [])) if attrs[:about]
-
-            # if the @typeof attribute is present, set typed resource to new subject
-            typed_resource = new_subject if attrs[:typeof]
-
-            add_debug(element) {
-              "[Step 5] new_subject: #{new_subject.to_ntriples rescue 'nil'}, " +
-              "typed_resource: #{typed_resource.to_ntriples rescue 'nil'}"
-            }
-
-            # If no URI is provided by a resource attribute, then the first match from the following rules
-            # will apply:
-            new_subject ||= if [:xhtml1, :xhtml5, :html4, :html5].include?(@host_language) && element.name =~ /^(head|body)$/
+            # new subject is set to the resource obtained from the first match from the following rule:
+            new_subject ||= if attrs[:about]
+              # by using the resource from @about, if present, obtained according to the section on CURIE and IRI Processing;
+              process_uri(element, attrs[:about], evaluation_context, base,
+                          :uri_mappings => uri_mappings,
+                          :restrictions => SafeCURIEorCURIEorIRI.fetch(@version, []))
+            elsif [:xhtml1, :xhtml5, :html4, :html5].include?(@host_language) && element.name =~ /^(head|body)$/
               # From XHTML+RDFa 1.1:
-              # if no URI is provided, then first check to see if the element is the head or body element.
-              # If it is, then act as if the new subject is set to the parent object.
+              # if no URI is provided, then first check to see if the element is the head or body element. If it is, then act as if the new subject is set to the parent object.
               evaluation_context.parent_object
             elsif element == root && base
-              # if the element is the root element of the document, then act as if there is an empty @about present,
-              # and process it according to the rule for @about, above;
+              # otherwise, if the element is the root element of the document, then act as if there is an empty @about present, and process it according to the rule for @about, above;
               uri(base)
-            else
-              # otherwise, if parent object is present, new subject is set to the value of parent object.
-              evaluation_context.parent_object
             end
 
-            if attrs[:typeof]
-              typed_resource ||= 
+            # if the @typeof attribute is present, set typed resource to new subject
+            typed_resource = new_subject if attrs[:typeof]
+
+            # otherwise, if parent object is present, new subject is set to the value of parent object.
+            new_subject ||= evaluation_context.parent_object
+
+            # If @typeof is present then typed resource is set to the resource obtained from the first match from the following rules:
+
+            # by using the resource from @about, if present, obtained according to the section on CURIE and IRI Processing; (done above)
+            # otherwise, if the element is the root element of the document, then act as if there is an empty @about present and process it according to the previous rule; (done above)
+
+            if attrs[:typeof] && typed_resource.nil?
+              # otherwise,
+              typed_resource ||= if attrs[:resource]
+                # by using the resource from @resource, if present, obtained according to the section on CURIE and IRI Processing;
                 process_uri(element, attrs[:resource], evaluation_context, base,
                             :uri_mappings => uri_mappings,
-                            :restrictions => SafeCURIEorCURIEorIRI.fetch(@version, [])) if attrs[:resource]
-              typed_resource ||= 
+                            :restrictions => SafeCURIEorCURIEorIRI.fetch(@version, []))
+              elsif attrs[:href] || attrs[:src]
+                # otherwise, by using the IRI from @href, if present, obtained according to the section on CURIE and IRI Processing;
+                # otherwise, by using the IRI from @src, if present, obtained according to the section on CURIE and IRI Processing;
                 process_uri(element, (attrs[:href] || attrs[:src]), evaluation_context, base,
-                            :restrictions => [:uri]) if attrs[:href] || attrs[:src]
-              typed_resource ||= RDF::Node.new
-              
+                            :restrictions => [:uri])
+              else
+                # otherwise, the value of typed resource is set to a newly created bnode.
+                RDF::Node.new
+              end
+
               # The value of the current object resource is set to the value of typed resource.
               current_object_resource = typed_resource
             end
           else
             # otherwise (ie, the @content or @datatype)
             new_subject =
-              process_uri(element, attrs[:about], evaluation_context, base,
+              process_uri(element, (attrs[:about] || attrs[:resource]),
+                          evaluation_context, base,
                           :uri_mappings => uri_mappings,
-                          :restrictions => SafeCURIEorCURIEorIRI.fetch(@version, [])) if attrs[:about]
-            new_subject ||=
-              process_uri(element, attrs[:resource], evaluation_context, base,
-                          :uri_mappings => uri_mappings,
-                          :restrictions => SafeCURIEorCURIEorIRI.fetch(@version, [])) if attrs[:resource]
+                          :restrictions => SafeCURIEorCURIEorIRI.fetch(@version, [])) if attrs[:about] ||attrs[:resource]
             new_subject ||=
               process_uri(element, (attrs[:href] || attrs[:src]), evaluation_context, base,
                           :restrictions => [:uri]) if attrs[:href] || attrs[:src]
@@ -874,6 +876,7 @@ module RDF::RDFa
         add_debug(element) {
           "[Step 5] new_subject: #{new_subject.to_ntriples rescue 'nil'}, " +
           "typed_resource: #{typed_resource.to_ntriples rescue 'nil'}, " +
+          "current_object_resource: #{current_object_resource.to_ntriples rescue 'nil'}, " +
           "skip = #{skip}"
         }
       else
@@ -932,7 +935,7 @@ module RDF::RDFa
         }
       end
     
-      # Process @typeof if there is a subject [Step 7]
+      # [Step 7] If in any of the previous steps a typed resource was set to a non-null value, it is now used to provide a subject for type values;
       if typed_resource
         # Typeof is TERMorCURIEorAbsIRIs
         types = process_uris(element, attrs[:typeof], evaluation_context, base,
@@ -961,8 +964,7 @@ module RDF::RDFa
 
       # Generate triples with given object [Step 9]
       #
-      # If the current element has a @inlist attribute, add the property to the
-      # list associated with that property, creating a new list if necessary.
+      # If in any of the previous steps a current object resource was set to a non-null value, it is now used to generate triples and add entries to the local list mapping:
       if new_subject && current_object_resource && (attrs[:rel] || attrs[:rev])
         add_debug(element) {"[Step 9] rels: #{rels.inspect} revs: #{revs.inspect}"}
         rels.each do |r|
@@ -976,6 +978,7 @@ module RDF::RDFa
             add_debug(element) {"[Step 9] add #{current_object_resource.to_ntriples} to #{r} #{list_mapping[r].inspect}"}
             list_mapping[r] << current_object_resource
           else
+            # Predicates for the current object resource can be set by using one or both of the @rel and the @rev attributes but, in case of the @rel attribute, only if the @inlist is not present:
             add_triple(element, new_subject, r, current_object_resource)
           end
         end
@@ -1108,9 +1111,8 @@ module RDF::RDFa
               RDF::Literal.new(attrs[:content], :language => language, :validate => validate?, :canonicalize => canonicalize?)
             when (attrs[:resource] || attrs[:href] || attrs[:src]) &&
                  !(attrs[:rel] || attrs[:rev]) &&
-                 evaluation_context.incomplete_triples.empty? &&
                  @version != :"rdfa1.0"
-              add_debug(element, "[Step 11] IRI literal (resource|href|src)")
+              add_debug(element, "[Step 11] resource (resource|href|src)")
               res = process_uri(element, attrs[:resource], evaluation_context, base,
                                 :uri_mappings => uri_mappings,
                                 :restrictions => SafeCURIEorCURIEorIRI.fetch(@version, [])) if attrs[:resource]

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

@@ -26,7 +26,7 @@ module RDF::RDFa
         ##
         # Element language
         #
-        # From HTML5 [3.2.3.3]
+        # 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
@@ -140,8 +140,8 @@ module RDF::RDFa
         ##
         # Return a proxy for each child
         #
-        # @yield(child)
-        # @yieldparam(NodeProxy)
+        # @yield child
+        # @yieldparam [NodeProxy]
         def each
           @node_set.each do |c|
             yield NodeProxy.new(c, parent)
@@ -278,7 +278,8 @@ module RDF::RDFa
       ##
       # Document errors
       def doc_errors
-        @doc.errors
+        # FIXME: Nokogiri version 1.5.5 things <time> is invalid
+        @doc.errors.reject {|e| e.to_s =~ /Tag time invalid/}
       end
       
       ##

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

@@ -28,7 +28,7 @@ module RDF::RDFa
         ##
         # Element language
         #
-        # From HTML5 [3.2.3.3]
+        # 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
@@ -143,7 +143,7 @@ module RDF::RDFa
           end
         end
 
-        # Simple case for <script>
+        # Simple case for &lt;script&gt;
         def css(path)
           xpath("//script[@type]")
         end
@@ -169,8 +169,8 @@ module RDF::RDFa
         ##
         # Return a proxy for each child
         #
-        # @yield(child)
-        # @yieldparam(NodeProxy)
+        # @yield child
+        # @yieldparam [NodeProxy]
         def each
           @node_set.each do |c|
             yield NodeProxy.new(c, parent)

data/lib/rdf/rdfa/writer.rb

@@ -3,51 +3,47 @@ require 'cgi'
 
 module RDF::RDFa
   ##
-  # An RDFa 1.1 serialiser in Ruby. The RDFa serializer makes use of Haml templates,
-  # allowing runtime-replacement with alternate templates. Note, however, that templates
-  # should be checked against the W3C test suite to ensure that valid RDFa is emitted.
+  # An RDFa 1.1 serialiser in Ruby. The RDFa serializer makes use of Haml templates, allowing runtime-replacement with alternate templates. Note, however, that templates should be checked against the W3C test suite to ensure that valid RDFa is emitted.
   #
-  # Note that the natural interface is to write a whole graph at a time.
-  # Writing statements or Triples will create a graph to add them to
-  # and then serialize the graph.
+  # Note that the natural interface is to write a whole graph at a time. Writing statements or Triples will create a graph to add them to and then serialize the graph.
   #
   # The writer will add prefix definitions, and use them for creating @prefix definitions, and minting CURIEs
   #
   # @example Obtaining a RDFa writer class
-  #   RDF::Writer.for(:html)         #=> RDF::RDFa::Writer
-  #   RDF::Writer.for("etc/test.html")
-  #   RDF::Writer.for(:file_name      => "etc/test.html")
-  #   RDF::Writer.for(:file_extension => "html")
-  #   RDF::Writer.for(:content_type   => "application/xhtml+xml")
-  #   RDF::Writer.for(:content_type   => "text/html")
+  #     RDF::Writer.for(:html)          => RDF::RDFa::Writer
+  #     RDF::Writer.for("etc/test.html")
+  #     RDF::Writer.for(:file_name      => "etc/test.html")
+  #     RDF::Writer.for(:file_extension => "html")
+  #     RDF::Writer.for(:content_type   => "application/xhtml+xml")
+  #     RDF::Writer.for(:content_type   => "text/html")
   #
   # @example Serializing RDF graph into an XHTML+RDFa file
-  #   RDF::RDFa::Write.open("etc/test.html") do |writer|
-  #     writer << graph
-  #   end
+  #     RDF::RDFa::Write.open("etc/test.html") do |writer|
+  #       writer << graph
+  #     end
   #
   # @example Serializing RDF statements into an XHTML+RDFa file
-  #   RDF::RDFa::Writer.open("etc/test.html") do |writer|
-  #     graph.each_statement do |statement|
-  #       writer << statement
+  #     RDF::RDFa::Writer.open("etc/test.html") do |writer|
+  #       graph.each_statement do |statement|
+  #         writer << statement
+  #       end
   #     end
-  #   end
   #
   # @example Serializing RDF statements into an XHTML+RDFa string
-  #   RDF::RDFa::Writer.buffer do |writer|
-  #     graph.each_statement do |statement|
-  #       writer << statement
+  #     RDF::RDFa::Writer.buffer do |writer|
+  #       graph.each_statement do |statement|
+  #         writer << statement
+  #       end
   #     end
-  #   end
   #
   # @example Creating @base and @prefix definitions in output
-  #   RDF::RDFa::Writer.buffer(:base_uri => "http://example.com/", :prefixes => {
-  #       :foaf => "http://xmlns.com/foaf/0.1/"}
-  #   ) do |writer|
-  #     graph.each_statement do |statement|
-  #       writer << statement
+  #     RDF::RDFa::Writer.buffer(:base_uri => "http://example.com/", :prefixes => {
+  #         :foaf => "http://xmlns.com/foaf/0.1/"}
+  #     ) do |writer|
+  #       graph.each_statement do |statement|
+  #         writer << statement
+  #       end
   #     end
-  #   end
   #
   # @author [Gregg Kellogg](http://kellogg-assoc.com/)
   class Writer < RDF::Writer
@@ -57,8 +53,7 @@ module RDF::RDFa
     # @return [Array<URI>]
     attr :top_classes
 
-    # Defines order of predicates to to emit at begninning of a resource description. Defaults to
-    # [rdf:type, rdfs:label, dc:title]
+    # Defines order of predicates to to emit at begninning of a resource description. Defaults to `[rdf:type, rdfs:label, dc:title]`
     # @return [Array<URI>]
     attr :predicate_order
 
@@ -99,11 +94,9 @@ module RDF::RDFa
     #   Defines order of predicates to to emit at begninning of a resource description..
     # @option options [Array<RDF::URI>] :heading_predicates ([RDF::RDFS.label, RDF::DC.title])
     #   Defines order of predicates to use in heading.
-    # @option options [String, Symbol, Hash{Symbol => String}] :haml (DEFAULT_HAML)
-    #   HAML templates used for generating code
+    # @option options [String, Symbol, Hash{Symbol => String}] :haml (DEFAULT_HAML) HAML templates used for generating code
     # @option options [Hash] :haml_options (HAML_OPTIONS)
-    #   Options to pass to Haml::Engine.new. Default options set :ugly => false
-    #   to ensure that whitespace in literals with newlines is properly preserved.
+    #   Options to pass to Haml::Engine.new. Default options set `:ugly => false` to ensure that whitespace in literals with newlines is properly preserved.
     # @yield  [writer]
     # @yieldparam [RDF::Writer] writer
     def initialize(output = $stdout, options = {}, &block)
@@ -202,22 +195,7 @@ module RDF::RDFa
 
     protected
 
-    # Render document using haml_template[:doc].
-    # Yields each subject to be rendered separately.
-    #
-    # The default Haml template is:
-    #     !!! XML
-    #     !!! 5
-    #     %html{:xmlns => "http://www.w3.org/1999/xhtml", :lang => lang, :prefix => prefix}
-    #       - if base || title
-    #         %head
-    #           - if base
-    #             %base{:href => base}
-    #           - if title
-    #             %title= title
-    #       %body
-    #         - subjects.each do |subject|
-    #           != yield(subject)
+    # Render document using `haml_template[:doc]`. Yields each subject to be rendered separately.
     #
     # @param [Array<RDF::Resource>] subjects
     #   Ordered list of subjects. Template must yield to each subject, which returns
@@ -252,28 +230,11 @@ module RDF::RDFa
       end
     end
 
-    # Render a subject using haml_template[:subject].
-    #
-    # The _subject_ template may be called either as a top-level element, or recursively under another element
-    # if the _rel_ local is not nil.
-    #
-    # Yields each predicate/property to be rendered separately (@see #render_property_value and
-    # {#render_property_values}).
+    # Render a subject using `haml_template[:subject]`.
     #
-    # The default Haml template is:
-    #     - if element == :li
-    #       %li{:rel => rel, :resource => (about || resource), :typeof => typeof, :inlist => inlist}
-    #         - if typeof
-    #           %span.type!= typeof
-    #         - predicates.each do |predicate|
-    #           != yield(predicate)
-    #     - else
-    #       %div{:rel => rel, :resource => (about || resource), :typeof => typeof, :inlist => inlist}
-    #         - if typeof
-    #           %span.type!= typeof
-    #         - predicates.each do |predicate|
-    #           != yield(predicate)
+    # The _subject_ template may be called either as a top-level element, or recursively under another element if the _rel_ local is not nil.
     #
+    # Yields each predicate/property to be rendered separately (@see #render_property_value and `#render_property_values`).
     #
     # @param [Array<RDF::Resource>] subject
     #   Subject to render
@@ -292,7 +253,7 @@ module RDF::RDFa
     #   RDF type as a CURIE, URI or Node definition.
     #   If :about is nil, this defaults to the empty string ("").
     # @option options [:li, nil] element (nil)
-    #   Render with <li>, otherwise with template default.
+    #   Render with &lt;li&gt;, otherwise with template default.
     # @option options [String] haml (haml_template[:subject])
     #   Haml template to render.
     # @yield [predicate]
@@ -301,7 +262,7 @@ module RDF::RDFa
     # @yieldreturn [:ignored]
     # @return String
     #   The rendered document is returned as a string
-    # Return Haml template for document from haml_template[:subject]
+    # Return Haml template for document from `haml_template[:subject]`
     def render_subject(subject, predicates, options = {})
       template = options[:haml] || :subject
       options = {
@@ -320,62 +281,17 @@ module RDF::RDFa
       end
     end
 
-    # Render a single- or multi-valued predicate using haml_template[:property_value] or haml_template[:property_values].
-    # Yields each object for optional rendering. The block should only
-    # render for recursive subject definitions (i.e., where the object
-    # is also a subject and is rendered underneath the first referencing subject).
-    #
-    # The default Haml template for a single-valued property is:
-    #     - if heading_predicates.include?(predicate) && object.literal?
-    #       %h1{:property => get_curie(predicate), :content => get_content(object), :lang => get_lang(object), :datatype => get_dt_curie(object), :inlist => inlist}= escape_entities(get_value(object))
-    #     - else
-    #       %div.property
-    #         %span.label
-    #           = get_predicate_name(predicate)
-    #         - if res = yield(object)
-    #           != res
-    #         - elsif get_curie(object) == 'rdf:nil'
-    #           %span{:rel => get_curie(predicate), :inlist => ''}
-    #         - elsif object.node?
-    #           %span{:property => get_curie(predicate), :resource => get_curie(object), :inlist => inlist}= get_curie(object)
-    #         - elsif object.uri?
-    #           %a{:property => get_curie(predicate), :href => object.to_s, :inlist => inlist}= object.to_s
-    #         - elsif object.datatype == RDF.XMLLiteral
-    #           %span{:property => get_curie(predicate), :lang => get_lang(object), :datatype => get_dt_curie(object), :inlist => inlist}<!= get_value(object)
-    #         - else
-    #           %span{:property => get_curie(predicate), :content => get_content(object), :lang => get_lang(object), :datatype => get_dt_curie(object), :inlist => inlist}= escape_entities(get_value(object))
-    #
-    #
-    # The default Haml template for a multi-valued property is:
-    #     %div.property
-    #       %span.label
-    #         = get_predicate_name(predicate)
-    #       %ul
-    #         - objects.each do |object|
-    #           - if res = yield(object)
-    #             != res
-    #           - elsif object.node?
-    #             %li{:property => get_curie(predicate), :resource => get_curie(object), :inlist => inlist}= get_curie(object)
-    #           - elsif object.uri?
-    #             %li
-    #               %a{:property => get_curie(predicate), :href => object.to_s, :inlist => inlist}= object.to_s
-    #           - elsif object.datatype == RDF.XMLLiteral
-    #             %li{:property => get_curie(predicate), :lang => get_lang(object), :datatype => get_curie(object.datatype), :inlist => inlist}<!= get_value(object)
-    #           - else
-    #             %li{:property => get_curie(predicate), :content => get_content(object), :lang => get_lang(object), :datatype => get_dt_curie(object), :inlist => inlist}= escape_entities(get_value(object))
+    # Render a single- or multi-valued predicate using `haml_template[:property_value]` or `haml_template[:property_values]`. Yields each object for optional rendering. The block should only render for recursive subject definitions (i.e., where the object is also a subject and is rendered underneath the first referencing subject).
     #
-    # If a multi-valued property definition is not found within the template,
-    # the writer will use the single-valued property definition multiple times.
+    # If a multi-valued property definition is not found within the template, the writer will use the single-valued property definition multiple times.
     #
     # @param [Array<RDF::Resource>] predicate
     #   Predicate to render.
     # @param [Array<RDF::Resource>] objects
-    #   List of objects to render.
-    #   If the list contains only a single element, the :property_value template will be used.
-    #   Otherwise, the :property_values template is used.
+    #   List of objects to render. If the list contains only a single element, the :property_value template will be used. Otherwise, the :property_values template is used.
     # @param [Hash{Symbol => Object}] options Rendering options passed to Haml render.
     # @option options [String] haml (haml_template[:property_value], haml_template[:property_values])
-    #   Haml template to render. Otherwise, uses haml_template[:property_value] or haml_template[:property_values]
+    #   Haml template to render. Otherwise, uses `haml_template[:property_value] or haml_template[:property_values]`
     #   depending on the cardinality of objects.
     # @yield [object]
     #   Yields object.
@@ -523,8 +439,7 @@ module RDF::RDFa
       prop_list
     end
 
-    # Perform any statement preprocessing required. This is used to perform reference counts and determine required
-    # prefixes.
+    # Perform any statement preprocessing required. This is used to perform reference counts and determine required prefixes.
     # @param [RDF::Statement] statement
     # @return [ignored]
     def preprocess_statement(statement)
@@ -551,21 +466,20 @@ module RDF::RDFa
 
     # Display a subject.
     #
-    # If the Haml template contains an entry matching the subject's rdf:type URI,
-    # that entry will be used as the template for this subject and it's properties.
+    # If the Haml template contains an entry matching the subject's rdf:type URI, that entry will be used as the template for this subject and it's properties.
     #
     # @example Displays a subject as a Resource Definition:
-    #   <div typeof="rdfs:Resource" about="http://example.com/resource">
-    #     <h1 property="dc:title">label</h1>
-    #     <ul>
-    #       <li content="2009-04-30T06:15:51Z" property="dc:created">2009-04-30T06:15:51+00:00</li>
-    #     </ul>
-    #   </div>
+    #     <div typeof="rdfs:Resource" about="http://example.com/resource">
+    #       <h1 property="dc:title">label</h1>
+    #       <ul>
+    #         <li content="2009-04-30T06:15:51Z" property="dc:created">2009-04-30T06:15:51+00:00</li>
+    #       </ul>
+    #     </div>
     #
     # @param [RDF::Resource] subject
     # @param [Hash{Symbol => Object}] options
     # @option options [:li, nil] :element(:div)
-    #   Serialize using <li> rather than template default element
+    #   Serialize using &lt;li&gt; rather than template default element
     # @option options [RDF::Resource] :rel (nil)
     #   Optional @rel property
     # @return [Nokogiri::XML::Element, {Namespace}]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdf-rdfa
 version: !ruby/object:Gem::Version
-  version: 0.3.15
+  version: 0.3.16
   prerelease: 
 platform: ruby
 authors:
@@ -10,264 +10,264 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-26 00:00:00.000000000 Z
+date: 2012-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.3.5
-    none: false
+  name: rdf
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.5
-    none: false
-  name: rdf
-  prerelease: false
+        version: 0.3.11
   type: :runtime
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.1.6
-    none: false
+        version: 0.3.11
+- !ruby/object:Gem::Dependency
+  name: haml
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.1.6
-    none: false
-  name: haml
-  prerelease: false
+        version: 3.1.7
   type: :runtime
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.7
-    none: false
+        version: 3.1.7
+- !ruby/object:Gem::Dependency
+  name: rdf-xsd
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.7
-    none: false
-  name: rdf-xsd
-  prerelease: false
+        version: 0.3.8
   type: :runtime
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 4.3.0
-    none: false
+        version: 0.3.8
+- !ruby/object:Gem::Dependency
+  name: htmlentities
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 4.3.0
-    none: false
-  name: htmlentities
-  prerelease: false
+        version: 4.3.1
   type: :runtime
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.4.4
-    none: false
+        version: 4.3.1
+- !ruby/object:Gem::Dependency
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.4.4
-    none: false
-  name: nokogiri
-  prerelease: false
+        version: 1.5.5
   type: :development
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.2.9
-    none: false
+        version: 1.5.5
+- !ruby/object:Gem::Dependency
+  name: equivalent-xml
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.2.9
-    none: false
-  name: equivalent-xml
-  prerelease: false
+        version: 0.3.0
   type: :development
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.5
-    none: false
+        version: 0.3.0
+- !ruby/object:Gem::Dependency
+  name: open-uri-cached
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.0.5
-    none: false
-  name: open-uri-cached
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.12
-    none: false
+        version: 0.0.5
+- !ruby/object:Gem::Dependency
+  name: spira
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.0.12
-    none: false
-  name: spira
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.10.0
-    none: false
+        version: 0.0.12
+- !ruby/object:Gem::Dependency
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.10.0
-    none: false
-  name: rspec
-  prerelease: false
+        version: 2.12.0
   type: :development
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.2.5
-    none: false
+        version: 2.12.0
+- !ruby/object:Gem::Dependency
+  name: rdf-microdata
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.2.5
-    none: false
-  name: rdf-microdata
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.5
-    none: false
+        version: 0.2.5
+- !ruby/object:Gem::Dependency
+  name: rdf-spec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.5
-    none: false
-  name: rdf-spec
-  prerelease: false
+        version: 0.3.11
   type: :development
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.2
-    none: false
+        version: 0.3.11
+- !ruby/object:Gem::Dependency
+  name: rdf-turtle
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.2
-    none: false
-  name: rdf-turtle
-  prerelease: false
+        version: 0.3.0
   type: :development
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.7
-    none: false
+        version: 0.3.0
+- !ruby/object:Gem::Dependency
+  name: rdf-rdfxml
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.7
-    none: false
-  name: rdf-rdfxml
-  prerelease: false
+        version: 0.3.8
   type: :development
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.4
-    none: false
+        version: 0.3.8
+- !ruby/object:Gem::Dependency
+  name: rdf-isomorphic
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.3.4
-    none: false
-  name: rdf-isomorphic
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.0
-    none: false
+        version: 0.3.4
+- !ruby/object:Gem::Dependency
+  name: sparql
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.0
-    none: false
-  name: sparql
-  prerelease: false
+        version: 0.3.1
   type: :development
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.7.5
-    none: false
+        version: 0.3.1
+- !ruby/object:Gem::Dependency
+  name: yard
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.7.5
-    none: false
-  name: yard
-  prerelease: false
+        version: 0.8.3
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.3
 description: RDF::RDFa is an RDFa reader/writer for Ruby using the RDF.rb library
   suite.
 email: public-rdf-ruby@w3.org
@@ -279,17 +279,10 @@ files:
 - README
 - UNLICENSE
 - VERSION
-- lib/rdf/rdfa.rb
-- lib/rdf/rdfa/context.rb
-- lib/rdf/rdfa/expansion.rb
-- lib/rdf/rdfa/format.rb
-- lib/rdf/rdfa/reader.rb
-- lib/rdf/rdfa/version.rb
-- lib/rdf/rdfa/vocab.rb
-- lib/rdf/rdfa/writer.rb
 - lib/rdf/rdfa/context/html.rb
 - lib/rdf/rdfa/context/xhtml.rb
 - lib/rdf/rdfa/context/xml.rb
+- lib/rdf/rdfa/context.rb
 - lib/rdf/rdfa/expansion/cc.rb
 - lib/rdf/rdfa/expansion/dc.rb
 - lib/rdf/rdfa/expansion/doap.rb
@@ -300,10 +293,17 @@ files:
 - lib/rdf/rdfa/expansion/skos.rb
 - lib/rdf/rdfa/expansion/skosxl.rb
 - lib/rdf/rdfa/expansion/v.rb
+- lib/rdf/rdfa/expansion.rb
+- lib/rdf/rdfa/format.rb
 - lib/rdf/rdfa/patches/string_hacks.rb
 - lib/rdf/rdfa/reader/nokogiri.rb
 - lib/rdf/rdfa/reader/rexml.rb
+- lib/rdf/rdfa/reader.rb
+- lib/rdf/rdfa/version.rb
+- lib/rdf/rdfa/vocab.rb
 - lib/rdf/rdfa/writer/haml_templates.rb
+- lib/rdf/rdfa/writer.rb
+- lib/rdf/rdfa.rb
 homepage: http://github.com/ruby-rdf/rdf-rdfa
 licenses:
 - Public Domain
@@ -312,17 +312,17 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.8.1
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 requirements: []
 rubyforge_project: rdf-rdfa
 rubygems_version: 1.8.24