stripe 1.36.0 → 1.36.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f34746bb3a826f64477e8dff5c616665144fe56d
-  data.tar.gz: 82e4663d7d8b3392ed36b19969d1ada2afb05115
+  metadata.gz: 0c61dab0439a342a7b81c1891bcc86de16f1c2e2
+  data.tar.gz: d703323b3ea491f50c7b2e3af3022593a4eec0e5
 SHA512:
-  metadata.gz: bae160dd906dcd1e27be1aae953c53e39697ecf17c61baf75637a3e3b725ebc96cdadabc5c5c2025b5f940aff1f1e8952dff9314adc185754557101795a0f691
-  data.tar.gz: ffa399f6f15e8e166995855c370629969986ddfee49b8a36b8126248be40b01a04c8135a83bc23b284f0b279b416f7676a731e08b498c206aadf037996d593d8
+  metadata.gz: 3f1b8e24a436c7aca910b09c4b39789c754a65894f5db8d9e7f3986d4f0c16eb79db4688fe5e8e1662873997cb6a867f9e6c90d4ecc983321e521ca5691fadd6
+  data.tar.gz: 32c5d898c296c3a6b41e0aad9a306d5987a4ede989d3345326856ac5130dd67751faaf97d3551a884594b22c42e05063737518651ff83d81ad2f446533f76470

data/.travis.yml

@@ -9,7 +9,6 @@ rvm:
 
 gemfile:
   - gemfiles/default-with-activesupport.gemfile
-  - gemfiles/json.gemfile
   - gemfiles/yajl.gemfile
 
 matrix:

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.36.1 2016-03-04
+
+* Fix serialization when subhash given to `#save` or `#update_attributes`
+
 === 1.36.0 2016-02-08
 
 * Add `CountrySpec` model for looking up country payment information

data/{README.rdoc → README.md}

@@ -1,4 +1,4 @@
-= Stripe Ruby bindings {<img src="https://travis-ci.org/stripe/stripe-ruby.svg?branch=master" alt="Build Status" />}[https://travis-ci.org/stripe/stripe-ruby]
+# Stripe Ruby Bindings [![Build Status](https://travis-ci.org/stripe/stripe-ruby.png?branch=master)](https://travis-ci.org/stripe/stripe-ruby)
 
 The Stripe Ruby bindings provide a small SDK for convenient access to the
 Stripe API from applications written in the Ruby language. It provides a
@@ -15,38 +15,40 @@ The bindings also provide other features. For example:
 * Built-in mechanisms for the serialization of parameters according to the
   expectations of Stripe's API.
 
-== Documentation
+## Documentation
 
-{Ruby API Docs}[https://stripe.com/docs/api/ruby#intro]
+See the [Ruby API docs](https://stripe.com/docs/api/ruby#intro).
 
-== Installation
+## Installation
 
-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:
+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:
 
-  gem install stripe
+    gem install stripe
 
 If you want to build the gem from source:
 
-  gem build stripe.gemspec
+    gem build stripe.gemspec
 
-== Requirements
+## Requirements
 
 * Ruby 1.9.3 or above.
-* rest-client, json
+* rest-client
 
-== Bundler
+## Bundler
 
-If you are installing via bundler, you should be sure to use the https
-rubygems source in your Gemfile, as any gems fetched over http could potentially be
+If you are installing via bundler, you should be sure to use the https rubygems
+source in your Gemfile, as any gems fetched over http could potentially be
 compromised in transit and alter the code of gems fetched securely over https:
 
-  source 'https://rubygems.org'
+``` ruby
+source 'https://rubygems.org'
 
-  gem 'rails'
-  gem 'stripe'
+gem 'rails'
+gem 'stripe'
+```
 
-== Development
+## Development
 
 Run all tests:
 
@@ -64,20 +66,21 @@ Update bundled CA certificates from the [Mozilla cURL release][curl]:
 
     bundle exec rake update_certs
 
-== Configuration
+## Configuration
 
-=== ca_bundle_path
+### ca_bundle_path
 
 The location of a file containing a bundle of CA certificates. By default the
 library will use an included bundle that can successfully validate Stripe
 certificates.
 
-=== max_network_retries
+### max_network_retries
 
-When `max_network_retries` is set to a positive integer, stripe will retry requests that 
-fail on a network error.  Idempotency keys will be added to post and get requests to ensure the 
-safety of retrying.  There will be a short delay between each retry, with an exponential backoff
-algorithm used to determine the length of the delay.  Default value is 0.
+When `max_network_retries` is set to a positive integer, stripe will retry
+requests that fail on a network error. Idempotency keys will be added to post
+and get requests to ensure the safety of retrying. There will be a short delay
+between each retry, with an exponential backoff algorithm used to determine the
+length of the delay. Default value is 0.
 
 Example:
 

data/VERSION

@@ -1 +1 @@
-1.36.0
+1.36.1

data/bin/stripe-console

@@ -1,7 +1,14 @@
 #!/usr/bin/env ruby
-irb = RUBY_PLATFORM =~ /(:?mswin|mingw)/ ? 'irb.bat' : 'irb'
 
-libs =  " -r irb/completion"
-libs <<  " -r #{File.dirname(__FILE__) + '/../lib/stripe'}"
-puts "Loading stripe gem"
-exec "#{irb} #{libs} --simple-prompt"
+require 'irb'
+require 'irb/completion'
+
+require "#{File.dirname(__FILE__)}/../lib/stripe"
+
+# Config IRB to enable --simple-prompt and auto indent
+IRB.conf[:PROMPT_MODE] = :SIMPLE
+IRB.conf[:AUTO_INDENT] = true
+
+puts "Loaded gem 'stripe'"
+
+IRB.start

data/lib/stripe/api_operations/update.rb

@@ -17,7 +17,7 @@ module Stripe
         # Let the caller override the URL but avoid serializing it.
         req_url = params.delete(:req_url) || save_url
 
-        # We started unintentionally (sort of) allowing attributes send to
+        # We started unintentionally (sort of) allowing attributes sent to
         # +save+ to override values used during the update. So as not to break
         # the API, this makes that official here.
         update_attributes(params)

data/lib/stripe/application_fee.rb

@@ -9,7 +9,7 @@ module Stripe
     # If you don't need access to an updated fee object after the refund, it's
     # more performant to just call `fee.refunds.create` directly.
     def refund(params={}, opts={})
-      self.refunds.create
+      self.refunds.create(params, opts)
 
       # now that a refund has been created, we expect the state of this object
       # to change as well (i.e. `refunded` will now be `true`) so refresh it

data/lib/stripe/stripe_object.rb

@@ -152,6 +152,7 @@ module Stripe
         # the object has been reassigned
         # e.g. as object.key = {foo => bar}
         update = new_value
+        update = update.to_hash if update.is_a?(StripeObject)
         new_keys = update.keys.map(&:to_sym)
 
         # remove keys at the server, but not known locally

data/lib/stripe/version.rb

@@ -1,3 +1,3 @@
 module Stripe
-  VERSION = '1.36.0'
+  VERSION = '1.36.1'
 end

data/stripe.gemspec

@@ -14,7 +14,6 @@ spec = Gem::Specification.new do |s|
   s.license = 'MIT'
 
   s.add_dependency('rest-client', '~> 1.4')
-  s.add_dependency('json', '~> 1.8.1')
 
   s.add_development_dependency('mocha', '~> 0.13.2')
   s.add_development_dependency('shoulda', '~> 3.4.0')

data/test/stripe/api_resource_test.rb

@@ -652,10 +652,10 @@ module Stripe
           :display_name => nil,
         })
 
-        @mock.expects(:post).once.with("#{Stripe.api_base}/v1/accounts", nil, 'display_name=stripe').
+        @mock.expects(:post).once.with("#{Stripe.api_base}/v1/accounts", nil, 'display_name=stripe&metadata[key]=value').
           returns(make_response({"id" => "charge_id"}))
 
-        account.save(:display_name => 'stripe')
+        account.save(:display_name => 'stripe', :metadata => {:key => 'value' })
       end
     end
 
@@ -665,14 +665,14 @@ module Stripe
         Stripe.stubs(:max_network_retries).returns(2)
       end
 
-      should 'retry failed network requests if specified and raise if error persists' do        
+      should 'retry failed network requests if specified and raise if error persists' do
         Stripe.expects(:sleep_time).at_least_once.returns(0)
         @mock.expects(:post).times(3).with('https://api.stripe.com/v1/charges', nil, 'amount=50&currency=usd').raises(Errno::ECONNREFUSED.new)
-        
+
         err = assert_raises Stripe::APIConnectionError do
           Stripe::Charge.create(:amount => 50, :currency => 'usd', :card => { :number => nil })
         end   
-        assert_match(/Request was retried 2 times/, err.message)   
+        assert_match(/Request was retried 2 times/, err.message)
       end
 
       should 'retry failed network requests if specified and return successful response' do
@@ -687,11 +687,11 @@ module Stripe
 
       should 'not retry a SSLCertificateNotVerified error' do
         @mock.expects(:post).times(1).with('https://api.stripe.com/v1/charges', nil, 'amount=50&currency=usd').raises(RestClient::SSLCertificateNotVerified.new('message'))
-        
+
         err = assert_raises Stripe::APIConnectionError do
           Stripe::Charge.create(:amount => 50, :currency => 'usd', :card => { :number => nil })
-        end   
-        assert_no_match(/retried/, err.message)   
+        end
+        assert_no_match(/retried/, err.message)
       end
 
       should 'not add an idempotency key to GET requests' do

data/test/stripe/stripe_object_test.rb

@@ -45,10 +45,23 @@ module Stripe
     end
 
     should "recursively call to_hash on its values" do
+      # deep nested hash (when contained in an array) or StripeObject
       nested_hash = { :id => 7, :foo => 'bar' }
       nested = Stripe::StripeObject.construct_from(nested_hash)
-      obj = Stripe::StripeObject.construct_from({ :id => 1, :nested => nested, :list => [nested] })
-      expected_hash = { :id => 1, :nested => nested_hash, :list => [nested_hash] }
+
+      obj = Stripe::StripeObject.construct_from({
+        :id     => 1,
+        # simple hash that contains a StripeObject to help us test deep
+        # recursion
+        :nested => { :object => 'list', :data => [nested] },
+        :list   => [nested]
+      })
+
+      expected_hash = {
+        :id     => 1,
+        :nested => { :object => 'list', :data => [nested_hash] },
+        :list   => [nested_hash]
+      }
       assert_equal expected_hash, obj.to_hash
     end
 
@@ -71,6 +84,12 @@ module Stripe
       assert_equal "foo", obj.unknown
     end
 
+    should "#update_attributes with a hash" do
+      obj = Stripe::StripeObject.construct_from({})
+      obj.update_attributes(:metadata => { :foo => 'bar' })
+      assert_equal Stripe::StripeObject, obj.metadata.class
+    end
+
     should "warn that #refresh_from is deprecated" do
       old_stderr = $stderr
       $stderr = StringIO.new
@@ -183,5 +202,17 @@ module Stripe
       obj.foo = ["0-index", "1-index", "2-index"]
       assert_equal({}, Stripe::StripeObject.serialize_params(obj))
     end
+
+    should "#serialize_params with a StripeObject" do
+      obj = Stripe::StripeObject.construct_from({})
+
+      # using an #update_attributes will end up converting a Hash into a
+      # StripeObject
+      obj.metadata =
+        Stripe::StripeObject.construct_from({ :foo => 'bar' })
+
+      serialized = Stripe::StripeObject.serialize_params(obj)
+      assert_equal({ :foo => "bar" }, serialized[:metadata])
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stripe
 version: !ruby/object:Gem::Version
-  version: 1.36.0
+  version: 1.36.1
 platform: ruby
 authors:
 - Ross Boucher
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-08 00:00:00.000000000 Z
+date: 2016-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -25,20 +25,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.8.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.8.1
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -153,12 +139,11 @@ files:
 - Gemfile
 - History.txt
 - LICENSE
-- README.rdoc
+- README.md
 - Rakefile
 - VERSION
 - bin/stripe-console
 - gemfiles/default-with-activesupport.gemfile
-- gemfiles/json.gemfile
 - gemfiles/yajl.gemfile
 - lib/data/ca-certificates.crt
 - lib/stripe.rb

data/gemfiles/json.gemfile

@@ -1,5 +0,0 @@
-source "https://rubygems.org"
-gemspec :path => File.join(File.dirname(__FILE__), "..")
-
-gem 'activesupport'
-gem 'json'