Fix Location and USPS carrier to not expect an Array from country.cod…

…e because it now returns a CountryCode object directly
hashrocketeer · Dec 16, 2010 · d547685 · d547685
1 parent 9c9b3f4
commit d547685
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/active_shipping/shipping/carriers/usps.rb b/lib/active_shipping/shipping/carriers/usps.rb
@@ -242,7 +242,7 @@ def build_us_rate_request(packages, origin_zip, destination_zip, options={})
       # package.options[:mail_type] -- one of [:package, :postcard, :matter_for_the_blind, :envelope].
       #                                 Defaults to :package.
       def build_world_rate_request(packages, destination_country)
-        country = COUNTRY_NAME_CONVERSIONS[destination_country.code(:alpha2).first.value] || destination_country.name
+        country = COUNTRY_NAME_CONVERSIONS[destination_country.code(:alpha2).value] || destination_country.name
         request = XmlNode.new('IntlRateRequest', :USERID => @options[:login]) do |rate_request|
           packages.each_index do |id|
             p = packages[id]

diff --git a/lib/active_shipping/shipping/location.rb b/lib/active_shipping/shipping/location.rb
@@ -70,7 +70,7 @@ def self.from(object, options={})
       end
 
       def country_code(format = :alpha2)
-        @country.nil? ? nil : @country.code(format).first.value
+        @country.nil? ? nil : @country.code(format).value
       end
 
       def residential?; (@address_type == 'residential') end