pump 0.0.5 → 0.1.0

data/lib/pump/version.rb

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

data/lib/pump/xml/tag.rb

@@ -44,7 +44,7 @@ module Pump
       end
 
       def value_and_close_tag_with_blank_check
-        "#{blank_check} ? #{close_blank_tag} : \"#{value_and_close_tag('v')}\""
+        "v.nil? ? \"/>\n\" : \"#{value_and_close_tag('v')}\""
       end
 
       def attributes_string
@@ -58,18 +58,6 @@ module Pump
         "\#{\" nil=\\\"true\\\"\" if v.nil?}" if options[:nil_check]
       end
 
-      def blank_check
-        if respond_to?(:blank?)
-          "v.blank?"
-        else
-          "v.nil? || v == ''"
-        end
-      end
-
-      def close_blank_tag
-        "\"/>\n\""
-      end
-
       def condition_start
         "\#{\"" if conditional?
       end

data/lib/pump/xml/tag_array.rb

@@ -21,7 +21,7 @@ module Pump
       end
 
       def loop_and_close_tag
-        "\#{ #{objects_path}.empty? ? \" />\n\" : \">\n#{tag_loop}#{tabs}</#{name}>\n\" }"
+        "\#{ #{objects_path}.empty? ? \"/>\n\" : \">\n#{tag_loop}#{tabs}</#{name}>\n\" }"
       end
 
       def objects_path

data/spec/pump/xml/tag_spec.rb

@@ -7,70 +7,4 @@ describe Pump::Xml::Tag do
       lambda{ Pump::Xml::Tag.new(0) }.should_not raise_error
     end
   end
-
-  describe ".to_s" do
-    context "with value node(s)" do
-      let(:attributes) { {} }
-      let(:options) { {} }
-      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 == '' ? \"/>\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 == '' ? \"/>\n\" : \">\#{v.to_s.encode(:xml => :text)}</tag>\n\"}"
-        )}
-      end
-
-      context "with :never_blank => true" do
-        let(:options) { {:never_blank => true} }
-
-        it {should eql(
-          "<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>\n"
-          )}
-        end
-      end
-
-      context "with :skip_encoding => true" do
-        let(:options) { {:skip_encoding => true} }
-
-        it {should eql(
-          "<tag\#{v = object.method;''}\#{v.nil? || v == '' ? \"/>\n\" : \">\#{v}</tag>\n\"}"
-        )}
-      end
-
-      context "with attributes" do
-        let(:attributes) { {:foo => "bar"} }
-
-        it {should eql(
-          "<tag foo=\\\"bar\\\"\#{v = object.method;''}\#{v.nil? || v == '' ? \"/>\n\" : \">\#{v.to_s.encode(:xml => :text)}</tag>\n\"}"
-        )}
-      end
-    end
-
-    context "with other tag child nodes" do
-      let(:attributes1) { {} }
-      let(:options1) { {} }
-      let(:attributes2) { {} }
-      let(:options2) { {:never_blank => true, :skip_encoding => true} }
-      let(:tag2) { Pump::Xml::Tag.new("child", attributes2, Pump::Xml::Value.new('method'), options2) }
-      let(:tag1) { Pump::Xml::Tag.new("root", attributes1, [tag2], options1) }
-      subject{ tag1.to_s }
-
-      it {should eql(
-        "<root>\n  <child>\#{object.method}</child>\n</root>\n"
-      )}
-    end
-  end
 end

data/spec/pump/xml_spec.rb

@@ -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\" />\n")
+          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\" />\n")
+          xml.encode(people).should eql("<people type=\"array\"/>\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>\n")
+        xml.encode(person).should eql("#{XML_INSTRUCT}<person>\n  <name></name>\n</person>\n")
       end
     end
 

data/spec/spec_helper.rb

@@ -7,4 +7,6 @@ RSpec.configure do |config|
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
   config.order = 'random'
+
+   config.backtrace_clean_patterns = [/rspec\/(core|expectations)/]
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pump
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-08 00:00:00.000000000 Z
+date: 2013-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport