pump 0.0.4 → 0.0.5

data/lib/pump/version.rb

@@ -1,3 +1,3 @@
 module Pump
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/pump/xml/tag.rb

@@ -34,13 +34,13 @@ module Pump
         if level == 0
           options[:instruct] ? INSTRUCT : (tabs)
         else
-          "\n#{tabs}"
+          "#{tabs}"
         end
       end
 
       def value_and_close_tag(path=nil)
-        value = value_nodes? ? nodes.first.to_s(path) : (nodes.map(&:to_s).join << "\n")
-        ">#{value}#{tabs unless value_nodes?}</#{name}>"
+        value = value_nodes? ? nodes.first.to_s(path) : ("\n" << nodes.map(&:to_s).join)
+        ">#{value}#{tabs unless value_nodes?}</#{name}>\n"
       end
 
       def value_and_close_tag_with_blank_check
@@ -67,7 +67,7 @@ module Pump
       end
 
       def close_blank_tag
-        "\"/>\""
+        "\"/>\n\""
       end
 
       def condition_start

data/lib/pump/xml/tag_array.rb

@@ -6,7 +6,7 @@ module Pump
     class TagArray < Node
       def initialize(name, attributes={}, nodes=[], options={})
         tag = Tag.new(name, attributes, nodes, {:level => 1, :extra_indent => options[:extra_indent]})
-        array_root = options[:array_root] || name.pluralize
+        array_root = options[:array_root] || name.to_s.pluralize
         super(array_root, {}, [tag], options)
       end
 
@@ -21,11 +21,15 @@ module Pump
       end
 
       def loop_and_close_tag
-        "\#{ objects.empty? ? \" />\" : \">#{tag_loop}#{tabs}</#{name}>\" }"
+        "\#{ #{objects_path}.empty? ? \" />\n\" : \">\n#{tag_loop}#{tabs}</#{name}>\n\" }"
+      end
+
+      def objects_path
+        options[:array_method] ? "object.#{options[:array_method]}" : "objects"
       end
 
       def tag_loop
-        "\#{objects.map{|object| \"#{nodes.first}\" }.join('')}\n"
+        "\#{#{objects_path}.map{|object| \"#{nodes.first}\" }.join('')}"
       end
     end
   end

data/lib/pump/xml.rb

@@ -46,6 +46,8 @@ module Pump
       tag_name, method_name = config.keys.first, config.values.first
       if method_name.is_a?(Array)
         Tag.new(tag_name, config[:attributes], method_name.map{|conf| build_tag(conf) }, config)
+      elsif config[:array].is_a?(Array)
+        TagArray.new(tag_name, config[:attributes], config[:array].map{|conf| build_tag(conf) }, config.merge({:array_method => method_name}))
       else
         Tag.new(tag_name, config[:attributes], Value.new(method_name), config)
       end

data/spec/pump/xml/tag_spec.rb

@@ -15,14 +15,14 @@ describe Pump::Xml::Tag do
       subject{ Pump::Xml::Tag.new("tag", attributes, Pump::Xml::Value.new('method'), options).to_s }
 
       it {should eql(
-        "<tag\#{v = object.method;''}\#{v.nil? || v == '' ? \"/>\" : \">\#{v.to_s.encode(:xml => :text)}</tag>\"}"
+        "<tag\#{v = object.method;''}\#{v.nil? || v == '' ? \"/>\n\" : \">\#{v.to_s.encode(:xml => :text)}</tag>\n\"}"
       )}
 
       context "with :nil_check => true" do
         let(:options) { {:nil_check => true} }
 
         it {should eql(
-          "<tag\#{v = object.method;''}\#{\" nil=\\\"true\\\"\" if v.nil?}\#{v.nil? || v == '' ? \"/>\" : \">\#{v.to_s.encode(:xml => :text)}</tag>\"}"
+          "<tag\#{v = object.method;''}\#{\" nil=\\\"true\\\"\" if v.nil?}\#{v.nil? || v == '' ? \"/>\n\" : \">\#{v.to_s.encode(:xml => :text)}</tag>\n\"}"
         )}
       end
 
@@ -30,14 +30,14 @@ describe Pump::Xml::Tag do
         let(:options) { {:never_blank => true} }
 
         it {should eql(
-          "<tag>\#{object.method.to_s.encode(:xml => :text)}</tag>"
+          "<tag>\#{object.method.to_s.encode(:xml => :text)}</tag>\n"
         )}
 
         context "with attributes" do
           let(:attributes) { {:foo => "bar"} }
 
           it {should eql(
-            "<tag foo=\\\"bar\\\">\#{object.method.to_s.encode(:xml => :text)}</tag>"
+            "<tag foo=\\\"bar\\\">\#{object.method.to_s.encode(:xml => :text)}</tag>\n"
           )}
         end
       end
@@ -46,7 +46,7 @@ describe Pump::Xml::Tag do
         let(:options) { {:skip_encoding => true} }
 
         it {should eql(
-          "<tag\#{v = object.method;''}\#{v.nil? || v == '' ? \"/>\" : \">\#{v}</tag>\"}"
+          "<tag\#{v = object.method;''}\#{v.nil? || v == '' ? \"/>\n\" : \">\#{v}</tag>\n\"}"
         )}
       end
 
@@ -54,7 +54,7 @@ describe Pump::Xml::Tag do
         let(:attributes) { {:foo => "bar"} }
 
         it {should eql(
-          "<tag foo=\\\"bar\\\"\#{v = object.method;''}\#{v.nil? || v == '' ? \"/>\" : \">\#{v.to_s.encode(:xml => :text)}</tag>\"}"
+          "<tag foo=\\\"bar\\\"\#{v = object.method;''}\#{v.nil? || v == '' ? \"/>\n\" : \">\#{v.to_s.encode(:xml => :text)}</tag>\n\"}"
         )}
       end
     end
@@ -69,7 +69,7 @@ describe Pump::Xml::Tag do
       subject{ tag1.to_s }
 
       it {should eql(
-        "<root>\n  <child>\#{object.method}</child>\n</root>"
+        "<root>\n  <child>\#{object.method}</child>\n</root>\n"
       )}
     end
   end

data/spec/pump/xml_spec.rb

@@ -19,7 +19,7 @@ describe Pump::Xml do
     end
 
     it "returns xml string" do
-      xml.encode(person).should eql("#{XML_INSTRUCT}<person>\n  <name>Benny</name>\n</person>")
+      xml.encode(person).should eql("#{XML_INSTRUCT}<person>\n  <name>Benny</name>\n</person>\n")
     end
 
     context "with array" do
@@ -28,7 +28,7 @@ describe Pump::Xml do
         let(:people) { [person] }
 
         it "returns xml string" do
-          xml.encode(people).should eql("#{XML_INSTRUCT}<people type=\"array\">\n  <person>\n    <name>Benny</name>\n  </person>\n</people>")
+          xml.encode(people).should eql("#{XML_INSTRUCT}<people type=\"array\">\n  <person>\n    <name>Benny</name>\n  </person>\n</people>\n")
         end
       end
 
@@ -36,7 +36,7 @@ describe Pump::Xml do
         let(:people) { [person, Struct.new(:name, :age).new('Carlo', 5)] }
 
         it "returns xml string" do
-          xml.encode(people).should eql("#{XML_INSTRUCT}<people type=\"array\">\n  <person>\n    <name>Benny</name>\n  </person>\n  <person>\n    <name>Carlo</name>\n  </person>\n</people>")
+          xml.encode(people).should eql("#{XML_INSTRUCT}<people type=\"array\">\n  <person>\n    <name>Benny</name>\n  </person>\n  <person>\n    <name>Carlo</name>\n  </person>\n</people>\n")
         end
       end
 
@@ -44,7 +44,7 @@ describe Pump::Xml do
         let(:people) { [] }
 
         it "returns xml string" do
-          xml.encode(people).should eql("#{XML_INSTRUCT}<people type=\"array\" />")
+          xml.encode(people).should eql("#{XML_INSTRUCT}<people type=\"array\" />\n")
         end
       end
 
@@ -53,7 +53,7 @@ describe Pump::Xml do
         let(:people) { [] }
 
         it "returns xml string" do
-          xml.encode(people).should eql("<people type=\"array\" />")
+          xml.encode(people).should eql("<people type=\"array\" />\n")
         end
       end
 
@@ -62,7 +62,7 @@ describe Pump::Xml do
         let(:xml) { Pump::Xml.new('person', [{:name => :name}], :instruct => false, :extra_indent => 1) }
 
         it "returns xml string" do
-          xml.encode(people).should eql("  <people type=\"array\">\n    <person>\n      <name>Benny</name>\n    </person>\n  </people>")
+          xml.encode(people).should eql("  <people type=\"array\">\n    <person>\n      <name>Benny</name>\n    </person>\n  </people>\n")
         end
       end
 
@@ -71,7 +71,7 @@ describe Pump::Xml do
         let(:xml) { Pump::Xml.new('person', [{:name => :name}], :instruct => false, :array_root => "personas") }
 
         it "returns xml string" do
-          xml.encode(people).should eql("<personas type=\"array\">\n  <person>\n    <name>Benny</name>\n  </person>\n</personas>")
+          xml.encode(people).should eql("<personas type=\"array\">\n  <person>\n    <name>Benny</name>\n  </person>\n</personas>\n")
         end
       end
     end
@@ -80,7 +80,7 @@ describe Pump::Xml do
       let(:xml) { Pump::Xml.new('person', [{:name => :name}], :instruct => false) }
 
       it "returns xml string" do
-        xml.encode(person).should eql("<person>\n  <name>Benny</name>\n</person>")
+        xml.encode(person).should eql("<person>\n  <name>Benny</name>\n</person>\n")
       end
     end
 
@@ -88,7 +88,7 @@ describe Pump::Xml do
       let(:xml) { Pump::Xml.new('person', [{:name => :name}], :instruct => false, :extra_indent => 1) }
 
       it "returns xml string" do
-        xml.encode(person).should eql("  <person>\n    <name>Benny</name>\n  </person>")
+        xml.encode(person).should eql("  <person>\n    <name>Benny</name>\n  </person>\n")
       end
     end
 
@@ -101,7 +101,7 @@ describe Pump::Xml do
       end
 
       it do
-        xml.encode(person).should eql("#{XML_INSTRUCT}<person>\n  <name>Benny</name>\n  <age type=\"integer\">9</age>\n</person>")
+        xml.encode(person).should eql("#{XML_INSTRUCT}<person>\n  <name>Benny</name>\n  <age type=\"integer\">9</age>\n</person>\n")
       end
     end
 
@@ -109,7 +109,7 @@ describe Pump::Xml do
       let(:person) { Struct.new(:name, :age).new('', 9) }
 
       it do
-        xml.encode(person).should eql("#{XML_INSTRUCT}<person>\n  <name/>\n</person>")
+        xml.encode(person).should eql("#{XML_INSTRUCT}<person>\n  <name/>\n</person>\n")
       end
     end
 
@@ -117,14 +117,14 @@ describe Pump::Xml do
       let(:person) { Struct.new(:name, :age).new(nil, 9) }
 
       it do
-        xml.encode(person).should eql("#{XML_INSTRUCT}<person>\n  <name/>\n</person>")
+        xml.encode(person).should eql("#{XML_INSTRUCT}<person>\n  <name/>\n</person>\n")
       end
 
       context "and with :nil_check => true" do
         let(:xml) { Pump::Xml.new('person', [{:name => :name, :nil_check => true}]) }
 
         it do
-          xml.encode(person).should eql("#{XML_INSTRUCT}<person>\n  <name nil=\"true\"/>\n</person>")
+          xml.encode(person).should eql("#{XML_INSTRUCT}<person>\n  <name nil=\"true\"/>\n</person>\n")
         end
       end
     end
@@ -133,7 +133,7 @@ describe Pump::Xml do
       let(:xml) { Pump::Xml.new('person', [{:name => :name}, {:age => :age}]) }
 
       it "returns xml string" do
-        xml.encode(person).should eql("#{XML_INSTRUCT}<person>\n  <name>Benny</name>\n  <age>9</age>\n</person>")
+        xml.encode(person).should eql("#{XML_INSTRUCT}<person>\n  <name>Benny</name>\n  <age>9</age>\n</person>\n")
       end
     end
 
@@ -141,7 +141,7 @@ describe Pump::Xml do
       let(:xml) { Pump::Xml.new('person', [{"last-name" => :last_name}]) }
 
       it "returns xml string" do
-        xml.encode(person).should eql("#{XML_INSTRUCT}<person>\n  <last-name>Hellman</last-name>\n</person>")
+        xml.encode(person).should eql("#{XML_INSTRUCT}<person>\n  <last-name>Hellman</last-name>\n</person>\n")
       end
     end
 
@@ -150,7 +150,7 @@ describe Pump::Xml do
       let(:xml) { Pump::Xml.new('person', [{:at => :at, :attributes => {:type => 'date'}}]) }
 
       it "returns xml string" do
