pump 0.1.0 → 0.2.0

data/benchmarks/encode.rb

@@ -18,15 +18,15 @@ end
 # Not optimized pump
 pump = Pump::Xml.new('person', [
   {:age => :age, :attributes => {:type => 'integer'}},
-  {:"created-at" => :created_at, :typecast => :xmlschema, :attributes => {:type => 'datetime'}, :never_blank => true},
+  {:"created-at" => :created_at, :typecast => :xmlschema, :attributes => {:type => 'datetime'}, :never_nil => true},
   {:name => :name}
 ])
 
 # Heavily optimized pump
 pump_optimized = Pump::Xml.new('person', [
-  {:age => :age, :attributes => {:type => 'integer'}, :never_blank => true, :skip_encoding => true},
-  {:"created-at" => :created_at, :typecast => :xmlschema, :attributes => {:type => 'datetime'}, :never_blank => true, :skip_encoding => true},
-  {:name => :name, :never_blank => true}
+  {:age => :age, :attributes => {:type => 'integer'}, :never_nil => true, :xmlsafe => true},
+  {:"created-at" => :created_at, :typecast => :xmlschema, :attributes => {:type => 'datetime'}, :never_nil => true, :xmlsafe => true},
+  {:name => :name, :never_nil => true}
 ])
 
 if defined?(Ox)

data/lib/pump/version.rb

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

data/lib/pump/xml/tag.rb

@@ -13,10 +13,10 @@ module Pump
       end
 
       def to_s
-        if !value_nodes? || options[:never_blank]
+        if !value_nodes? || options[:never_nil]
           "#{condition_start}#{open_tag}#{value_and_close_tag}#{condition_end}"
         else
-          "#{condition_start}#{open_tag}\#{v = #{nodes.first.plain};''}#{nil_attribute}\#{#{value_and_close_tag_with_blank_check}}#{condition_end}"
+          "#{condition_start}#{open_tag}\#{v = #{nodes.first.plain};''}\#{#{value_and_close_tag_with_nil_check}}#{condition_end}"
         end
       end
 
@@ -43,8 +43,8 @@ module Pump
         ">#{value}#{tabs unless value_nodes?}</#{name}>\n"
       end
 
-      def value_and_close_tag_with_blank_check
-        "v.nil? ? \"/>\n\" : \"#{value_and_close_tag('v')}\""
+      def value_and_close_tag_with_nil_check
+        "v.nil? ? \" nil=\\\"true\\\"/>\n\" : \"#{value_and_close_tag('v')}\""
       end
 
       def attributes_string
@@ -54,10 +54,6 @@ module Pump
         end
       end
 
-      def nil_attribute
-        "\#{\" nil=\\\"true\\\"\" if v.nil?}" if options[:nil_check]
-      end
-
       def condition_start
         "\#{\"" if conditional?
       end

data/lib/pump/xml/value.rb

@@ -18,7 +18,7 @@ module Pump
       def cast
         if options[:typecast]
           ".#{options[:typecast]}"
-        elsif !options[:skip_encoding]
+        elsif !options[:xmlsafe]
           '.to_s.encode(:xml => :text)'
         end
       end

data/spec/pump/xml/value_spec.rb

@@ -17,8 +17,8 @@ describe Pump::Xml::Value do
   describe "#to_s" do
     its(:to_s) { should eql("\#{object.method_name.to_s.encode(:xml => :text)}") }
 
-    context "with option :skip_encoding => true" do
-      subject { Pump::Xml::Value.new("method_name", {}, [], :skip_encoding => true) }
+    context "with option :xmlsafe => true" do
+      subject { Pump::Xml::Value.new("method_name", {}, [], :xmlsafe => true) }
 
       its(:to_s) { should eql("\#{object.method_name}") }
     end

data/spec/pump/xml_spec.rb

@@ -117,15 +117,7 @@ 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>\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>\n")
-        end
+        xml.encode(person).should eql("#{XML_INSTRUCT}<person>\n  <name nil=\"true\"/>\n</person>\n")
       end
     end
 
@@ -166,7 +158,7 @@ describe Pump::Xml 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>\n")
+          xml.encode(person).should eql("#{XML_INSTRUCT}<person>\n  <at type=\"datetime\" nil=\"true\"/>\n</person>\n")
         end
       end
     end

metadata

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