omniship 0.3.2.2 → 0.4.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: d9f5ce46f050f67d8b750e29ae85c457dc30bde0
+  data.tar.gz: fedf5e0c3e0408636c1ba156781eb9088df4f3ea
+SHA512:
+  metadata.gz: 473d38ea1ef885e530317a3b68ae013d0717406dd176ee8bca0e9ff2abfcfbc45780c211da29a62567ac2c462a8290ea6c5e9ff34de8eadc247bcdf27650b068
+  data.tar.gz: 999466fd9b82fb309c5327af767df136a364066b2a64c7755abb99f440d9535d31a156772fcb1844ee800bad661d41837ad5cc0abdd1de3ee4a61bafed925631

data/lib/omniship.rb

@@ -26,23 +26,23 @@
 require 'omniship/base'
 
 def Omniship.setup
-  @root   = Rails.root 
-  if @root    
+  @root   = Rails.root
+  if @root
     @boot   = File.join(@root, "config", "boot.rb").freeze
     @config = File.join(@root, "config", "omniship.yml").freeze
-    @keys   = %w{ username password key }.map { |v| v.freeze }.freeze
+    @keys   = %w{ username password key account meter }.map { |v| v.freeze }.freeze
     require boot unless defined? Rails.env
-    @@config = YAML.load_file(@config) rescue false
-    if @@config != false
-      raise "Invalid fedex configuration file: #{@config}" unless @@config.is_a?(Hash)
-      if (@@config.keys & @keys).sort == @keys.sort and !@@config.has_key?(Rails.env)
-        @@config[Rails.env] = {
-          "ups"   => @@config["ups"],
-          "fedex" => @@config["fedex"],
-          "usps"  => @@config["usps"]
+    if File.exists? @config
+      @config = YAML.load_file(@config)
+      raise "Invalid omniship configuration file: #{@config}" unless @config.is_a?(Hash)
+      if (@config.keys & @keys).sort == @keys.sort and !@config.has_key?(Rails.env)
+        @config[Rails.env] = {
+          "ups"   => @config["ups"],
+          "fedex" => @config["fedex"],
+          "usps"  => @config["usps"]
         }
       end
-      @@config[Rails.env].freeze
+      @config[Rails.env].freeze
     end
   end
 end
@@ -75,3 +75,4 @@ require 'omniship/rate_estimate'
 require 'omniship/carrier'
 require 'omniship/carriers'
 require 'omniship/shipment_event'
+require 'omniship/ship_response'

data/lib/omniship/address.rb

@@ -28,16 +28,16 @@ module Omniship #:nodoc:
       @country = (options[:country].nil? or options[:country].is_a?(ActiveMerchant::Country)) ?
           options[:country] :
           ActiveMerchant::Country.find(options[:country])
-      @postal_code = options[:postal_code] || options[:postal] || options[:zip]
-      @province = options[:province] || options[:state] || options[:territory] || options[:region]
-      @city = options[:city]
-      @name = options[:name]
-      @address1 = options[:address1]
-      @address2 = options[:address2]
-      @address3 = options[:address3]
-      @phone = options[:phone]
-      @fax = options[:fax]
-      @company_name = options[:company_name] || options[:company]
+      @postal_code    = options[:postal_code] || options[:postal] || options[:zip]
+      @province       = options[:province] || options[:state] || options[:territory] || options[:region]
+      @city           = options[:city]
+      @name           = options[:name]
+      @address1       = options[:address1]
+      @address2       = options[:address2]
+      @address3       = options[:address3]
+      @phone          = options[:phone]
+      @fax            = options[:fax]
+      @company_name   = options[:company_name] || options[:company]
       @attention_name = options[:attention_name]
 
       self.address_type = options[:address_type]
@@ -46,19 +46,19 @@ module Omniship #:nodoc:
     def self.from(object, options={})
       return object if object.is_a? Omniship::Address
       attr_mappings = {
-          :name => [:name],
-          :attention_name => [:attention_name],
-          :country => [:country_code, :country],
-          :postal_code => [:postal_code, :zip, :postal],
-          :province => [:province_code, :state_code, :territory_code, :region_code, :province, :state, :territory, :region],
-          :city => [:city, :town],
-          :address1 => [:address1, :address, :street],
-          :address2 => [:address2],
-          :address3 => [:address3],
-          :phone => [:phone, :phone_number],
-          :fax => [:fax, :fax_number],
-          :address_type => [:address_type],
-          :company_name => [:company, :company_name]
+        :name           => [:name],
+        :attention_name => [:attention_name],
+        :country        => [:country_code, :country],
+        :postal_code    => [:postal_code, :zip, :postal],
+        :province       => [:province_code, :state_code, :territory_code, :region_code, :province, :state, :territory, :region],
+        :city           => [:city, :town],
+        :address1       => [:address1, :address, :street],
+        :address2       => [:address2],
+        :address3       => [:address3],
+        :phone          => [:phone, :phone_number],
+        :fax            => [:fax, :fax_number],
+        :address_type   => [:address_type],
+        :company_name   => [:company, :company_name]
       }
       attributes = {}
       hash_access = begin
@@ -95,19 +95,19 @@ module Omniship #:nodoc:
 
     def to_hash
       {
-          :country => country_code,
-          :postal_code => postal_code,
-          :province => province,
-          :city => city,
-          :name => name,
-          :address1 => address1,
-          :address2 => address2,
-          :address3 => address3,
-          :phone => phone,
-          :fax => fax,
-          :address_type => address_type,
-          :company_name => company_name,
-          :attention_name => attention_name
+        :country        => country_code,
+        :postal_code    => postal_code,
+        :province       => province,
+        :city           => city,
+        :name           => name,
+        :address1       => address1,
+        :address2       => address2,
+        :address3       => address3,
+        :phone          => phone,
+        :fax            => fax,
+        :address_type   => address_type,
+        :company_name   => company_name,
+        :attention_name => attention_name
       }
     end
 

data/lib/omniship/carriers/fedex.rb

@@ -1,5 +1,4 @@
-# FedEx module by Jimmy Baker
-# http://github.com/jimmyebaker
+# FedEx module by Donavan White
 
 module Omniship
   # :key is your developer API key
@@ -8,79 +7,79 @@ module Omniship
   # :login is your meter number
   class FedEx < Carrier
     self.retry_safe = true
-    
+
     cattr_reader :name
     @@name = "FedEx"
-    
+
     TEST_URL = 'https://gatewaybeta.fedex.com:443/xml'
     LIVE_URL = 'https://gateway.fedex.com:443/xml'
-    
+
     CarrierCodes = {
-      "fedex_ground" => "FDXG",
+      "fedex_ground"  => "FDXG",
       "fedex_express" => "FDXE"
     }
-    
+
     ServiceTypes = {
-      "PRIORITY_OVERNIGHT" => "FedEx Priority Overnight",
-      "PRIORITY_OVERNIGHT_SATURDAY_DELIVERY" => "FedEx Priority Overnight Saturday Delivery",
-      "FEDEX_2_DAY" => "FedEx 2 Day",
-      "FEDEX_2_DAY_SATURDAY_DELIVERY" => "FedEx 2 Day Saturday Delivery",
-      "STANDARD_OVERNIGHT" => "FedEx Standard Overnight",
-      "FIRST_OVERNIGHT" => "FedEx First Overnight",
-      "FIRST_OVERNIGHT_SATURDAY_DELIVERY" => "FedEx First Overnight Saturday Delivery",
-      "FEDEX_EXPRESS_SAVER" => "FedEx Express Saver",
-      "FEDEX_1_DAY_FREIGHT" => "FedEx 1 Day Freight",
-      "FEDEX_1_DAY_FREIGHT_SATURDAY_DELIVERY" => "FedEx 1 Day Freight Saturday Delivery",
-      "FEDEX_2_DAY_FREIGHT" => "FedEx 2 Day Freight",
-      "FEDEX_2_DAY_FREIGHT_SATURDAY_DELIVERY" => "FedEx 2 Day Freight Saturday Delivery",
-      "FEDEX_3_DAY_FREIGHT" => "FedEx 3 Day Freight",
-      "FEDEX_3_DAY_FREIGHT_SATURDAY_DELIVERY" => "FedEx 3 Day Freight Saturday Delivery",
-      "INTERNATIONAL_PRIORITY" => "FedEx International Priority",
+      "PRIORITY_OVERNIGHT"                       => "FedEx Priority Overnight",
+      "PRIORITY_OVERNIGHT_SATURDAY_DELIVERY"     => "FedEx Priority Overnight Saturday Delivery",
+      "FEDEX_2_DAY"                              => "FedEx 2 Day",
+      "FEDEX_2_DAY_SATURDAY_DELIVERY"            => "FedEx 2 Day Saturday Delivery",
+      "STANDARD_OVERNIGHT"                       => "FedEx Standard Overnight",
+      "FIRST_OVERNIGHT"                          => "FedEx First Overnight",
+      "FIRST_OVERNIGHT_SATURDAY_DELIVERY"        => "FedEx First Overnight Saturday Delivery",
+      "FEDEX_EXPRESS_SAVER"                      => "FedEx Express Saver",
+      "FEDEX_1_DAY_FREIGHT"                      => "FedEx 1 Day Freight",
+      "FEDEX_1_DAY_FREIGHT_SATURDAY_DELIVERY"    => "FedEx 1 Day Freight Saturday Delivery",
+      "FEDEX_2_DAY_FREIGHT"                      => "FedEx 2 Day Freight",
+      "FEDEX_2_DAY_FREIGHT_SATURDAY_DELIVERY"    => "FedEx 2 Day Freight Saturday Delivery",
+      "FEDEX_3_DAY_FREIGHT"                      => "FedEx 3 Day Freight",
+      "FEDEX_3_DAY_FREIGHT_SATURDAY_DELIVERY"    => "FedEx 3 Day Freight Saturday Delivery",
+      "INTERNATIONAL_PRIORITY"                   => "FedEx International Priority",
       "INTERNATIONAL_PRIORITY_SATURDAY_DELIVERY" => "FedEx International Priority Saturday Delivery",
-      "INTERNATIONAL_ECONOMY" => "FedEx International Economy",
-      "INTERNATIONAL_FIRST" => "FedEx International First",
-      "INTERNATIONAL_PRIORITY_FREIGHT" => "FedEx International Priority Freight",
-      "INTERNATIONAL_ECONOMY_FREIGHT" => "FedEx International Economy Freight",
-      "GROUND_HOME_DELIVERY" => "FedEx Ground Home Delivery",
-      "FEDEX_GROUND" => "FedEx Ground",
-      "INTERNATIONAL_GROUND" => "FedEx International Ground"
+      "INTERNATIONAL_ECONOMY"                    => "FedEx International Economy",
+      "INTERNATIONAL_FIRST"                      => "FedEx International First",
+      "INTERNATIONAL_PRIORITY_FREIGHT"           => "FedEx International Priority Freight",
+      "INTERNATIONAL_ECONOMY_FREIGHT"            => "FedEx International Economy Freight",
+      "GROUND_HOME_DELIVERY"                     => "FedEx Ground Home Delivery",
+      "FEDEX_GROUND"                             => "FedEx Ground",
+      "INTERNATIONAL_GROUND"                     => "FedEx International Ground"
     }
 
     PackageTypes = {
-      "fedex_envelope" => "FEDEX_ENVELOPE",
-      "fedex_pak" => "FEDEX_PAK",
-      "fedex_box" => "FEDEX_BOX",
-      "fedex_tube" => "FEDEX_TUBE",
+      "fedex_envelope"  => "FEDEX_ENVELOPE",
+      "fedex_pak"       => "FEDEX_PAK",
+      "fedex_box"       => "FEDEX_BOX",
+      "fedex_tube"      => "FEDEX_TUBE",
       "fedex_10_kg_box" => "FEDEX_10KG_BOX",
       "fedex_25_kg_box" => "FEDEX_25KG_BOX",
-      "your_packaging" => "YOUR_PACKAGING"
+      "your_packaging"  => "YOUR_PACKAGING"
     }
 
     DropoffTypes = {
-      'regular_pickup' => 'REGULAR_PICKUP',
-      'request_courier' => 'REQUEST_COURIER',
-      'dropbox' => 'DROP_BOX',
+      'regular_pickup'          => 'REGULAR_PICKUP',
+      'request_courier'         => 'REQUEST_COURIER',
+      'dropbox'                 => 'DROP_BOX',
       'business_service_center' => 'BUSINESS_SERVICE_CENTER',
-      'station' => 'STATION'
+      'station'                 => 'STATION'
     }
 
     PaymentTypes = {
-      'sender' => 'SENDER',
-      'recipient' => 'RECIPIENT',
+      'sender'      => 'SENDER',
+      'recipient'   => 'RECIPIENT',
       'third_party' => 'THIRDPARTY',
-      'collect' => 'COLLECT'
+      'collect'     => 'COLLECT'
     }
-    
+
     PackageIdentifierTypes = {
-      'tracking_number' => 'TRACKING_NUMBER_OR_DOORTAG',
-      'door_tag' => 'TRACKING_NUMBER_OR_DOORTAG',
-      'rma' => 'RMA',
-      'ground_shipment_id' => 'GROUND_SHIPMENT_ID',
-      'ground_invoice_number' => 'GROUND_INVOICE_NUMBER',
+      'tracking_number'           => 'TRACKING_NUMBER_OR_DOORTAG',
+      'door_tag'                  => 'TRACKING_NUMBER_OR_DOORTAG',
+      'rma'                       => 'RMA',
+      'ground_shipment_id'        => 'GROUND_SHIPMENT_ID',
+      'ground_invoice_number'     => 'GROUND_INVOICE_NUMBER',
       'ground_customer_reference' => 'GROUND_CUSTOMER_REFERENCE',
-      'ground_po' => 'GROUND_PO',
-      'express_reference' => 'EXPRESS_REFERENCE',
-      'express_mps_master' => 'EXPRESS_MPS_MASTER'
+      'ground_po'                 => 'GROUND_PO',
+      'express_reference'         => 'EXPRESS_REFERENCE',
+      'express_mps_master'        => 'EXPRESS_MPS_MASTER'
     }
 
     def self.service_name_for_code(service_code)
@@ -89,88 +88,214 @@ module Omniship
         "FedEx #{name.sub(/Fedex /, '')}"
       end
     end
-    
+
     def requirements
-      [:key, :password, :account, :login]
+      [:key, :account, :meter, :password]
     end
-    
+
     def find_rates(origin, destination, packages, options = {})
-      options = @options.update(options)
-      packages = Array(packages)
-      
-      rate_request = build_rate_request(origin, destination, packages, options)
-      
-      response = commit(save_request(rate_request), (options[:test] || false)).gsub(/<(\/)?.*?\:(.*?)>/, '<\1\2>')
-      
+      options        = @options.merge(options)
+      options[:test] = options[:test].nil? ? true : options[:test]
+      packages       = Array(packages)
+      rate_request   = build_rate_request(origin, destination, packages, options)
+      response       = commit(save_request(rate_request.gsub("\n", "")), options[:test])
       parse_rate_response(origin, destination, packages, response, options)
     end
-    
+
+    def create_shipment(origin, destination, packages, options={})
+      options        = @options.merge(options)
+      options[:test] = options[:test].nil? ? true : options[:test]
+      packages       = Array(packages)
+      ship_request   = build_ship_request(origin, destination, packages, options)
+      response       = commit(save_request(ship_request.gsub("\n", "")), options[:test])
+      parse_ship_response(response, options)
+    end
+
+    def delete_shipment(tracking_number, shipment_type, options={})
+      options                 = @options.merge(options)
+      delete_shipment_request = build_delete_request(tracking_number, shipment_type, options)
+      response                = commit(save_request(delete_shipment_request.gsub("\n", "")), options[:test])
+      parse_delete_response(response, options)
+    end
+
     def find_tracking_info(tracking_number, options={})
-      options = @options.update(options)
-      
+      options          = @options.update(options)
       tracking_request = build_tracking_request(tracking_number, options)
-      response = commit(save_request(tracking_request), (options[:test] || false)).gsub(/<(\/)?.*?\:(.*?)>/, '<\1\2>')
+      response         = commit(save_request(tracking_request), (options[:test] || false)).gsub(/<(\/)?.*?\:(.*?)>/, '<\1\2>')
       parse_tracking_response(response, options)
     end
-    
+
     protected
     def build_rate_request(origin, destination, packages, options={})
       imperial = ['US','LR','MM'].include?(origin.country_code(:alpha2))
 
-      xml_request = XmlNode.new('RateRequest', 'xmlns' => 'http://fedex.com/ws/rate/v6') do |root_node|
-        root_node << build_request_header
+      builder = Nokogiri::XML::Builder.new do |xml|
+        xml.RateRequest('xmlns' => 'http://fedex.com/ws/rate/v12') {
+          build_access_request(xml)
+          xml.Version {
+            xml.ServiceId "crs"
+            xml.Major "12"
+            xml.Intermediate "0"
+            xml.Minor "0"
+          }
+          xml.RequestedShipment {
+            xml.ShipTimestamp options[:ship_date] || DateTime.now.strftime
+            xml.DropoffType options[:dropoff_type] || 'REGULAR_PICKUP'
+            xml.PackagingType options[:packaging_type] || 'YOUR_PACKAGING'
+            build_location_node(['Shipper'], (options[:shipper] || origin), xml)
+            build_location_node(['Recipient'], destination, xml)
+            if options[:shipper] && options[:shipper] != origin
+              build_location_node(['Origin'], origin, xml)
+            end
+            xml.RateRequestTypes 'ACCOUNT'
+            xml.PackageCount packages.size
+            packages.each do |pkg|
+              xml.RequestedPackageLineItems {
+                xml.SequenceNumber 1
+                xml.GroupPackageCount 1
+                xml.Weight {
+                  xml.Units (imperial ? 'LB' : 'KG')
+                  xml.Value ((imperial ? pkg.weight : pkg.weight/2.2).to_f)
+                }
+                # xml.Dimensions {
+                #   [:length, :width, :height].each do |axis|
+                #     name  = axis.to_s.capitalize
+                #     value = ((imperial ? pkg.inches(axis) : pkg.cm(axis)).to_f*1000).round/1000.0
+                #     xml.name value
+                #   end
+                #   xml.Units (imperial ? 'IN' : 'CM')
+                # }
+              }
+            end
+          }
+        }
+      end
+      builder.to_xml
+    end
 
-        # Version
-        root_node << XmlNode.new('Version') do |version_node|
-          version_node << XmlNode.new('ServiceId', 'crs')
-          version_node << XmlNode.new('Major', '6')
-          version_node << XmlNode.new('Intermediate', '0')
-          version_node << XmlNode.new('Minor', '0')
-        end
-        
-        # Returns delivery dates
-        root_node << XmlNode.new('ReturnTransitAndCommit', true)
-        # Returns saturday delivery shipping options when available
-        root_node << XmlNode.new('VariableOptions', 'SATURDAY_DELIVERY')
-        
-        root_node << XmlNode.new('RequestedShipment') do |rs|
-          rs << XmlNode.new('ShipTimestamp', Time.now)
-          rs << XmlNode.new('DropoffType', options[:dropoff_type] || 'REGULAR_PICKUP')
-          rs << XmlNode.new('PackagingType', options[:packaging_type] || 'YOUR_PACKAGING')
-          
-          rs << build_location_node('Shipper', (options[:shipper] || origin))
-          rs << build_location_node('Recipient', destination)
-          if options[:shipper] and options[:shipper] != origin
-            rs << build_location_node('Origin', origin)
-          end
-          
-          rs << XmlNode.new('RateRequestTypes', 'ACCOUNT')
-          rs << XmlNode.new('PackageCount', packages.size)
-          packages.each do |pkg|
-            rs << XmlNode.new('RequestedPackages') do |rps|
-              rps << XmlNode.new('Weight') do |tw|
-                tw << XmlNode.new('Units', imperial ? 'LB' : 'KG')
-                tw << XmlNode.new('Value', [((imperial ? pkg.lbs : pkg.kgs).to_f*1000).round/1000.0, 0.1].max)
-              end
-              rps << XmlNode.new('Dimensions') do |dimensions|
-                [:length,:width,:height].each do |axis|
-                  value = ((imperial ? pkg.inches(axis) : pkg.cm(axis)).to_f*1000).round/1000.0 # 3 decimals
-                  dimensions << XmlNode.new(axis.to_s.capitalize, value.ceil)
-                end
-                dimensions << XmlNode.new('Units', imperial ? 'IN' : 'CM')
+    def build_ship_request(origin, destination, packages, options={})
+      imperial = ['US','LR','MM'].include?(origin.country_code(:alpha2))
+
+      builder = Nokogiri::XML::Builder.new do |xml|
+        xml.ProcessShipmentRequest('xmlns' => 'http://fedex.com/ws/ship/v12') {
+          build_access_request(xml)
+          xml.Version {
+            xml.ServiceId "ship"
+            xml.Major "12"
+            xml.Intermediate "0"
+            xml.Minor "0"
+          }
+          xml.RequestedShipment {
+            xml.ShipTimestamp options[:ship_date] || DateTime.now.strftime
+            xml.DropoffType options[:dropoff_type] || 'REGULAR_PICKUP'
+            xml.ServiceType options[:service_type] || 'GROUND_HOME_DELIVERY'
+            xml.PackagingType options[:package_type] || 'YOUR_PACKAGING'
+            build_location_node(["Shipper"], (options[:shipper] || origin), xml)
+            build_location_node(["Recipient"], destination, xml)
+            if options[:shipper] && options[:shipper] != origin
+              build_location_node(["Origin"], origin, xml)
+            end
+            xml.ShippingChargesPayment {
+              xml.PaymentType "SENDER"
+              xml.Payor {
+                xml.ResponsibleParty {
+                  xml.AccountNumber @options[:account]
+                  xml.Contact nil
+                }
+              }
+            }
+            xml.SpecialServicesRequested {
+              xml.SpecialServiceTypes "SATURDAY_DELIVERY" if options[:saturday_delivery]
+              if options[:return_shipment]
+                xml.SpecialServiceTypes "RETURN_SHIPMENT"
+                xml.ReturnShipmentDetail {
+                  xml.ReturnType "PRINT_RETURN_LABEL"
+                }
               end
+            }
+            xml.LabelSpecification {
+              xml.LabelFormatType 'COMMON2D'
+              xml.ImageType 'PDF'
+              xml.LabelStockType 'PAPER_7X4.75'
+            }
+            xml.RateRequestTypes 'ACCOUNT'
+            xml.PackageCount packages.size
+            packages.each do |pkg|
+              xml.RequestedPackageLineItems {
+                xml.SequenceNumber 1
+                xml.Weight {
+                  xml.Units (imperial ? 'LB' : 'KG')
+                  xml.Value ((imperial ? pkg.weight : pkg.weight/2.2).to_f)
+                }
+                # xml.Dimensions {
+                #   [:length, :width, :height].each do |axis|
+                #     name  = axis.to_s.capitalize
+                #     value = ((imperial ? pkg.inches(axis) : pkg.cm(axis)).to_f*1000).round/1000.0
+                #     xml.send name, value.to_s
+                #   end
+                #   xml.Units (imperial ? 'IN' : 'CM')
+                # }
+              }
             end
-          end
-          
-        end
+
+            if !!@options[:notifications]
+              xml.SpecialServicesRequested {
+                xml.SpecialServiceTypes "EMAIL_NOTIFICATION"
+                xml.EmailNotificationDetail {
+                  xml.PersonalMessage # Personal Message to be sent to all recipients
+                  @options[:notifications].each do |email|
+                    xml.Recipients {
+                      xml.EmailAddress email.address
+                      xml.NotificationEventsRequested {
+                        xml.EmailNotificationEventType{
+                          xml.ON_DELIVERY  if email.on_delivery
+                          xml.ON_EXCEPTION if email.on_exception
+                          xml.ON_SHIPMENT  if email.on_shipment
+                          xml.ON_TENDER    if email.on_tender
+                        }
+                      }
+                      xml.Format email.format || "HTML" # options are "HTML" "Text" "Wireless"
+                      xml.Localization {
+                        xml.Language email.language || "EN" # Default to EN (English)
+                        xml.LocaleCode email.locale_code if !email.locale_code.nil?
+                      }
+                    }
+                  end
+                  xml.EMailNotificationAggregationType @options[:notification_aggregation_type] if @options.has_key?(:notification_aggregation_type)
+                }
+              }
+            end
+          }
+        }
       end
-      xml_request.to_s
+      builder.to_xml
     end
-    
+
+    def build_delete_request(tracking_number, shipment_type, options={})
+      builder = Nokogiri::XML::Builder.new do |xml|
+        xml.DeleteShipmentRequest('xmlns' => 'http://fedex.com/ws/ship/v12') {
+          build_access_request(xml)
+          xml.Version {
+            xml.ServiceId "ship"
+            xml.Major "12"
+            xml.Intermediate "0"
+            xml.Minor "0"
+          }
+          xml.ShipTimestamp options[:ship_timestamp] if options[:ship_timestamp]
+          xml.TrackingId {
+            xml.TrackingIdType shipment_type
+            xml.TrackingNumber tracking_number
+          }
+          xml.DeletionControl options[:deletion_type] || "DELETE_ALL_PACKAGES"
+        }
+      end
+      builder.to_xml
+    end
+
     def build_tracking_request(tracking_number, options={})
       xml_request = XmlNode.new('TrackRequest', 'xmlns' => 'http://fedex.com/ws/track/v3') do |root_node|
         root_node << build_request_header
-        
+
         # Version
         root_node << XmlNode.new('Version') do |version_node|
           version_node << XmlNode.new('ServiceId', 'trck')
@@ -178,74 +303,81 @@ module Omniship
           version_node << XmlNode.new('Intermediate', '0')
           version_node << XmlNode.new('Minor', '0')
         end
-        
+
         root_node << XmlNode.new('PackageIdentifier') do |package_node|
           package_node << XmlNode.new('Value', tracking_number)
           package_node << XmlNode.new('Type', PackageIdentifierTypes[options['package_identifier_type'] || 'tracking_number'])
         end
-        
+
         root_node << XmlNode.new('ShipDateRangeBegin', options['ship_date_range_begin']) if options['ship_date_range_begin']
         root_node << XmlNode.new('ShipDateRangeEnd', options['ship_date_range_end']) if options['ship_date_range_end']
         root_node << XmlNode.new('IncludeDetailedScans', 1)
       end
       xml_request.to_s
     end
-    
-    def build_request_header
-      web_authentication_detail = XmlNode.new('WebAuthenticationDetail') do |wad|
-        wad << XmlNode.new('UserCredential') do |uc|
-          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])
-        cd << XmlNode.new('MeterNumber', @options[:login])
-      end
-      
-      trasaction_detail = XmlNode.new('TransactionDetail') do |td|
-        td << XmlNode.new('CustomerTransactionId', 'ActiveShipping') # TODO: Need to do something better with this..
-      end
-      
-      [web_authentication_detail, client_detail, trasaction_detail]
+
+    def build_access_request(xml)
+      xml.WebAuthenticationDetail {
+        xml.UserCredential {
+          xml.Key @options[:key]
+          xml.Password @options[:password]
+        }
+      }
+
+      xml.ClientDetail {
+        xml.AccountNumber @options[:account]
+        xml.MeterNumber @options[:meter]
+      }
+
+      xml.TransactionDetail {
+        xml.CustomerTransactionId 'Omniship' # TODO: Need to do something better with this...
+      }
     end
-          
-    def build_location_node(name, location)
-      location_node = XmlNode.new(name) do |xml_node|
-        xml_node << XmlNode.new('Address') do |address_node|
-          address_node << XmlNode.new('PostalCode', location.postal_code)
-          address_node << XmlNode.new("CountryCode", location.country_code(:alpha2))
-
-          address_node << XmlNode.new("Residential", true) unless location.commercial?
-        end
+
+    def build_location_node(name, location, xml)
+      for name in name
+        xml.send(name) {
+          xml.Contact {
+            xml.PersonName location.name unless location.name == "" || location.name == nil
+            xml.CompanyName location.company unless location.company == "" || location.name == nil
+            xml.PhoneNumber location.phone
+          }
+          xml.Address {
+            xml.StreetLines location.address1
+            xml.StreetLines location.address2 unless location.address2.nil?
+            xml.City location.city
+            xml.StateOrProvinceCode location.state
+            xml.PostalCode location.postal_code
+            xml.CountryCode location.country_code(:alpha2)
+            xml.Residential true unless location.commercial?
+          }
+        }
       end
     end
-    
+
     def parse_rate_response(origin, destination, packages, response, options)
-      rate_estimates = []
+      rate_estimates   = []
       success, message = nil
-      
-      xml = REXML::Document.new(response)
-      root_node = xml.elements['RateReply']
-      
+
+      xml = Nokogiri::XML(response).remove_namespaces!
+
       success = response_success?(xml)
       message = response_message(xml)
