active_shipping 0.9.14 → 0.9.15

data/MIT-LICENSE

@@ -13,8 +13,8 @@ included in all copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOa AND
-NONINFRINGEMENT. IN NO EVENT SaALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.markdown

@@ -1,5 +1,7 @@
 # Active Shipping
 
+![Build Status](https://travis-ci.org/Shopify/active_shipping.png)
+
 This library interfaces with the web services of various shipping carriers. The goal is to abstract the features that are most frequently used into a pleasant and consistent Ruby API. Active Shipping is an extension of [Active Merchant][], and as such, it borrows heavily from conventions used in the latter.
 
 Active Shipping is currently being used and improved in a production environment for [Shopify][]. Development is being done by the Shopify integrations team (<integrations-team@shopify.com>). Discussion is welcome in the [Active Merchant Google Group][discuss].

data/lib/active_shipping/shipping/carrier.rb

@@ -65,6 +65,17 @@ module ActiveMerchant
       def save_request(r)
         @last_request = r
       end
+
+      def timestamp_from_business_day(days)
+        return unless days
+        date = DateTime.now.utc
+        days.times do
+          begin
+            date = date + 1
+          end until ![0,6].include?(date.wday)
+        end
+        date
+      end
     end
   end
 end

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

@@ -1,6 +1,7 @@
 # FedEx module by Jimmy Baker
 # http://github.com/jimmyebaker
 
+require 'date'
 module ActiveMerchant
   module Shipping
     
@@ -85,6 +86,45 @@ module ActiveMerchant
         'express_mps_master' => 'EXPRESS_MPS_MASTER'
       }
 
+
+      TransitTimes = ["UNKNOWN","ONE_DAY","TWO_DAYS","THREE_DAYS","FOUR_DAYS","FIVE_DAYS","SIX_DAYS","SEVEN_DAYS","EIGHT_DAYS","NINE_DAYS","TEN_DAYS","ELEVEN_DAYS","TWELVE_DAYS","THIRTEEN_DAYS","FOURTEEN_DAYS","FIFTEEN_DAYS","SIXTEEN_DAYS","SEVENTEEN_DAYS","EIGHTEEN_DAYS"]
+
+      # FedEx tracking codes as described in the FedEx Tracking Service WSDL Guide
+      # All delays also have been marked as exceptions
+      TRACKING_STATUS_CODES = HashWithIndifferentAccess.new({
+        'AA' => :at_airport,
+        'AD' => :at_delivery,
+        'AF' => :at_fedex_facility,
+        'AR' => :at_fedex_facility,
+        'AP' => :at_pickup,
+        'CA' => :canceled,
+        'CH' => :location_changed,
+        'DE' => :exception,
+        'DL' => :delivered,
+        'DP' => :departed_fedex_location,
+        'DR' => :vehicle_furnished_not_used,
+        'DS' => :vehicle_dispatched,
+        'DY' => :exception,
+        'EA' => :exception,
+        'ED' => :enroute_to_delivery,
+        'EO' => :enroute_to_origin_airport,
+        'EP' => :enroute_to_pickup,
+        'FD' => :at_fedex_destination,
+        'HL' => :held_at_location,
+        'IT' => :in_transit,
+        'LO' => :left_origin,
+        'OC' => :order_created,
+        'OD' => :out_for_delivery,
+        'PF' => :plane_in_flight,
+        'PL' => :plane_landed,
+        'PU' => :picked_up,
+        'RS' => :return_to_shipper,
+        'SE' => :exception,
+        'SF' => :at_sort_facility,
+        'SP' => :split_status,
+        'TR' => :transfer
+      })
+
       def self.service_name_for_code(service_code)
         ServiceTypes[service_code] || "FedEx #{service_code.titleize.sub(/Fedex /, '')}"
       end
@@ -100,7 +140,7 @@ module ActiveMerchant
         rate_request = build_rate_request(origin, destination, packages, options)
         
         response = commit(save_request(rate_request), (options[:test] || false)).gsub(/<(\/)?.*?\:(.*?)>/, '<\1\2>')
-        
+
         parse_rate_response(origin, destination, packages, response, options)
       end
       
@@ -111,7 +151,7 @@ module ActiveMerchant
         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))
@@ -133,7 +173,7 @@ module ActiveMerchant
           root_node << XmlNode.new('VariableOptions', 'SATURDAY_DELIVERY')
           
           root_node << XmlNode.new('RequestedShipment') do |rs|
-            rs << XmlNode.new('ShipTimestamp', Time.now)
+            rs << XmlNode.new('ShipTimestamp', ship_timestamp(options[:turn_around_time]))
             rs << XmlNode.new('DropoffType', options[:dropoff_type] || 'REGULAR_PICKUP')
             rs << XmlNode.new('PackagingType', options[:packaging_type] || 'YOUR_PACKAGING')
             
@@ -236,15 +276,22 @@ module ActiveMerchant
           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)
+          transit_time = rated_shipment.get_text('TransitTime').to_s if service_code == "FEDEX_GROUND"
+          max_transit_time = rated_shipment.get_text('MaximumTransitTime').to_s if service_code == "FEDEX_GROUND"
+
+          delivery_timestamp = rated_shipment.get_text('DeliveryTimestamp').to_s
+
+          delivery_range = delivery_range_from(transit_time, max_transit_time, delivery_timestamp, options)
+
+          currency = handle_incorrect_currency_codes(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
+                              :delivery_range => delivery_range)
+        end
 		
         if rate_estimates.empty?
           success = false
@@ -253,7 +300,35 @@ module ActiveMerchant
 
         RateResponse.new(success, message, Hash.from_xml(response), :rates => rate_estimates, :xml => response, :request => last_request, :log_xml => options[:log_xml])
       end
-      
+
+      def delivery_range_from(transit_time, max_transit_time, delivery_timestamp, options)
+        delivery_range = [delivery_timestamp, delivery_timestamp]
+        
+        #if there's no delivery timestamp but we do have a transit time, use it
+        if delivery_timestamp.blank? && transit_time.present?
+          transit_range  = parse_transit_times([transit_time,max_transit_time.presence || transit_time])
+          delivery_range = transit_range.map{|days| business_days_from(ship_date(options[:turn_around_time]), days)}
+        end
+
+        delivery_range
+      end
+
+      def business_days_from(date, days)
+        future_date = date
+        count       = 0
+
+        while count < days
+          future_date += 1.day
+          count += 1 if business_day?(future_date)
+        end
+
+        future_date
+      end
+
+      def business_day?(date)
+        (1..5).include?(date.wday)
+      end
+
       def parse_tracking_response(response, options)
         xml = REXML::Document.new(response)
         root_node = xml.elements['TrackReply']
@@ -262,13 +337,32 @@ module ActiveMerchant
         message = response_message(xml)
         
         if success
-          tracking_number, origin, destination = nil
+          tracking_number, origin, destination, status, status_code, status_description = nil
           shipment_events = []
-          
+
           tracking_details = root_node.elements['TrackDetails']
           tracking_number = tracking_details.get_text('TrackingNumber').to_s
           
+          status_code = tracking_details.get_text('StatusCode').to_s
+          status_description = tracking_details.get_text('StatusDescription').to_s
+          status = TRACKING_STATUS_CODES[status_code]
+
+          origin_node = tracking_details.elements['OriginLocationAddress']
+        
+          if origin_node
+            origin = Location.new(
+                  :country =>     origin_node.get_text('CountryCode').to_s,
+                  :province =>    origin_node.get_text('StateOrProvinceCode').to_s,
+                  :city =>        origin_node.get_text('City').to_s
+            )
+          end
+
           destination_node = tracking_details.elements['DestinationAddress']
