rdf-rdfa 0.3.10 → 0.3.11

data/README

@@ -397,10 +397,10 @@ see <http://unlicense.org/> or the accompanying {file:UNLICENSE} file.
 [YARD]:             http://yardoc.org/
 [YARD-GS]:          http://rubydoc.info/docs/yard/file/docs/GettingStarted.md
 [PDD]:              http://lists.w3.org/Archives/Public/public-rdf-ruby/2010May/0013.html
-[RDFa 1.1 Core]:    http://www.w3.org/TR/2011/WD-rdfa-core-20110331/                    "RDFa 1.1 Core"
-[RDFa Lite 1.1]:    http://www.w3.org/2010/02/rdfa/drafts/2011/ED-rdfa-lite-20111030/   "RDFa Lite 1.1"
-[XHTML+RDFa 1.1]:   http://www.w3.org/TR/2011/WD-xhtml-rdfa-20110331/                   "XHTML+RDFa 1.1"
-[HTML+RDFa 1.1]:    http://www.w3.org/TR/2011/WD-rdfa-in-html-20110525/                 "HTML+RDFa 1.1"
+[RDFa 1.1 Core]:    http://www.w3.org/TR/2012/PR-rdfa-core-20120508/                    "RDFa 1.1 Core"
+[RDFa Lite 1.1]:    http://www.w3.org/TR/2012/PR-rdfa-lite-20120508/                    "RDFa Lite 1.1"
+[XHTML+RDFa 1.1]:   http://www.w3.org/TR/2012/PR-xhtml-rdfa-20120508/                   "XHTML+RDFa 1.1"
+[HTML+RDFa 1.1]:    http://www.w3.org/TR/rdfa-in-html/                                   "HTML+RDFa 1.1"
 [RDFa-test-suite]:  http://rdfa.info/test-suite/                                        "RDFa test suite"
 [RDFa doc]:         http://rubydoc.info/github/gkellogg/rdf-rdfa/frames
 [Haml]:             http://haml-lang.com/

data/VERSION

@@ -1 +1 @@
-0.3.10
+0.3.11

data/lib/rdf/rdfa/reader.rb

@@ -80,7 +80,7 @@ module RDF::RDFa
       Regexp::EXTENDED)
 
     # Host language
-    # @attr [:xml1, :xhtml1, :xhtml5, :html4, :html5, :svg]
+    # @attr [:xml, :xhtml1, :xhtml5, :html4, :html5, :svg]
     attr_reader :host_language
     
     # Version
@@ -236,7 +236,7 @@ module RDF::RDFa
     #   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
-    # @option options [:xml1, :xhtml1, :xhtml5, :html4, :html5, :svg] :host_language (:xhtml1)
+    # @option options [:xml, :xhtml1, :xhtml5, :html4, :html5, :svg] :host_language (:html5)
     #   Host Language
     # @option options [:"rdfa1.0", :"rdfa1.1"] :version (:"rdfa1.1")
     #   Parser version information
@@ -312,7 +312,7 @@ module RDF::RDFa
         end
 
         case @host_language
-        when :xml1, :svg
+        when :xml, :svg
           @host_defaults[:initial_contexts] = [XML_RDFA_CONTEXT]
         when :xhtml1
           @host_defaults[:initial_contexts] = [XML_RDFA_CONTEXT, XHTML_RDFA_CONTEXT]
@@ -608,7 +608,8 @@ module RDF::RDFa
       list_mapping = evaluation_context.list_mapping
 
       xml_base = element.base
-      base = xml_base.to_s if xml_base && ![:xhtml1, :xhtml5, :html4, :html5].include?(@host_language)
+      base = xml_base.to_s if xml_base && ![:xhtml1, :html4, :html5].include?(@host_language)
+      add_debug(element) {"base: #{base.inspect}"} if base
       base ||= evaluation_context.base
 
       # Pull out the attributes needed for the skip test.
@@ -616,7 +617,6 @@ module RDF::RDFa
       %w(
         about
         content
-        data
         datatype
         datetime
         href
@@ -635,6 +635,20 @@ module RDF::RDFa
 
       add_debug(element) {"attrs " + attrs.inspect} unless attrs.empty?
 
+      # If @property and @rel/@rev are on the same elements, the non-CURIE and non-URI @rel/@rev values are ignored. If, after this, the value of @rel/@rev becomes empty, then the then the processor must act as if the attribute is not present.
+      if attrs.has_key?(:property) && @version == :"rdfa1.1" && (@host_language == :html5 || @host_language == :xhtml5 || @host_language == :html4)
+        [:rel, :rev].each do |attr|
+          next unless attrs.has_key?(attr)
+          add_debug(element) {"Remove non-CURIE/non-IRI @#{attr} values from #{attrs[attr].inspect}"}
+          attrs[attr] = attrs[attr].
+            split(/\s+/).
+            select {|a| a.index(':')}.
+            join(" ")
+          add_debug(element) {" => #{attrs[attr].inspect}"}
+          attrs.delete(attr) if attrs[attr].empty?
+        end
+      end
+
       # Default vocabulary [7.5 Step 2]
       # Next the current element is examined for any change to the default vocabulary via @vocab.
       # If @vocab is present and contains a value, its value updates the local default vocabulary.
@@ -721,7 +735,10 @@ module RDF::RDFa
           # if the @typeof attribute is present, set typed resource to new subject
           typed_resource = new_subject if attrs[:typeof]
         else
-          # If the current element contains the @property attribute, but does not contain the @content or the @datatype attribute
+          # 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
           if attrs[:property] && !(attrs[:content] || attrs[:datatype])
             new_subject = process_uri(element, attrs[:about], evaluation_context, base,
                         :uri_mappings => uri_mappings,
@@ -747,34 +764,31 @@ module RDF::RDFa
             end
 
             if attrs[:typeof]
-              typed_resource ||= if attrs[:resource]
+              typed_resource ||= 
                 process_uri(element, attrs[:resource], evaluation_context, base,
                             :uri_mappings => uri_mappings,
-                            :restrictions => SafeCURIEorCURIEorIRI.fetch(@version, []))
-              elsif attrs[:href] || attrs[:src]
-                process_uri(element, (attrs[:href] || attrs[:src]), evaluation_context, base, :restrictions => [:uri])
-              else
-                # if none of these are present, the value of typed resource is set to a newly defined bnode.
-                RDF::Node.new
-              end
+                            :restrictions => SafeCURIEorCURIEorIRI.fetch(@version, [])) if attrs[:resource]
+              typed_resource ||= 
+                process_uri(element, (attrs[:href] || attrs[:src]), evaluation_context, base,
+                            :restrictions => [:uri]) if attrs[:href] || attrs[:src]
+              typed_resource ||= RDF::Node.new
               
               # 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 @property element is not present)
-
-            new_subject = if attrs[:about]
+            # otherwise (ie, the @content or @datatype)
+            new_subject =
               process_uri(element, attrs[:about], evaluation_context, base,
                           :uri_mappings => uri_mappings,
-                          :restrictions => SafeCURIEorCURIEorIRI.fetch(@version, []))
-            elsif attrs[:resource]
+                          :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, []))
-            elsif attrs[:href] || attrs[:src]
-              process_uri(element, (attrs[:href] || attrs[:src]), evaluation_context, base, :restrictions => [:uri])
-            end
+                          :restrictions => SafeCURIEorCURIEorIRI.fetch(@version, [])) if attrs[:resource]
+            new_subject ||=
+              process_uri(element, (attrs[:href] || attrs[:src]), evaluation_context, base,
+                          :restrictions => [:uri]) if attrs[:href] || attrs[:src]
 
             # If no URI is provided by a resource attribute, then the first match from the following rules
             # will apply:
@@ -837,21 +851,14 @@ module RDF::RDFa
         end
       
         # Then the current object resource is set to the URI obtained from the first match from the following rules:
-        current_object_resource = if attrs[:resource]
-          process_uri(element, attrs[:resource], evaluation_context, base,
+        current_object_resource = process_uri(element, attrs[:resource], evaluation_context, base,
                       :uri_mappings => uri_mappings,
-                      :restrictions => SafeCURIEorCURIEorIRI.fetch(@version, []))
-        elsif attrs[:href]
-          process_uri(element, attrs[:href], evaluation_context, base,
-                      :restrictions => [:uri])
-        elsif attrs[:src] && @version != :"rdfa1.0"
-          process_uri(element, attrs[:src], evaluation_context, base,
-                      :restrictions => [:uri])
-        elsif attrs[:typeof] && !attrs[:about] && @version != :"rdfa1.0"
-          # otherwise, if @typeof is present and @about is not and the  incomplete triples
-          # within the current context is empty, use a newly created bnode
-          RDF::Node.new
-        end
+                      :restrictions => SafeCURIEorCURIEorIRI.fetch(@version, [])) if attrs[:resource]
+        current_object_resource ||= process_uri(element, attrs[:href], evaluation_context, base,
+                      :restrictions => [:uri]) if attrs[:href]
+        current_object_resource ||= process_uri(element, attrs[:src], evaluation_context, base,
+                      :restrictions => [:uri]) if attrs[:src] && @version != :"rdfa1.0"
+        current_object_resource ||= RDF::Node.new if attrs[:typeof] && !attrs[:about] && @version != :"rdfa1.0"
 
         # and also set the value typed resource to this bnode
         if attrs[:typeof]
@@ -974,14 +981,16 @@ module RDF::RDFa
                               :vocab => default_vocabulary,
                               :restrictions => TERMorCURIEorAbsIRI.fetch(@version, [])) unless attrs[:datatype].to_s.empty?
         begin
-          current_property_value = if datatype && datatype != RDF.XMLLiteral
+          current_property_value = case
+          when datatype && datatype != RDF.XMLLiteral
             # typed literal
             add_debug(element, "[Step 11] typed literal (#{datatype})")
             RDF::Literal.new(attrs[:datetime] || attrs[:value] || attrs[:content] || element.inner_text.to_s, :datatype => datatype, :language => language, :validate => validate?, :canonicalize => canonicalize?)
-          elsif @version == :"rdfa1.1"
-            if datatype == RDF.XMLLiteral
+          when @version == :"rdfa1.1"
+            case
+            when datatype == RDF.XMLLiteral
               # XML Literal
-              add_debug(element) {"[Step 11(1.1)] XML Literal: #{element.inner_html}"}
+              add_debug(element) {"[Step 11] XML Literal: #{element.inner_html}"}
 
               # In order to maintain maximum portability of this literal, any children of the current node that are
               # elements must have the current in scope XML namespace declarations (if any) declared on the
@@ -1002,43 +1011,46 @@ module RDF::RDFa
               rescue ArgumentError => e
                 add_error(element, e.message)
               end
-            elsif element.name == 'time'
+            when element.name == 'time'
               # HTML5 support
               # Lexically scan value and assign appropriate type, otherwise, leave untyped
               v = (attrs[:datetime] || element.inner_text).to_s
               datatype = %w(Date Time DateTime Year YearMonth Duration).map {|t| RDF::Literal.const_get(t)}.detect do |dt|
                 v.match(dt::GRAMMAR)
               end || RDF::Literal
-              add_debug(element) {"[Step 11(1.1)] <time> literal: #{datatype} #{v.inspect}"}
+              add_debug(element) {"[Step 11] <time> literal: #{datatype} #{v.inspect}"}
               datatype.new(v, :language => language)
-            elsif element.name.to_s == 'data' && attrs[:value]
+            when element.name.to_s == 'data' && attrs[:value]
               # HTML5 support
               # plain literal
-              add_debug(element, "[Step 11(1.1)] plain literal (value)")
+              add_debug(element, "[Step 11] plain literal (value)")
               RDF::Literal.new(attrs[:value],  :language => language, :validate => validate?, :canonicalize => canonicalize?)
-            elsif attrs[:content]
+            when attrs[:datatype]
+              # otherwise, as a plain literal if @datatype is present but has an empty value.
+              # The actual literal is either the value of @content (if present) or a string created by
+              # concatenating the value of all descendant text nodes, of the current element in turn.
+              # typed literal
+              add_debug(element, "[Step 11] plain plain (#{datatype})")
+              RDF::Literal.new(attrs[:content] || element.inner_text.to_s, :language => language, :validate => validate?, :canonicalize => canonicalize?)
+            when attrs[:content]
               # plain literal
-              add_debug(element, "[Step 11(1.1)] plain literal (content)")
+              add_debug(element, "[Step 11] plain literal (content)")
               RDF::Literal.new(attrs[:content], :language => language, :validate => validate?, :canonicalize => canonicalize?)
-            elsif (attrs[:resource] || attrs[:href] || attrs[:src] || attrs[:data]) &&
+            when (attrs[:resource] || attrs[:href] || attrs[:src]) &&
                  !(attrs[:rel] || attrs[:rev]) &&
                  evaluation_context.incomplete_triples.empty? &&
                  @version != :"rdfa1.0"
-              if attrs[:resource]
-                add_debug(element, "[Step 11(1.1)] IRI literal (resource)")
-                process_uri(element, attrs[:resource], evaluation_context, base,
-                            :uri_mappings => uri_mappings,
-                            :restrictions => SafeCURIEorCURIEorIRI.fetch(@version, []))
-              else
-                add_debug(element, "[Step 11(1.1)] IRI literal (href/src/data)")
-                process_uri(element, (attrs[:href] || attrs[:src] || attrs[:data]), evaluation_context, base, :restrictions => [:uri])
-              end
-            elsif typed_resource && !attrs[:about] && evaluation_context.incomplete_triples.empty? && @version != :"rdfa1.0"
-              add_debug(element, "[Step 11(1.1)] typed_resource")
+              add_debug(element, "[Step 11] IRI literal (resource|href|src)")
+              res = process_uri(element, attrs[:resource], evaluation_context, base,
+                                :uri_mappings => uri_mappings,
+                                :restrictions => SafeCURIEorCURIEorIRI.fetch(@version, [])) if attrs[:resource]
+              res ||= process_uri(element, (attrs[:href] || attrs[:src]), evaluation_context, base, :restrictions => [:uri])
+            when typed_resource && !attrs[:about] && evaluation_context.incomplete_triples.empty? && @version != :"rdfa1.0"
+              add_debug(element, "[Step 11] typed_resource")
               typed_resource
             else
               # plain literal
-              add_debug(element, "[Step 11(1.1)] plain literal (inner text)")
+              add_debug(element, "[Step 11] plain literal (inner text)")
               RDF::Literal.new(element.inner_text.to_s, :language => language, :validate => validate?, :canonicalize => canonicalize?)
             end
           else

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

@@ -168,9 +168,9 @@ module RDF::RDFa
           root_namespace = input.root.namespace.to_s
           root_attrs = input.root.attributes
           content_type = case
-          when root_element == "html" && input.is_a?(Nokogiri::HTML::Document)
+          when root_element == "html" && input.is_a?(::Nokogiri::HTML::Document)
             "text/html"
-          when root_element == "html" && input.is_a?(Nokogiri::XML::Document)
+          when root_element == "html" && input.is_a?(::Nokogiri::XML::Document)
             "application/xhtml+html"
           end
         else
@@ -212,8 +212,10 @@ module RDF::RDFa
         @version ||= :"rdfa1.1" if version_attr =~ /RDFa 1\.1/
         @version ||= :"rdfa1.1"
 
+        @host_language ||= :xhtml1 if @version == :"rdfa1.0" && doc_type_string =~ /html/i
+
         @host_language ||= case content_type
-        when "application/xml"  then :xml1
+        when "application/xml"  then :xml
         when "image/svg+xml"    then :svg
         when "text/html"
           case doc_type_string
@@ -233,7 +235,7 @@ module RDF::RDFa
           case root_element
           when /svg/i           then :svg
           when /html/i          then :html5
-          else                       :xml1
+          else                       :xml
           end
         end
       end

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

@@ -239,7 +239,7 @@ module RDF::RDFa
         @version ||= :"rdfa1.1"
 
         @host_language ||= case content_type
-        when "application/xml"  then :xml1
+        when "application/xml"  then :xml
         when "image/svg+xml"    then :svg
         when "text/html"
           case doc_type_string
@@ -259,7 +259,7 @@ module RDF::RDFa
           case root_element
           when /svg/i           then :svg
           when /html/i          then :html5
-          else                       :xml1
+          else                       :xml
           end
         end
       end
@@ -287,7 +287,7 @@ module RDF::RDFa
         # find if the document has a base element
         case @host_language
         when :xhtml1, :xhtml5, :html4, :html5
-          base_el = ::REXML::XPath.first(@doc, "/html/head/base") 
+          base_el = ::REXML::XPath.first(@doc, "/html/head/base") rescue nil
           base = base_el.attribute("href").to_s.split("#").first if base_el
         else
           xml_base = root.attribute("base", RDF::XML.to_s) if root

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdf-rdfa
 version: !ruby/object:Gem::Version
-  version: 0.3.10
+  version: 0.3.11
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-20 00:00:00.000000000Z
+date: 2012-05-12 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
-  requirement: &70354866028480 !ruby/object:Gem::Requirement
+  requirement: &70330722920340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 0.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *70354866028480
+  version_requirements: *70330722920340
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70354866027880 !ruby/object:Gem::Requirement
+  requirement: &70330722919680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70354866027880
+  version_requirements: *70330722919680
 - !ruby/object:Gem::Dependency
   name: rdf-xsd
-  requirement: &70354866027280 !ruby/object:Gem::Requirement
+  requirement: &70330722919040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 0.3.5
   type: :runtime
   prerelease: false
-  version_requirements: *70354866027280
+  version_requirements: *70330722919040
 - !ruby/object:Gem::Dependency
   name: htmlentities
-  requirement: &70354866026800 !ruby/object:Gem::Requirement
+  requirement: &70330722918540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: 4.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70354866026800
+  version_requirements: *70330722918540
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70354866026240 !ruby/object:Gem::Requirement
+  requirement: &70330722912340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: 1.4.4
   type: :development
   prerelease: false
-  version_requirements: *70354866026240
+  version_requirements: *70330722912340
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
-  requirement: &70354866025700 !ruby/object:Gem::Requirement
+  requirement: &70330722911800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: 0.2.8
   type: :development
   prerelease: false
-  version_requirements: *70354866025700
+  version_requirements: *70330722911800
 - !ruby/object:Gem::Dependency
   name: open-uri-cached
-  requirement: &70354866025240 !ruby/object:Gem::Requirement
+  requirement: &70330722911340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: 0.0.4
   type: :development
   prerelease: false
-  version_requirements: *70354866025240
+  version_requirements: *70330722911340
 - !ruby/object:Gem::Dependency
   name: spira
-  requirement: &70354866024720 !ruby/object:Gem::Requirement
+  requirement: &70330722910860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: 0.0.12
   type: :development
   prerelease: false
-  version_requirements: *70354866024720
+  version_requirements: *70330722910860
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70354866023360 !ruby/object:Gem::Requirement
+  requirement: &70330722910400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70354866023360
+  version_requirements: *70330722910400
 - !ruby/object:Gem::Dependency
   name: rdf-spec
-  requirement: &70354866022860 !ruby/object:Gem::Requirement
+  requirement: &70330722909940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: 0.3.2
   type: :development
   prerelease: false
-  version_requirements: *70354866022860
+  version_requirements: *70330722909940
 - !ruby/object:Gem::Dependency
   name: rdf-turtle
-  requirement: &70354866022140 !ruby/object:Gem::Requirement
+  requirement: &70330722909480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: 0.1.0
   type: :development
   prerelease: false
-  version_requirements: *70354866022140
+  version_requirements: *70330722909480
 - !ruby/object:Gem::Dependency
   name: rdf-rdfxml
-  requirement: &70354866021640 !ruby/object:Gem::Requirement
+  requirement: &70330722908960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +143,10 @@ dependencies:
         version: 0.3.4
   type: :development
   prerelease: false
-  version_requirements: *70354866021640
+  version_requirements: *70330722908960
 - !ruby/object:Gem::Dependency
   name: rdf-isomorphic
-  requirement: &70354866021180 !ruby/object:Gem::Requirement
+  requirement: &70330722908440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,10 +154,10 @@ dependencies:
         version: 0.3.4
   type: :development
   prerelease: false
-  version_requirements: *70354866021180
+  version_requirements: *70330722908440
 - !ruby/object:Gem::Dependency
   name: sparql
-  requirement: &70354866020720 !ruby/object:Gem::Requirement
+  requirement: &70330722907920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,10 +165,10 @@ dependencies:
         version: 0.0.2
   type: :development
   prerelease: false
-  version_requirements: *70354866020720
+  version_requirements: *70330722907920
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70354866020060 !ruby/object:Gem::Requirement
+  requirement: &70330722907440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -176,7 +176,7 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *70354866020060
+  version_requirements: *70330722907440
 description: RDF::RDFa is an RDFa reader/writer for Ruby using the RDF.rb library
   suite.
 email: public-rdf-ruby@w3.org