benhutton-active_shipping 0.9.13

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

@@ -0,0 +1,139 @@
+module ActiveMerchant
+  module Shipping
+    class NewZealandPost < Carrier
+
+      # class NewZealandPostRateResponse < RateResponse
+      # end
+      
+      cattr_reader :name
+      @@name = "New Zealand Post"
+
+      URL = "http://workshop.nzpost.co.nz/api/v1/rate.xml"
+
+      # Override to return required keys in options hash for initialize method.
+      def requirements
+        [:key]
+      end
+
+      # Override with whatever you need to get the rates
+      def find_rates(origin, destination, packages, options = {})
+        packages = Array(packages)
+        rate_responses = []
+        packages.each do |package|
+          if package.tube?
+            request_hash = build_tube_request_params(origin, destination, package, options)
+          else
+            request_hash = build_rectangular_request_params(origin, destination, package, options)
+          end
+          url = URL + '?' + request_hash.to_param
+          response = ssl_get(url)
+          rate_responses << parse_rate_response(origin, destination, package, response, options)
+        end
+        combine_rate_responses(rate_responses, packages)
+      end
+
+      def maximum_weight
+        Mass.new(20, :kilograms)
+      end
+
+      protected
+
+      # Override in subclasses for non-U.S.-based carriers.
+      def self.default_location
+        Location.new(:postal_code => '6011')
+      end
+
+      private
+
+      def build_rectangular_request_params(origin, destination,  package, options = {})
+        params = {
+          :postcode_src => origin.postal_code,
+          :postcode_dest => destination.postal_code,
+          :api_key => @options[:key],
+          :height => "#{package.centimetres(:height) * 10}",
+          :thickness => "#{package.centimetres(:width) * 10}",
+          :length => "#{package.centimetres(:length) * 10}",
+          :weight =>"%.1f" % (package.weight.amount / 1000.0)
+        }
+      end
+
+      def build_tube_request_params(origin, destination,  package, options = {})
+        params = {
+          :postcode_src => origin.postal_code,
+          :postcode_dest => destination.postal_code,
+          :api_key => @options[:key],
+          :diameter => "#{package.centimetres(:width) * 10}",
+          :length => "#{package.centimetres(:length) * 10}",
+          :weight => "%.1f" % (package.weight.amount / 1000.0)
+        }
+      end
+
+      def parse_rate_response(origin, destination, package, response, options={})
+        xml = REXML::Document.new(response)
+        if response_success?(xml)
+          rate_estimates = []
+          xml.elements.each('hash/products/product') do |prod|
+            if( prod.get_text('packaging') == 'postage_only' )
+              rate_estimates << RateEstimate.new(origin, 
+                                                 destination,
+                                                 @@name,
+                                                 prod.get_text('service-group-description').to_s,
+                                                 :total_price => prod.get_text('cost').to_s.to_f,
+                                                 :currency => 'NZD',
+                                                 :service_code => prod.get_text('code').to_s,
+                                                 :package => package)
+            end
+          end
+          
+          RateResponse.new(true, "Success", Hash.from_xml(response), :rates => rate_estimates, :xml => response)
+        else
+          error_message = response_message(xml)
+          RateResponse.new(false, error_message, Hash.from_xml(response), :rates => rate_estimates, :xml => response)
+        end
+      end
+
+      def combine_rate_responses(rate_responses, packages)
+        #if there are any failed responses, return on that response
+        rate_responses.each do |r|
+          return r if !r.success?
+        end
+
+        #group rate estimates by delivery type so that we can exclude any incomplete delviery types
+        rate_estimate_delivery_types = {}
+        rate_responses.each do |rr|
+          rr.rate_estimates.each do |re|
+            (rate_estimate_delivery_types[re.service_code] ||= []) << re
+          end
+        end
+        rate_estimate_delivery_types.delete_if{ |type, re| re.size != packages.size }
+
+        #combine cost estimates for remaining packages
+        combined_rate_estimates = []
+        rate_estimate_delivery_types.each do |type, re|
+          total_price = re.sum(&:total_price)
+          r = re.first
+          combined_rate_estimates << RateEstimate.new(r.origin, r.destination, r.carrier,
+                                                     r.service_name,
+                                                     :total_price => total_price,
+                                                     :currency => r.currency,
+                                                     :service_code => r.service_code,
+                                                     :packages => packages)
+        end
+        RateResponse.new(true, "Success", {}, :rates => combined_rate_estimates)
+      end
+
+      def response_success?(xml)
+        xml.get_text('hash/status').to_s == 'success'
+      end
+
+      def response_message(xml)
+        if response_success?(xml)
+          'Success'
+        else
+          xml.get_text('hash/message').to_s
+        end
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,172 @@
+require 'cgi'
+require 'builder'
+
+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'      
+      WAREHOUSES = { 'CHI' => 'Chicago',
+                     'LAX' => 'Los Angeles',
+                     'REN' => 'Reno',
+                     'VAN' => 'Vancouver',
+                     'TOR' => 'Toronto',
+                     'UK'  => 'United Kingdom'
+                   }
+                   
+      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 } ]
+        )
+      rescue ActiveMerchant::Shipping::ResponseError => e
+        e.message != "Could not verify e-mail/password combination"
+      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) 
+        end
+        xml.target!
+      end
+      
+      def add_credentials(xml)
+        xml.tag! 'EmailAddress', @options[:login]
+        xml.tag! 'Password', @options[:password]
+      end
+
+      def add_order(xml, destination, options)
+        xml.tag! 'Order', :id => options[:order_id] do
+          xml.tag! 'Warehouse', options[:warehouse] || '00'
+
+          add_address(xml, destination)
+          Array(options[:items]).each_with_index do |line_item, index|
+            add_item(xml, line_item, index)
+          end
+        end
+      end
+
+      def add_address(xml, destination)
+        xml.tag! 'AddressInfo', :type => 'Ship' do
+          if destination.name.present?
+            xml.tag! 'Name' do
+              xml.tag! 'Full', destination.name
+            end
+          end
+          xml.tag! 'Address1', destination.address1
+          xml.tag! 'Address2', destination.address2 unless destination.address2.blank?
+          xml.tag! 'Address3', destination.address3 unless destination.address3.blank?
+          xml.tag! 'City', destination.city
+          xml.tag! 'State', destination.state unless destination.state.blank?
+          xml.tag! 'Country', destination.country_code
+          xml.tag! 'Zip', destination.zip  unless destination.zip.blank?
+        end
+      end
+      
+     # Code is limited to 12 characters
+      def add_item(xml, item, index)
+        xml.tag! 'Item', :num => index do
+          xml.tag! 'Code', item[:sku]
+          xml.tag! 'Quantity', item[:quantity]
+        end
+      end
+
+      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
+        )
+      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"]
+          )
+        end
+      end
+      
+      def carrier_for(service)
+        CARRIERS.dup.find{ |carrier| service.to_s =~ /^#{carrier}/i } || service.to_s.split(" ").first
+      end
+
+      def parse(xml)
+        response = {}
+        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"]
+          rate["warehouse"] = parse_child_text(e, "Warehouse")
+          rate["service"]   = parse_child_text(e, "Service")
+          rate["cost"]      = parse_child_text(e, "Cost")
+          rate["currency"]  = parse_child_attribute(e, "Cost", "currency")
+          response["rates"] << rate
+        end
+
+        if response["status"] == SUCCESS && response["rates"].any?
+          response["success"] = true
+          response["message"] = SUCCESS_MESSAGE
+        elsif response["status"] == SUCCESS && response["rates"].empty?
+          response["success"] = false
+          response["message"] = NO_RATES_MESSAGE
+        else
+          response["success"] = false
+          response["message"] = parse_child_text(document.root, "ErrorMessage")
+        end
+        
+        response
+      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]
+        end
+      end      
+    end
+  end
+end

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

@@ -0,0 +1,390 @@
+# -*- encoding: utf-8 -*-
+
+module ActiveMerchant
+  module Shipping
+    class UPS < Carrier
+      self.retry_safe = true
+      
+      cattr_accessor :default_options
+      cattr_reader :name
+      @@name = "UPS"
+      
+      TEST_URL = 'https://wwwcie.ups.com'
+      LIVE_URL = 'https://www.ups.com'
+      
+      RESOURCES = {
+        :rates => 'ups.app/xml/Rate',
+        :track => 'ups.app/xml/Track'
+      }
+      
+      PICKUP_CODES = HashWithIndifferentAccess.new({
+        :daily_pickup => "01",
+        :customer_counter => "03", 
+        :one_time_pickup => "06",
+        :on_call_air => "07",
+        :suggested_retail_rates => "11",
+        :letter_center => "19",
+        :air_service_center => "20"
+      })
+      
+      CUSTOMER_CLASSIFICATIONS = HashWithIndifferentAccess.new({
+        :wholesale => "01",
+        :occasional => "03", 
+        :retail => "04"
+      })
+      
+      # these are the defaults described in the UPS API docs,
+      # but they don't seem to apply them under all circumstances,
+      # so we need to take matters into our own hands
+      DEFAULT_CUSTOMER_CLASSIFICATIONS = Hash.new do |hash,key|
+        hash[key] = case key.to_sym
+        when :daily_pickup then :wholesale
+        when :customer_counter then :retail
+        else
+          :occasional
+        end
+      end
+      
+      DEFAULT_SERVICES = {
+        "01" => "UPS Next Day Air",
+        "02" => "UPS Second Day Air",
+        "03" => "UPS Ground",
+        "07" => "UPS Worldwide Express",
+        "08" => "UPS Worldwide Expedited",
+        "11" => "UPS Standard",
+        "12" => "UPS Three-Day Select",
+        "13" => "UPS Next Day Air Saver",
+        "14" => "UPS Next Day Air Early A.M.",
+        "54" => "UPS Worldwide Express Plus",
+        "59" => "UPS Second Day Air A.M.",
+        "65" => "UPS Saver",
+        "82" => "UPS Today Standard",
+        "83" => "UPS Today Dedicated Courier",
+        "84" => "UPS Today Intercity",
+        "85" => "UPS Today Express",
+        "86" => "UPS Today Express Saver"
+      }
+      
+      CANADA_ORIGIN_SERVICES = {
+        "01" => "UPS Express",
+        "02" => "UPS Expedited",
+        "14" => "UPS Express Early A.M."
+      }
+      
+      MEXICO_ORIGIN_SERVICES = {
+        "07" => "UPS Express",
+        "08" => "UPS Expedited",
+        "54" => "UPS Express Plus"
+      }
+      
+      EU_ORIGIN_SERVICES = {
+        "07" => "UPS Express",
+        "08" => "UPS Expedited"
+      }
+      
+      OTHER_NON_US_ORIGIN_SERVICES = {
+        "07" => "UPS Express"
+      }
+      
+      # From http://en.wikipedia.org/w/index.php?title=European_Union&oldid=174718707 (Current as of November 30, 2007)
+      EU_COUNTRY_CODES = ["GB", "AT", "BE", "BG", "CY", "CZ", "DK", "EE", "FI", "FR", "DE", "GR", "HU", "IE", "IT", "LV", "LT", "LU", "MT", "NL", "PL", "PT", "RO", "SK", "SI", "ES", "SE"]
+      
+      US_TERRITORIES_TREATED_AS_COUNTRIES = ["AS", "FM", "GU", "MH", "MP", "PW", "PR", "VI"]
+      
+      def requirements
+        [:key, :login, :password]
+      end
+      
+      def find_rates(origin, destination, packages, options={})
+        origin, destination = upsified_location(origin), upsified_location(destination)
+        options = @options.merge(options)
+        packages = Array(packages)
+        access_request = build_access_request
+        rate_request = build_rate_request(origin, destination, packages, options)
+        response = commit(:rates, save_request(access_request + rate_request), (options[:test] || false))
+        parse_rate_response(origin, destination, packages, response, options)
+      end
+      
+      def find_tracking_info(tracking_number, options={})
+        options = @options.update(options)
+        access_request = build_access_request
+        tracking_request = build_tracking_request(tracking_number, options)
+        response = commit(:track, save_request(access_request + tracking_request), (options[:test] || false))
+        parse_tracking_response(response, options)
+      end
+      
+      protected
+      
+      def upsified_location(location)
+        if location.country_code == 'US' && US_TERRITORIES_TREATED_AS_COUNTRIES.include?(location.state)
+          atts = {:country => location.state}
+          [:zip, :city, :address1, :address2, :address3, :phone, :fax, :address_type].each do |att|
+            atts[att] = location.send(att)
+          end
+          Location.new(atts)
+        else
+          location
+        end
+      end
+      
+      def build_access_request
+        xml_request = XmlNode.new('AccessRequest') do |access_request|
+          access_request << XmlNode.new('AccessLicenseNumber', @options[:key])
+          access_request << XmlNode.new('UserId', @options[:login])
+          access_request << XmlNode.new('Password', @options[:password])
+        end
+        xml_request.to_s
+      end
+      
+      def build_rate_request(origin, destination, packages, options={})
+        packages = Array(packages)
+        xml_request = XmlNode.new('RatingServiceSelectionRequest') do |root_node|
+          root_node << XmlNode.new('Request') do |request|
+            request << XmlNode.new('RequestAction', 'Rate')
+            request << XmlNode.new('RequestOption', 'Shop')
+            # not implemented: 'Rate' RequestOption to specify a single service query
+            # request << XmlNode.new('RequestOption', ((options[:service].nil? or options[:service] == :all) ? 'Shop' : 'Rate'))
+          end
+          
+          pickup_type = options[:pickup_type] || :daily_pickup
+          
+          root_node << XmlNode.new('PickupType') do |pickup_type_node|
+            pickup_type_node << XmlNode.new('Code', PICKUP_CODES[pickup_type])
+            # not implemented: PickupType/PickupDetails element
+          end
+          cc = options[:customer_classification] || DEFAULT_CUSTOMER_CLASSIFICATIONS[pickup_type]
+          root_node << XmlNode.new('CustomerClassification') do |cc_node|
+            cc_node << XmlNode.new('Code', CUSTOMER_CLASSIFICATIONS[cc])
+          end
+          
+          root_node << XmlNode.new('Shipment') do |shipment|
+            # not implemented: Shipment/Description element
+            shipment << build_location_node('Shipper', (options[:shipper] || origin), options)
+            shipment << build_location_node('ShipTo', destination, options)
+            if options[:shipper] and options[:shipper] != origin
+              shipment << build_location_node('ShipFrom', origin, options)
+            end
+            
+            # not implemented:  * Shipment/ShipmentWeight element
+            #                   * Shipment/ReferenceNumber element                    
+            #                   * Shipment/Service element                            
+            #                   * Shipment/PickupDate element                         
+            #                   * Shipment/ScheduledDeliveryDate element              
+            #                   * Shipment/ScheduledDeliveryTime element              
+            #                   * Shipment/AlternateDeliveryTime element              
+            #                   * Shipment/DocumentsOnly element                      
+            
+            packages.each do |package|
+              imperial = ['US','LR','MM'].include?(origin.country_code(:alpha2))
+              
+              shipment << XmlNode.new("Package") do |package_node|
+                
+                # not implemented:  * Shipment/Package/PackagingType element
+                #                   * Shipment/Package/Description element
+                
+                package_node << XmlNode.new("PackagingType") do |packaging_type|
+                  packaging_type << XmlNode.new("Code", '02')
+                end
+                
+                package_node << XmlNode.new("Dimensions") do |dimensions|
+                  dimensions << XmlNode.new("UnitOfMeasurement") do |units|
+                    units << XmlNode.new("Code", imperial ? 'IN' : 'CM')
+                  end
+                  [:length,:width,:height].each do |axis|
+                    value = ((imperial ? package.inches(axis) : package.cm(axis)).to_f*1000).round/1000.0 # 3 decimals
+                    dimensions << XmlNode.new(axis.to_s.capitalize, [value,0.1].max)
+                  end
+                end
+              
+                package_node << XmlNode.new("PackageWeight") do |package_weight|
+                  package_weight << XmlNode.new("UnitOfMeasurement") do |units|
+                    units << XmlNode.new("Code", imperial ? 'LBS' : 'KGS')
+                  end
+                  
+                  value = ((imperial ? package.lbs : package.kgs).to_f*1000).round/1000.0 # 3 decimals
+                  package_weight << XmlNode.new("Weight", [value,0.1].max)
+                end
+              
+                # not implemented:  * Shipment/Package/LargePackageIndicator element
+                #                   * Shipment/Package/ReferenceNumber element
+                #                   * Shipment/Package/PackageServiceOptions element
+                #                   * Shipment/Package/AdditionalHandling element  
+              end
+              
+            end
+            
+            # not implemented:  * Shipment/ShipmentServiceOptions element
+            #                   * Shipment/RateInformation element
+            
+          end
+          
+        end
+        xml_request.to_s
+      end
+      
+      def build_tracking_request(tracking_number, options={})
+        xml_request = XmlNode.new('TrackRequest') do |root_node|
+          root_node << XmlNode.new('Request') do |request|
+            request << XmlNode.new('RequestAction', 'Track')
+            request << XmlNode.new('RequestOption', '1')
+          end
+          root_node << XmlNode.new('TrackingNumber', tracking_number.to_s)
+        end
+        xml_request.to_s
+      end
+      
+      def build_location_node(name,location,options={})
+        # not implemented:  * Shipment/Shipper/Name element
+        #                   * Shipment/(ShipTo|ShipFrom)/CompanyName element
+        #                   * Shipment/(Shipper|ShipTo|ShipFrom)/AttentionName element
+        #                   * Shipment/(Shipper|ShipTo|ShipFrom)/TaxIdentificationNumber element
+        location_node = XmlNode.new(name) do |location_node|
+          location_node << XmlNode.new('PhoneNumber', location.phone.gsub(/[^\d]/,'')) unless location.phone.blank?
+          location_node << XmlNode.new('FaxNumber', location.fax.gsub(/[^\d]/,'')) unless location.fax.blank?
+          
+          if name == 'Shipper' and (origin_account = @options[:origin_account] || options[:origin_account])
+            location_node << XmlNode.new('ShipperNumber', origin_account)
+          elsif name == 'ShipTo' and (destination_account = @options[:destination_account] || options[:destination_account])
+            location_node << XmlNode.new('ShipperAssignedIdentificationNumber', destination_account)
+          end
+          
+          location_node << XmlNode.new('Address') do |address|
+            address << XmlNode.new("AddressLine1", location.address1) unless location.address1.blank?
+            address << XmlNode.new("AddressLine2", location.address2) unless location.address2.blank?
+            address << XmlNode.new("AddressLine3", location.address3) unless location.address3.blank?
+            address << XmlNode.new("City", location.city) unless location.city.blank?
+            address << XmlNode.new("StateProvinceCode", location.province) unless location.province.blank?
+              # StateProvinceCode required for negotiated rates but not otherwise, for some reason
+            address << XmlNode.new("PostalCode", location.postal_code) unless location.postal_code.blank?
+            address << XmlNode.new("CountryCode", location.country_code(:alpha2)) unless location.country_code(:alpha2).blank?
+            address << XmlNode.new("ResidentialAddressIndicator", true) unless location.commercial? # the default should be that UPS returns residential rates for destinations that it doesn't know about
+            # not implemented: Shipment/(Shipper|ShipTo|ShipFrom)/Address/ResidentialAddressIndicator element
+          end
+        end
+      end
+      
+      def parse_rate_response(origin, destination, packages, response, options={})
+        rates = []
+        
+        xml = REXML::Document.new(response)
+        success = response_success?(xml)
+        message = response_message(xml)
+        
+        if success
+          rate_estimates = []
+          
+          xml.elements.each('/*/RatedShipment') do |rated_shipment|
+            service_code = rated_shipment.get_text('Service/Code').to_s
+            rate_estimates << RateEstimate.new(origin, destination, @@name,
+                                service_name_for(origin, service_code),
+                                :total_price => rated_shipment.get_text('TotalCharges/MonetaryValue').to_s.to_f,
+                                :currency => rated_shipment.get_text('TotalCharges/CurrencyCode').to_s,
+                                :service_code => service_code,
+                                :packages => packages)
+          end
+        end
+        RateResponse.new(success, message, Hash.from_xml(response).values.first, :rates => rate_estimates, :xml => response, :request => last_request)
+      end
+      
+      def parse_tracking_response(response, options={})
+        xml = REXML::Document.new(response)
+        success = response_success?(xml)
+        message = response_message(xml)
+        
+        if success
+          tracking_number, origin, destination = nil
+          shipment_events = []
+          
+          first_shipment = xml.elements['/*/Shipment']
+          first_package = first_shipment.elements['Package']
+          tracking_number = first_shipment.get_text('ShipmentIdentificationNumber | Package/TrackingNumber').to_s
+          
+          origin, destination = %w{Shipper ShipTo}.map do |location|
+            location_from_address_node(first_shipment.elements["#{location}/Address"])
+          end
+          
+          activities = first_package.get_elements('Activity')
+          unless activities.empty?
+            shipment_events = activities.map do |activity|
+              description = activity.get_text('Status/StatusType/Description').to_s
+              zoneless_time = if (time = activity.get_text('Time')) &&
+                                 (date = activity.get_text('Date'))
+                time, date = time.to_s, date.to_s
+                hour, minute, second = time.scan(/\d{2}/)
+                year, month, day = date[0..3], date[4..5], date[6..7]
+                Time.utc(year, month, day, hour, minute, second)
+              end
+              location = location_from_address_node(activity.elements['ActivityLocation/Address'])
+              ShipmentEvent.new(description, zoneless_time, location)
+            end
+            
+            shipment_events = shipment_events.sort_by(&:time)
+            
+            if origin
+              first_event = shipment_events[0]
+              same_country = origin.country_code(:alpha2) == first_event.location.country_code(:alpha2)
+              same_or_blank_city = first_event.location.city.blank? or first_event.location.city == origin.city
+              origin_event = ShipmentEvent.new(first_event.name, first_event.time, origin)
+              if same_country and same_or_blank_city
+                shipment_events[0] = origin_event
+              else
+                shipment_events.unshift(origin_event)
+              end
+            end
+            if shipment_events.last.name.downcase == 'delivered'
+              shipment_events[-1] = ShipmentEvent.new(shipment_events.last.name, shipment_events.last.time, destination)
+            end
+          end
+          
+        end
+        TrackingResponse.new(success, message, Hash.from_xml(response).values.first,
+          :xml => response,
+          :request => last_request,
+          :shipment_events => shipment_events,
+          :origin => origin,
+          :destination => destination,
+          :tracking_number => tracking_number)
+      end
+      
+      def location_from_address_node(address)
+        return nil unless address
+        Location.new(
+                :country =>     node_text_or_nil(address.elements['CountryCode']),
+                :postal_code => node_text_or_nil(address.elements['PostalCode']),
+                :province =>    node_text_or_nil(address.elements['StateProvinceCode']),
+                :city =>        node_text_or_nil(address.elements['City']),
+                :address1 =>    node_text_or_nil(address.elements['AddressLine1']),
+                :address2 =>    node_text_or_nil(address.elements['AddressLine2']),
+                :address3 =>    node_text_or_nil(address.elements['AddressLine3'])
+              )
+      end
+      
+      def response_success?(xml)
+        xml.get_text('/*/Response/ResponseStatusCode').to_s == '1'
+      end
+      
+      def response_message(xml)
+        xml.get_text('/*/Response/Error/ErrorDescription | /*/Response/ResponseStatusDescription').to_s
+      end
+      
+      def commit(action, request, test = false)
+        ssl_post("#{test ? TEST_URL : LIVE_URL}/#{RESOURCES[action]}", request)
+      end
+      
+      
+      def service_name_for(origin, code)
+        origin = origin.country_code(:alpha2)
+        
+        name = case origin
+        when "CA" then CANADA_ORIGIN_SERVICES[code]
+        when "MX" then MEXICO_ORIGIN_SERVICES[code]
+        when *EU_COUNTRY_CODES then EU_ORIGIN_SERVICES[code]
+        end
+        
+        name ||= OTHER_NON_US_ORIGIN_SERVICES[code] unless name == 'US'
+        name ||= DEFAULT_SERVICES[code]
+      end
+      
+    end
+  end
+end