click_and_send 0.2.0 → 0.2.1

data/lib/click_and_send.rb

@@ -56,9 +56,7 @@ module ClickAndSend
 
     def delete_items(options)
       ensure_keys_present(options, %w(DeleteItems))
-      # TODO: Adjust XML so all DeleteItem objects are nested within one DeleteItems object.
-      # Then, replace next line with: Request::DeleteItems.new(options).result
-      options['DeleteItems'].each { |item| Request::DeleteItems.new('DeleteItems' => item).result }
+      Request::DeleteItems.new(options).result
     end
 
     def find_tracking_numbers(refs)

data/lib/click_and_send/request.rb

@@ -45,11 +45,11 @@ module ClickAndSend
     end
 
     def default_keys
-      { :errors => [:item_errors, :errors_found] }
+      { :errors => [:item_errors, :errors_found], :strip_inner_tags => [] }
     end
 
     def extra_request_xml
-      ClickAndSend::XML.new(data).to_xml if data
+      ClickAndSend::XML.new(data, :strip_inner_tags => key(:strip_inner_tags)).to_xml if data
     end
 
     def header

data/lib/click_and_send/request/delete_items.rb

@@ -9,7 +9,8 @@ module ClickAndSend
         { :answer   => :ws_delete_items_answer,
           :request  => 'WSDeleteItems',
           :response => :ws_delete_items_response,
-          :result   => :delete_items }
+          :result   => :delete_items,
+          :strip_inner_tags => ['DeleteItems'] }
       end
     end
   end

data/lib/click_and_send/request/manifest_items.rb

@@ -9,7 +9,8 @@ module ClickAndSend
         { :answer   => :ws_manifest_items_answer,
           :request  => 'WSManifestItems',
           :response => :ws_manifest_items_response,
-          :result   => nil }
+          :result   => nil,
+          :strip_inner_tags => ['ManifestItems'] }
       end
     end
   end

data/lib/click_and_send/version.rb

@@ -1,3 +1,3 @@
 module ClickAndSend
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/lib/click_and_send/xml.rb

@@ -1,11 +1,16 @@
 module ClickAndSend
   class XML
-    def initialize(input)
+    def initialize(input, options = {})
       @input = input
+      @options = options
     end
 
     def to_xml
-      Gyoku.xml(@input)
+      xml = Gyoku.xml(@input)
+      if @options[:strip_inner_tags]
+        @options[:strip_inner_tags].each { |tag| xml.gsub!("</#{tag}><#{tag}>", '') }
+      end
+      xml
     end
   end
 end

data/spec/acceptance_spec.rb

@@ -138,14 +138,26 @@ describe ClickAndSend, :acceptance do
 
   describe '.manifest_items_by_refs' do
     subject { ClickAndSend.manifest_items_by_refs(refs) }
-    let(:items_created) { ClickAndSend.create_items('Transactions' => attributes_for('Transaction')) }
-    let(:ref) { items_created.fetch(:cust_transaction_id) }
-    let(:refs) { [ref] }
+    let(:item1) { ClickAndSend.create_items('Transactions' => attributes_for('Transaction')) }
+    let(:ref1) { item1.fetch(:cust_transaction_id) }
+    let(:refs) { [ref1] }
 
     it "returns manifest number and total charges/taxes" do
       expect { subject }.not_to raise_error
       subject.should be_a(Hash)
       subject.keys.should =~ [:manifest_number, :total_charge, :total_taxes]
     end
+
+    context "with 2 items" do
+      let(:item2) { ClickAndSend.create_items('Transactions' => attributes_for('Transaction')) }
+      let(:ref2) { item1.fetch(:cust_transaction_id) }
+      let(:refs) { [ref1, ref2] }
+
+      it "returns manifest number and total charges/taxes" do
+        expect { subject }.not_to raise_error
+        subject.should be_a(Hash)
+        subject.keys.should =~ [:manifest_number, :total_charge, :total_taxes]
+      end
+    end
   end
 end

data/spec/click_and_send/request_spec.rb

@@ -46,7 +46,9 @@ describe ClickAndSend::Request do
         end
         Savon.stub(:client) { client }
         ClickAndSend::Encryption.stub(:new) { |arg| stub(:to_s => "encrypted_#{arg}") }
-        ClickAndSend::XML.stub(:new).with(data) { stub(:to_xml => "<ExtraRequestXml></ExtraRequestXml>") }
+        ClickAndSend::XML.stub(:new).with(data, :strip_inner_tags => []) do
+          stub(:to_xml => "<ExtraRequestXml></ExtraRequestXml>")
+        end
         client.stub(:request) { request }
         Nori.stub(:parse).with(request.to_hash[:ws_something_response][:ws_something_response]) do
           parsed_response

data/spec/click_and_send/xml_spec.rb

@@ -5,6 +5,7 @@ describe ClickAndSend::XML do
     subject { ClickAndSend::XML.new(input).to_xml }
     context "hash" do
       let(:input) { {:a => 1, "b" => 2} }
+
       it "generates XML" do
         ["<a>1</a><b>2</b>", "<b>2</b><a>1</a>"].should include(subject)
       end
@@ -12,6 +13,7 @@ describe ClickAndSend::XML do
 
     context "nested hash" do
       let(:input) { {:a => {:b => 2}} }
+
       it { should eq("<a><b>2</b></a>") }
     end
 
@@ -22,14 +24,27 @@ describe ClickAndSend::XML do
           {'DeleteItem' => {'CustTransactionID' => 2, 'TrackingNumber' => 'B'}},
         ]}
       end
-      it "encapsulates hash value with key" do
-        pending "required for deleting multiple items (?) but not how gyoku generates xml"
+
+      it "encapsulates each value with key" do
         expected_xml = '<DeleteItems>'+
           '<DeleteItem><CustTransactionID>1</CustTransactionID><TrackingNumber>A</TrackingNumber></DeleteItem>'+
+          '</DeleteItems><DeleteItems>'+
           '<DeleteItem><CustTransactionID>2</CustTransactionID><TrackingNumber>B</TrackingNumber></DeleteItem>'+
           '</DeleteItems>'
         should eq(expected_xml)
       end
+
+      context "with :strip_inner_tags option for 'DeleteItems'" do
+        subject { ClickAndSend::XML.new(input, :strip_inner_tags => ['DeleteItems']).to_xml }
+
+        it "encapsulates all values with key" do
+          expected_xml = '<DeleteItems>'+
+            '<DeleteItem><CustTransactionID>1</CustTransactionID><TrackingNumber>A</TrackingNumber></DeleteItem>'+
+            '<DeleteItem><CustTransactionID>2</CustTransactionID><TrackingNumber>B</TrackingNumber></DeleteItem>'+
+            '</DeleteItems>'
+          should eq(expected_xml)
+        end
+      end
     end
   end
 end

data/spec/click_and_send_spec.rb

@@ -118,7 +118,6 @@ describe ClickAndSend do
       let(:required_inputs) { %w(DeleteItems) }
       it_behaves_like "data required"
       it "calls DeleteItems result" do
-        pending "Won't work this way until TODO completed for ClickAndSend#delete_items."
         ClickAndSend::Request::DeleteItems.should_receive(:new).with(options) { stub(:result => 'deleted') }
         subject.should eq('deleted')
       end
@@ -211,7 +210,6 @@ describe ClickAndSend do
     end
 
     describe '.manifest_items_by_refs' do
-      subject { ClickAndSend.manifest_items_by_refs(refs, options) }
       let(:manifest_items) do
         {
           'ManifestItems' => [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: click_and_send
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-17 00:00:00.000000000 Z
+date: 2012-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -178,7 +178,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2505933282695818565
+      hash: 2996821537768733287
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -187,7 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2505933282695818565
+      hash: 2996821537768733287
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24