active_shipping 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '049d76632467f43502625eb1059dcc9db84009ff'
-  data.tar.gz: 2067401f05fcdad7fd6fd1b6bb14eb06dd08d90b
+  metadata.gz: 9337304484e37d86fe2905321e6739f774094b06
+  data.tar.gz: df9e20bc15df77173a6d6e6d3ae2e0c016a5fe41
 SHA512:
-  metadata.gz: 7240de267d12ccfeef56c846b4869f244ef2d9fc4094fb28ed560431f1815c9e0ad4840a03ea56fd25df8d1af28a82425dbfed332ebe4f2d1544572b00e1e209
-  data.tar.gz: 5520de3c6a87772b29241fe241a7a142d188f36e27de5ae6228ea83d83a61b6278cb468a371513ce7d05087795f59b1bdfe385a32478c2c4f904b3ef947105a5
+  metadata.gz: 36f4b8d16f48ea3114e6f449ba6d65a06beed8bdc556f72a00664e37030141677cf7a136679c341d98dab2f8fc418bf8788d59b495460a79926b5cfc7984afd1
+  data.tar.gz: f97b2cd9167cd0f5bede7dfaf179cc7e584424061b8b101b43c37f525b00f142ceb10f79cf2d31e6d22caaac23282317d6463b691edde60e49537af24850731d

data/CHANGELOG.md

@@ -1,7 +1,7 @@
 # ActiveShipping CHANGELOG
 
-### v2.0.1
-- Raise ActiveShipping::ResponseError error in favour of ActiveUtils::ResponseError for CanadaPostPWS#find_shipment_receipt
+### v2.1.0
+- Add email field to Location
 
 ### v2.0.0
 - Drop support for < ruby 2.2, support ruby 2.4

data/lib/active_shipping/carriers/canada_post_pws.rb

@@ -115,8 +115,6 @@ module ActiveShipping
     def find_shipment_receipt(shipping_id, options = {})
       response = ssl_get(shipment_receipt_url(shipping_id, options), headers(options, SHIPMENT_MIMETYPE, SHIPMENT_MIMETYPE))
       parse_shipment_receipt_response(response)
-    rescue ActiveUtils::ResponseError => e
-      raise ActiveShipping::ResponseError.new(e.message)
     end
 
     def retrieve_shipping_label(shipping_response, options = {})

data/lib/active_shipping/location.rb

@@ -13,6 +13,7 @@ module ActiveShipping #:nodoc:
       address3: [:address3],
       phone: [:phone, :phone_number],
       fax: [:fax, :fax_number],
+      email: [:email],
       address_type: [:address_type],
       company_name: [:company, :company_name],
     }.freeze
@@ -28,6 +29,7 @@ module ActiveShipping #:nodoc:
                 :address3,
                 :phone,
                 :fax,
+                :email,
                 :address_type,
                 :company_name
 
@@ -54,6 +56,7 @@ module ActiveShipping #:nodoc:
       @address3 = options[:address3]
       @phone = options[:phone]
       @fax = options[:fax]
+      @email = options[:email]
       @company_name = options[:company_name] || options[:company]
 
       self.address_type = options[:address_type]
@@ -122,6 +125,7 @@ module ActiveShipping #:nodoc:
         address3: address3,
         phone: phone,
         fax: fax,
+        email: email,
         address_type: address_type,
         company_name: company_name
       }
@@ -142,6 +146,7 @@ module ActiveShipping #:nodoc:
       string = prettyprint
       string << "\nPhone: #{@phone}" unless @phone.blank?
       string << "\nFax: #{@fax}" unless @fax.blank?
+      string << "\nEmail: #{@email}" unless @email.blank?
       string
     end
 

data/lib/active_shipping/version.rb

@@ -1,3 +1,3 @@
 module ActiveShipping
-  VERSION = "2.0.1"
+  VERSION = "2.1.0"
 end

data/test/test_helper.rb

@@ -116,7 +116,8 @@ module ActiveShipping::Test
                                  :address1 => '110 Laurier Avenue West',
                                  :postal_code => 'K1P 1J1',
                                  :phone => '1-613-580-2400',
