rdf-rdfa 0.2.1 → 0.2.2

data/History.txt

@@ -1,3 +1,15 @@
+=== 0.2.2
+* Ruby 1.9.2 compatibility
+* Added script/parse as command-line option for parsing files.
+* Add back support for RDFa 1.0 as well as RDFa 1.1. Parser checks @version to determine which
+* Update RDFa processing to WD-rdfa-core-20100803 semantics
+  * Added Processor Graph and required output
+  * Reverse order of processing profiles
+  * Don't process element if any profile fails
+  * XMLLiterals must be explicitly specified as @datatype
+  * TERMorCURIEorAbsURI requires an absolute URI, not document relative
+  * Extract a new default vocabulary from @profile.
+
 === 0.2.1
 * Update for RDF 0.2.1
 
@@ -7,7 +19,7 @@
   * Change use of Graph#predicates and Graph#objects to use as enumerables
 
 === 0.0.3
-* Removed interal graph in Reader and implement each_triple & each_statement to perform parsing
+* Removed internal graph in Reader and implement each_triple & each_statement to perform parsing
 
 === 0.0.2
 * Remove dependency on Namespace

data/Rakefile

@@ -60,7 +60,7 @@ namespace :spec do
     require 'spec/rdfa_helper'
     require 'fileutils'
 
-    %w(xhtml html4 html5).each do |suite|
+    %w(xhtml xhtml11 html4 html5).each do |suite|
       yaml = manifest_file = File.join(File.dirname(__FILE__), "spec", "#{suite}-manifest.yml")
       FileUtils.rm_f(yaml)
       RdfaHelper::TestCase.to_yaml(suite, yaml)

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/lib/rdf/rdfa/patches/literal_hacks.rb

@@ -20,10 +20,9 @@ module RDF; class Literal
     ##
     # @param  [Object] value
     # @option options [String] :lexical (nil)
-    # @option options [Hash] :namespaces (nil)
-    # @option options [Hash] :namespaces ({})
+    # @option options [Hash] :namespaces ({}) Use :__default__ or "" to declare default namespace
     # @option options [Symbol] :language (nil)
-    # @option options [Symbol] :library (:nokogiri, :libxml, or :rexml)
+    # @option options [:nokogiri, :libxml, or :rexml] :library
     def initialize(value, options = {})
       options[:namespaces] ||= {}
 
@@ -69,7 +68,8 @@ module RDF; class Literal
     def parse_value(value, options)
       ns_hash = {}
       options[:namespaces].each_pair do |prefix, uri|
-        attr = prefix.to_s.empty? ? "xmlns" : "xmlns:#{prefix}"
+        prefix = prefix == :__default__ ? "" : prefix.to_s
+        attr = prefix.empty? ? "xmlns" : "xmlns:#{prefix}"
         ns_hash[attr] = uri.to_s
       end
       ns_strs = []
@@ -94,10 +94,18 @@ module RDF; class Literal
     
     # Nokogiri implementations
     if defined?(::Nokogiri)
+      # A somewhat half-hearted attempt at C14N.
+      # Main problem is that it promotes all namespaces to top element, instead of demoting them
+      # to the required element, and does not properly order either namespaces or attributes.
+      #
+      # An open-issue in Nokogiri is to add support for C14N from the underlying libxml2 libraries.
       def parse_value_nokogiri(value, ns_strs, language)
-        return value if value.is_a?(Nokogiri::XML::NodeSet)
-        # Add inherited namespaces to created root element so that they're inherited to sub-elements
-        elements = Nokogiri::XML::Document.parse("<foo #{ns_strs.join(" ")}>#{value.to_s}</foo>").root.children
+        elements = if value.is_a?(Nokogiri::XML::NodeSet)
+          value
+        else
+          # Add inherited namespaces to created root element so that they're inherited to sub-elements
+          Nokogiri::XML::Document.parse("<foo #{ns_strs.join(" ")}>#{value.to_s}</foo>").root.children
+        end
 
         elements.map do |c|
           if c.is_a?(Nokogiri::XML::Element)
@@ -110,9 +118,9 @@ module RDF; class Literal
               c[prefix] = ns.href.to_s unless c.namespaces[prefix]
             end
 
-            # Add lanuage
+            # Add language
             if language && c["lang"].to_s.empty?
-              c["xml:lang"] = language
+              c["xml:lang"] = language.to_s
             end
           end
           c
@@ -125,6 +133,7 @@ module RDF; class Literal
     end   # Nokogiri
     
     if defined?(::LibXML)
+      # This should use Document#canonicalize if as and when it is available in libxml-ruby
       def parse_value_libxml(value, ns_strs, language)
         # Fixme
       end
@@ -135,6 +144,8 @@ module RDF; class Literal
     end   # LibXML
     
     # REXML
+    # This could make use of the XMLCanonicalizer gem (http://rubygems.org/gems/XMLCanonicalizer)
+    # But, it hasn't been touched since 2007 and relies on log4r.
     def parse_value_rexml(value, ns_strs, language)
       # Fixme
     end
@@ -143,5 +154,5 @@ module RDF; class Literal
       # Fixme
     end
     
-  end unless defined?(::RDF::Literal::XML)# class XML
+  end # class XML
 end; end

data/lib/rdf/rdfa/patches/nokogiri_hacks.rb

@@ -0,0 +1,16 @@
+require 'nokogiri'
+class Nokogiri::XML::Node
+  # URI of namespace + node_name
+  def uri
+    ns = self.namespace ? self.namespace.href : RDF::XML.to_s
+    RDF::URI.intern(ns + self.node_name)
+  end
+
+  def display_path
+    @display_path ||= case self
+    when Nokogiri::XML::Document then ""
+    when Nokogiri::XML::Element then parent ? "#{parent.display_path}/#{name}" : name
+    when Nokogiri::XML::Attr then "#{parent.display_path}@#{name}"
+    end
+  end
+end

data/lib/rdf/rdfa/patches/uri_hacks.rb

@@ -10,10 +10,15 @@ module RDF
     def join(*uris)
       result = @uri
       uris.each do |uri|
-#        result.path += '/' unless result.path.match(/[\#\/]$/) || uri.to_s[0..0] == "#"
         result = result.join(uri)
       end
       self.class.new(result)
     end
+  
+  class NTriples::Writer
+    def format_uri(uri, options = {})
+      "<%s>" % escaped(uri_for(uri))
+    end
+  end
   end
 end