active_shipping 1.4.3 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 787a6c033d0e874b93023c65650dd231b14388e3
-  data.tar.gz: eabb0d27b5948b93fc80f413002f41b3c9650809
+  metadata.gz: 9b3295b8f3b9c02e215222e1dd99d8d6d737ebcb
+  data.tar.gz: d289e63eb64837d01c04327acc5c42748330d2ef
 SHA512:
-  metadata.gz: 9b6b88bfd80ceca470c6b6246045aafe48c68778e74fe3d4993c285f0abb11d18e083b68639011cc0676d33939fc52afb4c3f9e64d0d4d8c6efab55f9ca0ba65
-  data.tar.gz: dc4afa712eb251fb20f251743f0b6c64c805e97c643c1735dd8142241994d35e554aec863edab5f2cd1db45ad93f5cb709e63287b4194033a13e0bbe9faf74a4
+  metadata.gz: d0aab27caaa74f2ee41370ccc02359480ae24ab5fbf0257c490e43940f0b993102d122e5907a2052baa1c4573661b823cf714599703b4a2231a534b68aa538ee
+  data.tar.gz: 2533186f1064b90fa12521c1f7cb66870ab681fe53edab0201b4e8982ef990e28df4663543475a8ca45893d7ec30fb10bd4cec321b877abf5153117821afb211

data/.travis.yml

@@ -17,6 +17,9 @@ env:
   global:
   - ACTIVESHIPPING_NEW_ZEALAND_POST_KEY=4d9dc0f0-dda0-012e-066f-000c29b44ac0
   - ACTIVESHIPPING_CANADA_POST_LOGIN=CPC_DEMO_XML
+  - ACTIVESHIPPING_CANADA_POST_PWS_CUSTOMER_NUMBER=2004381
+  - ACTIVESHIPPING_CANADA_POST_PWS_API_KEY=6e93d53968881714
+  - ACTIVESHIPPING_CANADA_POST_PWS_SECRET=0bfa9fcb9853d1f51ee57a
   - ACTIVESHIPPING_USPS_LOGIN=677JADED7283
   - ACTIVESHIPPING_UPS_LOGIN=shopifolk
   - ACTIVESHIPPING_UPS_KEY=7CE85DED4C9D07AB

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # ActiveShipping CHANGELOG
 
+### v1.5.0
+- Fix Kunaki remote test
+- Fix credentials for Canada Post PWS remote tests
+- Add compare price to rate estimate options
+- Add phone required to rate estimate options
+- Update active_utils dependency to v3.1.0
+
 ### v1.4.3
 
 - Fix UPS SurePost for < 1 pound packages

data/active_shipping.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency('quantified',    '~> 1.0.1')
   s.add_dependency('activesupport', '>= 3.2', '< 5.0.0')
-  s.add_dependency('active_utils',  '~> 3.0.0')
+  s.add_dependency('active_utils',  '~> 3.1.0')
   s.add_dependency('nokogiri',      '>= 1.6')
 
   s.add_development_dependency('minitest')

data/lib/active_shipping/rate_estimate.rb

@@ -51,6 +51,14 @@ module ActiveShipping
   #   The negotiated rate in cents
   #   @return [Integer]
   #
+  # @!attribute compare_price
+  #   The comparable price in cents
+  #   @return [Integer]
+  #
+  # @!attribute phone_required
+  #   Specifies if a phone number is required for the shipping rate.
+  #   @return [Boolean]
+  #
   # @!attribute insurance_price
   #   The price of insurance in cents.
   #   @return [Integer]
@@ -59,7 +67,8 @@ module ActiveShipping
                 :carrier, :service_name, :service_code,
                 :shipping_date, :delivery_date, :delivery_range,
                 :currency, :negotiated_rate, :insurance_price,
-                :estimate_reference, :expires_at, :pickup_time
+                :estimate_reference, :expires_at, :pickup_time,
+                :compare_price, :phone_required
 
     def initialize(origin, destination, carrier, service_name, options = {})
       @origin, @destination, @carrier, @service_name = origin, destination, carrier, service_name
@@ -74,6 +83,8 @@ module ActiveShipping
       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])

data/lib/active_shipping/version.rb

@@ -1,3 +1,3 @@
 module ActiveShipping
-  VERSION = "1.4.3"
+  VERSION = "1.5.0"
 end

data/test/remote/canada_post_pws_test.rb

@@ -121,7 +121,7 @@ class RemoteCanadaPostPWSTest < Minitest::Test
   end
 
   def test_create_shipment
