easypost 5.2.0 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 043543a947c3d50354a25d984eded8e68e37d9af9d7e2c6158176201426cafa1
-  data.tar.gz: 15ebc3486ec63ac23b0dfa6de82001537a72697863e1587fd9a1d909cde33a9a
+  metadata.gz: d84472fd17512bf9f3c4a2a670a025e76154bbe93fffa5a8e9139309af4feac2
+  data.tar.gz: 4c7c6df535c2700e54751e878e239ba689be42faec299993a19993d6ceb2fc0f
 SHA512:
-  metadata.gz: 8a004acaa7797b54fd7226e4321a47e9aaa11aa055ee39dd886456d547f3e9ec847046c77f2f548a3f510c9d992842c4896fcb5beb6ee060280098e87ee2ae40
-  data.tar.gz: 7b4f5377749b4d65278f744befef446cfcfe7372f171e64a6b42996b9c0c988b0a6370f949d2986698fc5484f66d4bc3cb879b0f714b04a25e9216c196d960ee
+  metadata.gz: b7337d5099aa61da9c7bf21ce1c7d9fe9c6e9b9f011ab615949934e6e42b192785f87481cadfcbd1e244d682f323edbfd6a42e6df409b900749e92d83d474c63
+  data.tar.gz: fee3c31633179b4337ded644d83e61d4b7f776ac873954cf01b1f1c613044c8cdf46cd34b1f3a8a40333823050ff78eb0c432c6db1fe269adc113acc79efeae9

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # CHANGELOG
 
+## 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
+- Fixes a bug where the original filtering criteria of `all` calls wasn't passed along to `get_next_page` calls. Now, these are persisted via `_params` key on response objects
+- Removes the undocumented `create_and_buy` function from the Batch service. The proper usage is to create a batch first and buy it separately
+
+## v5.3.0 (2023-10-11)
+
+- Migrate API Key-related functions out of `user` service into `api_key` service, deprecating the old and introducing the new
+
 ## v5.2.0 (2023-09-14)
 
 - Add `carrier_type` service + `carrier_type.all` method

data/UPGRADE_GUIDE.md

@@ -2,11 +2,42 @@
 
 Use the following guide to assist in the upgrade process of the `easypost-ruby` library between major versions.
 
+- [Upgrading from 5.x to 6.0](#upgrading-from-5x-to-60)
 - [Upgrading from 4.x to 5.0](#upgrading-from-4x-to-50)
 - [Upgrading from 3.x to 4.0](#upgrading-from-3x-to-40)
 
+## Upgrading from 5.x to 6.0
+
+### 6.0 High Impact Changes
+
+- [Carbon Offset Removed](#60-carbon-offset-removed)
+
+### 6.0 Low Impact Changes
+
+- [Create and Buy Batch Function Removed](#60-create-and-buy-batch-function-removed)
+
+## 6.0 Carbon Offset Removed
+
+*Likelihood of Impact: **High***
+
+EasyPost now offers Carbon Neutral shipments by default for free! Because of this, there is no longer a need to specify if you want to offset the carbon footprint of a shipment.
+
+The `with_carbon_offset` parameter of the `create`, `buy`, and `regenerate_rates` shipment functions has been removed.
+
+This is a high-impact change for those using `EndShippers`, as the signature for the `create` and `buy` shipment function has changed. You will need to inspect these callsites to ensure that the EndShipper parameter is being passed in the correct place.
+
+## 6.0 Create and Buy Batch Function Removed
+
+*Likelihood of Impact: **Low***
+
+The `create_and_buy` batch endpoint has been deprecated, and the `create_and_buy` Batch service function has been removed.
+
+The correct procedure is to first create a batch and then purchase it with two separate API calls.
+
 ## Upgrading from 4.x to 5.0
 
+**NOTICE:** v5 is deprecated.
+
 ### 5.0 High Impact Changes
 
 - [New Client object](#50-thread-safe-with-client-object)

data/VERSION

@@ -1 +1 @@
-5.2.0
+6.0.0

data/lib/easypost/client.rb

@@ -72,7 +72,6 @@ class EasyPost::Client
   #
   # @param method [Symbol] the HTTP Verb (get, method, put, post, etc.)
   # @param endpoint [String] URI path of the resource
-  # @param cls [Class] the class to deserialize to
   # @param body [Object] (nil) object to be dumped to JSON
   # @param api_version [String] the version of API to hit
   # @raise [EasyPost::Error] if the response has a non-2xx status code
@@ -80,7 +79,6 @@ class EasyPost::Client
   def make_request(
     method,
     endpoint,
-    cls = EasyPost::Models::EasyPostObject,
     body = nil,
     api_version = EasyPost::InternalUtilities::Constants::API_VERSION
   )
@@ -89,7 +87,7 @@ class EasyPost::Client
     potential_error = EasyPost::Errors::ApiError.handle_api_error(response)
     raise potential_error unless potential_error.nil?
 
-    EasyPost::InternalUtilities::Json.convert_json_to_object(response.body, cls)
+    EasyPost::InternalUtilities::Json.parse_json(response.body)
   end
 
   # Subscribe a request hook

data/lib/easypost/constants.rb

@@ -6,6 +6,7 @@ class EasyPost::Constants
   INVALID_PAYMENT_METHOD = 'The chosen payment method is not valid. Please try again.'
   MISSING_REQUIRED_PARAMETER = 'Required parameter %s is missing.'
   NO_MATCHING_RATES = 'No matching rates found.'
+  NO_USER_FOUND = 'No user found with the given id.'
   NO_MORE_PAGES = 'There are no more pages to retrieve.'
   NO_PAYMENT_METHODS = 'Billing has not been setup for this user. Please add a payment method.'
   STRIPE_CARD_CREATE_FAILED = 'Could not send card details to Stripe, please try again later.'

data/lib/easypost/models/base.rb

@@ -32,7 +32,9 @@ class EasyPost::Models::Object
   private
 
   def add_properties(values)
-    values.each do |key, _|
+    values.each_key do |key|
+      next if key == EasyPost::InternalUtilities::Constants::FILTERS_KEY
+
       define_singleton_method(key) { handle_value(@values[key]) } # getter
       define_singleton_method("#{key}=") { |v| @values[key] = handle_value(v) } # setter
     end

data/lib/easypost/models.rb

@@ -8,7 +8,6 @@ require_relative 'models/address'
 require_relative 'models/api_key'
 require_relative 'models/batch'
 require_relative 'models/brand'
-require_relative 'models/carbon_offset'
 require_relative 'models/carrier_account'
 require_relative 'models/carrier_type'
 require_relative 'models/customs_info'

data/lib/easypost/services/address.rb

@@ -17,7 +17,9 @@ class EasyPost::Services::Address < EasyPost::Services::Service
       wrapped_params[:verify_strict] = params[:verify_strict]
     end
 
-    @client.make_request(:post, 'addresses', MODEL_CLASS, params)
+    response = @client.make_request(:post, 'addresses', params)
+
+    EasyPost::InternalUtilities::Json.convert_json_to_object(response, MODEL_CLASS)
   end
 
   # Create and verify an Address in one call.
@@ -25,26 +27,39 @@ class EasyPost::Services::Address < EasyPost::Services::Service
     wrapped_params = {}
     wrapped_params[:address] = params
 
-    @client.make_request(:post, 'addresses/create_and_verify', MODEL_CLASS, wrapped_params).address
+    response = @client.make_request(:post, 'addresses/create_and_verify', wrapped_params)
+
+    EasyPost::InternalUtilities::Json.convert_json_to_object(response, MODEL_CLASS).address
   end
 
   # Verify an Address.
   def verify(id)
-    @client.make_request(:get, "addresses/#{id}/verify", MODEL_CLASS).address
+    response = @client.make_request(:get, "addresses/#{id}/verify")
+
+    EasyPost::InternalUtilities::Json.convert_json_to_object(response, MODEL_CLASS).address
   end
 
   # Retrieve an Address.
   def retrieve(id)
-    @client.make_request(:get, "addresses/#{id}", MODEL_CLASS)
+    response = @client.make_request(:get, "addresses/#{id}")
+
+    EasyPost::InternalUtilities::Json.convert_json_to_object(response, MODEL_CLASS)
   end
 
   # Retrieve all Addresses.
-  def all(filters = {})
-    @client.make_request(:get, 'addresses', MODEL_CLASS, filters)
+  def all(params = {})
+    filters = { key: 'addresses' }
+
+    get_all_helper('addresses', MODEL_CLASS, params, filters)
   end
 
   # Get the next page of addresses.
   def get_next_page(collection, page_size = nil)
-    get_next_page_helper(collection, collection.addresses, 'addresses', MODEL_CLASS, page_size)
+    raise EasyPost::Errors::EndOfPaginationError.new unless more_pages?(collection)
+
+    params = { before_id: collection.addresses.last.id }
+    params[:page_size] = page_size unless page_size.nil?
+
+    all(params)
   end
 end

data/lib/easypost/services/api_key.rb

@@ -1,8 +1,29 @@
 # frozen_string_literal: true
 
 class EasyPost::Services::ApiKey < EasyPost::Services::Service
-  # Retrieve all api keys.
+  # Retrieve a list of all ApiKey objects.
   def all
-    @client.make_request(:get, 'api_keys', EasyPost::Models::ApiKey)
+    response = @client.make_request(:get, 'api_keys')
+
+    EasyPost::InternalUtilities::Json.convert_json_to_object(response, EasyPost::Models::ApiKey)
+  end
+
+  # Retrieve a list of ApiKey objects (works for the authenticated user or a child user).
+  def retrieve_api_keys_for_user(id)
+    api_keys = all
+
+    if api_keys.id == id
+      # This function was called on the authenticated user
+      return api_keys.keys
+    end
+
+    # This function was called on a child user (authenticated as parent, only return this child user's details).
+    api_keys.children.each do |child|
+      if child.id == id
+        return child.keys
+      end
+    end
+
+    raise EasyPost::Errors::FilteringError.new(EasyPost::Constants::NO_USER_FOUND)
   end
 end

data/lib/easypost/services/base.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative '../internal_utilities'
+
 # The base class for all services in the library.
 class EasyPost::Services::Service
   def initialize(client)
@@ -8,20 +10,15 @@ class EasyPost::Services::Service
 
   protected
 
-  # Get next page of an object collection
-  def get_next_page_helper(collection, current_page_items, endpoint, cls, page_size = nil)
-    has_more = collection.has_more || false
-    unless !has_more || current_page_items.nil? || current_page_items.empty?
-      params = {}
-      params[:before_id] = current_page_items.last.id
-      unless page_size.nil?
-        params[:page_size] = page_size
-      end
+  def get_all_helper(endpoint, cls, params, filters = nil)
+    response = @client.make_request(:get, endpoint, params)
+
+    response[EasyPost::InternalUtilities::Constants::FILTERS_KEY] = filters unless filters.nil?
 
-      @client.make_request(:get, endpoint, cls, params)
-    end
+    EasyPost::InternalUtilities::Json.convert_json_to_object(response, cls)
+  end
 
-    # issue with getting the next page
-    raise EasyPost::Errors::EndOfPaginationError.new
+  def more_pages?(collection)
+    collection&.has_more
   end
 end

data/lib/easypost/services/batch.rb

@@ -6,48 +6,56 @@ class EasyPost::Services::Batch < EasyPost::Services::Service
   # Create a Batch.
   def create(params = {})
     wrapped_params = { batch: params }
+    response = @client.make_request(:post, 'batches', wrapped_params)
 
-    @client.make_request(:post, 'batches', MODEL_CLASS, wrapped_params)
-  end
-
-  # Create and buy a batch in one call.
-  def create_and_buy(params = {})
-    wrapped_params = { batch: params }
-
-    @client.make_request(:post, 'batches/create_and_buy', MODEL_CLASS, wrapped_params)
+    EasyPost::InternalUtilities::Json.convert_json_to_object(response, MODEL_CLASS)
   end
 
   def all(params = {})
-    @client.make_request(:get, 'batches', EasyPost::Models::ApiKey, params)
+    filters = { key: 'batches' }
+
+    get_all_helper('batches', MODEL_CLASS, params, filters)
   end
 
   # Retrieve a Batch
   def retrieve(id)
-    @client.make_request(:get, "batches/#{id}", MODEL_CLASS)
+    response = @client.make_request(:get, "batches/#{id}")
+
+    EasyPost::InternalUtilities::Json.convert_json_to_object(response, MODEL_CLASS)
   end
 
   # Buy a Batch.
   def buy(id, params = {})
-    @client.make_request(:post, "batches/#{id}/buy", MODEL_CLASS, params)
+    response = @client.make_request(:post, "batches/#{id}/buy", params)
+
+    EasyPost::InternalUtilities::Json.convert_json_to_object(response, MODEL_CLASS)
   end
 
   # Convert the label format of a Batch.
   def label(id, params = {})
-    @client.make_request(:post, "batches/#{id}/label", MODEL_CLASS, params)
+    response = @client.make_request(:post, "batches/#{id}/label", params)
+
+    EasyPost::InternalUtilities::Json.convert_json_to_object(response, MODEL_CLASS)
   end
 
   # Remove Shipments from a Batch.
   def remove_shipments(id, params = {})
-    @client.make_request(:post, "batches/#{id}/remove_shipments", MODEL_CLASS, params)
+    response = @client.make_request(:post, "batches/#{id}/remove_shipments", params)
+
+    EasyPost::InternalUtilities::Json.convert_json_to_object(response, MODEL_CLASS)
   end
 
   # Add Shipments to a Batch.
   def add_shipments(id, params = {})
-    @client.make_request(:post, "batches/#{id}/add_shipments", MODEL_CLASS, params)
+    response = @client.make_request(:post, "batches/#{id}/add_shipments", params)
+
+    EasyPost::InternalUtilities::Json.convert_json_to_object(response, MODEL_CLASS)
   end
 
   # Create a ScanForm for a Batch.
   def create_scan_form(id, params = {})
-    @client.make_request(:post, "batches/#{id}/scan_form", MODEL_CLASS, params)
+    response = @client.make_request(:post, "batches/#{id}/scan_form", params)
+
+    EasyPost::InternalUtilities::Json.convert_json_to_object(response, MODEL_CLASS)
   end
 end

data/lib/easypost/services/beta_rate.rb

@@ -6,7 +6,8 @@ class EasyPost::Services::BetaRate < EasyPost::Services::Service
     wrapped_params = {
       shipment: params,
     }
+    response = @client.make_request(:post, 'rates', wrapped_params, 'beta')
 
-    @client.make_request(:post, 'rates', EasyPost::Models::Rate, wrapped_params, 'beta').rates
+    EasyPost::InternalUtilities::Json.convert_json_to_object(response, EasyPost::Models::Rate).rates
   end
 end

data/lib/easypost/services/beta_referral_customer.rb

@@ -10,13 +10,14 @@ class EasyPost::Services::BetaReferralCustomer < EasyPost::Services::Service
         priority: priority.downcase,
       },
     }
-    @client.make_request(
+    response = @client.make_request(
       :post,
       'referral_customers/payment_method',
-      EasyPost::Models::EasyPostObject,
       wrapped_params,
       'beta',
     )
+
+    EasyPost::InternalUtilities::Json.convert_json_to_object(response)
   end
 
   # Refund a ReferralCustomer Customer's wallet by a specified amount. Refund will be issued to the user's original payment method.
@@ -25,8 +26,9 @@ class EasyPost::Services::BetaReferralCustomer < EasyPost::Services::Service
     params = {
       refund_amount: amount,
     }
-    @client.make_request(:post, 'referral_customers/refunds', EasyPost::Models::EasyPostObject, params, 'beta')
-    # noinspection RubyMismatchedReturnType
+    response = @client.make_request(:post, 'referral_customers/refunds', params, 'beta')
+
+    EasyPost::InternalUtilities::Json.convert_json_to_object(response)
   end
 
   # Refund a ReferralCustomer Customer's wallet for a specified payment log entry. Refund will be issued to the user's original payment method.
@@ -35,6 +37,8 @@ class EasyPost::Services::BetaReferralCustomer < EasyPost::Services::Service
     params = {
       payment_log_id: payment_log_id,
     }
-    @client.make_request(:post, 'referral_customers/refunds', EasyPost::Models::EasyPostObject, params, 'beta')
+    response = @client.make_request(:post, 'referral_customers/refunds', params, 'beta')
+
+    EasyPost::InternalUtilities::Json.convert_json_to_object(response)
   end
 end

data/lib/easypost/services/billing.rb

@@ -44,7 +44,7 @@ class EasyPost::Services::Billing < EasyPost::Services::Service
     payment_id = payment_info[1]
 
     wrapped_params = { amount: amount }
-    @client.make_request(:post, "#{endpoint}/#{payment_id}/charges", EasyPost::Models::EasyPostObject, wrapped_params)
+    @client.make_request(:post, "#{endpoint}/#{payment_id}/charges", wrapped_params)
 
     # Return true if succeeds, an error will be thrown if it fails
     true
@@ -65,11 +65,12 @@ class EasyPost::Services::Billing < EasyPost::Services::Service
   # Retrieve all payment methods.
   def retrieve_payment_methods
     response = @client.make_request(:get, '/v2/payment_methods')
+    payment_methods = EasyPost::InternalUtilities::Json.convert_json_to_object(response)
 
-    if response['id'].nil?
+    if payment_methods['id'].nil?
       raise EasyPost::Errors::InvalidObjectError.new(EasyPost::Constants::NO_PAYMENT_METHODS)
     end
 
-    response
+    payment_methods
   end
 end

data/lib/easypost/services/carrier_account.rb

@@ -14,24 +14,29 @@ class EasyPost::Services::CarrierAccount < EasyPost::Services::Service
                  else
                    'carrier_accounts'
                  end
+    response = @client.make_request(:post, create_url, wrapped_params)
 
-    @client.make_request(:post, create_url, MODEL_CLASS, wrapped_params)
+    EasyPost::InternalUtilities::Json.convert_json_to_object(response, MODEL_CLASS)
   end
 
   # Retrieve a carrier account
   def retrieve(id)
-    @client.make_request(:get, "carrier_accounts/#{id}", MODEL_CLASS)
+    response = @client.make_request(:get, "carrier_accounts/#{id}")
+
+    EasyPost::InternalUtilities::Json.convert_json_to_object(response, MODEL_CLASS)
   end
 
   # Retrieve all carrier accounts
   def all(params = {})
-    @client.make_request(:get, 'carrier_accounts', MODEL_CLASS, params)
+    get_all_helper('carrier_accounts', MODEL_CLASS, params)
   end
 
   # Update a carrier account
   def update(id, params = {})
     wrapped_params = { carrier_account: params }
-    @client.make_request(:put, "carrier_accounts/#{id}", MODEL_CLASS, wrapped_params)
+    response = @client.make_request(:put, "carrier_accounts/#{id}", wrapped_params)
+
+    EasyPost::InternalUtilities::Json.convert_json_to_object(response, MODEL_CLASS)
   end
 
   # Delete a carrier account

data/lib/easypost/services/carrier_metadata.rb

@@ -4,7 +4,6 @@ class EasyPost::Services::CarrierMetadata < EasyPost::Services::Service
   # Retrieve metadata for carrier(s).
   def retrieve(carriers = [], types = [])
     path = '/metadata/carriers?'
-
     params = {}
 
     if carriers.length.positive?
@@ -16,7 +15,8 @@ class EasyPost::Services::CarrierMetadata < EasyPost::Services::Service
     end
 
     path += URI.encode_www_form(params)
+    response = @client.make_request(:get, path, params)
 
-    @client.make_request(:get, path, EasyPost::Models::EasyPostObject, params).carriers
+    EasyPost::InternalUtilities::Json.convert_json_to_object(response).carriers
   end
 end

data/lib/easypost/services/carrier_type.rb

@@ -5,6 +5,8 @@ class EasyPost::Services::CarrierType < EasyPost::Services::Service
 
   # Retrieve all carrier types
   def all
-    @client.make_request(:get, 'carrier_types', MODEL_CLASS)
+    response = @client.make_request(:get, 'carrier_types')
+
+    EasyPost::InternalUtilities::Json.convert_json_to_object(response, MODEL_CLASS)
   end
 end

data/lib/easypost/services/customs_info.rb

@@ -6,12 +6,15 @@ class EasyPost::Services::CustomsInfo < EasyPost::Services::Service
   # Create a CustomsInfo object
   def create(params)
     wrapped_params = { customs_info: params }
+    response = @client.make_request(:post, 'customs_infos', wrapped_params)
 
-    @client.make_request(:post, 'customs_infos', MODEL_CLASS, wrapped_params)
+    EasyPost::InternalUtilities::Json.convert_json_to_object(response, MODEL_CLASS)
   end
 
   # Retrieve a CustomsInfo object
   def retrieve(id)
-    @client.make_request(:get, "customs_infos/#{id}", MODEL_CLASS)
+    response = @client.make_request(:get, "customs_infos/#{id}")
+
+    EasyPost::InternalUtilities::Json.convert_json_to_object(response, MODEL_CLASS)
   end
 end

data/lib/easypost/services/customs_item.rb

@@ -5,11 +5,15 @@ class EasyPost::Services::CustomsItem < EasyPost::Services::Service
 
   # Create a CustomsItem object
   def create(params)
-    @client.make_request(:post, 'customs_items', MODEL_CLASS, params)
+    response = @client.make_request(:post, 'customs_items', params)
+
+    EasyPost::InternalUtilities::Json.convert_json_to_object(response, MODEL_CLASS)
   end
 
   # Retrieve a CustomsItem object
   def retrieve(id)
-    @client.make_request(:get, "customs_items/#{id}", MODEL_CLASS)
+    response = @client.make_request(:get, "customs_items/#{id}")
+
+    EasyPost::InternalUtilities::Json.convert_json_to_object(response, MODEL_CLASS)
   end
 end

data/lib/easypost/services/end_shipper.rb

@@ -6,25 +6,31 @@ class EasyPost::Services::EndShipper < EasyPost::Services::Service
   # Create an EndShipper object.
   def create(params = {})
     wrapped_params = { address: params }
+    response = @client.make_request(:post, 'end_shippers', wrapped_params)
 
-    @client.make_request(:post, 'end_shippers', MODEL_CLASS, wrapped_params)
+    EasyPost::InternalUtilities::Json.convert_json_to_object(response, MODEL_CLASS)
   end
 
   # Retrieve an EndShipper object.
   def retrieve(id)
-    @client.make_request(:get, "end_shippers/#{id}", MODEL_CLASS)
+    response = @client.make_request(:get, "end_shippers/#{id}")
+
+    EasyPost::InternalUtilities::Json.convert_json_to_object(response, MODEL_CLASS)
   end
 
   # Retrieve all EndShipper objects.
   def all(params = {})
-    @client.make_request(:get, 'end_shippers', MODEL_CLASS, params)
+    response = @client.make_request(:get, 'end_shippers', params)
+
+    EasyPost::InternalUtilities::Json.convert_json_to_object(response, MODEL_CLASS)
   end
 
   # Updates an EndShipper object. This requires all parameters to be set.
   def update(id, params)
     wrapped_params = { address: params }
+    response = @client.make_request(:put, "end_shippers/#{id}", wrapped_params)
 
-    @client.make_request(:put, "end_shippers/#{id}", MODEL_CLASS, wrapped_params)
+    EasyPost::InternalUtilities::Json.convert_json_to_object(response, MODEL_CLASS)
   end
 
   # TODO: Add support for getting the next page of end shippers when the API supports it.

data/lib/easypost/services/event.rb

@@ -7,26 +7,39 @@ class EasyPost::Services::Event < EasyPost::Services::Service
 
   # Retrieve an Event object
   def retrieve(id)
-    @client.make_request(:get, "events/#{id}", MODEL_CLASS)
+    response = @client.make_request(:get, "events/#{id}")
+
+    EasyPost::InternalUtilities::Json.convert_json_to_object(response, MODEL_CLASS)
   end
 
   # Retrieve all Event objects
   def all(params = {})
-    @client.make_request(:get, 'events', MODEL_CLASS, params)
+    filters = { key: 'events' }
+
+    get_all_helper('events', MODEL_CLASS, params, filters)
   end
 
   # Retrieve all payloads for an event.
   def retrieve_all_payloads(event_id)
-    @client.make_request(:get, "events/#{event_id}/payloads", EasyPost::Models::Payload)
+    response = @client.make_request(:get, "events/#{event_id}/payloads")
+
+    EasyPost::InternalUtilities::Json.convert_json_to_object(response, EasyPost::Models::Payload)
   end
 
   # Retrieve a specific payload for an event.
   def retrieve_payload(event_id, payload_id)
-    @client.make_request(:get, "events/#{event_id}/payloads/#{payload_id}", EasyPost::Models::Payload)
+    response = @client.make_request(:get, "events/#{event_id}/payloads/#{payload_id}")
+
+    EasyPost::InternalUtilities::Json.convert_json_to_object(response, EasyPost::Models::Payload)
   end
 
   # Get the next page of events.
   def get_next_page(collection, page_size = nil)
-    get_next_page_helper(collection, collection.events, 'events', MODEL_CLASS, page_size)
+    raise EasyPost::Errors::EndOfPaginationError.new unless more_pages?(collection)
+
+    params = { before_id: collection.events.last.id }
+    params[:page_size] = page_size unless page_size.nil?
+
+    all(params)
   end
 end

data/lib/easypost/services/insurance.rb

@@ -6,21 +6,32 @@ class EasyPost::Services::Insurance < EasyPost::Services::Service
   # Create an Insurance object
   def create(params = {})
     wrapped_params = { insurance: params }
-    @client.make_request(:post, 'insurances', MODEL_CLASS, wrapped_params)
+    response = @client.make_request(:post, 'insurances', wrapped_params)
+
+    EasyPost::InternalUtilities::Json.convert_json_to_object(response, MODEL_CLASS)
   end
 
   # Retrieve an Insurance object
   def retrieve(id)
-    @client.make_request(:get, "insurances/#{id}", MODEL_CLASS)
+    response = @client.make_request(:get, "insurances/#{id}")
+
+    EasyPost::InternalUtilities::Json.convert_json_to_object(response, MODEL_CLASS)
   end
 
   # Retrieve all Insurance objects
   def all(params = {})
-    @client.make_request(:get, 'insurances', MODEL_CLASS, params)
+    filters = { key: 'insurances' }
+
+    get_all_helper('insurances', MODEL_CLASS, params, filters)
   end
 
   # Get the next page of insurances.
   def get_next_page(collection, page_size = nil)
-    get_next_page_helper(collection, collection.insurances, 'insurances', MODEL_CLASS, page_size)
+    raise EasyPost::Errors::EndOfPaginationError.new unless more_pages?(collection)
+
+    params = { before_id: collection.insurances.last.id }
+    params[:page_size] = page_size unless page_size.nil?
+
+    all(params)
   end
 end