From eff920662ea40b5ec67083b82e7cc433770a62e6 Mon Sep 17 00:00:00 2001
From: Alex Rattray <rattrayalex@stripe.com>
Date: Wed, 29 May 2019 11:34:16 -0400
Subject: [PATCH] Some safe transformations from codegen

---
 lib/stripe/apple_pay_domain.rb  |  2 +-
 lib/stripe/bitcoin_receiver.rb  |  7 +++----
 lib/stripe/card.rb              |  9 +++------
 lib/stripe/invoice.rb           |  3 +--
 lib/stripe/issuing/card.rb      |  2 +-
 lib/stripe/order.rb             | 16 ++++------------
 lib/stripe/recipient.rb         |  2 +-
 lib/stripe/subscription_item.rb |  3 +--
 8 files changed, 15 insertions(+), 29 deletions(-)

diff --git a/lib/stripe/apple_pay_domain.rb b/lib/stripe/apple_pay_domain.rb
index 740f1f10..8666a1a2 100644
--- a/lib/stripe/apple_pay_domain.rb
+++ b/lib/stripe/apple_pay_domain.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
+# Domains registered for Apple Pay on the Web
 module Stripe
-  # Domains registered for Apple Pay on the Web
   class ApplePayDomain < APIResource
     extend Stripe::APIOperations::Create
     include Stripe::APIOperations::Delete
diff --git a/lib/stripe/bitcoin_receiver.rb b/lib/stripe/bitcoin_receiver.rb
index d30e1184..7303a412 100644
--- a/lib/stripe/bitcoin_receiver.rb
+++ b/lib/stripe/bitcoin_receiver.rb
@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
+# Directly creating or retrieving BitcoinReceivers is deprecated. Please use
+# the Sources API instead: https://stripe.com/docs/sources/bitcoin
 module Stripe
   class BitcoinReceiver < APIResource
-    # Directly creating or retrieving BitcoinReceivers is deprecated. Please use
-    # the Sources API instead: https://stripe.com/docs/sources/bitcoin
     extend Stripe::APIOperations::List
 
     OBJECT_NAME = "bitcoin_receiver".freeze
@@ -14,8 +14,7 @@ module Stripe
 
     def resource_url
       if respond_to?(:customer) && !customer.nil? && customer != ""
-        "#{Customer.resource_url}/#{CGI.escape(customer)}/sources" \
-        "/#{CGI.escape(id)}"
+        "#{Customer.resource_url}/#{CGI.escape(customer)}/sources/#{CGI.escape(id)}"
       else
         "#{self.class.resource_url}/#{CGI.escape(id)}"
       end
diff --git a/lib/stripe/card.rb b/lib/stripe/card.rb
index b0b5807c..194ad2cc 100644
--- a/lib/stripe/card.rb
+++ b/lib/stripe/card.rb
@@ -10,14 +10,11 @@ module Stripe
 
     def resource_url
       if respond_to?(:recipient) && !recipient.nil? && !recipient.empty?
-        "#{Recipient.resource_url}/#{CGI.escape(recipient)}/cards" \
-        "/#{CGI.escape(id)}"
+        "#{Recipient.resource_url}/#{CGI.escape(recipient)}/cards/#{CGI.escape(id)}"
       elsif respond_to?(:customer) && !customer.nil? && !customer.empty?
-        "#{Customer.resource_url}/#{CGI.escape(customer)}/sources" \
-        "/#{CGI.escape(id)}"
+        "#{Customer.resource_url}/#{CGI.escape(customer)}/sources/#{CGI.escape(id)}"
       elsif respond_to?(:account) && !account.nil? && !account.empty?
-        "#{Account.resource_url}/#{CGI.escape(account)}/external_accounts" \
-        "/#{CGI.escape(id)}"
+        "#{Account.resource_url}/#{CGI.escape(account)}/external_accounts/#{CGI.escape(id)}"
       end
     end
 
diff --git a/lib/stripe/invoice.rb b/lib/stripe/invoice.rb
index b9986e78..dfee9f9a 100644
--- a/lib/stripe/invoice.rb
+++ b/lib/stripe/invoice.rb
@@ -21,8 +21,7 @@ module Stripe
     end
 
     def mark_uncollectible(params = {}, opts = {})
-      resp, opts = request(:post, resource_url + "/mark_uncollectible", params,
-                           opts)
+      resp, opts = request(:post, resource_url + "/mark_uncollectible", params, opts)
       initialize_from(resp.data, opts)
     end
 
diff --git a/lib/stripe/issuing/card.rb b/lib/stripe/issuing/card.rb
index ba38e5dd..c24ee662 100644
--- a/lib/stripe/issuing/card.rb
+++ b/lib/stripe/issuing/card.rb
@@ -13,7 +13,7 @@ module Stripe
 
       def details(params = {}, opts = {})
         resp, opts = request(:get, resource_url + "/details", params, opts)
-        Util.convert_to_stripe_object(resp.data, opts)
+        initialize_from(resp.data, opts)
       end
     end
   end
diff --git a/lib/stripe/order.rb b/lib/stripe/order.rb
index a6eda3e7..62367c4e 100644
--- a/lib/stripe/order.rb
+++ b/lib/stripe/order.rb
@@ -12,21 +12,13 @@ module Stripe
     custom_method :return_order, http_verb: :post, http_path: "returns"
 
     def pay(params = {}, opts = {})
-      resp, opts = request(:post, pay_url, params, opts)
+      resp, opts = request(:post, resource_url + "/pay", params, opts)
       initialize_from(resp.data, opts)
     end
 
-    def return_order(params, opts = {})
-      resp, opts = request(:post, returns_url, params, opts)
-      Util.convert_to_stripe_object(resp.data, opts)
-    end
-
-    private def pay_url
-      resource_url + "/pay"
-    end
-
-    private def returns_url
-      resource_url + "/returns"
+    def return_order(params = {}, opts = {})
+      resp, opts = request(:post, resource_url + "/returns", params, opts)
+      initialize_from(resp.data, opts)
     end
   end
 end
diff --git a/lib/stripe/recipient.rb b/lib/stripe/recipient.rb
index 9efd4071..bd17ce5a 100644
--- a/lib/stripe/recipient.rb
+++ b/lib/stripe/recipient.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
+# Recipients objects are deprecated. Please use Stripe Connect instead.
 module Stripe
-  # Recipients objects are deprecated. Please use Stripe Connect instead.
   class Recipient < APIResource
     extend Stripe::APIOperations::Create
     include Stripe::APIOperations::Delete
diff --git a/lib/stripe/subscription_item.rb b/lib/stripe/subscription_item.rb
index 33d625ee..99bd624b 100644
--- a/lib/stripe/subscription_item.rb
+++ b/lib/stripe/subscription_item.rb
@@ -10,8 +10,7 @@ module Stripe
     OBJECT_NAME = "subscription_item".freeze
 
     def usage_record_summaries(params = {}, opts = {})
-      resp, opts = request(:get, resource_url + "/usage_record_summaries",
-                           params, opts)
+      resp, opts = request(:get, resource_url + "/usage_record_summaries", params, opts)
       Util.convert_to_stripe_object(resp.data, opts)
     end
   end