-      
-      root_node.elements.each('RateReplyDetails') do |rated_shipment|
-        service_code = rated_shipment.get_text('ServiceType').to_s
-        is_saturday_delivery = rated_shipment.get_text('AppliedOptions').to_s == 'SATURDAY_DELIVERY'
-        service_type = is_saturday_delivery ? "#{service_code}_SATURDAY_DELIVERY" : service_code
-        
-        currency = handle_uk_currency(rated_shipment.get_text('RatedShipmentDetails/ShipmentRateDetail/TotalNetCharge/Currency').to_s)
-        rate_estimates << RateEstimate.new(origin, destination, @@name,
-                            self.class.service_name_for_code(service_type),
-                            :service_code => service_code,
-                            :total_price => rated_shipment.get_text('RatedShipmentDetails/ShipmentRateDetail/TotalNetCharge/Amount').to_s.to_f,
-                            :currency => currency,
-                            :packages => packages,
-                            :delivery_range => [rated_shipment.get_text('DeliveryTimestamp').to_s] * 2)
-   end
+
+
+      service_code         = xml.xpath('//ServiceType').text == options[:service_type]
+      is_saturday_delivery = xml.xpath('//AppliedOptions').text == 'SATURDAY_DELIVERY'
+      service_type         = is_saturday_delivery ? "#{service_code}_SATURDAY_DELIVERY" : service_code
+
+      currency = handle_uk_currency(xml.xpath('//RatedShipmentDetails/ShipmentRateDetail/TotalNetCharge/Currency').text)
+      rate_estimates << RateEstimate.new(origin, destination, @@name,
+                          self.class.service_name_for_code(service_type),
+                          :service_code   => service_code,
+                          :total_price    => xml.xpath('//RatedShipmentDetails/ShipmentRateDetail/TotalNetCharge/Amount').text.to_f,
+                          :currency       => currency,
+                          :packages       => packages,
+                          :delivery_range => [xml.xpath('//DeliveryTimestamp').text] * 2)
+
 
       if rate_estimates.empty?
         success = false
@@ -254,28 +386,52 @@ module Omniship
 
       RateResponse.new(success, message, Hash.from_xml(response), :rates => rate_estimates, :xml => response, :request => last_request, :log_xml => options[:log_xml])
     end
-    
+
+    def parse_ship_response(response, options)
+      xml             = Nokogiri::XML(response).remove_namespaces!
+      success         = response_success?(xml)
+      message         = response_message(xml)
+      label           = nil
+      tracking_number = nil
+
+      if success
+        label           = xml.xpath("//Image").text
+        tracking_number = xml.xpath("//TrackingNumber").text
+      else
+        success = false
+        message = "Shipment was not succcessful." if message.blank?
+      end
+      ShipResponse.new(success, message, :tracking_number => tracking_number, :label_encoded => label)
+    end
+
+    def parse_delete_response(response, options={})
+      xml     = Nokogiri::XML(response).remove_namespaces!
+      success = response_success?(xml)
+      message = response_message(xml)
+      return [success, message]
+    end
+
     def parse_tracking_response(response, options)
       xml = REXML::Document.new(response)
       root_node = xml.elements['TrackReply']
-      
+
       success = response_success?(xml)
       message = response_message(xml)
-      
+
       if success
         tracking_number, origin, destination = nil
         shipment_events = []
-        
+
         tracking_details = root_node.elements['TrackDetails']
         tracking_number = tracking_details.get_text('TrackingNumber').to_s
-        
+
         destination_node = tracking_details.elements['DestinationAddress']
         destination = Address.new(
               :country =>     destination_node.get_text('CountryCode').to_s,
               :province =>    destination_node.get_text('StateOrProvinceCode').to_s,
               :city =>        destination_node.get_text('City').to_s
             )
-        
+
         tracking_details.elements.each('Events') do |event|
           address  = event.elements['Address']
 
@@ -284,45 +440,44 @@ module Omniship
           zip_code = address.get_text('PostalCode').to_s
           country  = address.get_text('CountryCode').to_s
           next if country.blank?
-          
+
           location = Address.new(:city => city, :state => state, :postal_code => zip_code, :country => country)
           description = event.get_text('EventDescription').to_s
-          
+
           # for now, just assume UTC, even though it probably isn't
           time = Time.parse("#{event.get_text('Timestamp').to_s}")
           zoneless_time = Time.utc(time.year, time.month, time.mday, time.hour, time.min, time.sec)
-          
+
           shipment_events << ShipmentEvent.new(description, zoneless_time, location)
         end
         shipment_events = shipment_events.sort_by(&:time)
       end
-      
+
       TrackingResponse.new(success, message, Hash.from_xml(response),
-        :xml => response,
-        :request => last_request,
+        :xml             => response,
+        :request         => last_request,
         :shipment_events => shipment_events,
-        :destination => destination,
+        :destination     => destination,
         :tracking_number => tracking_number
       )
     end
-          
-    def response_status_node(document)
-      document.elements['/*/Notifications/']
+
+    def response_status_node(xml)
+      xml.ProcessShipmentReply
     end
-    
-    def response_success?(document)
-      %w{SUCCESS WARNING NOTE}.include? response_status_node(document).get_text('Severity').to_s
+
+    def response_success?(xml)
+      %w{SUCCESS WARNING NOTE}.include? xml.xpath('//Notifications/Severity').text
     end
-    
-    def response_message(document)
-      response_node = response_status_node(document)
-      "#{response_status_node(document).get_text('Severity').to_s} - #{response_node.get_text('Code').to_s}: #{response_node.get_text('Message').to_s}"
+
+    def response_message(xml)
+      "#{xml.xpath('//Notifications/Severity').text} - #{xml.xpath('//Notifications/Code').text}: #{xml.xpath('//Notifications/Message').text}"
     end
-    
+
     def commit(request, test = false)
-      ssl_post(test ? TEST_URL : LIVE_URL, request.gsub("\n",''))        
+      ssl_post(test ? TEST_URL : LIVE_URL, request)
     end
-    
+
     def handle_uk_currency(currency)
       currency =~ /UKL/i ? 'GBP' : currency
     end