easypost 4.8.0 → 4.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6f62b9504efc5502cea14eb8c0ec792fe8c2987d857aedc34522663f2587706
-  data.tar.gz: e8c927c3ee7d01bc7a4d1d42c9cc6c1360ea082c66017bdf31c6399d503753fe
+  metadata.gz: 9ad992fe480aa1a1c8b1fc7e85dd06c7af4478bca9bcc3a2f083daaeeedcc39e
+  data.tar.gz: f37a2a32dac1dcc1efa0121dce6b6edbf14e3aa690308d393815ecaabddedda4
 SHA512:
-  metadata.gz: 7a731d243163def53e558f86191f992156ad50d2da7ed35f8993ae3b4f01298cacf99f5c507df44f420f856bd6c7c87b1f0965e98bd5f2719f7ebc048a383cd1
-  data.tar.gz: c79fb8e2236b550a0ca7925674f685054262bf0a88dda6dbd5582ad74828e85bb5268d188656513feb6e8cdf164792eb0f646ca436cb2d67d95b83c6f5be9906
+  metadata.gz: 6f0e9c8cbfb299608c58c865a2193e163739ca3543fb5bbea44026930bbecf34ae8d772fc2377909492a89d8c7d3d1440c7a9f7ebf25935927db35bc6ba1b7c3
+  data.tar.gz: 8b02eee4c36c0c918e4a3f4884694c48d453bbf3aba7db653669618462d67bad30c0cf0ceec96ee44de0b335626e0992b493ad06e4457feeb5f661ebe55ceb70

data/.github/workflows/ci.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches: [master]
   pull_request: ~
+  workflow_dispatch: ~
 
 jobs:
   run-tests:

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## v4.8.1 (2022-10-24)
+
+- Concatenates `error.message` if it incorrectly comes back from the API as an array
+- Treats any HTTP status outside the `2xx` range as an error. Impact expected is minimal as this change only affects `1xx` and `3xx` HTTP status codes
+
 ## v4.8.0 (2022-09-21)
 
 - Adds support to buy a shipment by passing in `end_shipper_id`

data/Makefile

@@ -39,9 +39,9 @@ release:
 scan:
 	bundle exec brakeman lib --force
 
-## test - Test the project
+## test - Test the project (and ignore warnings for test output)
 test:
-	bundle exec rspec
+	RUBYOPT="-W0" bundle exec rspec
 
 ## update - Updates dependencies
 update:

data/VERSION

@@ -1 +1 @@
-4.8.0
+4.8.1

data/lib/easypost/address.rb

@@ -28,20 +28,12 @@ class EasyPost::Address < EasyPost::Resource
     wrapped_params[class_name.to_sym] = params
     response = EasyPost.make_request(:post, "#{url}/create_and_verify", api_key, wrapped_params)
 
-    raise EasyPost::Error.new('Unable to verify address.') unless response.key?('address')
-
     EasyPost::Util.convert_to_easypost_object(response['address'], api_key)
   end
 
   # Verify an Address.
   def verify
-    begin
-      response = EasyPost.make_request(:get, "#{url}/verify", @api_key)
-    rescue StandardError
-      raise EasyPost::Error.new('Unable to verify address.')
-    end
-
-    raise EasyPost::Error.new('Unable to verify address.') unless response.key?('address')
+    response = EasyPost.make_request(:get, "#{url}/verify", @api_key)
 
     EasyPost::Util.convert_to_easypost_object(response['address'], api_key)
   end

data/lib/easypost/beta/referral.rb

@@ -2,10 +2,63 @@
 
 # Referral objects are User objects created from a Partner user.
 class EasyPost::Beta::Referral < EasyPost::Resource
+  class << self
+    protected
+
+    # Retrieve EasyPost's Stripe public API key.
+    def retrieve_easypost_stripe_api_key
+      response = EasyPost.make_request(:get, '/beta/partners/stripe_public_key', @api_key)
+      response['public_key']
+    end
+
+    # Get credit card token from Stripe.
+    def create_stripe_token(number, expiration_month, expiration_year,
+                            cvc, easypost_stripe_token)
+      headers = {
+        # This Stripe endpoint only accepts URL form encoded bodies.
+        Authorization: "Bearer #{easypost_stripe_token}",
+        'Content-type': 'application/x-www-form-urlencoded',
+      }
+
+      credit_card_hash = {
+        card: {
+          number: number,
+          exp_month: expiration_month,
+          exp_year: expiration_year,
+          cvc: cvc,
+        },
+      }
+
+      form_encoded_params = EasyPost::Util.form_encode_params(credit_card_hash)
+
+      uri = URI.parse('https://api.stripe.com/v1/tokens')
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = true
+      request = Net::HTTP::Post.new(uri.request_uri, headers)
+      query = URI.encode_www_form(form_encoded_params)
+
+      response = http.request(request, query)
+      response_json = JSON.parse(response.body)
+      response_json['id']
+    end
+
+    # Submit Stripe credit card token to EasyPost.
+    def create_easypost_credit_card(referral_api_key, stripe_object_id, priority = 'primary')
+      wrapped_params = {
+        credit_card: {
+          stripe_object_id: stripe_object_id,
+          priority: priority,
+        },
+      }
+      response = EasyPost.make_request(:post, '/beta/credit_cards', referral_api_key, wrapped_params)
+      EasyPost::Util.convert_to_easypost_object(response, referral_api_key)
+    end
+  end
+
   # Create a referral user. This function requires the Partner User's API key.
   # <b>DEPRECATED:</b> Please use <tt>Referral</tt> in the main namespace instead.
   def self.create(params = {}, api_key = nil)
-    warn '[DEPRECATION] Please use `EndShipper.create` in the main namespace instead.'
+    warn '[DEPRECATION] Please use `Referral.create` in the main namespace instead.'
     response = EasyPost.make_request(:post, '/beta/referral_customers', api_key, { user: params })
     EasyPost::Util.convert_to_easypost_object(response, api_key)
   end
@@ -13,7 +66,7 @@ class EasyPost::Beta::Referral < EasyPost::Resource
   # Update a referral user. This function requires the Partner User's API key.
   # <b>DEPRECATED:</b> Please use <tt>Referral</tt> in the main namespace instead.
   def self.update_email(email, user_id, api_key = nil)
