rsxml 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/rsxml.rb

@@ -16,8 +16,16 @@ module Rsxml
   # convert an XML string to an s-expression representation
   #  Rsxml.to_rsxml('<Foo foofoo="10"><Bar>barbar</Bar><Baz></Baz></Foo>')
   #   => ["Foo", {"foofoo"=>"10"}, ["Bar", "barbar"], ["Baz"]] 
-  def to_rsxml(doc)
-    root = Nokogiri::XML(doc).children.first
+  #
+  # if <tt>ns_prefixes</tt> is a Hash, then +doc+ is assumed to be a 
+  # fragment, and is wrapped in an element with namespace declarations
+  # according to +ns_prefixes+
+  #  fragment = '<foo:Foo foo:foofoo="10"><Bar>barbar</Bar><Baz></Baz></Foo>'
+  #  Rsxml.to_rsxml(fragment, {"foo"=>"http://foo.com/foo", ""=>"http://baz.com/baz"})
+  #   => ["foo:Foo", {"foo:foofoo"=>"10", "xmlns:foo"=>"http://foo.com/foo", "xmlns"=>"http://baz.com/baz"}, ["Bar", "barbar"], ["Baz"]]
+  def to_rsxml(doc, ns_prefixes=nil)
+    doc = Xml.wrap_fragment(doc, ns_prefixes)
+    root = Xml.unwrap_fragment(Nokogiri::XML(doc).children.first)
     Xml.read_xml(root, [])
   end
 
@@ -55,6 +63,30 @@ module Rsxml
   module Xml
     module_function
 
+    WRAP_ELEMENT = "RsxmlXmlWrapper"
+
+    def wrap_fragment(fragment, ns_prefixes)
+      return fragment if !ns_prefixes
+
+      ns_attrs = Hash[*ns_prefixes.map do |prefix,href|
+                        prefix = nil if prefix.length == 0
+                        [["xmlns", prefix].compact.join(":"), href]
+                      end.flatten]
+      xml = Builder::XmlMarkup.new
+      xml.__send__(WRAP_ELEMENT, ns_attrs) do
+        xml << fragment
+      end
+      xml.target!
+    end
+
+    def unwrap_fragment(node)
+      if node.name==WRAP_ELEMENT
+        node.children.first
+      else
+        node
+      end
+    end
+
     def read_xml(node, ns_stack)
       prefix = node.namespace.prefix if node.namespace
       tag = node.name

data/spec/rsxml_spec.rb

@@ -99,5 +99,16 @@ describe Rsxml do
     it "should parse a doc with namespaces" do
       test_roundtrip(["foo:foofoo", {"xmlns:foo"=>"http://foo.com/foo", "foo:bar"=>"1", "foo:baz"=>"baz"}])
     end
+
+    it "should allow namespace prefixes to be specified when parsing a fragment" do
+      org = ["foo:foofoo", {"foo:bar"=>"1", "foo:baz"=>"baz"}]
+      xml = Rsxml.to_xml(["foo:foofoo", {"foo:bar"=>"1", "foo:baz"=>"baz"}])
+
+      org_with_ns = ["foo:foofoo", {"foo:bar"=>"1", "foo:baz"=>"baz", "xmlns"=>"http://baz.com/baz", "xmlns:foo"=>"http://foo.com/foo"}]
+      rsxml = Rsxml.to_rsxml(xml, {"foo"=>"http://foo.com/foo", ""=>"http://baz.com/baz"})
+
+      rsxml.should == org_with_ns
+    end
+
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rsxml
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Trampoline Systems Ltd