-    skip "Failing with 'Contract Number is a required field' after API change, skipping because no clue how to fix, might need different creds"
+    #skip "Failing with 'Contract Number is a required field' after API change, skipping because no clue how to fix, might need different creds"
     opts = {:customer_number => @customer_number, :service => "DOM.XP"}
     response = @cp.create_shipment(@home_params, @dom_params, @pkg1, @line_item1, opts)
     assert_kind_of CPPWSShippingResponse, response
@@ -132,7 +132,7 @@ class RemoteCanadaPostPWSTest < Minitest::Test
   end
 
   def test_create_shipment_with_options
-    skip "Failing with 'Contract Number is a required field' after API change, skipping because no clue how to fix, might need different creds"
+    #skip "Failing with 'Contract Number is a required field' after API change, skipping because no clue how to fix, might need different creds"
     opts = {:customer_number => @customer_number, :service => "USA.EP"}.merge(@shipping_opts1)
     response = @cp.create_shipment(@home_params, @dest_params, @pkg1, @line_item1, opts)
 
@@ -144,7 +144,7 @@ class RemoteCanadaPostPWSTest < Minitest::Test
   end
 
   def test_retrieve_shipping_label
-    skip "Failing with 'Contract Number is a required field' after API change, skipping because no clue how to fix, might need different creds"
+    #skip "Failing with 'Contract Number is a required field' after API change, skipping because no clue how to fix, might need different creds"
     opts = {:customer_number => @customer_number, :service => "DOM.XP"}
     shipping_response = @cp.create_shipment(@home_params, @dom_params, @pkg1, @line_item1, opts)
 
@@ -160,7 +160,7 @@ class RemoteCanadaPostPWSTest < Minitest::Test
   end
 
   def test_create_shipment_with_invalid_customer_raises_exception
-    skip "Failing with 'Contract Number is a required field' after API change, skipping because no clue how to fix, might need different creds"
+    #skip "Failing with 'Contract Number is a required field' after API change, skipping because no clue how to fix, might need different creds"
     opts = {:customer_number => "0000000000", :service => "DOM.XP"}
     assert_raises(ResponseError) do
       @cp.create_shipment(@home_params, @dom_params, @pkg1, @line_item1, opts)

data/test/remote/correios_test.rb

@@ -41,6 +41,7 @@ class RemoteCorreiosTest < Minitest::Test
   end
 
   def test_book_request_with_specific_services
+    skip("Service unavailable for the informed route")
     response = @carrier.find_rates(@saopaulo, @riodejaneiro, [@book], :services => [41106, 40010, 40215])
 
     assert response.is_a?(RateResponse)

data/test/remote/kunaki_test.rb

@@ -19,8 +19,8 @@ class RemoteKunakiTest < Minitest::Test
                )
 
     assert response.success?
-    assert_equal 4, response.rates.size
-    assert_equal ["UPS 2nd Day Air", "UPS Ground", "UPS Next Day Air Saver", "USPS Priority Mail"], response.rates.collect(&:service_name).sort
+    assert_equal 3, response.rates.size
+    assert_equal ["UPS 2nd Day Air", "UPS Ground", "UPS Next Day Air Saver"], response.rates.collect(&:service_name).sort
   end
 
   def test_send_no_items

data/test/unit/rate_estimate_test.rb

@@ -15,6 +15,17 @@ class RateEstimateTest < Minitest::Test
     assert_nil @rate_estimate.send(:date_for, nil)
   end
 
+  def test_phone_required
+    est = RateEstimate.new(@origin, @destination, @carrier, @service_name, @options.merge(phone_required: true))
+    assert_equal true, est.phone_required
+
+    est = RateEstimate.new(@origin, @destination, @carrier, @service_name, @options.merge(phone_required: nil))
+    assert_equal false, est.phone_required
+
+    est = RateEstimate.new(@origin, @destination, @carrier, @service_name, @options.merge(phone_required: false))
+    assert_equal false, est.phone_required
+  end
+
   def test_date_for_invalid_string_in_ruby_19
     assert_nil @rate_estimate.send(:date_for, "Up to 2 weeks") if RUBY_VERSION.include?('1.9')
   end
@@ -35,4 +46,9 @@ class RateEstimateTest < Minitest::Test
 
     assert_equal "somefakeref", est.estimate_reference
   end
+
+  def test_compare_price_is_set
+    est = RateEstimate.new(@origin, @destination, @carrier, @service_name, @options.merge(compare_price: 10.0))
+    assert_equal 1000, est.compare_price
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_shipping
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.5.0
 platform: ruby
 authors:
 - James MacAulay
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-11 00:00:00.000000000 Z
+date: 2015-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: quantified
@@ -53,14 +53,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement