bcarpenter-active_shipping 0.0.2 → 0.0.5

data/CHANGELOG

@@ -1,3 +1,4 @@
+* Fixed bug that causes fedex tracking to crash on some tracking #s
 * Remove ftools for Rails 1.9 compatibility and remove xml logging, as logging is now included in the connection [cody]
 * Update connection code from ActiveMerchant [cody]
 * Fix space-ridden USPS usernames when validating credentials [james]

data/Rakefile

@@ -44,7 +44,7 @@ begin
     s.homepage = "http://github.com/bcarpenter/active_shipping"
     s.description = "Use for Fedex/UPS/USPS tracking and more... Originally from: http://github.com/Shopify/active_shipping"
     s.authors = ["Shopify"]
-    s.files =  FileList["[A-Z]*", "{lib,examples}/**/*", "Rakefile"]
+    s.files =  FileList["[A-Z]*", "{lib,examples}/**/*", "Rakefile"] - ["TODO.todo"]
     s.add_dependency 'activesupport'
   end
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.6

data/lib/active_shipping/shipping/location.rb

@@ -21,7 +21,7 @@ module ActiveMerchant #:nodoc:
       alias_method :region, :province
       
       def initialize(options = {})
-        @country = (options[:country].nil? or options[:country].is_a?(ActiveMerchant::Country)) ?
+        @country = (options[:country].nil? or options[:country] == '' or options[:country].is_a?(ActiveMerchant::Country)) ?
                       options[:country] :
                       ActiveMerchant::Country.find(options[:country])
         @postal_code = options[:postal_code] || options[:postal] || options[:zip]

data/test/remote/fedex_test.rb

@@ -6,7 +6,7 @@ class FedExTest < Test::Unit::TestCase
     @packages  = TestFixtures.packages
     @locations = TestFixtures.locations
     @carrier   = FedEx.new(fixtures(:fedex))
-    FedEx.logger = Logger.new('/Users/james/.active_merchant/fedex.log')
+    FedEx.logger = Logger.new(File.dirname(__FILE__) + '/../../log/fedex.log')
   end
     
   def test_us_to_canada

data/test/unit/carriers/fedex_test.rb

@@ -42,6 +42,12 @@ class FedExTest < Test::Unit::TestCase
     assert_equal response.shipment_events.map(&:time).sort, response.shipment_events.map(&:time)
   end
   
+  def test_find_tracking_info_handles_missing_locations
+    @carrier.expects(:commit).returns(xml_fixture('fedex/tracking_response_oc_missing_address_info'))
+    response = @carrier.find_tracking_info('077973360403984', :test => true)
+    assert response.shipment_events.any? {|e| e.location.to_s == ''}
+  end  
+  
   def test_building_request_and_parsing_response
     expected_request = xml_fixture('fedex/ottawa_to_beverly_hills_rate_request')
     mock_response = xml_fixture('fedex/ottawa_to_beverly_hills_rate_response')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bcarpenter-active_shipping
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.5
 platform: ruby
 authors: 
 - Shopify
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-22 00:00:00 -07:00
+date: 2009-09-23 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency