stripe-rails 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b4472dc93a9a92f24f317a0d1048126780e7bf84
-  data.tar.gz: 862d7edf59f3ba3c8e1288a93ef892805b70155a
+SHA256:
+  metadata.gz: 527a4386b9b19687aa3a803c8645a814d7f9c5e2ece5a51033a453eafcceab58
+  data.tar.gz: 5fd3c8566a15edbf6319658a3adbca642dbba53882bab207732c3dc946533edd
 SHA512:
-  metadata.gz: 829dc5a3512ab65c93d82fdff3b761631d1119c0e48e70d46aa793530e6e2d3914c17ea30986cca4ddf58928572e6a5cea0b89a7af96e2a4171c51930bf15b51
-  data.tar.gz: 7f0f08f7bc250f8ee65cbf8c68b13226e1f28505c831af66c247c2d6436865953eb763788eba33db1a8cc8fcbc874de55b94b56a820a4345ccadd2d4e4ec0c95
+  metadata.gz: 748847a11c9e7e9741b6da139fea408ee6a95f3768f8bc8c35ae4f64dad843661e317502c7d898754d309dc34797cdffa5d0ab5f6151e50a8402ce13f5fcda91
+  data.tar.gz: fdd425809e6d4522f752c949c1eab0546524cd255ff97b6591b6a86bd962d14cdab2a7cde6c42573e1dce17eae1fbffd7f672473adc77a3c4cb5825ba8692217

data/.gitignore

@@ -19,3 +19,4 @@ test/dummy/**/*.log
 tmp
 .rvmrc
 .DS_Store
+.ruby-version

data/.travis.yml

@@ -1,5 +1,6 @@
 language: ruby
 rvm:
+- 2.5.0
 - 2.4.1
 - 2.3.4
 - 2.2.7

data/Changelog.md

@@ -1,3 +1,7 @@
+## 1.2.1 (2018-03-22)
+
+* Fixes Stripe API update on 2018-02-05 that breaks the plan builder (thanks to @georgecheng for reporting this!)
+
 ## 1.2.0 (2018-01-02)
 
 * Added additional callbacks (thanks @lloydpick & @dja)

data/Gemfile

@@ -9,6 +9,10 @@ gem 'tzinfo'
 gem 'mocha'
 gem 'pry'
 
+group :development, :test do
+  gem 'm'
+end
+
 group :test do
   gem 'simplecov', require: false
   # NOTE: tracking master temporarily until they
@@ -17,4 +21,5 @@ group :test do
   gem 'poltergeist' # required for system tests
   gem 'phantomjs'   # ditto
   gem 'puma'        # ditto
+  gem 'webmock'
 end

data/gemfiles/rails4.gemfile

@@ -16,4 +16,5 @@ group :test do
   gem 'poltergeist'
   gem 'phantomjs', :require => 'phantomjs/poltergeist'
   gem 'puma'
+  gem 'webmock'
 end

data/gemfiles/rails5.gemfile

@@ -16,4 +16,5 @@ group :test do
   gem 'poltergeist'
   gem 'phantomjs', :require => 'phantomjs/poltergeist'
   gem 'puma'
+  gem 'webmock'
 end

data/lib/stripe/plans.rb

@@ -20,7 +20,43 @@ module Stripe
         @trial_period_days = 0
       end
 
+      private
+
       def create_options
