active_fulfillment 1.0.3 → 2.0.0

data/CHANGELOG

@@ -1,5 +1,9 @@
 = ActiveFulfillment CHANGELOG
 
+== Version 2.0.0 (Jan 5, 2013)
+
+* API Change on tracking numbers, returns array instead of single string [csaunders]
+
 == Version 1.0.3 (Jan 21, 2010)
 
 * Include "pending" counts in stock levels for Shipwire [wisq]

data/Rakefile

@@ -1,9 +1,9 @@
-require 'rubygems'
+require 'bundler'
+Bundler::GemHelper.install_tasks
+
 require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
-require 'rake/gempackagetask'
-require 'rake/contrib/rubyforgepublisher'
 
 desc "Default Task"
 task :default => 'test:units'
@@ -34,30 +34,3 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('README', 'CHANGELOG')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
-
-task :install => [:package] do
-  `gem install pkg/#{PKG_FILE_NAME}.gem`
-end
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gemspec|
-    gemspec.name = 'active_fulfillment'
-    gemspec.summary = "Framework and tools for dealing with shipping, tracking and order fulfillment services."
-    gemspec.email = "cody@shopify.com"
-    gemspec.homepage = "http://github.com/shopify/active_fulfillment"
-    gemspec.authors = ["Cody Fauser", "James MacAulay"]
-    gemspec.add_dependency('activesupport', '>= 2.3.2')
-    gemspec.add_dependency('builder', '>= 2.0.0')
-  end
-rescue LoadError
-  puts "Jeweler not available. Install it with: gem install jeweler"
-end
-
-desc "Update common files from active_merchant directory"
-task :update_common do 
-  STDERR.puts "Updating common include from ../active_merchant. Please make sure this is up-to-date"
-  system("diff -u lib/active_merchant/common.rb ../active_merchant/lib/active_merchant/common.rb | patch -p0")
-  system("diff -ur lib/active_merchant/common ../active_merchant/lib/active_merchant/common | patch -p0")  
-  STDERR.puts "done.."
-end

data/VERSION

@@ -1 +1 @@
-1.0.3
+2.0.0

data/active_fulfillment.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{active_fulfillment}
-  s.version = "1.0.3"
+  s.version = "2.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Cody Fauser", "James MacAulay"]
@@ -25,16 +25,6 @@ Gem::Specification.new do |s|
     "lib/active_fulfillment/fulfillment/services/amazon.rb",
     "lib/active_fulfillment/fulfillment/services/shipwire.rb",
     "lib/active_fulfillment/fulfillment/services/webgistix.rb",
-    "lib/active_merchant/common.rb",
-    "lib/active_merchant/common/connection.rb",
-    "lib/active_merchant/common/country.rb",
-    "lib/active_merchant/common/error.rb",
-    "lib/active_merchant/common/post_data.rb",
-    "lib/active_merchant/common/posts_data.rb",
-    "lib/active_merchant/common/requires_parameters.rb",
-    "lib/active_merchant/common/utils.rb",
-    "lib/active_merchant/common/validateable.rb",
-    "lib/certs/cacert.pem",
     "test/fixtures.yml",
     "test/fixtures/xml/amazon/inventory_get_response.xml",
     "test/fixtures/xml/amazon/inventory_list_response.xml",
@@ -69,20 +59,11 @@ Gem::Specification.new do |s|
     "test/unit/services/webgistix_test.rb"
   ]
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.add_dependency('activesupport', '>= 2.3.11')
+  s.add_dependency('builder', '>= 2.0.0')
+  s.add_dependency('active_utils', '>= 1.0.1')
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activesupport>, [">= 2.3.2"])
-      s.add_runtime_dependency(%q<builder>, [">= 2.0.0"])
-    else
-      s.add_dependency(%q<activesupport>, [">= 2.3.2"])
-      s.add_dependency(%q<builder>, [">= 2.0.0"])
-    end
-  else
-    s.add_dependency(%q<activesupport>, [">= 2.3.2"])
-    s.add_dependency(%q<builder>, [">= 2.0.0"])
-  end
+  s.add_development_dependency('rake')
+  s.add_development_dependency('mocha')
 end
 

data/lib/active_fulfillment/fulfillment/response.rb

@@ -1,14 +1,10 @@
 module ActiveMerchant
   module Fulfillment
-  
-    class Error < StandardError
-    end
-  
     class Response
       attr_reader :params
       attr_reader :message
       attr_reader :test
-    
+
       def success?
         @success
       end
@@ -16,17 +12,17 @@ module ActiveMerchant
       def test?
         @test
       end
-        
+
       def initialize(success, message, params = {}, options = {})
         @success, @message, @params = success, message, params.stringify_keys
-        @test = options[:test] || false        
+        @test = options[:test] || false
       end
-      
+
       private
       def method_missing(method, *args)
         @params[method.to_s] || super
       end
     end
-    
+
   end
-end
+end

data/lib/active_fulfillment/fulfillment/services/amazon.rb

@@ -342,7 +342,7 @@ module ActiveMerchant
         track_node = REXML::XPath.first(document, '//ns1:FulfillmentShipmentPackage/ns1:TrackingNumber')
         if track_node
           id_node = REXML::XPath.first(document, '//ns1:MerchantFulfillmentOrderId')
-          response[:tracking_numbers][id_node.text] = track_node.text
+          response[:tracking_numbers][id_node.text] = [track_node.text]
         end
 
         response[:response_status] = SUCCESS

data/lib/active_fulfillment/fulfillment/services/shipwire.rb

@@ -27,8 +27,10 @@ module ActiveMerchant
                      'UK'  => 'United Kingdom'
                    }
                    
-      INVALID_LOGIN = /Error with EmailAddress, valid email is required/
-                   
+      INVALID_LOGIN = /(Error with Valid Username\/EmailAddress and Password Required)|(Could not verify Username\/EmailAddress and Password combination)/
+
+      class_attribute :affiliate_id
+
       # The first is the label, and the last is the code
       def self.shipping_methods
         [ ['1 Day Service',   '1D'],
@@ -72,6 +74,10 @@ module ActiveMerchant
         @options[:include_pending_stock]
       end
 
+      def include_empty_stock?
+        @options[:include_empty_stock]
+      end
+
       private
       def build_fulfillment_request(order_id, shipping_address, line_items, options)
         xml = Builder::XmlMarkup.new :indent => 2
@@ -93,6 +99,7 @@ module ActiveMerchant
           add_credentials(xml)
           xml.tag! 'Warehouse', WAREHOUSES[options[:warehouse]]
           xml.tag! 'ProductCode', options[:sku]
+          xml.tag! 'IncludeEmpty' if include_empty_stock?
         end
       end
       
@@ -113,6 +120,7 @@ module ActiveMerchant
         xml.tag! 'EmailAddress', @options[:login]
         xml.tag! 'Password', @options[:password]
         xml.tag! 'Server', test? ? 'Test' : 'Production'
+        xml.tag! 'AffiliateId', affiliate_id if affiliate_id.present?
       end
 
       def add_order(xml, order_id, shipping_address, line_items, options)
@@ -125,6 +133,9 @@ module ActiveMerchant
           Array(line_items).each_with_index do |line_item, index|
             add_item(xml, line_item, index)
           end
+          xml.tag! 'Note' do
+            xml.cdata! options[:note] unless options[:note].blank?
+          end
         end
       end
 
@@ -134,14 +145,10 @@ module ActiveMerchant
             xml.tag! 'Full', address[:name]
           end
           
-          if address[:company].blank?
-            xml.tag! 'Address1', address[:address1]
-            xml.tag! 'Address2', address[:address2]
-          else
-            xml.tag! 'Address1', address[:company]
-            xml.tag! 'Address2', address[:address1]
-            xml.tag! 'Address3', address[:address2]
-          end
+          xml.tag! 'Address1', address[:address1]
+          xml.tag! 'Address2', address[:address2]
+
+          xml.tag! 'Company', address[:company]
           
           xml.tag! 'City', address[:city]
           xml.tag! 'State', address[:state] unless address[:state].blank?
@@ -186,7 +193,7 @@ module ActiveMerchant
         
         document = REXML::Document.new(xml)
         document.root.elements.each do |node|
-          response[node.name.underscore.to_sym] = node.text
+          response[node.name.underscore.to_sym] = text_content(node)
         end
         
         response[:success] = response[:status] == '0'
@@ -207,7 +214,7 @@ module ActiveMerchant
             amount = to_check.sum { |a| node.attributes[a].to_i }
             response[:stock_levels][node.attributes['code']] = amount
           else
-            response[node.name.underscore.to_sym] = node.text
+            response[node.name.underscore.to_sym] = text_content(node)
           end
         end
         
@@ -225,9 +232,12 @@ module ActiveMerchant
         
         document.root.elements.each do |node|
           if node.name == 'Order'
-            response[:tracking_numbers][node.attributes['id']] = node.attributes['trackingNumber'] if node.attributes["shipped"] == "YES"
+            if node.attributes["shipped"] == "YES" && node.elements['TrackingNumber']
+              tracking_number = node.elements['TrackingNumber'].text 
+              response[:tracking_numbers][node.attributes['id']] = [tracking_number]
+            end
           else
-            response[node.name.underscore.to_sym] = node.text
+            response[node.name.underscore.to_sym] = text_content(node)
           end
         end
         
@@ -240,6 +250,12 @@ module ActiveMerchant
         return if string.blank?
         string.gsub("\n", '').squeeze(" ")
       end
+
+      def text_content(xml_node)
+        text = xml_node.text
+        text = xml_node.cdatas.join if text.blank?
+        text
+      end
     end
   end
 end

data/lib/active_fulfillment/fulfillment/services/webgistix.rb

@@ -28,7 +28,9 @@ module ActiveMerchant
       def self.shipping_methods
         [ 
           ["UPS Ground Shipping", "Ground"],
+          ["UPS Ground", "Ground"],
           ["UPS Standard Shipping (Canada Only)", "Standard"],
+          ["UPS Standard Shipping (CA & MX Only)", "Standard"],
           ["UPS 3-Business Day", "3-Day Select"],
           ["UPS 2-Business Day", "2nd Day Air"],
           ["UPS 2-Business Day AM", "2nd Day Air AM"],
@@ -299,7 +301,7 @@ module ActiveMerchant
           params = node.elements.to_a.each_with_object({}) {|elem, hash| hash[elem.name] = elem.text}
 
           tracking = params['ShipmentTrackingNumber']
-          response[:tracking_numbers][params['InvoiceNumber']] = tracking unless tracking == NOT_SHIPPED
+          response[:tracking_numbers][params['InvoiceNumber']] = [tracking] unless tracking == NOT_SHIPPED
         end
 
         response

data/lib/active_fulfillment/fulfillment/services.rb

@@ -1,3 +1,4 @@
 require 'active_fulfillment/fulfillment/services/shipwire'
 require 'active_fulfillment/fulfillment/services/webgistix'
 require 'active_fulfillment/fulfillment/services/amazon'
+require 'active_fulfillment/fulfillment/services/amazon_mws'

data/lib/active_fulfillment.rb

@@ -30,9 +30,10 @@ rescue LoadError
   require 'active_support'
 end
 
-require 'active_support/core_ext/class/inheritable_attributes'
+require 'active_support/core_ext/class/attribute'
 require 'active_support/core_ext/class/delegating_attributes'
 require 'active_support/core_ext/time/calculations'
+require 'active_support/core_ext/date/calculations'
 require 'active_support/core_ext/numeric/time'
 require 'active_support/core_ext/enumerable'
 begin
@@ -51,7 +52,7 @@ end
 require 'cgi'
 require 'net/https'
 require 'rexml/document'
-require 'active_merchant/common'
+require 'active_utils'
 
 require 'active_fulfillment/fulfillment/base'
 require 'active_fulfillment/fulfillment/response'

data/test/fixtures.yml

@@ -8,4 +8,9 @@ webgistix:
   
 amazon:
   login: 
-  password: 
+  password: 
+
+amazon_mws:
+  login:
+  password:
+  seller_id:

data/test/remote/amazon_test.rb

@@ -33,7 +33,7 @@ class RemoteAmazonTest < Test::Unit::TestCase
   end
 
   def test_successful_order_submission
-    response = @service.fulfill(generate_order_id, @address, @line_items, @options)
+    response = @service.fulfill(ActiveMerchant::Utils.generate_unique_id, @address, @line_items, @options)
     assert response.success?
     assert !response.test?
   end
@@ -45,7 +45,7 @@ class RemoteAmazonTest < Test::Unit::TestCase
        }
     )
     
-    response = @service.fulfill(generate_order_id, @address, @line_items, @options)
+    response = @service.fulfill(ActiveMerchant::Utils.generate_unique_id, @address, @line_items, @options)
     assert response.success?
   end
   
@@ -54,7 +54,7 @@ class RemoteAmazonTest < Test::Unit::TestCase
       :login => 'y',
       :password => 'p')
     
-    response = service.fulfill(generate_order_id, @address, @line_items, @options)
+    response = service.fulfill(ActiveMerchant::Utils.generate_unique_id, @address, @line_items, @options)
     assert !response.success?
     assert_equal "aws:Client.InvalidClientTokenId The AWS Access Key Id you provided does not exist in our records.", response.message
   end
@@ -114,4 +114,4 @@ class RemoteAmazonTest < Test::Unit::TestCase
     assert response.success?
   end
   
-end
+end

data/test/remote/shipwire_test.rb

@@ -45,7 +45,7 @@ class RemoteShipwireTest < Test::Unit::TestCase
     assert !response.success?
     assert response.test?
     assert_equal 'Error', response.params['status']
-    assert_equal "Could not verify e-mail/password combination", response.message
+    assert_equal "Could not verify Username/EmailAddress and Password combination", response.message
   end
   
   def test_successful_order_submission_to_us
@@ -112,7 +112,7 @@ class RemoteShipwireTest < Test::Unit::TestCase
     assert !response.success?
     assert response.test?
     assert_equal 'Error', response.params['status']
-    assert_equal "Error with EmailAddress, valid email is required. There is an error in XML document.", response.message
+    assert_equal "Error with Valid Username/EmailAddress and Password Required. There is an error in XML document.", response.message
   end
   
   def test_get_inventory
@@ -142,4 +142,4 @@ class RemoteShipwireTest < Test::Unit::TestCase
               )
     assert !service.valid_credentials?
   end
-end
+end

data/test/remote/webgistix_test.rb

@@ -79,8 +79,8 @@ class RemoteWebgistixTest < Test::Unit::TestCase
       '1254658', 'FAItest123', 'Flat Rate Test Order 4'
     ])
     assert response.success?
-    assert_equal '4209073191018052136352154', response.tracking_numbers['1254658']
-    assert_equal '9101805213907472080032',    response.tracking_numbers['Flat Rate Test Order 4']
+    assert_equal ['4209073191018052136352154'], response.tracking_numbers['1254658']
+    assert_equal ['9101805213907472080032'],    response.tracking_numbers['Flat Rate Test Order 4']
     assert_nil response.tracking_numbers['FAItest123'] # 'Not Shipped'
   end
   

data/test/test_helper.rb

@@ -1,16 +1,16 @@
 #!/usr/bin/env ruby
 $:.unshift(File.dirname(__FILE__) + '/../lib')
 
+require 'rubygems'
+require 'bundler'
+Bundler.setup
+
 require 'test/unit'
 require 'digest/md5'
 require 'active_fulfillment'
+require 'active_utils'
 
-begin
-  require 'mocha'
-rescue LoadError
-  require 'rubygems'
-  require 'mocha'
-end
+require 'mocha'
 
 module Test
   module Unit
@@ -19,17 +19,6 @@ module Test
       
       LOCAL_CREDENTIALS = ENV['HOME'] + '/.active_merchant/fixtures.yml' unless defined?(LOCAL_CREDENTIALS)
       DEFAULT_CREDENTIALS = File.dirname(__FILE__) + '/fixtures.yml' unless defined?(DEFAULT_CREDENTIALS)
-      
-      def generate_order_id
-        md5 = Digest::MD5.new
-        now = Time.now
-        md5 << now.to_s
-        md5 << String(now.usec)
-        md5 << String(rand(0))
-        md5 << String($$)
-        md5 << self.class.name
-        md5.hexdigest
-      end
 
       def all_fixtures
         @@fixtures ||= load_fixtures

data/test/unit/services/amazon_test.rb

@@ -98,7 +98,7 @@ class AmazonTest < Test::Unit::TestCase
       
     response = @service.fetch_tracking_numbers(['TEST-00000001', 'TEST-00000002'])
     assert response.success?
-    assert_equal 'UPS00000001', response.tracking_numbers['TEST-00000001']
+    assert_equal %w{UPS00000001}, response.tracking_numbers['TEST-00000001']
     assert_nil response.tracking_numbers['TEST-00000002']
   end
 
@@ -115,7 +115,7 @@ class AmazonTest < Test::Unit::TestCase
       
     response = @service.fetch_tracking_numbers(['TEST-00000001', '#1337-1', 'TEST-00000002'])
     assert response.success?
-    assert_equal 'UPS00000001', response.tracking_numbers['TEST-00000001']
+    assert_equal %w{UPS00000001}, response.tracking_numbers['TEST-00000001']
   end
 
   def test_fetch_tracking_numbers_aborts_on_error

data/test/unit/services/shipwire_test.rb

@@ -21,6 +21,7 @@ class ShipwireTest < Test::Unit::TestCase
       :state => 'NC',
       :country => 'US',
       :zip => '23456',
+      :company => 'MyCorp',
       :email    => 'buyer@jadedpallet.com'
     }
     
@@ -86,6 +87,16 @@ class ShipwireTest < Test::Unit::TestCase
     assert_equal 921, response.stock_levels['KingMonkey']
   end
 
+  def test_inventory_request_with_include_empty_tag
+     @shipwire = ShipwireService.new(
+                  :login => 'cody@example.com',
+                  :password => 'test',
+                  :include_empty_stock => true
+                )
+    xml = REXML::Document.new(@shipwire.send(:build_inventory_request, {}))
+    assert REXML::XPath.first(xml, '//IncludeEmpty')
+  end
+
   def test_no_tracking_numbers_available
     @shipwire.expects(:ssl_post).returns(successful_empty_tracking_response)
     response = @shipwire.fetch_tracking_numbers(['1234'])
@@ -94,8 +105,8 @@ class ShipwireTest < Test::Unit::TestCase
   end
   
   def test_successful_tracking
-    expected = { "2986" => "1ZW682E90326614239",
-                 "2987" => "1ZW682E90326795080" }
+    expected = { "2986" => ["1ZW682E90326614239"],
+                 "2987" => ["1ZW682E90326795080"] }
     
     @shipwire.expects(:ssl_post).returns(successful_tracking_response)
     response = @shipwire.fetch_tracking_numbers(["2986", "2987"])
@@ -132,6 +143,38 @@ class ShipwireTest < Test::Unit::TestCase
     assert !@shipwire.valid_credentials?
   end
 
+  def test_affiliate_id
+    ActiveMerchant::Fulfillment::ShipwireService.affiliate_id = 'affiliate_id'
+
+    xml = REXML::Document.new(@shipwire.send(:build_fulfillment_request, '123456', @address, @line_items, @options))
+    affiliate_id = REXML::XPath.first(xml, "//AffiliateId")
+    assert_equal 'affiliate_id', affiliate_id.text
+  end
+
+  def test_company_name_in_request
+    xml = REXML::Document.new(@shipwire.send(:build_fulfillment_request, '123456', @address, @line_items, @options))
+    company_node = REXML::XPath.first(xml, "//Company")
+    assert_equal 'MyCorp', company_node.text 
+  end
+
+  def test_order_excludes_note_by_default
+    xml = REXML::Document.new(@shipwire.send(:build_fulfillment_request, '123456', @address, @line_items, @options))
+    note_node = REXML::XPath.first(xml, "//Note").cdatas.first
+    assert_nil note_node
+  end
+
+  def test_order_includes_note_when_present
+    @options[:note] = "A test note"
+    xml = REXML::Document.new(@shipwire.send(:build_fulfillment_request, '123456', @address, @line_items, @options))
+    note_node = REXML::XPath.first(xml, "//Note").cdatas.first
+    assert_equal "A test note", note_node.to_s
+  end
+
+  def test_error_response_cdata_parsing
+    @shipwire.expects(:ssl_post).returns(xml_fixture('shipwire/fulfillment_failure_response'))
+    assert !@shipwire.valid_credentials?
+  end
+
   private
   def successful_empty_tracking_response
     "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\r\n<TrackingUpdateResponse><Status>Test</Status><TotalOrders></TotalOrders><TotalShippedOrders></TotalShippedOrders><TotalProducts></TotalProducts><Bookmark></Bookmark></TrackingUpdateResponse>"
@@ -142,9 +185,15 @@ class ShipwireTest < Test::Unit::TestCase
 <?xml version="1.0"?>
 <TrackingUpdateResponse>
   <Status>Test</Status>
-  <Order id="2986" shipped="YES" trackingNumber="1ZW682E90326614239" shipper="UPS GD" handling="1.00" shipping="13.66" total="14.66"/>
-  <Order id="2987" shipped="YES" trackingNumber="1ZW682E90326795080" shipper="UPS GD" handling="1.50" shipping="9.37" total="10.87"/>
-  <Order id="2988" shipped="NO" trackingNumber="" shipper="UPS GD" handling="" shipping="" total=""/>
+  <Order id="2986" shipped="YES" shipper="UPS GD" handling="1.00" shipping="13.66" total="14.66">
+    <TrackingNumber>1ZW682E90326614239</TrackingNumber>
+  </Order>
+  <Order id="2987" shipped="YES" shipper="UPS GD" handling="1.50" shipping="9.37" total="10.87">
+    <TrackingNumber>1ZW682E90326795080</TrackingNumber>
+  </Order>
+  <Order id="2988" shipped="NO" shipper="UPS GD" handling="" shipping="" total="">
+    <TrackingNumber></TrackingNumber>
+  </Order>
   <TotalOrders>3</TotalOrders>
   <TotalShippedOrders>2</TotalShippedOrders>
   <Bookmark>2006-04-28 20:35:45</Bookmark>
@@ -157,21 +206,51 @@ class ShipwireTest < Test::Unit::TestCase
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <TrackingUpdateResponse>
   <Status>0</Status>
