rdf-rdfa 0.3.3.1 → 0.3.3.2

data/History.md

@@ -1,3 +1,10 @@
+### 0.3.3.2
+* In Reader:
+  * Ensure that encoding is set to utf-8 if not specified.
+  * Look for encoding from input and HTML meta tags.
+  * Look for content-type from input and HTML meta tags.
+  * Retrieve @xmlns, @xml:lang and @lang as attributes when doing HTML parsing.
+
 ### 0.3.3.1
 * Improve format detection.
 * Use HTML parser instead of XML if format is determined to be html4 or html5.

data/VERSION

@@ -1 +1 @@
-0.3.3.1
+0.3.3.2

data/lib/rdf/rdfa/reader.rb

@@ -145,7 +145,7 @@ module RDF::RDFa
       end
       
       def inspect
-        v = %w(base parent_subject parent_object language default_vocabulary).map {|a| "#{a}='#{self.send(a).nil? ? '<nil>' : self.send(a)}'"}
+        v = %w(base parent_subject parent_object language default_vocabulary).map {|a| "#{a}='#{self.send(a).inspect}'"}
         v << "uri_mappings[#{uri_mappings.keys.length}]"
         v << "incomplete_triples[#{incomplete_triples.length}]"
         v << "term_mappings[#{term_mappings.keys.length}]"
@@ -200,11 +200,17 @@ module RDF::RDFa
         when Nokogiri::HTML::Document, Nokogiri::XML::Document
           input
         else
+          # Try to detect charset from input
+          options[:encoding] ||= input.charset if input.respond_to?(:charset)
+          
+          # Otherwise, default is utf-8
+          options[:encoding] ||= 'utf-8'
+
           case @host_language
           when :html4, :html5
-            Nokogiri::HTML.parse(input, @base_uri.to_s)
+            Nokogiri::HTML.parse(input, @base_uri.to_s, options[:encoding])
           else
-            Nokogiri::XML.parse(input, @base_uri.to_s)
+            Nokogiri::XML.parse(input, @base_uri.to_s, options[:encoding])
           end
         end
         
@@ -282,6 +288,20 @@ module RDF::RDFa
         root = head.match(%r(<[^!\?>]*>)m).to_s
         root_element = root.match(%r(^<(\S+)[ >])) ? $1 : ""
         version_attr = root.match(/version\s+=\s+(\S+)[\s">]/m) ? $1 : ""
+        head_element = head.match(%r(<head.*<\/head>)mi)
+        head_doc = Nokogiri::HTML.parse(head_element.to_s)
+        
+        # May determine content-type and/or charset from meta
+        # Easist way is to parse head into a document and iterate
+        # of CSS matches
+        head_doc.css("meta").each do |e|
+          if e.attr("http-equiv").to_s.downcase == 'content-type'
+            content_type, e = e.attr("content").to_s.downcase.split(";")
+            options[:encoding] = $1.downcase if e.to_s =~ /charset=([^\s]*)$/i
+          elsif e.attr("charset")
+            options[:encoding] = e.attr("charset").to_s.downcase
+          end
+        end
       end
 
       # Already using XML parser, determine from DOCTYPE and/or root element
@@ -507,19 +527,33 @@ module RDF::RDFa
       # Regardless of how the mapping is declared, the value to be mapped must be converted to lower case,
       # and the URI is not processed in any way; in particular if it is a relative path it is
       # not resolved against the current base.
+      ns_defs = {}
       element.namespace_definitions.each do |ns|
+        ns_defs[ns.prefix] = ns.href.to_s
+      end
+
+      # HTML parsing doesn't create namespace_definitions
+      if ns_defs.empty?
+        ns_defs = {}
+        element.attributes.each do |k, v|
+          ns_defs[$1] = v.to_s if k =~ /^xmlns(?:\:(.+))?/
+        end
+      end
+
+      ns_defs.each do |prefix, href|
         # A Conforming RDFa Processor must ignore any definition of a mapping for the '_' prefix.
-        next if ns.prefix == "_"
+        next if prefix == "_"
 
         # Downcase prefix for RDFa 1.1
-        pfx_lc = (@version == :"rdfa1.0" || ns.prefix.nil?) ? ns.prefix : ns.prefix.to_s.downcase
-        if ns.prefix
-          uri_mappings[pfx_lc.to_sym] = ns.href
-          namespaces[pfx_lc] ||= ns.href
-          prefix(pfx_lc, ns.href)
-          add_info(element, "extract_mappings: xmlns:#{ns.prefix} => <#{ns.href}>")
+        pfx_lc = (@version == :"rdfa1.0" || prefix.nil?) ? prefix : prefix.downcase
+        if prefix
+          uri_mappings[pfx_lc.to_sym] = href
+          namespaces[pfx_lc] ||= href
+          prefix(pfx_lc, href)
+          add_info(element, "extract_mappings: #{prefix} => <#{href}>")
         else
-          namespaces[""] ||= ns.href
+          add_info(element, "extract_mappings: nil => <#{href}>")
+          namespaces[""] ||= href
         end
       end
 
@@ -672,6 +706,10 @@ module RDF::RDFa
       #   attribute in no namespace must be ignored for the purposes of determining the element's
       #   language.
       language = case
+      when @doc.is_a?(Nokogiri::HTML::Document) && element.attributes["xml:lang"]
+        element.attributes["xml:lang"].to_s
+      when @doc.is_a?(Nokogiri::HTML::Document) && element.attributes["lang"]
+        element.attributes["lang"].to_s
       when element.at_xpath("@xml:lang", "xml" => RDF::XML["uri"].to_s)
         element.at_xpath("@xml:lang", "xml" => RDF::XML["uri"].to_s).to_s
       when element.at_xpath("@lang")

data/rdf-rdfa.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rdf-rdfa}
-  s.version = "0.3.3.1"
+  s.version = "0.3.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gregg Kellogg"]
-  s.date = %q{2011-04-26}
+  s.date = %q{2011-04-29}
   s.description = %q{    RDF::RDFa is an RDFa reader/writer for Ruby using the RDF.rb library suite.
 }
   s.email = %q{gregg@kellogg-assoc.com}
