active_shipping 0.12.4 → 0.12.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f283611b274ba965863f5320de5a30dda94bffc9
-  data.tar.gz: e770521d4940a107e28fe80ffdf4ce2b1c2f5838
+  metadata.gz: 1976e71d35364954a7b796b394000fa996d3e0b1
+  data.tar.gz: 0c143eefaaf19b10cfaba63e01110164024b3bae
 SHA512:
-  metadata.gz: 20b52260419ce6a9ffcd2b67229af8303430bedb36fdabb21126cfb3b4dcb48df65868c7a4e3380947b8087b16ff790e102b5c7f7dbcd6afe920105701903d72
-  data.tar.gz: 0546189f408a9b687b584d90600cf20c420f68cc2e9cd381180ad4794be44ee322ea338424b4f38c5fca11489560dda22f0da5be1fa1e0c19006b05a1b8b8db0
+  metadata.gz: 312abbbb1fd246d4f6221cbf4fa7f70101465d118ff18bc2c588be8f276904e90ee9a9666d90b745a3d29c6abe1cc615230f188e7a6acb759374977a88ce2838
+  data.tar.gz: db9d8dccf1c806d521188f99fff5b72eb7704da60359bb4239fa293e21be21e646373a0d42fd5df901b597e224bcb5ccd7d7a0c617607c2375242456df1a8843

data/lib/active_shipping.rb

@@ -25,7 +25,7 @@ $:.unshift File.dirname(__FILE__)
 
 begin
   require 'active_support/all'
-rescue LoadError => e
+rescue LoadError
   require 'rubygems'
   gem "activesupport", ">= 2.3.5"
   require "active_support/all"
@@ -42,6 +42,7 @@ require 'active_shipping/shipping/response'
 require 'active_shipping/shipping/rate_response'
 require 'active_shipping/shipping/tracking_response'
 require 'active_shipping/shipping/shipping_response'
+require 'active_shipping/shipping/label_response'
 require 'active_shipping/shipping/package'
 require 'active_shipping/shipping/location'
 require 'active_shipping/shipping/rate_estimate'

data/lib/active_shipping/shipping/base.rb

@@ -3,9 +3,9 @@ module ActiveMerchant
     module Base
       mattr_accessor :mode
       self.mode = :production
-      
+
       def self.carrier(name)
-        ActiveMerchant::Shipping::Carriers.all.find {|c| c.name.downcase == name.to_s.downcase} ||
+        ActiveMerchant::Shipping::Carriers.all.find { |c| c.name.downcase == name.to_s.downcase } ||
           raise(NameError, "unknown carrier #{name}")
       end
     end

data/lib/active_shipping/shipping/carrier.rb

@@ -1,18 +1,17 @@
 module ActiveMerchant
   module Shipping
     class Carrier
-      
       include RequiresParameters
       include PostsData
       include Quantified
-      
+
       attr_reader :last_request
       attr_accessor :test_mode
       alias_method :test_mode?, :test_mode
-      
+
       # Credentials should be in options hash under keys :login, :password and/or :key.
       def initialize(options = {})
-        requirements.each {|key| requires!(options, key)}
+        requirements.each { |key| requires!(options, key) }
         @options = options
         @last_request = nil
         @test_mode = @options[:test]
@@ -22,33 +21,37 @@ module ActiveMerchant
       def requirements
         []
       end
-      
+
       # Override with whatever you need to get the rates
       def find_rates(origin, destination, packages, options = {})
       end
-      
+
+      # Override with whatever you need to get a shipping label
+      def create_shipment(origin, destination, packages, options = {})
+      end
+
       # Validate credentials with a call to the API. By default this just does a find_rates call
       # with the orgin and destination both as the carrier's default_location. Override to provide
       # alternate functionality, such as checking for test_mode to use test servers, etc.
       def valid_credentials?
         location = self.class.default_location
-        find_rates(location,location,Package.new(100, [5,15,30]), :test => test_mode)
+        find_rates(location, location, Package.new(100, [5, 15, 30]), :test => test_mode)
       rescue ActiveMerchant::Shipping::ResponseError
         false
       else
         true
       end
-      
+
       def maximum_weight
         Mass.new(150, :pounds)
       end
-      
+
       protected
-      
+
       def node_text_or_nil(xml_node)
         xml_node ? xml_node.text : nil
       end
-      
+
       # Override in subclasses for non-U.S.-based carriers.
       def self.default_location
         Location.new( :country => 'US',
@@ -60,7 +63,7 @@ module ActiveMerchant
                       :phone => '1-310-285-1013',
                       :fax => '1-310-275-8159')
       end
-      
+
       # Use after building the request to save for later inspection. Probably won't ever be overridden.
       def save_request(r)
         @last_request = r
@@ -72,7 +75,7 @@ module ActiveMerchant
         days.times do
           begin
             date = date + 1