+
+          if destination_node.nil?
+            destination_node = tracking_details.elements['ActualDeliveryAddress']
+          end
+
           destination = Location.new(
                 :country =>     destination_node.get_text('CountryCode').to_s,
                 :province =>    destination_node.get_text('StateOrProvinceCode').to_s,
@@ -294,17 +388,33 @@ module ActiveMerchant
             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),
+          :carrier => @@name,
           :xml => response,
           :request => last_request,
+          :status => status,
+          :status_code => status_code,
+          :status_description => status_description,
           :shipment_events => shipment_events,
+          :origin => origin,
           :destination => destination,
           :tracking_number => tracking_number
         )
       end
-            
+
+      def ship_timestamp(delay_in_hours)
+        delay_in_hours ||= 0
+        Time.now + delay_in_hours.hours
+      end
+
+      def ship_date(delay_in_hours)
+        delay_in_hours ||= 0
+        (Time.now + delay_in_hours.hours).to_date
+      end
+
       def response_status_node(document)
         document.elements['/*/Notifications/']
       end
@@ -322,8 +432,21 @@ module ActiveMerchant
         ssl_post(test ? TEST_URL : LIVE_URL, request.gsub("\n",''))        
       end
       
-      def handle_uk_currency(currency)
-        currency =~ /UKL/i ? 'GBP' : currency
+      def handle_incorrect_currency_codes(currency)
+        case currency
+        when /UKL/i then 'GBP'
+        when /SID/i then 'SGD'
+        else currency
+        end
+      end
+
+      def parse_transit_times(times)
+        results = []
+        times.each do |day_count|
+          days = TransitTimes.index(day_count.to_s.chomp)
+          results << days.to_i
+        end
+        results
       end
     end
   end

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

@@ -82,6 +82,7 @@ module ActiveMerchant
           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! 'Company', destination.company unless destination.company.blank?
           xml.tag! 'City', destination.city
           xml.tag! 'State', destination.state unless destination.state.blank?
           xml.tag! 'Country', destination.country_code
@@ -173,17 +174,6 @@ module ActiveMerchant
           element.attributes[attribute]
         end
       end
-
-      def timestamp_from_business_day(days)
-        return unless days
-        date = DateTime.now
-        days.times do
-          begin
-            date = date + 1
-          end until ![0,6].include?(date.wday)
-        end
-        date
-      end
     end
   end
 end

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

@@ -26,13 +26,13 @@ module ActiveMerchant
         :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
@@ -85,7 +85,15 @@ module ActiveMerchant
       OTHER_NON_US_ORIGIN_SERVICES = {
         "07" => "UPS Express"
       }
-      
+
+      TRACKING_STATUS_CODES = HashWithIndifferentAccess.new({
+        'I' => :in_transit,
+        'D' => :delivered,
+        'X' => :exception,
+        'P' => :pickup,
+        'M' => :manifest_pickup
+      })
+
       # 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"]
       
@@ -276,7 +284,7 @@ module ActiveMerchant
           xml.elements.each('/*/RatedShipment') do |rated_shipment|
             service_code = rated_shipment.get_text('Service/Code').to_s
             days_to_delivery = rated_shipment.get_text('GuaranteedDaysToDelivery').to_s.to_i
-            delivery_date  = days_to_delivery >= 1 ? days_to_delivery.days.from_now.strftime("%Y-%m-%d") : nil
+            days_to_delivery = nil if days_to_delivery == 0
 
             rate_estimates << RateEstimate.new(origin, destination, @@name,
                                 service_name_for(origin, service_code),
@@ -284,7 +292,7 @@ module ActiveMerchant
                                 :currency => rated_shipment.get_text('TotalCharges/CurrencyCode').to_s,
                                 :service_code => service_code,
                                 :packages => packages,
-                                :delivery_range => [delivery_date])
+                                :delivery_range => [timestamp_from_business_day(days_to_delivery)])
           end
         end
         RateResponse.new(success, message, Hash.from_xml(response).values.first, :rates => rate_estimates, :xml => response, :request => last_request)
@@ -296,17 +304,39 @@ module ActiveMerchant
         message = response_message(xml)
         
         if success
-          tracking_number, origin, destination = nil
+          tracking_number, origin, destination, status_code, status_description = nil
+          delivered, exception = false
+          exception_event = nil
           shipment_events = []
-          
+          status = {}
+          scheduled_delivery_date = nil
+
           first_shipment = xml.elements['/*/Shipment']
           first_package = first_shipment.elements['Package']
           tracking_number = first_shipment.get_text('ShipmentIdentificationNumber | Package/TrackingNumber').to_s
           
+          # Build status hash
+          status_node = first_package.elements['Activity/Status/StatusType']
+          status_code = status_node.get_text('Code').to_s
+          status_description = status_node.get_text('Description').to_s
+          status = TRACKING_STATUS_CODES[status_code]
+
+          if status_description =~ /out.*delivery/i
+            status = :out_for_delivery
+          end
+
           origin, destination = %w{Shipper ShipTo}.map do |location|
             location_from_address_node(first_shipment.elements["#{location}/Address"])
           end
-          
+
+          # Get scheduled delivery date
+          unless status == :delivered
+            scheduled_delivery_date = parse_ups_datetime({
+              :date => first_shipment.get_text('ScheduledDeliveryDate'),
+              :time => nil
+              })
+          end
+
           activities = first_package.get_elements('Activity')
           unless activities.empty?
             shipment_events = activities.map do |activity|
@@ -324,7 +354,10 @@ module ActiveMerchant
             
             shipment_events = shipment_events.sort_by(&:time)
             
-            if origin
+            # UPS will sometimes archive a shipment, stripping all shipment activity except for the delivery 
+            # event (see test/fixtures/xml/delivered_shipment_without_events_tracking_response.xml for an example).
+            # This adds an origin event to the shipment activity in such cases.
+            if origin && !(shipment_events.count == 1 && status == :delivered)
               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
@@ -335,16 +368,29 @@ module ActiveMerchant
                 shipment_events.unshift(origin_event)
               end
             end
-            if shipment_events.last.name.downcase == 'delivered'
+
+            # Has the shipment been delivered?
+            if status == :delivered
+              if !destination
+                destination = shipment_events[-1].location
+              end
               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,
+          :carrier => @@name,
           :xml => response,
           :request => last_request,
+          :status => status,
+          :status_code => status_code,
+          :status_description => status_description,
+          :scheduled_delivery_date => scheduled_delivery_date,
           :shipment_events => shipment_events,
+          :delivered => delivered,
+          :exception => exception,
+          :exception_event => exception_event,
           :origin => origin,
           :destination => destination,
           :tracking_number => tracking_number)
@@ -363,6 +409,18 @@ module ActiveMerchant
               )
       end
       
+      def parse_ups_datetime(options = {})
+        time, date = options[:time].to_s, options[:date].to_s
+        if time.nil?
+          hour, minute, second = 0
+        else
+          hour, minute, second = time.scan(/\d{2}/)
+        end
+        year, month, day = date[0..3], date[4..5], date[6..7]
+
+        Time.utc(year, month, day, hour, minute, second)
+      end
+
       def response_success?(xml)
         xml.get_text('/*/Response/ResponseStatusCode').to_s == '1'
       end

data/lib/active_shipping/shipping/location.rb

@@ -131,6 +131,18 @@ module ActiveMerchant #:nodoc:
         string << "\nFax: #{@fax}" unless @fax.blank?
         string
       end
+
+      # Returns the postal code as a properly formatted Zip+4 code, e.g. "77095-2233"
+      def zip_plus_4
+        if /(\d{5})(\d{4})/ =~ @postal_code
+          return "#{$1}-#{$2}"
+        elsif /\d{5}-\d{4}/ =~ @postal_code
+          return @postal_code
+        else
+          nil
+        end
+      end
+
     end
       
   end

data/lib/active_shipping/shipping/tracking_response.rb

@@ -2,20 +2,45 @@ module ActiveMerchant #:nodoc:
   module Shipping
     
     class TrackingResponse < Response
+      attr_reader :carrier # symbol
+      attr_reader :carrier_name # string
+      attr_reader :status # symbol
+      attr_reader :status_code # string
+      attr_reader :status_description #string
+      attr_reader :scheduled_delivery_date # time
       attr_reader :tracking_number # string
       attr_reader :shipment_events # array of ShipmentEvents in chronological order
       attr_reader :origin, :destination
       
       def initialize(success, message, params = {}, options = {})
+        @carrier = options[:carrier].parameterize.to_sym
+        @carrier_name = options[:carrier]
+        @status = options[:status]
+        @status_code = options[:status_code]
+        @status_description = options[:status_description]
+        @scheduled_delivery_date = options[:scheduled_delivery_date]
         @tracking_number = options[:tracking_number]
         @shipment_events = Array(options[:shipment_events])
         @origin, @destination = options[:origin], options[:destination]
         super
       end
-      
+
       def latest_event
         @shipment_events.last
       end
+
+      def is_delivered?
+        @status == :delivered
+      end
+
+      def has_exception?
+        @status == :exception
+      end
+
+      alias_method(:exception_event, :latest_event)
+      alias_method(:delivered?, :is_delivered?)
+      alias_method(:exception?, :has_exception?)
+
     end
     
   end

data/lib/active_shipping/version.rb

@@ -1,3 +1,3 @@
 module ActiveShipping
-  VERSION = "0.9.14"
+  VERSION = "0.9.15"
 end

metadata

@@ -1,15 +1,10 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: active_shipping
-version: !ruby/object:Gem::Version 
-  hash: 39
+version: !ruby/object:Gem::Version
   prerelease: 
-  segments: 
-  - 0
-  - 9
-  - 14
-  version: 0.9.14
+  version: 0.9.15
 platform: ruby
-authors: 
+authors:
 - James MacAulay
 - Tobi Lutke
 - Cody Fauser
@@ -17,124 +12,143 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-05-02 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: activesupport
+date: 2013-05-06 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 2
-        - 3
-        - 5
-        version: 2.3.5
+  name: activesupport
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: i18n
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.3.5
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.3.5
+    none: false
+- !ruby/object:Gem::Dependency
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  name: i18n
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: active_utils
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+- !ruby/object:Gem::Dependency
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 1
-        - 0
-        - 1
-        version: 1.0.1
+  name: active_utils
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: builder
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.1
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.1
+    none: false
+- !ruby/object:Gem::Dependency
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  name: builder
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: json
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+- !ruby/object:Gem::Dependency
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 1
-        - 5
-        - 1
-        version: 1.5.1
+  name: json
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rake
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.1
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.1
+    none: false
+- !ruby/object:Gem::Dependency
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  name: rake
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+- !ruby/object:Gem::Dependency
+  prerelease: false
   name: mocha
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+- !ruby/object:Gem::Dependency
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  name: timecop
   type: :development
-  version_requirements: *id007
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
 description: Get rates and tracking info from various shipping carriers.
-email: 
+email:
 - james@shopify.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/active_shipping/shipping/base.rb
 - lib/active_shipping/shipping/carrier.rb
 - lib/active_shipping/shipping/carriers/bogus_carrier.rb
@@ -179,41 +193,31 @@ files:
 - MIT-LICENSE
 - README.markdown
 - CHANGELOG
-has_rdoc: true
 homepage: http://github.com/shopify/active_shipping
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 3014508717412085176
+      version: '0'
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
+  none: false
 requirements: []
-
 rubyforge_project: active_shipping
-rubygems_version: 1.6.2
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Shipping API extension for Active Merchant
 test_files: []
-