rdf-rdfxml 0.3.7 → 0.3.8

data/History.markdown

@@ -1,3 +1,7 @@
+### 0.3.8
+* If rdf:RDF is found in a deaper element, look to ancestors for xml:base and xml:lang.
+### 0.3.7
+* Added :stylesheet option to RDF::RDFXML::Writer to allow writing of an XSL stylesheet processing instruction.
 ### 0.3.6
 * Attempt at JRuby and REXML support; not quite there yet.
 * Element content uses `#inner_text`, rather than `#inner_html`; this performs entity decoding.

data/README.markdown

@@ -51,7 +51,7 @@ Full documentation available on [RubyForge](http://rubydoc.info/github/ruby-rdf/
 * [RDF.rb][RDF.rb]
 * [RDF/XML][RDF/XML]
 * [Distiller](http://distiller.kellogg-assoc)
-* [Documentation](http://rdf.rubyforge.org/rdfxml)
+* [Documentation](http://rubygems.org/gems/rdf-rdfxml)
 * [History](file:file.History.html)
 * [RDF Tests](http://www.w3.org/2000/10/rdf-tests/rdfcore/allTestCases.html)
 
@@ -87,7 +87,7 @@ see <http://unlicense.org/> or the accompanying {file:UNLICENSE} file.
 * <http://github.com/ruby-rdf/rdf-rdfxml>
 * <http://lists.w3.org/Archives/Public/public-rdf-ruby/>
 
-[RDF.rb]:   http://rdf.rubyforge.org/
+[RDF.rb]:   http://rubygems.org/gems/rdf
 [RDF/XML]:  http://www.w3.org/TR/REC-rdf-syntax/  "RDF/XML Syntax Specification"
 [YARD]:     http://yardoc.org/
 [YARD-GS]:  http://rubydoc.info/docs/yard/file/docs/GettingStarted.md

data/VERSION

@@ -1 +1 @@
-0.3.7
+0.3.8

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

@@ -38,11 +38,17 @@ module RDF::RDFXML
         end
 
         ##
-        # Return xml:base on element, if defined
+        # Get any xml:base in effect for this element
         #
         # @return [String]
         def base
-          attribute_with_ns("base", RDF::XML.to_s)
+          if @base.nil?
+            @base = attribute_with_ns("base", RDF::XML.to_s) ||
+            (parent && parent.element? && parent.base) ||
+            false
+          end
+
+          @base == false ? nil : @base
         end
 
         ##
@@ -115,7 +121,13 @@ module RDF::RDFXML
         end
 
         def xpath(*args)
-          @node.xpath(*args).map {|n| NodeProxy.new(n)}
+          @node.xpath(*args).map do |n|
+            # Get node ancestors
+            parent = n.ancestors.reverse.inject(nil) do |p,node|
+              NodeProxy.new(node, p)
+            end
+            NodeProxy.new(n, parent)
+          end
         end
 
         # For jRuby, there is a bug that prevents the namespace from being set on an element

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

@@ -42,7 +42,13 @@ module RDF::RDFXML
         #
         # @return [String]
         def base
-          @node.attribute("base", RDF::XML.to_s)
+          if @base.nil?
+            @base = attributes['xml:base'] ||
+            (parent && parent.element? && parent.base) ||
+            false
+          end
+
+          @base == false ? nil : @base
         end
 
         def attribute_with_ns(name, namespace)
@@ -129,7 +135,13 @@ module RDF::RDFXML
 
         def xpath(*args)
           #NodeSetProxy.new(::REXML::XPath.match(@node, path, namespaces), self)
-          ::REXML::XPath.match(@node, *args).map {|n| NodeProxy.new(n)}
+          ::REXML::XPath.match(@node, *args).map do |n|
+            # Get node ancestors
+            parent = n.ancestors.reverse.inject(nil) do |p,node|
+              NodeProxy.new(node, p)
+            end
+            NodeProxy.new(n, parent)
+          end
         end
 
         def elem?

data/lib/rdf/rdfxml/reader.rb

@@ -29,7 +29,7 @@ module RDF::RDFXML
 
       def initialize(base, element, graph, &cb)
         # Initialize the evaluation context, [5.1]
-        self.base = RDF::URI.intern(base)
+        self.base = RDF::URI(base)
         @uri_mappings = {}
         @language = nil
         @graph = graph
@@ -138,7 +138,7 @@ module RDF::RDFXML
     # @yield  [reader] `self`
     # @yieldparam  [RDF::Reader] reader
     # @yieldreturn [void] ignored
-    # @raise [Error]:: Raises RDF::ReaderError if _validate_
+    # @raise [Error] Raises RDF::ReaderError if _validate_
     def initialize(input = $stdin, options = {}, &block)
       super do
         @debug = options[:debug]
@@ -188,7 +188,7 @@ module RDF::RDFXML
 
       raise "root must be a proxy not a #{root.class}" unless root.is_a?(@implementation::NodeProxy)
 
-      add_debug(root, "base_uri: #{@base_uri || 'nil'}")
+      add_debug(root, "base_uri: #{@base_uri.inspect}")
       
       rdf_nodes = root.xpath("//rdf:RDF", "rdf" => RDF.to_uri.to_s)
       if rdf_nodes.length == 0
@@ -250,8 +250,8 @@ module RDF::RDFXML
     
     # Add debug event to debug array, if specified
     #
-    # @param [Nokogiri::XML::Node, #to_s] node:: XML Node or string for showing context
-    # @param [String] message::
+    # @param [Nokogiri::XML::Node, #to_s] node XML Node or string for showing context
+    # @param [String] message
     # @yieldreturn [String] appended to message, to allow for lazy-evaulation of message
     def add_debug(node, message = "")
       return unless ::RDF::RDFXML.debug? || @debug
@@ -262,12 +262,12 @@ module RDF::RDFXML
 
     # add a statement, object can be literal or URI or bnode
     #
-    # @param [Nokogiri::XML::Node, any] node:: XML Node or string for showing context
-    # @param [URI, BNode] subject:: the subject of the statement
-    # @param [URI] predicate:: the predicate of the statement
-    # @param [URI, BNode, Literal] object:: the object of the statement
-    # @return [Statement]:: Added statement
-    # @raise [RDF::ReaderError]:: Checks parameter types and raises if they are incorrect if validating.
+    # @param [Nokogiri::XML::Node, any] node XML Node or string for showing context
+    # @param [URI, BNode] subject the subject of the statement
+    # @param [URI] predicate the predicate of the statement
+    # @param [URI, BNode, Literal] object the object of the statement
+    # @return [Statement] Added statement
+    # @raise [RDF::ReaderError] Checks parameter types and raises if they are incorrect if validating.
     def add_triple(node, subject, predicate, object)
       statement = RDF::Statement.new(subject, predicate, object)
       add_debug(node) {"statement: #{statement}"}
@@ -276,10 +276,10 @@ module RDF::RDFXML
 
     # XML nodeElement production
     #
-    # @param [XML Element] el:: XMl Element to parse
-    # @param [EvaluationContext] ec:: Evaluation context
-    # @return [RDF::URI] subject:: The subject found for the node
-    # @raise [RDF::ReaderError]:: Raises Exception if validating
+    # @param [XML Element] el XMl Element to parse
+    # @param [EvaluationContext] ec Evaluation context
+    # @return [RDF::URI] subject The subject found for the node
+    # @raise [RDF::ReaderError] Raises Exception if validating
     def nodeElement(el, ec)
       raise "el must be a proxy not a #{el.class}" unless el.is_a?(@implementation::NodeProxy)
       # subject

data/lib/rdf/rdfxml.rb

@@ -15,7 +15,7 @@ module RDF
   #     end
   #   end
   #
-  # @see http://rdf.rubyforge.org/
+  # @see http://rubygems.org/gems/rdf
   # @see http://www.w3.org/TR/REC-rdf-syntax/
   #
   # @author [Gregg Kellogg](http://kellogg-assoc.com/)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdf-rdfxml
 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: 2012-05-14 00:00:00.000000000Z
+date: 2012-05-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
-  requirement: &70345945239300 !ruby/object:Gem::Requirement
+  requirement: &70095897830720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 0.3.4
   type: :runtime
   prerelease: false
-  version_requirements: *70345945239300
+  version_requirements: *70095897830720
 - !ruby/object:Gem::Dependency
   name: rdf-xsd
-  requirement: &70345945238820 !ruby/object:Gem::Requirement
+  requirement: &70095897829980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 0.3.5
   type: :runtime
   prerelease: false
-  version_requirements: *70345945238820
+  version_requirements: *70095897829980
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70345945238300 !ruby/object:Gem::Requirement
+  requirement: &70095897829280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 1.5.0
   type: :development
   prerelease: false
-  version_requirements: *70345945238300
+  version_requirements: *70095897829280
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
-  requirement: &70345945221360 !ruby/object:Gem::Requirement
+  requirement: &70095897828540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: 0.2.8
   type: :development
   prerelease: false
-  version_requirements: *70345945221360
+  version_requirements: *70095897828540
 - !ruby/object:Gem::Dependency
   name: open-uri-cached
-  requirement: &70345945220780 !ruby/object:Gem::Requirement
+  requirement: &70095897827820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: 0.0.4
   type: :development
   prerelease: false
-  version_requirements: *70345945220780
+  version_requirements: *70095897827820
 - !ruby/object:Gem::Dependency
   name: spira
-  requirement: &70345945220180 !ruby/object:Gem::Requirement
+  requirement: &70095897827060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: 0.0.12
   type: :development
   prerelease: false
-  version_requirements: *70345945220180
+  version_requirements: *70095897827060
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70345945219600 !ruby/object:Gem::Requirement
+  requirement: &70095897826340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70345945219600
+  version_requirements: *70095897826340
 - !ruby/object:Gem::Dependency
   name: rdf-isomorphic
-  requirement: &70345945219020 !ruby/object:Gem::Requirement
+  requirement: &70095897825560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: 0.3.4
   type: :development
   prerelease: false
-  version_requirements: *70345945219020
+  version_requirements: *70095897825560
 - !ruby/object:Gem::Dependency
   name: rdf-n3
-  requirement: &70345945218480 !ruby/object:Gem::Requirement
+  requirement: &70095897824800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: 0.3.4
   type: :development
   prerelease: false
-  version_requirements: *70345945218480
+  version_requirements: *70095897824800
 - !ruby/object:Gem::Dependency
   name: rdf-spec
-  requirement: &70345945217940 !ruby/object:Gem::Requirement
+  requirement: &70095897824060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: 0.3.4
   type: :development
   prerelease: false
-  version_requirements: *70345945217940
+  version_requirements: *70095897824060
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70345945217420 !ruby/object:Gem::Requirement
+  requirement: &70095897823420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,7 +132,7 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *70345945217420
+  version_requirements: *70095897823420
 description: RDF::RDFXML is an RDF/XML reader and writer for the RDF.rb library suite.
 email: public-rdf-ruby@w3.org
 executables: []