lib/active_shipping/carriers/usps.rb in active_shipping-1.4.2 vs lib/active_shipping/carriers/usps.rb in active_shipping-1.4.3
- old
+ new
@@ -20,15 +20,13 @@
LIVE_DOMAIN = 'production.shippingapis.com'
LIVE_RESOURCE = 'ShippingAPI.dll'
TEST_DOMAINS = { # indexed by security; e.g. TEST_DOMAINS[USE_SSL[:rates]]
true => 'secure.shippingapis.com',
- false => 'testing.shippingapis.com'
+ false => 'stg-production.shippingapis.com'
}
- TEST_RESOURCE = 'ShippingAPITest.dll'
-
API_CODES = {
:us_rates => 'RateV4',
:world_rates => 'IntlRateV2',
:test => 'CarrierPickupAvailability',
:track => 'TrackV2'
@@ -682,11 +680,10 @@
end
def request_url(action, request, test)
scheme = USE_SSL[action] ? 'https://' : 'http://'
host = test ? TEST_DOMAINS[USE_SSL[action]] : LIVE_DOMAIN
- resource = test ? TEST_RESOURCE : LIVE_RESOURCE
- "#{scheme}#{host}/#{resource}?API=#{API_CODES[action]}&XML=#{URI.encode(request)}"
+ "#{scheme}#{host}/#{LIVE_RESOURCE}?API=#{API_CODES[action]}&XML=#{URI.encode(request)}"
end
def strip_zip(zip)
zip.to_s.scan(/\d{5}/).first || zip
end