-  <Order id="21" shipped="YES" trackingNumber="1Z6296VW0398500001" shipper="5" handling="0.00" shipping="6.58" total="6.58"/>
-  <Order id="22" shipped="YES" trackingNumber="1Z6296VW0390790002" shipper="5" handling="0.00" shipping="8.13" total="8.13"/>
-  <Order id="23" shipped="YES" trackingNumber="1Z6296VW0396490003" shipper="5" handling="0.00" shipping="7.63" total="7.63"/>
-  <Order id="24" shipped="YES" trackingNumber="1Z6296VW0390200004" shipper="5" handling="0.00" shipping="8.97" total="8.97"/>
-  <Order id="25" shipped="YES" trackingNumber="1Z6296VW0393240005" shipper="5" handling="0.00" shipping="8.42" total="8.42"/>
-  <Order id="26" shipped="YES" trackingNumber="1Z6296VW0396400006" shipper="5" handling="0.00" shipping="8.42" total="8.42"/>
-  <Order id="2581" shipped="YES" trackingNumber="1Z6296VW0391160007" shipper="5" handling="0.00" shipping="8.21" total="8.21"/>
-  <Order id="2576" shipped="YES" trackingNumber="CJ3026000018US" shipper="43" handling="0.00" shipping="18.60" total="18.60"/>
-  <Order id="2593" shipped="YES" trackingNumber="1Z6296VW0398660008" shipper="5" handling="0.00" shipping="7.63" total="7.63"/>
-  <Order id="2598" shipped="YES" trackingNumber="1Z6296VW0391610009" shipper="5" handling="0.00" shipping="9.84" total="9.84"/>
-  <Order id="2610" shipped="YES" trackingNumber="1Z6296VW0395650010" shipper="5" handling="0.00" shipping="7.63" total="7.63"/>
-  <Order id="2611" shipped="YES" trackingNumber="1Z6296VW0397050011" shipper="5" handling="0.00" shipping="7.13" total="7.13"/>
-  <Order id="2613" shipped="YES" trackingNumber="1Z6296VW0398970012" shipper="5" handling="0.00" shipping="8.97" total="8.97"/>
-  <Order id="2616" shipped="NO" trackingNumber="" shipper="5" handling="0.00" shipping="9.84" total="9.84"/>
-  <Order id="2631" shipped="NO" trackingNumber="" shipper="" handling="" shipping="" total=""/>
+  <Order id="21" shipped="YES" shipper="5" handling="0.00" shipping="6.58" total="6.58">
+    <TrackingNumber>1Z6296VW0398500001</TrackingNumber>
+  </Order>
+  <Order id="22" shipped="YES" shipper="5" handling="0.00" shipping="8.13" total="8.13">
+    <TrackingNumber>1Z6296VW0390790002</TrackingNumber>
+  </Order>
+  <Order id="23" shipped="YES" shipper="5" handling="0.00" shipping="7.63" total="7.63">
+    <TrackingNumber>1Z6296VW0396490003</TrackingNumber>
+  </Order>
+  <Order id="24" shipped="YES" shipper="5" handling="0.00" shipping="8.97" total="8.97">
+    <TrackingNumber>1Z6296VW0390200004</TrackingNumber>
+  </Order>
+  <Order id="25" shipped="YES" shipper="5" handling="0.00" shipping="8.42" total="8.42">
+    <TrackingNumber>1Z6296VW0393240005</TrackingNumber>
+  </Order>
+  <Order id="26" shipped="YES" shipper="5" handling="0.00" shipping="8.42" total="8.42">
+    <TrackingNumber>1Z6296VW0396400006</TrackingNumber>
+  </Order>
+  <Order id="2581" shipped="YES" shipper="5" handling="0.00" shipping="8.21" total="8.21">
+    <TrackingNumber>1Z6296VW0391160007</TrackingNumber>
+  </Order>
+  <Order id="2576" shipped="YES" shipper="43" handling="0.00" shipping="18.60" total="18.60">
+    <TrackingNumber>CJ3026000018US</TrackingNumber>
+  </Order>
+  <Order id="2593" shipped="YES" shipper="5" handling="0.00" shipping="7.63" total="7.63">
+    <TrackingNumber>1Z6296VW0398660008</TrackingNumber>
+  </Order>
+  <Order id="2598" shipped="YES" shipper="5" handling="0.00" shipping="9.84" total="9.84">
+    <TrackingNumber>1Z6296VW0391610009</TrackingNumber>
+  </Order>
+  <Order id="2610" shipped="YES" shipper="5" handling="0.00" shipping="7.63" total="7.63">
+    <TrackingNumber>1Z6296VW0395650010</TrackingNumber>
+  </Order>
+  <Order id="2611" shipped="YES" shipper="5" handling="0.00" shipping="7.13" total="7.13">
+    <TrackingNumber>1Z6296VW0397050011</TrackingNumber>
+  </Order>
+  <Order id="2613" shipped="YES" shipper="5" handling="0.00" shipping="8.97" total="8.97">
+    <TrackingNumber>1Z6296VW0398970012</TrackingNumber>
+  </Order>
+  <Order id="2616" shipped="NO" shipper="5" handling="0.00" shipping="9.84" total="9.84">
+    <TrackingNumber></TrackingNumber>
+  </Order>
+  <Order id="2631" shipped="NO" shipper="" handling="" shipping="" total="">
+    <TrackingNumber></TrackingNumber>
+  </Order>
   <TotalOrders>15</TotalOrders>
   <TotalShippedOrders>13</TotalShippedOrders>
   <TotalProducts/>
@@ -185,7 +264,7 @@ class ShipwireTest < Test::Unit::TestCase
     <<-XML
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <TrackingUpdateResponse><Status>Error</Status><ErrorMessage>
-Error with EmailAddress, valid email is required.
+Error with Valid Username/EmailAddress and Password Required.
     There is an error in XML document.
 </ErrorMessage></TrackingUpdateResponse>    
     XML

data/test/unit/services/webgistix_test.rb

@@ -106,7 +106,7 @@ class WebgistixTest < Test::Unit::TestCase
     response = @service.fetch_tracking_numbers(['AB12345', 'XY4567'])
     assert response.success?
     assert_equal WebgistixService::SUCCESS_MESSAGE, response.message
-    assert_equal '1Z8E5A380396682872', response.tracking_numbers['AB12345']
+    assert_equal ['1Z8E5A380396682872'], response.tracking_numbers['AB12345']
     assert_nil response.tracking_numbers['XY4567']
   end