active_shipping 1.7.3 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79c6b3362e5819936e2a22e145f561bef37dbd4f
-  data.tar.gz: 3e0b2fcd0aa37da3733796632bdf92864e538e52
+  metadata.gz: 5ad9d99cc454f0faea29105ee23c7fd8f2d15abd
+  data.tar.gz: aad314e51332792731f489177fbfc27531f51461
 SHA512:
-  metadata.gz: 0dadab7eeb70c6123fdaaa4a0215755a5e9337a5e51c6bc82ba29ca357d9caa493a9bd64c070ca85c8e5e2500df47109beeb9c11c7e787c34973b3a8b9376f13
-  data.tar.gz: eeacbd47303bd524f268877a386477b67fe8ac2987cf7c4a722a90abc3535409de6ffcdb508072992b9c75e6d620c0d3c759edac1dc50229b05f2a4a63e998f1
+  metadata.gz: a3d3414ea380fbd020aea383b03e5653455c2c5437722401a70d077405a3d7fcb17340dc14b065591a50985b057b10d795bdf37b5cef4b0a4290d5e0f4c5dab5
+  data.tar.gz: 2a231ba077f8e57ff194461a6654007d600658e7a384cbb9762359b5f7f4e950ca21fee25e012f2d91d1dd8cc187b4374940f171023c137a5359d6378c2346dc

data/.travis.yml

@@ -5,7 +5,7 @@ sudo: false
 rvm:
 - "2.0"
 - "2.1"
-- "2.2"
+- "2.2.2"
 - "2.3.1"
 
 gemfile:
@@ -13,6 +13,14 @@ gemfile:
 - Gemfile.activesupport40
 - Gemfile.activesupport41
 - Gemfile.activesupport42
+- Gemfile.activesupport50
+
+matrix:
+  exclude:
+    - rvm: "2.0"
+      gemfile: Gemfile.activesupport50
+    - rvm: "2.1"
+      gemfile: Gemfile.activesupport50
 
 env:
   global:

data/Gemfile.activesupport50

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+gemspec
+
+gem 'activesupport', '~> 5.0.0'
+gem 'active_utils', '~> 3.2.2'

data/active_shipping.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.license     = 'MIT'
 
   s.add_dependency('quantified',    '~> 1.0.1')
-  s.add_dependency('activesupport', '>= 3.2', '< 5.0.0')
+  s.add_dependency('activesupport', '>= 3.2', '< 5.1.0')
   s.add_dependency('active_utils',  '~> 3.2.0')
   s.add_dependency('nokogiri',      '>= 1.6')
 

data/dev.yml

@@ -1,4 +1,4 @@
-name: active_shipping
+name: active-shipping
 
 up:
   - ruby: 2.3.1

data/lib/active_shipping/carrier.rb

@@ -72,8 +72,8 @@ module ActiveShipping
     #
     # @note Override with whatever you need to cancel a shipping label
     #
-    # @param shipment_id [String] The unique identifier of the shipment to cancel. 
-    #  This can be shipment_id or tracking number depending on carrier. Up to you and 
+    # @param shipment_id [String] The unique identifier of the shipment to cancel.
+    #  This can be shipment_id or tracking number depending on carrier. Up to you and
     #  the carrier
     # @param options [Hash] Carrier-specific parameters.
     # @return [ActiveShipping::ShipmentResponse] The response from the carrier. This
@@ -162,12 +162,15 @@ module ActiveShipping
     def timestamp_from_business_day(days)
       return unless days
       date = DateTime.now.utc
+
       days.times do
-        begin
-          date = date + 1
-        end while [0, 6].include?(date.wday)
+        date += 1.day
+
+        date += 2.days if date.saturday?
+        date += 1.day if date.sunday?
       end
-      date
+
+      date.to_datetime
     end
   end
 end

data/lib/active_shipping/carriers/canada_post_pws.rb

@@ -814,7 +814,7 @@ module ActiveShipping
   end
 
   class CPPWSTrackingResponse < TrackingResponse
-    DELIVERED_EVENT_CODES = %w(1496 1498 1499 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438)
+    DELIVERED_EVENT_CODES = %w(1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1441 1442 1496 1497 1498 1499 5300)
     include CPPWSErrorResponse
 
     attr_reader :service_name, :expected_date, :changed_date, :change_reason, :customer_number

data/lib/active_shipping/rate_estimate.rb

@@ -62,13 +62,17 @@ module ActiveShipping
   # @!attribute insurance_price
   #   The price of insurance in cents.
   #   @return [Integer]
+  #
+  # @!attribute delivery_category
+  #   The general classification of the delivery method
+  #   @return [String]
   class RateEstimate
     attr_accessor :origin, :destination, :package_rates,
                 :carrier, :service_name, :service_code,
                 :shipping_date, :delivery_date, :delivery_range,
                 :currency, :negotiated_rate, :insurance_price,
                 :estimate_reference, :expires_at, :pickup_time,
-                :compare_price, :phone_required
+                :compare_price, :phone_required, :delivery_category
 
     def initialize(origin, destination, carrier, service_name, options = {})
       self.origin, self.destination, self.carrier, self.service_name = origin, destination, carrier, service_name
@@ -90,6 +94,7 @@ module ActiveShipping
       self.shipping_date = options[:shipping_date]
       self.delivery_date = @delivery_range.last
       self.insurance_price = options[:insurance_price]
+      self.delivery_category = options[:delivery_category]
     end
 
     # The total price of the shipments in cents.

data/lib/active_shipping/response.rb

@@ -18,12 +18,13 @@ module ActiveShipping #:nodoc:
     #   of a request executed against the sandbox or test environment of the carrier's API.
     # @option options [String] :xml The raw XML of the response.
     # @option options [String] :request The payload of the request.
+    # @option options [Boolean] :allow_failure Allows a failed response without raising.
     def initialize(success, message, params = {}, options = {})
       @success, @message, @params = success, message, params.stringify_keys
       @test = options[:test] || false
       @xml = options[:xml]
       @request = options[:request]
-      raise ResponseError.new(self) unless success
+      raise ResponseError.new(self) unless success || options[:allow_failure]
     end
 
     # Whether the request was executed successfully or not.

data/lib/active_shipping/version.rb

@@ -1,3 +1,3 @@
 module ActiveShipping
-  VERSION = "1.7.3"
+  VERSION = "1.8.0"
 end

data/test/unit/carrier_test.rb

@@ -0,0 +1,124 @@
+require 'test_helper'
+
+class CarrierTest < Minitest::Test
+  class ExampleCarrier < Carrier
+    cattr_reader :name
+    @@name = "Example Carrier"
+  end
+
+  def setup
+    @carrier = ExampleCarrier.new
+  end
+
+  def test_find_rates_not_implemented
+    assert_raises NotImplementedError do
+      @carrier.find_rates(nil, nil, nil)
+    end
+  end
+
+  def test_create_shipment_not_implemented
+    assert_raises NotImplementedError do
+      @carrier.create_shipment(nil, nil, nil)
+    end
+  end
+
+  def test_cancel_shipment_not_implemented
+    assert_raises NotImplementedError do
+      @carrier.cancel_shipment(nil)
+    end
+  end
+
+  def test_find_tracking_info_not_implemented
+    assert_raises NotImplementedError do
+      @carrier.find_tracking_info(nil)
+    end
+  end
+
+  def test_maximum_weight
+    assert_equal Quantified::Mass.new(150, :pounds), @carrier.maximum_weight
+  end
+
+  def test_maximum_address_field_length
+    assert_equal 255, @carrier.maximum_address_field_length
+  end
+
+  def test_requirements_empty_array
+    assert_equal [], @carrier.send(:requirements)
+  end
+
+  def test_timestamp_from_business_day_returns_nil_without_a_day
+    assert_nil @carrier.send(:timestamp_from_business_day, nil)
+  end
+
+  def test_save_request
+    request = Object.new
+    assert_nil @carrier.last_request
+    @carrier.send(:save_request, request)
+    assert_equal request, @carrier.last_request
+  end
+
+  def test_timestamp_from_business_day_returns_two_days_in_the_future
+    current = DateTime.new(2016, 7, 19) # Tuesday
+    expected = DateTime.new(2016, 7, 21)
+
+    Timecop.freeze(current) do
+      assert_equal expected, @carrier.send(:timestamp_from_business_day, 2)
+    end
+  end
+
+  def test_timestamp_from_business_day_returns_two_days_in_the_future_over_a_weekend
+    current = DateTime.new(2016, 7, 22) # Friday
+    expected = DateTime.new(2016, 7, 26)
+
+    Timecop.freeze(current) do
+      assert_equal expected, @carrier.send(:timestamp_from_business_day, 2)
+    end
+  end
+
+  def test_timestamp_from_business_day_returns_fifteen_days_in_the_future
+    current = DateTime.new(2016, 7, 6) # Wednesday
+    expected = DateTime.new(2016, 7, 27) # includes 3 weekends
+
+    Timecop.freeze(current) do
+      assert_equal expected, @carrier.send(:timestamp_from_business_day, 15)
+    end
+  end
+
+  def test_timestamp_from_business_day_handles_saturday
+    current = DateTime.new(2016, 7, 9) # Saturday
+    expected = DateTime.new(2016, 7, 11)
+
+    Timecop.freeze(current) do
+      assert_equal expected, @carrier.send(:timestamp_from_business_day, 1)
+    end
+  end
+
+  def test_timestamp_from_business_day_handles_sunday
+    current = DateTime.new(2016, 7, 10) # Sunday
+    expected = DateTime.new(2016, 7, 11)
+
+    Timecop.freeze(current) do
+      assert_equal expected, @carrier.send(:timestamp_from_business_day, 1)
+    end
+  end
+
+  def test_timestamp_from_business_day_returns_datetime
+    Timecop.freeze(DateTime.civil(2016, 7, 19)) do
+      assert_equal DateTime, @carrier.send(:timestamp_from_business_day, 1).class
+    end
+  end
+
+  def test_default_location
+    result = Carrier.default_location
+
+    assert_equal Location, result.class
+    assert_equal ActiveUtils::Country.find("US"), result.country
+    assert_equal "CA", result.state
+    assert_equal "Beverly Hills", result.city
+    assert_equal "455 N. Rexford Dr.", result.address1
+    assert_equal "3rd Floor", result.address2
+    assert_equal "90210", result.zip
+    assert_equal "1-310-285-1013", result.phone
+    assert_equal "1-310-275-8159", result.fax
+  end
+end

data/test/unit/carriers/shipwire_test.rb

@@ -24,67 +24,65 @@ class ShipwireTest < Minitest::Test
 
   def test_successfully_get_international_rates
     date = DateTime.new(2011, 8, 1)
-    DateTime.expects(:now).returns(date).at_least_once
     @carrier.expects(:ssl_post).returns(xml_fixture('shipwire/international_rates_response'))
 
-    response = @carrier.find_rates(
-                 location_fixtures[:ottawa],
-                 location_fixtures[:london],
-                 package_fixtures.values_at(:book, :wii),
-                 :order_id => '#1000',
-                 :items => @items
-               )
-
-    assert response.success?
-
-    assert_equal 1, response.rates.size
-
-    assert international = response.rates.first
-    assert_equal "INTL", international.service_code
-    assert_equal "UPS", international.carrier
-    assert_equal "UPS Standard", international.service_name
-    assert_equal 2806, international.total_price
-    assert_equal date + 7, international.delivery_date
-    assert_equal [date + 1, date + 7], international.delivery_range
+    Timecop.freeze(date) do
+      response = @carrier.find_rates(
+                   location_fixtures[:ottawa],
+                   location_fixtures[:london],
+                   package_fixtures.values_at(:book, :wii),
+                   :order_id => '#1000',
+                   :items => @items
+                 )
+
+      assert response.success?
+
+      assert_equal 1, response.rates.size
+
+      assert international = response.rates.first
+      assert_equal "INTL", international.service_code
+      assert_equal "UPS", international.carrier
+      assert_equal "UPS Standard", international.service_name
+      assert_equal 2806, international.total_price
+      assert_equal [date + 1.day, date + 7.days], international.delivery_range
+    end
   end
 
   def test_successfully_get_domestic_rates
     date = DateTime.new(2011, 8, 1)
-    DateTime.expects(:now).returns(date).at_least_once
     @carrier.expects(:ssl_post).returns(xml_fixture('shipwire/rates_response'))
 
-    response = @carrier.find_rates(
-                 location_fixtures[:ottawa],
-                 location_fixtures[:beverly_hills],
-                 package_fixtures.values_at(:book, :wii),
-                 :order_id => '#1000',
-                 :items => @items
-               )
-
-    assert response.success?
-
-    assert_equal 3, response.rates.size
-
-    assert ground  = response.rates.find { |r| r.service_code == "GD" }
-    assert_equal "UPS", ground.carrier
-    assert_equal "UPS Ground", ground.service_name
-    assert_equal 773, ground.total_price
-    assert_equal date + 7, ground.delivery_date
-    assert_equal [date + 1, date + 7], ground.delivery_range
-
-    assert two_day = response.rates.find { |r| r.service_code == "2D" }
-    assert_equal "UPS", two_day.carrier
-    assert_equal "UPS Second Day Air", two_day.service_name
-    assert_equal 1364, two_day.total_price
-    assert_equal date + 2, two_day.delivery_date
-    assert_equal [date + 2, date + 2], two_day.delivery_range
-
-    assert one_day = response.rates.find { |r| r.service_code == "1D" }
-    assert_equal "USPS", one_day.carrier
-    assert_equal "USPS Express Mail", one_day.service_name
-    assert_equal 2525, one_day.total_price
-    assert_equal date + 1, one_day.delivery_date
-    assert_equal [date + 1, date + 1], one_day.delivery_range
+    Timecop.freeze(date) do
+      response = @carrier.find_rates(
+                   location_fixtures[:ottawa],
+                   location_fixtures[:beverly_hills],
+                   package_fixtures.values_at(:book, :wii),
+                   :order_id => '#1000',
+                   :items => @items
+                 )
+
+      assert response.success?
+
+      assert_equal 3, response.rates.size
+
+      assert ground  = response.rates.find { |r| r.service_code == "GD" }
+      assert_equal "UPS", ground.carrier
+      assert_equal "UPS Ground", ground.service_name
+      assert_equal 773, ground.total_price
+      assert_equal [date + 1.day, date + 7.days], ground.delivery_range
+
+      assert two_day = response.rates.find { |r| r.service_code == "2D" }
+      assert_equal "UPS", two_day.carrier
+      assert_equal "UPS Second Day Air", two_day.service_name
+      assert_equal 1364, two_day.total_price
+      assert_equal [date + 2.days, date + 2.days], two_day.delivery_range
+
+      assert one_day = response.rates.find { |r| r.service_code == "1D" }
+      assert_equal "USPS", one_day.carrier
+      assert_equal "USPS Express Mail", one_day.service_name
+      assert_equal 2525, one_day.total_price
+      assert_equal [date + 1.day, date + 1.day], one_day.delivery_range
+    end
   end
 
   def test_gracefully_handle_new_carrier
@@ -167,7 +165,6 @@ class ShipwireTest < Minitest::Test
 
     assert response.success?
     assert_equal [], response.rates[0].delivery_range
-    assert_nil response.rates[0].delivery_date
   end
 
   def test_rate_request_includes_company_if_provided

data/test/unit/carriers/ups_test.rb

@@ -242,17 +242,18 @@ class UPSTest < Minitest::Test
   def test_delivery_range_takes_weekend_into_consideration
     mock_response = xml_fixture('ups/test_real_home_as_residential_destination_response')
     @carrier.expects(:commit).returns(mock_response)
-    Timecop.freeze(DateTime.new(2012, 6, 15))
-    response = @carrier.find_rates( location_fixtures[:beverly_hills],
-                                    location_fixtures[:real_home_as_residential],
-                                    package_fixtures.values_at(:chocolate_stuff))
 
-    date_test = [nil, 3, 2, 1, 1, 1].map do |days|
-      DateTime.now.utc + days + 2 if days
-    end
-    Timecop.return
+    Timecop.freeze(DateTime.new(2012, 6, 15)) do
+      response = @carrier.find_rates( location_fixtures[:beverly_hills],
+                                      location_fixtures[:real_home_as_residential],
+                                      package_fixtures.values_at(:chocolate_stuff))
+
+      date_test = [nil, 3, 2, 1, 1, 1].map do |days|
+        DateTime.now.utc + (days + 2).days if days
+      end
 
-    assert_equal date_test, response.rates.map(&:delivery_date)
+      assert_equal date_test, response.rates.map(&:delivery_date)
+    end
   end
 
   def test_maximum_weight

data/test/unit/rate_estimate_test.rb

@@ -2,11 +2,11 @@ require 'test_helper'
 
 class RateEstimateTest < Minitest::Test
   def setup
-    @origin      = {:address1 => "61A York St", :city => "Ottawa", :province => "ON", :country => "Canada", :postal_code => "K1N 5T2"}
-    @destination = {:city => "Beverly Hills", :state => "CA", :country => "United States", :postal_code => "90210"}
-    @line_items  = [Package.new(500, [2, 3, 4], :description => "a box full of stuff", :value => 2500)]
+    @origin      = {address1: "61A York St", city: "Ottawa", province: "ON", country: "Canada", postal_code: "K1N 5T2"}
+    @destination = {city: "Beverly Hills", state: "CA", country: "United States", postal_code: "90210"}
+    @line_items  = [Package.new(500, [2, 3, 4], description: "a box full of stuff", value: 2500)]
     @carrier     = CanadaPost.new(login: 'test')
-    @options     = {:currency => 'USD'}
+    @options     = {currency: 'USD', delivery_range: [DateTime.new(2016, 7, 1), DateTime.new(2016, 7, 3)]}
 
     @rate_estimate = RateEstimate.new(@origin, @destination, @carrier, @service_name, @options)
   end
@@ -31,13 +31,13 @@ class RateEstimateTest < Minitest::Test
   end
 
   def test_rate_estimate_converts_noniso_to_iso
-    rate_estimate = RateEstimate.new(@origin, @destination, @carrier, @service_name, @options.merge(:currency => 'UKL'))
+    rate_estimate = RateEstimate.new(@origin, @destination, @carrier, @service_name, @options.merge(currency: 'UKL'))
     assert_equal 'GBP', rate_estimate.currency
   end
 
   def test_creating_an_estimate_with_an_invalid_currency_raises
     assert_raises(ActiveUtils::InvalidCurrencyCodeError) do
-      RateEstimate.new(nil, nil, nil, nil, :currency => 'FAKE')
+      RateEstimate.new(nil, nil, nil, nil, currency: 'FAKE')
     end
   end
 
@@ -51,4 +51,15 @@ class RateEstimateTest < Minitest::Test
     est = RateEstimate.new(@origin, @destination, @carrier, @service_name, @options.merge(compare_price: 10.0))
     assert_equal 1000, est.compare_price
   end
+
+  def test_delivery_category_is_set
+    est = RateEstimate.new(@origin, @destination, @carrier, @service_name, @options.merge(delivery_category: "local_delivery"))
+
+    assert_equal "local_delivery", est.delivery_category
+  end
+
+  def test_delivery_date_pulls_from_delivery_range
+    assert_equal [DateTime.new(2016, 7, 1), DateTime.new(2016, 7, 3)], @rate_estimate.delivery_range
+    assert_equal DateTime.new(2016, 7, 3), @rate_estimate.delivery_date
+  end
 end

data/test/unit/response_test.rb

@@ -11,4 +11,9 @@ class ResponseTest < Minitest::Test
       RateResponse.new(false, "fail!", {:rate => 'Free!'}, :rates => [stub(:service_name => 'Free!', :total_price => 0)], :xml => "<rate>Free!</rate>")
     end
   end
+
+  def test_initialize_failure_no_raise
+    response = RateResponse.new(false, "fail!", {:rate => 'Free!'}, :rates => [stub(:service_name => 'Free!', :total_price => 0)], :xml => "<rate>Free!</rate>", :allow_failure => true)
+    refute response.success?
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_shipping
 version: !ruby/object:Gem::Version
-  version: 1.7.3
+  version: 1.8.0
 platform: ruby
 authors:
 - James MacAulay
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-02 00:00:00.000000000 Z
+date: 2016-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: quantified
@@ -36,7 +36,7 @@ dependencies:
         version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 5.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -46,7 +46,7 @@ dependencies:
         version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 5.1.0
 - !ruby/object:Gem::Dependency
   name: active_utils
   requirement: !ruby/object:Gem::Requirement
@@ -177,6 +177,7 @@ files:
 - Gemfile.activesupport40
 - Gemfile.activesupport41
 - Gemfile.activesupport42
+- Gemfile.activesupport50
 - MIT-LICENSE
 - README.md
 - Rakefile
@@ -389,6 +390,7 @@ files:
 - test/remote/usps_returns_test.rb
 - test/remote/usps_test.rb
 - test/test_helper.rb
+- test/unit/carrier_test.rb
 - test/unit/carriers/australia_post_test.rb
 - test/unit/carriers/benchmark_test.rb
 - test/unit/carriers/canada_post_pws_rating_test.rb
@@ -609,6 +611,7 @@ test_files:
 - test/remote/usps_returns_test.rb
 - test/remote/usps_test.rb
 - test/test_helper.rb
+- test/unit/carrier_test.rb
 - test/unit/carriers/australia_post_test.rb
 - test/unit/carriers/benchmark_test.rb
 - test/unit/carriers/canada_post_pws_rating_test.rb