-                                 :fax => '1-613-580-2495'),
+                                 :fax => '1-613-580-2495',
+                                 :email => 'bob.bobsen@gmail.com'),
         :ottawa_with_name => Location.new( :country => 'CA',
                                            :province => 'ON',
                                            :city => 'Ottawa',

data/test/unit/carriers/canada_post_pws_shipping_test.rb

@@ -229,16 +229,6 @@ class CanadaPostPwsShippingTest < ActiveSupport::TestCase
     assert_equal @cp.parse_shipment_receipt_response(xml_response), response
   end
 
-  def test_find_shipment_receipt_returns_active_shipping_response_error_if_active_utils_response_error
-    options = @default_options.dup
-    bad_response = Net::HTTPResponse.new({}, 404, "404 Not Found")
-    response_error = ActiveUtils::ResponseError.new(bad_response)
-    @cp.expects(:ssl_get).once.raises(response_error)
-    assert_raises ActiveShipping::ResponseError do
-      response = @cp.find_shipment_receipt('1234567', options)
-    end
-  end
-
   def test_character_limit_on_customs_description
     @line_item1.first.stubs(:name).returns("Some super long description that exceeds the 44 character limit")
     options = @default_options.dup

data/test/unit/carriers/fedex_test.rb

@@ -102,7 +102,7 @@ class FedExTest < ActiveSupport::TestCase
 
     @carrier.expects(:ship_timestamp).returns(Time.parse("2009-07-20T12:01:55-04:00").in_time_zone('US/Eastern'))
     @carrier.expects(:commit).with { |request, test_mode| Hash.from_xml(request) == Hash.from_xml(expected_request) && test_mode }.returns(mock_response)
-    destination = ActiveShipping::Location.from(location_fixtures[:beverly_hills].to_hash) 
+    destination = ActiveShipping::Location.from(location_fixtures[:beverly_hills].to_hash)
     @carrier.find_rates( location_fixtures[:ottawa],
                          destination,
                          package_fixtures.values_at(:book, :wii), test: true)
@@ -599,7 +599,7 @@ class FedExTest < ActiveSupport::TestCase
   end
 
   ### create_shipment
-  
+
   def test_create_shipment
     confirm_response = xml_fixture('fedex/create_shipment_response')
     @carrier.stubs(:commit).returns(confirm_response)

data/test/unit/location_test.rb

@@ -15,6 +15,7 @@ class LocationTest < ActiveSupport::TestCase
       address: '66 Gregory Ave.',
       phone: '515-555-1212',
       fax_number: 'none to speak of',
+      email: 'bob.bobsen@gmail.com',
       address_type: :commercial,
       name: "Bob Bobsen",
     }
@@ -35,6 +36,7 @@ class LocationTest < ActiveSupport::TestCase
     assert_equal @attributes_hash[:address], location.address1
     assert_equal @attributes_hash[:phone], location.phone
     assert_equal @attributes_hash[:fax_number], location.fax
+    assert_equal @attributes_hash[:email], location.email
     assert_equal @attributes_hash[:address_type].to_s, location.address_type
     assert_equal @attributes_hash[:name], location.name
   end
@@ -62,6 +64,7 @@ class LocationTest < ActiveSupport::TestCase
     assert_equal @attributes_hash[:address], location.address1
     assert_equal @attributes_hash[:phone], location.phone
     assert_equal @attributes_hash[:fax_number], location.fax
+    assert_equal @attributes_hash[:email], location.email
     assert_equal @attributes_hash[:address_type].to_s, location.address_type
     assert_equal @attributes_hash[:name], location.name
   end
@@ -116,7 +119,7 @@ class LocationTest < ActiveSupport::TestCase
   end
 
   test "#inspect returns a readable string" do
-    expected = "110 Laurier Avenue West\nOttawa, ON, K1P 1J1\nCanada\nPhone: 1-613-580-2400\nFax: 1-613-580-2495"
+    expected = "110 Laurier Avenue West\nOttawa, ON, K1P 1J1\nCanada\nPhone: 1-613-580-2400\nFax: 1-613-580-2495\nEmail: bob.bobsen@gmail.com"
     assert_equal expected, @location.inspect
   end
 
@@ -165,7 +168,7 @@ class LocationTest < ActiveSupport::TestCase
   end
 
   test "#to_hash has the expected attributes" do
-    expected = %w(address1 address2 address3 address_type city company_name country fax name phone postal_code province)
+    expected = %w(address1 address2 address3 address_type city company_name country email fax name phone postal_code province)
 
     assert_equal expected, @location.to_hash.stringify_keys.keys.sort
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_shipping
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-31 00:00:00.000000000 Z
+date: 2017-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: measured