easypost 4.7.1 → 4.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33802b8af58e7efc3e5592c6559dd48dfa5a58cc9338f719c78bc97639f73c51
-  data.tar.gz: 1ec9df3da15eb1169817db4d3610f78826388836995615ec928a80d60e17fcf1
+  metadata.gz: d6f62b9504efc5502cea14eb8c0ec792fe8c2987d857aedc34522663f2587706
+  data.tar.gz: e8c927c3ee7d01bc7a4d1d42c9cc6c1360ea082c66017bdf31c6399d503753fe
 SHA512:
-  metadata.gz: 8f66b559d5f34005ad16151f3b32b168254efaff625ab06eba13a97ebe1aade1ff40f3d281fed9f32f80016bf662337be2053dc9a74d0f748bff47c67c3f6dd8
-  data.tar.gz: a22e6a0c850f686807aae90db0d81a24f963c045e043dbd497a5078b9b4f5806124782906d78b3e30b760a13cd78daf9c99b4252c58760205d5b7364472f3310
+  metadata.gz: 7a731d243163def53e558f86191f992156ad50d2da7ed35f8993ae3b4f01298cacf99f5c507df44f420f856bd6c7c87b1f0965e98bd5f2719f7ebc048a383cd1
+  data.tar.gz: c79fb8e2236b550a0ca7925674f685054262bf0a88dda6dbd5582ad74828e85bb5268d188656513feb6e8cdf164792eb0f646ca436cb2d67d95b83c6f5be9906

data/.github/workflows/ci.yml

@@ -32,6 +32,7 @@ jobs:
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: "3.1"
+          bundler-cache: true
       - name: Install Dependencies
         run: make install
       - name: Lint Project

data/.rubocop.yml

@@ -1,5 +1,7 @@
 inherit_from: easycop.yml
 
+AllCops:
+  SuggestExtensions: false
 # We are ignoring RSpec/FilePath because Simplecov doesn't play nice with nested spec files
 RSpec/FilePath:
   Enabled: false

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## v4.8.0 (2022-09-21)
+
+- Adds support to buy a shipment by passing in `end_shipper_id`
+- `with_carbon_offset` can now alternatively be passed in the `params` parameter of the `shipment.buy` function
+- Migrates Partner White Label (Referrals) to general library namespace and deprecates beta functions
+
 ## v4.7.1 (2022-09-06)
 
 - Makes not implemented `all` calls match the `EasyPost::Resource` interface so that one can call `.to_json` on them and receive the proper error

data/Makefile

@@ -14,7 +14,7 @@ clean:
 
 ## fix - Fix Rubocop errors
 fix:
-	rubocop -A
+	bundle exec rubocop -A
 
 ## install - Install globally from source
 install:
@@ -24,7 +24,7 @@ install:
 
 ## lint - Lint the project
 lint:
-	rubocop
+	bundle exec rubocop
 
 ## publish - Publishes the built gem to Rubygems
 publish:
@@ -37,7 +37,7 @@ release:
 
 ## scan - Runs security analysis on the project with Brakeman
 scan:
-	brakeman lib --force
+	bundle exec brakeman lib --force
 
 ## test - Test the project
 test:

data/VERSION

@@ -1 +1 @@
-4.7.1
+4.8.0

data/lib/easypost/beta/end_shipper.rb

@@ -2,6 +2,7 @@
 
 # EndShipper objects are fully-qualified Address objects that require all parameters and get verified upon creation.
 class EasyPost::Beta::EndShipper < EasyPost::Resource
+  # Create an EndShipper object.
   # <b>DEPRECATED:</b> Please use <tt>EndShipper</tt> in the main namespace instead.
   def self.create(params = {}, api_key = nil)
     warn '[DEPRECATION] Please use `EndShipper.create` in the main namespace instead.'
@@ -10,6 +11,7 @@ class EasyPost::Beta::EndShipper < EasyPost::Resource
   end
 
   # Retrieves an EndShipper object.
+  # <b>DEPRECATED:</b> Please use <tt>EndShipper</tt> in the main namespace instead.
   def self.retrieve(id, params = {}, api_key = nil)
     warn '[DEPRECATION] Please use `EndShipper.retrieve` in the main namespace instead.'
     response = EasyPost.make_request(:get, "/beta/end_shippers/#{id}", api_key, params)
@@ -17,6 +19,7 @@ class EasyPost::Beta::EndShipper < EasyPost::Resource
   end
 
   # Retrieves a list of EndShipper objects.
+  # <b>DEPRECATED:</b> Please use <tt>EndShipper</tt> in the main namespace instead.
   def self.all(params = {}, api_key = nil)
     warn '[DEPRECATION] Please use `EndShipper.all` in the main namespace instead.'
     response = EasyPost.make_request(:get, '/beta/end_shippers', api_key, params)
@@ -24,6 +27,7 @@ class EasyPost::Beta::EndShipper < EasyPost::Resource
   end
 
   # Updates (saves) an EndShipper object. This requires all parameters to be set.
+  # <b>DEPRECATED:</b> Please use <tt>EndShipper</tt> in the main namespace instead.
   def save
     warn '[DEPRECATION] Please use `endShipper.save` in the main namespace instead.'
     if @unsaved_values.length.positive?

data/lib/easypost/beta/referral.rb

@@ -3,13 +3,17 @@
 # Referral objects are User objects created from a Partner user.
 class EasyPost::Beta::Referral < EasyPost::Resource
   # 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.'
     response = EasyPost.make_request(:post, '/beta/referral_customers', api_key, { user: params })
     EasyPost::Util.convert_to_easypost_object(response, api_key)
   end
 
   # 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.'
     wrapped_params = {
       user: {
         email: email,
@@ -22,13 +26,17 @@ class EasyPost::Beta::Referral < EasyPost::Resource
   end
 
   # 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.'
     response = EasyPost.make_request(:get, '/beta/referral_customers', api_key, params)
     EasyPost::Util.convert_to_easypost_object(response, api_key)
   end
 
   # 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.'
     easypost_stripe_api_key = retrieve_easypost_stripe_api_key
 
     begin
@@ -48,13 +56,14 @@ class EasyPost::Beta::Referral < EasyPost::Resource
   end
 
   # Retrieve EasyPost's Stripe public API key.
-  def self.retrieve_easypost_stripe_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.
-  def self.create_stripe_token(number, expiration_month, expiration_year, cvc, easypost_stripe_token)
+  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}",
@@ -84,7 +93,7 @@ class EasyPost::Beta::Referral < EasyPost::Resource
   end
 
   # Submit Stripe credit card token to EasyPost.
-  def self.create_easypost_credit_card(referral_api_key, stripe_object_id, priority = 'primary')
+  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,

data/lib/easypost/referral.rb

@@ -0,0 +1,98 @@
+# frozen_string_literal: true
+
+# Referral objects are User objects created from a Partner user.
+class EasyPost::Referral < EasyPost::Resource
+  # 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 })
+    EasyPost::Util.convert_to_easypost_object(response, api_key)
+  end
+
+  # Update a referral user. This function requires the Partner User's API key.
+  def self.update_email(email, user_id, api_key = nil)
+    wrapped_params = {
+      user: {
+        email: email,
+      },
+    }
+    EasyPost.make_request(:put, "/v2/referral_customers/#{user_id}", api_key, wrapped_params)
+
+    # return true if API succeeds, else an error is throw if it fails.
+    true
+  end
+
+  # Retrieve a list of referral users. This function requires the Partner User's API key.
+  def self.all(params = {}, api_key = nil)
+    response = EasyPost.make_request(:get, '/v2/referral_customers', api_key, params)
+    EasyPost::Util.convert_to_easypost_object(response, api_key)
+  end
+
+  # Add credit card to a referral user. This function requires the Referral User's API key.
+  def self.add_credit_card(referral_api_key, number, expiration_month, expiration_year, cvc, priority = 'primary')
+    easypost_stripe_api_key = retrieve_easypost_stripe_api_key
+
+    begin
+      stripe_credit_card_token = create_stripe_token(
+        number,
+        expiration_month,
+        expiration_year,
+        cvc,
+        easypost_stripe_api_key,
+      )
+    rescue StandardError
+      raise EasyPost::Error.new('Could not send card details to Stripe, please try again later.')
+    end
+
+    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/shipment.rb

@@ -35,14 +35,23 @@ class EasyPost::Shipment < EasyPost::Resource
   end
 
   # Buy a Shipment.
-  def buy(params = {}, with_carbon_offset = false)
+  def buy(params = {}, with_carbon_offset = false, end_shipper_id = nil)
     if params.instance_of?(EasyPost::Rate)
       temp = params.clone
       params = {}
       params[:rate] = temp
     end
 
-    params[:carbon_offset] = with_carbon_offset
+    if params[:with_carbon_offset]
+      params[:carbon_offset] = params[:with_carbon_offset]
+      params.delete(:with_carbon_offset)
+    else
+      params[:carbon_offset] = with_carbon_offset
+    end
+
+    if end_shipper_id
+      params[:end_shipper_id] = end_shipper_id
+    end
 
     response = EasyPost.make_request(:post, "#{url}/buy", @api_key, params)
     refresh_from(response, @api_key)

data/lib/easypost.rb

@@ -30,6 +30,7 @@ require 'easypost/pickup_rate'
 require 'easypost/pickup'
 require 'easypost/postage_label'
 require 'easypost/rate'
+require 'easypost/referral'
 require 'easypost/refund'
 require 'easypost/report'
 require 'easypost/scan_form'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: easypost
 version: !ruby/object:Gem::Version
-  version: 4.7.1
+  version: 4.8.0
 platform: ruby
 authors:
 - EasyPost Developers
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-06 00:00:00.000000000 Z
+date: 2022-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: brakeman
@@ -208,6 +208,7 @@ files:
 - lib/easypost/pickup_rate.rb
 - lib/easypost/postage_label.rb
 - lib/easypost/rate.rb
+- lib/easypost/referral.rb
 - lib/easypost/refund.rb
 - lib/easypost/report.rb
 - lib/easypost/resource.rb