stripe 4.5.0 → 4.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 176cc43da4fb0e5967142300c7d5f22f4c13b21b81dfc01dd703a99396d3cb39
-  data.tar.gz: a7c12a9c2d2758377902ef75822ede38e9e0680343778e080cb6c6cec7b814fc
+  metadata.gz: 30001fb9ea2136d96728f5eac636ad6b86f787193fa18339ea0e594d8948d50c
+  data.tar.gz: 3eaf42ef3e0d39478fd7f386031cfd689df6b15c4d6005aafe93d733cf94ae45
 SHA512:
-  metadata.gz: 1d01504fe2c3080c4ffd469f91c8250da6e98ddc519df7182d0c0c2d92d1095be58669a619f880b9bef831be96905fece73c14fdc81d56af1a9a74d2f5a30ad1
-  data.tar.gz: 22795339a7d756f0960f8dba40dd4e9541d01e11e0cd48b0bfde30dbd0e29574c9c206288457a8a3e86c94a916c3358d787670c22053507ea11557274794bfb1
+  metadata.gz: 1eb34606d76dbb884ce72323554009f4305c353ede914389b2e7a43bb297bccf39a30f4e7d32bcbf881c1adc1ae51df62f729c27ac253d83c585f38d951a4bdf
+  data.tar.gz: 17b31fdc7ab1d49e23b07e2882a121ee28e3116512a766a8323241ea8681cf02396c8b00a0a850cadafde3fb6b69431829cf3ca6c439cee5b46aa98218320379

data/.travis.yml

@@ -17,13 +17,15 @@ sudo: false
 env:
   global:
     # If changing this number, please also change it in `test/test_helper.rb`.
-    - STRIPE_MOCK_VERSION=0.40.0
+    - STRIPE_MOCK_VERSION=0.40.1
 
 cache:
   directories:
     - stripe-mock
 
 before_install:
+  # Install bundler 1.x, because we need to support Ruby 2.1 for now
+  - gem install bundler -v "~> 1.0"
   # Unpack and start stripe-mock so that the test suite can talk to it
   - |
     if [ ! -d "stripe-mock/stripe-mock_${STRIPE_MOCK_VERSION}" ]; then
@@ -34,6 +36,7 @@ before_install:
   - |
     stripe-mock/stripe-mock_${STRIPE_MOCK_VERSION}/stripe-mock > /dev/null &
     STRIPE_MOCK_PID=$!
+  - export PATH="${PATH}:${PWD}/stripe-mock/stripe-mock_${STRIPE_MOCK_VERSION}"
 
 script:
   - bundle exec rake

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 4.6.0 - 2019-01-21
+* [#736](https://github.com/stripe/stripe-ruby/pull/736) Properly serialize `individual` on `Account` objects
+
 ## 4.5.0 - 2019-01-02
 * [#719](https://github.com/stripe/stripe-ruby/pull/719) Generate OAuth authorize URLs for Express accounts as well as standard
 

data/VERSION

@@ -1 +1 @@
-4.5.0
+4.6.0

data/lib/stripe/account.rb

@@ -80,10 +80,10 @@ module Stripe
     # We're trying to get this overturned on the server side, but for now,
     # patch in a special allowance.
     def serialize_params(options = {})
-      serialize_params_account(self, super)
+      serialize_params_account(self, super, options)
     end
 
-    def serialize_params_account(_obj, update_hash)
+    def serialize_params_account(_obj, update_hash, options = {})
       if (entity = @values[:legal_entity])
         if (owners = entity[:additional_owners])
           entity_update = update_hash[:legal_entity] ||= {}
@@ -91,6 +91,11 @@ module Stripe
             serialize_additional_owners(entity, owners)
         end
       end
+      if (individual = @values[:individual])
+        if individual.is_a?(Person) && !update_hash.key?(:individual)
+          update_hash[:individual] = individual.serialize_params(options)
+        end
+      end
       update_hash
     end
 

data/lib/stripe/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Stripe
-  VERSION = "4.5.0".freeze
+  VERSION = "4.6.0".freeze
 end

data/test/openapi/README.md

@@ -0,0 +1,9 @@
+## Using custom OpenAPI specification and fixtures files
+
+You can place custom OpenAPI specification and fixtures files in this
+directory. The files must be in JSON format, and must be named `spec3.json`
+and `fixtures3.json` respectively.
+
+If those files are present, the test suite will start its own stripe-mock
+process on a random available port. In order for this to work, `stripe-mock`
+must be on the `PATH` in the environment used to run the test suite.

data/test/stripe/account_test.rb

@@ -195,6 +195,57 @@ module Stripe
         }
         assert_equal(expected, obj.serialize_params)
       end
+
+      should "serialize on a new individual" do
+        obj = Stripe::Util.convert_to_stripe_object({
+          object: "account",
+        }, {})
+        obj.individual = { first_name: "Jane" }
+
+        expected = { individual: { first_name: "Jane" } }
+        assert_equal(expected, obj.serialize_params)
+      end
+
+      should "serialize on a partially changed individual" do
+        obj = Stripe::Util.convert_to_stripe_object({
+          object: "account",
+          individual: Stripe::Util.convert_to_stripe_object({
+            object: "person",
+            first_name: "Jenny",
+          }, {}),
+        }, {})
+        obj.individual = { first_name: "Jane" }
+
+        expected = { individual: { first_name: "Jane" } }
+        assert_equal(expected, obj.serialize_params)
+      end
+
+      should "serialize on an unchanged individual" do
+        obj = Stripe::Util.convert_to_stripe_object({
+          object: "account",
+          individual: Stripe::Util.convert_to_stripe_object({
+            object: "person",
+            first_name: "Jenny",
+          }, {}),
+        }, {})
+
+        expected = { individual: {} }
+        assert_equal(expected, obj.serialize_params)
+      end
+
+      should "serialize on an unset individual" do
+        obj = Stripe::Util.convert_to_stripe_object({
+          object: "account",
+          individual: Stripe::Util.convert_to_stripe_object({
+            object: "person",
+            first_name: "Jenny",
+          }, {}),
+        }, {})
+        obj.individual = nil
+
+        expected = { individual: "" }
+        assert_equal(expected, obj.serialize_params)
+      end
     end
   end
 end

data/test/stripe/stripe_object_test.rb

@@ -159,18 +159,21 @@ module Stripe
 
     context "#to_hash" do
       should "skip calling to_hash on nil" do
-        module NilWithToHash
-          def to_hash
-            raise "Can't call to_hash on nil"
+        begin
+          module NilWithToHash
+            def to_hash
+              raise "Can't call to_hash on nil"
+            end
           end
+          ::NilClass.include NilWithToHash
+
+          hash_with_nil = { id: 3, foo: nil }
+          obj = StripeObject.construct_from(hash_with_nil)
+          expected_hash = { id: 3, foo: nil }
+          assert_equal expected_hash, obj.to_hash
+        ensure
+          ::NilClass.send(:undef_method, :to_hash)
         end
-        # include is private in Ruby 2.0
-        NilClass.send(:include, NilWithToHash)
-
-        hash_with_nil = { id: 3, foo: nil }
-        obj = StripeObject.construct_from(hash_with_nil)
-        expected_hash = { id: 3, foo: nil }
-        assert_equal expected_hash, obj.to_hash
       end
 
       should "recursively call to_hash on its values" do

data/test/stripe_mock.rb

@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+module Stripe
+  class StripeMock
+    include Singleton
+
+    PATH_SPEC = "#{::File.dirname(__FILE__)}/openapi/spec3.json".freeze
+    PATH_FIXTURES = "#{::File.dirname(__FILE__)}/openapi/fixtures3.json".freeze
+
+    @pid = nil
+    @port = -1
+
+    # Starts stripe-mock, if necessary. Returns the port on which stripe-mock is listening.
+    def self.start
+      unless ::File.exist?(PATH_SPEC)
+        port = ENV["STRIPE_MOCK_PORT"] || 12_111
+        puts("No custom spec file found, assuming stripe-mock is already running on port #{port}")
+        return port
+      end
+
+      unless @pid.nil?
+        puts("stripe-mock already running on port #{@port}")
+        return @port
+      end
+
+      @port = find_available_port
+
+      puts("Starting stripe-mock on port #{@port}...")
+
+      @stdout, @child_stdout = ::IO.pipe
+      @stderr, @child_stderr = ::IO.pipe
+
+      @pid = ::Process.spawn(
+        ["stripe-mock", "stripe-mock"],
+        "-http-port",
+        @port.to_s,
+        "-spec",
+        PATH_SPEC,
+        "-fixtures",
+        PATH_FIXTURES,
+        out: @child_stdout,
+        err: @child_stderr
+      )
+
+      [@child_stdout, @child_stderr].each(&:close)
+
+      sleep 1
+
+      status = (::Process.wait2(@pid, ::Process::WNOHANG) || []).last
+      if status.nil?
+        puts("Started stripe-mock, PID = #{@pid}")
+      else
+        abort("stripe-mock terminated early: #{status}")
+      end
+
+      @port
+    end
+
+    # Stops stripe-mock, if necessary.
+    def self.stop
+      return if @pid.nil?
+      puts("Stopping stripe-mock...")
+      ::Process.kill(:SIGTERM, @pid)
+      ::Process.waitpid2(@pid)
+      @pid = nil
+      @port = -1
+      puts("Stopped stripe-mock")
+    end
+
+    # Finds and returns an available TCP port
+    private_class_method def self.find_available_port
+      server = TCPServer.new("localhost", 0)
+      port = server.addr[1]
+      server.close
+      port
+    end
+  end
+end

data/test/test_helper.rb

@@ -14,10 +14,11 @@ require "webmock/test_unit"
 PROJECT_ROOT = ::File.expand_path("../../", __FILE__)
 
 require ::File.expand_path("../test_data", __FILE__)
+require ::File.expand_path("../stripe_mock", __FILE__)
 
 # If changing this number, please also change it in `.travis.yml`.
-MOCK_MINIMUM_VERSION = "0.40.0".freeze
-MOCK_PORT = ENV["STRIPE_MOCK_PORT"] || 12_111
+MOCK_MINIMUM_VERSION = "0.40.1".freeze
+MOCK_PORT = Stripe::StripeMock.start
 
 # Disable all real network connections except those that are outgoing to
 # stripe-mock.
@@ -41,6 +42,10 @@ rescue Faraday::ConnectionFailed
     "it running? Please see README for setup instructions.")
 end
 
+Test::Unit.at_exit do
+  Stripe::StripeMock.stop
+end
+
 module Test
   module Unit
     class TestCase

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stripe
 version: !ruby/object:Gem::Version
-  version: 4.5.0
+  version: 4.6.0
 platform: ruby
 authors:
 - Stripe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-02 00:00:00.000000000 Z
+date: 2019-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -148,6 +148,7 @@ files:
 - lib/stripe/webhook_endpoint.rb
 - stripe.gemspec
 - test/api_stub_helpers.rb
+- test/openapi/README.md
 - test/stripe/account_external_accounts_operations_test.rb
 - test/stripe/account_link_test.rb
 - test/stripe/account_login_links_operations_test.rb
@@ -224,6 +225,7 @@ files:
 - test/stripe/util_test.rb
 - test/stripe/webhook_endpoint_test.rb
 - test/stripe/webhook_test.rb
+- test/stripe_mock.rb
 - test/stripe_test.rb
 - test/test_data.rb
 - test/test_helper.rb
@@ -247,12 +249,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: Ruby bindings for the Stripe API
 test_files:
 - test/api_stub_helpers.rb
+- test/openapi/README.md
 - test/stripe/account_external_accounts_operations_test.rb
 - test/stripe/account_link_test.rb
 - test/stripe/account_login_links_operations_test.rb
@@ -329,6 +332,7 @@ test_files:
 - test/stripe/util_test.rb
 - test/stripe/webhook_endpoint_test.rb
 - test/stripe/webhook_test.rb
+- test/stripe_mock.rb
 - test/stripe_test.rb
 - test/test_data.rb
 - test/test_helper.rb