-          end until ![0,6].include?(date.wday)
+          end while [0, 6].include?(date.wday)
         end
         date
       end

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

@@ -7,7 +7,7 @@ module ActiveMerchant
     class BenchmarkCarrier < Carrier
       cattr_reader :name
       @@name = "Benchmark Carrier"
-      
+
       def find_rates(origin, destination, packages, options = {})
         origin = Location.from(origin)
         destination = Location.from(destination)
@@ -18,17 +18,16 @@ module ActiveMerchant
         bogus_estimate = RateEstimate.new(
           origin, destination, @@name,
           "Free Benchmark Shipping", :total_price => 0, :currency => 'USD',
-          :packages => packages, :delivery_range => [Time.now.utc.strftime("%Y-%d-%m"), Time.now.utc.strftime("%Y-%d-%m")]
+                                     :packages => packages, :delivery_range => [Time.now.utc.strftime("%Y-%d-%m"), Time.now.utc.strftime("%Y-%d-%m")]
           )
         RateResponse.new(true, "Success (delayed #{delay_time} seconds)", {:rate => 'free'}, :rates => [bogus_estimate], :xml => "<rate>free</rate>")
       end
-      
+
       private
 
       def generate_simulated_lag(max_delay = 30)
         sleep Random.rand * max_delay
       end
-
     end
   end
 end

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

@@ -3,14 +3,12 @@ module ActiveMerchant
     class BogusCarrier < Carrier
       cattr_reader :name
       @@name = "Bogus Carrier"
-      
-      
+
       def find_rates(origin, destination, packages, options = {})
         origin = Location.from(origin)
         destination = Location.from(destination)
         packages = Array(packages)
       end
-      
     end
   end
 end

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

@@ -2,37 +2,32 @@ require 'cgi'
 
 module ActiveMerchant
   module Shipping
-    
     class CanadaPost < Carrier
-      
       # NOTE!
       # A Merchant CPC Id must be assigned to you by Canada Post
       # CPC_DEMO_XML is just a public domain account for testing
-      
+
       class CanadaPostRateResponse < RateResponse
-        
         attr_reader :boxes, :postal_outlets
-        
+
         def initialize(success, message, params = {}, options = {})
           @boxes = options[:boxes]
           @postal_outlets = options[:postal_outlets]
           super
         end
-        
       end
-      
+
       cattr_reader :name, :name_french
       @@name = "Canada Post"
       @@name_french = "Postes Canada"
-      
+
       Box = Struct.new(:name, :weight, :expediter_weight, :length, :width, :height, :packedItems)
       PackedItem = Struct.new(:quantity, :description)
       PostalOutlet = Struct.new(:sequence_no, :distance, :name, :business_name, :postal_address, :business_hours)
-      
-      DEFAULT_TURN_AROUND_TIME = 24
+
       URL = "http://sellonline.canadapost.ca:30000"
-      DOCTYPE = '<!DOCTYPE eparcel SYSTEM "http://sellonline.canadapost.ca/DevelopersResources/protocolV3/eParcel.dtd">'      
-      
+      DOCTYPE = '<!DOCTYPE eparcel SYSTEM "http://sellonline.canadapost.ca/DevelopersResources/protocolV3/eParcel.dtd">'
+
       RESPONSE_CODES = {
        '1'     =>	"All calculation was done",
        '2'     =>	"Default shipping rates are returned due to a problem during the processing of the request.",
@@ -78,25 +73,24 @@ module ActiveMerchant
        '-6002' => "Unable to write to the database",
        '-50000' => "Internal problem - Please contact Sell Online Help Desk"
       }
-      
+
       NON_ISO_COUNTRY_NAMES = {
         'Russian Federation' => 'Russia'
       }
 
-
       def requirements
         [:login]
       end
-      
+
       def find_rates(origin, destination, line_items = [], options = {})
         rate_request = build_rate_request(origin, destination, line_items, options)
         commit(rate_request, origin, destination, options)
       end
-      
+
       def maximum_weight
         Mass.new(30, :kilograms)
       end
