rdf-rdfa 0.3.7 → 0.3.8

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdf-rdfa
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-14 00:00:00.000000000 Z
+date: 2011-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
-  requirement: &2165534840 !ruby/object:Gem::Requirement
+  requirement: &2161384300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 0.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *2165534840
+  version_requirements: *2161384300
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &2165533600 !ruby/object:Gem::Requirement
+  requirement: &2161383420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,32 +33,76 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2165533600
+  version_requirements: *2161383420
 - !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: &2165532460 !ruby/object:Gem::Requirement
+  name: facets
+  requirement: &2161370720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.4.4
+        version: 2.9.1
   type: :runtime
   prerelease: false
-  version_requirements: *2165532460
+  version_requirements: *2161370720
 - !ruby/object:Gem::Dependency
-  name: facets
-  requirement: &2165508060 !ruby/object:Gem::Requirement
+  name: rdf-xsd
+  requirement: &2161369720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.9.1
+        version: 0.3.5
+  type: :runtime
+  prerelease: false
+  version_requirements: *2161369720
+- !ruby/object:Gem::Dependency
+  name: htmlentities
+  requirement: &2161368560 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 4.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *2165508060
+  version_requirements: *2161368560
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: &2161367940 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.4
+  type: :development
+  prerelease: false
+  version_requirements: *2161367940
+- !ruby/object:Gem::Dependency
+  name: equivalent-xml
+  requirement: &2161367160 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.2.8
+  type: :development
+  prerelease: false
+  version_requirements: *2161367160
+- !ruby/object:Gem::Dependency
+  name: open-uri-cached
+  requirement: &2161366120 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.4
+  type: :development
+  prerelease: false
+  version_requirements: *2161366120
 - !ruby/object:Gem::Dependency
   name: spira
-  requirement: &2165506740 !ruby/object:Gem::Requirement
+  requirement: &2161365500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +110,10 @@ dependencies:
         version: 0.0.12
   type: :development
   prerelease: false
-  version_requirements: *2165506740
+  version_requirements: *2161365500
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2165505420 !ruby/object:Gem::Requirement
+  requirement: &2161364820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +121,10 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *2165505420
+  version_requirements: *2161364820
 - !ruby/object:Gem::Dependency
   name: rdf-spec
-  requirement: &2165503180 !ruby/object:Gem::Requirement
+  requirement: &2161363480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +132,10 @@ dependencies:
         version: 0.3.2
   type: :development
   prerelease: false
-  version_requirements: *2165503180
+  version_requirements: *2161363480
 - !ruby/object:Gem::Dependency
   name: rdf-turtle
-  requirement: &2165501920 !ruby/object:Gem::Requirement
+  requirement: &2161361320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +143,10 @@ dependencies:
         version: 0.1.0
   type: :development
   prerelease: false
-  version_requirements: *2165501920
+  version_requirements: *2161361320
 - !ruby/object:Gem::Dependency
   name: rdf-rdfxml
-  requirement: &2165500860 !ruby/object:Gem::Requirement
+  requirement: &2161359740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +154,10 @@ dependencies:
         version: 0.3.4
   type: :development
   prerelease: false
-  version_requirements: *2165500860
+  version_requirements: *2161359740
 - !ruby/object:Gem::Dependency
   name: rdf-isomorphic
-  requirement: &2165495300 !ruby/object:Gem::Requirement
+  requirement: &2161358080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +165,10 @@ dependencies:
         version: 0.3.4
   type: :development
   prerelease: false
-  version_requirements: *2165495300
+  version_requirements: *2161358080
 - !ruby/object:Gem::Dependency
   name: sparql
-  requirement: &2165494580 !ruby/object:Gem::Requirement
+  requirement: &2161357100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +176,10 @@ dependencies:
         version: 0.0.2
   type: :development
   prerelease: false
-  version_requirements: *2165494580
+  version_requirements: *2161357100
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2165493880 !ruby/object:Gem::Requirement
+  requirement: &2161355420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,7 +187,7 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *2165493880
+  version_requirements: *2161355420
 description: RDF::RDFa is an RDFa reader/writer for Ruby using the RDF.rb library
   suite.
 email: public-rdf-ruby@w3.org
@@ -167,12 +211,12 @@ files:
 - lib/rdf/rdfa/expansion/v.rb
 - lib/rdf/rdfa/expansion.rb
 - lib/rdf/rdfa/format.rb
-- lib/rdf/rdfa/patches/literal_hacks.rb
-- lib/rdf/rdfa/patches/nokogiri_hacks.rb
 - lib/rdf/rdfa/patches/string_hacks.rb
 - lib/rdf/rdfa/profile/xhtml.rb
 - lib/rdf/rdfa/profile/xml.rb
 - lib/rdf/rdfa/profile.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
@@ -205,3 +249,4 @@ signing_key:
 specification_version: 3
 summary: RDFa reader/writer for RDF.rb.
 test_files: []
+has_rdoc: false

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

@@ -1,156 +0,0 @@
-# Use Nokogiri or LibXML when available, and REXML otherwise:
-begin
-  require 'nokogiri'
-rescue LoadError => e
-  begin
-    require 'libxml'
-  rescue LoadError => e
-    :rexml
-  end
-end
-
-module RDF; class Literal
-  ##
-  # An XML literal.
-  #
-  # @see   http://www.w3.org/TR/rdf-concepts/#section-XMLLiteral
-  # @see   http://www.w3.org/TR/rdfa-core/#s_xml_literals
-  # @since 0.2.1
-  class XML < Literal
-    ##
-    # @param  [Object] value
-    # @option options [String] :lexical (nil)
-    # @option options [Hash] :namespaces ({}) Use "" to declare default namespace
-    # @option options [Symbol] :language (nil)
-    # @option options [:nokogiri, :libxml, or :rexml] :library
-    def initialize(value, options = {})
-      options[:namespaces] ||= {}
-
-      @library = case options[:library]
-        when nil
-          case
-          when defined?(::Nokogiri) then :nokogiri
-          when defined?(::LibXML)   then :libxml
-          else                           :rexml
-          end
-        when :nokogiri, :libxml, :rexml
-          options[:library]
-        else
-          raise ArgumentError.new("expected :rexml, :libxml or :nokogiri, but got #{options[:library].inspect}")
-      end
-
-      @datatype = options[:datatype] || DATATYPE
-      @string   = options[:lexical] if options.has_key?(:lexical)
-      @object   = parse_value(value, options)
-      @string   = serialize_nodeset(@object)
-    end
-
-    ##
-    # Converts the literal into its canonical lexical representation.
-    #
-    # @return [Literal]
-    # @see    http://www.w3.org/TR/xml-exc-c14n/
-    def canonicalize
-      # This is the opportunity to use exclusive canonicalization library
-      self
-    end
-
-    ##
-    # Returns the value as a string.
-    #
-    # @return [String]
-    def to_s
-      @string
-    end
-    
-    private
-    
-    def parse_value(value, options)
-      ns_hash = {}
-      options[:namespaces].each_pair do |prefix, uri|
-        prefix = prefix.to_s
-        attr = prefix.empty? ? "xmlns" : "xmlns:#{prefix}"
-        ns_hash[attr] = uri.to_s
-      end
-
-      case @library
-      when :nokogiri  then parse_value_nokogiri(value, ns_hash, options)
-      when :libxml    then parse_value_libxml(value, ns_hash, options)
-      when :rexml     then parse_value_rexml(value, ns_hash, options)
-      else                 value.to_s
-      end
-    end
-    
-    def serialize_nodeset(object)
-      case @library
-      when :nokogiri  then serialize_nodeset_nokogiri(object)
-      when :libxml    then serialize_nodeset_libxml(object)
-      when :rexml     then serialize_nodeset_rexml(object)
-      else                 object
-      end
-    end
-    
-    # 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_hash, options)
-        elements = if value.is_a?(Nokogiri::XML::NodeSet)
-          value
-        else
-          ns_strs = []
-          ns_hash.each_pair {|a, u| ns_strs << "#{a}=\"#{u}\""}
-          # 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)
-            c = Nokogiri::XML.parse(c.dup.to_xml(:save_with => Nokogiri::XML::Node::SaveOptions::NO_EMPTY_TAGS)).root
-
-            # Apply defined namespaces
-            ns_hash.each_pair do |prefix, href|
-              c[prefix] = href unless c.namespaces[prefix]
-            end
-            
-            # Add language
-            if options[:language] && c["lang"].to_s.empty?
-              c["xml:lang"] = options[:language].to_s
-            end
-          end
-          c
-        end
-      end
-    
-      def serialize_nodeset_nokogiri(object)
-        object.map {|c| c.to_xml(:save_with => Nokogiri::XML::Node::SaveOptions::NO_EMPTY_TAGS)}.join("")
-      end
-    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
-
-      def serialize_nodeset_libxml(object)
-        # Fixme
-      end
-    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
-
-    def serialize_nodeset_rexml(object)
-      # Fixme
-    end
-    
-  end # class XML
-end; end

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

@@ -1,22 +0,0 @@
-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
-
-class Nokogiri::XML::Document
-  def doctype
-    self.children.first rescue false
-  end
-end