active_shipping 0.1.3 → 0.1.4

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/active_shipping.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{active_shipping}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["James MacAulay", "Tobias Luetke", "Cody Fauser", "Jimmy Baker"]
-  s.date = %q{2010-03-30}
+  s.date = %q{2010-04-20}
   s.description = %q{Shipping API extension for Active Merchant.}
   s.email = %q{jmacaulay@gmail.com}
   s.extra_rdoc_files = [

data/lib/active_shipping/shipping/carriers/fedex.rb

@@ -446,8 +446,9 @@ module ActiveMerchant
           tracking_number = tracking_details.get_text('TrackingNumber').to_s
           
           destination_node = tracking_details.elements['DestinationAddress']
+          
           destination = Location.new(
-                :country =>     destination_node.get_text('CountryCode').to_s,
+                :country =>     destination_node.get_text('CountryCode').to_s.blank? ? 'US' : destination_node.get_text('CountryCode').to_s,
                 :province =>    destination_node.get_text('StateOrProvinceCode').to_s,
                 :city =>        destination_node.get_text('City').to_s
               )
@@ -457,7 +458,7 @@ module ActiveMerchant
               :city => event.elements['Address'].get_text('City').to_s,
               :state => event.elements['Address'].get_text('StateOrProvinceCode').to_s,
               :postal_code => event.elements['Address'].get_text('PostalCode').to_s,
-              :country => event.elements['Address'].get_text('CountryCode').to_s)
+              :country => event.elements['Address'].get_text('CountryCode').to_s.blank? ? 'US' : destination_node.get_text('CountryCode').to_s)
             description = event.get_text('EventDescription').to_s
             
             time = Time.parse(event.get_text('Timestamp').to_s)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - James MacAulay
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-30 00:00:00 -04:00
+date: 2010-04-20 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency