easypost 6.0.0 → 6.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d84472fd17512bf9f3c4a2a670a025e76154bbe93fffa5a8e9139309af4feac2
-  data.tar.gz: 4c7c6df535c2700e54751e878e239ba689be42faec299993a19993d6ceb2fc0f
+  metadata.gz: 78ff932eb3d904ba184e444260e54f89bc1130fa7a93f5483c3a322071035d99
+  data.tar.gz: 51fd77d26ae8bb1351880956a47cdcd1529c84e51f26a209b125e28a67b6fa9f
 SHA512:
-  metadata.gz: b7337d5099aa61da9c7bf21ce1c7d9fe9c6e9b9f011ab615949934e6e42b192785f87481cadfcbd1e244d682f323edbfd6a42e6df409b900749e92d83d474c63
-  data.tar.gz: fee3c31633179b4337ded644d83e61d4b7f776ac873954cf01b1f1c613044c8cdf46cd34b1f3a8a40333823050ff78eb0c432c6db1fe269adc113acc79efeae9
+  metadata.gz: 21b04b15fa14c1f82bdaf7b208201f66f186c8c5b6adc4d1a4e9040e93232b9c4f3793f0a5064eaaafca269818a75e2e7b33c6cb0476793da48735d087045da3
+  data.tar.gz: 15525784bb626e44c1469513ebc16663b8f8b0c882c46270514783118f21dc6b7b2afb4ec092fedfb0eae17325acb46a671292db385fae7a2dffca58de7d1ec9

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # CHANGELOG
 
+## v6.1.1 (2024-01-23)
+
+- Fix issues funding wallet due to invalid internal function call
+
+## v6.1.0 (2024-01-08)
+
+- Add `all_children` and `get_next_page_of_children` in `user` service
+
 ## v6.0.0 (2023-12-06)
 
 - Removes `with_carbon_offset` parameter from `create`, `buy` and `regenerate_rates` methods in the shipment service since now EasyPost offers carbon neutral shipments by default for free

data/Makefile

@@ -40,8 +40,9 @@ publish:
 
 ## release - Cuts a release for the project on GitHub (requires GitHub CLI)
 # tag = The associated tag title of the release
+# target = Target branch or full commit SHA
 release:
-	gh release create ${tag} dist/*
+	gh release create ${tag} dist/* --target ${target}
 
 ## rubocop - lints the project with rubocop
 rubocop:

data/VERSION

@@ -1 +1 @@
-6.0.0
+6.1.1

data/easypost.gemspec

@@ -24,7 +24,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'brakeman', '~> 5.4'
   spec.add_development_dependency 'faraday', '~> 2.7.5' # used for integration tests
   spec.add_development_dependency 'pry', '~> 0.14'
-  spec.add_development_dependency 'psych', '~> 5.1'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rdoc', '~> 6.5'
   spec.add_development_dependency 'rspec', '~> 3.12'

data/lib/easypost/services/base.rb

@@ -10,8 +10,11 @@ class EasyPost::Services::Service
 
   protected
 
-  def get_all_helper(endpoint, cls, params, filters = nil)
-    response = @client.make_request(:get, endpoint, params)
+  def get_all_helper(endpoint, cls, params, filters = nil, beta = false)
+    response = @client.make_request(
+      :get, endpoint, params,
+      beta ? 'beta' : EasyPost::InternalUtilities::Constants::API_VERSION,
+    )
 
     response[EasyPost::InternalUtilities::Constants::FILTERS_KEY] = filters unless filters.nil?
 

data/lib/easypost/services/billing.rb

@@ -3,43 +3,9 @@
 require 'easypost/constants'
 
 class EasyPost::Services::Billing < EasyPost::Services::Service
-  # Get payment method info (type of the payment method and ID of the payment method)
-  def self.get_payment_method_info(priority)
-    payment_methods = EasyPost::Services::Billing.retrieve_payment_methods
-    payment_method_map = {
-      'primary' => 'primary_payment_method',
-      'secondary' => 'secondary_payment_method',
-    }
-
-    payment_method_to_use = payment_method_map[priority]
-
-    error_string = EasyPost::Constants::INVALID_PAYMENT_METHOD
-    suggestion = "Please use a valid payment method: #{payment_method_map.keys.join(', ')}"
-    if payment_methods[payment_method_to_use].nil?
-      raise EasyPost::Errors::InvalidParameterError.new(
-        error_string,
-        suggestion,
-      )
-    end
-
-    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::Errors::InvalidObjectError.new(error_string)
-      end
-    end
-
-    [endpoint, payment_method_id]
-  end
-
   # Fund your EasyPost wallet by charging your primary or secondary card on file.
   def fund_wallet(amount, priority = 'primary')
-    payment_info = EasyPost::Services::Billing.get_payment_method_info(priority.downcase)
+    payment_info = get_payment_method_info(priority.downcase)
     endpoint = payment_info[0]
     payment_id = payment_info[1]
 
@@ -52,7 +18,7 @@ class EasyPost::Services::Billing < EasyPost::Services::Service
 
   # Delete a payment method.
   def delete_payment_method(priority)
-    payment_info = EasyPost::Services::Billing.get_payment_method_info(priority.downcase)
+    payment_info = get_payment_method_info(priority.downcase)
     endpoint = payment_info[0]
     payment_id = payment_info[1]
 
@@ -64,7 +30,7 @@ class EasyPost::Services::Billing < EasyPost::Services::Service
 
   # Retrieve all payment methods.
   def retrieve_payment_methods
-    response = @client.make_request(:get, '/v2/payment_methods')
+    response = @client.make_request(:get, '/payment_methods')
     payment_methods = EasyPost::InternalUtilities::Json.convert_json_to_object(response)
 
     if payment_methods['id'].nil?
@@ -73,4 +39,40 @@ class EasyPost::Services::Billing < EasyPost::Services::Service
 
     payment_methods
   end
+
+  private
+
+  # Get payment method info (type of the payment method and ID of the payment method)
+  def get_payment_method_info(priority)
+    payment_methods = retrieve_payment_methods
+    payment_method_map = {
+      'primary' => 'primary_payment_method',
+      'secondary' => 'secondary_payment_method',
+    }
+
+    payment_method_to_use = payment_method_map[priority]
+
+    error_string = EasyPost::Constants::INVALID_PAYMENT_METHOD
+    suggestion = "Please use a valid payment method: #{payment_method_map.keys.join(', ')}"
+    if payment_methods[payment_method_to_use].nil?
+      raise EasyPost::Errors::InvalidParameterError.new(
+        error_string,
+        suggestion,
+      )
+    end
+
+    payment_method_id = payment_methods[payment_method_to_use]['id']
+
+    unless payment_method_id.nil?
+      if payment_method_id.start_with?('card_')
+        endpoint = '/credit_cards'
+      elsif payment_method_id.start_with?('bank_')
+        endpoint = '/bank_accounts'
+      else
+        raise EasyPost::Errors::InvalidObjectError.new(error_string)
+      end
+    end
+
+    [endpoint, payment_method_id]
+  end
 end

data/lib/easypost/services/user.rb

@@ -78,4 +78,21 @@ Please use `retrieve_api_keys_for_user` in the `api_key` service instead.'
 
     EasyPost::InternalUtilities::Json.convert_json_to_object(response, EasyPost::Models::Brand)
   end
+
+  # Retrieve all child Users.
+  def all_children(params = {})
+    filters = { key: 'children' }
+
+    get_all_helper('users/children', EasyPost::Models::User, params, filters)
+  end
+
+  # Get the next page of child users.
+  def get_next_page_of_children(collection, page_size = nil)
+    raise EasyPost::Errors::EndOfPaginationError.new unless more_pages?(collection)
+
+    params = { before_id: collection.children.last.id }
+    params[:page_size] = page_size unless page_size.nil?
+
+    all_children(params)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: easypost
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.1.1
 platform: ruby
 authors:
 - EasyPost Developers
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-06 00:00:00.000000000 Z
+date: 2024-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: brakeman
@@ -52,20 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.14'
-- !ruby/object:Gem::Dependency
-  name: psych
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -352,7 +338,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.4
 signing_key:
 specification_version: 4
 summary: EasyPost Ruby Client Library