spec/xml/object_spec.rb spec/xml/text_spec.rb @@ -9,6 +9,8 @@ * attributes collected :as => [] were previously output improperly, as a single attribute on a single node + * don't output crazy, context-less namespaces and local-name xpaths + when trying to output namespaced attributes == 3.1.2 (October 18, 2009) History.txt @@ -95,7 +95,9 @@ in this case. === Namespace Support -Namespaces are supported via the xml_namespace declaration and the :from and :namespace attr options. See spec/xml/namespace_spec.rb for usage. +Namespaced nodes are supported via the xml_namespace and xml_namespaces declarations and the :from and :namespace attr options. See spec/xml/namespace_spec.rb for usage. + +Note that ROXML does not currently support outputting namespaced nodes. This is planned for a future version. == Manipulation README.rdoc @@ -2,6 +2,8 @@ Planned: v 3.2 + * Support outputting namespaced attrs + * Consider class_inheritable_attribute rather than superclass.try stuff. * Do some benchmarking TODO @@ -22,6 +22,7 @@ module ROXML # :nodoc: # Returns an XML object representing this object def to_xml(params = {}) params.reverse_merge!(:name => self.class.tag_name, :namespace => self.class.roxml_namespace) + params[:namespace] = nil if ['*', 'xmlns'].include?(params[:namespace]) XML::Node.create([params[:namespace], params[:name]].compact.join(':')).tap do |root| refs = (self.roxml_references.present? \ ? self.roxml_references \ lib/roxml.rb @@ -177,10 +177,10 @@ module ROXML xml.name = value elsif array? value.each do |v| - add(xml.add_child(XML::Node.create(xpath_name)), v) + add(xml.add_child(XML::Node.create(name)), v) end else - add(xml.add_child(XML::Node.create(xpath_name)), value) + add(xml.add_child(XML::Node.create(name)), value) end end end @@ -294,7 +294,7 @@ module ROXML elsif value.is_a?(ROXML) xml.add_child(value.to_xml(params)) else - node = XML::Node.create(xpath_name) + node = XML::Node.create(name) node.content = value.to_xml xml.add_child(node) end lib/roxml/xml/references.rb @@ -9,7 +9,7 @@ describe ROXML::XMLAttributeRef do <node name="third" /> </myxml>) end - + context "plain vanilla" do before do @ref = ROXML::XMLAttributeRef.new(OpenStruct.new(:name => 'name', :wrapper => 'node', :array? => false), RoxmlObject.new) @@ -36,4 +36,36 @@ describe ROXML::XMLAttributeRef do xml.to_s.squeeze(' ').should == @xml.root.to_s.squeeze(' ') end end + + context "when the namespaces are different" do + before do + @xml = ROXML::XML::Parser.parse %( + <document> + <myxml xmlns="http://example.com/three" xmlns:one="http://example.com/one" xmlns:two="http://example.com/two"> + <one:node name="first" /> + <two:node name="second" /> + <node name="third" /> + </myxml> + </document> + ) + end + + context "with :namespace => '*'" do + before do + @ref = ROXML::XMLAttributeRef.new(OpenStruct.new(:name => 'name', :wrapper => 'node', :array? => true, :namespace => '*'), RoxmlObject.new) + end + + it "should collect all instances" do + pending "Test bug?" + @ref.value_in(@xml).should == ["first", "second", "third"] + end + + it "should output all instances with namespaces" do + pending "Full namespace write support" + xml = ROXML::XML::Node.create('result') + @ref.update_xml(xml, ["first", "second", "third"]) + xml.should == @xml.root + end + end + end end \ No newline at end of file spec/xml/attributes_spec.rb @@ -51,6 +51,7 @@ EOS it "should reproduce the input xml" do output = ROXML::XML::Document.new output.root = VApp.from_xml(@xml).to_xml + pending "Full namespace write support" output.should == ROXML::XML::Parser.parse(@xml) end end spec/xml/namespace_spec.rb 69a8077bd961b57271181ea7eaf728d526e90438 Ben Woosley ben.woosley@gmail.com http://github.com/Empact/roxml/commit/055d96037ccd91013eed5818d6e53c3166b7bb8a 055d96037ccd91013eed5818d6e53c3166b7bb8a 2009-10-26T22:26:31-07:00 2009-10-26T22:26:31-07:00 Don't output crazy, context-less namespaces and local-name xpaths when trying to output namespaced attributes d79762231fe0fc6ddad366c887f478513fcfe173 Ben Woosley ben.woosley@gmail.com