+        if api_version_after_switch_to_products_in_plans
+          default_create_options
+        else
+          create_options_without_products
+        end
+      end
+
+      def api_version_after_switch_to_products_in_plans
+        Date.parse(current_api_version) >= Date.parse('2018-02-05')
+      end
+
+      def current_api_version
+        Stripe.api_version || begin
+          resp, _ = @stripe_class.request(:get, @stripe_class.resource_url)
+          resp.http_headers['stripe-version']
+        end
+      end
+
+      def default_create_options
+        {
+          :currency => @currency,
+          product: {
+            :name => @name,
+            :statement_descriptor => @statement_descriptor,
+          },
+          :amount => @amount,
+          :interval => @interval,
+          :interval_count => @interval_count,
+          :trial_period_days => @trial_period_days,
+          :metadata => @metadata,
+        }
+      end
+
+      def create_options_without_products
         {
           :currency => @currency,
           :name => @name,

data/lib/stripe/rails/version.rb

@@ -1,5 +1,5 @@
 module Stripe
   module Rails
-    VERSION = '1.2.0'
+    VERSION = '1.2.1'
   end
 end

data/stripe-rails.gemspec

@@ -15,6 +15,6 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Stripe::Rails::VERSION
   gem.add_dependency 'rails', '>= 3'
-  gem.add_dependency 'stripe'
+  gem.add_dependency 'stripe', '>= 1.36.2'
   gem.add_dependency 'responders'
 end

data/test/fixtures/stripe_plans.json

@@ -0,0 +1,7 @@
+{
+  "object": "list",
+  "count": 0,
+  "data": [],
+  "has_more": false,
+  "url": "/v1/plans"
+}

data/test/fixtures/stripe_plans_headers.json

@@ -0,0 +1,16 @@
+{
+  "Server": "nginx",
+  "Date": "Wed, 21 Mar 2018 20:04:56 GMT",
+  "Content-Type": "application/json",
+  "Content-Length": "5807",
+  "Connection": "close",
+  "Access-Control-Allow-Credentials": "true",
+  "Access-Control-Allow-Methods": "GET, POST, HEAD, OPTIONS, DELETE",
+  "Access-Control-Allow-Origin": "*",
+  "Access-Control-Expose-Headers": "Request-Id, Stripe-Manage-Version, X-Stripe-External-Auth-Required, X-Stripe-Privileged-Session-Required",
+  "Access-Control-Max-Age": "300",
+  "Cache-Control": "no-cache, no-store",
+  "Request-Id": "req_UCuedZo4sKqUXn",
+  "Stripe-Version": "2018-02-05",
+  "Strict-Transport-Security": "max-age=31556926; includeSubDomains; preload"
+}

data/test/fixtures/stripe_plans_headers_2017.json

@@ -0,0 +1,16 @@
+{
+  "Server": "nginx",
+  "Date": "Wed, 21 Mar 2018 20:04:56 GMT",
+  "Content-Type": "application/json",
+  "Content-Length": "5807",
+  "Connection": "close",
+  "Access-Control-Allow-Credentials": "true",
+  "Access-Control-Allow-Methods": "GET, POST, HEAD, OPTIONS, DELETE",
+  "Access-Control-Allow-Origin": "*",
+  "Access-Control-Expose-Headers": "Request-Id, Stripe-Manage-Version, X-Stripe-External-Auth-Required, X-Stripe-Privileged-Session-Required",
+  "Access-Control-Max-Age": "300",
+  "Cache-Control": "no-cache, no-store",
+  "Request-Id": "req_UCuedZo4sKqUXn",
+  "Stripe-Version": "2017-02-05",
+  "Strict-Transport-Security": "max-age=31556926; includeSubDomains; preload"
+}

data/test/plan_builder_spec.rb

@@ -104,9 +104,16 @@ describe 'building plans' do
     end
 
     describe 'uploading' do
+      include FixtureLoader
+
       describe 'when none exists on stripe.com' do
+        let(:headers) { load_request_fixture('stripe_plans_headers_2017.json') }
         before do
           Stripe::Plan.stubs(:retrieve).raises(Stripe::InvalidRequestError.new("not found", "id"))
+
+          stub_request(:get, "https://api.stripe.com/v1/plans").
+            with(headers: { 'Authorization'=>'Bearer XYZ',}).
+            to_return(status: 200, body: load_request_fixture('stripe_plans.json'), headers: JSON.parse(headers))
         end
 
         it 'creates the plan online' do
@@ -139,6 +146,51 @@ describe 'building plans' do
           Stripe::Plans::ALTERNATIVE_CURRENCY.put!
         end
 
+        describe 'when using the API version that supports products' do
+          before { Stripe.api_version = '2018-02-05' }
+          after  { Stripe.api_version = nil }
+
+          it 'creates the plan online' do
+            Stripe::Plan.expects(:create).with(
+              :id => :gold,
+              :currency => 'usd',
+              :product => {
+                :name => 'Solid Gold',
+                :statement_descriptor => nil,
+              },
+              :amount => 699,
+              :interval => 'month',
+              :interval_count => 1,
+              :trial_period_days => 0,
+              :metadata => nil,
+            )
+            Stripe::Plans::GOLD.put!
+          end
+        end
+
+        describe 'when api_version is not set for api versions that support products' do
+          before  { Stripe.api_version = nil }
+          subject { Stripe::Plans::GOLD.put! }
+          let(:headers) { load_request_fixture('stripe_plans_headers.json') }
+
+          it 'creates the plan online' do
+            Stripe::Plan.expects(:create).with(
+              :id => :gold,
+              :currency => 'usd',
+              :product => {
+                :name => 'Solid Gold',
+                :statement_descriptor => nil,
+              },
+              :amount => 699,
+              :interval => 'month',
+              :interval_count => 1,
+              :trial_period_days => 0,
+              :metadata => nil,
+            )
+
+            subject
+          end
+        end
       end
 
       describe 'when it is already present on stripe.com' do

data/test/spec_helper.rb

@@ -5,6 +5,9 @@ end
 
 require 'minitest/autorun'
 
+require 'webmock/minitest'
+WebMock.disable_net_connect!(allow_localhost: true)
+
 # Configure Rails Environment
 ENV["RAILS_ENV"] = "test"
 ENV['STRIPE_SECRET_KEY'] = 'XYZ'

data/test/stripe_initializers_spec.rb

@@ -11,6 +11,12 @@ describe "Configuring the stripe engine" do
 
   def rerun_initializers!; initializers.each{|init| init.run(app) }; end
 
+  after do
+    Stripe.api_version = nil
+    Stripe.api_base    = 'https://api.stripe.com'
+    Stripe.api_key     = 'XYZ'
+  end
+
   describe 'Stripe configurations' do
     it "will have valid default values" do
       Stripe.api_base.must_equal          'https://api.stripe.com'

data/test/support/fixture_loader.rb

@@ -0,0 +1,5 @@
+module FixtureLoader
+  def load_request_fixture(name)
+    Pathname.new(__FILE__).join('..', '..', 'fixtures', name).read
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stripe-rails
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Charles Lowell
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-02 00:00:00.000000000 Z
+date: 2018-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -32,14 +32,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.36.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.36.2
 - !ruby/object:Gem::Dependency
   name: responders
   requirement: !ruby/object:Gem::Requirement
@@ -140,6 +140,9 @@ files:
 - test/dummy_apis_controller_spec.rb
 - test/dummy_stripes_controller_spec.rb
 - test/event.json
+- test/fixtures/stripe_plans.json
+- test/fixtures/stripe_plans_headers.json
+- test/fixtures/stripe_plans_headers_2017.json
 - test/invoice.json
 - test/javascript_helper_spec.rb
 - test/pings_controller_spec.rb
@@ -148,6 +151,7 @@ files:
 - test/stripe_initializers_spec.rb
 - test/support/application_system_test_case.rb
 - test/support/callback_helpers.rb
+- test/support/fixture_loader.rb
 - test/support/null_system_test_case.rb
 - test/testing_spec.rb
 homepage: https://github.com/Everapps/stripe-rails
@@ -170,7 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: A gem to integrate stripe into your rails app
@@ -219,6 +223,9 @@ test_files:
 - test/dummy_apis_controller_spec.rb
 - test/dummy_stripes_controller_spec.rb
 - test/event.json
+- test/fixtures/stripe_plans.json
+- test/fixtures/stripe_plans_headers.json
+- test/fixtures/stripe_plans_headers_2017.json
 - test/invoice.json
 - test/javascript_helper_spec.rb
 - test/pings_controller_spec.rb
@@ -227,5 +234,6 @@ test_files:
 - test/stripe_initializers_spec.rb
 - test/support/application_system_test_case.rb
 - test/support/callback_helpers.rb
+- test/support/fixture_loader.rb
 - test/support/null_system_test_case.rb
 - test/testing_spec.rb