-    warn '[DEPRECATION] Please use `EndShipper.update_email` in the main namespace instead.'
+    warn '[DEPRECATION] Please use `Referral.update_email` in the main namespace instead.'
     wrapped_params = {
       user: {
         email: email,
@@ -28,7 +81,7 @@ class EasyPost::Beta::Referral < EasyPost::Resource
   # Retrieve a list of referral users. This function requires the Partner User's API key.
   # <b>DEPRECATED:</b> Please use <tt>Referral</tt> in the main namespace instead.
   def self.all(params = {}, api_key = nil)
-    warn '[DEPRECATION] Please use `EndShipper.all` in the main namespace instead.'
+    warn '[DEPRECATION] Please use `Referral.all` in the main namespace instead.'
     response = EasyPost.make_request(:get, '/beta/referral_customers', api_key, params)
     EasyPost::Util.convert_to_easypost_object(response, api_key)
   end
@@ -36,7 +89,7 @@ class EasyPost::Beta::Referral < EasyPost::Resource
   # Add credit card to a referral user. This function requires the Referral User's API key.
   # <b>DEPRECATED:</b> Please use <tt>Referral</tt> in the main namespace instead.
   def self.add_credit_card(referral_api_key, number, expiration_month, expiration_year, cvc, priority = 'primary')
-    warn '[DEPRECATION] Please use `EndShipper.add_credit_card` in the main namespace instead.'
+    warn '[DEPRECATION] Please use `Referral.add_credit_card` in the main namespace instead.'
     easypost_stripe_api_key = retrieve_easypost_stripe_api_key
 
     begin
@@ -54,53 +107,4 @@ class EasyPost::Beta::Referral < EasyPost::Resource
     response = create_easypost_credit_card(referral_api_key, stripe_credit_card_token, priority)
     EasyPost::Util.convert_to_easypost_object(response, referral_api_key)
   end
-
-  # Retrieve EasyPost's Stripe public API key.
-  private_class_method def self.retrieve_easypost_stripe_api_key
-    response = EasyPost.make_request(:get, '/beta/partners/stripe_public_key', @api_key)
-    response['public_key']
-  end
-
-  # Get credit card token from Stripe.
-  private_class_method def self.create_stripe_token(number, expiration_month, expiration_year,
-                                                    cvc, easypost_stripe_token)
-    headers = {
-      # This Stripe endpoint only accepts URL form encoded bodies.
-      Authorization: "Bearer #{easypost_stripe_token}",
-      'Content-type': 'application/x-www-form-urlencoded',
-    }
-
-    credit_card_hash = {
-      card: {
-        number: number,
-        exp_month: expiration_month,
-        exp_year: expiration_year,
-        cvc: cvc,
-      },
-    }
-
-    form_encoded_params = EasyPost::Util.form_encode_params(credit_card_hash)
-
-    uri = URI.parse('https://api.stripe.com/v1/tokens')
-    http = Net::HTTP.new(uri.host, uri.port)
-    http.use_ssl = true
-    request = Net::HTTP::Post.new(uri.request_uri, headers)
-    query = URI.encode_www_form(form_encoded_params)
-
-    response = http.request(request, query)
-    response_json = JSON.parse(response.body)
-    response_json['id']
-  end
-
-  # Submit Stripe credit card token to EasyPost.
-  private_class_method def self.create_easypost_credit_card(referral_api_key, stripe_object_id, priority = 'primary')
-    wrapped_params = {
-      credit_card: {
-        stripe_object_id: stripe_object_id,
-        priority: priority,
-      },
-    }
-    response = EasyPost.make_request(:post, '/beta/credit_cards', referral_api_key, wrapped_params)
-    EasyPost::Util.convert_to_easypost_object(response, referral_api_key)
-  end
 end

data/lib/easypost/billing.rb

@@ -2,9 +2,41 @@
 
 # Billing class that users can manage their payment and fund
 class EasyPost::Billing < EasyPost::Resource
+  class << self
+    protected
+
+    # Get payment method info (type of the payment method and ID of the payment method)
+    def get_payment_method_info(primary_or_secondary)
+      payment_methods = EasyPost::Billing.retrieve_payment_methods
+      payment_method_map = {
+        'primary' => 'primary_payment_method',
+        'secondary' => 'secondary_payment_method',
+      }
+
+      payment_method_to_use = payment_method_map[primary_or_secondary]
+
+      error_string = 'The chosen payment method is not valid. Please try again.'
+      raise EasyPost::Error.new(error_string) if payment_methods[payment_method_to_use].nil?
+
+      payment_method_id = payment_methods[payment_method_to_use]['id']
+
+      unless payment_method_id.nil?
+        if payment_method_id.start_with?('card_')
+          endpoint = '/v2/credit_cards'
+        elsif payment_method_id.start_with?('bank_')
+          endpoint = '/v2/bank_accounts'
+        else
+          raise EasyPost::Error.new(error_string)
+        end
+      end
+
+      [endpoint, payment_method_id]
+    end
+  end
+
   # Fund your EasyPost wallet by charging your primary or secondary card on file.
   def self.fund_wallet(amount, primary_or_secondary = 'primary', api_key = nil)
-    payment_info = EasyPost::Billing.get_payment_method_info(primary_or_secondary.downcase)
+    payment_info = get_payment_method_info(primary_or_secondary.downcase)
     endpoint = payment_info[0]
     payment_id = payment_info[1]
 
@@ -17,7 +49,7 @@ class EasyPost::Billing < EasyPost::Resource
 
   # Delete a payment method.
   def self.delete_payment_method(primary_or_secondary, api_key = nil)
-    payment_info = EasyPost::Billing.get_payment_method_info(primary_or_secondary.downcase)
+    payment_info = get_payment_method_info(primary_or_secondary.downcase)
     endpoint = payment_info[0]
     payment_id = payment_info[1]
 
@@ -37,32 +69,4 @@ class EasyPost::Billing < EasyPost::Resource
 
     EasyPost::Util.convert_to_easypost_object(response, api_key)
   end
-
-  # Get payment method info (type of the payment method and ID of the payment method)
-  private_class_method def self.get_payment_method_info(primary_or_secondary)
-    payment_methods = EasyPost::Billing.retrieve_payment_methods
-    payment_method_map = {
-      'primary' => 'primary_payment_method',
-      'secondary' => 'secondary_payment_method',
-    }
-
-    payment_method_to_use = payment_method_map[primary_or_secondary]
-
-    error_string = 'The chosen payment method is not valid. Please try again.'
-    raise EasyPost::Error.new(error_string) if payment_methods[payment_method_to_use].nil?
-
-    payment_method_id = payment_methods[payment_method_to_use]['id']
-
-    unless payment_method_id.nil?
-      if payment_method_id.start_with?('card_')
-        endpoint = '/v2/credit_cards'
-      elsif payment_method_id.start_with?('bank_')
-        endpoint = '/v2/bank_accounts'
-      else
-        raise EasyPost::Error.new(error_string)
-      end
-    end
-
-    [endpoint, payment_method_id]
-  end
 end

data/lib/easypost/connection.rb

@@ -52,7 +52,7 @@ EasyPost::Connection = Struct.new(:uri, :config, keyword_init: true) do
     request.body = JSON.dump(EasyPost::Util.objects_to_ids(body)) if body
 
     EasyPost.default_headers.each_pair { |h, v| request[h] = v }
-    request['Authorization'] = EasyPost.authorization(api_key) if api_key
+    request['Authorization'] = EasyPost.authorization(api_key)
 
     response = connection.request(request)
     response_is_json = response['Content-Type'] ? response['Content-Type'].start_with?('application/json') : false

data/lib/easypost/error.rb

@@ -6,7 +6,8 @@ class EasyPost::Error < StandardError
 
   # Initialize a new EasyPost Error
   def initialize(message = nil, status = nil, code = nil, errors = nil, http_body = nil)
-    @message = message
+    # message should be a string but can sometimes incorrectly come back as an array
+    @message = message.is_a?(Array) ? message.join(', ') : message
     @status = status
     @code = code
     @errors = errors

data/lib/easypost/referral.rb

@@ -2,6 +2,59 @@
 
 # Referral objects are User objects created from a Partner user.
 class EasyPost::Referral < EasyPost::Resource
+  class << self
+    protected
+
+    # Retrieve EasyPost's Stripe public API key.
+    def retrieve_easypost_stripe_api_key
+      response = EasyPost.make_request(:get, '/beta/partners/stripe_public_key', @api_key)
+      response['public_key']
+    end
+
+    # Get credit card token from Stripe.
+    def create_stripe_token(number, expiration_month, expiration_year,
+                            cvc, easypost_stripe_token)
+      headers = {
+        # This Stripe endpoint only accepts URL form encoded bodies.
+        Authorization: "Bearer #{easypost_stripe_token}",
+        'Content-type': 'application/x-www-form-urlencoded',
+      }
+
+      credit_card_hash = {
+        card: {
+          number: number,
+          exp_month: expiration_month,
+          exp_year: expiration_year,
+          cvc: cvc,
+        },
+      }
+
+      form_encoded_params = EasyPost::Util.form_encode_params(credit_card_hash)
+
+      uri = URI.parse('https://api.stripe.com/v1/tokens')
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = true
+      request = Net::HTTP::Post.new(uri.request_uri, headers)
+      query = URI.encode_www_form(form_encoded_params)
+
+      response = http.request(request, query)
+      response_json = JSON.parse(response.body)
+      response_json['id']
+    end
+
+    # Submit Stripe credit card token to EasyPost.
+    def create_easypost_credit_card(referral_api_key, stripe_object_id, priority = 'primary')
+      wrapped_params = {
+        credit_card: {
+          stripe_object_id: stripe_object_id,
+          priority: priority,
+        },
+      }
+      response = EasyPost.make_request(:post, '/beta/credit_cards', referral_api_key, wrapped_params)
+      EasyPost::Util.convert_to_easypost_object(response, referral_api_key)
+    end
+  end
+
   # Create a referral user. This function requires the Partner User's API key.
   def self.create(params = {}, api_key = nil)
     response = EasyPost.make_request(:post, '/v2/referral_customers', api_key, { user: params })
@@ -46,53 +99,4 @@ class EasyPost::Referral < EasyPost::Resource
     response = create_easypost_credit_card(referral_api_key, stripe_credit_card_token, priority)
     EasyPost::Util.convert_to_easypost_object(response, referral_api_key)
   end
-
-  # Retrieve EasyPost's Stripe public API key.
-  private_class_method def self.retrieve_easypost_stripe_api_key
-    response = EasyPost.make_request(:get, '/beta/partners/stripe_public_key', @api_key)
-    response['public_key']
-  end
-
-  # Get credit card token from Stripe.
-  private_class_method def self.create_stripe_token(number, expiration_month, expiration_year,
-                                                    cvc, easypost_stripe_token)
-    headers = {
-      # This Stripe endpoint only accepts URL form encoded bodies.
-      Authorization: "Bearer #{easypost_stripe_token}",
-      'Content-type': 'application/x-www-form-urlencoded',
-    }
-
-    credit_card_hash = {
-      card: {
-        number: number,
-        exp_month: expiration_month,
-        exp_year: expiration_year,
-        cvc: cvc,
-      },
-    }
-
-    form_encoded_params = EasyPost::Util.form_encode_params(credit_card_hash)
-
-    uri = URI.parse('https://api.stripe.com/v1/tokens')
-    http = Net::HTTP.new(uri.host, uri.port)
-    http.use_ssl = true
-    request = Net::HTTP::Post.new(uri.request_uri, headers)
-    query = URI.encode_www_form(form_encoded_params)
-
-    response = http.request(request, query)
-    response_json = JSON.parse(response.body)
-    response_json['id']
-  end
-
-  # Submit Stripe credit card token to EasyPost.
-  private_class_method def self.create_easypost_credit_card(referral_api_key, stripe_object_id, priority = 'primary')
-    wrapped_params = {
-      credit_card: {
-        stripe_object_id: stripe_object_id,
-        priority: priority,
-      },
-    }
-    response = EasyPost.make_request(:post, '/beta/credit_cards', referral_api_key, wrapped_params)
-    EasyPost::Util.convert_to_easypost_object(response, referral_api_key)
-  end
 end

data/lib/easypost/resource.rb

@@ -48,6 +48,7 @@ class EasyPost::Resource < EasyPost::EasyPostObject
     EasyPost::Util.convert_to_easypost_object(response, api_key)
   end
 
+  # Filter all results based on criteria.
   def self.each(filters = {}, api_key = EasyPost.api_key, &block)
     return to_enum(:each, filters, api_key) unless block_given?
 

data/lib/easypost.rb

@@ -26,6 +26,7 @@ require 'easypost/event'
 require 'easypost/insurance'
 require 'easypost/order'
 require 'easypost/parcel'
+require 'easypost/payment_method' # deprecated
 require 'easypost/pickup_rate'
 require 'easypost/pickup'
 require 'easypost/postage_label'
@@ -133,7 +134,7 @@ module EasyPost
   end
 
   def self.parse_response(status:, body:, json:)
-    if status >= 400
+    if status < 200 || status >= 300
       error = JSON.parse(body)['error']
 
       raise EasyPost::Error.new(

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: easypost
 version: !ruby/object:Gem::Version
-  version: 4.8.0
+  version: 4.8.1
 platform: ruby
 authors:
 - EasyPost Developers
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-21 00:00:00.000000000 Z
+date: 2022-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: brakeman