stripe 1.30.0 → 1.30.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 061c68a3e8fbf7b2adfa0a93489b1b124b08cb37
-  data.tar.gz: 4fda58089700ad1f39ab8a084b09982679b4e9a1
+  metadata.gz: a744255415d993917d419962d5f1420b8daed37d
+  data.tar.gz: 1c9085d745949c729e3c9caa3e986d16c6373eda
 SHA512:
-  metadata.gz: b2f3f7dff2c30038b9608f825f542061eccb6461bb1c0a9bebfb754ac5d7031c00e4df16e0a753edf92c5934435dcd1bfe191dfd2bdd5744c67ffdc268f3e16c
-  data.tar.gz: b68dfc54c11b18e6081a5794c89d717812607f334c60744f7b0cf0ba2a65a337f8f0465c4e092471cb3709e30df8fc62267550b73d255857914b40c1d9f32c47
+  metadata.gz: 02b09d3707b1861f069cbd46124fe5c03aa86a44f47973a01315156056765404ddc54423b6479141f56cb1cd9ef28679dcfed3147d98e65d11835eb5622a275f
+  data.tar.gz: 1f7d8ccf6eac75aea02b7935587f8448d363601f92f1f5245ebb4639e6f9a6c9f71f0201c88a14d86a6e172dab79351088bd103ae47230718b18a47340dc9c17

data/History.txt

@@ -1,3 +1,8 @@
+=== 1.30.1 2015-10-10
+
+* Fix bug that prevent lists of hashes from being URI-encoded properly
+* Fix bug where filter conditions were not making it fast the first instantiated `ListObject`
+
 === 1.30.0 2015-10-09
 
 * Add `StripeObject#deleted?` for a reliable way to check whether an object is alive

data/VERSION

@@ -1 +1 @@
-1.30.0
+1.30.1

data/lib/stripe/api_operations/list.rb

@@ -8,9 +8,13 @@ module Stripe
         response, opts = request(:get, url, filters, opts)
         obj = ListObject.construct_from(response, opts)
 
-        # set a limit so that we can fetch the same number when accessing the
-        # next and previous pages
-        obj.limit = filters[:limit]
+        # set filters so that we can fetch the same limit, expansions, and
+        # predicates when accessing the next and previous pages
+        #
+        # just for general cleanliness, remove any paging options
+        obj.filters = filters.dup
+        obj.filters.delete(:ending_before)
+        obj.filters.delete(:starting_after)
 
         obj
       end

data/lib/stripe/list_object.rb

@@ -4,10 +4,10 @@ module Stripe
     include Stripe::APIOperations::List
     include Stripe::APIOperations::Request
 
-    # This accessor allows a `ListObject` to inherit a limit that was given to
-    # a predecessor. This allows consistent limits as a user pages through
-    # resources.
-    attr_accessor :limit
+    # This accessor allows a `ListObject` to inherit various filters that were
+    # given to a predecessor. This allows for things like consistent limits,
+    # expansions, and predicates as a user pages through resources.
+    attr_accessor :filters
 
     # An empty list object. This is returned from +next+ when we know that
     # there isn't a next page in order to replicate the behavior of the API
@@ -16,6 +16,11 @@ module Stripe
       ListObject.construct_from({ :data => [] }, opts)
     end
 
+    def initialize(*args)
+      super
+      self.filters = {}
+    end
+
     def [](k)
       case k
       when String, Symbol
@@ -75,10 +80,9 @@ module Stripe
       return self.class.empty_list(opts) if !has_more
       last_id = data.last.id
 
-      params = {
-        :limit          => limit, # may be nil
+      params = filters.merge({
         :starting_after => last_id,
-      }.merge(params)
+      }).merge(params)
 
       list(params, opts)
     end
@@ -90,10 +94,9 @@ module Stripe
     def previous_page(params={}, opts={})
       first_id = data.first.id
 
-      params = {
+      params = filters.merge({
         :ending_before => first_id,
-        :limit         => limit, # may be nil
-      }.merge(params)
+      }).merge(params)
 
       list(params, opts)
     end

data/lib/stripe/util.rb

@@ -127,11 +127,7 @@ module Stripe
         end
       end
 
-      # The #sort_by call here is mostly so that we can get some stability in
-      # our 1.8.7 test suite where Hash key order is not preserved.
-      #
-      # https://www.igvita.com/2009/02/04/ruby-19-internals-ordered-hash/
-      result.sort_by { |(k, _)| k }
+      result
     end
 
     def self.flatten_params_array(value, calculated_key)

data/lib/stripe/version.rb

@@ -1,3 +1,3 @@
 module Stripe
-  VERSION = '1.30.0'
+  VERSION = '1.30.1'
 end

data/test/stripe/account_test.rb

@@ -68,7 +68,7 @@ module Stripe
 
       @mock.expects(:post).
         once.
-        with('https://api.stripe.com/v1/accounts/acct_foo', nil, 'legal_entity[address][line1]=2+Three+Four&legal_entity[first_name]=Bob').
+        with('https://api.stripe.com/v1/accounts/acct_foo', nil, 'legal_entity[first_name]=Bob&legal_entity[address][line1]=2+Three+Four').
         returns(make_response(resp))
 
       a = Stripe::Account.retrieve('acct_foo')

data/test/stripe/list_object_test.rb

@@ -79,11 +79,20 @@ module Stripe
 
     should "fetch a next page through #next_page and respect limit" do
       list = TestListObject.construct_from({ :data => [{ :id => 1 }], :has_more => true })
-      list.limit = 3
-      @mock.expects(:get).once.with("#{Stripe.api_base}/things?limit=3&starting_after=1", nil, nil).
-        returns(make_response({ :data => [{ :id => 2 }], :has_more => false }))
+      list.filters = { :expand => ['data.source'], :limit => 3 }
+      @mock.expects(:get).with do |url, _, _|
+        # apparently URI.parse in 1.8.7 doesn't support query parameters ...
+        url, query = url.split("?")
+        u = URI.parse(url)
+        params = CGI.parse(query)
+        u.host == URI.parse(Stripe.api_base).host && u.path == "/things" && params == {
+          "expand[]"       => ["data.source"],
+          "limit"          => ["3"],
+          "starting_after" => ["1"],
+        }
+      end.returns(make_response({ :data => [{ :id => 2 }], :has_more => false }))
       next_list = list.next_page
-      assert_equal 3, next_list.limit
+      assert_equal({ :expand => ['data.source'], :limit => 3 }, next_list.filters)
     end
 
     should "fetch an empty page through #next_page" do
@@ -106,11 +115,20 @@ module Stripe
 
     should "fetch a next page through #previous_page and respect limit" do
       list = TestListObject.construct_from({ :data => [{ :id => 2 }] })
-      list.limit = 3
-      @mock.expects(:get).once.with("#{Stripe.api_base}/things?ending_before=2&limit=3", nil, nil).
-        returns(make_response({ :data => [{ :id => 1 }] }))
+      list.filters = { :expand => ['data.source'], :limit => 3 }
+      @mock.expects(:get).with do |url, _, _|
+        # apparently URI.parse in 1.8.7 doesn't support query parameters ...
+        url, query = url.split("?")
+        u = URI.parse(url)
+        params = CGI.parse(query)
+        u.host == URI.parse(Stripe.api_base).host && u.path == "/things" && params == {
+          "ending_before" => ["2"],
+          "expand[]"      => ["data.source"],
+          "limit"         => ["3"],
+        }
+      end.returns(make_response({ :data => [{ :id => 1 }] }))
       next_list = list.previous_page
-      assert_equal 3, next_list.limit
+      assert_equal({ :expand => ['data.source'], :limit => 3 }, next_list.filters)
     end
 
     #

data/test/stripe/metadata_test.rb

@@ -60,7 +60,7 @@ module Stripe
 
       if is_greater_than_ruby_1_9?
         check_metadata({:metadata => {:initial => 'true'}},
-                      'metadata[initial]=&metadata[uuid]=6735',
+                      'metadata[uuid]=6735&metadata[initial]=',
                       update_actions)
       end
     end

data/test/stripe/util_test.rb

@@ -3,13 +3,14 @@ require File.expand_path('../../test_helper', __FILE__)
 module Stripe
   class UtilTest < Test::Unit::TestCase
     should "#encode_parameters should prepare parameters for an HTTP request" do
-      params = {
-        :a => 3,
-        :b => "+foo?",
-        :c => "bar&baz",
-        :d => { :a => "a", :b => "b" },
-        :e => [0, 1],
-      }
+      # use array instead of hash for 1.8.7 ordering
+      params = [
+        [:a, 3],
+        [:b, "+foo?"],
+        [:c, "bar&baz"],
+        [:d, { :a => "a", :b => "b" }],
+        [:e, [0, 1]],
+      ]
       assert_equal(
         "a=3&b=%2Bfoo%3F&c=bar%26baz&d[a]=a&d[b]=b&e[]=0&e[]=1",
         Stripe::Util.encode_parameters(params)
@@ -25,21 +26,33 @@ module Stripe
     end
 
     should "#flatten_params should encode parameters according to Rails convention" do
-      params = {
-        :a => 3,
-        :b => "foo?",
-        :c => "bar&baz",
-        :d => { :a => "a", :b => "b" },
-        :e => [0, 1],
-      }
+      params = [
+        [:a, 3],
+        [:b, "foo?"],
+        [:c, "bar&baz"],
+        [:d, { :a => "a", :b => "b" }],
+        [:e, [0, 1]],
+        [:f, [
+          { :foo => "1", :bar => "2" },
+          { :foo => "3", :baz => "4" },
+        ]],
+      ]
       assert_equal([
-        ["a",    3],
-        ["b",    "foo?"],
-        ["c",    "bar&baz"],
-        ["d[a]", "a"],
-        ["d[b]", "b"],
-        ["e[]",  0],
-        ["e[]",  1],
+        ["a",        3],
+        ["b",        "foo?"],
+        ["c",        "bar&baz"],
+        ["d[a]",     "a"],
+        ["d[b]",     "b"],
+        ["e[]",      0],
+        ["e[]",      1],
+
+        # *The key here is the order*. In order to be properly interpreted as
+        # an array of hashes on the server, everything from a single hash must
+        # come in at once. A duplicate key in an array triggers a new element.
+        ["f[][foo]", "1"],
+        ["f[][bar]", "2"],
+        ["f[][foo]", "3"],
+        ["f[][baz]", "4"],
       ], Stripe::Util.flatten_params(params))
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stripe
 version: !ruby/object:Gem::Version
-  version: 1.30.0
+  version: 1.30.1
 platform: ruby
 authors:
 - Ross Boucher
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-09 00:00:00.000000000 Z
+date: 2015-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client