click_and_send 0.0.6 → 0.1.0

data/.gitignore

@@ -7,7 +7,6 @@ Gemfile.lock
 InstalledFiles
 _yardoc
 coverage
-doc/
 lib/bundler/man
 log/*.log
 pkg

data/lib/click_and_send/version.rb

@@ -1,3 +1,3 @@
 module ClickAndSend
-  VERSION = '0.0.6'
+  VERSION = '0.1.0'
 end

data/lib/click_and_send.rb

@@ -39,6 +39,7 @@ module ClickAndSend
     end
 
     def delete_items_by_ref(refs)
+      refs = refs.collect(&:to_s)
       items = find_tracking_numbers(refs).inject([]) do |carrier, (ref, tracking_numbers)|
         tracking_numbers.each do |tracking_number|
           hash = ActiveSupport::OrderedHash.new
@@ -48,15 +49,18 @@ module ClickAndSend
         end
         carrier
       end
-      delete_items('DeleteItems' => items)
+      delete_items('DeleteItems' => items) if items.any?
     end
 
     def delete_items(options)
       ensure_keys_present(options, %w(DeleteItems))
-      Request::DeleteItems.new(options).result
+      # 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 }
     end
 
     def find_tracking_numbers(refs)
+      refs = refs.collect(&:to_s)
       item_summary.inject({}) do |hash,item|
         if item.kind_of?(Hash) && refs.include?(item[:cust_transaction_id])
           hash[item[:cust_transaction_id]] ||= []
@@ -81,6 +85,7 @@ module ClickAndSend
     end
 
     def pdf_url(ref)
+      ref = ref.to_s
       tracking_numbers = find_tracking_numbers([ref])[ref] || {}
       case tracking_numbers.length
       when 0 then raise(Errors::APIError, "Not found: '#{ref}'")

data/spec/acceptance_spec.rb

@@ -32,7 +32,7 @@ describe ClickAndSend, :acceptance do
       subject { ClickAndSend.find_tracking_numbers([ref]) }
       specify do
         should be_a(Hash)
-        subject.keys.should == [ref]
+        subject.keys.should == [ref.to_s]
       end
     end
 
@@ -50,6 +50,13 @@ describe ClickAndSend, :acceptance do
           ClickAndSend.delete_items_by_ref([ref])
         end.to change { ClickAndSend.find_tracking_numbers([ref]).empty? }.to(true)
       end
+
+      context "when item doesn't exist" do
+        let(:ref) { 'MISSING' }
+        specify do
+          expect { ClickAndSend.delete_items_by_ref([ref]) }.not_to raise_error
+        end
+      end
     end
 
     describe '.delete_items' do
@@ -61,14 +68,21 @@ describe ClickAndSend, :acceptance do
           {'DeleteItem' => hash}
         end
       end
-      let(:tracking_numbers) { ClickAndSend.find_tracking_numbers([ref]).fetch(ref) }
+      let(:tracking_numbers) { ClickAndSend.find_tracking_numbers([ref]).fetch(ref.to_s) }
       specify do
         expect do
           ClickAndSend.delete_items('DeleteItems' => items)
-        end.to change { ClickAndSend.find_tracking_numbers(ref).empty? }.to(true)
+        end.to change { ClickAndSend.find_tracking_numbers([ref]).empty? }.to(true)
       end
 
-      it "deletes multiple items"
+      context "when duplicate item exists (same ref)" do
+        before { ClickAndSend.create_items('Transactions' => create_item_attributes) }
+        it "deletes both items" do
+          expect do
+            ClickAndSend.delete_items('DeleteItems' => items)
+          end.to change { ClickAndSend.find_tracking_numbers([ref]).empty? }.to(true)
+        end
+      end
     end
   end
 

data/spec/click_and_send_spec.rb

@@ -118,6 +118,7 @@ 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 == 'deleted'
       end

data/spec/fixtures/config.example.yml

@@ -2,4 +2,4 @@
 :account_number: 1234567
 :api_key: xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 :user_name: acme
-:wsdl: https://auspostuat3-staging.oss.neopost-id.com/modules/oss/api/ship/wsdl?sz_Client=AustraliaPost
+:wsdl: https://auspost-staging.oss.neopost-id.com/modules/oss/api/ship/wsdl?sz_Client=AustraliaPost

data/spec/support/factories.rb

@@ -118,7 +118,7 @@ module ClickAndSend
 
       def transaction_attributes
         ActiveSupport::OrderedHash.new.tap do |hash|
-          hash['CustTransactionID'] = rand(10**10).to_s
+          hash['CustTransactionID'] = rand(10**10)
           hash['Sender'           ] = au_address_attributes
           hash['Receiver'         ] = us_address_attributes
           hash['ItemDetails'      ] = item_details_attributes

data/spec/support/helpers.rb

@@ -6,9 +6,7 @@ module ClickAndSend
       def cleanup
         puts "--> Cleaning up"
         refs = ClickAndSend.item_summary.collect { |item| item[:cust_transaction_id] }
-        # TODO: Delete in one API call when delete multiple items implemented.
-        # ClickAndSend.delete_items_by_ref(refs) if refs.any?
-        refs.each { |ref| ClickAndSend.delete_items_by_ref(ref) }
+        ClickAndSend.delete_items_by_ref(refs) if refs.any?
       end
 
       def load_config(mode = :test)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: click_and_send
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-26 00:00:00.000000000 Z
+date: 2012-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -138,6 +138,7 @@ files:
 - README.md
 - Rakefile
 - click_and_send.gemspec
+- doc/click_and_send_api_guide_v8.1.pdf
 - lib/click_and_send.rb
 - lib/click_and_send/configuration.rb
 - lib/click_and_send/encryption.rb
@@ -175,7 +176,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1946765259710927809
+      hash: -1546608747268446612
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -184,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1946765259710927809
+      hash: -1546608747268446612
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24