rdf-rdfa 0.3.13 → 0.3.14

data/VERSION

@@ -1 +1 @@
-0.3.13
+0.3.14

data/lib/rdf/rdfa/reader.rb

@@ -1039,7 +1039,7 @@ module RDF::RDFa
                               :restrictions => TERMorCURIEorAbsIRI.fetch(@version, [])) unless attrs[:datatype].to_s.empty?
         begin
           current_property_value = case
-          when datatype && datatype != RDF.XMLLiteral
+          when datatype && ![RDF.XMLLiteral, RDF.HTML].include?(datatype)
             # 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?)
@@ -1068,6 +1068,20 @@ module RDF::RDFa
               rescue ArgumentError => e
                 add_error(element, e.message)
               end
+            when datatype == RDF.HTML
+              # HTML Literal
+              add_debug(element) {"[Step 11] HTML Literal: #{element.inner_html}"}
+
+              # Just like XMLLiteral, but without the c14nxl
+              begin
+                RDF::Literal.new(element.children.to_html,
+                  :library => @library,
+                  :datatype => RDF.HTML,
+                  :validate => validate?,
+                  :canonicalize => canonicalize?)
+              rescue ArgumentError => e
+                add_error(element, e.message)
+              end
             when element.name == 'time'
               # HTML5 support
               # Lexically scan value and assign appropriate type, otherwise, leave untyped
@@ -1110,12 +1124,12 @@ module RDF::RDFa
               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
+          else # rdfa1.0
             if element.text_content? || (element.children.length == 0) || attrs[:datatype] == ""
               # plain literal
               add_debug(element, "[Step 11 (1.0)] plain literal")
               RDF::Literal.new(attrs[:content] || element.inner_text.to_s, :language => language, :validate => validate?, :canonicalize => canonicalize?)
-            elsif !element.text_content? and (datatype == nil or datatype.to_s == RDF.XMLLiteral.to_s)
+            elsif !element.text_content? and (datatype == nil or datatype == RDF.XMLLiteral)
               # XML Literal
               add_debug(element) {"[Step 11 (1.0)] XML Literal: #{element.inner_html}"}
               recurse = false

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

@@ -177,6 +177,11 @@ module RDF::RDFa
           end
         end
 
+        ##
+        def to_html
+          node_set.map(&:to_s).join("")
+        end
+
         ##
         # Proxy for everything else to @node_set
         def method_missing(method, *args)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdf-rdfa
 version: !ruby/object:Gem::Version
-  version: 0.3.13
+  version: 0.3.14
   prerelease: 
 platform: ruby
 authors:
@@ -10,44 +10,44 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-17 00:00:00.000000000Z
+date: 2012-05-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
-  requirement: &70096958854220 !ruby/object:Gem::Requirement
+  requirement: &70178126806620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.3.5
   type: :runtime
   prerelease: false
-  version_requirements: *70096958854220
+  version_requirements: *70178126806620
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70096958853760 !ruby/object:Gem::Requirement
+  requirement: &70178126805920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.6
   type: :runtime
   prerelease: false
-  version_requirements: *70096958853760
+  version_requirements: *70178126805920
 - !ruby/object:Gem::Dependency
   name: rdf-xsd
-  requirement: &70096958853260 !ruby/object:Gem::Requirement
+  requirement: &70178126789820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: 0.3.7
   type: :runtime
   prerelease: false
-  version_requirements: *70096958853260
+  version_requirements: *70178126789820
 - !ruby/object:Gem::Dependency
   name: htmlentities
-  requirement: &70096958852780 !ruby/object:Gem::Requirement
+  requirement: &70178126788980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: 4.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70096958852780
+  version_requirements: *70178126788980
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70096958852240 !ruby/object:Gem::Requirement
+  requirement: &70178126788200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,32 +66,32 @@ dependencies:
         version: 1.4.4
   type: :development
   prerelease: false
-  version_requirements: *70096958852240
+  version_requirements: *70178126788200
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
-  requirement: &70096958851780 !ruby/object:Gem::Requirement
+  requirement: &70178126787460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.2.8
+        version: 0.2.9
   type: :development
   prerelease: false
-  version_requirements: *70096958851780
+  version_requirements: *70178126787460
 - !ruby/object:Gem::Dependency
   name: open-uri-cached
-  requirement: &70096958851320 !ruby/object:Gem::Requirement
+  requirement: &70178126786760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 0.0.5
   type: :development
   prerelease: false
-  version_requirements: *70096958851320
+  version_requirements: *70178126786760
 - !ruby/object:Gem::Dependency
   name: spira
-  requirement: &70096958850860 !ruby/object:Gem::Requirement
+  requirement: &70178126786020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,54 +99,54 @@ dependencies:
         version: 0.0.12
   type: :development
   prerelease: false
-  version_requirements: *70096958850860
+  version_requirements: *70178126786020
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70096958850320 !ruby/object:Gem::Requirement
+  requirement: &70178126785320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.10.0
   type: :development
   prerelease: false
-  version_requirements: *70096958850320
+  version_requirements: *70178126785320
 - !ruby/object:Gem::Dependency
   name: rdf-spec
-  requirement: &70096958849800 !ruby/object:Gem::Requirement
+  requirement: &70178126784680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.5
   type: :development
   prerelease: false
-  version_requirements: *70096958849800
+  version_requirements: *70178126784680
 - !ruby/object:Gem::Dependency
   name: rdf-turtle
-  requirement: &70096958849340 !ruby/object:Gem::Requirement
+  requirement: &70178126783900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.2
   type: :development
   prerelease: false
-  version_requirements: *70096958849340
+  version_requirements: *70178126783900
 - !ruby/object:Gem::Dependency
   name: rdf-rdfxml
-  requirement: &70096958848840 !ruby/object:Gem::Requirement
+  requirement: &70178126783140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 0.3.7
   type: :development
   prerelease: false
-  version_requirements: *70096958848840
+  version_requirements: *70178126783140
 - !ruby/object:Gem::Dependency
   name: rdf-isomorphic
-  requirement: &70096958848340 !ruby/object:Gem::Requirement
+  requirement: &70178126782400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,29 +154,29 @@ dependencies:
         version: 0.3.4
   type: :development
   prerelease: false
-  version_requirements: *70096958848340
+  version_requirements: *70178126782400
 - !ruby/object:Gem::Dependency
   name: sparql
-  requirement: &70096958833200 !ruby/object:Gem::Requirement
+  requirement: &70178126766180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.1.0
   type: :development
   prerelease: false
-  version_requirements: *70096958833200
+  version_requirements: *70178126766180
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70096958832640 !ruby/object:Gem::Requirement
+  requirement: &70178126765420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.7.5
   type: :development
   prerelease: false
-  version_requirements: *70096958832640
+  version_requirements: *70178126765420
 description: RDF::RDFa is an RDFa reader/writer for Ruby using the RDF.rb library
   suite.
 email: public-rdf-ruby@w3.org