stripe 3.13.0 → 3.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 719456b37833bcc702e2bfc07e527893605d8a1c
-  data.tar.gz: 5e7be4888ad520802089c4038d3a309db8b38bdc
+  metadata.gz: 694536c3749e651a8bfcf6dee6fc625ec982d747
+  data.tar.gz: 5c20bddece5f1ac3eae41a876904be08367f5918
 SHA512:
-  metadata.gz: 8e8b56ed5c634e90cc5e7ecd7bd351ba1c4a797607256762fda2862ceaf88fdc471919d94618a2643df85683624ff88acb40e417898bff66ec963d341e18c204
-  data.tar.gz: 6cda7ebdcdae5837a1ba955421546a16999ee33d091bf47ea5d75ee996cf00ba8caacef5df9196954c6ec274436a887d10f508fb9f1f9d73979aa9017c7e67f4
+  metadata.gz: 06a5e474c9ab8a042a3a3e98f6d4292db3a4bcd279fca448292adcff957b166847d78d8c22533a5d95ae0524fc504daa5395fab386badc01bc95968bbd0f46a9
+  data.tar.gz: 3170f632390bb3fc6940d79b68647fb1d8a0fdeaa63858c2f2ae08ff8b9776d89270ec10c7777af48a87bd3b9e500857ab1694beedd5952891396f5289d4bcb2

data/.rubocop_todo.yml

@@ -8,17 +8,17 @@
 
 # Offense count: 19
 Metrics/AbcSize:
-  Max: 45
+  Max: 52
 
 # Offense count: 27
 # Configuration parameters: CountComments, ExcludedMethods.
 Metrics/BlockLength:
-  Max: 469
+  Max: 496
 
 # Offense count: 8
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 597
+  Max: 624
 
 # Offense count: 11
 Metrics/CyclomaticComplexity:
@@ -33,7 +33,7 @@ Metrics/LineLength:
 # Offense count: 32
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
-  Max: 46
+  Max: 48
 
 # Offense count: 1
 # Configuration parameters: CountComments.

data/.travis.yml

@@ -16,7 +16,8 @@ sudo: false
 
 env:
   global:
-    - STRIPE_MOCK_VERSION=0.12.0
+    # If changing this number, please also change it in `test/test_helper.rb`.
+    - STRIPE_MOCK_VERSION=0.15.0
 
 cache:
   directories:

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 3.13.1 - 2018-05-07
+* [#647](https://github.com/stripe/stripe-ruby/pull/647) Merge query parameters coming from path with `params` argument
+
 ## 3.13.0 - 2018-04-11
 * [#498](https://github.com/stripe/stripe-ruby/pull/498) Add support for flexible billing primitives
 

data/README.md

@@ -80,14 +80,20 @@ require "stripe"
 
 Stripe::Charge.list(
   {},
-  :api_key => "sk_test_...",
-  :stripe_account => "acct_..."
+  {
+    :api_key => "sk_test_...",
+    :stripe_account => "acct_...",
+    :stripe_version => "2018-02-28"
+  }
 )
 
 Stripe::Charge.retrieve(
   "ch_18atAXCdGbJFKhCuBAa4532Z",
-  :api_key => "sk_test_...",
-  :stripe_account => "acct_..."
+  {
+    :api_key => "sk_test_...",
+    :stripe_account => "acct_...",
+    :stripe_version => "2018-02-28"
+  }
 )
 ```
 
@@ -108,6 +114,15 @@ end
 puts resp.request_id
 ```
 
+### Configuration an API Version
+
+By default, the library will use the API version pinned to the account making
+a request. This can be overridden with this global option:
+
+    Stripe.api_version = "2018-02-28"
+
+See [versioning in the API reference][versioning] for more information.
+
 ### Configuring CA Bundles
 
 By default, the library will use its own internal bundle of known CA
@@ -204,6 +219,7 @@ Update the bundled [stripe-mock] by editing the version number found in
 [faraday]: https://github.com/lostisland/faraday
 [idempotency-keys]: https://stripe.com/docs/api/ruby#idempotent_requests
 [stripe-mock]: https://github.com/stripe/stripe-mock
+[versioning]: https://stripe.com/docs/api/ruby#versioning
 
 <!--
 # vim: set tw=79:

data/VERSION

@@ -1 +1 @@
-3.13.0
+3.13.1

data/lib/stripe/stripe_client.rb

@@ -134,6 +134,23 @@ module Stripe
                end
       end
 
+      # This works around an edge case where we end up with both query
+      # parameters in `query_params` and query parameters that are appended
+      # onto the end of the given path. In this case, Faraday will silently
+      # discard the URL's parameters which may break a request.
+      #
+      # Here we decode any parameters that were added onto the end of a path
+      # and add them to `query_params` so that all parameters end up in one
+      # place and all of them are correctly included in the final request.
+      u = URI.parse(path)
+      unless u.query.nil?
+        query_params ||= {}
+        query_params = Hash[URI.decode_www_form(u.query)].merge(query_params)
+
+        # Reset the path minus any query parameters that were specified.
+        path = u.path
+      end
+
       headers = request_headers(api_key, method)
                 .update(Util.normalize_headers(headers))
 

data/lib/stripe/version.rb

@@ -1,3 +1,3 @@
 module Stripe
-  VERSION = "3.13.0".freeze
+  VERSION = "3.13.1".freeze
 end

data/test/stripe/file_upload_test.rb

@@ -2,43 +2,18 @@ require File.expand_path("../../test_helper", __FILE__)
 
 module Stripe
   class FileUploadTest < Test::Unit::TestCase
-    # Note that these tests are written different from others because we
-    # don't have anything on the uploads service in our OpenAPI spec. This is
-    # something that should be looked into at some point. We may need to ship
-    # a separate spec for it though, so it's high effort with low reward for
-    # the time being.
-    FIXTURE = {
-      id: "file_123",
-      object: "file_upload",
-    }.freeze
-
     should "be listable" do
-      stub_request(:get, "#{Stripe.uploads_base}/v1/files")
-        .to_return(body: JSON.generate(data: [FIXTURE],
-                                       object: "list",
-                                       resource_url: "/v1/files"))
-
       files = Stripe::FileUpload.list
       assert files.data.is_a?(Array)
       assert files.data[0].is_a?(Stripe::FileUpload)
     end
 
     should "be retrievable" do
-      stub_request(:get, "#{Stripe.uploads_base}/v1/files/file_123")
-        .to_return(body: JSON.generate(FIXTURE))
-
       file = Stripe::FileUpload.retrieve("file_123")
       assert file.is_a?(Stripe::FileUpload)
     end
 
     should "be creatable with a File" do
-      stub_request(:post, "#{Stripe.uploads_base}/v1/files")
-        .with(headers: {
-          "Content-Type" => /\A#{Faraday::Request::Multipart.mime_type}/,
-        }) do |request|
-        request.body =~ /FileUploadTest/
-      end.to_return(body: JSON.generate(FIXTURE))
-
       file = Stripe::FileUpload.create(
         purpose: "dispute_evidence",
         file: File.new(__FILE__)
@@ -47,13 +22,6 @@ module Stripe
     end
 
     should "be creatable with a Tempfile" do
-      stub_request(:post, "#{Stripe.uploads_base}/v1/files")
-        .with(headers: {
-          "Content-Type" => /\A#{Faraday::Request::Multipart.mime_type}/,
-        }) do |request|
-        request.body =~ /Hello world/
-      end.to_return(body: JSON.generate(FIXTURE))
-
       tempfile = Tempfile.new("foo")
       tempfile.write("Hello world")
       tempfile.rewind
@@ -66,13 +34,6 @@ module Stripe
     end
 
     should "be creatable with Faraday::UploadIO" do
-      stub_request(:post, "#{Stripe.uploads_base}/v1/files")
-        .with(headers: {
-          "Content-Type" => /\A#{Faraday::Request::Multipart.mime_type}/,
-        }) do |request|
-        request.body =~ /FileUploadTest/
-      end.to_return(body: JSON.generate(FIXTURE))
-
       file = Stripe::FileUpload.create(
         purpose: "dispute_evidence",
         file: Faraday::UploadIO.new(File.new(__FILE__), nil)

data/test/stripe/stripe_client_test.rb

@@ -681,6 +681,35 @@ module Stripe
             }
           )
         end
+
+        should "merge query parameters in URL and params" do
+          client = StripeClient.new
+          client.execute_request(:get, "/v1/invoices/upcoming?coupon=25OFF", params: {
+            customer: "cus_123",
+          })
+          assert_requested(
+            :get,
+            "#{Stripe.api_base}/v1/invoices/upcoming?",
+            query: {
+              coupon: "25OFF",
+              customer: "cus_123",
+            }
+          )
+        end
+
+        should "prefer query parameters in params when specified in URL as well" do
+          client = StripeClient.new
+          client.execute_request(:get, "/v1/invoices/upcoming?customer=cus_query", params: {
+            customer: "cus_param",
+          })
+          assert_requested(
+            :get,
+            "#{Stripe.api_base}/v1/invoices/upcoming?",
+            query: {
+              customer: "cus_param",
+            }
+          )
+        end
       end
     end
 

data/test/test_helper.rb

@@ -13,7 +13,8 @@ PROJECT_ROOT = File.expand_path("../../", __FILE__)
 
 require File.expand_path("../test_data", __FILE__)
 
-MOCK_MINIMUM_VERSION = "0.12.0".freeze
+# If changing this number, please also change it in `.travis.yml`.
+MOCK_MINIMUM_VERSION = "0.15.0".freeze
 MOCK_PORT = ENV["STRIPE_MOCK_PORT"] || 12_111
 
 # Disable all real network connections except those that are outgoing to
@@ -46,6 +47,11 @@ module Test
       setup do
         Stripe.api_key = "sk_test_123"
         Stripe.api_base = "http://localhost:#{MOCK_PORT}"
+
+        # We don't point to the same host for the API and uploads in
+        # production, but `stripe-mock` supports both APIs.
+        Stripe.uploads_base = Stripe.api_base
+
         stub_connect
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stripe
 version: !ruby/object:Gem::Version
-  version: 3.13.0
+  version: 3.13.1
 platform: ruby
 authors:
 - Stripe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-11 00:00:00.000000000 Z
+date: 2018-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday