stripe 3.5.2 → 3.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37fac5005ed9a37c3996413717db00c9308bd1a2
-  data.tar.gz: 97f90fd989e7735522947754e60237ceb238c822
+  metadata.gz: 31bc202ae773c518a1f9d9382b08c76df41d4252
+  data.tar.gz: 0a8007b7d10c5c4a7cc4f8721553f58042e7ee9b
 SHA512:
-  metadata.gz: b2d32411c530bb4b43c4c3313f0ed2867b2f1dfa0bade82185d155eaf5ec23a08f2e4d327278116d0e9045fe3b88f9d666a8f56367e6af2a42733610885c633b
-  data.tar.gz: 942c93711ce7de11108f2c9721af9a4dfdecdbb73714c3abdcf6f87cc42e2ac61f18f0e76059a5e318517f29c3c1c7c21221434db5afd2f0c79581a4c4ef4a1c
+  metadata.gz: 82412fadaa6d945c754cd1712eebad95cb6fc5ab35564ae7878e1c3d7095e4794821fc44119a45c0bd15c52818301c110b33964665c6fb741c2affd5d08237f1
+  data.tar.gz: cd2a601d172ae2a1eabf23616832d40716eebdea2c00e101a51419e9f06021463aa4abdb6776e6089df47d163ac87bd9659028e198d8da1e2bd2fb0495e5ba2a

data/.rubocop_todo.yml

@@ -38,7 +38,7 @@ Metrics/MethodLength:
 # Offense count: 1
 # Configuration parameters: CountComments.
 Metrics/ModuleLength:
-  Max: 298
+  Max: 302
 
 # Offense count: 5
 # Configuration parameters: CountKeywordArgs.

data/CHANGELOG.md

@@ -1,17 +1,23 @@
 # Changelog
 
+## 3.5.3 - 2017-10-16
+* [#594](https://github.com/stripe/stripe-ruby#594) Make sure that `StripeObject`'s `#deep_copy` maintains original class
+* [#595](https://github.com/stripe/stripe-ruby#595) Allow `Object#method` to be called on `StripeObject` even if it conflicts with an accessor
+* [#596](https://github.com/stripe/stripe-ruby#596) Encode arrays as integer-indexed hashes where appropriate
+* [#598](https://github.com/stripe/stripe-ruby#598) Don't persist `idempotency_key` opt between requests
+
 ## 3.5.2 - 2017-10-13
 * [#592](https://github.com/stripe/stripe-ruby#592) Bring back `Marshal.dump/load` support with custom marshal encoder/decoder
 
 ## 3.5.1 - 2017-10-12
-* [#591](https://github.com/stripe/stripe-dotnet#591) Use thread-local `StripeClient` instances for thread safety
+* [#591](https://github.com/stripe/stripe-ruby#591) Use thread-local `StripeClient` instances for thread safety
 
 ## 3.5.0 - 2017-10-11
-* [#589](https://github.com/stripe/stripe-dotnet#589) Rename source `delete` to `detach` (and deprecate the former)
+* [#589](https://github.com/stripe/stripe-ruby#589) Rename source `delete` to `detach` (and deprecate the former)
 
 ## 3.4.1 - 2017-10-05
-* [#586](https://github.com/stripe/stripe-dotnet#586) Log query strings as well as form bodies with STRIPE_LOG
-* [#588](https://github.com/stripe/stripe-dotnet#588) Require minimum Faraday 0.10 for bug fix in parameter encoding
+* [#586](https://github.com/stripe/stripe-ruby#586) Log query strings as well as form bodies with STRIPE_LOG
+* [#588](https://github.com/stripe/stripe-ruby#588) Require minimum Faraday 0.10 for bug fix in parameter encoding
 
 ## 3.4.0 - 2017-09-20
 * Mark legacy Bitcoin API as deprecated, and remove corresponding tests

data/VERSION

@@ -1 +1 @@
-3.5.2
+3.5.3

data/lib/stripe.rb

@@ -1,15 +1,15 @@
 # Stripe Ruby bindings
 # API spec at https://stripe.com/docs/api
 require "cgi"
+require "faraday"
+require "json"
 require "logger"
 require "openssl"
 require "rbconfig"
 require "securerandom"
 require "set"
 require "socket"
-
-require "faraday"
-require "json"
+require "uri"
 
 # Version
 require "stripe/version"

data/lib/stripe/api_operations/request.rb

@@ -23,7 +23,7 @@ module Stripe
           # Hash#select returns an array before 1.9
           opts_to_persist = {}
           opts.each do |k, v|
-            opts_to_persist[k] = v if Util::OPTS_KEYS_TO_PERSIST.include?(k)
+            opts_to_persist[k] = v if Util::OPTS_PERSISTABLE.include?(k)
           end
 
           [resp, opts_to_persist]

data/lib/stripe/invoice.rb

@@ -7,6 +7,7 @@ module Stripe
     OBJECT_NAME = "invoice".freeze
 
     def self.upcoming(params, opts = {})
+      params[:subscription_items] = Util.array_to_hash(params[:subscription_items]) if params[:subscription_items]
       resp, opts = request(:get, upcoming_url, params, opts)
       Util.convert_to_stripe_object(resp.data, opts)
     end

data/lib/stripe/order.rb

@@ -12,10 +12,16 @@ module Stripe
     end
 
     def return_order(params, opts = {})
+      params[:items] = Util.array_to_hash(params[:items]) if params[:items]
       resp, opts = request(:post, returns_url, params, opts)
       Util.convert_to_stripe_object(resp.data, opts)
     end
 
+    def self.create(params = {}, opts = {})
+      params[:items] = Util.array_to_hash(params[:items]) if params[:items]
+      super(params, opts)
+    end
+
     private
 
     def pay_url

data/lib/stripe/stripe_object.rb

@@ -241,7 +241,16 @@ module Stripe
           next if protected_fields.include?(k)
           next if @@permanent_attributes.include?(k)
 
-          define_method(k) { @values[k] }
+          if k == :method
+            # Object#method is a built-in Ruby method that accepts a symbol
+            # and returns the corresponding Method object. Because the API may
+            # also use `method` as a field name, we check the arity of *args
+            # to decide whether to act as a getter or call the parent method.
+            define_method(k) { |*args| args.empty? ? @values[k] : super(*args) }
+          else
+            define_method(k) { @values[k] }
+          end
+
           define_method(:"#{k}=") do |v|
             if v == ""
               raise ArgumentError, "You cannot set #{k} to an empty string. " \
@@ -427,7 +436,7 @@ module Stripe
           copy
         end
       when StripeObject
-        StripeObject.construct_from(
+        obj.class.construct_from(
           deep_copy(obj.instance_variable_get(:@values)),
           obj.instance_variable_get(:@opts).select do |k, _v|
             Util::OPTS_COPYABLE.include?(k)

data/lib/stripe/subscription.rb

@@ -24,6 +24,16 @@ module Stripe
       super(params, opts)
     end
 
+    def serialize_params(options = {})
+      update_hash = super
+      if @unsaved_values.include?(:items)
+        value = Util.array_to_hash(@values[:items])
+        update_hash[:items] =
+          serialize_params_value(value, nil, true, options[:force], key: :items)
+      end
+      update_hash
+    end
+
     private
 
     def discount_url

data/lib/stripe/util.rb

@@ -12,11 +12,15 @@ module Stripe
 
     # Options that should be copyable from one StripeObject to another
     # including options that may be internal.
-    OPTS_COPYABLE = (OPTS_USER_SPECIFIED + Set[:api_base]).freeze
+    OPTS_COPYABLE = (
+      OPTS_USER_SPECIFIED + Set[:api_base]
+    ).freeze
 
     # Options that should be persisted between API requests. This includes
     # client, which is an object containing an HTTP client to reuse.
-    OPTS_KEYS_TO_PERSIST = (OPTS_USER_SPECIFIED + Set[:client]).freeze
+    OPTS_PERSISTABLE = (
+      OPTS_USER_SPECIFIED + Set[:client] - Set[:idempotency_key]
+    ).freeze
 
     def self.objects_to_ids(h)
       case h

data/lib/stripe/version.rb

@@ -1,3 +1,3 @@
 module Stripe
-  VERSION = "3.5.2".freeze
+  VERSION = "3.5.3".freeze
 end

data/test/stripe/stripe_object_test.rb

@@ -104,6 +104,15 @@ module Stripe
         assert_equal opts.reject { |k, _v| k == :client },
                      copy_obj.instance_variable_get(:@opts)
       end
+
+      should "return an instance of the same class" do
+        class TestObject < Stripe::StripeObject; end
+
+        obj = TestObject.construct_from(id: 1)
+        copy_obj = obj.class.send(:deep_copy, obj)
+
+        assert_equal obj.class, copy_obj.class
+      end
     end
 
     should "recursively call to_hash on its values" do
@@ -423,5 +432,17 @@ module Stripe
       expected_hash = { api_key: "apikey" }
       assert_equal expected_hash, m.instance_variable_get("@opts")
     end
+
+    context "#method" do
+      should "act as a getter if no arguments are provided" do
+        obj = Stripe::StripeObject.construct_from(id: 1, method: "foo")
+        assert_equal "foo", obj.method
+      end
+
+      should "call Object#method if an argument is provided" do
+        obj = Stripe::StripeObject.construct_from(id: 1, method: "foo")
+        assert obj.method(:id).is_a?(Method)
+      end
+    end
   end
 end

data/test/stripe/subscription_test.rb

@@ -54,5 +54,51 @@ module Stripe
         assert subscription.is_a?(Stripe::Subscription)
       end
     end
+
+    context "#serialize_params" do
+      should "serialize when items is set to an Array" do
+        obj = Stripe::Util.convert_to_stripe_object({
+          object: "subscription",
+          items: Stripe::Util.convert_to_stripe_object(
+            object: "list",
+            data: []
+          ),
+        }, {})
+        obj.items = [
+          { id: "si_foo", deleted: true },
+          { plan: "plan_bar" },
+        ]
+
+        expected = {
+          items: {
+            :"0" => { id: "si_foo", deleted: true },
+            :"1" => { plan: "plan_bar" },
+          },
+        }
+        assert_equal(expected, obj.serialize_params)
+      end
+
+      should "serialize when items is set to a Hash" do
+        obj = Stripe::Util.convert_to_stripe_object({
+          object: "subscription",
+          items: Stripe::Util.convert_to_stripe_object(
+            object: "list",
+            data: []
+          ),
+        }, {})
+        obj.items = {
+          "0" => { id: "si_foo", deleted: true },
+          "1" => { plan: "plan_bar" },
+        }
+
+        expected = {
+          items: {
+            :"0" => { id: "si_foo", deleted: true },
+            :"1" => { plan: "plan_bar" },
+          },
+        }
+        assert_equal(expected, obj.serialize_params)
+      end
+    end
   end
 end

data/test/stripe/util_test.rb

@@ -2,6 +2,22 @@ require File.expand_path("../../test_helper", __FILE__)
 
 module Stripe
   class UtilTest < Test::Unit::TestCase
+    context "OPTS_COPYABLE" do
+      should "include :apibase" do
+        assert_include Stripe::Util::OPTS_COPYABLE, :api_base
+      end
+    end
+
+    context "OPTS_PERSISTABLE" do
+      should "include :client" do
+        assert_include Stripe::Util::OPTS_PERSISTABLE, :client
+      end
+
+      should "not include :idempotency_key" do
+        refute_includes Stripe::Util::OPTS_PERSISTABLE, :idempotency_key
+      end
+    end
+
     should "#encode_parameters should prepare parameters for an HTTP request" do
       params = {
         a: 3,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stripe
 version: !ruby/object:Gem::Version
-  version: 3.5.2
+  version: 3.5.3
 platform: ruby
 authors:
 - Stripe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-13 00:00:00.000000000 Z
+date: 2017-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -172,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Ruby bindings for the Stripe API