active_shipping 1.14.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1cdf320ee4f62ffc781b724b4a1062cca673d55b
-  data.tar.gz: 751db33e450bb92c8b9b8b38911716450e51f364
+  metadata.gz: 8daef7547a1eadf200bb06247f518cc9e5813a31
+  data.tar.gz: ea7675b5b350fdf8ea1372e87f22b3efcb99f74f
 SHA512:
-  metadata.gz: 2cb07bbdefd76c3ae7a05f523d42d4f79de0daecfa2688ee708c79dc369e81fb475f153c777e29cd896018bf686afa6f9cc93a9f153c1d2903695e79053e4d2f
-  data.tar.gz: 04e6be9e02c295e14b725dfbe0c193d400445e2b487ba7193899053e2c81c8d9dfbf544cd699afaac03ca0d4bb221b65b2f023edfdd507ed988ff06ef5766105
+  metadata.gz: a2b9295a91d1a7af45debd3c659588b9e3f86fb212d266c58d4274a60db07f760ff0833dd01795ad69449bceafb3de154dcef1999c80c8bd26df753292f45c45
+  data.tar.gz: c1390c553d52b92720f7219ce72ee8f68589361b342346a8b88b2b616c1b668931472c17d816aeb4c74c91e35394e5c355b2428679d492d32d2969da1e08db5d

data/.travis.yml

@@ -3,41 +3,19 @@ script: bundle exec rake test
 sudo: false
 
 rvm:
-- "2.0"
-- "2.1"
 - "2.2.2"
 - "2.3.1"
+- "2.4.0"
 
 gemfile:
-- gemfiles/activesupport32.gemfile
-- gemfiles/activesupport32_nokogiri_17.gemfile
-- gemfiles/activesupport40.gemfile
-- gemfiles/activesupport40_nokogiri_17.gemfile
-- gemfiles/activesupport41.gemfile
-- gemfiles/activesupport41_nokogiri_17.gemfile
 - gemfiles/activesupport42.gemfile
-- gemfiles/activesupport42_nokogiri_17.gemfile
 - gemfiles/activesupport50.gemfile
 - gemfiles/activesupport_master.gemfile
 
 matrix:
   exclude:
-    - rvm: "2.0"
-      gemfile: gemfiles/activesupport32_nokogiri_17.gemfile
-    - rvm: "2.0"
-      gemfile: gemfiles/activesupport40_nokogiri_17.gemfile
-    - rvm: "2.0"
-      gemfile: gemfiles/activesupport41_nokogiri_17.gemfile
-    - rvm: "2.0"
-      gemfile: gemfiles/activesupport42_nokogiri_17.gemfile
-    - rvm: "2.0"
-      gemfile: gemfiles/activesupport50.gemfile
-    - rvm: "2.0"
-      gemfile: gemfiles/activesupport_master.gemfile
-    - rvm: "2.1"
-      gemfile: gemfiles/activesupport50.gemfile
-    - rvm: "2.1"
-      gemfile: gemfiles/activesupport_master.gemfile
+    - rvm: "2.4.0"
+      gemfile: gemfiles/activesupport42.gemfile
 
 env:
   global:

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # ActiveShipping CHANGELOG
 
+### v2.0.0
+- Drop support for < ruby 2.2, support ruby 2.4
+- Drop support for < Rails 4.2.
+- BREAKING CHANGE: Use shopify/measured instead of shopify/quantified for dimensions and units.
+
 ### v1.14.2
 - Make saturday delivery an option for fedex
 

data/CONTRIBUTING.md

@@ -2,6 +2,8 @@
 
 We love receiving pull requests! Anything from new carriers to documentation fixes.
 
+Also, we are looking for maintainers for the current version of ActiveShipping 2.0.
+
 ## Standards
 
 * PR should explain what the feature does, and why the change exists.

data/README.md

@@ -7,9 +7,6 @@ This library interfaces with the web services of various shipping carriers. The
 - Tracking shipments
 - Purchasing shipping labels
 
-Active Shipping is currently being used and improved in a production environment for [Shopify](http://shopify.com).
-
-
 ## Supported Shipping Carriers
 
 * [UPS](http://www.ups.com)
@@ -25,11 +22,8 @@ Active Shipping is currently being used and improved in a production environment
 
 
 ## Versions
-
-Development on `master` is for a pre-release of the `2.x` version of this gem. It includes a number of backwards incompatible changes and improvements. Progress can be tracked in [the milestone](https://github.com/Shopify/active_shipping/milestone/1).
-
-We are no longer actively developing version `1.x`. We have released `1.9` and will only backport small fixes to this version, on branch `1-9-stable`, and they should be on `master` first.
-
+Note: `2.x` contains breaking changes, please see the [changelog](https://github.com/Shopify/active_shipping/blob/master/CHANGELOG.md). Shopify will not be actively contibuting to the 2.0 version of this gem and is looking for maintainers.
+We have released `1.9` and will only backport small fixes to this version, on branch `1-9-stable`, and they should be on `master` first.
 
 ## Installation
 

data/active_shipping.gemspec

@@ -17,16 +17,22 @@ Gem::Specification.new do |s|
   s.executables   = s.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
   s.require_path  = "lib"
+  s.post_install_message = "Thanks for installing ActiveShipping! If upgrading to v2.0, please see the changelog for breaking changes: https://github.com/Shopify/active_shipping/blob/master/CHANGELOG.md."
 
-  s.add_dependency("quantified", "~> 1.0.1")
-  s.add_dependency("activesupport", ">= 3.2", "< 5.2.0")
+
+  s.add_dependency("measured", ">= 2.0")
+  s.add_dependency("activesupport", ">= 4.2", "< 5.2.0")
   s.add_dependency("active_utils", "~> 3.3.1")
-  s.add_dependency("nokogiri", ">= 1.6.8")
+  s.add_dependency("nokogiri", ">= 1.6")
 
   s.add_development_dependency("minitest")
+  s.add_development_dependency("minitest-reporters")
   s.add_development_dependency("rake")
   s.add_development_dependency("mocha", "~> 1")
   s.add_development_dependency("timecop")
   s.add_development_dependency("business_time")
   s.add_development_dependency("pry")
+  s.add_development_dependency("pry-byebug")
+  s.add_development_dependency("vcr")
+  s.add_development_dependency("webmock")
 end

data/gemfiles/activesupport42.gemfile

@@ -2,5 +2,4 @@ source "https://rubygems.org"
 
 gemspec path: '..'
 
-gem 'nokogiri', '= 1.6.8'
 gem 'activesupport', '~> 4.2.0'

data/lib/active_shipping.rb

@@ -2,7 +2,7 @@ require 'active_support/all'
 require 'active_utils'
 
 require 'nokogiri'
-require 'quantified'
+require 'measured'
 
 require 'active_shipping/response'
 require 'active_shipping/rate_response'

data/lib/active_shipping/carrier.rb

@@ -18,8 +18,6 @@ module ActiveShipping
   #   The last request performed against the carrier's API.
   #   @see #save_request
   class Carrier
-    include Quantified
-
     attr_reader :last_request
     attr_accessor :test_mode
     alias_method :test_mode?, :test_mode
@@ -122,9 +120,9 @@ module ActiveShipping
     end
 
     # The maximum weight the carrier will accept.
-    # @return [Quantified::Mass]
+    # @return [Measured::Weight]
     def maximum_weight
-      Mass.new(150, :pounds)
+      Measured::Weight.new(150, :pounds)
     end
 
     # The address field maximum length accepted by the carrier

data/lib/active_shipping/carriers/australia_post.rb

@@ -1,5 +1,3 @@
-require 'active_support/core_ext/object/to_query'
-
 module ActiveShipping
   class AustraliaPost < Carrier
     cattr_reader :name
@@ -154,7 +152,7 @@ module ActiveShipping
           length:        @package.cm(:length),
           width:         @package.cm(:width),
           height:        @package.cm(:height),
-          weight:        @package.weight.in_kg.to_f.round(2),
+          weight:        @package.kilograms.to_f.round(2),
           from_postcode: @origin.postal_code,
           to_postcode:   @destination.postal_code
         }
@@ -162,7 +160,7 @@ module ActiveShipping
 
       def international_params
         {
-          weight:       @package.weight.in_kg.to_f.round(2),
+          weight:       @package.kilograms.to_f.round(2),
           country_code: @destination.country_code
         }
       end

data/lib/active_shipping/carriers/canada_post.rb

@@ -86,7 +86,7 @@ module ActiveShipping
     end
 
     def maximum_weight
-      Mass.new(30, :kilograms)
+      Measured::Weight.new(30, :kg)
     end
 
     def maximum_address_field_length

data/lib/active_shipping/carriers/canada_post_pws.rb

@@ -164,7 +164,7 @@ module ActiveShipping
     end
 
     def maximum_weight
-      Mass.new(MAX_WEIGHT, :kilograms)
+      Measured::Weight.new(MAX_WEIGHT, :kg)
     end
 
     def maximum_address_field_length
@@ -214,14 +214,14 @@ module ActiveShipping
       restrictions_node = doc.root.at('restrictions')
       dimensions_node = restrictions_node.at('dimensional-restrictions')
       restrictions = {
-        :min_weight => restrictions_node.at("weight-restriction").attributes['min'].try(:value).to_i,
-        :max_weight => restrictions_node.at("weight-restriction").attributes['max'].try(:value).to_i,
-        :min_length => dimensions_node.at("length").attributes['min'].try(:value).to_f,
-        :max_length => dimensions_node.at("length").attributes['max'].try(:value).to_f,
-        :min_height => dimensions_node.at("height").attributes['min'].try(:value).to_f,
-        :max_height => dimensions_node.at("height").attributes['max'].try(:value).to_f,
-        :min_width => dimensions_node.at("width").attributes['min'].try(:value).to_f,
-        :max_width => dimensions_node.at("width").attributes['max'].try(:value).to_f
+        :min_weight => restrictions_node.at("weight-restriction").attributes['min'].value.to_i,
+        :max_weight => restrictions_node.at("weight-restriction").attributes['max'].value.to_i,
+        :min_length => dimensions_node.at("length").attributes['min'].value.to_f,
+        :max_length => dimensions_node.at("length").attributes['max'].value.to_f,
+        :min_height => dimensions_node.at("height").attributes['min'].value.to_f,
+        :max_height => dimensions_node.at("height").attributes['max'].value.to_f,
+        :min_width => dimensions_node.at("width").attributes['min'].value.to_f,
+        :max_width => dimensions_node.at("width").attributes['max'].value.to_f
       }
 
       {
@@ -526,7 +526,7 @@ module ActiveShipping
       raise "No Merchant Info" if doc.root.at('customer-number').blank?
       options = {
         :customer_number => doc.root.at('customer-number').text,
-        :contract_number => doc.root.at('contract-number').try(:text),
+        :contract_number => doc.root.at('contract-number').text,
         :username => doc.root.at('merchant-username').text,
         :password => doc.root.at('merchant-password').text,
         :has_default_credit_card => doc.root.at('has-default-credit-card').text == 'true'
@@ -728,43 +728,39 @@ module ActiveShipping
 
     def shipping_options_node(xml, available_options, options = {})
       return if (options.symbolize_keys.keys & available_options).empty?
-
-      options_doc = Nokogiri::XML::Builder.new do |options_xml|
-        options_xml.public_send('options') do
-          if options[:cod] && options[:cod_amount]
-            options_xml.public_send('option') do
-              options_xml.public_send('option-code', 'COD')
-              options_xml.public_send('option-amount', options[:cod_amount])
-              options_xml.public_send('option-qualifier-1', options[:cod_includes_shipping]) unless options[:cod_includes_shipping].blank?
-              options_xml.public_send('option-qualifier-2', options[:cod_method_of_payment]) unless options[:cod_method_of_payment].blank?
-            end
+      xml.public_send('options') do
+
+        if options[:cod] && options[:cod_amount]
+          xml.public_send('option') do
+            xml.public_send('option-code', 'COD')
+            xml.public_send('option-amount', options[:cod_amount])
+            xml.public_send('option-qualifier-1', options[:cod_includes_shipping]) unless options[:cod_includes_shipping].blank?
+            xml.public_send('option-qualifier-2', options[:cod_method_of_payment]) unless options[:cod_method_of_payment].blank?
           end
+        end
 
-          if options[:cov]
-            options_xml.public_send('option') do
-              options_xml.public_send('option-code', 'COV')
-              options_xml.public_send('option-amount', options[:cov_amount]) unless options[:cov_amount].blank?
-            end
+        if options[:cov]
+          xml.public_send('option') do
+            xml.public_send('option-code', 'COV')
+            xml.public_send('option-amount', options[:cov_amount]) unless options[:cov_amount].blank?
           end
+        end
 
-          if options[:d2po]
-            options_xml.public_send('option') do
-              options_xml.public_send('option-code', 'D2PO')
-              options_xml.public_send('option-qualifier-2'. options[:d2po_office_id]) unless options[:d2po_office_id].blank?
-            end
+        if options[:d2po]
+          xml.public_send('option') do
+            xml.public_send('option-code', 'D2PO')
+            xml.public_send('option-qualifier-2'. options[:d2po_office_id]) unless options[:d2po_office_id].blank?
           end
+        end
 
-          [:so, :dc, :pa18, :pa19, :hfp, :dns, :lad, :rase, :rts, :aban].each do |code|
-            if options[code]
-              options_xml.public_send('option') do
-                options_xml.public_send('option-code', code.to_s.upcase)
-              end
+        [:so, :dc, :pa18, :pa19, :hfp, :dns, :lad, :rase, :rts, :aban].each do |code|
+          if options[code]
+            xml.public_send('option') do
+              xml.public_send('option-code', code.to_s.upcase)
             end
           end
         end
       end
-
-      xml.parent << options_doc.doc.at("options") if options_doc.doc.at("options").children.any?
     end
 
     def expected_date_from_node(node)

data/lib/active_shipping/carriers/correios.rb

@@ -1,5 +1,3 @@
-# -*- encoding utf-8 -*-
-
 module ActiveShipping
   class Correios < Carrier
 

data/lib/active_shipping/carriers/new_zealand_post.rb

@@ -1,5 +1,3 @@
-require 'active_support/core_ext/object/to_query'
-
 module ActiveShipping
   class NewZealandPost < Carrier
     cattr_reader :name

data/lib/active_shipping/carriers/ups.rb

@@ -1,5 +1,3 @@
-# -*- encoding: utf-8 -*-
-
 module ActiveShipping
   class UPS < Carrier
     self.retry_safe = true

data/lib/active_shipping/carriers/usps.rb

@@ -1,5 +1,3 @@
-# -*- encoding: utf-8 -*-
-
 module ActiveShipping
   # After getting an API login from USPS (looks like '123YOURNAME456'),
   # run the following test:
@@ -234,7 +232,7 @@ module ActiveShipping
     end
 
     def maximum_weight
-      Mass.new(70, :pounds)
+      Measured::Weight.new(70, :pounds)
     end
 
     def extract_event_details(node)

data/lib/active_shipping/external_return_label_request.rb

@@ -1,8 +1,5 @@
-# -*- coding: utf-8 -*-
 module ActiveShipping
-
   class ExternalReturnLabelRequest
-
     CAP_STRING_LEN = 100
 
     USPS_EMAIL_REGEX = /^([a-zA-Z0-9_\-\.]+)@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.)|(([a-zA-Z0-9\-]+\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\]?)$/
@@ -416,6 +413,5 @@ module ActiveShipping
         raise USPSValidationError, "'#{v}' is not a valid e-mail in #{meth}"
       end
     end
-
   end
 end

data/lib/active_shipping/location.rb

@@ -2,6 +2,21 @@ module ActiveShipping #:nodoc:
   class Location
     ADDRESS_TYPES = %w(residential commercial po_box)
 
+    ATTRIBUTE_ALIASES = {
+      name: [:name],
+      country: [:country_code, :country],
+      postal_code: [:postal_code, :zip, :postal],
+      province: [:province_code, :state_code, :territory_code, :region_code, :province, :state, :territory, :region],
+      city: [:city, :town],
+      address1: [:address1, :address, :street],
+      address2: [:address2],
+      address3: [:address3],
+      phone: [:phone, :phone_number],
+      fax: [:fax, :fax_number],
+      address_type: [:address_type],
+      company_name: [:company, :company_name],
+    }.freeze
+
     attr_reader :options,
                 :country,
                 :postal_code,
@@ -24,9 +39,12 @@ module ActiveShipping #:nodoc:
     alias_method :company, :company_name
 
     def initialize(options = {})
-      @country = (options[:country].nil? or options[:country].is_a?(ActiveUtils::Country)) ?
-                    options[:country] :
-                    ActiveUtils::Country.find(options[:country])
+      @country = if options[:country].nil? || options[:country].is_a?(ActiveUtils::Country)
+        options[:country]
+      else
+        ActiveUtils::Country.find(options[:country])
+      end
+
       @postal_code = options[:postal_code] || options[:postal] || options[:zip]
       @province = options[:province] || options[:state] || options[:territory] || options[:region]
       @city = options[:city]
@@ -42,37 +60,27 @@ module ActiveShipping #:nodoc:
     end
 
     def self.from(object, options = {})
-      return object if object.is_a? ActiveShipping::Location
-      attr_mappings = {
-        :name => [:name],
-        :country => [:country_code, :country],
-        :postal_code => [:postal_code, :zip, :postal],
-        :province => [:province_code, :state_code, :territory_code, :region_code, :province, :state, :territory, :region],
-        :city => [:city, :town],
-        :address1 => [:address1, :address, :street],
-        :address2 => [:address2],
-        :address3 => [:address3],
-        :phone => [:phone, :phone_number],
-        :fax => [:fax, :fax_number],
-        :address_type => [:address_type],
-        :company_name => [:company, :company_name]
-      }
+      return object if object.is_a?(ActiveShipping::Location)
+
       attributes = {}
-      hash_access = begin
-        object[:some_symbol]
-        true
-      rescue
-        false
-      end
-      attr_mappings.each do |pair|
-        pair[1].each do |sym|
-          if value = (object[sym] if hash_access) || (object.send(sym) if object.respond_to?(sym) && (!hash_access || !Hash.public_instance_methods.include?(sym.to_s)))
-            attributes[pair[0]] = value
-            break
+
+      hash_access = object.respond_to?(:[])
+
+      ATTRIBUTE_ALIASES.each do |attribute, aliases|
+        aliases.detect do |sym|
+          value = object[sym] if hash_access
+          if !value &&
+            object.respond_to?(sym) &&
+            (!hash_access || !Hash.public_instance_methods.include?(sym))
+            value = object.send(sym)
           end
+
+          attributes[attribute] = value if value
         end
       end
+
       attributes.delete(:address_type) unless ADDRESS_TYPES.include?(attributes[:address_type].to_s)
+
       new(attributes.update(options))
     end
 
@@ -80,10 +88,21 @@ module ActiveShipping #:nodoc:
       @country.nil? ? nil : @country.code(format).value
     end
 
-    def residential?; @address_type == 'residential' end
-    def commercial?; @address_type == 'commercial' end
-    def po_box?; @address_type == 'po_box' end
-    def unknown?; country_code == 'ZZ' end
+    def residential?
+      @address_type == 'residential'
+    end
+
+    def commercial?
+      @address_type == 'commercial'
+    end
+
+    def po_box?
+      @address_type == 'po_box'
+    end
+
+    def unknown?
+      country_code == 'ZZ'
+    end
 
     def address_type=(value)
       return unless value.present?
@@ -93,18 +112,18 @@ module ActiveShipping #:nodoc:
 
     def to_hash
       {
-        :country => country_code,
-        :postal_code => postal_code,
-        :province => province,
-        :city => city,
-        :name => name,
-        :address1 => address1,
-        :address2 => address2,
-        :address3 => address3,
-        :phone => phone,
-        :fax => fax,
-        :address_type => address_type,
-        :company_name => company_name
+        country: country_code,
+        postal_code: postal_code,
+        province: province,
+        city: city,
+        name: name,
+        address1: address1,
+        address2: address2,
+        address3: address3,
+        phone: phone,
+        fax: fax,
+        address_type: address_type,
+        company_name: company_name
       }
     end
 
@@ -128,13 +147,7 @@ module ActiveShipping #:nodoc:
 
     # Returns the postal code as a properly formatted Zip+4 code, e.g. "77095-2233"
     def zip_plus_4
-      if /(\d{5})(\d{4})/ =~ @postal_code
-        return "#{$1}-#{$2}"
-      elsif /\d{5}-\d{4}/ =~ @postal_code
-        return @postal_code
-      else
-        nil
-      end
+      "#{$1}-#{$2}" if /(\d{5})-?(\d{4})/ =~ @postal_code
     end
 
     def address2_and_3