stripe 4.24.0 → 5.0.0

data/test/stripe/stripe_object_test.rb

@@ -52,9 +52,9 @@ module Stripe
             2,
           ],
           map: {
-            :"0" => StripeObject.construct_from({ id: "index0" }, opts),
-            :"1" => "index1",
-            :"2" => 2,
+            "0": StripeObject.construct_from({ id: "index0" }, opts),
+            "1": "index1",
+            "2": 2,
           },
         }
 
@@ -235,20 +235,6 @@ module Stripe
       assert_equal true, obj.send(:metaclass).method_defined?(:foo)
     end
 
-    should "warn that #refresh_from is deprecated" do
-      old_stderr = $stderr
-      $stderr = StringIO.new
-      begin
-        obj = Stripe::StripeObject.construct_from({})
-        obj.refresh_from({}, {})
-        message = "NOTE: Stripe::StripeObject#refresh_from is " \
-                  "deprecated; use #update_attributes instead"
-        assert_match Regexp.new(message), $stderr.string
-      ensure
-        $stderr = old_stderr
-      end
-    end
-
     should "pass opts down to children when initializing" do
       opts = { custom: "opts" }
 
@@ -302,14 +288,14 @@ module Stripe
     end
 
     should "#serialize_params on an array that shortens" do
-      obj = Stripe::StripeObject.construct_from(foo: ["0-index", "1-index", "2-index"])
+      obj = Stripe::StripeObject.construct_from(foo: %w[0-index 1-index 2-index])
       obj.foo = ["new-value"]
       assert_equal({ foo: ["new-value"] },
                    obj.serialize_params)
     end
 
     should "#serialize_params on an array that lengthens" do
-      obj = Stripe::StripeObject.construct_from(foo: ["0-index", "1-index", "2-index"])
+      obj = Stripe::StripeObject.construct_from(foo: %w[0-index 1-index 2-index])
       obj.foo = ["new-value"] * 4
       assert_equal({ foo: ["new-value"] * 4 },
                    obj.serialize_params)
@@ -331,8 +317,8 @@ module Stripe
     end
 
     should "#serialize_params on an array that is unchanged" do
-      obj = Stripe::StripeObject.construct_from(foo: ["0-index", "1-index", "2-index"])
-      obj.foo = ["0-index", "1-index", "2-index"]
+      obj = Stripe::StripeObject.construct_from(foo: %w[0-index 1-index 2-index])
+      obj.foo = %w[0-index 1-index 2-index]
       assert_equal({}, obj.serialize_params)
     end
 
@@ -475,20 +461,6 @@ module Stripe
       assert_equal(expected, obj.to_s)
     end
 
-    should "warn that .serialize_params is deprecated" do
-      old_stderr = $stderr
-      $stderr = StringIO.new
-      begin
-        obj = Stripe::StripeObject.construct_from({})
-        Stripe::StripeObject.serialize_params(obj)
-        message = "NOTE: Stripe::StripeObject.serialize_params is " \
-                  "deprecated; use #serialize_params instead"
-        assert_match Regexp.new(message), $stderr.string
-      ensure
-        $stderr = old_stderr
-      end
-    end
-
     should "error on setting a property to an empty string" do
       obj = Stripe::StripeObject.construct_from(foo: "bar")
       e = assert_raises ArgumentError do

data/test/stripe/stripe_response_test.rb

@@ -4,46 +4,92 @@ require ::File.expand_path("../test_helper", __dir__)
 
 module Stripe
   class StripeResponseTest < Test::Unit::TestCase
-    context ".from_faraday_hash" do
-      should "converts to StripeResponse" do
-        body = '{"foo": "bar"}'
+    context "Headers" do
+      should "allow case-insensitive header access" do
         headers = { "Request-Id" => "request-id" }
+        http_resp = create_net_http_resp(200, "", headers)
 
-        http_resp = {
-          body: body,
-          headers: headers,
-          status: 200,
-        }
+        headers = StripeResponse::Headers.from_net_http(http_resp)
 
-        resp = StripeResponse.from_faraday_hash(http_resp)
+        assert_equal "request-id", headers["request-id"]
+        assert_equal "request-id", headers["Request-Id"]
+        assert_equal "request-id", headers["Request-ID"]
+      end
 
-        assert_equal JSON.parse(body, symbolize_names: true), resp.data
-        assert_equal body, resp.http_body
-        assert_equal headers, resp.http_headers
-        assert_equal 200, resp.http_status
-        assert_equal "request-id", resp.request_id
+      should "initialize without error" do
+        StripeResponse::Headers.new({})
+        StripeResponse::Headers.new("Request-Id" => [])
+        StripeResponse::Headers.new("Request-Id" => ["request-id"])
+      end
+
+      should "initialize with error on a malformed hash" do
+        assert_raises(ArgumentError) do
+          StripeResponse::Headers.new(nil)
+        end
+
+        assert_raises(ArgumentError) do
+          StripeResponse::Headers.new(1 => [])
+        end
+
+        assert_raises(ArgumentError) do
+          StripeResponse::Headers.new("Request-Id" => 1)
+        end
+
+        assert_raises(ArgumentError) do
+          StripeResponse::Headers.new("Request-Id" => [1])
+        end
+      end
+
+      should "warn on duplicate header values" do
+        old_stderr = $stderr
+        $stderr = StringIO.new
+        begin
+          headers = StripeResponse::Headers.new("Duplicated" => %w[a b])
+          assert_equal "a", headers["Duplicated"]
+          assert_equal "Duplicate header values for `Duplicated`; returning only first",
+                       $stderr.string.rstrip
+        ensure
+          $stderr = old_stderr
+        end
       end
     end
 
-    context ".from_faraday_response" do
+    context ".from_net_http" do
       should "converts to StripeResponse" do
+        code = 200
         body = '{"foo": "bar"}'
         headers = { "Request-Id" => "request-id" }
+        http_resp = create_net_http_resp(code, body, headers)
 
-        env = Faraday::Env.from(
-          status: 200, body: body,
-          response_headers: headers
-        )
-        http_resp = Faraday::Response.new(env)
-
-        resp = StripeResponse.from_faraday_response(http_resp)
+        resp = StripeResponse.from_net_http(http_resp)
 
         assert_equal JSON.parse(body, symbolize_names: true), resp.data
         assert_equal body, resp.http_body
-        assert_equal headers, resp.http_headers
-        assert_equal 200, resp.http_status
+        assert_equal "request-id", resp.http_headers["Request-ID"]
+        assert_equal code, resp.http_status
         assert_equal "request-id", resp.request_id
       end
     end
+
+    # Synthesizes a `Net::HTTPResponse` object for testing purposes.
+    private def create_net_http_resp(code, body, headers)
+      # The "1.1" is HTTP version.
+      http_resp = Net::HTTPResponse.new("1.1", code.to_s, nil)
+      http_resp.body = body
+
+      # This is obviously super sketchy, but the Ruby team has done everything
+      # in their power to make these objects as difficult to test with as
+      # possible. Even if you specify a body, accessing `#body` the first time
+      # will attempt to read from a non-existent socket which will subsequently
+      # blow up. Setting this internal variable skips that read and allows the
+      # object to use the body that we specified above.
+      http_resp.instance_variable_set(:@read, true)
+
+      headers.each do |name, value|
+        http_resp[name] = value
+      end
+
+      http_resp
+    end
   end
 end

data/test/stripe/subscription_test.rb

@@ -63,9 +63,9 @@ module Stripe
     context "#delete_discount" do
       should "be able to delete a subscriptions's discount" do
         subscription = Stripe::Subscription.retrieve("sub_123")
-        subscription = subscription.delete_discount
+        discount = subscription.delete_discount
         assert_requested :delete, "#{Stripe.api_base}/v1/subscriptions/sub_123/discount"
-        assert subscription.is_a?(Stripe::Subscription)
+        assert discount.is_a?(Stripe::Discount)
       end
     end
 

data/test/stripe/webhook_test.rb

@@ -4,13 +4,13 @@ require ::File.expand_path("../test_helper", __dir__)
 
 module Stripe
   class WebhookTest < Test::Unit::TestCase
-    EVENT_PAYLOAD = <<-PAYLOAD.freeze
+    EVENT_PAYLOAD = <<~PAYLOAD
       {
         "id": "evt_test_webhook",
         "object": "event"
       }
     PAYLOAD
-    SECRET = "whsec_test_secret".freeze
+    SECRET = "whsec_test_secret"
 
     def generate_header(opts = {})
       opts[:timestamp] ||= Time.now.to_i

data/test/stripe_mock.rb

@@ -4,8 +4,8 @@ module Stripe
   class StripeMock
     include Singleton
 
-    PATH_SPEC = "#{::File.dirname(__FILE__)}/openapi/spec3.json".freeze
-    PATH_FIXTURES = "#{::File.dirname(__FILE__)}/openapi/fixtures3.json".freeze
+    PATH_SPEC = "#{::File.dirname(__FILE__)}/openapi/spec3.json"
+    PATH_FIXTURES = "#{::File.dirname(__FILE__)}/openapi/fixtures3.json"
 
     @pid = nil
     @port = -1
@@ -29,7 +29,7 @@ module Stripe
       @stderr, @child_stderr = ::IO.pipe
 
       @pid = ::Process.spawn(
-        ["stripe-mock", "stripe-mock"],
+        %w[stripe-mock stripe-mock],
         "-http-port",
         "0", # have stripe-mock select a port
         "-spec",
@@ -66,6 +66,7 @@ module Stripe
     # Stops stripe-mock, if necessary.
     def self.stop
       return if @pid.nil?
+
       puts("Stopping stripe-mock...")
       ::Process.kill(:SIGTERM, @pid)
       ::Process.waitpid2(@pid)

data/test/stripe_test.rb

@@ -3,19 +3,6 @@
 require ::File.expand_path("test_helper", __dir__)
 
 class StripeTest < Test::Unit::TestCase
-  should "warn that #refresh_from is deprecated" do
-    old_stderr = $stderr
-    $stderr = StringIO.new
-    begin
-      Stripe.uri_encode({})
-      message = "NOTE: Stripe.uri_encode is deprecated; use " \
-                "Stripe::Util#encode_parameters instead"
-      assert_match Regexp.new(message), $stderr.string
-    ensure
-      $stderr = old_stderr
-    end
-  end
-
   should "allow app_info to be configured" do
     begin
       old = Stripe.app_info

data/test/test_helper.rb

@@ -17,7 +17,7 @@ require ::File.expand_path("test_data", __dir__)
 require ::File.expand_path("stripe_mock", __dir__)
 
 # If changing this number, please also change it in `.travis.yml`.
-MOCK_MINIMUM_VERSION = "0.63.0".freeze
+MOCK_MINIMUM_VERSION = "0.63.0"
 MOCK_PORT = Stripe::StripeMock.start
 
 # Disable all real network connections except those that are outgoing to
@@ -28,16 +28,21 @@ WebMock.disable_net_connect!(allow: "localhost:#{MOCK_PORT}")
 # we can print one error and fail fast so that it's more clear to the user how
 # they should fix the problem.
 begin
-  conn = Faraday::Connection.new("http://localhost:#{MOCK_PORT}")
-  resp = conn.get("/")
-  version = resp.headers["Stripe-Mock-Version"]
+  resp = Net::HTTP.get_response(URI("http://localhost:#{MOCK_PORT}/"))
+  version = resp["Stripe-Mock-Version"]
+
+  if version.nil?
+    abort("Couldn't find `Stripe-Mock-Version` in response from " \
+      "`localhost:#{MOCK_PORT}`. Is the service running there stripe-mock?")
+  end
+
   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
+rescue Errno::ECONNREFUSED
   abort("Couldn't reach stripe-mock at `localhost:#{MOCK_PORT}`. Is " \
     "it running? Please see README for setup instructions.")
 end

metadata

@@ -1,43 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: stripe
 version: !ruby/object:Gem::Version
-  version: 4.24.0
+  version: 5.0.0
 platform: ruby
 authors:
 - Stripe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-13 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: faraday
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.13'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.13'
-- !ruby/object:Gem::Dependency
-  name: net-http-persistent
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
+date: 2019-08-20 00:00:00.000000000 Z
+dependencies: []
 description: Stripe is the easiest way to accept payments online.  See https://stripe.com
   for details.
 email: support@stripe.com
@@ -73,8 +45,11 @@ files:
 - lib/stripe/api_operations/request.rb
 - lib/stripe/api_operations/save.rb
 - lib/stripe/api_resource.rb
+- lib/stripe/connection_manager.rb
+- lib/stripe/error_object.rb
 - lib/stripe/errors.rb
 - lib/stripe/list_object.rb
+- lib/stripe/multipart_encoder.rb
 - lib/stripe/oauth.rb
 - lib/stripe/object_types.rb
 - lib/stripe/resources.rb
@@ -108,7 +83,6 @@ files:
 - lib/stripe/resources/invoice.rb
 - lib/stripe/resources/invoice_item.rb
 - lib/stripe/resources/invoice_line_item.rb
-- lib/stripe/resources/issuer_fraud_record.rb
 - lib/stripe/resources/issuing/authorization.rb
 - lib/stripe/resources/issuing/card.rb
 - lib/stripe/resources/issuing/card_details.rb
@@ -178,6 +152,7 @@ files:
 - test/stripe/capability_test.rb
 - test/stripe/charge_test.rb
 - test/stripe/checkout/session_test.rb
+- test/stripe/connection_manager_test.rb
 - test/stripe/country_spec_test.rb
 - test/stripe/coupon_test.rb
 - test/stripe/credit_note_test.rb
@@ -190,11 +165,9 @@ files:
 - test/stripe/exchange_rate_test.rb
 - test/stripe/file_link_test.rb
 - test/stripe/file_test.rb
-- test/stripe/file_upload_test.rb
 - test/stripe/invoice_item_test.rb
 - test/stripe/invoice_line_item_test.rb
 - test/stripe/invoice_test.rb
-- test/stripe/issuer_fraud_record_test.rb
 - test/stripe/issuing/authorization_test.rb
 - test/stripe/issuing/card_test.rb
 - test/stripe/issuing/cardholder_test.rb
@@ -202,6 +175,7 @@ files:
 - test/stripe/issuing/transaction_test.rb
 - test/stripe/list_object_test.rb
 - test/stripe/login_link_test.rb
+- test/stripe/multipart_encoder_test.rb
 - test/stripe/oauth_test.rb
 - test/stripe/order_return_test.rb
 - test/stripe/order_test.rb
@@ -240,7 +214,6 @@ files:
 - test/stripe/topup_test.rb
 - test/stripe/transfer_test.rb
 - test/stripe/usage_record_summary_test.rb
-- test/stripe/usage_record_test.rb
 - test/stripe/util_test.rb
 - test/stripe/webhook_endpoint_test.rb
 - test/stripe/webhook_test.rb
@@ -266,7 +239,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -294,6 +267,7 @@ test_files:
 - test/stripe/capability_test.rb
 - test/stripe/charge_test.rb
 - test/stripe/checkout/session_test.rb
+- test/stripe/connection_manager_test.rb
 - test/stripe/country_spec_test.rb
 - test/stripe/coupon_test.rb
 - test/stripe/credit_note_test.rb
@@ -306,11 +280,9 @@ test_files:
 - test/stripe/exchange_rate_test.rb
 - test/stripe/file_link_test.rb
 - test/stripe/file_test.rb
-- test/stripe/file_upload_test.rb
 - test/stripe/invoice_item_test.rb
 - test/stripe/invoice_line_item_test.rb
 - test/stripe/invoice_test.rb
-- test/stripe/issuer_fraud_record_test.rb
 - test/stripe/issuing/authorization_test.rb
 - test/stripe/issuing/card_test.rb
 - test/stripe/issuing/cardholder_test.rb
@@ -318,6 +290,7 @@ test_files:
 - test/stripe/issuing/transaction_test.rb
 - test/stripe/list_object_test.rb
 - test/stripe/login_link_test.rb
+- test/stripe/multipart_encoder_test.rb
 - test/stripe/oauth_test.rb
 - test/stripe/order_return_test.rb
 - test/stripe/order_test.rb
@@ -356,7 +329,6 @@ test_files:
 - test/stripe/topup_test.rb
 - test/stripe/transfer_test.rb
 - test/stripe/usage_record_summary_test.rb
-- test/stripe/usage_record_test.rb
 - test/stripe/util_test.rb
 - test/stripe/webhook_endpoint_test.rb
 - test/stripe/webhook_test.rb