active_shipping 1.14.2 → 2.0.0

data/lib/active_shipping/package.rb

@@ -1,12 +1,10 @@
 module ActiveShipping #:nodoc:
   class Package
-    include Quantified
-
     cattr_accessor :default_options
     attr_reader :options, :value, :currency
 
     # Package.new(100, [10, 20, 30], :units => :metric)
-    # Package.new(Mass.new(100, :grams), [10, 20, 30].map {|m| Length.new(m, :centimetres)})
+    # Package.new(Measured::Weight.new(100, :g), [10, 20, 30].map {|m| Length.new(m, :centimetres)})
     # Package.new(100.grams, [10, 20, 30].map(&:centimetres))
     def initialize(grams_or_ounces, dimensions, options = {})
       options = @@default_options.update(options) if @@default_options
@@ -15,28 +13,26 @@ module ActiveShipping #:nodoc:
 
       @dimensions = [dimensions].flatten.reject(&:nil?)
 
-      imperial = (options[:units] == :imperial) ||
-                 ([grams_or_ounces, *dimensions].all? { |m| m.respond_to?(:unit) && m.unit.to_sym == :imperial })
+      imperial = (options[:units] == :imperial)
 
       weight_imperial = dimensions_imperial = imperial if options.include?(:units)
 
       if options.include?(:weight_units)
-        weight_imperial = (options[:weight_units] == :imperial) ||
-                          (grams_or_ounces.respond_to?(:unit) && m.unit.to_sym == :imperial)
+        weight_imperial = (options[:weight_units] == :imperial)
       end
 
       if options.include?(:dim_units)
-        dimensions_imperial = (options[:dim_units] == :imperial) ||
-                              (dimensions && dimensions.all? { |m| m.respond_to?(:unit) && m.unit.to_sym == :imperial })
+        dimensions_imperial = (options[:dim_units] == :imperial)
       end
 
       @weight_unit_system = weight_imperial ? :imperial : :metric
       @dimensions_unit_system = dimensions_imperial ? :imperial : :metric
 
-      @weight = attribute_from_metric_or_imperial(grams_or_ounces, Mass, @weight_unit_system, :grams, :ounces)
+      @weight = attribute_from_metric_or_imperial(grams_or_ounces, Measured::Weight, @weight_unit_system, :grams, :ounces)
 
       if @dimensions.blank?
-        @dimensions = [Length.new(0, (dimensions_imperial ? :inches : :centimetres))] * 3
+        zero_length = Measured::Length.new(0, (dimensions_imperial ? :inches : :centimetres))
+        @dimensions = [zero_length] * 3
       else
         process_dimensions
       end
@@ -67,35 +63,35 @@ module ActiveShipping #:nodoc:
     end
 
     def ounces(options = {})
-      weight(options).in_ounces.amount
+      weight(options).convert_to(:oz).value.to_f
     end
     alias_method :oz, :ounces
 
     def grams(options = {})
-      weight(options).in_grams.amount
+      weight(options).convert_to(:g).value.to_f
     end
     alias_method :g, :grams
 
     def pounds(options = {})
-      weight(options).in_pounds.amount
+      weight(options).convert_to(:lb).value.to_f
     end
     alias_method :lb, :pounds
     alias_method :lbs, :pounds
 
     def kilograms(options = {})
-      weight(options).in_kilograms.amount
+      weight(options).convert_to(:kg).value.to_f
     end
     alias_method :kg, :kilograms
     alias_method :kgs, :kilograms
 
     def inches(measurement = nil)
-      @inches ||= @dimensions.map { |m| m.in_inches.amount }
+      @inches ||= @dimensions.map { |m| m.convert_to(:in).value.to_f }
       measurement.nil? ? @inches : measure(measurement, @inches)
     end
     alias_method :in, :inches
 
     def centimetres(measurement = nil)
-      @centimetres ||= @dimensions.map { |m| m.in_centimetres.amount }
+      @centimetres ||= @dimensions.map { |m| m.convert_to(:cm).value.to_f }
       measurement.nil? ? @centimetres : measure(measurement, @centimetres)
     end
     alias_method :cm, :centimetres
@@ -106,8 +102,8 @@ module ActiveShipping #:nodoc:
         @weight
       when :volumetric, :dimensional
         @volumetric_weight ||= begin
-          m = Mass.new((centimetres(:box_volume) / 6.0), :grams)
-          @weight_unit_system == :imperial ? m.in_ounces : m
+          m = Measured::Weight.new((centimetres(:box_volume) / 6.0), :grams)
+          @weight_unit_system == :imperial ? m.convert_to(:oz) : m
         end
       when :billable
         [weight, weight(:type => :volumetric)].max
@@ -143,7 +139,7 @@ module ActiveShipping #:nodoc:
 
     def measure(measurement, ary)
       case measurement
-      when Fixnum then ary[measurement]
+      when Integer then ary[measurement]
       when :x, :max, :length, :long then ary[2]
       when :y, :mid, :width, :wide then ary[1]
       when :z, :min, :height, :depth, :high, :deep then ary[0]
@@ -156,7 +152,7 @@ module ActiveShipping #:nodoc:
 
     def process_dimensions
       @dimensions = @dimensions.map do |l|
-        attribute_from_metric_or_imperial(l, Length, @dimensions_unit_system, :centimetres, :inches)
+        attribute_from_metric_or_imperial(l, Measured::Length, @dimensions_unit_system, :centimetres, :inches)
       end.sort
       # [1,2] => [1,1,2]
       # [5] => [5,5,5]

data/lib/active_shipping/package_item.rb

@@ -1,18 +1,16 @@
 module ActiveShipping #:nodoc:
   class PackageItem
-    include Quantified
-
     attr_reader :sku, :hs_code, :value, :name, :weight, :quantity, :options
 
     def initialize(name, grams_or_ounces, value, quantity, options = {})
       @name = name
 
-      imperial = (options[:units] == :imperial) ||
-                 (grams_or_ounces.respond_to?(:unit) && m.unit.to_sym == :imperial)
+      imperial = (options[:units] == :imperial)
 
       @unit_system = imperial ? :imperial : :metric
 
-      @weight = attribute_from_metric_or_imperial(grams_or_ounces, Mass, :grams, :ounces)
+      @weight = grams_or_ounces
+      @weight = Measured::Weight.new(grams_or_ounces, (@unit_system == :imperial ? :oz : :g)) unless @weight.is_a?(Measured::Weight)
 
       @value = Package.cents_from(value)
       @quantity = quantity > 0 ? quantity : 1
@@ -28,7 +26,7 @@ module ActiveShipping #:nodoc:
         @weight
       when :volumetric, :dimensional
         @volumetric_weight ||= begin
-          m = Mass.new((centimetres(:box_volume) / 6.0), :grams)
+          m = Measured::Weight.new((centimetres(:box_volume) / 6.0), :grams)
           @unit_system == :imperial ? m.in_ounces : m
         end
       when :billable
@@ -38,35 +36,25 @@ module ActiveShipping #:nodoc:
     alias_method :mass, :weight
 
     def ounces(options = {})
-      weight(options).in_ounces.amount
+      weight(options).convert_to(:oz).value
     end
     alias_method :oz, :ounces
 
     def grams(options = {})
-      weight(options).in_grams.amount
+      weight(options).convert_to(:g).value
     end
     alias_method :g, :grams
 
     def pounds(options = {})
-      weight(options).in_pounds.amount
+      weight(options).convert_to(:lb).value
     end
     alias_method :lb, :pounds
     alias_method :lbs, :pounds
 
     def kilograms(options = {})
-      weight(options).in_kilograms.amount
+      weight(options).convert_to(:kg).value
     end
     alias_method :kg, :kilograms
     alias_method :kgs, :kilograms
-
-    private
-
-    def attribute_from_metric_or_imperial(obj, klass, metric_unit, imperial_unit)
-      if obj.is_a?(klass)
-        return value
-      else
-        return klass.new(obj, (@unit_system == :imperial ? imperial_unit : metric_unit))
-      end
-    end
   end
 end

data/lib/active_shipping/rate_estimate.rb

@@ -189,7 +189,7 @@ module ActiveShipping
     # @return [Date, nil] The Date object absed on the input, or `nil` if no date
     #   could be determined.
     def date_for(date)
-      date && DateTime.strptime(date.to_s, "%Y-%m-%d")
+      date && Date.strptime(date.to_s, "%Y-%m-%d")
     rescue ArgumentError
       nil
     end

data/lib/active_shipping/version.rb

@@ -1,3 +1,3 @@
 module ActiveShipping
-  VERSION = "1.14.2"
+  VERSION = "2.0.0"
 end

data/test/fixtures/xml/canadapost/example_request.xml

@@ -10,9 +10,9 @@
       <item>
         <quantity>1</quantity>
         <weight>0.5</weight>
-        <length>4</length>
-        <width>3</width>
-        <height>2</height>
+        <length>4.0</length>
+        <width>3.0</width>
+        <height>2.0</height>
         <description>a box full of stuff</description>
         <readyToShip/>
       </item>

data/test/helpers/holiday_helpers.rb

@@ -0,0 +1,54 @@
+module HolidayHelpers
+  class MissingConfigurationError < RuntimeError; end
+
+  HOLIDAYS = {
+    ups: { # https://compass.ups.com/ups-holiday-schedule-2016/
+      "2016" => [
+        { month: 1,  day: 1  },
+        { month: 5,  day: 30 },
+        { month: 6,  day: 4  },
+        { month: 9,  day: 5  },
+        { month: 11, day: 24 },
+        { month: 12, day: 26 },
+      ],
+      "2017" => [
+        { month: 1,  day: 2  },
+        { month: 5,  day: 29 },
+        { month: 6,  day: 4  },
+        { month: 9,  day: 4  },
+        { month: 11, day: 23 },
+        { month: 12, day: 25 },
+      ]
+    }
+  }
+
+  def with_holidays(carrier, year=Date.current.year)
+    holiday_config = fetch_holidays(carrier, year)
+
+    BusinessTime::Config.with(holidays: holiday_config) do
+      yield
+    end
+
+  rescue MissingConfigurationError
+    self.logger.warn(
+      "[HolidayHelpers] Missing holiday configuration. You need to update test/helpers/holiday_helpers.rb. "\
+      "test: #{self}, carrier: #{carrier}, year: #{year}")
+    yield
+  end
+
+  private
+
+  def fetch_holidays(carrier, year)
+    carrier_holiday_config = case carrier
+    when :ups
+      HOLIDAYS[carrier]
+    else
+      raise MissingConfigurationError
+    end
+    raise MissingConfigurationError unless carrier_holiday_config.include?(year.to_s)
+
+    carrier_holiday_config[year.to_s].map do |holiday|
+      Date.new(year, holiday[:month], holiday[:day])
+    end
+  end
+end

data/test/remote/australia_post_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class RemoteAustraliaPostTest < Minitest::Test
+class RemoteAustraliaPostTest < ActiveSupport::TestCase
   include ActiveShipping::Test::Credentials
   include ActiveShipping::Test::Fixtures
 

data/test/remote/canada_post_pws_platform_test.rb

@@ -1,9 +1,7 @@
-# encoding: utf-8
-
 require 'test_helper'
 
 # All remote tests require Canada Post development environment credentials
-class RemoteCanadaPostPWSPlatformTest < Minitest::Test
+class RemoteCanadaPostPWSPlatformTest < ActiveSupport::TestCase
   include ActiveShipping::Test::Credentials
   include ActiveShipping::Test::Fixtures
 

data/test/remote/canada_post_pws_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class RemoteCanadaPostPWSTest < Minitest::Test
+class RemoteCanadaPostPWSTest < ActiveSupport::TestCase
   # All remote tests require Canada Post development environment credentials
   include ActiveShipping::Test::Credentials
   include ActiveShipping::Test::Fixtures

data/test/remote/canada_post_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class RemoteCanadaPostTest < Minitest::Test
+class RemoteCanadaPostTest < ActiveSupport::TestCase
   include ActiveShipping::Test::Credentials
 
   def setup

data/test/remote/correios_test.rb

@@ -1,7 +1,6 @@
 require 'test_helper'
 
-class RemoteCorreiosTest < Minitest::Test
-
+class RemoteCorreiosTest < ActiveSupport::TestCase
   def setup
     @carrier = Correios.new
 

data/test/remote/fedex_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class RemoteFedExTest < Minitest::Test
+class RemoteFedExTest < ActiveSupport::TestCase
   include ActiveShipping::Test::Credentials
   include ActiveShipping::Test::Fixtures
 
@@ -33,7 +33,7 @@ class RemoteFedExTest < Minitest::Test
     assert response.rates.length > 0
     response.rates.each do |rate|
       assert_instance_of String, rate.service_name
-      assert_instance_of Fixnum, rate.price
+      assert_kind_of Integer, rate.price
     end
   end
 
@@ -75,7 +75,7 @@ class RemoteFedExTest < Minitest::Test
     assert response.rates.length > 0
     response.rates.each do |rate|
       assert_instance_of String, rate.service_name
-      assert_instance_of Fixnum, rate.price
+      assert_kind_of Integer, rate.price
     end
   end
 
@@ -134,7 +134,7 @@ class RemoteFedExTest < Minitest::Test
     assert response.rates.length > 0
     response.rates.each do |rate|
       assert_instance_of String, rate.service_name
-      assert_instance_of Fixnum, rate.price
+      assert_kind_of Integer, rate.price
     end
   end
 
@@ -149,7 +149,7 @@ class RemoteFedExTest < Minitest::Test
     assert response.rates.length > 0
     response.rates.each do |rate|
       assert_instance_of String, rate.service_name
-      assert_instance_of Fixnum, rate.price
+      assert_kind_of Integer, rate.price
     end
   end
 
@@ -164,7 +164,7 @@ class RemoteFedExTest < Minitest::Test
     assert response.rates.length > 0
     response.rates.each do |rate|
       assert_instance_of String, rate.service_name
-      assert_instance_of Fixnum, rate.price
+      assert_kind_of Integer, rate.price
     end
   end
 
@@ -179,7 +179,7 @@ class RemoteFedExTest < Minitest::Test
     assert response.rates.length > 0
     response.rates.each do |rate|
       assert_instance_of String, rate.service_name
-      assert_instance_of Fixnum, rate.price
+      assert_kind_of Integer, rate.price
     end
   end
 
@@ -194,7 +194,7 @@ class RemoteFedExTest < Minitest::Test
     assert response.rates.length > 0
     response.rates.each do |rate|
       assert_instance_of String, rate.service_name
-      assert_instance_of Fixnum, rate.price
+      assert_kind_of Integer, rate.price
     end
   end
 

data/test/remote/kunaki_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class RemoteKunakiTest < Minitest::Test
+class RemoteKunakiTest < ActiveSupport::TestCase
   include ActiveShipping::Test::Fixtures
 
   def setup

data/test/remote/new_zealand_post_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class RemoteNewZealandPostTest < Minitest::Test
+class RemoteNewZealandPostTest < ActiveSupport::TestCase
   include ActiveShipping::Test::Credentials
   include ActiveShipping::Test::Fixtures
 

data/test/remote/shipwire_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class RemoteShipwireTest < Minitest::Test
+class RemoteShipwireTest < ActiveSupport::TestCase
   include ActiveShipping::Test::Credentials
   include ActiveShipping::Test::Fixtures
 

data/test/remote/stamps_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class RemoteStampsTest < Minitest::Test
+class RemoteStampsTest < ActiveSupport::TestCase
   include ActiveShipping::Test::Credentials
   include ActiveShipping::Test::Fixtures
 
@@ -138,7 +138,7 @@ class RemoteStampsTest < Minitest::Test
     assert_equal '10017', response.rate.destination.zip
     assert_equal 'US', response.rate.destination.country_code
 
-    assert_instance_of Fixnum, response.rate.total_price
+    assert_kind_of Integer, response.rate.total_price
     assert_instance_of String, response.stamps_tx_id
 
     assert_nil response.label_url
@@ -169,7 +169,7 @@ class RemoteStampsTest < Minitest::Test
     assert_equal 'K1P 1J1', response.rate.destination.zip
     assert_equal 'CA', response.rate.destination.country_code
 
-    assert_instance_of Fixnum, response.rate.total_price
+    assert_kind_of Integer, response.rate.total_price
     assert_instance_of String, response.stamps_tx_id
     assert_instance_of String, response.label_url
 
@@ -299,8 +299,8 @@ class RemoteStampsTest < Minitest::Test
     rate = response.rates.first
     assert_equal 'Stamps', rate.carrier
     assert_equal 'USD', rate.currency
-    assert_instance_of Fixnum, rate.total_price
-    assert_instance_of Fixnum, rate.price
+    assert_kind_of Integer, rate.total_price
+    assert_kind_of Integer, rate.price
     assert_instance_of String, rate.service_name
     assert_instance_of String, rate.service_code
     assert_instance_of Array, rate.package_rates
@@ -328,8 +328,8 @@ class RemoteStampsTest < Minitest::Test
     rate = response.rates.first
     assert_equal 'Stamps', rate.carrier
     assert_equal 'USD', rate.currency
-    assert_instance_of Fixnum, rate.total_price
-    assert_instance_of Fixnum, rate.price
+    assert_kind_of Integer, rate.total_price
+    assert_kind_of Integer, rate.price
     assert_instance_of String, rate.service_name
     assert_instance_of String, rate.service_code
     assert_instance_of Array, rate.package_rates