active_shipping 0.9.9 → 0.9.10

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

@@ -79,6 +79,11 @@ module ActiveMerchant
        '-50000' => "Internal problem - Please contact Sell Online Help Desk"
       }
       
+      NON_ISO_COUNTRY_NAMES = {
+        'Russian Federation' => 'Russia'
+      }
+
+
       def requirements
         [:login]
       end
@@ -131,7 +136,7 @@ module ActiveMerchant
             #NOTE: These tags MUST be after line items
             request << XmlNode.new('city', destination.city)
             request << XmlNode.new('provOrState', destination.province)
-            request << XmlNode.new('country', destination.country)
+            request << XmlNode.new('country', handle_non_iso_country_names(destination.country))
             request << XmlNode.new('postalCode', destination.postal_code)
           end
         end
@@ -254,6 +259,10 @@ module ActiveMerchant
       def dollar_amount(cents)
         "%0.2f" % (cents / 100.0)
       end
+      
+      def handle_non_iso_country_names(country)
+        NON_ISO_COUNTRY_NAMES[country.to_s] || country
+      end
     end
   end
 end

data/lib/active_shipping/version.rb

@@ -1,3 +1,3 @@
 module ActiveShipping
-  VERSION = "0.9.9"
+  VERSION = "0.9.10"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_shipping
 version: !ruby/object:Gem::Version 
-  hash: 41
+  hash: 47
   prerelease: false
   segments: 
   - 0
   - 9
-  - 9
-  version: 0.9.9
+  - 10
+  version: 0.9.10
 platform: ruby
 authors: 
 - James MacAulay
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-24 00:00:00 -05:00
+date: 2011-03-09 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency