binarylogic-shippinglogic 0.9.0 → 1.0.0

data/README.rdoc

@@ -31,25 +31,34 @@ You can also install this as a plugin:
 
 See below for usage examples.
 
-== Usage
+== Simple tracking example
 
-What's unique about this library is it's usage / syntax. Let me show you...
-
-=== Calls to the web services are lazy
-
-A simple example where we want to track a FedEx package:
+What I think is unique about this library is it's usage / syntax:
+  
+  fedex = Shippinglogic::FedEx.new(key, password, account, meter)
+  tracking = fedex.track(:tracking_number => "XXXXXXXXXXXXXXXXX")
+  # => A proxy object that delegates calls to an array of Shippinglogic::FedEx::Track::Event objects
+  
+  # this shows that the tracking object is a proxy for the underlying array
+  tracking.tracking_number
+  # => "XXXXXXXXXXXXXXXXX"
+  
+  tracking.first
+  # => #<Shippinglogic::FedEx::Track::Event @postal_code="95817", @name="Delivered", @state="CA", @residential=false,
+  #    @city="Sacramento", @type="DL", @country="US", @occured_at=Mon Dec 08 10:43:37 -0500 2008>
+  
+  tracking.first.name
+  # => "Delivered"
 
-  fedex = Shippinglogic::FedEx.new(key, password, account, meter) # all credentials FedEx requires
-  tracking = fedex.track(:tracking_number => "077973360403984")
+== Calls to the web services are lazy
 
-Now here is why this is cool. Nothing has happened yet. No call has been made to the FedEx servers, etc. We do this because we don't need it yet. You don't need it until you start using the object. Lets continue with our example:
+In our above example, you will notice we are able to access attributes, while at the same time able to treat the object as an array. That's because the object is not actually an array, it acts as a proxy for the underlying array.
 
-  tracking.first  # call is made to FedEx and returns the first tracking result in the array
-  tracking.size   # cache is used to determine the size of the array
+That being said, a request is not sent to FedEx until we need to deal with the underlying array. Meaning it's lazy, which is more efficient. Most would think the request to FedEx was sent when we initialized the object. This is not the case. The request to FedEx was sent when we executed "tracking.first".
 
-This is similar to how ActiveRecord's association proxies work. When you call user.orders no database activity occurs until you actually use the object.
+This is similar to how ActiveRecord's association proxies work. When you call "user.orders" no database activity occurs until you actually use the object (Ex: user.orders.each).
 
-=== Flexibility
+== Flexibility
 
 You will notice above we assign the result of the 'track' method to a variable called 'tracking'. That object has more to it:
 
@@ -68,7 +77,6 @@ You will notice above we assign the result of the 'track' method to a variable c
   tracking.tracking_number
   # => "ZZZZZZZZZZZZZZZZ"
   
-  # Mass attribute reading
   tracking.attributes
   # => {:tracking_number => "ZZZZZZZZZZZZZZZZ"}
 
@@ -76,14 +84,19 @@ You will notice above we assign the result of the 'track' method to a variable c
 
 This library is still very new, as a result only FedEx is support at this time. More will come.
 
+I spent a lot of time on the documentation, for examples of how to use each service please see the docs for their respective classes.
+
 === FedEx
 
 1. <b>Tracking</b> - See Shippinglogic::Fedex::Track
-1. <b>Getting service rates</b> - See Shippinglogic::Fedex::Rates
+2. <b>Signature proof of delivery</b> - See Shippinglogic::Fedex::Signature
+3. <b>Getting service rates</b> - See Shippinglogic::Fedex::Rate
+4. <b>Creating shipments w/ labels</b> - See Shippinglogic::Fedex::Ship
+5. <b>Canceling shipments</b> - See Shippinglogic::Fedex::Cancel
 
 === Add your own services
 
-Simply fork the project and make your changes. If you want to add support for a new service it should be fairly straight forward. Checkout the code in Shippinglogic::Fedex::Track, it very simple and easy to follow. It's a great place to start because its the simplest of services.
+Simply fork the project and make your changes. If you want to add support for a new service it is very straight forward. Checkout the code in Shippinglogic::Fedex::Track, it very simple and easy to follow. It's a great place to start because its the simplest of services.
 
 == Interface integration
 

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :patch: 0
-:major: 0
-:minor: 9
+:major: 1
+:minor: 0

data/lib/shippinglogic/fedex.rb

@@ -1,6 +1,9 @@
 require "shippinglogic/fedex/error"
 require "shippinglogic/fedex/service"
