active_shipping 0.11.0 → 0.11.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 4b36c0ee1b7b2ac743a5b950a23f40f006b5fcc9
+  data.tar.gz: 4a89bf43c4fde9d06f3e34aeee258a9c1990171d
+SHA512:
+  metadata.gz: 1fe9164056568d8913f2f9230fb8a26cdb9f7ff5237c2ab4b7902fcfc1dd0e60b1615a8ccb999754c1f3349b32152fe8bb6f0503afe024452f36944d455d1517
+  data.tar.gz: 5a55bbce296ed30b42a172b4dc70519cefa409828b68d7018a537ad14ddb6cd7d5e21d8f39d494f789454a4f5049acc539f57b656ef4bcd47ae6c5956ec21bf7

data/README.markdown

@@ -132,6 +132,7 @@ After you've pushed your well-tested changes to your github fork, make a pull re
 * John Duff
 * Nigel Ramsay
 * Philip Arndt
+* Vikram Oberoi
 
 ## Legal Mumbo Jumbo
 

data/lib/active_shipping/shipping/carriers.rb

@@ -1,3 +1,4 @@
+require 'active_shipping/shipping/carriers/benchmark_carrier'
 require 'active_shipping/shipping/carriers/bogus_carrier'
 require 'active_shipping/shipping/carriers/ups'
 require 'active_shipping/shipping/carriers/usps'
@@ -13,7 +14,7 @@ module ActiveMerchant
     module Carriers
       class <<self
         def all
-          [BogusCarrier, UPS, USPS, FedEx, Shipwire, Kunaki, CanadaPost, NewZealandPost, CanadaPostPWS]
+          [BenchmarkCarrier, BogusCarrier, UPS, USPS, FedEx, Shipwire, Kunaki, CanadaPost, NewZealandPost, CanadaPostPWS]
         end
       end
     end

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

@@ -0,0 +1,34 @@
+# The time a 3rd-party shipping provider takes to respond to a request varies greatly.
+# This class simulates these unpredictable delays in shipping rate retrieval so that
+# load-testing tools run into situations that more accurately reflect the real world.
+
+module ActiveMerchant
+  module Shipping
+    class BenchmarkCarrier < Carrier
+      cattr_reader :name
+      @@name = "Benchmark Carrier"
+      
+      def find_rates(origin, destination, packages, options = {})
+        origin = Location.from(origin)
+        destination = Location.from(destination)
+        packages = Array(packages)
+
+        delay_time = generate_simulated_lag
+
+        bogus_estimate = RateEstimate.new(
+          origin, destination, @@name,
+          "Free Benchmark Shipping", :total_price => 0, :currency => 'USD',
+          :packages => packages, :delivery_range => [Time.now.utc.strftime("%Y-%d-%m"), Time.now.utc.strftime("%Y-%d-%m")]
+          )
+        RateResponse.new(true, "Success (delayed #{delay_time} seconds)", {:rate => 'free'}, :rates => [bogus_estimate], :xml => "<rate>free</rate>")
+      end
+      
+      private
+
+      def generate_simulated_lag(max_delay = 30)
+        sleep Random.rand * max_delay
+      end
+
+    end
+  end
+end

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

@@ -127,7 +127,7 @@ module ActiveMerchant
             request << XmlNode.new('merchantCPCID', @options[:login])
             request << XmlNode.new('fromPostalCode', origin.postal_code)
             request << XmlNode.new('turnAroundTime', options[:turn_around_time] ? options[:turn_around_time] : DEFAULT_TURN_AROUND_TIME)
-            request << XmlNode.new('itemsPrice', dollar_amount(line_items.sum(&:value)))
+            request << XmlNode.new('itemsPrice', dollar_amount(line_items.map(&:value).compact.sum))
 
             #line items
             request << build_line_items(line_items)
@@ -211,12 +211,18 @@ module ActiveMerchant
       end
 
       def response_success?(xml)
+        return false unless xml.get_text('eparcel/error').nil?
+
         value = xml.get_text('eparcel/ratesAndServicesResponse/statusCode').to_s
         value == '1' || value == '2'
       end
       
       def response_message(xml)
-        xml.get_text('eparcel/ratesAndServicesResponse/statusMessage').to_s
+        if response_success?(xml)
+          xml.get_text('eparcel/ratesAndServicesResponse/statusMessage').to_s
+        else
+          xml.get_text('eparcel/error/statusMessage').to_s
+        end
       end
       
       # <!-- List of items in the shopping    -->

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

@@ -52,12 +52,13 @@ module ActiveMerchant
 
       MAX_WEIGHT = 30 # kg
 
-      attr_accessor :language, :endpoint, :logger, :platform_id
+      attr_accessor :language, :endpoint, :logger, :platform_id, :customer_number
 
       def initialize(options = {})
         @language = LANGUAGE[options[:language]] || LANGUAGE['en']
         @endpoint = options[:endpoint] || ENDPOINT
         @platform_id = options[:platform_id]
+        @customer_number = options[:customer_number]
         super(options)
       end
       
@@ -618,7 +619,7 @@ module ActiveMerchant
       end
 
       def customer_number_node(options)
-        XmlNode.new("customer-number", options[:customer_number])
+        XmlNode.new("customer-number", options[:customer_number] || customer_number)
       end
 
       def contract_id_node(options)

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

@@ -22,6 +22,9 @@ module ActiveMerchant
         "fedex_ground" => "FDXG",
         "fedex_express" => "FDXE"
       }
+
+      DELIVERY_ADDRESS_NODE_NAMES = %w(DestinationAddress ActualDeliveryAddress)
+      SHIPPER_ADDRESS_NODE_NAMES  = %w(ShipperAddress)
       
       ServiceTypes = {
         "PRIORITY_OVERNIGHT" => "FedEx Priority Overnight",
@@ -47,7 +50,9 @@ module ActiveMerchant
         "GROUND_HOME_DELIVERY" => "FedEx Ground Home Delivery",
         "FEDEX_GROUND" => "FedEx Ground",
         "INTERNATIONAL_GROUND" => "FedEx International Ground",
-        "SMART_POST" => "FedEx SmartPost"
+        "SMART_POST" => "FedEx SmartPost",
+        "FEDEX_FREIGHT_PRIORITY" => "FedEx Freight Priority",
+        "FEDEX_FREIGHT_ECONOMY" => "FedEx Freight Economy"
       }
 
       PackageTypes = {
@@ -175,9 +180,14 @@ module ActiveMerchant
           
           root_node << XmlNode.new('RequestedShipment') do |rs|
             rs << XmlNode.new('ShipTimestamp', ship_timestamp(options[:turn_around_time]))
-            rs << XmlNode.new('DropoffType', options[:dropoff_type] || 'REGULAR_PICKUP')
-            #rs << XmlNode.new('ServiceType', 'SMART_POST') # use this to test responses for specific services.
-            rs << XmlNode.new('PackagingType', options[:packaging_type] || 'YOUR_PACKAGING')
+
+            freight = has_freight?(options)
+
+            if !freight
+              # fedex api wants this up here otherwise request returns an error
+              rs << XmlNode.new('DropoffType', options[:dropoff_type] || 'REGULAR_PICKUP')
+              rs << XmlNode.new('PackagingType', options[:packaging_type] || 'YOUR_PACKAGING')
+            end
             
             rs << build_location_node('Shipper', (options[:shipper] || origin))
             rs << build_location_node('Recipient', destination)
@@ -185,35 +195,89 @@ module ActiveMerchant
               rs << build_location_node('Origin', origin)
             end
 
-            rs << XmlNode.new('SmartPostDetail') do |spd|
-              spd << XmlNode.new('Indicia', options[:smart_post_indicia] || 'PARCEL_SELECT')
-              spd << XmlNode.new('HubId', options[:smart_post_hub_id] || 5902) # default to LA
-            end
+            if freight
+              # build xml for freight rate requests
+              freight_options = options[:freight]
+              rs << build_shipping_charges_payment_node(freight_options)
+              rs << build_freight_shipment_detail_node(freight_options, packages, imperial)
+              rs << build_rate_request_types_node
+            else
+              # build xml for non-freight rate requests
+              rs << XmlNode.new('SmartPostDetail') do |spd|
+                spd << XmlNode.new('Indicia', options[:smart_post_indicia] || 'PARCEL_SELECT')
+                spd << XmlNode.new('HubId', options[:smart_post_hub_id] || 5902) # default to LA
+              end
 
-            rs << XmlNode.new('RateRequestTypes', 'ACCOUNT')
+              rs << build_rate_request_types_node
 
-            rs << XmlNode.new('PackageCount', packages.size)
-            packages.each do |pkg|
-              rs << XmlNode.new('RequestedPackageLineItems') do |rps|
-                rps << XmlNode.new('GroupPackageCount', 1)
-                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')
+              rs << XmlNode.new('PackageCount', packages.size)
+              packages.each do |pkg|
+                rs << XmlNode.new('RequestedPackageLineItems') do |rps|
+                  rps << XmlNode.new('GroupPackageCount', 1)
+                  rps << build_package_weight_node(pkg, imperial)
+                  rps << build_package_dimensions_node(pkg, imperial)
                 end
               end
             end
-            
           end
         end
         xml_request.to_s
       end
+
+      def build_shipping_charges_payment_node(freight_options)
+        XmlNode.new('ShippingChargesPayment') do |shipping_charges_payment|
+          shipping_charges_payment << XmlNode.new('PaymentType', freight_options[:payment_type])
+          shipping_charges_payment << XmlNode.new('Payor') do |payor|
+            payor << XmlNode.new('ResponsibleParty') do |responsible_party|
+              # TODO: case of different freight account numbers?
+              responsible_party << XmlNode.new('AccountNumber', freight_options[:account])
+            end
+          end
+        end
+      end
+
+      def build_freight_shipment_detail_node(freight_options, packages, imperial)
+        XmlNode.new('FreightShipmentDetail') do |freight_shipment_detail|
+          # TODO: case of different freight account numbers?
+          freight_shipment_detail << XmlNode.new('FedExFreightAccountNumber', freight_options[:account])
+          freight_shipment_detail << build_location_node('FedExFreightBillingContactAndAddress', freight_options[:billing_location])
+          freight_shipment_detail << XmlNode.new('Role', freight_options[:role])
+
+          packages.each do |pkg|
+            freight_shipment_detail << XmlNode.new('LineItems') do |line_items|
+              line_items << XmlNode.new('FreightClass', freight_options[:freight_class])
+              line_items << XmlNode.new('Packaging', freight_options[:packaging])
+              line_items << build_package_weight_node(pkg, imperial)
+              line_items << build_package_dimensions_node(pkg, imperial)
+            end
+          end
+        end
+      end
+
+      def has_freight?(options)
+        options[:freight] && options[:freight].present?
+      end
+
+      def build_package_weight_node(pkg, imperial)
+        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
+      end
+
+      def build_package_dimensions_node(pkg, imperial)
+        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')
+        end
+      end
+
+      def build_rate_request_types_node(type = 'ACCOUNT')
+        XmlNode.new('RateRequestTypes', type)
+      end
       
       def build_tracking_request(tracking_number, options={})
         xml_request = XmlNode.new('TrackRequest', 'xmlns' => 'http://fedex.com/ws/track/v3') do |root_node|
@@ -262,6 +326,10 @@ module ActiveMerchant
       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('StreetLines', location.address1) if location.address1
+            address_node << XmlNode.new('StreetLines', location.address2) if location.address2
+            address_node << XmlNode.new('City', location.city) if location.city
+            address_node << XmlNode.new('StateOrProvinceCode', location.state) if location.state
             address_node << XmlNode.new('PostalCode', location.postal_code)
             address_node << XmlNode.new("CountryCode", location.country_code(:alpha2))
 
@@ -346,7 +414,9 @@ module ActiveMerchant
         message = response_message(xml)
         
         if success
-          tracking_number, origin, destination, status, status_code, status_description, delivery_signature = nil
+          tracking_number, shipper_address, origin, destination, status = nil
+          status_code, status_description, ship_time = nil
+          scheduled_delivery_time, actual_delivery_time, delivery_signature = nil
           shipment_events = []
 
           tracking_details = root_node.elements['TrackDetails']
@@ -370,7 +440,12 @@ module ActiveMerchant
             )
           end
 
-          destination = extract_destination(tracking_details)
+          destination = extract_address(tracking_details, DELIVERY_ADDRESS_NODE_NAMES)
+          shipper_address = extract_address(tracking_details, SHIPPER_ADDRESS_NODE_NAMES)
+
+          ship_time = extract_timestamp(tracking_details, 'ShipTimestamp')
+          actual_delivery_time = extract_timestamp(tracking_details, 'ActualDeliveryTimestamp')
+          scheduled_delivery_time = extract_timestamp(tracking_details, 'EstimatedDeliveryTimestamp')
           
           tracking_details.elements.each('Events') do |event|
             address  = event.elements['Address']
@@ -400,8 +475,12 @@ module ActiveMerchant
           :status => status,
           :status_code => status_code,
           :status_description => status_description,
+          :ship_time => ship_time,
+          :scheduled_delivery_date => scheduled_delivery_time,
+          :actual_delivery_date => actual_delivery_time,
           :delivery_signature => delivery_signature,
           :shipment_events => shipment_events,
+          :shipper_address => shipper_address.unknown? ? nil : shipper_address,
           :origin => origin,
           :destination => destination,
           :tracking_number => tracking_number
@@ -452,8 +531,12 @@ module ActiveMerchant
         results
       end
 
-      def extract_destination(document)
-        node = document.elements['DestinationAddress'] || document.elements['ActualDeliveryAddress']
+      def extract_address(document, possible_node_names)
+        node = nil
+        possible_node_names.each do |name|
+          node ||= document.elements[name]
+          break if node
+        end
 
         args = if node
           {
@@ -472,6 +555,12 @@ module ActiveMerchant
         Location.new(args)
       end
 
+      def extract_timestamp(document, node_name)
+        if timestamp_node = document.elements[node_name]
+          Time.parse(timestamp_node.to_s).utc
+        end
+      end
+
       def build_document(xml)
         REXML::Document.new(xml)
       rescue REXML::ParseException => e

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

@@ -325,7 +325,7 @@ module ActiveMerchant
         message = response_message(xml)
 
         if success
-          tracking_number, origin, destination, status_code, status_description = nil
+          tracking_number, origin, destination, status_code, status_description, delivery_signature = nil
           delivered, exception = false
           exception_event = nil
           shipment_events = []
@@ -392,6 +392,7 @@ module ActiveMerchant
 
             # Has the shipment been delivered?
             if status == :delivered
+              delivery_signature = activities.first.get_text('ActivityLocation/SignedForByName').to_s
               if !destination
                 destination = shipment_events[-1].location
               end
@@ -407,6 +408,7 @@ module ActiveMerchant
           :status => status,
           :status_code => status_code,
           :status_description => status_description,
+          :delivery_signature => delivery_signature,
           :scheduled_delivery_date => scheduled_delivery_date,
           :shipment_events => shipment_events,
           :delivered => delivered,

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

@@ -474,6 +474,7 @@ module ActiveMerchant
       end
 
       def parse_tracking_response(response, options)
+        actual_delivery_date, status = nil
         xml = REXML::Document.new(response)
         root_node = xml.elements['TrackResponse']
 
@@ -509,7 +510,13 @@ module ActiveMerchant
               shipment_events << ShipmentEvent.new(description, zoneless_time, location)
             end
           end
+
           shipment_events = shipment_events.sort_by(&:time)
+
+          if last_shipment = shipment_events.last
+            status = last_shipment.status
+            actual_delivery_date = last_shipment.time if last_shipment.delivered?
+          end
         end
 
         TrackingResponse.new(success, message, Hash.from_xml(response),
@@ -518,7 +525,9 @@ module ActiveMerchant
           :request => last_request,
           :shipment_events => shipment_events,
           :destination => destination,
-          :tracking_number => tracking_number
+          :tracking_number => tracking_number,
+          :status => status,
+          :actual_delivery_date => actual_delivery_date
         )
       end
 

data/lib/active_shipping/shipping/location.rb

@@ -84,6 +84,7 @@ module ActiveMerchant #:nodoc:
       def residential?; @address_type == 'residential' end
       def commercial?; @address_type == 'commercial' end
       def po_box?; @address_type == 'po_box' end
+      def unknown?; country_code == 'ZZ' end
 
       def address_type=(value)
         return unless value.present?

data/lib/active_shipping/shipping/shipment_event.rb

@@ -7,8 +7,15 @@ module ActiveMerchant #:nodoc:
       def initialize(name, time, location, message=nil)
         @name, @time, @location, @message = name, time, location, message
       end
-      
+
+      def delivered?
+        status == :delivered
+      end
+
+      def status
+        @status ||= name.downcase.gsub("\s", "_").to_sym
+      end
     end
     
   end
-end
+end

data/lib/active_shipping/shipping/tracking_response.rb

@@ -7,11 +7,13 @@ module ActiveMerchant #:nodoc:
       attr_reader :status # symbol
       attr_reader :status_code # string
       attr_reader :status_description #string
+      attr_reader :ship_time # time
       attr_reader :scheduled_delivery_date # time
+      attr_reader :actual_delivery_date # time
       attr_reader :delivery_signature #string
       attr_reader :tracking_number # string
       attr_reader :shipment_events # array of ShipmentEvents in chronological order
-      attr_reader :origin, :destination
+      attr_reader :shipper_address, :origin, :destination # Location objects
       
       def initialize(success, message, params = {}, options = {})
         @carrier = options[:carrier].parameterize.to_sym
@@ -19,11 +21,15 @@ module ActiveMerchant #:nodoc:
         @status = options[:status]
         @status_code = options[:status_code]
         @status_description = options[:status_description]
+        @ship_time = options[:ship_time]
         @scheduled_delivery_date = options[:scheduled_delivery_date]
+        @actual_delivery_date = options[:actual_delivery_date]
         @delivery_signature = options[:delivery_signature]
         @tracking_number = options[:tracking_number]
         @shipment_events = Array(options[:shipment_events])
-        @origin, @destination = options[:origin], options[:destination]
+        @shipper_address = options[:shipper_address]
+        @origin = options[:origin]
+        @destination = options[:destination]
         super
       end
 
@@ -42,7 +48,8 @@ module ActiveMerchant #:nodoc:
       alias_method(:exception_event, :latest_event)
       alias_method(:delivered?, :is_delivered?)
       alias_method(:exception?, :has_exception?)
-
+      alias_method(:scheduled_delivery_time, :scheduled_delivery_date)
+      alias_method(:actual_delivery_time, :actual_delivery_date)
     end
     
   end

data/lib/active_shipping/version.rb

@@ -1,3 +1,3 @@
 module ActiveShipping
-  VERSION = "0.11.0"
+  VERSION = "0.11.1"
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_shipping
 version: !ruby/object:Gem::Version
-  version: 0.11.0
-  prerelease: 
+  version: 0.11.1
 platform: ruby
 authors:
 - James MacAulay
@@ -12,92 +11,81 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-15 00:00:00.000000000 Z
+date: 2013-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.3.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.3.5
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: active_utils
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.5.1
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -105,7 +93,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -113,23 +100,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -137,7 +121,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -145,33 +128,29 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Get rates and tracking info from various shipping carriers.
@@ -183,6 +162,7 @@ extra_rdoc_files: []
 files:
 - lib/active_shipping/shipping/base.rb
 - lib/active_shipping/shipping/carrier.rb
+- lib/active_shipping/shipping/carriers/benchmark_carrier.rb
 - lib/active_shipping/shipping/carriers/bogus_carrier.rb
 - lib/active_shipping/shipping/carriers/canada_post.rb
 - lib/active_shipping/shipping/carriers/canada_post_pws.rb
@@ -232,29 +212,25 @@ files:
 - CHANGELOG
 homepage: http://github.com/shopify/active_shipping
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2134793660123218894
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: active_shipping
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Shipping API extension for Active Merchant
 test_files: []