stripe 1.8.2 → 1.8.3

data/History.txt

@@ -1,3 +1,8 @@
+=== 1.8.3 2013-05-06
+
+* 1 bugfix:
+  * Fix handling of per-call API keys (github issue #67)
+
 === 1.8.2 2013-05-01
 
 * 3 minor enhancement:

data/VERSION

@@ -1 +1 @@
-1.8.2
+1.8.3

data/lib/stripe.rb

@@ -91,7 +91,7 @@ module Stripe
       payload = uri_encode(params)
     end
 
-    request_opts.update(:headers => request_headers.update(headers),
+    request_opts.update(:headers => request_headers(api_key).update(headers),
                         :method => method, :open_timeout => 30,
                         :payload => payload, :url => url, :timeout => 80)
 
@@ -117,7 +117,7 @@ module Stripe
       handle_restclient_error(e)
     end
 
-    parse(response)
+    [parse(response), api_key]
   end
 
   private
@@ -165,7 +165,7 @@ module Stripe
       map { |k,v| "#{k}=#{Util.url_encode(v)}" }.join('&')
   end
 
-  def self.request_headers
+  def self.request_headers(api_key)
     headers = {
       :user_agent => "Stripe/v1 RubyBindings/#{Stripe::VERSION}",
       :authorization => "Bearer #{api_key}",
@@ -195,7 +195,7 @@ module Stripe
       raise general_api_error(response.code, response.body)
     end
 
-    [Util.symbolize_names(response), api_key]
+    Util.symbolize_names(response)
   end
 
   def self.general_api_error(rcode, rbody)

data/lib/stripe/version.rb

@@ -1,3 +1,3 @@
 module Stripe
-  VERSION = '1.8.2'
+  VERSION = '1.8.3'
 end

data/test/test_stripe.rb

@@ -111,6 +111,52 @@ class TestStripeRuby < Test::Unit::TestCase
       end
     end
 
+    context "when specifying per-object credentials" do
+      context "with no global API key set" do
+        should "use the per-object credential when creating" do
+          Stripe.expects(:execute_request).with do |opts|
+            opts[:headers][:authorization] == 'Bearer sk_test_local'
+          end.returns(test_response(test_charge))
+
+          Stripe::Charge.create({:card => {:number => '4242424242424242'}},
+            'sk_test_local')
+        end
+      end
+
+      context "with a global API key set" do
+        setup do
+          Stripe.api_key = "global"
+        end
+
+        teardown do
+          Stripe.api_key = nil
+        end
+
+        should "use the per-object credential when creating" do
+          Stripe.expects(:execute_request).with do |opts|
+            opts[:headers][:authorization] == 'Bearer local'
+          end.returns(test_response(test_charge))
+
+          Stripe::Charge.create({:card => {:number => '4242424242424242'}},
+            'local')
+        end
+
+        should "use the per-object credential when retrieving and making other calls" do
+          Stripe.expects(:execute_request).with do |opts|
+            opts[:url] == "#{Stripe.api_base}/v1/charges/ch_test_charge" &&
+              opts[:headers][:authorization] == 'Bearer local'
+          end.returns(test_response(test_charge))
+          Stripe.expects(:execute_request).with do |opts|
+            opts[:url] == "#{Stripe.api_base}/v1/charges/ch_test_charge/refund" &&
+              opts[:headers][:authorization] == 'Bearer local'
+          end.returns(test_response(test_charge))
+
+          ch = Stripe::Charge.retrieve('ch_test_charge', 'local')
+          ch.refund
+        end
+      end
+    end
+
     context "with valid credentials" do
       setup do
         Stripe.api_key="foo"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stripe
 version: !ruby/object:Gem::Version
-  version: 1.8.2
+  version: 1.8.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-01 00:00:00.000000000 Z
+date: 2013-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client