Apply safe transformations from current codegen (#777)

lib/stripe/bank_account.rb

@@ -2,9 +2,9 @@
 
 module Stripe
   class BankAccount < APIResource
-    include Stripe::APIOperations::Save
     include Stripe::APIOperations::Delete
     extend Stripe::APIOperations::List
+    include Stripe::APIOperations::Save
 
     OBJECT_NAME = "bank_account".freeze
 

lib/stripe/card.rb

@@ -2,9 +2,9 @@
 
 module Stripe
   class Card < APIResource
-    include Stripe::APIOperations::Save
     include Stripe::APIOperations::Delete
     extend Stripe::APIOperations::List
+    include Stripe::APIOperations::Save
 
     OBJECT_NAME = "card".freeze
 

lib/stripe/charge.rb

@@ -2,8 +2,8 @@
 
 module Stripe
   class Charge < APIResource
-    extend Stripe::APIOperations::List
     extend Stripe::APIOperations::Create
+    extend Stripe::APIOperations::List
     include Stripe::APIOperations::Save
 
     OBJECT_NAME = "charge".freeze

lib/stripe/credit_note.rb

@@ -11,8 +11,7 @@ module Stripe
     custom_method :void_credit_note, http_verb: :post, http_path: "void"
 
     def void_credit_note(params = {}, opts = {})
-      url = resource_url + "/void"
-      resp, opts = request(:post, url, params, opts)
+      resp, opts = request(:post, resource_url + "/void", params, opts)
       initialize_from(resp.data, opts)
     end
   end

lib/stripe/dispute.rb

@@ -10,12 +10,14 @@ module Stripe
     custom_method :close, http_verb: :post
 
     def close(params = {}, opts = {})
-      resp, opts = request(:post, close_url, params, opts)
+      resp, opts = request(:post, resource_url + "/close", params, opts)
       initialize_from(resp.data, opts)
     end
 
     def close_url
       resource_url + "/close"
     end
+    extend Gem::Deprecate
+    deprecate :close_url, :none, 2019, 11
   end
 end

lib/stripe/invoice.rb

@@ -16,39 +16,33 @@ module Stripe
     custom_method :void_invoice, http_verb: :post, http_path: "void"
 
     def finalize_invoice(params = {}, opts = {})
-      url = resource_url + "/finalize"
-      resp, opts = request(:post, url, params, opts)
+      resp, opts = request(:post, resource_url + "/finalize", params, opts)
       initialize_from(resp.data, opts)
     end
 
     def mark_uncollectible(params = {}, opts = {})
-      url = resource_url + "/mark_uncollectible"
-      resp, opts = request(:post, url, params, opts)
+      resp, opts = request(:post, resource_url + "/mark_uncollectible", params, opts)
       initialize_from(resp.data, opts)
     end
 
     def pay(params = {}, opts = {})
-      url = resource_url + "/pay"
-      resp, opts = request(:post, url, params, opts)
+      resp, opts = request(:post, resource_url + "/pay", params, opts)
       initialize_from(resp.data, opts)
     end
 
     def send_invoice(params = {}, opts = {})
-      url = resource_url + "/send"
-      resp, opts = request(:post, url, params, opts)
+      resp, opts = request(:post, resource_url + "/send", params, opts)
+      initialize_from(resp.data, opts)
+    end
+
+    def void_invoice(params = {}, opts = {})
+      resp, opts = request(:post, resource_url + "/void", params, opts)
       initialize_from(resp.data, opts)
     end
 
     def self.upcoming(params, opts = {})
-      url = resource_url + "/upcoming"
-      resp, opts = request(:get, url, params, opts)
+      resp, opts = request(:get, resource_url + "/upcoming", params, opts)
       Util.convert_to_stripe_object(resp.data, opts)
     end
-
-    def void_invoice(params = {}, opts = {})
-      url = resource_url + "/void"
-      resp, opts = request(:post, url, params, opts)
-      initialize_from(resp.data, opts)
-    end
   end
 end

lib/stripe/payment_method.rb

@@ -12,14 +12,12 @@ module Stripe
     custom_method :detach, http_verb: :post
 
     def attach(params = {}, opts = {})
-      url = resource_url + "/attach"
-      resp, opts = request(:post, url, params, opts)
+      resp, opts = request(:post, resource_url + "/attach", params, opts)
       initialize_from(resp.data, opts)
     end
 
     def detach(params = {}, opts = {})
-      url = resource_url + "/detach"
-      resp, opts = request(:post, url, params, opts)
+      resp, opts = request(:post, resource_url + "/detach", params, opts)
       initialize_from(resp.data, opts)
     end
   end

lib/stripe/payout.rb

@@ -10,13 +10,15 @@ module Stripe
 
     custom_method :cancel, http_verb: :post
 
-    def cancel
-      resp, api_key = request(:post, cancel_url)
-      initialize_from(resp.data, api_key)
+    def cancel(params = {}, opts = {})
+      resp, opts = request(:post, resource_url + "/cancel", params, opts)
+      initialize_from(resp.data, opts)
     end
 
     def cancel_url
       resource_url + "/cancel"
     end
+    extend Gem::Deprecate
+    deprecate :cancel_url, :none, 2019, 11
   end
 end

lib/stripe/sku.rb

@@ -2,10 +2,10 @@
 
 module Stripe
   class SKU < APIResource
-    extend Stripe::APIOperations::List
     extend Stripe::APIOperations::Create
-    include Stripe::APIOperations::Save
     include Stripe::APIOperations::Delete
+    extend Stripe::APIOperations::List
+    include Stripe::APIOperations::Save
 
     OBJECT_NAME = "sku".freeze
   end

lib/stripe/tax_id.rb

@@ -2,8 +2,8 @@
 
 module Stripe
   class TaxId < APIResource
-    extend Stripe::APIOperations::List
     include Stripe::APIOperations::Delete
+    extend Stripe::APIOperations::List
 
     OBJECT_NAME = "tax_id".freeze
 

lib/stripe/topup.rb

@@ -10,9 +10,9 @@ module Stripe
 
     custom_method :cancel, http_verb: :post
 
-    def cancel
-      resp, api_key = request(:post, resource_url + "/cancel")
-      initialize_from(resp.data, api_key)
+    def cancel(params = {}, opts = {})
+      resp, opts = request(:post, resource_url + "/cancel", params, opts)
+      initialize_from(resp.data, opts)
     end
   end
 end

lib/stripe/usage_record.rb

@@ -2,13 +2,13 @@
 
 module Stripe
   class UsageRecord < APIResource
+    OBJECT_NAME = "usage_record".freeze
+
     def self.create(params = {}, opts = {})
       raise(ArgumentError, "Params must have a subscription_item key") unless params.key?(:subscription_item)
       req_params = params.clone.delete_if { |key, _value| key == :subscription_item }
       resp, opts = request(:post, "/v1/subscription_items/#{params[:subscription_item]}/usage_records", req_params, opts)
       Util.convert_to_stripe_object(resp.data, opts)
     end
-
-    OBJECT_NAME = "usage_record".freeze
   end
 end