fedex 2.2.2 → 3.0.0

data/Readme.md

@@ -188,7 +188,12 @@ Documentation for setting up Paperclip with Amazon S3 can be found in the Paperc
 To track a shipment:
 
 ```ruby
-tracking_info = fedex.track(:tracking_number => "1234567890123")
+results = fedex.track(:tracking_number => "1234567890123")
+# => [#<Fedex::TrackingInformation>]
+
+# Pull the first result from the returned array
+#
+tracking_info = results.first
 
 tracking_info.tracking_number
 # => "1234567890123"
@@ -242,6 +247,7 @@ Fedex::Shipment::DROP_OFF_TYPES
 - [geermc4](https://github.com/geermc4) (German Garcia)
 - [janders223] (https://github.com/janders223) (Jim Anders)
 - [jlambert121] (https://github.com/jlambert121) (Justin Lambert)
+- [sborsje] (https://github.com/sborsje) (Stefan Borsje)
 
 # Copyright/License:
 Copyright 2011 [Jazmin Schroeder](http://jazminschroeder.com)

data/fedex.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "fedex"
 
-  s.add_dependency 'httparty',            '~> 0.9.0'
+  s.add_dependency 'httparty',            '~> 0.10.0'
   s.add_dependency 'nokogiri',            '~> 1.5.0'
 
   s.add_development_dependency "rspec",   '~> 2.9.0'

data/lib/fedex/request/base.rb

@@ -261,8 +261,8 @@ module Fedex
             value.each do |v|
               xml.send element do |x|
                 hash_to_xml(x, v)
-              end  
-            end  
+              end
+            end
           else
             xml.send element, value
           end

data/lib/fedex/request/tracking_information.rb

@@ -25,7 +25,6 @@ module Fedex
       end
 
       def process_request
-        puts build_xml
         api_response = self.class.post(api_url, :body => build_xml)
         puts api_response if @debug == true
         response = parse_response(api_response)
@@ -33,7 +32,9 @@ module Fedex
         if success?(response)
           options = response[:track_reply][:track_details]
 
-          Fedex::TrackingInformation.new(options)
+          [options].flatten.map do |details|
+            Fedex::TrackingInformation.new(details)
+          end
         else
           error_message = if response[:track_reply]
             response[:track_reply][:notifications][:message]
@@ -54,18 +55,16 @@ module Fedex
             add_client_detail(xml)
             add_version(xml)
             add_package_identifier(xml)
-            xml.IncludeDetailedScans @include_detailed_scans
-
-            # Optional
-            xml.TrackingNumberUniqueIdentifier @uuid if @uuid
-            xml.PagingToken @paging_token            if @paging_token
+            xml.TrackingNumberUniqueIdentifier @uuid         if @uuid
+            xml.IncludeDetailedScans           @include_detailed_scans
+            xml.PagingToken                    @paging_token if @paging_token
           }
         end
         builder.doc.root.to_xml
       end
 
       def service
-        { :id => 'trck', :version => 5 }
+        { :id => 'trck', :version => 6 }
       end
 
       def add_package_identifier(xml)

data/lib/fedex/tracking_information.rb

@@ -29,20 +29,22 @@ module Fedex
     }
 
     attr_reader :tracking_number, :signature_name, :service_type, :status,
-                :delivery_at, :events
+                :delivery_at, :events, :unique_tracking_number
 
     def initialize(details = {})
       @details = details
 
-      @tracking_number = details[:tracking_number]
-      @signature_name  = details[:delivery_signature_name]
-      @service_type    = details[:service_type]
-      @status          = details[:status_description]
+      @tracking_number        = details[:tracking_number]
+      @unique_tracking_number = details[:tracking_number_unique_identifier]
+      @signature_name         = details[:delivery_signature_name]
+      @service_type           = details[:service_type]
+      @status                 = details[:status_description]
+
       if details.has_key?(:actual_delivery_timestamp)
-        @delivery_at = Time.parse(details[:actual_delivery_timestamp]) 
+        @delivery_at = Time.parse(details[:actual_delivery_timestamp])
       end
 
-      @events = details[:events].map do |event_details|
+      @events = [details[:events]].flatten.compact.map do |event_details|
         Event.new(event_details)
       end
     end

data/lib/fedex/tracking_information/event.rb

@@ -2,18 +2,20 @@ module Fedex
   class TrackingInformation
     class Event
       attr_reader :description, :type, :occured_at, :city, :state, :postal_code,
-                  :country, :residential
+                  :country, :residential, :exception_code, :exception_description
 
       def initialize(details = {})
-        @description  = details[:event_description]
-        @type         = details[:event_type]
-        @occured_at   = Time.parse(details[:timestamp])
-        @city         = details[:address][:city]
-        @state        = details[:address][:state_or_province_code]
-        @postal_code  = details[:address][:postal_code]
-        @country      = details[:address][:country_code]
-        @residential  = details[:address][:residential] == "true"
+        @description           = details[:event_description]
+        @type                  = details[:event_type]
+        @occured_at            = Time.parse(details[:timestamp])
+        @city                  = details[:address][:city]
+        @state                 = details[:address][:state_or_province_code]
+        @postal_code           = details[:address][:postal_code]
+        @country               = details[:address][:country_code]
+        @residential           = details[:address][:residential] == "true"
+        @exception_code        = details[:status_exception_code]
+        @exception_description = details[:status_exception_description]
       end
     end
   end
-end
+end

data/lib/fedex/version.rb

@@ -1,3 +1,3 @@
 module Fedex
-  VERSION = "2.2.2"
+  VERSION = "3.0.0"
 end

data/spec/lib/fedex/track_spec.rb

@@ -6,16 +6,25 @@ module Fedex
 
     context "shipments with tracking number", :vcr, :focus do
       let(:options) do
-        { :package_id             => "077973360403984",
+        { :package_id             => "123456789012",
           :package_type           => "TRACKING_NUMBER_OR_DOORTAG",
           :include_detailed_scans => true
         }
       end
 
+      let(:uuid) { "12012~123456789012~FDEG" }
+
+      it "returns an array of tracking information results" do
+        results = fedex.track(options)
+        results.should_not be_empty
+      end
+
       it "returns events with tracking information" do
-        tracking_info = fedex.track(options)
+        options[:uuid] = uuid
+
+        tracking_info = fedex.track(options).first
 
-        tracking_info.events.count.should == 7
+        tracking_info.events.should_not be_empty
       end
 
       it "fails if using an invalid package type" do
@@ -27,22 +36,19 @@ module Fedex
       end
 
       it "allows short hand tracking number queries" do
-        shorthand_options = options
+        shorthand_options = { :tracking_number => options[:package_id] }
 
-        shorthand_options.delete(:package_type)
-        tracking_number = shorthand_options.delete(:package_id)
+        tracking_info = fedex.track(shorthand_options).first
 
-        shorthand_options[:tracking_number] = tracking_number
-
-        tracking_info = fedex.track(shorthand_options)
-
-        tracking_info.tracking_number.should == tracking_number
+        tracking_info.tracking_number.should == options[:package_id]
       end
 
       it "reports the status of the package" do
-        tracking_info = fedex.track(options)
+        options[:uuid] = uuid
+
+        tracking_info = fedex.track(options).first
 
-        tracking_info.status.should == "Delivered"
+        tracking_info.status.should == "In transit"
       end
 
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fedex
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 3.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-17 00:00:00.000000000 Z
+date: 2013-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &70199311767300 !ruby/object:Gem::Requirement
+  requirement: &70168051584480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.10.0
   type: :runtime
   prerelease: false
-  version_requirements: *70199311767300
+  version_requirements: *70168051584480
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70199311766780 !ruby/object:Gem::Requirement
+  requirement: &70168051583980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70199311766780
+  version_requirements: *70168051583980
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70199311766300 !ruby/object:Gem::Requirement
+  requirement: &70168051583460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.9.0
   type: :development
   prerelease: false
-  version_requirements: *70199311766300
+  version_requirements: *70168051583460
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &70199311765820 !ruby/object:Gem::Requirement
+  requirement: &70168051582920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *70199311765820
+  version_requirements: *70168051582920
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70199311765440 !ruby/object:Gem::Requirement
+  requirement: &70168051582460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70199311765440
+  version_requirements: *70168051582460
 description: Provides an interface to Fedex Web Services(version 10) - shipping rates,
   generate labels and address validation
 email: