active_shipping 0.12.4 → 0.12.5

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

@@ -4,14 +4,14 @@ module ActiveMerchant
   module Shipping
     class Kunaki < Carrier
       self.retry_safe = true
-      
+
       cattr_reader :name
       @@name = "Kunaki"
-      
+
       URL = 'https://Kunaki.com/XMLService.ASP'
-                   
-      CARRIERS = [ "UPS", "USPS", "FedEx", "Royal Mail", "Parcelforce", "Pharos", "Eurotrux", "Canada Post", "DHL" ]
-      
+
+      CARRIERS = ["UPS", "USPS", "FedEx", "Royal Mail", "Parcelforce", "Pharos", "Eurotrux", "Canada Post", "DHL"]
+
       COUNTRIES = {
         'AR' => 'Argentina',
         'AU' => 'Australia',
@@ -65,30 +65,31 @@ module ActiveMerchant
         'RS' => 'Yugoslavia',
         'ME' => 'Yugoslavia'
       }
-                        
+
       def find_rates(origin, destination, packages, options = {})
         requires!(options, :items)
         commit(origin, destination, options)
       end
-      
+
       def valid_credentials?
         true
       end
-      
-      private      
+
+      private
+
       def build_request(destination, options)
         xml = Builder::XmlMarkup.new
         xml.instruct!
         xml.tag! 'ShippingOptions' do
           xml.tag! 'AddressInfo' do
             xml.tag! 'Country', COUNTRIES[destination.country_code]
-            
-            state = ['US', 'CA'].include?(destination.country_code.to_s) ? destination.state : ''
-            
+
+            state = %w(US CA).include?(destination.country_code.to_s) ? destination.state : ''
+
             xml.tag! 'State_Province', state
             xml.tag! 'PostalCode', destination.zip
           end
-        
+
           options[:items].each do |item|
             xml.tag! 'Product' do
               xml.tag! 'ProductId', item[:sku]
@@ -98,39 +99,39 @@ module ActiveMerchant
         end
         xml.target!
       end
-      
+
       def commit(origin, destination, options)
         request = build_request(destination, options)
-                
+
         response = parse( ssl_post(URL, request, "Content-Type" => "text/xml") )
-        
-        RateResponse.new(success?(response), message_from(response), response, 
-          :rates => build_rate_estimates(response, origin, destination)
+
+        RateResponse.new(success?(response), message_from(response), response,
+                         :rates => build_rate_estimates(response, origin, destination)
         )
       end
-      
+
       def build_rate_estimates(response, origin, destination)
         response["Options"].collect do |quote|
           RateEstimate.new(origin, destination, carrier_for(quote["Description"]), quote["Description"],
-            :total_price  => quote["Price"],
-            :currency     => "USD"
+                           :total_price  => quote["Price"],
+                           :currency     => "USD"
           )
         end
       end
-      
+
       def carrier_for(service)
-        CARRIERS.dup.find{ |carrier| service.to_s =~ /^#{carrier}/i } || service.to_s.split(" ").first
+        CARRIERS.dup.find { |carrier| service.to_s =~ /^#{carrier}/i } || service.to_s.split(" ").first
       end
-      
+
       def parse(xml)
         response = {}
         response["Options"] = []
-        
+
         document = REXML::Document.new(sanitize(xml))
-        
+
         response["ErrorCode"] = parse_child_text(document.root, "ErrorCode")
         response["ErrorText"] = parse_child_text(document.root, "ErrorText")
-             
+
         document.root.elements.each("Option") do |e|
           rate = {}
           rate["Description"] = parse_child_text(e, "Description")
@@ -139,27 +140,27 @@ module ActiveMerchant
         end
         response
       end
-      
+
       def sanitize(response)
         result = response.to_s
         result.gsub!("\r\n", "")
         result.gsub!(/<(\/)?(BODY|HTML)>/, '')
         result
       end
-      
+
       def parse_child_text(parent, name)
         if element = parent.elements[name]
           element.text
         end
       end
-      
+
       def success?(response)
         response["ErrorCode"] == "0"
       end
-      
+
       def message_from(response)
         response["ErrorText"]
       end
     end
   end
-end
+end

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

@@ -1,7 +1,6 @@
 module ActiveMerchant
   module Shipping
     class NewZealandPost < Carrier
-
       cattr_reader :name
       @@name = "New Zealand Post"
 
@@ -25,17 +24,16 @@ module ActiveMerchant
       end
 
       def self.default_location
-        Location.new({
+        Location.new(
           :country => "NZ",
           :city => "Wellington",
           :address1 => "22 Waterloo Quay",
           :address2 => "Pipitea",
           :postal_code => "6011"
-        })
+        )
       end
 
       class NewZealandPostRateResponse < RateResponse
-
         attr_reader :raw_responses
 
         def initialize(success, message, params = {}, options = {})
@@ -45,7 +43,6 @@ module ActiveMerchant
       end
 
       class RateRequest
-
         attr_reader :urls
         attr_writer :raw_responses
 
@@ -78,7 +75,7 @@ module ActiveMerchant
         protected
 
         def self.new_zealand?(location)
-          [ 'NZ', nil ].include?(Location.from(location).country_code)
+          ['NZ', nil].include?(Location.from(location).country_code)
         end
 
         def self.domestic?(locations)
@@ -113,7 +110,7 @@ module ActiveMerchant
         end
 
         def rates_hash
-          products_hash.select { |service, products| products.size == @packages.size }
+          products_hash.select { |_service, products| products.size == @packages.size }
         end
 
         def products_hash
@@ -142,14 +139,13 @@ module ActiveMerchant
         def params(package)
           @params.merge(api_params).merge(package.params)
         end
-
       end
 
       class Domestic < RateRequest
         def service_name(product)
-          [ product["service_group_description"], product["description"] ].join(" ")
+          [product["service_group_description"], product["description"]].join(" ")
         end
-        
+
         def api
           :domestic
         end
@@ -168,16 +164,15 @@ module ActiveMerchant
       end
 
       class International < RateRequest
-
         def rates
           raise "New Zealand Post packages must originate in New Zealand" unless new_zealand_origin?
           super
         end
 
         def service_name(product)
-          [ product["group"], product["name"] ].join(" ")
+          [product["group"], product["name"]].join(" ")
         end
-        
+
         def api
           :international
         end
@@ -185,14 +180,13 @@ module ActiveMerchant
         def api_params
           { :country_code => @destination.country_code }
         end
-        
+
         def price(product)
           product["price"].to_f
         end
       end
 
       class NewZealandPostPackage
-
         def initialize(package, api)
           @package = package
           @api = api
@@ -262,7 +256,6 @@ module ActiveMerchant
         def currency
           @package.currency || "NZD"
         end
-
       end
     end
   end

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

@@ -5,12 +5,12 @@ module ActiveMerchant
   module Shipping
     class Shipwire < Carrier
       self.retry_safe = true
-      
+
       cattr_reader :name
       @@name = "Shipwire"
-      
+
       URL = 'https://api.shipwire.com/exec/RateServices.php'
-      SCHEMA_URL = 'http://www.shipwire.com/exec/download/RateRequest.dtd'      
+      SCHEMA_URL = 'http://www.shipwire.com/exec/download/RateRequest.dtd'
       WAREHOUSES = { 'CHI' => 'Chicago',
                      'LAX' => 'Los Angeles',
                      'REN' => 'Reno',
@@ -18,46 +18,47 @@ module ActiveMerchant
                      'TOR' => 'Toronto',
                      'UK'  => 'United Kingdom'
                    }
-                   
-      CARRIERS = [ "UPS", "USPS", "FedEx", "Royal Mail", "Parcelforce", "Pharos", "Eurotrux", "Canada Post", "DHL" ]
-                   
+
+      CARRIERS = ["UPS", "USPS", "FedEx", "Royal Mail", "Parcelforce", "Pharos", "Eurotrux", "Canada Post", "DHL"]
+
       SUCCESS = "OK"
       SUCCESS_MESSAGE = "Successfully received the shipping rates"
       NO_RATES_MESSAGE = "No shipping rates could be found for the destination address"
       REQUIRED_OPTIONS = [:login, :password].freeze
-      
+
       def find_rates(origin, destination, packages, options = {})
         requires!(options, :items)
         commit(origin, destination, options)
       end
-      
+
       def valid_credentials?
         location = self.class.default_location
-        find_rates(location, location, Package.new(100, [5,15,30]),
-          :items => [ { :sku => '', :quantity => 1 } ]
+        find_rates(location, location, Package.new(100, [5, 15, 30]),
+                   :items => [{ :sku => '', :quantity => 1 }]
         )
       rescue ActiveMerchant::Shipping::ResponseError
         true
       rescue ActiveMerchant::ResponseError => e
         e.response.code != '401'
       end
-      
+
       private
+
       def requirements
         REQUIRED_OPTIONS
       end
-      
+
       def build_request(destination, options)
         xml = Builder::XmlMarkup.new
         xml.instruct!
         xml.declare! :DOCTYPE, :RateRequest, :SYSTEM, SCHEMA_URL
         xml.tag! 'RateRequest' do
           add_credentials(xml)
-          add_order(xml, destination, options) 
+          add_order(xml, destination, options)
         end
         xml.target!
       end
-      
+
       def add_credentials(xml)
         xml.tag! 'EmailAddress', @options[:login]
         xml.tag! 'Password', @options[:password]
@@ -91,8 +92,8 @@ module ActiveMerchant
           xml.tag! 'Zip', destination.zip  unless destination.zip.blank?
         end
       end
-      
-     # Code is limited to 12 characters
+
+      # Code is limited to 12 characters
       def add_item(xml, item, index)
         xml.tag! 'Item', :num => index do
           xml.tag! 'Code', item[:sku]
@@ -103,30 +104,30 @@ module ActiveMerchant
       def commit(origin, destination, options)
         request = build_request(destination, options)
         save_request(request)
-        
+
         response = parse( ssl_post(URL, "RateRequestXML=#{CGI.escape(request)}") )
-        
-        RateResponse.new(response["success"], response["message"], response, 
-          :xml     => response,
-          :rates   => build_rate_estimates(response, origin, destination),
-          :request => last_request
+
+        RateResponse.new(response["success"], response["message"], response,
+                         :xml     => response,
+                         :rates   => build_rate_estimates(response, origin, destination),
+                         :request => last_request
         )
       end
-      
+
       def build_rate_estimates(response, origin, destination)
         response["rates"].collect do |quote|
           RateEstimate.new(origin, destination, carrier_for(quote["service"]), quote["service"],
-            :service_code    => quote["method"],
-            :total_price     => quote["cost"],
-            :currency        => quote["currency"],
-            :delivery_range  => [ timestamp_from_business_day(quote["delivery_min"]),
-                                  timestamp_from_business_day(quote["delivery_max"]) ]
+                           :service_code    => quote["method"],
+                           :total_price     => quote["cost"],
+                           :currency        => quote["currency"],
+                           :delivery_range  => [timestamp_from_business_day(quote["delivery_min"]),
+                                                timestamp_from_business_day(quote["delivery_max"])]
           )
         end
       end
-      
+
       def carrier_for(service)
-        CARRIERS.dup.find{ |carrier| service.to_s =~ /^#{carrier}/i } || service.to_s.split(" ").first
+        CARRIERS.dup.find { |carrier| service.to_s =~ /^#{carrier}/i } || service.to_s.split(" ").first
       end
 
       def parse(xml)
@@ -134,9 +135,9 @@ module ActiveMerchant
         response["rates"] = []
 
         document = REXML::Document.new(xml)
-    
+
         response["status"] = parse_child_text(document.root, "Status")
-             
+
         document.root.elements.each("Order/Quotes/Quote") do |e|
           rate = {}
           rate["method"]    = e.attributes["method"]
@@ -161,18 +162,18 @@ module ActiveMerchant
           response["success"] = false
           response["message"] = parse_child_text(document.root, "ErrorMessage")
         end
-        
+
         response
       rescue NoMethodError => e
         raise ActiveMerchant::Shipping::ResponseContentError.new(e, xml)
       end
-      
+
       def parse_child_text(parent, name)
         if element = parent.elements[name]
           element.text
         end
       end
-      
+
       def parse_child_attribute(parent, name, attribute)
         if element = parent.elements[name]
           element.attributes[attribute]

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

@@ -3,7 +3,6 @@ require 'builder'
 
 module ActiveMerchant
   module Shipping
-
     # Stamps.com integration for rating, tracking, address validation, and label generation
     # Integration ID can be requested from Stamps.com
 
@@ -15,6 +14,7 @@ module ActiveMerchant
 
       attr_reader :last_swsim_method
 
+      # TODO: Update to latest API. Documentation for the latest WSDL version is available here: http://support.stamps.com/outgoing/swsimv39doc.zip
       LIVE_URL = 'https://swsim.stamps.com/swsim/swsimv34.asmx'
       TEST_URL = 'https://swsim.testing.stamps.com/swsim/swsimv34.asmx'
       NAMESPACE = 'http://stamps.com/xml/namespace/2014/01/swsim/swsimv34'
@@ -22,25 +22,25 @@ module ActiveMerchant
       REQUIRED_OPTIONS = [:integration_id, :username, :password].freeze
 
       PACKAGE = [
-                 'Postcard',
-                 'Letter',
-                 'Large Envelope or Flat',
-                 'Thick Envelope',
-                 'Package',
-                 'Flat Rate Box',
-                 'Small Flat Rate Box',
-                 'Large Flat Rate Box',
-                 'Flat Rate Envelope',
-                 'Flat Rate Padded Envelope',
-                 'Large Package',
-                 'Oversized Package',
-                 'Regional Rate Box A',
-                 'Regional Rate Box B',
-                 'Regional Rate Box C',
-                 'Legal Flat Rate Envelope'
-                ].freeze
-
-      US_POSSESSIONS = ["AS", "FM", "GU", "MH", "MP", "PW", "PR", "VI"]
+        'Postcard',
+        'Letter',
+        'Large Envelope or Flat',
+        'Thick Envelope',
+        'Package',
+        'Flat Rate Box',
+        'Small Flat Rate Box',
+        'Large Flat Rate Box',
+        'Flat Rate Envelope',
+        'Flat Rate Padded Envelope',
+        'Large Package',
+        'Oversized Package',
+        'Regional Rate Box A',
+        'Regional Rate Box B',
+        'Regional Rate Box C',
+        'Legal Flat Rate Envelope'
+      ].freeze
+
+      US_POSSESSIONS = %w(AS FM GU MH MP PW PR VI)
 
       SERVICE_TYPES = {
         'US-FC'  => 'USPS First-Class Mail',
@@ -131,57 +131,46 @@ module ActiveMerchant
         'EnvelopeGreeting'
       ]
 
-      IMAGE_TYPE = [
-        'Auto',
-        'Epl',
-        'Gif',
-        'Jpg',
-        'Pdf',
-        'Png',
-        'Zpl'
-      ]
+      IMAGE_TYPE = %w(Auto Epl Gif Jpg Pdf Png Zpl)
 
       def account_info
         request = build_get_account_info_request
-        response = commit(:GetAccountInfo, request)
+        commit(:GetAccountInfo, request)
       end
 
       def purchase_postage(purchase_amount, control_total)
         request = build_purchase_postage_request(purchase_amount, control_total)
-        response = commit(:PurchasePostage, request)
+        commit(:PurchasePostage, request)
       end
 
       def purchase_status(transaction_id)
         request = build_get_purchase_status(transaction_id)
-        response = commit(:GetPurchaseStatus, request)
+        commit(:GetPurchaseStatus, request)
       end
 
       def validate_address(address, options = {})
         address = standardize_address(address)
-
         request = build_cleanse_address_request(address)
-        response = commit(:CleanseAddress, request)
+        commit(:CleanseAddress, request)
       end
 
       def find_rates(origin, destination, package, options = {})
         origin = standardize_address(origin)
         destination = standardize_address(destination)
-
         request = build_rate_request(origin, destination, package, options)
-        response = commit(:GetRates, request)
+        commit(:GetRates, request)
       end
 
       def create_shipment(origin, destination, package, line_items = [], options = {})
         origin = standardize_address(origin)
         destination = standardize_address(destination)
-
         request = build_create_indicium_request(origin, destination, package, line_items, options)
-        response = commit(:CreateIndicium, request)
+        commit(:CreateIndicium, request)
       end
 
       def find_tracking_info(shipment_id, options = {})
         request = build_track_shipment_request(shipment_id, options)
-        response = commit(:TrackShipment, request)
+        commit(:TrackShipment, request)
       end
 
       def namespace
@@ -234,18 +223,18 @@ module ActiveMerchant
 
       def get_authenticator
         request = build_authenticate_user_request
-        response = commit(:AuthenticateUser, request)
+        commit(:AuthenticateUser, request)
       end
 
       def build_header
         xml = Builder::XmlMarkup.new
         xml.instruct!
-        xml.soap(:Envelope, {
-                   'xmlns:soap' => 'http://schemas.xmlsoap.org/soap/envelope/',
-                   'xmlns:xsi'  => 'http://www.w3.org/2001/XMLSchema-instance',
-                   'xmlns:xsd'  => 'http://www.w3.org/2001/XMLSchema',
-                   'xmlns:tns'  => 'http://stamps.com/xml/namespace/2014/01/swsim/swsimv34'
-                 }) do
+        xml.soap(:Envelope,
+                 'xmlns:soap' => 'http://schemas.xmlsoap.org/soap/envelope/',
+                 'xmlns:xsi'  => 'http://www.w3.org/2001/XMLSchema-instance',
+                 'xmlns:xsd'  => 'http://www.w3.org/2001/XMLSchema',
+                 'xmlns:tns'  => 'http://stamps.com/xml/namespace/2014/01/swsim/swsimv34'
+                 ) do
           xml.soap :Body do
             yield(xml)
           end
@@ -361,7 +350,7 @@ module ActiveMerchant
 
           xml.tns(:NonMachinable,     true) unless machinable
 
-          xml.tns(:RectangularShaped, ! package.cylinder?)
+          xml.tns(:RectangularShaped, !package.cylinder?)
           xml.tns(:GEMNotes,          options[:gem_notes]) unless options[:gem_notes].blank?
 
           add_ons = Array(options[:add_ons])
@@ -684,7 +673,7 @@ module ActiveMerchant
           add_on_details[:missing_data] = add_on.get_text('MissingData').to_s if add_on.get_text('MissingData')
           add_on_details[:amount]       = add_on.get_text('Amount').to_s if add_on.get_text('Amount')
 
-          prohibited_with = add_on.get_elements('ProhibitedWithAnyOf/AddOnTypeV5').map { |p| p.text }
+          prohibited_with = add_on.get_elements('ProhibitedWithAnyOf/AddOnTypeV5').map(&:text)
           add_on_details[:prohibited_with] = prohibited_with unless prohibited_with.empty?
 
           add_ons[add_on_type] = add_on_details
@@ -696,7 +685,7 @@ module ActiveMerchant
       def parse_package(rate)
         weight = rate.get_text('WeightOz').to_s.to_f
 
-        dimensions = ['Length', 'Width', 'Height'].map do |dim|
+        dimensions = %w(Length Width Height).map do |dim|
           rate.get_text(dim) ? rate.get_text(dim).to_s.to_f : nil
         end
         dimensions.compact!
@@ -840,7 +829,7 @@ module ActiveMerchant
     class StampsRateEstimate < RateEstimate
       attr_reader :add_ons
 
-      def initialize(origin, destination, carrier, service_name, options={})
+      def initialize(origin, destination, carrier, service_name, options = {})
         super
         @add_ons = options[:add_ons]
       end
@@ -851,7 +840,6 @@ module ActiveMerchant
     end
 
     class StampsShippingResponse < ShippingResponse
-
       include PostsData
 
       self.ssl_version = :SSLv3