active_shipping 1.6.5 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67c1a999efbdf53ccf0184cb263ae02c952be3ad
-  data.tar.gz: a810e0262340b15fec6bafdf157197a3af7a4a7e
+  metadata.gz: aded0a13e4d317dc8bb370ae2203c874282a2a47
+  data.tar.gz: 296ade65ae145953d279045449ba84757abcf02e
 SHA512:
-  metadata.gz: ff22888d9dcdfaa98693bda3b993a83bb1c2404f7b217e359ba5f97e35bf21b283a8b6bf483b82a9f743aa10c43940de3ba5ae29e86abb905997297103016592
-  data.tar.gz: 9d827efa63c84851a042498c57c2ab184807ac34d89deb2d7e822358d977fff9a5c0ac88c0bd97fa5c95f2454af966210ec1c35fb6ef4deb47059510ac070364
+  metadata.gz: 9053d50d49b00869a4e29bb8a04d48bb44fa86f189eed51c1f8a2846a0c95baf9ff6b8d4fbebe6f72178be256e4b612650b97d22851a12c03a56fe0be86a5ad7
+  data.tar.gz: 03afa606338e9aedac600911f886f11b6945ae617cd41ab3336d2620c36d354cc2ce682d54a2a55c861397caf907cd039dba12612e26d105c654a5dd45f97f8d

data/.gitignore

@@ -11,3 +11,4 @@ test/fixtures/live_credentials.yml
 .yardoc/
 doc/
 .idea
+.bundle

data/README.md

@@ -26,7 +26,9 @@ Active Shipping is currently being used and improved in a production environment
 
 ## Installation
 
-    gem install active_shipping
+```ruby
+gem install active_shipping
+```
 
 ...or add it to your project's [Gemfile](http://bundler.io/).
 
@@ -34,68 +36,78 @@ Active Shipping is currently being used and improved in a production environment
 
 ### Compare rates from different carriers
 
-    require 'active_shipping'
-
-    # Package up a poster and a Wii for your nephew.
-    packages = [
-      ActiveShipping::Package.new( 100,                  # 100 grams
-                                   [93,10],              # 93 cm long, 10 cm diameter
-                                   :cylinder => true),   # cylinders have different volume calculations
-
-      ActiveShipping::Package.new( 7.5 * 16,             # 7.5 lbs, times 16 oz/lb.
-                                   [15, 10, 4.5],        # 15x10x4.5 inches
-                                   :units => :imperial)  # not grams, not centimetres
-    ]
-
-    # You live in Beverly Hills, he lives in Ottawa
-    origin = ActiveShipping::Location.new( :country => 'US',
-                                           :state => 'CA',
-                                           :city => 'Beverly Hills',
-                                           :zip => '90210')
-
-    destination = ActiveShipping::Location.new( :country => 'CA',
-                                                :province => 'ON',
-                                                :city => 'Ottawa',
-                                                :postal_code => 'K1P 1J1')
-
-    # Find out how much it'll be.
-    ups = ActiveShipping::UPS.new(:login => 'auntjudy', :password => 'secret', :key => 'xml-access-key')
-    response = ups.find_rates(origin, destination, packages)
-
-    ups_rates = response.rates.sort_by(&:price).collect {|rate| [rate.service_name, rate.price]}
-    # => [["UPS Standard", 3936],
-    #     ["UPS Worldwide Expedited", 8682],
-    #     ["UPS Saver", 9348],
-    #     ["UPS Express", 9702],
-    #     ["UPS Worldwide Express Plus", 14502]]
-
-    # Check out USPS for comparison...
-    usps = ActiveShipping::USPS.new(:login => 'developer-key')
-    response = usps.find_rates(origin, destination, packages)
-
-    usps_rates = response.rates.sort_by(&:price).collect {|rate| [rate.service_name, rate.price]}
-    # => [["USPS Priority Mail International", 4110],
-    #     ["USPS Express Mail International (EMS)", 5750],
-    #     ["USPS Global Express Guaranteed Non-Document Non-Rectangular", 9400],
-    #     ["USPS GXG Envelopes", 9400],
-    #     ["USPS Global Express Guaranteed Non-Document Rectangular", 9400],
-    #     ["USPS Global Express Guaranteed", 9400]]
+```ruby
+require 'active_shipping'
+
+# Package up a poster and a Wii for your nephew.
+packages = [
+  ActiveShipping::Package.new(100,               # 100 grams
+                              [93,10],           # 93 cm long, 10 cm diameter
+                              cylinder: true),   # cylinders have different volume calculations
+
+  ActiveShipping::Package.new(7.5 * 16,          # 7.5 lbs, times 16 oz/lb.
+                              [15, 10, 4.5],     # 15x10x4.5 inches
+                              units: :imperial)  # not grams, not centimetres
+ ]
+
+ # You live in Beverly Hills, he lives in Ottawa
+ origin = ActiveShipping::Location.new(country: 'US',
+                                       state: 'CA',
+                                       city: 'Beverly Hills',
+                                       zip: '90210')
+
+ destination = ActiveShipping::Location.new(country: 'CA',
+                                            province: 'ON',
+                                            city: 'Ottawa',
+                                            postal_code: 'K1P 1J1')
+
+ # Find out how much it'll be.
+ ups = ActiveShipping::UPS.new(login: 'auntjudy', password: 'secret', key: 'xml-access-key')
+ response = ups.find_rates(origin, destination, packages)
+
+ ups_rates = response.rates.sort_by(&:price).collect {|rate| [rate.service_name, rate.price]}
+ # => [["UPS Standard", 3936],
+ #     ["UPS Worldwide Expedited", 8682],
+ #     ["UPS Saver", 9348],
+ #     ["UPS Express", 9702],
+ #     ["UPS Worldwide Express Plus", 14502]]
+
+ # Check out USPS for comparison...
+ usps = ActiveShipping::USPS.new(login: 'developer-key')
+ response = usps.find_rates(origin, destination, packages)
+
+ usps_rates = response.rates.sort_by(&:price).collect {|rate| [rate.service_name, rate.price]}
+ # => [["USPS Priority Mail International", 4110],
+ #     ["USPS Express Mail International (EMS)", 5750],
+ #     ["USPS Global Express Guaranteed Non-Document Non-Rectangular", 9400],
+ #     ["USPS GXG Envelopes", 9400],
+ #     ["USPS Global Express Guaranteed Non-Document Rectangular", 9400],
+ #     ["USPS Global Express Guaranteed", 9400]]
+```
 
 ### Track a FedEx package
 
-    fedex = ActiveShipping::FedEx.new(login: '999999999', password: '7777777', key: '1BXXXXXXXXXxrcB', account: '51XXXXX20')
-    tracking_info = fedex.find_tracking_info('tracking-number', :carrier_code => 'fedex_ground') # Ground package
+```ruby
+fedex = ActiveShipping::FedEx.new(login: '999999999', password: '7777777', key: '1BXXXXXXXXXxrcB', account: '51XXXXX20')
+tracking_info = fedex.find_tracking_info('tracking-number', carrier_code: 'fedex_ground') # Ground package
 
-    tracking_info.shipment_events.each do |event|
-      puts "#{event.name} at #{event.location.city}, #{event.location.state} on #{event.time}. #{event.message}"
-    end
-    # => Package information transmitted to FedEx at NASHVILLE LOCAL, TN on Thu Oct 23 00:00:00 UTC 2008.
-    # Picked up by FedEx at NASHVILLE LOCAL, TN on Thu Oct 23 17:30:00 UTC 2008.
-    # Scanned at FedEx sort facility at NASHVILLE, TN on Thu Oct 23 18:50:00 UTC 2008.
-    # Departed FedEx sort facility at NASHVILLE, TN on Thu Oct 23 22:33:00 UTC 2008.
-    # Arrived at FedEx sort facility at KNOXVILLE, TN on Fri Oct 24 02:45:00 UTC 2008.
-    # Scanned at FedEx sort facility at KNOXVILLE, TN on Fri Oct 24 05:56:00 UTC 2008.
-    # Delivered at Knoxville, TN on Fri Oct 24 16:45:00 UTC 2008. Signed for by: T.BAKER
+tracking_info.shipment_events.each do |event|
+  puts "#{event.name} at #{event.location.city}, #{event.location.state} on #{event.time}. #{event.message}"
+end
+# => Package information transmitted to FedEx at NASHVILLE LOCAL, TN on Thu Oct 23 00:00:00 UTC 2008.
+# Picked up by FedEx at NASHVILLE LOCAL, TN on Thu Oct 23 17:30:00 UTC 2008.
+# Scanned at FedEx sort facility at NASHVILLE, TN on Thu Oct 23 18:50:00 UTC 2008.
+# Departed FedEx sort facility at NASHVILLE, TN on Thu Oct 23 22:33:00 UTC 2008.
+# Arrived at FedEx sort facility at KNOXVILLE, TN on Fri Oct 24 02:45:00 UTC 2008.
+# Scanned at FedEx sort facility at KNOXVILLE, TN on Fri Oct 24 05:56:00 UTC 2008.
+# Delivered at Knoxville, TN on Fri Oct 24 16:45:00 UTC 2008. Signed for by: T.BAKER
+```
+
+#### FedEx connection notes
+
+The :login key passed to ```ActiveShipping::FedEx.new()``` is really the FedEx meter number, not the FedEx login.
+
+When developing with test credentials, be sure to pass ```test: true``` to ```ActiveShipping::FedEx.new()``` .
 
 ## Running the tests
 
@@ -113,7 +125,9 @@ https://github.com/Shopify/active_shipping/tree/master/test/fixtures/xml/usps
 
 To log requests and responses, just set the `logger` on your carrier class to some kind of `Logger` object:
 
-    ActiveShipping::USPS.logger = Logger.new($stdout)
+```ruby
+ActiveShipping::USPS.logger = Logger.new($stdout)
+```
 
 (This logging functionality is provided by the [`PostsData` module](https://github.com/Shopify/active_utils/blob/master/lib/active_utils/posts_data.rb) in the `active_utils` dependency.)
 

data/dev.yml

@@ -0,0 +1,19 @@
+name: active_shipping
+
+up:
+  - ruby:
+      version: 2.2.4
+      build: true
+  - bundler
+
+commands:
+  test:
+    syntax:
+      optional: file args...
+    desc: 'run all tests or a specific test file'
+    run: |
+      if [[ $# -eq 0 ]]; then
+        bundle exec rake test
+      else
+        bundle exec ruby -Itest "$@"
+      fi

data/lib/active_shipping/carriers/fedex.rb

@@ -605,6 +605,11 @@ module ActiveShipping
           else
             raise ActiveShipping::ResponseContentError, StandardError.new(first_notification.at('Message').text)
           end
+        elsif first_notification.at('Severity').text == 'FAILURE'
+          case first_notification.at('Code').text
+          when '9045'
+            raise ActiveShipping::ResponseContentError, StandardError.new(first_notification.at('Message').text)
+          end
         end
 
         tracking_number = tracking_details.at('TrackingNumber').text

data/lib/active_shipping/carriers/ups.rb

@@ -3,6 +3,7 @@
 module ActiveShipping
   class UPS < Carrier
     self.retry_safe = true
+    self.ssl_version = :TLSv1_2
 
     cattr_accessor :default_options
     cattr_reader :name
@@ -532,10 +533,12 @@ module ActiveShipping
             xml.Weight([value.round(3), 0.1].max)
           end
 
-          xml.InvoiceLineTotal do
-            xml.CurrencyCode('USD')
-            total_value = packages.inject(0) {|sum, package| sum + package.value}
-            xml.MonetaryValue(total_value)
+          if packages.any? {|package| package.value.present?}
+            xml.InvoiceLineTotal do
+              xml.CurrencyCode('USD')
+              total_value = packages.inject(0) {|sum, package| sum + package.value.to_i}
+              xml.MonetaryValue(total_value)
+            end
           end
 
           xml.PickupDate(pickup_date.strftime('%Y%m%d'))

data/lib/active_shipping/carriers/usps.rb

@@ -247,8 +247,8 @@ module ActiveShipping
         timestamp = "#{node.at('EventDate').text}, #{node.at('EventTime').text}"
         Time.parse(timestamp)
       else
-        # Arbitrary time in past, because we need to sort properly by time
-        Time.parse("Jan 01, 2000")
+        # Epoch time, because we need to sort properly by time
+        Time.at(0)
       end
 
       event_code = node.at('EventCode').text

data/lib/active_shipping/rate_estimate.rb

@@ -63,7 +63,7 @@ module ActiveShipping
   #   The price of insurance in cents.
   #   @return [Integer]
   class RateEstimate
-    attr_reader :origin, :destination, :package_rates,
+    attr_accessor :origin, :destination, :package_rates,
                 :carrier, :service_name, :service_code,
                 :shipping_date, :delivery_date, :delivery_range,
                 :currency, :negotiated_rate, :insurance_price,
@@ -71,25 +71,25 @@ module ActiveShipping
                 :compare_price, :phone_required
 
     def initialize(origin, destination, carrier, service_name, options = {})
-      @origin, @destination, @carrier, @service_name = origin, destination, carrier, service_name
-      @service_code = options[:service_code]
-      @estimate_reference = options[:estimate_reference]
-      @pickup_time = options[:pickup_time]
-      @expires_at = options[:expires_at]
+      self.origin, self.destination, self.carrier, self.service_name = origin, destination, carrier, service_name
+      self.service_code = options[:service_code]
+      self.estimate_reference = options[:estimate_reference]
+      self.pickup_time = options[:pickup_time]
+      self.expires_at = options[:expires_at]
       if options[:package_rates]
-        @package_rates = options[:package_rates].map { |p| p.update(:rate => Package.cents_from(p[:rate])) }
+        self.package_rates = options[:package_rates].map { |p| p.update(:rate => Package.cents_from(p[:rate])) }
       else
-        @package_rates = Array(options[:packages]).map { |p| {:package => p} }
+        self.package_rates = Array(options[:packages]).map { |p| {:package => p} }
       end
-      @total_price = Package.cents_from(options[:total_price])
-      @negotiated_rate = options[:negotiated_rate] ? Package.cents_from(options[:negotiated_rate]) : nil
-      @compare_price = options[:compare_price] ? Package.cents_from(options[:compare_price]) : nil
-      @phone_required = !!options[:phone_required]
-      @currency = ActiveUtils::CurrencyCode.standardize(options[:currency])
-      @delivery_range = options[:delivery_range] ? options[:delivery_range].map { |date| date_for(date) }.compact : []
-      @shipping_date = date_for(options[:shipping_date])
-      @delivery_date = @delivery_range.last
-      @insurance_price = Package.cents_from(options[:insurance_price])
+      self.total_price = options[:total_price]
+      self.negotiated_rate = options[:negotiated_rate]
+      self.compare_price = options[:compare_price]
+      self.phone_required = options[:phone_required]
+      self.currency = options[:currency]
+      self.delivery_range = options[:delivery_range]
+      self.shipping_date = options[:shipping_date]
+      self.delivery_date = @delivery_range.last
+      self.insurance_price = options[:insurance_price]
     end
 
     # The total price of the shipments in cents.
@@ -125,6 +125,40 @@ module ActiveShipping
       package_rates.length
     end
 
+    protected
+
+    def delivery_range=(delivery_range)
+      @delivery_range = delivery_range ? delivery_range.map { |date| date_for(date) }.compact : []
+    end
+
+    def total_price=(total_price)
+      @total_price = Package.cents_from(total_price)
+    end
+
+    def negotiated_rate=(negotiated_rate)
+      @negotiated_rate = negotiated_rate ? Package.cents_from(negotiated_rate) : nil
+    end
+
+    def compare_price=(compare_price)
+      @compare_price = compare_price ? Package.cents_from(compare_price) : nil
+    end
+
+    def currency=(currency)
+      @currency = ActiveUtils::CurrencyCode.standardize(currency)
+    end
+
+    def phone_required=(phone_required)
+      @phone_required = !!phone_required
+    end
+
+    def shipping_date=(shipping_date)
+      @shipping_date = date_for(shipping_date)
+    end
+
+    def insurance_price=(insurance_price)
+      @insurance_price = Package.cents_from(insurance_price)
+    end
+
     private
 
     # Returns a Date object for a given input

data/lib/active_shipping/version.rb

@@ -1,3 +1,3 @@
 module ActiveShipping
-  VERSION = "1.6.5"
+  VERSION = "1.7.0"
 end

data/test/fixtures/xml/fedex/tracking_response_failure_code_9045.xml

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<TrackReply xmlns="http://fedex.com/ws/track/v7" xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/">
+  <HighestSeverity>SUCCESS</HighestSeverity>
+  <Notifications>
+    <Severity>SUCCESS</Severity>
+    <Source>trck</Source>
+    <Code>0</Code>
+    <Message>Request was successfully processed.</Message>
+    <LocalizedMessage>Request was successfully processed.</LocalizedMessage>
+  </Notifications>
+  <TransactionDetail>
+    <CustomerTransactionId>ActiveShipping</CustomerTransactionId>
+  </TransactionDetail>
+  <Version>
+    <ServiceId>trck</ServiceId>
+    <Major>7</Major>
+    <Intermediate>0</Intermediate>
+    <Minor>0</Minor>
+  </Version>
+  <CompletedTrackDetails>
+    <HighestSeverity>SUCCESS</HighestSeverity>
+    <Notifications>
+      <Severity>SUCCESS</Severity>
+      <Source>trck</Source>
+      <Code>0</Code>
+      <Message>Request was successfully processed.</Message>
+      <LocalizedMessage>Request was successfully processed.</LocalizedMessage>
+    </Notifications>
+    <DuplicateWaybill>false</DuplicateWaybill>
+    <MoreData>false</MoreData>
+    <TrackDetails>
+      <Notification>
+        <Severity>FAILURE</Severity>
+        <Source>trck</Source>
+        <Code>9045</Code>
+        <Message>Sorry, we are unable to process your tracking request.  Please retry later, or contact Customer Service at 1.800.Go.FedEx(R) 800.463.3339.</Message>
+        <LocalizedMessage>Sorry, we are unable to process your tracking request.  Please retry later, or contact Customer Service at 1.800.Go.FedEx(R) 800.463.3339.</LocalizedMessage>
+      </Notification>
+      <TrackingNumber>020207021381215</TrackingNumber>
+      <StatusDetail>
+        <Location>
+          <Residential>false</Residential>
+        </Location>
+      </StatusDetail>
+      <PackageSequenceNumber>0</PackageSequenceNumber>
+      <PackageCount>0</PackageCount>
+      <DeliveryAttempts>0</DeliveryAttempts>
+      <TotalUniqueAddressCountInConsolidation>0</TotalUniqueAddressCountInConsolidation>
+      <RedirectToHoldEligibility>INELIGIBLE</RedirectToHoldEligibility>
+    </TrackDetails>
+  </CompletedTrackDetails>
+</TrackReply>

data/test/remote/ups_test.rb

@@ -286,6 +286,25 @@ class RemoteUPSTest < Minitest::Test
     assert_equal Date.parse(1.business_days.from_now.to_s), ground_delivery_estimate.date
   end
 
+  def test_delivery_date_estimates_within_zip_with_no_value
+    today = Date.current
+
+    response = @carrier.get_delivery_date_estimates(
+      location_fixtures[:new_york_with_name],
+      location_fixtures[:new_york_with_name],
+      package_fixtures.values_at(:book),
+      today,
+      {
+        :test => true
+      }
+    )
+
+    assert response.success?
+    refute_empty response.delivery_estimates
+    ground_delivery_estimate = response.delivery_estimates.select {|de| de.service_name == "UPS Ground"}.first
+    assert_equal Date.parse(1.business_days.from_now.to_s), ground_delivery_estimate.date
+  end
+
   def test_delivery_date_estimates_across_zips
     today = Date.current
 

data/test/remote/usps_test.rb

@@ -11,14 +11,6 @@ class RemoteUSPSTest < Minitest::Test
     skip(e.message)
   end
 
-  def test_tracking
-    response = @carrier.find_tracking_info('LN757696446US', test: false)
-    assert response.success?, response.message
-    assert_equal 13,response.shipment_events.size
-    assert_equal 'DELIVERED', response.shipment_events.last.message
-    assert_equal Time.parse('2015-11-30 13:02:00 UTC'), response.actual_delivery_date
-  end
-
    def test_tracking_with_attempted_delivery
     response = @carrier.find_tracking_info('9405515901606017103876', test: false)
     assert response.success?, response.message
@@ -26,7 +18,7 @@ class RemoteUSPSTest < Minitest::Test
     assert_equal 'DELIVERED', response.shipment_events.last.message
     assert_equal Time.parse('2015-12-10 14:42:00 UTC'), response.attempted_delivery_date
     assert_equal Time.parse('2015-12-24 10:51:00 UTC'), response.actual_delivery_date
-  end 
+  end
 
   def test_tracking_with_bad_number
     assert_raises(ResponseError) do

data/test/unit/carriers/fedex_test.rb

@@ -327,6 +327,18 @@ class FedExTest < Minitest::Test
     end
   end
 
+  def test_response_failure_code_9045
+    mock_response = xml_fixture('fedex/tracking_response_failure_code_9045')
+    @carrier.expects(:commit).returns(mock_response)
+
+    error = assert_raises(ActiveShipping::ResponseContentError) do
+      @carrier.find_tracking_info('123456789013')
+    end
+
+    msg = 'Sorry, we are unable to process your tracking request.  Please retry later, or contact Customer Service at 1.800.Go.FedEx(R) 800.463.3339.'
+    assert_equal msg, error.message
+  end
+
   def test_parsing_response_without_notifications
     mock_response = xml_fixture('fedex/reply_without_notifications')
 

data/test/unit/carriers/usps_test.rb

@@ -139,8 +139,11 @@ class USPSTest < Minitest::Test
     assert_nil response.scheduled_delivery_date
     assert_nil response.shipment_events.last.location.city
 
+    time = Time.at(0)
+    expected_utc_time = Time.utc(time.year, time.month, time.mday, time.hour, time.min, time.sec)
+
     assert_equal 'NP', response.shipment_events.first.type_code
-    assert_equal Time.parse('Jan 01, 2000'), response.shipment_events.first.time
+    assert_equal expected_utc_time, response.shipment_events.first.time
 
     special_country  = xml_fixture('usps/tracking_response_alt').gsub('CANADA','TAIWAN')
     @carrier.expects(:commit).returns(special_country)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_shipping
 version: !ruby/object:Gem::Version
-  version: 1.6.5
+  version: 1.7.0
 platform: ruby
 authors:
 - James MacAulay
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-08 00:00:00.000000000 Z
+date: 2016-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: quantified
@@ -181,6 +181,7 @@ files:
 - README.md
 - Rakefile
 - active_shipping.gemspec
+- dev.yml
 - lib/active_shipping.rb
 - lib/active_shipping/carrier.rb
 - lib/active_shipping/carriers.rb
@@ -281,6 +282,7 @@ files:
 - test/fixtures/xml/fedex/tracking_response_delivered_at_facility.xml
 - test/fixtures/xml/fedex/tracking_response_delivered_with_signature.xml
 - test/fixtures/xml/fedex/tracking_response_empty_status_detail.xml
+- test/fixtures/xml/fedex/tracking_response_failure_code_9045.xml
 - test/fixtures/xml/fedex/tracking_response_in_transit.xml
 - test/fixtures/xml/fedex/tracking_response_invalid_status_code.xml
 - test/fixtures/xml/fedex/tracking_response_invalid_tracking_number.xml
@@ -487,6 +489,7 @@ test_files:
 - test/fixtures/xml/fedex/tracking_response_delivered_at_facility.xml
 - test/fixtures/xml/fedex/tracking_response_delivered_with_signature.xml
 - test/fixtures/xml/fedex/tracking_response_empty_status_detail.xml
+- test/fixtures/xml/fedex/tracking_response_failure_code_9045.xml
 - test/fixtures/xml/fedex/tracking_response_in_transit.xml
 - test/fixtures/xml/fedex/tracking_response_invalid_status_code.xml
 - test/fixtures/xml/fedex/tracking_response_invalid_tracking_number.xml