-      
+
       def self.default_location
         {
           :country     => 'CA',
@@ -108,15 +102,15 @@ module ActiveMerchant
       end
 
       protected
-      
+
       def commit(request, origin, destination, options = {})
-        response = parse_rate_response(ssl_post(URL, request), origin, destination, options)
+        parse_rate_response(ssl_post(URL, request), origin, destination, options)
       end
-      
+
       private
-      
+
       def build_rate_request(origin, destination, line_items = [], options = {})
-        line_items = [line_items] if !line_items.is_a?(Array)
+        line_items = [line_items] unless line_items.is_a?(Array)
         origin = origin.is_a?(Location) ? origin : Location.new(origin)
         destination = destination.is_a?(Location) ? destination : Location.new(destination)
 
@@ -126,14 +120,14 @@ module ActiveMerchant
 
             request << XmlNode.new('merchantCPCID', @options[:login])
             request << XmlNode.new('fromPostalCode', origin.postal_code)
-            request << XmlNode.new('turnAroundTime', options[:turn_around_time] ? options[:turn_around_time] : DEFAULT_TURN_AROUND_TIME)
+            request << XmlNode.new('turnAroundTime', options[:turn_around_time]) if options[:turn_around_time]
             request << XmlNode.new('itemsPrice', dollar_amount(line_items.map(&:value).compact.sum))
 
-            #line items
+            # line items
             request << build_line_items(line_items)
 
-            #delivery info
-            #NOTE: These tags MUST be after line items
+            # delivery info
+            # NOTE: These tags MUST be after line items
             request << XmlNode.new('city', destination.city)
             request << XmlNode.new('provOrState', destination.province)
             request << XmlNode.new('country', handle_non_iso_country_names(destination.country))
@@ -157,11 +151,11 @@ module ActiveMerchant
             service_code = product.attribute('id').to_s
 
             rate_estimates << RateEstimate.new(origin, destination, @@name, service_name,
-              :service_code => service_code,
-              :total_price => product.get_text('rate').to_s,
-              :currency => 'CAD',
-              :shipping_date => product.get_text('shippingDate').to_s,
-              :delivery_range => [product.get_text('deliveryDate').to_s] * 2
+                                               :service_code => service_code,
+                                               :total_price => product.get_text('rate').to_s,
+                                               :currency => 'CAD',
+                                               :shipping_date => product.get_text('shippingDate').to_s,
+                                               :delivery_range => [product.get_text('deliveryDate').to_s] * 2
             )
           end
 
@@ -190,14 +184,14 @@ module ActiveMerchant
             postal_outlet.name           = outlet.get_text('outletName').to_s
             postal_outlet.business_name  = outlet.get_text('businessName').to_s
 
-            postal_outlet.postal_address = Location.new({
+            postal_outlet.postal_address = Location.new(
               :address1     => outlet.get_text('postalAddress/addressLine').to_s,
               :postal_code  => outlet.get_text('postalAddress/postal_code').to_s,
               :city         => outlet.get_text('postalAddress/municipality').to_s,
               :province     => outlet.get_text('postalAddress/province').to_s,
               :country      => 'Canada',
               :phone_number => outlet.get_text('phoneNumber').to_s
-            })
+            )
 
             postal_outlet.business_hours = outlet.elements.collect('businessHours') do |hour|
               { :day_of_week => hour.get_text('dayOfWeek').to_s, :time => hour.get_text('time').to_s }
@@ -216,7 +210,7 @@ module ActiveMerchant
         value = xml.get_text('eparcel/ratesAndServicesResponse/statusCode').to_s
         value == '1' || value == '2'
       end
-      
+
       def response_message(xml)
         if response_success?(xml)
           xml.get_text('eparcel/ratesAndServicesResponse/statusMessage').to_s
@@ -224,7 +218,7 @@ module ActiveMerchant
           xml.get_text('eparcel/error/statusMessage').to_s
         end
       end
-      
+
       # <!-- List of items in the shopping    -->
       # <!-- cart                             -->
       # <!-- Each item is defined by :        -->
@@ -233,12 +227,10 @@ module ActiveMerchant
       # <!--   - weight      (mandatory)      -->
       # <!--   - description (mandatory)      -->
       # <!--   - ready to ship (optional)     -->
-      
+
       def build_line_items(line_items)
-        xml_line_items = XmlNode.new('lineItems') do |line_items_node|
-          
+        XmlNode.new('lineItems') do |line_items_node|
           line_items.each do |line_item|
-            
             line_items_node << XmlNode.new('item') do |item|
               item << XmlNode.new('quantity', 1)
               item << XmlNode.new('weight', line_item.kilograms)
@@ -247,19 +239,16 @@ module ActiveMerchant
               item << XmlNode.new('height', line_item.cm(:height).to_s)
               item << XmlNode.new('description', line_item.options[:description] || ' ')
               item << XmlNode.new('readyToShip', line_item.options[:ready_to_ship] || nil)
-              
               # By setting the 'readyToShip' tag to true, Sell Online will not pack this item in the boxes defined in the merchant profile.
             end
           end
         end
-        
-        xml_line_items
       end
-      
+
       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

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

@@ -2,7 +2,6 @@ require 'cgi'
 
 module ActiveMerchant
   module Shipping
-          
     class CanadaPostPWS < Carrier
       @@name = "Canada Post PWS"
 
@@ -38,14 +37,14 @@ module ActiveMerchant
       RATE_MIMETYPE = "application/vnd.cpc.ship.rate+xml"
       TRACK_MIMETYPE = "application/vnd.cpc.track+xml"
       REGISTER_MIMETYPE = "application/vnd.cpc.registration+xml"
-      
+
       LANGUAGE = {
         'en' => 'en-CA',
         'fr' => 'fr-CA'
       }
-      
-      SHIPPING_OPTIONS = [:d2po, :d2po_office_id, :cov, :cov_amount, :cod, :cod_amount, :cod_includes_shipping, 
-                          :cod_method_of_payment, :so, :dc, :dns, :pa18, :pa19, :hfp, :lad, 
+
+      SHIPPING_OPTIONS = [:d2po, :d2po_office_id, :cov, :cov_amount, :cod, :cod_amount, :cod_includes_shipping,
+                          :cod_method_of_payment, :so, :dc, :dns, :pa18, :pa19, :hfp, :lad,
                           :rase, :rts, :aban]
 
       RATES_OPTIONS = [:cov, :cov_amount, :cod, :so, :dc, :dns, :pa18, :pa19, :hfp, :lad]
@@ -61,11 +60,11 @@ module ActiveMerchant
         @customer_number = options[:customer_number]
         super(options)
       end
-      
+
       def requirements
         [:api_key, :secret]
       end
-      
+
       def find_rates(origin, destination, line_items = [], options = {}, package = nil, services = [])
         url = endpoint + "rs/ship/price"
         request  = build_rates_request(origin, destination, line_items, options, package, services)
@@ -74,7 +73,7 @@ module ActiveMerchant
       rescue ActiveMerchant::ResponseError, ActiveMerchant::Shipping::ResponseError => e
         error_response(e.response.body, CPPWSRateResponse)
       end
-      
+
       def find_tracking_info(pin, options = {})
         response = ssl_get(tracking_url(pin), headers(options, TRACK_MIMETYPE))
         parse_tracking_response(response)
@@ -82,12 +81,12 @@ module ActiveMerchant
         if e.response
           error_response(e.response.body, CPPWSTrackingResponse)
         else
-          CPPWSTrackingResponse.new(false, e.message, {}, {:carrier => @@name})
+          CPPWSTrackingResponse.new(false, e.message, {}, :carrier => @@name)
         end
-      rescue InvalidPinFormatError => e
-        CPPWSTrackingResponse.new(false, "Invalid Pin Format", {}, {:carrier => @@name})
+      rescue InvalidPinFormatError
+        CPPWSTrackingResponse.new(false, "Invalid Pin Format", {}, :carrier => @@name)
       end
-      
+
       # line_items should be a list of PackageItem's
       def create_shipment(origin, destination, package, line_items = [], options = {})
         request_body = build_shipment_request(origin, destination, package, line_items, options)
@@ -95,20 +94,20 @@ module ActiveMerchant
         parse_shipment_response(response)
       rescue ActiveMerchant::ResponseError, ActiveMerchant::Shipping::ResponseError => e
         error_response(e.response.body, CPPWSShippingResponse)
-      rescue MissingCustomerNumberError => e
-        CPPWSShippingResponse.new(false, "Missing Customer Number", {}, {:carrier => @@name})
+      rescue MissingCustomerNumberError
+        CPPWSShippingResponse.new(false, "Missing Customer Number", {}, :carrier => @@name)
       end
 
       def retrieve_shipment(shipping_id, options = {})
         response = ssl_post(shipment_url(shipping_id, options), nil, headers(options, SHIPMENT_MIMETYPE, SHIPMENT_MIMETYPE))
-        shipping_response = parse_shipment_response(response)
+        parse_shipment_response(response)
       end
 
       def find_shipment_receipt(shipping_id, options = {})
         response = ssl_get(shipment_receipt_url(shipping_id, options), headers(options, SHIPMENT_MIMETYPE, SHIPMENT_MIMETYPE))
-        shipping_response = parse_shipment_receipt_response(response)
+        parse_shipment_receipt_response(response)
       end
-      
+
       def retrieve_shipping_label(shipping_response, options = {})
         raise MissingShippingNumberError unless shipping_response && shipping_response.shipping_id
         ssl_get(shipping_response.label_url, headers(options, "application/pdf"))
@@ -116,7 +115,7 @@ module ActiveMerchant
 
       def register_merchant(options = {})
         url = endpoint + "ot/token"
-        response = ssl_post(url, nil, headers({}, REGISTER_MIMETYPE, REGISTER_MIMETYPE).merge({"Content-Length" => "0"}))
+        response = ssl_post(url, nil, headers({}, REGISTER_MIMETYPE, REGISTER_MIMETYPE).merge("Content-Length" => "0"))
         parse_register_token_response(response)
       rescue ActiveMerchant::ResponseError, ActiveMerchant::Shipping::ResponseError => e
         error_response(e.response.body, CPPWSRegisterResponse)
@@ -154,7 +153,7 @@ module ActiveMerchant
       rescue ActiveMerchant::ResponseError, ActiveMerchant::Shipping::ResponseError => e
         error_response(e.response.body, CPPWSRateResponse)
       end
-      
+
       def maximum_weight
         Mass.new(MAX_WEIGHT, :kilograms)
       end
@@ -163,8 +162,8 @@ module ActiveMerchant
 
       def parse_services_response(response)
         doc = REXML::Document.new(REXML::Text::unnormalize(response))
-        service_nodes = doc.elements['services'].elements.collect('service') {|node| node }
-        services = service_nodes.inject({}) do |result, node|
+        service_nodes = doc.elements['services'].elements.collect('service') { |node| node }
+        service_nodes.inject({}) do |result, node|
           service_code = node.get_text("service-code").to_s
           service_name = node.get_text("service-name").to_s
           service_link = node.elements["link"].attributes['href']
@@ -176,7 +175,6 @@ module ActiveMerchant
           }
           result
         end
-        services
       end
 
       def parse_service_options_response(response)
@@ -186,7 +184,7 @@ module ActiveMerchant
         service_name = service_node.get_text("service-name").to_s
         options_node = service_node.elements['options']
         unless options_node.blank?
-          option_nodes = options_node.elements.collect('option') {|node| node}
+          option_nodes = options_node.elements.collect('option') { |node| node }
           options = option_nodes.inject([]) do |result, node|
             option = {
               :code => node.get_text("option-code").to_s,
@@ -209,7 +207,7 @@ module ActiveMerchant
           :min_height => dimensions_node.elements["height"].attributes['min'].to_f,
           :max_height => dimensions_node.elements["height"].attributes['max'].to_f,
           :min_width => dimensions_node.elements["width"].attributes['min'].to_f,
-          :max_width => dimensions_node.elements["width"].attributes['max'].to_f,
+          :max_width => dimensions_node.elements["width"].attributes['max'].to_f
         }
 
         {
@@ -223,8 +221,8 @@ module ActiveMerchant
       def parse_option_response(response)
         doc = REXML::Document.new(REXML::Text::unnormalize(response))
         option_node = doc.elements['option']
-        conflicts = option_node.elements['conflicting-options'].elements.collect('option-code') {|node| node.get_text.to_s} unless option_node.elements['conflicting-options'].blank?
-        prereqs = option_node.elements['prerequisite-options'].elements.collect('option-code') {|node| node.get_text.to_s} unless option_node.elements['prerequisite-options'].blank?
+        conflicts = option_node.elements['conflicting-options'].elements.collect('option-code') { |node| node.get_text.to_s } unless option_node.elements['conflicting-options'].blank?
+        prereqs = option_node.elements['prerequisite-options'].elements.collect('option-code') { |node| node.get_text.to_s } unless option_node.elements['prerequisite-options'].blank?
         option = {
           :code => option_node.get_text('option-code').to_s,
           :name => option_node.get_text('option-name').to_s,
@@ -262,7 +260,7 @@ module ActiveMerchant
         doc = REXML::Document.new(REXML::Text::unnormalize(response))
         raise ActiveMerchant::Shipping::ResponseError, "No Quotes" unless doc.elements['price-quotes']
 
-        quotes = doc.elements['price-quotes'].elements.collect('price-quote') {|node| node }
+        quotes = doc.elements['price-quotes'].elements.collect('price-quote') { |node| node }
         rates = quotes.map do |node|
           service_name  = node.get_text("service-name").to_s
           service_code  = node.get_text("service-code").to_s
@@ -279,14 +277,13 @@ module ActiveMerchant
         CPPWSRateResponse.new(true, "", {}, :rates => rates)
       end
 
-
       # tracking
-      
+
       def parse_tracking_response(response)
         doc = REXML::Document.new(REXML::Text::unnormalize(response))
         raise ActiveMerchant::Shipping::ResponseError, "No Tracking" unless root_node = doc.elements['tracking-detail']
 
-        events = root_node.elements['significant-events'].elements.collect('occurrence') {|node| node }
+        events = root_node.elements['significant-events'].elements.collect('occurrence') { |node| node }
 
         shipment_events  = build_tracking_events(events)
         change_date      = root_node.get_text('changed-expected-date').to_s
@@ -307,7 +304,7 @@ module ActiveMerchant
           :destination             => destination,
           :customer_number         => root_node.get_text('mailed-by-customer-number').to_s
         }
-        
+
         CPPWSTrackingResponse.new(true, "", {}, options)
       end
 
@@ -320,12 +317,11 @@ module ActiveMerchant
           time      = Time.utc(timestamp.utc.year, timestamp.utc.month, timestamp.utc.day, timestamp.utc.hour, timestamp.utc.min, timestamp.utc.sec)
           message   = event.get_text('event-description').to_s
           location  = [event.get_text('event-retail-name'), event.get_text('event-site'), event.get_text('event-province')].compact.join(", ")
-          name      = event.get_text('event-identifier').to_s          
+          name      = event.get_text('event-identifier').to_s
           ShipmentEvent.new(name, time, location, message)
         end
       end
 
-
       # shipping
 
       # options
@@ -334,7 +330,7 @@ module ActiveMerchant
       # :packing_instructions
       # :show_postage_rate
       # :cod, :cod_amount, :insurance, :insurance_amount, :signature_required, :pa18, :pa19, :hfp, :dns, :lad
-      # 
+      #
       def build_shipment_request(origin, destination, package, line_items = [], options = {})
         origin = sanitize_location(origin)
         destination = sanitize_location(destination)
@@ -368,11 +364,10 @@ module ActiveMerchant
           node << XmlNode.new('contact-phone', location.phone)
           node << XmlNode.new('address-details') do |innernode|
             innernode << XmlNode.new('address-line-1', location.address1)
-            address2 = [location.address2, location.address3].reject(&:blank?).join(", ")
-            innernode << XmlNode.new('address-line-2', address2) unless address2.blank?
+            innernode << XmlNode.new('address-line-2', location.address2_and_3) unless location.address2_and_3.blank?
             innernode << XmlNode.new('city', location.city)
-            innernode << XmlNode.new('prov-state', location.province)     
-            #innernode << XmlNode.new('country-code', location.country_code)
+            innernode << XmlNode.new('prov-state', location.province)
+            # innernode << XmlNode.new('country-code', location.country_code)
             innernode << XmlNode.new('postal-zip-code', location.postal_code)
           end
         end
@@ -385,8 +380,7 @@ module ActiveMerchant
           node << XmlNode.new('client-voice-number', location.phone)
           node << XmlNode.new('address-details') do |innernode|
             innernode << XmlNode.new('address-line-1', location.address1)
-            address2 = [location.address2, location.address3].reject(&:blank?).join(", ")
-            innernode << XmlNode.new('address-line-2', address2) unless address2.blank?
+            innernode << XmlNode.new('address-line-2', location.address2_and_3) unless location.address2_and_3.blank?
             innernode << XmlNode.new('city', location.city)
             innernode << XmlNode.new('prov-state', location.province) unless location.province.blank?
             innernode << XmlNode.new('country-code', location.country_code)
@@ -412,7 +406,7 @@ module ActiveMerchant
       def shipment_preferences_node(options)
         XmlNode.new('preferences') do |node|
           node << XmlNode.new('show-packing-instructions', options[:packing_instructions] || true)
-          node << XmlNode.new('show-postage-rate', options[:show_postage_rate] || false)          
+          node << XmlNode.new('show-postage-rate', options[:show_postage_rate] || false)
           node << XmlNode.new('show-insured-value', true)
         end
       end
@@ -428,17 +422,17 @@ module ActiveMerchant
 
         XmlNode.new('customs') do |node|
           currency = options[:currency] || "CAD"
-          node << XmlNode.new('currency',currency)
-          node << XmlNode.new('conversion-from-cad',options[:conversion_from_cad].to_s) if currency != 'CAD' && options[:conversion_from_cad]
-          node << XmlNode.new('reason-for-export','SOG') # SOG - Sale of Goods
-          node << XmlNode.new('other-reason',options[:customs_other_reason]) if (options[:customs_reason_for_export] && options[:customs_other_reason])
-          node << XmlNode.new('additional-customs-info',options[:customs_addition_info]) if options[:customs_addition_info]
+          node << XmlNode.new('currency', currency)
+          node << XmlNode.new('conversion-from-cad', options[:conversion_from_cad].to_s) if currency != 'CAD' && options[:conversion_from_cad]
+          node << XmlNode.new('reason-for-export', 'SOG') # SOG - Sale of Goods
+          node << XmlNode.new('other-reason', options[:customs_other_reason]) if options[:customs_reason_for_export] && options[:customs_other_reason]
+          node << XmlNode.new('additional-customs-info', options[:customs_addition_info]) if options[:customs_addition_info]
           node << XmlNode.new('sku-list') do |sku|
             line_items.each do |line_item|
               sku << XmlNode.new('item') do |item|
                 item << XmlNode.new('hs-tariff-code', line_item.hs_code) if line_item.hs_code && !line_item.hs_code.empty?
                 item << XmlNode.new('sku', line_item.sku) if line_item.sku && !line_item.sku.empty?
-                item << XmlNode.new('customs-description', line_item.name.slice(0,44))
+                item << XmlNode.new('customs-description', line_item.name.slice(0, 44))
                 item << XmlNode.new('unit-weight', '%#2.3f' % sanitize_weight_kg(line_item.kg))
                 item << XmlNode.new('customs-value-per-unit', '%.2f' % sanitize_price_from_cents(line_item.value))
                 item << XmlNode.new('customs-number-of-units', line_item.quantity)
@@ -447,20 +441,20 @@ module ActiveMerchant
               end
             end
           end
-          
+
         end
       end
 
-      def shipment_parcel_node(package, options ={})
+      def shipment_parcel_node(package, options = {})
         weight = sanitize_weight_kg(package.kilograms.to_f)
         XmlNode.new('parcel-characteristics') do |el|
           el << XmlNode.new('weight', "%#2.3f" % weight)
           pkg_dim = package.cm
-          if pkg_dim && !pkg_dim.select{|x| x != 0}.empty?
+          if pkg_dim && !pkg_dim.select { |x| x != 0 }.empty?
             el << XmlNode.new('dimensions') do |dim|
-              dim << XmlNode.new('length', '%.1f' % ((pkg_dim[2]*10).round / 10.0)) if pkg_dim.size >= 3
-              dim << XmlNode.new('width', '%.1f' % ((pkg_dim[1]*10).round / 10.0)) if pkg_dim.size >= 2
-              dim << XmlNode.new('height', '%.1f' % ((pkg_dim[0]*10).round / 10.0)) if pkg_dim.size >= 1
+              dim << XmlNode.new('length', '%.1f' % ((pkg_dim[2] * 10).round / 10.0)) if pkg_dim.size >= 3
+              dim << XmlNode.new('width', '%.1f' % ((pkg_dim[1] * 10).round / 10.0)) if pkg_dim.size >= 2
+              dim << XmlNode.new('height', '%.1f' % ((pkg_dim[0] * 10).round / 10.0)) if pkg_dim.size >= 1
             end
           end
           el << XmlNode.new('document', false)
@@ -469,10 +463,9 @@ module ActiveMerchant
         end
       end
 
-
       def parse_shipment_response(response)
         doc = REXML::Document.new(REXML::Text::unnormalize(response))
-        raise ActiveMerchant::Shipping::ResponseError, "No Shipping" unless root_node = doc.elements['non-contract-shipment-info']      
+        raise ActiveMerchant::Shipping::ResponseError, "No Shipping" unless root_node = doc.elements['non-contract-shipment-info']
         options = {
           :shipping_id      => root_node.get_text('shipment-id').to_s,
           :tracking_number  => root_node.get_text('tracking-pin').to_s,
@@ -485,7 +478,7 @@ module ActiveMerchant
 
       def parse_register_token_response(response)
         doc = REXML::Document.new(REXML::Text::unnormalize(response))
-        raise ActiveMerchant::Shipping::ResponseError, "No Registration Token" unless root_node = doc.elements['token']      
+        raise ActiveMerchant::Shipping::ResponseError, "No Registration Token" unless root_node = doc.elements['token']
         options = {
           :token_id => root_node.get_text('token-id').to_s
         }
@@ -526,13 +519,13 @@ module ActiveMerchant
           :expected_transit_days => service_standard_node.get_text("expected-transit-time").to_s.to_i,
           :expected_delivery_date => service_standard_node.get_text("expected-delivery-date").to_s
         }
-        option_nodes = root.elements['priced-options'].elements.collect('priced-option') {|node| node} unless root.elements['priced-options'].blank?
+        option_nodes = root.elements['priced-options'].elements.collect('priced-option') { |node| node } unless root.elements['priced-options'].blank?
 
         receipt[:priced_options] = if option_nodes
             option_nodes.inject({}) do |result, node|
             result[node.get_text("option-code").to_s] = node.get_text("option-price").to_s.to_f
             result
-          end
+            end
         else
           []
         end
@@ -542,10 +535,10 @@ module ActiveMerchant
 
       def error_response(response, response_klass)
         doc = REXML::Document.new(REXML::Text::unnormalize(response))
-        messages = doc.elements['messages'].elements.collect('message') {|node| node }
-        message = messages.map {|m| m.get_text('description').to_s }.join(", ")
-        code = messages.map {|m| m.get_text('code').to_s }.join(", ")
-        response_klass.new(false, message, {}, {:carrier => @@name, :code => code})
+        messages = doc.elements['messages'].elements.collect('message') { |node| node }
+        message = messages.map { |m| m.get_text('description').to_s }.join(", ")
+        code = messages.map { |m| m.get_text('code').to_s }.join(", ")
+        response_klass.new(false, message, {}, :carrier => @@name, :code => code)
       end
 
       def log(msg)
@@ -556,7 +549,7 @@ module ActiveMerchant
 
       def tracking_url(pin)
         case pin.length
-          when 12,13,16
+          when 12, 13, 16
             endpoint + "vis/track/pin/%s/detail" % pin
           when 15
             endpoint + "vis/track/dnc/%s/detail" % pin
@@ -574,7 +567,7 @@ module ActiveMerchant
         end
       end
 
-      def shipment_url(shipping_id, options={})
+      def shipment_url(shipping_id, options = {})
         raise MissingCustomerNumberError unless customer_number = options[:customer_number]
         if @platform_id.present?
           endpoint + "rs/#{customer_number}-#{@platform_id}/ncshipment/#{shipping_id}"
@@ -583,7 +576,7 @@ module ActiveMerchant
         end
       end
 
-      def shipment_receipt_url(shipping_id, options={})
+      def shipment_receipt_url(shipping_id, options = {})
         raise MissingCustomerNumberError unless customer_number = options[:customer_number]
         if @platform_id.present?
           endpoint + "rs/#{customer_number}-#{@platform_id}/ncshipment/#{shipping_id}/receipt"
@@ -592,7 +585,7 @@ module ActiveMerchant
         end
       end
 
-      def services_url(country=nil, service_code=nil)
+      def services_url(country = nil, service_code = nil)
         url = endpoint + "rs/ship/service"
         url += "/#{service_code}" if service_code
         url += "?country=#{country}" if country
@@ -610,11 +603,11 @@ module ActiveMerchant
           "Basic %s" % Base64.encode64("#{@options[:api_key]}:#{@options[:secret]}")
         end
       end
-      
+
       def headers(customer_credentials, accept = nil, content_type = nil)
         headers = {
           'Authorization'   => encoded_authorization(customer_credentials),
-          'Accept-Language' => language          
+          'Accept-Language' => language
         }
         headers['Accept'] = accept if accept
         headers['Content-Type'] = content_type if content_type
@@ -638,17 +631,17 @@ module ActiveMerchant
         XmlNode.new("expected-mailing-date", date_as_string)
       end
 
-      def parcel_node(line_items, package = nil, options ={})
+      def parcel_node(line_items, package = nil, options = {})
         weight = sanitize_weight_kg(package && !package.kilograms.zero? ? package.kilograms.to_f : line_items.sum(&:kilograms).to_f)
         XmlNode.new('parcel-characteristics') do |el|
           el << XmlNode.new('weight', "%#2.3f" % weight)
           if package
             pkg_dim = package.cm
-            if pkg_dim && !pkg_dim.select{|x| x != 0}.empty?
+            if pkg_dim && !pkg_dim.select { |x| x != 0 }.empty?
               el << XmlNode.new('dimensions') do |dim|
-                dim << XmlNode.new('length', '%.1f' % ((pkg_dim[2]*10).round / 10.0)) if pkg_dim.size >= 3
-                dim << XmlNode.new('width', '%.1f' % ((pkg_dim[1]*10).round / 10.0)) if pkg_dim.size >= 2
-                dim << XmlNode.new('height', '%.1f' % ((pkg_dim[0]*10).round / 10.0)) if pkg_dim.size >= 1
+                dim << XmlNode.new('length', '%.1f' % ((pkg_dim[2] * 10).round / 10.0)) if pkg_dim.size >= 3
+                dim << XmlNode.new('width', '%.1f' % ((pkg_dim[1] * 10).round / 10.0)) if pkg_dim.size >= 2
+                dim << XmlNode.new('height', '%.1f' % ((pkg_dim[0] * 10).round / 10.0)) if pkg_dim.size >= 1
               end
             end
           end
@@ -691,7 +684,7 @@ module ActiveMerchant
 
       def services_node(services)
         XmlNode.new('services') do |node|
-          services.each {|code| node << XmlNode.new('service-code', code)}
+          services.each { |code| node << XmlNode.new('service-code', code) }
         end
       end
 
@@ -731,7 +724,7 @@ module ActiveMerchant
           end
         end
       end
-      
+
       def expected_date_from_node(node)
         if service = node.elements['service-standard']
           expected_date = service.get_text("expected-delivery-date").to_s
@@ -753,17 +746,17 @@ module ActiveMerchant
 
       def sanitize_zip(hash)
         [:postal_code, :zip].each do |attr|
-          hash[attr].gsub!(/\s+/,'') if hash[attr]
+          hash[attr].gsub!(/\s+/, '') if hash[attr]
         end
         hash
       end
 
       def sanitize_weight_kg(kg)
-        return kg == 0 ? 0.001 : kg;
+        kg == 0 ? 0.001 : kg
       end
 
       def sanitize_price_from_cents(value)
-        return value == 0 ? 0.01 : value.round / 100.0
+        value == 0 ? 0.01 : value.round / 100.0
       end
 
       def origin_hash_for(root_node)
@@ -819,14 +812,13 @@ module ActiveMerchant
       end
 
       def delivered?
-        ! delivered_event.nil?
+        !delivered_event.nil?
       end
 
       def actual_delivery_time
         delivered_event.time if delivered?
       end
 
-
       private
 
       def delivered_event
@@ -878,6 +870,5 @@ module ActiveMerchant
     class MissingCustomerNumberError < StandardError; end
     class MissingShippingNumberError < StandardError; end
     class MissingTokenIdError < StandardError; end
-
   end
 end