-require "shippinglogic/fedex/rates"
+require "shippinglogic/fedex/cancel"
+require "shippinglogic/fedex/rate"
+require "shippinglogic/fedex/ship"
+require "shippinglogic/fedex/signature"
 require "shippinglogic/fedex/track"
 
 module Shippinglogic
@@ -53,8 +56,20 @@ module Shippinglogic
       self.options = self.class.options.merge(options)
     end
     
-    def rates(attributes = {})
-      @rates ||= Rates.new(self, attributes)
+    def cancel(attributes = {})
+      @cancel ||= Cancel.new(self, attributes)
+    end
+    
+    def rate(attributes = {})
+      @rate ||= Rate.new(self, attributes)
+    end
+    
+    def ship(attributes = {})
+      @ship ||= Ship.new(self, attributes)
+    end
+    
+    def signature(attributes = {})
+      @signature ||= Signature.new(self, attributes)
     end
     
     def track(attributes = {})

data/lib/shippinglogic/fedex/attributes.rb

@@ -64,11 +64,11 @@ module Shippinglogic
         
         private
           def attribute_names
-            self.class.attribute_names
+            real_class.attribute_names
           end
           
           def attribute_options(name)
-            self.class.attribute_options(name)
+            self.real_class.attribute_options(name)
           end
           
           def attribute_type(name)
@@ -79,7 +79,7 @@ module Shippinglogic
             default = attribute_options(name)[:default]
             case default
             when Proc
-              default.call
+              default.call(self)
             else
               default
             end

data/lib/shippinglogic/fedex/cancel.rb

@@ -0,0 +1,47 @@
+module Shippinglogic
+  class FedEx
+    # An interface to the shipment canceling service provided by FedEx. Allows you to cancel a shipment
+    #
+    # == Accessor methods / options
+    #
+    # * <tt>tracking_number</tt> - the tracking number
+    # * <tt>deletion_control</tt> - one of DELETION_CONTROL (default: DELETE_ALL_PACKAGES)
+    #
+    # === Simple Example
+    #
+    #   fedex = Shippinglogic::FedEx.new(key, password, account, meter)
+    #   cancel = fedex.cancel(:tracking_number => "my number")
+    #   cancel.perform
+    #   # => true
+    class Cancel < Service
+      VERSION = {:major => 6, :intermediate => 0, :minor => 0}
+      
+      attribute :tracking_number,     :string
+      attribute :deletion_control,    :string,  :default => "DELETE_ALL_PACKAGES"
+      
+      # Our services are set up as a proxy. We need to access the underlying object, to trigger the request
+      # to fedex. So calling this method is a way to do that since there really is no underlying object
+      def perform
+        target && true
+      end
+      
+      private
+        # The parent class Service requires that we define this method. This is our kicker. This method is only
+        # called when we need to deal with information from FedEx. Notice the caching into the @target variable.
+        def target
+          @target ||= request(build_request)
+        end
+        
+        # Just building some XML to send off to FedEx. FedEx require this particualr format.
+        def build_request
+          b = builder
+          xml = b.DeleteShipmentRequest(:xmlns => "http://fedex.com/ws/ship/v#{VERSION[:major]}") do
+            build_authentication(b)
+            build_version(b, "ship", VERSION[:major], VERSION[:intermediate], VERSION[:minor])
+            b.TrackingNumber tracking_number
+            b.DeletionControl deletion_control
+          end
+        end
+    end
+  end
+end

data/lib/shippinglogic/fedex/error.rb

@@ -16,31 +16,41 @@ module Shippinglogic
     #     # to get the raw response from fedex
     #   end
     class Error < StandardError
-      attr_accessor :code, :message, :response
+      attr_accessor :errors, :response
       
       def initialize(response)
         self.response = response
         
         if response.blank?
-          self.message = "The response from FedEx was blank."
+          add_error("The response from FedEx was blank.")
         elsif !response.is_a?(Hash)
-          self.message = "The response from FedEx was malformed and was not in a valid XML format."
+          add_error("The response from FedEx was malformed and was not in a valid XML format.")
         elsif notifications = response[:notifications]
-          self.code = notifications[:code]
-          self.message = notifications[:message]
+          notifications = notifications.is_a?(Array) ? notifications : [notifications]
+          notifications.each { |notification| add_error(notification[:message], notification[:code]) }
         elsif response[:"soapenv:fault"] && detail = response[:"soapenv:fault"][:detail][:"con:fault"]
-          self.code = detail[:"con:error_code"]
-          self.message = detail[:"con:reason"]
+          add_error(detail[:"con:reason"], detail[:"con:error_code"])
+          
+          if detail[:"con:details"] && detail[:"con:details"][:"con1:validation_failure_detail"] && messages = detail[:"con:details"][:"con1:validation_failure_detail"][:"con1:message"]
+            messages = messages.is_a?(Array) ? messages : [messages]
+            messages.each { |message| add_error(message) }
+          end
         else
-          self.message = "There was a problem with your fedex request, and we couldn't locate a specific error message. This means your response " +
+          add_error(
+            "There was a problem with your fedex request, and we couldn't locate a specific error message. This means your response " +
             "was in an unexpected format. You might try glancing at the raw response by using the 'response' method on this error object."
+          )
         end
         
-        error_message = ""
-        error_message += "(Error: #{code}) " if code
-        error_message = message
-        
-        super(error_message)
+        super(errors.collect { |error| error[:message] }.to_sentence)
+      end
+      
+      def add_error(error, code = nil)
+        errors << {:message => error, :code => code}
+      end
+      
+      def errors
+        @errors ||= []
       end
     end
   end

data/lib/shippinglogic/fedex/{rates.rb → rate.rb}

@@ -3,7 +3,8 @@ module Shippinglogic
     # An interface to the rate services provided by FedEx. Allows you to get an array of rates from fedex for a shipment,
     # or a single rate for a specific service.
     #
-    # == Accessor methods / options
+    # == Options
+    # === Shipper options
     #
     # * <tt>shipper_streets</tt> - street part of the address, separate multiple streets with a new line, dont include blank lines.
     # * <tt>shipper_city</tt> - city part of the address.
@@ -11,71 +12,86 @@ module Shippinglogic
     # * <tt>shipper_postal_code</tt> - postal code part of the address. Ex: zip for the US.
     # * <tt>shipper_country</tt> - country code part of the address, use abbreviations, ex: 'US'
     # * <tt>shipper_residential</tt> - a boolean value representing if the address is redential or not (default: false)
+    #
+    # === Recipient options
+    #
     # * <tt>recipient_streets</tt> - street part of the address, separate multiple streets with a new line, dont include blank lines.
     # * <tt>recipient_city</tt> - city part of the address.
     # * <tt>recipient_state</tt> - state part of the address, use state abreviations.
     # * <tt>recipient_postal_code</tt> - postal code part of the address. Ex: zip for the US.
     # * <tt>recipient_country</tt> - country code part of the address, use abbreviations, ex: 'US'
     # * <tt>recipient_residential</tt> - a boolean value representing if the address is redential or not (default: false)
-    # * <tt>service_type</tt> - one of SERVICE_TYPES, this is optional, leave this blank if you want a list of all
-    #   available services. (default: nil)
+    #
+    # === Packaging options
+    #
+    # One thing to note is that FedEx does support multiple package shipments. The problem is that all of the packages must be identical.
+    # FedEx specifically notes in their documentation that mutiple package specifications are not allowed. So your only option for a
+    # multi package shipment is to increase the package_count option and keep the dimensions and weight the same for all packages. Then again,
+    # the documentation for the FedEx web services is terrible, so I could be wrong. Any tests I tried resulted in an error though.
+    #
     # * <tt>packaging_type</tt> - one of PACKAGE_TYPES. (default: YOUR_PACKAGING)
-    # * <tt>packages</tt> - an array of packages included in the shipment. This should be an array of hashes with the following keys:
-    #   * <tt>:weight</tt> - the weight
-    #   * <tt>:weight_units</tt> - either LB or KG. (default: LB)
-    #   * <tt>:length</tt> - the length.
-    #   * <tt>:width</tt> - the width.
-    #   * <tt>:height</tt> - the height.
-    #   * <tt>:dimension_units</tt> - either IN or CM. (default: IN)
-    # * <tt>ship_time</tt> - a Time object representing when you want to ship the package. (default: Time.now)
-    # * <tt>dropoff_type</tt> - one of DROP_OFF_TYPES. (default: REGULAR_PICKUP)
-    # * <tt>include_transit_times</tt> - whether or not to include estimated transit times. (default: true)
-    # * <tt>delivery_deadline</tt> - whether or not to include estimated transit times. (default: true)
-    # * <tt>special_services_requested</tt> - any exceptions or special services FedEx needs to be aware of, this should be
-    #   one or more of SPECIAL_SERVICES. (default: nil)
+    # * <tt>package_count</tt> - the number of packages in your shipment. (default: 1)
+    # * <tt>package_weight</tt> - a single packages weight.
+    # * <tt>package_weight_units</tt> - either LB or KG. (default: LB)
+    # * <tt>package_length</tt> - a single packages length.
+    # * <tt>package_width</tt> - a single packages width.
+    # * <tt>package_height</tt> - a single packages height.
+    # * <tt>package_dimension_units</tt> - either IN or CM. (default: IN)
+    #
+    # === Monetary options
+    #
     # * <tt>currency_type</tt> - the type of currency. (default: nil, because FedEx will default to your account preferences)
