rsxml 0.1.3 → 0.1.4

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/lib/rsxml.rb

@@ -4,15 +4,24 @@ require 'builder'
 module Rsxml
   module_function
 
+  def check_opts(constraints, opts)
+    (opts||{}).each do |k,v|
+      raise "opt not permitted: #{k}" if !constraints.has_key?(k)
+      constraint = constraints[k]
+    end
+  end
+
   # convert an Rsxml s-expression representation of an XML document to XML
   #  Rsxml.to_xml(["Foo", {"foofoo"=>"10"}, ["Bar", "barbar"] ["Baz"]])
   #   => '<Foo foofoo="10"><Bar>barbar</Bar><Baz></Baz></Foo>' 
-  def to_xml(rsxml)
+  def to_xml(rsxml, &transformer)
     xml = Builder::XmlMarkup.new
-    Sexp.write_xml(xml, rsxml)
+    Sexp.write_xml(xml, rsxml, &transformer)
     xml.target!
   end
 
+  TO_RSXML_OPTS = {:ns=>nil}
+
   # convert an XML string to an Rsxml s-expression representation
   #  Rsxml.to_rsxml('<Foo foofoo="10"><Bar>barbar</Bar><Baz></Baz></Foo>')
   #   => ["Foo", {"foofoo"=>"10"}, ["Bar", "barbar"], ["Baz"]] 
@@ -23,8 +32,9 @@ module Rsxml
   #  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)
+  def to_rsxml(doc, opts={})
+    check_opts(TO_RSXML_OPTS, opts)
+    doc = Xml.wrap_fragment(doc, opts[:ns])
     root = Xml.unwrap_fragment(Nokogiri::XML(doc).children.first)
     Xml.read_xml(root, [])
   end
@@ -40,13 +50,20 @@ module Rsxml
   module Sexp
     module_function
 
-    def write_xml(xml, sexp)
+    def write_xml(xml, sexp, path="", &transformer)
       tag, attrs, children = decompose_sexp(sexp)
       
-      xml.__send__(tag, attrs) do
-        children.each do |child|
+      if transformer
+        txtag, txattrs = transformer.call(tag, attrs, path)
+      else
+        txtag, txattrs = [tag, attrs]
+      end
+      
+      cp = [path, tag].join("/")
+      xml.__send__(txtag, txattrs) do
+        children.each_with_index do |child, i|
           if child.is_a?(Array)
-            write_xml(xml, child)
+            write_xml(xml, child, "#{cp}[#{i}]", &transformer)
           else
             xml << child
           end

data/spec/rsxml_spec.rb

@@ -67,6 +67,32 @@ describe Rsxml do
       r.attributes["baz"].namespace.href.should == "http://foo.com/foo"
       r.attributes["baz"].namespace.prefix.should == "foo"
     end
+
+    it "should transform a single tag if a transformer is supplied" do
+      xml = Rsxml.to_xml([:foo]) do |tag,attrs,path| 
+        path.should == ""
+        [tag.upcase, attrs]
+      end.should ==
+        "<FOO></FOO>"
+    end
+
+    it "should transform nested tags if a transformer is supplied" do
+      txs = {"/foo"=>"Blub", "/foo[0]/bar"=>"Wub"}
+      xml = Rsxml.to_xml([:foo, [:bar]]) do |tag,attrs,path| 
+        $stderr << [tag, attrs, path].inspect
+        [txs[[path, tag].join("/")], attrs]
+      end.should ==
+        "<Blub><Wub></Wub></Blub>"
+    end
+
+    it "should transform a tag with attributes if a transformer is supplied" do
+      xml = Rsxml.to_xml([:foo, {:bar=>"bar"}]) do |tag,attrs,path| 
+        path.should == ""
+        [tag.upcase, Hash[*attrs.map{|k,v| [k.to_s.upcase,v]}.flatten]]
+      end.should ==
+        '<FOO BAR="bar"></FOO>'
+      
+    end
   end
 
   describe "to_rsxml" do
@@ -105,7 +131,7 @@ describe Rsxml do
       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 = Rsxml.to_rsxml(xml, :ns=>{:foo=>"http://foo.com/foo", ""=>"http://baz.com/baz"})
 
       rsxml.should == org_with_ns
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rsxml
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Trampoline Systems Ltd
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-04 00:00:00 +01:00
+date: 2011-05-05 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency