active_shipping 1.8.0 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ad9d99cc454f0faea29105ee23c7fd8f2d15abd
-  data.tar.gz: aad314e51332792731f489177fbfc27531f51461
+  metadata.gz: e38b1f2643ba2b428af9627fe62638a4d4ced137
+  data.tar.gz: c42f3de2612e17488e8c2ed69991d84297dd8791
 SHA512:
-  metadata.gz: a3d3414ea380fbd020aea383b03e5653455c2c5437722401a70d077405a3d7fcb17340dc14b065591a50985b057b10d795bdf37b5cef4b0a4290d5e0f4c5dab5
-  data.tar.gz: 2a231ba077f8e57ff194461a6654007d600658e7a384cbb9762359b5f7f4e950ca21fee25e012f2d91d1dd8cc187b4374940f171023c137a5359d6378c2346dc
+  metadata.gz: e0cb3a47d17bffddd2a54f8d82e569dd7caa95e9822a44361b33a26a96c903aaa2dda812748556dbc49bded142a45fe8fac58b2db731fd6b568a0fffb078d745
+  data.tar.gz: ac743371aa813bdbb2f880627b983a900d5fea53abb2a0c02787d014f1558bbd9eac929e01fa9e3bd03af34f9000547b2687757e707a2b10ef8420d92e039a19

data/lib/active_shipping/carriers/canada_post_pws.rb

@@ -1,5 +1,7 @@
 module ActiveShipping
   class CanadaPostPWS < Carrier
+    
+    cattr_reader :name
     @@name = "Canada Post PWS"
 
     SHIPPING_SERVICES = {

data/lib/active_shipping/rate_estimate.rb

@@ -66,13 +66,19 @@ module ActiveShipping
   # @!attribute delivery_category
   #   The general classification of the delivery method
   #   @return [String]
+  #
+  # @!attribute shipment_options
+  #   Additional priced options bundled with the given rate estimate with price in cents
+  #   @return [Array<{ code: String, price: Integer }>]
+  #
   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, :delivery_category
+                :compare_price, :phone_required, :delivery_category,
+                :shipment_options
 
     def initialize(origin, destination, carrier, service_name, options = {})
       self.origin, self.destination, self.carrier, self.service_name = origin, destination, carrier, service_name
@@ -95,6 +101,7 @@ module ActiveShipping
       self.delivery_date = @delivery_range.last
       self.insurance_price = options[:insurance_price]
       self.delivery_category = options[:delivery_category]
+      self.shipment_options = options[:shipment_options] || []
     end
 
     # The total price of the shipments in cents.

data/lib/active_shipping/version.rb

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

data/test/unit/carriers/canada_post_pws_rating_test.rb

@@ -53,6 +53,10 @@ class CanadaPostPwsRatingTest < Minitest::Test
     assert_equal 'en-CA', @cp.language
   end
 
+  def test_name_accessor
+    assert_equal 'Canada Post PWS', @cp.name
+  end
+
   def test_find_rates
     response = xml_fixture('canadapost_pws/rates_info')
     expected_headers = {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_shipping
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.8.1
 platform: ruby
 authors:
 - James MacAulay
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-05 00:00:00.000000000 Z
+date: 2016-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: quantified
@@ -436,7 +436,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Simple shipping abstraction library