Use request_stripe_object for all requests

lib/stripe/api_operations/create.rb

@@ -4,8 +4,12 @@ module Stripe
   module APIOperations
     module Create
       def create(params = {}, opts = {})
-        resp, opts = execute_resource_request(:post, resource_url, params, opts)
-        Util.convert_to_stripe_object(resp.data, opts)
+        request_stripe_object(
+          method: :post,
+          path: resource_url,
+          params: params,
+          opts: opts
+        )
       end
     end
   end

lib/stripe/api_operations/delete.rb

@@ -18,17 +18,22 @@ module ClassMethods
         #   api_key to be overwritten. See
         #   {APIOperations::Request.execute_resource_request}.
         def delete(id, params = {}, opts = {})
-          resp, opts = execute_resource_request(:delete,
-                                                "#{resource_url}/#{id}",
-                                                params, opts)
-          Util.convert_to_stripe_object(resp.data, opts)
+          request_stripe_object(
+            method: :delete,
+            path: "#{resource_url}/#{id}",
+            params: params,
+            opts: opts
+          )
         end
       end
 
       def delete(params = {}, opts = {})
-        resp, opts = execute_resource_request(:delete, resource_url,
-                                              params, opts)
-        initialize_from(resp.data, opts)
+        request_stripe_object(
+          method: :delete,
+          path: resource_url,
+          params: params,
+          opts: opts
+        )
       end
 
       def self.included(base)

lib/stripe/api_operations/list.rb

@@ -4,15 +4,12 @@ module Stripe
   module APIOperations
     module List
       def list(filters = {}, opts = {})
-        opts = Util.normalize_opts(opts)
-
-        resp, opts = execute_resource_request(:get, resource_url, filters, opts)
-        obj = ListObject.construct_from(resp.data, opts)
-
-        # set filters so that we can fetch the same limit, expansions, and
-        # predicates when accessing the next and previous pages
-        obj.filters = filters.dup
-        obj
+        request_stripe_object(
+          method: :get,
+          path: resource_url,
+          params: filters,
+          opts: opts
+        )
       end
     end
   end

lib/stripe/api_operations/nested_resource.rb

@@ -26,46 +26,74 @@ def nested_resource_class_methods(resource, path: nil, operations: nil,
         end
 
         operations.each do |operation|
-          case operation
-          when :create
-            define_singleton_method(:"create_#{resource}") \
+          define_operation(
+            resource,
+            operation,
+            resource_url_method,
+            resource_plural
+          )
+        end
+      end
+
+      private def define_operation(
+        resource,
+        operation,
+        resource_url_method,
+        resource_plural
+      )
+        case operation
+        when :create
+          define_singleton_method(:"create_#{resource}") \
               do |id, params = {}, opts = {}|
-                url = send(resource_url_method, id)
-                resp, opts = execute_resource_request(:post, url, params, opts)
-                Util.convert_to_stripe_object(resp.data, opts)
-              end
-          when :retrieve
-            define_singleton_method(:"retrieve_#{resource}") \
+            request_stripe_object(
+              method: :post,
+              path: send(resource_url_method, id),
+              params: params,
+              opts: opts
+            )
+          end
+        when :retrieve
+          define_singleton_method(:"retrieve_#{resource}") \
               do |id, nested_id, opts = {}|
-                url = send(resource_url_method, id, nested_id)
-                resp, opts = execute_resource_request(:get, url, {}, opts)
-                Util.convert_to_stripe_object(resp.data, opts)
-              end
-          when :update
-            define_singleton_method(:"update_#{resource}") \
+            request_stripe_object(
+              method: :get,
+              path: send(resource_url_method, id, nested_id),
+              params: {},
+              opts: opts
+            )
+          end
+        when :update
+          define_singleton_method(:"update_#{resource}") \
               do |id, nested_id, params = {}, opts = {}|
-                url = send(resource_url_method, id, nested_id)
-                resp, opts = execute_resource_request(:post, url, params, opts)
-                Util.convert_to_stripe_object(resp.data, opts)
-              end
-          when :delete
-            define_singleton_method(:"delete_#{resource}") \
+            request_stripe_object(
+              method: :post,
+              path: send(resource_url_method, id, nested_id),
+              params: params,
+              opts: opts
+            )
+          end
+        when :delete
+          define_singleton_method(:"delete_#{resource}") \
               do |id, nested_id, params = {}, opts = {}|
-                url = send(resource_url_method, id, nested_id)
-                resp, opts = execute_resource_request(:delete, url, params,
-                                                      opts)
-                Util.convert_to_stripe_object(resp.data, opts)
-              end
-          when :list
-            define_singleton_method(:"list_#{resource_plural}") \
+            request_stripe_object(
+              method: :delete,
+              path: send(resource_url_method, id, nested_id),
+              params: params,
+              opts: opts
+            )
+          end
+        when :list
+          define_singleton_method(:"list_#{resource_plural}") \
               do |id, params = {}, opts = {}|
-                url = send(resource_url_method, id)
-                resp, opts = execute_resource_request(:get, url, params, opts)
-                Util.convert_to_stripe_object(resp.data, opts)
-              end
-          else
-            raise ArgumentError, "Unknown operation: #{operation.inspect}"
+            request_stripe_object(
+              method: :get,
+              path: send(resource_url_method, id),
+              params: params,
+              opts: opts
+            )
           end
+        else
+          raise ArgumentError, "Unknown operation: #{operation.inspect}"
         end
       end
     end

lib/stripe/api_operations/request.rb

@@ -24,6 +24,11 @@ def execute_resource_request_stream(method, url,
           )
         end
 
+        private def request_stripe_object(method:, path:, params:, opts: {})
+          resp, opts = execute_resource_request(method, path, params, opts)
+          Util.convert_to_stripe_object_with_params(resp.data, params, opts)
+        end
+
         private def execute_resource_request_internal(client_request_method_sym,
                                                       method, url,
                                                       params, opts,
@@ -122,6 +127,11 @@ def self.included(base)
         )
       end
 
+      private def request_stripe_object(method:, path:, params:, opts: {})
+        resp, opts = execute_resource_request(method, path, params, opts)
+        Util.convert_to_stripe_object_with_params(resp.data, params, opts)
+      end
+
       # See notes on `alias` above.
       alias request execute_resource_request
     end

lib/stripe/api_operations/save.rb

@@ -24,9 +24,12 @@ def update(id, params = {}, opts = {})
             end
           end
 
-          resp, opts = execute_resource_request(:post, "#{resource_url}/#{id}",
-                                                params, opts)
-          Util.convert_to_stripe_object(resp.data, opts)
+          request_stripe_object(
+            method: :post,
+            path: "#{resource_url}/#{id}",
+            params: params,
+            opts: opts
+          )
         end
       end
 

lib/stripe/api_operations/search.rb

@@ -4,15 +4,12 @@ module Stripe
   module APIOperations
     module Search
       def _search(search_url, filters = {}, opts = {})
-        opts = Util.normalize_opts(opts)
-
-        resp, opts = execute_resource_request(:get, search_url, filters, opts)
-        obj = SearchResultObject.construct_from(resp.data, opts)
-
-        # set filters so that we can fetch the same limit and query
-        # when accessing the next page
-        obj.filters = filters.dup
-        obj
+        request_stripe_object(
+          method: :get,
+          path: search_url,
+          params: filters,
+          opts: opts
+        )
       end
     end
   end

lib/stripe/api_resource.rb

@@ -97,7 +97,7 @@ def request_stripe_object(method:, path:, params:, opts: {})
       if Util.object_name_matches_class?(resp.data[:object], self.class)
         initialize_from(resp.data, opts)
       else
-        Util.convert_to_stripe_object(resp.data, opts)
+        Util.convert_to_stripe_object_with_params(resp.data, params, opts)
       end
     end
 

lib/stripe/resources/account.rb

@@ -37,23 +37,21 @@ def reject(params = {}, opts = {})
     end
 
     def self.persons(account, params = {}, opts = {})
-      resp, opts = execute_resource_request(
-        :get,
-        format("/v1/accounts/%<account>s/persons", { account: CGI.escape(account) }),
-        params,
-        opts
+      request_stripe_object(
+        method: :get,
+        path: format("/v1/accounts/%<account>s/persons", { account: CGI.escape(account) }),
+        params: params,
+        opts: opts
       )
-      Util.convert_to_stripe_object(resp.data, opts)
     end
 
     def self.reject(account, params = {}, opts = {})
-      resp, opts = execute_resource_request(
-        :post,
-        format("/v1/accounts/%<account>s/reject", { account: CGI.escape(account) }),
-        params,
-        opts
+      request_stripe_object(
+        method: :post,
+        path: format("/v1/accounts/%<account>s/reject", { account: CGI.escape(account) }),
+        params: params,
+        opts: opts
       )
-      Util.convert_to_stripe_object(resp.data, opts)
     end
 
     save_nested_resource :external_account

lib/stripe/resources/apps/secret.rb

@@ -10,23 +10,21 @@ class Secret < APIResource
       OBJECT_NAME = "apps.secret"
 
       def self.delete_where(params = {}, opts = {})
-        resp, opts = execute_resource_request(
-          :post,
-          "/v1/apps/secrets/delete",
-          params,
-          opts
+        request_stripe_object(
+          method: :post,
+          path: "/v1/apps/secrets/delete",
+          params: params,
+          opts: opts
         )
-        Util.convert_to_stripe_object(resp.data, opts)
       end
 
       def self.find(params = {}, opts = {})
-        resp, opts = execute_resource_request(
-          :get,
-          "/v1/apps/secrets/find",
-          params,
-          opts
+        request_stripe_object(
+          method: :get,
+          path: "/v1/apps/secrets/find",
+          params: params,
+          opts: opts
         )
-        Util.convert_to_stripe_object(resp.data, opts)
       end
     end
   end

lib/stripe/resources/charge.rb

@@ -20,13 +20,12 @@ def capture(params = {}, opts = {})
     end
 
     def self.capture(charge, params = {}, opts = {})
-      resp, opts = execute_resource_request(
-        :post,
-        format("/v1/charges/%<charge>s/capture", { charge: CGI.escape(charge) }),
-        params,
-        opts
+      request_stripe_object(
+        method: :post,
+        path: format("/v1/charges/%<charge>s/capture", { charge: CGI.escape(charge) }),
+        params: params,
+        opts: opts
       )
-      Util.convert_to_stripe_object(resp.data, opts)
     end
 
     def self.search(params = {}, opts = {})

lib/stripe/resources/checkout/session.rb

@@ -22,13 +22,12 @@ def expire(params = {}, opts = {})
       end
 
       def self.expire(session, params = {}, opts = {})
-        resp, opts = execute_resource_request(
-          :post,
-          format("/v1/checkout/sessions/%<session>s/expire", { session: CGI.escape(session) }),
-          params,
-          opts
+        request_stripe_object(
+          method: :post,
+          path: format("/v1/checkout/sessions/%<session>s/expire", { session: CGI.escape(session) }),
+          params: params,
+          opts: opts
         )
-        Util.convert_to_stripe_object(resp.data, opts)
       end
     end
   end

lib/stripe/resources/credit_note.rb

@@ -19,23 +19,30 @@ def void_credit_note(params = {}, opts = {})
     end
 
     def self.void_credit_note(id, params = {}, opts = {})
-      resp, opts = execute_resource_request(
-        :post,
-        format("/v1/credit_notes/%<id>s/void", { id: CGI.escape(id) }),
-        params,
-        opts
+      request_stripe_object(
+        method: :post,
+        path: format("/v1/credit_notes/%<id>s/void", { id: CGI.escape(id) }),
+        params: params,
+        opts: opts
       )
-      Util.convert_to_stripe_object(resp.data, opts)
     end
 
     def self.preview(params, opts = {})
-      resp, opts = execute_resource_request(:get, resource_url + "/preview", params, opts)
-      Util.convert_to_stripe_object(resp.data, opts)
+      request_stripe_object(
+        method: :get,
+        path: resource_url + "/preview",
+        params: params,
+        opts: opts
+      )
     end
 
     def self.list_preview_line_items(params, opts = {})
-      resp, opts = execute_resource_request(:get, resource_url + "/preview/lines", params, opts)
-      Util.convert_to_stripe_object(resp.data, opts)
+      request_stripe_object(
+        method: :get,
+        path: resource_url + "/preview/lines",
+        params: params,
+        opts: opts
+      )
     end
   end
 end