-    # * <tt>rate_request_types</tt> - one or more of RATE_REQUEST_TYPES. (default: ACCOUNT)
     # * <tt>insured_value</tt> - the value you want to insure, if any. (default: nil)
     # * <tt>payment_type</tt> - one of PAYMENT_TYPES. (default: SENDER)
     # * <tt>payor_account_number</tt> - if the account paying for this ship is different than the account you specified then
-    #   you can specify that here. (default: nil)
+    #   you can specify that here. (default: your account number)
     # * <tt>payor_country</tt> - the country code for the account number. (default: US)
     #
-    # === Simple Example
+    # === Delivery options
+    #
+    # * <tt>ship_time</tt> - a Time object representing when you want to ship the package. (default: Time.now)
+    # * <tt>service_type</tt> - one of SERVICE_TYPES, this is optional, leave this blank if you want a list of all
+    #   available services. (default: nil)
+    # * <tt>delivery_deadline</tt> - whether or not to include estimated transit times. (default: true)
+    # * <tt>dropoff_type</tt> - one of DROP_OFF_TYPES. (default: REGULAR_PICKUP)
+    # * <tt>special_services_requested</tt> - any exceptions or special services FedEx needs to be aware of, this should be
+    #   one or more of SPECIAL_SERVICES. (default: nil)
+    #
+    # === Misc options
+    #
+    # * <tt>rate_request_types</tt> - one or more of RATE_REQUEST_TYPES. (default: ACCOUNT)
+    # * <tt>include_transit_times</tt> - whether or not to include estimated transit times. (default: true)
+    #
+    # == Simple Example
     #
     # Here is a very simple example. Mix and match the options above to get more accurate rates:
     #
     #   fedex = Shippinglogic::FedEx.new(key, password, account, meter)
-    #   fedex.rates(
+    #   rates = fedex.rate(
     #     :shipper_postal_code => "10007",
     #     :shipper_country => "US",
     #     :recipient_postal_code => "75201",
-    #     :recipient_country_code => "US"
-    #     :packages => [{:weight => 24, :length => 12, :width => 12, :height => 12}]
+    #     :recipient_country_code => "US",
+    #     :package_weight => 24,
+    #     :package_length => 12,
+    #     :package_width => 12,
+    #     :package_height => 12
     #   )
-    class Rates < Service
+    #
+    #   rates.first
+    #   #<Shippinglogic::FedEx::Rates::Rate @currency="USD", @name="First Overnight", @cost=#<BigDecimal:19ea290,'0.7001E2',8(8)>,
+    #     @deadline=Fri Aug 07 08:00:00 -0400 2009, @type="FIRST_OVERNIGHT", @saturday=false>
+    #   
+    #   # to show accessor methods
+    #   rates.first.name
+    #   # => "First Overnight"
+    class Rate < Service
       # Each rate result is an object of this class
-      class Rate; attr_accessor :name, :type, :saturday, :deadline, :cost, :currency; end
+      class Rate; attr_accessor :name, :type, :saturday, :deadline, :rate, :currency; end
       
       VERSION = {:major => 6, :intermediate => 0, :minor => 0}
-      DROP_OFF_TYPES = ["REGULAR_PICKUP", "REQUEST_COURIER", "DROP_BOX", "BUSINESS_SERVICE_CENTER", "STATION"]
-      PACKAGE_TYPES = ["FEDEX_ENVELOPE", "FEDEX_PAK", "FEDEX_BOX", "FEDEX_TUBE", "FEDEX_10KG_BOX", "FEDEX_25KG_BOX", "YOUR_PACKAGING"]
-      SPECIAL_SERVICES = [
-        "APPOINTMENT_DELIVERY", "DANGEROUS_GOODS", "DRY_ICE", "NON_STANDARD_CONTAINER", "PRIORITY_ALERT", "SIGNATURE_OPTION",
-        "FEDEX_FREIGHT", "FEDEX_NATIONAL_FREIGHT", "INSIDE_PICKUP", "INSIDE_DELIVERY", "EXHIBITION", "EXTREME_LENGTH", "FLATBED_TRAILER",
-        "FREIGHT_GUARANTEE", "LIFTGATE_DELIVERY", "LIFTGATE_PICKUP", "LIMITED_ACCESS_DELIVERY", "LIMITED_ACCESS_PICKUP", "PRE_DELIVERY_NOTIFICATION",
-        "PROTECTION_FROM_FREEZING", "REGIONAL_MALL_DELIVERY", "REGIONAL_MALL_PICKUP"
-      ]
-      RATE_REQUEST_TYPES = ["ACCOUNT", "LIST", "MULTIWEIGHT"]
-      PAYMENT_TYPES = ["SENDER", "CASH", "CREDIT_CARD"]
-      SERVICE_TYPES = [
-        "INTERNATIONAL_FIRST", "FEDEX_3_DAY_FREIGHT", "STANDARD_OVERNIGHT", "PRIORITY_OVERNIGHT", "FEDEX_GROUND", "INTERNATIONAL_PRIORITY",
-        "FIRST_OVERNIGHT", "FEDEX_1_DAY_FREIGHT", "FEDEX_2_DAY_FREIGHT", "INTERNATIONAL_GROUND", "INTERNATIONAL_ECONOMY_FREIGHT", "INTERNATIONAL_ECONOMY",
-        "FEDEX_1_DAY_FREIGHT_SATURDAY_DELIVERY", "INTERNATIONAL_PRIORITY_FREIGHT", "FEDEX_2_DAY_FREIGHT_SATURDAY_DELIVERY", "FEDEX_2_DAY_SATURDAY_DELIVERY",
-        "FEDEX_3_DAY_FREIGHT_SATURDAY_DELIVERY", "FEDEX_2_DAY", "PRIORITY_OVERNIGHT_SATURDAY_DELIVERY", "INTERNATIONAL_PRIORITY_SATURDAY_DELIVERY",
-        "FEDEX_EXPRESS_SAVER", "GROUND_HOME_DELIVERY"
-      ]
       
+      # shipper options
       attribute :shipper_streets,             :string
       attribute :shipper_city,                :string
       attribute :shipper_state,               :string
@@ -83,6 +99,7 @@ module Shippinglogic
       attribute :shipper_country,             :string
       attribute :shipper_residential,         :boolean,     :default => false
       
+      # recipient options
       attribute :recipient_streets,           :string
       attribute :recipient_city,              :string
       attribute :recipient_state,             :string
@@ -90,27 +107,40 @@ module Shippinglogic
       attribute :recipient_country,           :string
       attribute :recipient_residential,       :boolean,     :default => false
       
-      attribute :service_type,                :string
+      # packaging options
       attribute :packaging_type,              :string,      :default => "YOUR_PACKAGING"
-      attribute :packages,                    :array
-      attribute :ship_time,                   :datetime,    :default => lambda { Time.now }
-      attribute :dropoff_type,                :boolean,     :default => "REGULAR_PICKUP"
-      attribute :include_transit_times,       :boolean,     :default => true
-      attribute :delivery_deadline,           :datetime
-      attribute :special_services_requested,  :array
+      attribute :package_count,               :integer,     :default => 1
+      attribute :package_weight,              :integer
+      attribute :package_weight_units,        :string,      :default => "LB"
+      attribute :package_length,              :integer
+      attribute :package_width,               :integer
+      attribute :package_height,              :integer
+      attribute :package_dimension_units,     :string,      :default => "IN"
+      
+      # monetary options
       attribute :currency_type,               :string
-      attribute :rate_request_types,          :array,       :default => ["ACCOUNT"]
       attribute :insured_value,               :big_decimal
       attribute :payment_type,                :string,      :default => "SENDER"
-      attribute :payor_account_number,        :string
-      attribute :payor_country,               :string,      :default => "US"
+      attribute :payor_account_number,        :string,      :default => lambda { |shipment| shipment.base.account }
+      attribute :payor_country,               :string
+      
+      # delivery options
+      attribute :ship_time,                   :datetime,    :default => lambda { |rate| Time.now }
+      attribute :service_type,                :string
+      attribute :delivery_deadline,           :datetime
+      attribute :dropoff_type,                :string,      :default => "REGULAR_PICKUP"
+      attribute :special_services_requested,  :array
+      
+      # misc options
+      attribute :rate_request_types,          :array,       :default => ["ACCOUNT"]
+      attribute :include_transit_times,       :boolean,     :default => true
       
       private
         def target
-          @target ||= parse_rate_response(request(build_rate_request))
+          @target ||= parse_response(request(build_request))
         end
         
-        def build_rate_request
+        def build_request
           b = builder
           xml = b.RateRequest(:xmlns => "http://fedex.com/ws/rate/v#{VERSION[:major]}") do
             build_authentication(b)
@@ -119,7 +149,7 @@ module Shippinglogic
             b.SpecialServicesRequested special_services_requested.join(",") if special_services_requested.any?
             
             b.RequestedShipment do
-              b.ShipTimestamp ship_time.xmlschema
+              b.ShipTimestamp ship_time.xmlschema if ship_time
               b.ServiceType service_type if service_type
               b.DropoffType dropoff_type if dropoff_type
               b.PackagingType packaging_type if packaging_type
@@ -127,73 +157,40 @@ module Shippinglogic
               b.Shipper { build_address(b, :shipper) }
               b.Recipient { build_address(b, :recipient) }
               b.ShippingChargesPayment do
-                b.PaymentType payment_type
-                if payor_account_number && payor_country_code
-                  b.Payor do
-                    b.AccountNumber payor_account_number
-                    b.CountryCode payor_country
-                  end
+                b.PaymentType payment_type if payment_type
+                b.Payor do
+                  b.AccountNumber payor_account_number if payor_account_number
+                  b.CountryCode payor_country if payor_country
                 end
               end
-              b.RateRequestTypes rate_request_types.join(",")
-              b.PackageCount packages.size
-              b.PackageDetail "INDIVIDUAL_PACKAGES"
-              
-              packages.each { |package| build_package(b, package) }
+              b.RateRequestTypes rate_request_types.join(",") if rate_request_types
+              build_package(b)
             end
           end
         end
         
-        def build_address(b, type)
-          b.Address do
-            b.StreetLines send("#{type}_streets") if send("#{type}_streets")
-            b.City send("#{type}_city") if send("#{type}_city")
-            b.StateOrProvinceCode send("#{type}_state") if send("#{type}_state")
-            b.PostalCode send("#{type}_postal_code") if send("#{type}_postal_code")
-            b.CountryCode send("#{type}_country") if send("#{type}_country")
-            b.Residential send("#{type}_residential")
-          end
-        end
-        
-        def build_package(b, package)
-          package.symbolize_keys! if package.respond_to?(:symbolize_keys!)
-          validate_package(package)
-          
-          b.RequestedPackages do
-            b.Weight do
-              b.Units package[:weight_units] || "LB"
-              b.Value package[:weight]
-            end
-            
-            b.Dimensions do
-              b.Length package[:length]
-              b.Width package[:width]
-              b.Height package[:height]
-              b.Units package[:dimension_units] || "IN"
-            end
-          end
-        end
-        
-        def validate_package(package)
-          raise ArgumentError.new("Each package much be in a Hash format") if !package.is_a?(Hash)
-          package.assert_valid_keys(:weight, :weight_units, :length, :height, :width, :dimension_units)
-        end
-        
-        def parse_rate_response(response)
+        def parse_response(response)
           response[:rate_reply_details].collect do |details|
             shipment_detail = details[:rated_shipment_details].is_a?(Array) ? details[:rated_shipment_details].first : details[:rated_shipment_details]
             cost = shipment_detail[:shipment_rate_detail][:total_net_charge]
+            deadline = details[:delivery_timestamp] && Time.parse(details[:delivery_timestamp])
+            
+            next if delivery_deadline && !meets_deadline?(delivery_deadline)
             
             rate = Rate.new
             rate.name = details[:service_type].titleize
             rate.type = details[:service_type]
             rate.saturday = details[:applied_options] == "SATURDAY_DELIVERY"
             rate.deadline = details[:delivery_timestamp] && Time.parse(details[:delivery_timestamp])
-            rate.cost = BigDecimal.new(cost[:amount])
+            rate.rate = BigDecimal.new(cost[:amount])
             rate.currency = cost[:currency]
             rate
           end
         end
+        
+        def meets_deadline?(delivery_deadline)
+          !deadline || deadline > delivery_deadline
+        end
     end
   end
 end