@@ -75,7 +75,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://github.com/gkellogg/rdf-rdfa}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
+  s.rubygems_version = %q{1.5.0}
   s.summary = %q{RDFa reader/writer for RDF.rb.}
   s.test_files = [
     "spec/literal_spec.rb",

data/spec/reader_spec.rb

@@ -535,7 +535,7 @@ describe "RDF::RDFa::Reader" do
                   reader.should be_a RDF::Reader
 
                   # Make sure auto-detect works
-                  unless host_language =~ /svg/
+                  unless host_language =~ /svg/ || t.name == "0216" # due to http-equiv
                     reader.host_language.should == host_language.to_sym
                     reader.version.should == version.to_sym
                   end
@@ -546,8 +546,6 @@ describe "RDF::RDFa::Reader" do
                 rescue RSpec::Expectations::ExpectationNotMetError => e
                   if %w(0198).include?(t.name) || query =~ /XMLLiteral/m
                     pending("XMLLiteral canonicalization not implemented yet")
-                  elsif %w(html4 html5).include?(host_language) && Kernel.open(t.input(host_language, version)) {|f| f.read =~ /xmlns/}
-                    pending("HTML parsing does not use xmlns")
                   elsif classification != "required"
                     pending("#{classification} test") {  raise }
                   else

metadata

@@ -1,8 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: rdf-rdfa
 version: !ruby/object:Gem::Version 
+  hash: 95
   prerelease: 
-  version: 0.3.3.1
+  segments: 
+  - 0
+  - 3
+  - 3
+  - 2
+  version: 0.3.3.2
 platform: ruby
 authors: 
 - Gregg Kellogg
@@ -10,251 +16,349 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-26 00:00:00 -07:00
+date: 2011-04-29 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: addressable
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 2
+        - 2
+        - 4
         version: 2.2.4
-  type: :runtime
   prerelease: false
-  version_requirements: *id001
+  type: :runtime
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
   name: rdf
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-  type: :runtime
   prerelease: false
-  version_requirements: *id002
+  type: :runtime
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
   name: haml
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        - 0
         version: 3.0.0
-  type: :runtime
   prerelease: false
-  version_requirements: *id003
+  type: :runtime
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
   name: nokogiri
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 1
+        - 3
+        - 3
         version: 1.3.3
-  type: :runtime
   prerelease: false
-  version_requirements: *id004
+  type: :runtime
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
   name: open-uri-cached
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 0
+        - 3
         version: 0.0.3
-  type: :development
   prerelease: false
-  version_requirements: *id005
+  type: :development
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
   name: rdf-spec
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-  type: :development
   prerelease: false
-  version_requirements: *id006
+  type: :development
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
   name: rdf-isomorphic
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 0
+        - 3
+        - 4
         version: 0.3.4
-  type: :development
   prerelease: false
-  version_requirements: *id007
+  type: :development
+  requirement: *id007
 - !ruby/object:Gem::Dependency 
   name: rdf-n3
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 17
+        segments: 
+        - 0
+        - 3
+        - 1
         version: 0.3.1
-  type: :development
   prerelease: false
-  version_requirements: *id008
+  type: :development
+  requirement: *id008
 - !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 2
+        - 1
+        - 0
         version: 2.1.0
-  type: :development
   prerelease: false
-  version_requirements: *id009
+  type: :development
+  requirement: *id009
 - !ruby/object:Gem::Dependency 
   name: sxp
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-  type: :development
   prerelease: false
-  version_requirements: *id010
+  type: :development
+  requirement: *id010
 - !ruby/object:Gem::Dependency 
   name: sparql-algebra
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-  type: :development
   prerelease: false
-  version_requirements: *id011
+  type: :development
+  requirement: *id011
 - !ruby/object:Gem::Dependency 
   name: sparql-grammar
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-  type: :development
   prerelease: false
-  version_requirements: *id012
+  type: :development
+  requirement: *id012
 - !ruby/object:Gem::Dependency 
   name: spira
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  version_requirements: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 0
+        - 0
+        - 12
         version: 0.0.12
-  type: :development
   prerelease: false
-  version_requirements: *id013
+  type: :development
+  requirement: *id013
 - !ruby/object:Gem::Dependency 
   name: yard
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  version_requirements: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 0
+        - 6
+        - 4
         version: 0.6.4
-  type: :development
   prerelease: false
-  version_requirements: *id014
+  type: :development
+  requirement: *id014
 - !ruby/object:Gem::Dependency 
   name: rdf
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  version_requirements: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 0
+        - 3
+        - 3
         version: 0.3.3
-  type: :runtime
   prerelease: false
-  version_requirements: *id015
+  type: :runtime
+  requirement: *id015
 - !ruby/object:Gem::Dependency 
   name: haml
-  requirement: &id016 !ruby/object:Gem::Requirement 
+  version_requirements: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        - 0
         version: 3.0.0
-  type: :runtime
   prerelease: false
-  version_requirements: *id016
+  type: :runtime
+  requirement: *id016
 - !ruby/object:Gem::Dependency 
   name: nokogiri
-  requirement: &id017 !ruby/object:Gem::Requirement 
+  version_requirements: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 4
+        - 4
         version: 1.4.4
-  type: :runtime
   prerelease: false
-  version_requirements: *id017
+  type: :runtime
+  requirement: *id017
 - !ruby/object:Gem::Dependency 
   name: spira
-  requirement: &id018 !ruby/object:Gem::Requirement 
+  version_requirements: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 0
+        - 0
+        - 12
         version: 0.0.12
-  type: :development
   prerelease: false
-  version_requirements: *id018
+  type: :development
+  requirement: *id018
 - !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &id019 !ruby/object:Gem::Requirement 
+  version_requirements: &id019 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 2
+        - 5
+        - 0
         version: 2.5.0
-  type: :development
   prerelease: false
-  version_requirements: *id019
+  type: :development
+  requirement: *id019
 - !ruby/object:Gem::Dependency 
   name: rdf-spec
-  requirement: &id020 !ruby/object:Gem::Requirement 
+  version_requirements: &id020 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 0
+        - 3
+        - 3
         version: 0.3.3
-  type: :development
   prerelease: false
-  version_requirements: *id020
+  type: :development
+  requirement: *id020
 - !ruby/object:Gem::Dependency 
   name: rdf-isomorphic
-  requirement: &id021 !ruby/object:Gem::Requirement 
+  version_requirements: &id021 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 0
+        - 3
+        - 4
         version: 0.3.4
-  type: :development
   prerelease: false
-  version_requirements: *id021
+  type: :development
+  requirement: *id021
 - !ruby/object:Gem::Dependency 
   name: yard
-  requirement: &id022 !ruby/object:Gem::Requirement 
+  version_requirements: &id022 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-  type: :development
   prerelease: false
-  version_requirements: *id022
+  type: :development
+  requirement: *id022
 description: "    RDF::RDFa is an RDFa reader/writer for Ruby using the RDF.rb library suite.\n"
 email: gregg@kellogg-assoc.com
 executables: []
@@ -333,17 +437,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: RDFa reader/writer for RDF.rb.