@@ -4,8 +4,10 @@ module ActiveMerchant module Shipping - # :login is your FedEx account number - # :password is your meter number + # :key is your developer API key + # :password is your API password + # :account is your FedEx account number + # :login is your meter number class FedEx < Carrier self.retry_safe = true @@ -83,7 +85,7 @@ module ActiveMerchant } def requirements - [:api_key, :api_password, :account_number, :meter_number] + [:key, :password, :account, :login] end def find_rates(origin, destination, packages, options = {}) @@ -186,14 +188,14 @@ module ActiveMerchant def build_request_header web_authentication_detail = XmlNode.new('WebAuthenticationDetail') do |wad| wad << XmlNode.new('UserCredential') do |uc| - uc << XmlNode.new('Key', @options[:api_key]) - uc << XmlNode.new('Password', @options[:api_password]) + uc << XmlNode.new('Key', @options[:key]) + uc << XmlNode.new('Password', @options[:password]) end end client_detail = XmlNode.new('ClientDetail') do |cd| - cd << XmlNode.new('AccountNumber', @options[:account_number]) - cd << XmlNode.new('MeterNumber', @options[:meter_number]) + cd << XmlNode.new('AccountNumber', @options[:account]) + cd << XmlNode.new('MeterNumber', @options[:login]) end trasaction_detail = XmlNode.new('TransactionDetail') do |td| lib/active_shipping/shipping/carriers/fedex.rb @@ -4,14 +4,14 @@ class FedExTest < Test::Unit::TestCase def setup @packages = TestFixtures.packages @locations = TestFixtures.locations - @carrier = FedEx.new(:api_key => '1111', :api_password => '2222', :account_number => '3333', :meter_number => '4444') + @carrier = FedEx.new(:key => '1111', :password => '2222', :account => '3333', :login => '4444') end def test_initialize_options_requirements assert_raises ArgumentError do FedEx.new end assert_raises ArgumentError do FedEx.new(:login => '999999999') end assert_raises ArgumentError do FedEx.new(:password => '7777777') end - assert_nothing_raised { FedEx.new(:api_key => '999999999', :api_password => '7777777', :account_number => '123', :meter_number => '123')} + assert_nothing_raised { FedEx.new(:key => '999999999', :password => '7777777', :account => '123', :login => '123')} end # def test_no_rates_response test/unit/carriers/fedex_test.rb b703837466eb1175473a867d0b1c24dc33e2d04c James MacAulay james@jadedpixel.com http://github.com/Shopify/active_shipping/commit/dfcd5d32750f0316c4523d4bcada229cdbbaf5fa dfcd5d32750f0316c4523d4bcada229cdbbaf5fa 2009-07-20T14:32:12-07:00 2009-07-20T14:32:12-07:00 normalize fedex credentials 03069ccbcd32f1fa89b9c7a0d76882d39bf344ed James MacAulay james@jadedpixel.com