stripe 3.0.3 → 3.1.0

data/test/stripe/subscription_item_test.rb

@@ -2,52 +2,50 @@ require File.expand_path('../../test_helper', __FILE__)
 
 module Stripe
   class SubscriptionItemTest < Test::Unit::TestCase
-    FIXTURE = API_FIXTURES.fetch(:subscription_item)
-
     should "be listable" do
       items = Stripe::SubscriptionItem.list(
-        subscription: API_FIXTURES.fetch(:subscription)[:id]
+        subscription: "sub_123",
       )
       assert_requested :get, "#{Stripe.api_base}/v1/subscription_items",
-        query: { subscription: API_FIXTURES.fetch(:subscription)[:id] }
+        query: { subscription: "sub_123" }
       assert items.data.kind_of?(Array)
       assert items.data[0].kind_of?(Stripe::SubscriptionItem)
     end
 
     should "be retrievable" do
-      item = Stripe::SubscriptionItem.retrieve(FIXTURE[:id])
-      assert_requested :get, "#{Stripe.api_base}/v1/subscription_items/#{FIXTURE[:id]}"
+      item = Stripe::SubscriptionItem.retrieve("si_123")
+      assert_requested :get, "#{Stripe.api_base}/v1/subscription_items/si_123"
       assert item.kind_of?(Stripe::SubscriptionItem)
     end
 
     should "be creatable" do
       item = Stripe::SubscriptionItem.create(
         item: 'silver',
-        plan: API_FIXTURES.fetch(:plan)[:id],
+        plan: "sapphire-elite",
         quantity: 3,
-        subscription: API_FIXTURES.fetch(:subscription)[:id]
+        subscription: "sub_123"
       )
       assert_requested :post, "#{Stripe.api_base}/v1/subscription_items"
       assert item.kind_of?(Stripe::SubscriptionItem)
     end
 
     should "be saveable" do
-      item = Stripe::SubscriptionItem.retrieve(FIXTURE[:id])
+      item = Stripe::SubscriptionItem.retrieve("si_123")
       item.quantity = 4
       item.save
-      assert_requested :post, "#{Stripe.api_base}/v1/subscription_items/#{FIXTURE[:id]}"
+      assert_requested :post, "#{Stripe.api_base}/v1/subscription_items/#{item.id}"
     end
 
     should "be updateable" do
-      item = Stripe::SubscriptionItem.update(FIXTURE[:id], metadata: {foo: 'bar'})
-      assert_requested :post, "#{Stripe.api_base}/v1/subscription_items/#{FIXTURE[:id]}"
+      item = Stripe::SubscriptionItem.update("si_123", metadata: {foo: 'bar'})
+      assert_requested :post, "#{Stripe.api_base}/v1/subscription_items/si_123"
       assert item.kind_of?(Stripe::SubscriptionItem)
     end
 
     should "be deletable" do
-      item = Stripe::SubscriptionItem.retrieve(FIXTURE[:id])
+      item = Stripe::SubscriptionItem.retrieve("si_123")
       item = item.delete
-      assert_requested :delete, "#{Stripe.api_base}/v1/subscription_items/#{FIXTURE[:id]}"
+      assert_requested :delete, "#{Stripe.api_base}/v1/subscription_items/#{item.id}"
       assert item.kind_of?(Stripe::SubscriptionItem)
     end
   end

data/test/stripe/subscription_test.rb

@@ -2,8 +2,6 @@ require File.expand_path('../../test_helper', __FILE__)
 
 module Stripe
   class SubscriptionTest < Test::Unit::TestCase
-    FIXTURE = API_FIXTURES.fetch(:subscription)
-
     should "be listable" do
       subscriptions = Stripe::Subscription.list
       assert_requested :get, "#{Stripe.api_base}/v1/subscriptions"
@@ -12,46 +10,46 @@ module Stripe
     end
 
     should "be retrievable" do
-      subscription = Stripe::Subscription.retrieve(FIXTURE[:id])
+      subscription = Stripe::Subscription.retrieve("sub_123")
       assert_requested :get,
-        "#{Stripe.api_base}/v1/subscriptions/#{FIXTURE[:id]}"
+        "#{Stripe.api_base}/v1/subscriptions/sub_123"
       assert subscription.kind_of?(Stripe::Subscription)
     end
 
     should "be creatable" do
       subscription = Stripe::Subscription.create(
-        customer: API_FIXTURES.fetch(:customer)[:id]
+        customer: "cus_123"
       )
       assert_requested :post, "#{Stripe.api_base}/v1/subscriptions"
       assert subscription.kind_of?(Stripe::Subscription)
     end
 
     should "be saveable" do
-      subscription = Stripe::Subscription.retrieve(FIXTURE[:id])
+      subscription = Stripe::Subscription.retrieve("sub_123")
       subscription.metadata['key'] = 'value'
       subscription.save
       assert_requested :post,
-        "#{Stripe.api_base}/v1/subscriptions/#{FIXTURE[:id]}"
+        "#{Stripe.api_base}/v1/subscriptions/#{subscription.id}"
     end
 
     should "be updateable" do
-      subscription = Stripe::Subscription.update(FIXTURE[:id], metadata: {foo: 'bar'})
+      subscription = Stripe::Subscription.update("sub_123", metadata: {foo: 'bar'})
       assert_requested :post,
-        "#{Stripe.api_base}/v1/subscriptions/#{FIXTURE[:id]}"
+        "#{Stripe.api_base}/v1/subscriptions/sub_123"
       assert subscription.kind_of?(Stripe::Subscription)
     end
 
     should "be deletable" do
-      subscription = Stripe::Subscription.retrieve(FIXTURE[:id])
+      subscription = Stripe::Subscription.retrieve("sub_123")
       subscription = subscription.delete
       assert_requested :delete,
-        "#{Stripe.api_base}/v1/subscriptions/#{FIXTURE[:id]}"
+        "#{Stripe.api_base}/v1/subscriptions/#{subscription.id}"
       assert subscription.kind_of?(Stripe::Subscription)
     end
 
     context "#delete_discount" do
       should "be able to delete a subscriptions's discount" do
-        subscription = Stripe::Subscription.retrieve(FIXTURE[:id])
+        subscription = Stripe::Subscription.retrieve("sub_123")
         subscription = subscription.delete_discount
         assert subscription.kind_of?(Stripe::Subscription)
       end

data/test/stripe/three_d_secure_test.rb

@@ -2,17 +2,15 @@ require File.expand_path('../../test_helper', __FILE__)
 
 module Stripe
   class ThreeDSecureTest < Test::Unit::TestCase
-    FIXTURE = API_FIXTURES.fetch(:three_d_secure)
-
     should "be retrievable" do
-      secure = Stripe::ThreeDSecure.retrieve(FIXTURE[:id])
-      assert_requested :get, "#{Stripe.api_base}/v1/3d_secure/#{FIXTURE[:id]}"
+      secure = Stripe::ThreeDSecure.retrieve("tdsrc_123")
+      assert_requested :get, "#{Stripe.api_base}/v1/3d_secure/tdsrc_123"
       assert secure.kind_of?(Stripe::ThreeDSecure)
     end
 
     should "be creatable" do
       _ = Stripe::ThreeDSecure.create(
-        card: API_FIXTURES.fetch(:token)[:id],
+        card: "tok_123",
         amount: 1500,
         currency: "usd",
         return_url: "https://example.org/3d-secure-result"

data/test/stripe/transfer_test.rb

@@ -2,8 +2,6 @@ require File.expand_path('../../test_helper', __FILE__)
 
 module Stripe
   class TransferTest < Test::Unit::TestCase
-    FIXTURE = API_FIXTURES.fetch(:transfer)
-
     should "be listable" do
       transfers = Stripe::Transfer.list
       assert_requested :get, "#{Stripe.api_base}/v1/transfers"
@@ -12,8 +10,8 @@ module Stripe
     end
 
     should "be retrievable" do
-      transfer = Stripe::Transfer.retrieve(FIXTURE[:id])
-      assert_requested :get, "#{Stripe.api_base}/v1/transfers/#{FIXTURE[:id]}"
+      transfer = Stripe::Transfer.retrieve("tr_123")
+      assert_requested :get, "#{Stripe.api_base}/v1/transfers/tr_123"
       assert transfer.kind_of?(Stripe::Transfer)
     end
 
@@ -21,22 +19,22 @@ module Stripe
       transfer = Stripe::Transfer.create(
         amount: 100,
         currency: "USD",
-        destination: API_FIXTURES.fetch(:account)[:id],
+        destination: "acct_123"
       )
       assert_requested :post, "#{Stripe.api_base}/v1/transfers"
       assert transfer.kind_of?(Stripe::Transfer)
     end
 
     should "be saveable" do
-      transfer = Stripe::Transfer.retrieve(FIXTURE[:id])
+      transfer = Stripe::Transfer.retrieve("tr_123")
       transfer.metadata['key'] = 'value'
       transfer.save
-      assert_requested :post, "#{Stripe.api_base}/v1/transfers/#{FIXTURE[:id]}"
+      assert_requested :post, "#{Stripe.api_base}/v1/transfers/#{transfer.id}"
     end
 
     should "be updateable" do
-      transfer = Stripe::Transfer.update(FIXTURE[:id], metadata: {foo: 'bar'})
-      assert_requested :post, "#{Stripe.api_base}/v1/transfers/#{FIXTURE[:id]}"
+      transfer = Stripe::Transfer.update("tr_123", metadata: {foo: 'bar'})
+      assert_requested :post, "#{Stripe.api_base}/v1/transfers/tr_123"
       assert transfer.kind_of?(Stripe::Transfer)
     end
   end

data/test/stripe/util_test.rb

@@ -145,5 +145,169 @@ module Stripe
     should "#array_to_hash should convert an array into a hash with integer keys" do
       assert_equal({"0" => 1, "1" => 2, "2" => 3}, Util.array_to_hash([1, 2, 3]))
     end
+
+    context ".request_id_dashboard_url" do
+      should "generate a livemode URL" do
+        assert_equal "https://dashboard.stripe.com/live/logs/request-id",
+          Util.request_id_dashboard_url("request-id", "sk_live_123")
+      end
+
+      should "generate a testmode URL" do
+        assert_equal "https://dashboard.stripe.com/test/logs/request-id",
+          Util.request_id_dashboard_url("request-id", "sk_test_123")
+      end
+
+      should "default to a testmode URL" do
+        assert_equal "https://dashboard.stripe.com/test/logs/request-id",
+          Util.request_id_dashboard_url("request-id", nil)
+      end
+    end
+
+    context ".log_*" do
+      setup do
+        @old_log_level = Stripe.log_level
+        Stripe.log_level = nil
+
+        @old_stdout = $stdout
+        $stdout = StringIO.new
+      end
+
+      teardown do
+        Stripe.log_level = @old_log_level
+        $stdout = @old_stdout
+      end
+
+      context ".log_debug" do
+        should "not log if logging is disabled" do
+          Util.log_debug("foo")
+          assert_equal "", $stdout.string
+        end
+
+        should "log if level set to debug" do
+          Stripe.log_level = Stripe::LEVEL_DEBUG
+          Util.log_debug("foo")
+          assert_equal "message=foo level=debug \n", $stdout.string
+        end
+
+        should "not log if level set to info" do
+          Stripe.log_level = Stripe::LEVEL_INFO
+          Util.log_debug("foo")
+          assert_equal "", $stdout.string
+        end
+      end
+
+      context ".log_info" do
+        should "not log if logging is disabled" do
+          Util.log_info("foo")
+          assert_equal "", $stdout.string
+        end
+
+        should "log if level set to debug" do
+          Stripe.log_level = Stripe::LEVEL_DEBUG
+          Util.log_info("foo")
+          assert_equal "message=foo level=info \n", $stdout.string
+        end
+
+        should "log if level set to info" do
+          Stripe.log_level = Stripe::LEVEL_INFO
+          Util.log_info("foo")
+          assert_equal "message=foo level=info \n", $stdout.string
+        end
+      end
+    end
+
+    context ".normalize_headers" do
+      should "normalize the format of a header key" do
+        assert_equal({ "Request-Id" => nil },
+          Util.normalize_headers({ "Request-Id" => nil }))
+        assert_equal({ "Request-Id" => nil },
+          Util.normalize_headers({ "request-id" => nil }))
+        assert_equal({ "Request-Id" => nil },
+          Util.normalize_headers({ "Request-ID" => nil }))
+        assert_equal({ "Request-Id" => nil },
+          Util.normalize_headers({ :request_id => nil }))
+      end
+
+      should "tolerate bad formatting" do
+        assert_equal({ "Request-Id" => nil },
+          Util.normalize_headers({ "-Request--Id-" => nil }))
+        assert_equal({ "Request-Id" => nil },
+          Util.normalize_headers({ :request__id => nil }))
+      end
+    end
+
+    #
+    # private
+    #
+    # I don't feel particularly good about using #send to invoke these, but I
+    # want them hidden from the public interface, and each method is far easier
+    # to test in isolation (as opposed to going through a public method).
+    #
+
+    context ".colorize" do
+      should "colorize for a TTY" do
+        assert_equal "\033[0;32;49mfoo\033[0m",
+          Util.send(:colorize, "foo", :green, true)
+      end
+
+      should "not colorize otherwise" do
+        assert_equal "foo", Util.send(:colorize, "foo", :green, false)
+      end
+    end
+
+    context ".log_internal" do
+      should "log in a terminal friendly way" do
+        out = StringIO.new
+
+        # Sketchy as anything, but saves us from pulling in a mocking library.
+        # Open this instance of StringIO, and add a method override so that it
+        # looks like a TTY.
+        out.instance_eval do
+          def isatty; true; end
+        end
+
+        Util.send(:log_internal, "message", { foo: "bar" },
+          color: :green, level: Stripe::LEVEL_DEBUG, out: out)
+        assert_equal "\e[0;32;49mDEBU\e[0m message \e[0;32;49mfoo\e[0m=bar\n",
+          out.string
+      end
+
+      should "log in a data friendly way" do
+        out = StringIO.new
+        Util.send(:log_internal, "message", { foo: "bar" },
+          color: :green, level: Stripe::LEVEL_DEBUG, out: out)
+        assert_equal "message=message level=debug foo=bar\n",
+          out.string
+      end
+    end
+
+    context ".wrap_logfmt_value" do
+      should "pass through simple values" do
+        assert_equal "abc", Util.send(:wrap_logfmt_value, "abc")
+        assert_equal "123", Util.send(:wrap_logfmt_value, "123")
+        assert_equal "a-b_c/d", Util.send(:wrap_logfmt_value, "a-b_c/d")
+      end
+
+      should "pass through numerics" do
+        assert_equal 123, Util.send(:wrap_logfmt_value, 123)
+        assert_equal 1.23, Util.send(:wrap_logfmt_value, 1.23)
+      end
+
+      should "wrap more complex values in double quotes" do
+        assert_equal %{"abc=123"}, Util.send(:wrap_logfmt_value, %{abc=123})
+      end
+
+      should "escape double quotes already in the value" do
+        assert_equal %{"abc=\\"123\\""}, Util.send(:wrap_logfmt_value, %{abc="123"})
+      end
+
+      should "remove newlines" do
+        assert_equal %{"abc"}, Util.send(:wrap_logfmt_value, "a\nb\nc")
+      end
+
+      should "not error if given a non-string" do
+        assert_equal "true", Util.send(:wrap_logfmt_value, true)
+      end
+    end
   end
 end

data/test/test_helper.rb

@@ -1,41 +1,56 @@
-require 'committee'
-require 'sinatra'
 require 'stripe'
 require 'test/unit'
 require 'mocha/setup'
 require 'stringio'
 require 'shoulda/context'
+require "timecop"
 require 'webmock/test_unit'
 
 PROJECT_ROOT = File.expand_path("../../", __FILE__)
 
-require File.expand_path('../api_fixtures', __FILE__)
-require File.expand_path('../api_stub_helpers', __FILE__)
 require File.expand_path('../test_data', __FILE__)
 
+MOCK_MINIMUM_VERSION = "0.1.12"
+MOCK_PORT = ENV["STRIPE_MOCK_PORT"] || 12111
+
+# Disable all real network connections except those that are outgoing to
+# stripe-mock.
+WebMock.disable_net_connect!(allow: "localhost:#{MOCK_PORT}")
+
+# Try one initial test connection to stripe-mock so that if there's a problem
+# we can print one error and fail fast so that it's more clear to the user how
+# they should fix the problem.
+begin
+  resp = Faraday.get("http://localhost:#{MOCK_PORT}/")
+  version = resp.headers['Stripe-Mock-Version']
+  if version != "master" &&
+      Gem::Version.new(version) < Gem::Version.new(MOCK_MINIMUM_VERSION)
+    abort("Your version of stripe-mock (#{version}) is too old. The minimum " \
+      "version to run this test suite is #{MOCK_MINIMUM_VERSION}. Please " \
+      "see its repository for upgrade instructions.")
+  end
+rescue Faraday::ConnectionFailed
+  abort("Couldn't reach stripe-mock at `localhost:#{MOCK_PORT}`. Is " \
+    "it running? Please see README for setup instructions.")
+end
+
 class Test::Unit::TestCase
-  include APIStubHelpers
   include Stripe::TestData
   include Mocha
 
-  # Fixtures are available in tests using something like:
-  #
-  #   API_FIXTURES[:charge][:id]
-  #
-  API_FIXTURES = APIFixtures.new
-
   setup do
-    Stripe.api_key = "foo"
-
-    # Stub the Stripe API with a default stub. Note that this method can be
-    # called again in test bodies in order to override responses on particular
-    # endpoints.
-    stub_api
-
+    Stripe.api_key = "sk_test_123"
+    Stripe.api_base = "http://localhost:#{MOCK_PORT}"
     stub_connect
   end
 
   teardown do
     Stripe.api_key = nil
   end
+
+  private
+
+  def stub_connect
+    stub_request(:any, /^#{Stripe.connect_base}/).to_return(:body => "{}")
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stripe
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.1.0
 platform: ruby
 authors:
 - Stripe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-28 00:00:00.000000000 Z
+date: 2017-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -101,12 +101,7 @@ files:
 - lib/stripe/util.rb
 - lib/stripe/version.rb
 - lib/stripe/webhook.rb
-- openapi/fixtures.json
-- openapi/fixtures.yaml
-- openapi/spec2.json
-- openapi/spec2.yaml
 - stripe.gemspec
-- test/api_fixtures.rb
 - test/api_stub_helpers.rb
 - test/stripe/account_test.rb
 - test/stripe/alipay_account_test.rb
@@ -182,7 +177,6 @@ signing_key:
 specification_version: 4
 summary: Ruby bindings for the Stripe API
 test_files:
-- test/api_fixtures.rb
 - test/api_stub_helpers.rb
 - test/stripe/account_test.rb
 - test/stripe/alipay_account_test.rb