-        xml.encode(person).should eql("#{XML_INSTRUCT}<person>\n  <at type=\"date\">2013-02-07</at>\n</person>")
+        xml.encode(person).should eql("#{XML_INSTRUCT}<person>\n  <at type=\"date\">2013-02-07</at>\n</person>\n")
       end
     end
 
@@ -159,14 +159,14 @@ describe Pump::Xml do
       let(:xml) { Pump::Xml.new('person', [{:at => :at, :typecast => :xmlschema, :attributes => {:type => 'datetime'}}]) }
 
       it "returns xml string" do
-        xml.encode(person).should eql("#{XML_INSTRUCT}<person>\n  <at type=\"datetime\">2013-02-07T00:00:00+01:00</at>\n</person>")
+        xml.encode(person).should eql("#{XML_INSTRUCT}<person>\n  <at type=\"datetime\">2013-02-07T00:00:00+01:00</at>\n</person>\n")
       end
 
       context "but nil" do
         let(:person) { Struct.new(:at).new(nil) }
 
         it "returns xml string" do
-          xml.encode(person).should eql("#{XML_INSTRUCT}<person>\n  <at type=\"datetime\"/>\n</person>")
+          xml.encode(person).should eql("#{XML_INSTRUCT}<person>\n  <at type=\"datetime\"/>\n</person>\n")
         end
       end
     end
@@ -178,7 +178,7 @@ describe Pump::Xml do
         let(:xml) { Pump::Xml.new('person', [{:name => :name}, {:age => :age, :if => :is_young}]) }
 
         it "skips tag on false" do
-          xml.encode(person).should eql("#{XML_INSTRUCT}<person>\n  <name>Gorbatschow</name>\n</person>")
+          xml.encode(person).should eql("#{XML_INSTRUCT}<person>\n  <name>Gorbatschow</name>\n</person>\n")
         end
       end
 
@@ -186,7 +186,7 @@ describe Pump::Xml do
         let(:xml) { Pump::Xml.new('person', [{:name => :name}, {:age => :age, :unless => :is_old}]) }
 
         it "skips tag on false" do
-          xml.encode(person).should eql("#{XML_INSTRUCT}<person>\n  <name>Gorbatschow</name>\n</person>")
+          xml.encode(person).should eql("#{XML_INSTRUCT}<person>\n  <name>Gorbatschow</name>\n</person>\n")
         end
       end
 
@@ -195,17 +195,29 @@ describe Pump::Xml do
         let(:people) { [person, Struct.new(:name, :age).new('Schewardnadse', nil)] }
 
         it "skips tag on false" do
-          xml.encode(people).should eql("#{XML_INSTRUCT}<people type=\"array\">\n  <person>\n    <name>Gorbatschow</name>\n    <age>82</age>\n  </person>\n  <person>\n    <name>Schewardnadse</name>\n  </person>\n</people>")
+          xml.encode(people).should eql("#{XML_INSTRUCT}<people type=\"array\">\n  <person>\n    <name>Gorbatschow</name>\n    <age>82</age>\n  </person>\n  <person>\n    <name>Schewardnadse</name>\n  </person>\n</people>\n")
         end
       end
     end
 
-    context "deeper nesting" do
+    context "deep hash-like nesting" do
       let(:xml) { Pump::Xml.new('person', [{:name => :name}, {:parent => [{:name => :name}, {:age => :age}]}], :instruct => false) }
 
       it "returns xml string" do
-        xml.encode(person).should eql("<person>\n  <name>Benny</name>\n  <parent>\n    <name>Benny</name>\n    <age>9</age>\n  </parent>\n</person>")
+        xml.encode(person).should eql("<person>\n  <name>Benny</name>\n  <parent>\n    <name>Benny</name>\n    <age>9</age>\n  </parent>\n</person>\n")
       end
     end
+
+    context "deep array-like nesting" do
+      let(:person) { Struct.new(:name, :children).new('Gustav', [Struct.new(:name).new('Lilly'), Struct.new(:name).new('Lena')]) }
+      let(:xml) { Pump::Xml.new('person', [{:name => :name}, {:child => :children, :array => [{:name => :name}]}], :instruct => false) }
+
+      it "returns xml string" do
+        xml.encode(person).should eql("<person>\n  <name>Gustav</name>\n  <children type=\"array\">\n    <child>\n      <name>Lilly</name>\n    </child>\n    <child>\n      <name>Lena</name>\n    </child>\n  </children>\n</person>\n")
+      end
+    end
+
+
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pump
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors: