From 0fc6ee5e5b5dda5ea86edd3e894f1f8eed5c8791 Mon Sep 17 00:00:00 2001
From: Tim Craft <mail@timcraft.com>
Date: Fri, 22 Aug 2014 19:43:13 +0100
Subject: [PATCH] Return self from Stripe::StripeObject#refresh_from

---
 lib/stripe/api_operations/delete.rb | 1 -
 lib/stripe/api_resource.rb          | 1 -
 lib/stripe/application_fee.rb       | 1 -
 lib/stripe/charge.rb                | 3 ---
 lib/stripe/invoice.rb               | 1 -
 lib/stripe/stripe_object.rb         | 6 +++---
 lib/stripe/transfer.rb              | 1 -
 7 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/lib/stripe/api_operations/delete.rb b/lib/stripe/api_operations/delete.rb
index 2d660884..92ae676f 100644
--- a/lib/stripe/api_operations/delete.rb
+++ b/lib/stripe/api_operations/delete.rb
@@ -4,7 +4,6 @@ module Stripe
       def delete(params = {})
         response, api_key = Stripe.request(:delete, url, @api_key, params)
         refresh_from(response, api_key)
-        self
       end
     end
   end
diff --git a/lib/stripe/api_resource.rb b/lib/stripe/api_resource.rb
index 4752faf9..d0c2e61c 100644
--- a/lib/stripe/api_resource.rb
+++ b/lib/stripe/api_resource.rb
@@ -21,7 +21,6 @@ module Stripe
     def refresh
       response, api_key = Stripe.request(:get, url, @api_key, @retrieve_options)
       refresh_from(response, api_key)
-      self
     end
 
     def self.retrieve(id, api_key=nil)
diff --git a/lib/stripe/application_fee.rb b/lib/stripe/application_fee.rb
index ff96c1f5..93137d03 100644
--- a/lib/stripe/application_fee.rb
+++ b/lib/stripe/application_fee.rb
@@ -9,7 +9,6 @@ module Stripe
     def refund(params={})
       response, api_key = Stripe.request(:post, refund_url, @api_key, params)
       refresh_from(response, api_key)
-      self
     end
 
     private
diff --git a/lib/stripe/charge.rb b/lib/stripe/charge.rb
index 53217512..256b1e7c 100644
--- a/lib/stripe/charge.rb
+++ b/lib/stripe/charge.rb
@@ -7,13 +7,11 @@ module Stripe
     def refund(params={})
       response, api_key = Stripe.request(:post, refund_url, @api_key, params)
       refresh_from(response, api_key)
-      self
     end
 
     def capture(params={})
       response, api_key = Stripe.request(:post, capture_url, @api_key, params)
       refresh_from(response, api_key)
-      self
     end
 
     def update_dispute(params)
@@ -25,7 +23,6 @@ module Stripe
     def close_dispute
       response, api_key = Stripe.request(:post, close_dispute_url, @api_key)
       refresh_from(response, api_key)
-      self
     end
 
     private
diff --git a/lib/stripe/invoice.rb b/lib/stripe/invoice.rb
index 316b1880..3359087b 100644
--- a/lib/stripe/invoice.rb
+++ b/lib/stripe/invoice.rb
@@ -12,7 +12,6 @@ module Stripe
     def pay
       response, api_key = Stripe.request(:post, pay_url, @api_key)
       refresh_from(response, api_key)
-      self
     end
 
     private
diff --git a/lib/stripe/stripe_object.rb b/lib/stripe/stripe_object.rb
index 077d59aa..8fbf1775 100644
--- a/lib/stripe/stripe_object.rb
+++ b/lib/stripe/stripe_object.rb
@@ -30,9 +30,7 @@ module Stripe
     end
 
     def self.construct_from(values, api_key=nil)
-      obj = self.new(values[:id], api_key)
-      obj.refresh_from(values, api_key)
-      obj
+      self.new(values[:id], api_key).refresh_from(values, api_key)
     end
 
     def to_s(*args)
@@ -68,6 +66,8 @@ module Stripe
         @transient_values.delete(k)
         @unsaved_values.delete(k)
       end
+
+      return self
     end
 
     def [](k)
diff --git a/lib/stripe/transfer.rb b/lib/stripe/transfer.rb
index aae073e0..4e6ad365 100644
--- a/lib/stripe/transfer.rb
+++ b/lib/stripe/transfer.rb
@@ -7,7 +7,6 @@ module Stripe
     def cancel
       response, api_key = Stripe.request(:post, cancel_url, @api_key)
       refresh_from(response, api_key)
-      self
     end
 
     def cancel_url