stripe 1.7.2 → 1.7.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    stripe (1.7.2)
+    stripe (1.7.3)
       multi_json (~> 1.1)
       rest-client (~> 1.4)
 

data/History.txt

@@ -1,3 +1,12 @@
+=== 1.7.3 2012-09-14
+
+* Make sure that both keys and values of GET params are
+  URL-encoded. NOTE: If you were previously URL-encoding values
+  yourself, you may need to adjust your code.
+* URL-encode POST params directly, instead of allowing rest-client to
+  do it to work around an unfortunate interaction with the hashery gem
+  (github issue #38)
+
 === 1.7.2 2012-08-31
 
 * Add support for new pay and update methods for Invoice objects

data/README.rdoc

@@ -5,11 +5,11 @@
 You don't need this source code unless you want to modify the gem. If
 you just want to use the Stripe Ruby bindings, you should run:
 
-  sudo gem install --source https://code.stripe.com stripe
+  gem install --source https://code.stripe.com stripe
 
 If you want to build the gem from source:
 
-  sudo gem build stripe.gemspec
+  gem build stripe.gemspec
 
 == Requirements
 

data/VERSION

@@ -1 +1 @@
-1.7.2
+1.7.3

data/lib/stripe.rb

@@ -116,12 +116,12 @@ module Stripe
     when :get, :head, :delete
       # Make params into GET parameters
       if params && params.count
-        query_string = Util.flatten_params(params).collect{|p| "#{p[0]}=#{p[1]}"}.join('&')
+        query_string = Util.flatten_params(params).collect{|key, value| "#{key}=#{Util.url_encode(value)}"}.join('&')
         url += "?#{query_string}"
       end
       payload = nil
     else
-      payload = params
+      payload = Util.flatten_params(params).collect{|(key, value)| "#{key}=#{Util.url_encode(value)}"}.join('&')
     end
 
     begin
@@ -135,7 +135,8 @@ module Stripe
 
     headers = {
       :user_agent => "Stripe/v1 RubyBindings/#{Stripe::VERSION}",
-      :authorization => "Bearer #{api_key}"
+      :authorization => "Bearer #{api_key}",
+      :content_type => 'application/x-www-form-urlencoded'
     }.merge(headers)
     opts = {
       :method => method,

data/lib/stripe/util.rb

@@ -67,14 +67,14 @@ module Stripe
       end
     end
 
-    def self.encode_key(key)
+    def self.url_encode(key)
       URI.escape(key.to_s, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
     end
 
     def self.flatten_params(params, parent_key=nil)
       result = []
       params.each do |key, value|
-        calculated_key = parent_key ? "#{parent_key}[#{encode_key(key)}]" : encode_key(key)
+        calculated_key = parent_key ? "#{parent_key}[#{url_encode(key)}]" : url_encode(key)
         if value.is_a?(Hash)
           result += flatten_params(value, calculated_key)
         elsif value.is_a?(Array)

data/lib/stripe/version.rb

@@ -1,3 +1,3 @@
 module Stripe
-  VERSION = '1.7.2'
+  VERSION = '1.7.3'
 end

data/test/test_stripe.rb

@@ -113,6 +113,13 @@ class TestStripeRuby < Test::Unit::TestCase
         Stripe.api_key=nil
       end
 
+      should "urlencode values in GET params" do
+        response = test_response(test_charge_array)
+        @mock.expects(:get).with('https://api.stripe.com/v1/charges?customer=test%20customer', nil, nil).returns(response)
+        charges = Stripe::Charge.all(:customer => 'test customer').data
+        assert charges.kind_of? Array
+      end
+
       should "a 400 should give an InvalidRequestError with http status, body, and JSON body" do
         response = test_response(test_missing_id_error, 400)
         @mock.expects(:get).once.raises(RestClient::ExceptionWithResponse.new(response, 404))
@@ -170,7 +177,9 @@ class TestStripeRuby < Test::Unit::TestCase
         end.returns(test_response({ :count => 1, :data => [test_charge] }))
         c = Stripe::Charge.all(:count => nil, :offset => 5, :sad => false)
 
-        @mock.expects(:post).with('https://api.stripe.com/v1/charges', nil, { :amount => 50, :currency => 'usd', :card => {} }).returns(test_response({ :count => 1, :data => [test_charge] }))
+        @mock.expects(:post).with do |url, api_key, params|
+          url == 'https://api.stripe.com/v1/charges' && api_key.nil? && CGI.parse(params) == { 'amount' => ['50'], 'currency' => ['usd'] }
+        end.returns(test_response({ :count => 1, :data => [test_charge] }))
         c = Stripe::Charge.create(:amount => 50, :currency => 'usd', :card => { :number => nil })
       end
 
@@ -194,7 +203,9 @@ class TestStripeRuby < Test::Unit::TestCase
 
       should "making a POST request with parameters should have a body and no query string" do
         params = { :amount => 100, :currency => 'usd', :card => 'sc_token' }
-        @mock.expects(:post).once.with { |url, get, post| get.nil? and post == params }.returns(test_response(test_charge))
+        @mock.expects(:post).once.with do |url, get, post|
+          get.nil? && CGI.parse(post) == {'amount' => ['100'], 'currency' => ['usd'], 'card' => ['sc_token']}
+        end.returns(test_response(test_charge))
         c = Stripe::Charge.create(params)
       end
 
@@ -221,7 +232,9 @@ class TestStripeRuby < Test::Unit::TestCase
       end
 
       should "updating an object should issue a POST request with only the changed properties" do
-        @mock.expects(:post).with("https://api.stripe.com/v1/customers/c_test_customer", nil, {:mnemonic => 'another_mn'}).once.returns(test_response(test_customer))
+        @mock.expects(:post).with do |url, api_key, params|
+          url == "https://api.stripe.com/v1/customers/c_test_customer" && api_key.nil? && CGI.parse(params) == {'mnemonic' => ['another_mn']}
+        end.once.returns(test_response(test_customer))
         c = Stripe::Customer.construct_from(test_customer)
         c.mnemonic = "another_mn"
         c.save
@@ -314,10 +327,14 @@ class TestStripeRuby < Test::Unit::TestCase
         end
 
         should "execute should return a new, fully executed charge when passed correct parameters" do
-          @mock.expects(:post).with('https://api.stripe.com/v1/charges', nil, {
-            :currency => 'usd', :amount => 100,
-            :card => {:exp_year => 2012, :number => '4242424242424242', :exp_month => 11}
-          }).once.returns(test_response(test_charge))
+          @mock.expects(:post).with do |url, api_key, params|
+            url == 'https://api.stripe.com/v1/charges' && api_key.nil? && CGI.parse(params) == {
+              'currency' => ['usd'], 'amount' => ['100'],
+              'card[exp_year]' => ['2012'],
+              'card[number]' => ['4242424242424242'],
+              'card[exp_month]' => ['11']
+            }
+          end.once.returns(test_response(test_charge))
 
           c = Stripe::Charge.create({
             :amount => 100,
@@ -375,7 +392,9 @@ class TestStripeRuby < Test::Unit::TestCase
           @mock.expects(:get).once.returns(test_response(test_customer))
           c = Stripe::Customer.retrieve("test_customer")
 
-          @mock.expects(:post).once.with("https://api.stripe.com/v1/customers/c_test_customer/subscription", nil, {:plan => 'silver'}).returns(test_response(test_subscription('silver')))
+          @mock.expects(:post).once.with do |url, api_key, params|
+            url == "https://api.stripe.com/v1/customers/c_test_customer/subscription" && api_key.nil? && CGI.parse(params) == {'plan' => ['silver']}
+          end.returns(test_response(test_subscription('silver')))
           s = c.update_subscription({:plan => 'silver'})
 
           assert_equal 'subscription', s.object

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: stripe
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 1
   - 7
-  - 2
-  version: 1.7.2
+  - 3
+  version: 1.7.3
 platform: ruby
 authors: 
 - Ross Boucher
@@ -16,12 +16,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-31 00:00:00 Z
+date: 2012-09-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  name: rest-client
   prerelease: false
+  name: rest-client
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -33,10 +32,10 @@ dependencies:
         - 4
         version: "1.4"
   requirement: *id001
-- !ruby/object:Gem::Dependency 
   type: :runtime
-  name: multi_json
+- !ruby/object:Gem::Dependency 
   prerelease: false
+  name: multi_json
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -48,10 +47,10 @@ dependencies:
         - 1
         version: "1.1"
   requirement: *id002
+  type: :runtime
 - !ruby/object:Gem::Dependency 
-  type: :development
-  name: mocha
   prerelease: false
+  name: mocha
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -62,10 +61,10 @@ dependencies:
         - 0
         version: "0"
   requirement: *id003
-- !ruby/object:Gem::Dependency 
   type: :development
-  name: shoulda
+- !ruby/object:Gem::Dependency 
   prerelease: false
+  name: shoulda
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -76,10 +75,10 @@ dependencies:
         - 0
         version: "0"
   requirement: *id004
-- !ruby/object:Gem::Dependency 
   type: :development
-  name: test-unit
+- !ruby/object:Gem::Dependency 
   prerelease: false
+  name: test-unit
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -90,10 +89,10 @@ dependencies:
         - 0
         version: "0"
   requirement: *id005
-- !ruby/object:Gem::Dependency 
   type: :development
-  name: rake
+- !ruby/object:Gem::Dependency 
   prerelease: false
+  name: rake
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -104,6 +103,7 @@ dependencies:
         - 0
         version: "0"
   requirement: *id006
+  type: :development
 description: Stripe is the easiest way to accept payments online.  See https://stripe.com for details.
 email: 
 - boucher@stripe.com
@@ -193,7 +193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Ruby bindings for the Stripe API