From beaa08f45b32fd354c2f6f86465a4841fd5d7aec Mon Sep 17 00:00:00 2001 From: SengMing Tan Date: Thu, 9 May 2019 14:58:13 -0400 Subject: [PATCH 01/25] end testing for rails < 5 --- .travis.yml | 2 +- gemfiles/{rails4.gemfile => rails52.gemfile} | 7 +++---- stripe-rails.gemspec | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) rename gemfiles/{rails4.gemfile => rails52.gemfile} (70%) diff --git a/.travis.yml b/.travis.yml index 8d4e4970..3a7540e0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,7 @@ script: after-build --exit-code $TRAVIS_TEST_RESULT; fi gemfile: - Gemfile -- gemfiles/rails4.gemfile +- gemfiles/rails52.gemfile notifications: slack: secure: csciM073msTrOOdVYVXdAsrx2sR3Y1BKL0VvlSsYxBJawDa8BFNl6Fw8Uz1V2n4OfnkMvMCME4I3EXsCb4Kl5omnK+7ibeCzzzkCR5VwUs5/vLY7awUfCiihSCqg5ULAp2T1whQJUl5HY9Ot62sujIUX/FUhPzdbCqaKQ7cVkUo= diff --git a/gemfiles/rails4.gemfile b/gemfiles/rails52.gemfile similarity index 70% rename from gemfiles/rails4.gemfile rename to gemfiles/rails52.gemfile index 108d095d..b35fdfac 100644 --- a/gemfiles/rails4.gemfile +++ b/gemfiles/rails52.gemfile @@ -1,9 +1,8 @@ source :rubygems -gem 'rails', '~> 4.2' +gem 'rails', '~> 5.2' gem 'rake' -gem 'responders', '~> 2.0' # to support Rails 4.2 gem 'stripe' group :test do @@ -14,6 +13,6 @@ group :test do # Required for system tests gem 'capybara' gem 'chromedriver-helper' - gem 'puma' + gem 'puma' gem 'selenium-webdriver' -end \ No newline at end of file +end diff --git a/stripe-rails.gemspec b/stripe-rails.gemspec index 6fb76d81..09deb078 100644 --- a/stripe-rails.gemspec +++ b/stripe-rails.gemspec @@ -14,7 +14,7 @@ Gem::Specification.new do |gem| gem.name = "stripe-rails" gem.require_paths = ["lib"] gem.version = Stripe::Rails::VERSION - gem.add_dependency 'rails', '>= 3' + gem.add_dependency 'rails', '>= 5' gem.add_dependency 'stripe', '>= 1.36.2' gem.add_dependency 'responders' end From d6814ec19367090d613237932376e374f4c08f23 Mon Sep 17 00:00:00 2001 From: SengMing Tan Date: Thu, 9 May 2019 15:05:22 -0400 Subject: [PATCH 02/25] updates rubies --- .travis.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3a7540e0..05f3cdfd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,7 @@ language: ruby rvm: -- 2.6.0 -- 2.5.3 -- 2.4.5 -- 2.3.8 +- 2.6.3 +- 2.5.5 addons: chrome: stable env: From c916426ac459432fcab0f9cb2b8632c226676b45 Mon Sep 17 00:00:00 2001 From: SengMing Tan Date: Thu, 9 May 2019 15:06:25 -0400 Subject: [PATCH 03/25] adds responders gem on rails 52 gemfile --- gemfiles/rails52.gemfile | 1 + 1 file changed, 1 insertion(+) diff --git a/gemfiles/rails52.gemfile b/gemfiles/rails52.gemfile index b35fdfac..0ac87dbb 100644 --- a/gemfiles/rails52.gemfile +++ b/gemfiles/rails52.gemfile @@ -3,6 +3,7 @@ source :rubygems gem 'rails', '~> 5.2' gem 'rake' +gem 'responders' gem 'stripe' group :test do From 6304d37bef66dc7f6c73b5b00094c92601dc101b Mon Sep 17 00:00:00 2001 From: SengMing Tan Date: Thu, 9 May 2019 15:18:15 -0400 Subject: [PATCH 04/25] rubies to match rails 5 requirements --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 05f3cdfd..6961cdd2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,8 @@ language: ruby rvm: - 2.6.3 - 2.5.5 +- 2.4.5 +- 2.3.8 addons: chrome: stable env: From b73ac9f1fe7136b73b8c5daae815c593c5bcf2a2 Mon Sep 17 00:00:00 2001 From: SengMing Tan Date: Thu, 9 May 2019 15:22:31 -0400 Subject: [PATCH 05/25] chrome driver -> webdrivers --- Gemfile | 4 ++-- gemfiles/rails52.gemfile | 2 +- test/spec_helper.rb | 5 +++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index c46399c4..d9dc5b1a 100644 --- a/Gemfile +++ b/Gemfile @@ -14,9 +14,9 @@ group :test do gem 'simplecov', require: false gem 'stripe-ruby-mock' gem 'webmock' - # Required for system tests + # System tests gem 'capybara' - gem 'chromedriver-helper' gem 'puma' gem 'selenium-webdriver' + gem 'webdrivers' end \ No newline at end of file diff --git a/gemfiles/rails52.gemfile b/gemfiles/rails52.gemfile index 0ac87dbb..ec122a00 100644 --- a/gemfiles/rails52.gemfile +++ b/gemfiles/rails52.gemfile @@ -13,7 +13,7 @@ group :test do gem 'webmock' # Required for system tests gem 'capybara' - gem 'chromedriver-helper' gem 'puma' gem 'selenium-webdriver' + gem 'webdrivers' end diff --git a/test/spec_helper.rb b/test/spec_helper.rb index 66cef9c4..8985105f 100644 --- a/test/spec_helper.rb +++ b/test/spec_helper.rb @@ -6,12 +6,13 @@ require 'minitest/autorun' require 'webmock/minitest' -WebMock.disable_net_connect!(allow_localhost: true) +WebMock.disable_net_connect!(allow_localhost: true, allow: 'chromedriver.storage.googleapis.com') # Chrome Setup require 'selenium-webdriver' require 'capybara' -require 'chromedriver-helper' +require 'webdrivers' + Capybara.register_driver :selenium do |app| Capybara::Selenium::Driver.new(app, :browser => :chrome) end From 80a3d23391d333318c0d9e661161c1c36c37cc7b Mon Sep 17 00:00:00 2001 From: SengMing Tan Date: Thu, 9 May 2019 15:26:41 -0400 Subject: [PATCH 06/25] excludes non-supported rubies for rails 6 --- .travis.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.travis.yml b/.travis.yml index 6961cdd2..390a41e8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,6 +23,12 @@ script: gemfile: - Gemfile - gemfiles/rails52.gemfile +matrix: + exclude: + - rvm: 2.4.5 + gemfile: Gemfile + - rvm: 2.3.8 + gemfile: Gemfile notifications: slack: secure: csciM073msTrOOdVYVXdAsrx2sR3Y1BKL0VvlSsYxBJawDa8BFNl6Fw8Uz1V2n4OfnkMvMCME4I3EXsCb4Kl5omnK+7ibeCzzzkCR5VwUs5/vLY7awUfCiihSCqg5ULAp2T1whQJUl5HY9Ot62sujIUX/FUhPzdbCqaKQ7cVkUo= From d6ce437b81517c5e18221ddd417a6dd37dc8d41a Mon Sep 17 00:00:00 2001 From: SengMing Tan Date: Thu, 9 May 2019 15:38:13 -0400 Subject: [PATCH 07/25] readme --- Changelog.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Changelog.md b/Changelog.md index 63e42354..112b5744 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,3 +1,8 @@ +## 2.0.0 (2019-XX-XX) - Rails 6 + +* [Breaking] The gem will only be tested against Rails 6, Rails 5.2, Rails 5.1 and Rails 5.0. It will probably still work on older versions of Rails, I just won't be testing or supporting them. +* [Breaking] It'll also tested Ruby 2.6 and Ruby 2.5 + ## 1.7.0 (2019-05-09) * [New Feature] add support for Plan to use a constant name different from plan id thanks @alexagranov ! From e0e22f936b6236a582621ff3171ed3864eaa5ea9 Mon Sep 17 00:00:00 2001 From: SengMing Tan Date: Thu, 9 May 2019 15:39:00 -0400 Subject: [PATCH 08/25] web drivers doesn't like the older rubies? https://travis-ci.org/tansengming/stripe-rails/jobs/530433280 --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 390a41e8..b3ab1e81 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,8 +2,6 @@ language: ruby rvm: - 2.6.3 - 2.5.5 -- 2.4.5 -- 2.3.8 addons: chrome: stable env: From d218987434f13a54a1e04e25a8c128cbb5eeba28 Mon Sep 17 00:00:00 2001 From: SengMing Tan Date: Thu, 9 May 2019 15:43:03 -0400 Subject: [PATCH 09/25] removes travis matrix --- .travis.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index b3ab1e81..05f3cdfd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,12 +21,6 @@ script: gemfile: - Gemfile - gemfiles/rails52.gemfile -matrix: - exclude: - - rvm: 2.4.5 - gemfile: Gemfile - - rvm: 2.3.8 - gemfile: Gemfile notifications: slack: secure: csciM073msTrOOdVYVXdAsrx2sR3Y1BKL0VvlSsYxBJawDa8BFNl6Fw8Uz1V2n4OfnkMvMCME4I3EXsCb4Kl5omnK+7ibeCzzzkCR5VwUs5/vLY7awUfCiihSCqg5ULAp2T1whQJUl5HY9Ot62sujIUX/FUhPzdbCqaKQ7cVkUo= From af37e989fc0877f4c50016028812c7e61cd7a2f2 Mon Sep 17 00:00:00 2001 From: SengMing Tan Date: Thu, 9 May 2019 15:45:00 -0400 Subject: [PATCH 10/25] adds testing for rails 5, 5.1 --- .travis.yml | 2 ++ gemfiles/rails50.gemfile | 19 +++++++++++++++++++ gemfiles/rails51.gemfile | 19 +++++++++++++++++++ gemfiles/rails52.gemfile | 2 +- 4 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 gemfiles/rails50.gemfile create mode 100644 gemfiles/rails51.gemfile diff --git a/.travis.yml b/.travis.yml index 05f3cdfd..01823eb8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,6 +21,8 @@ script: gemfile: - Gemfile - gemfiles/rails52.gemfile +- gemfiles/rails51.gemfile +- gemfiles/rails50.gemfile notifications: slack: secure: csciM073msTrOOdVYVXdAsrx2sR3Y1BKL0VvlSsYxBJawDa8BFNl6Fw8Uz1V2n4OfnkMvMCME4I3EXsCb4Kl5omnK+7ibeCzzzkCR5VwUs5/vLY7awUfCiihSCqg5ULAp2T1whQJUl5HY9Ot62sujIUX/FUhPzdbCqaKQ7cVkUo= diff --git a/gemfiles/rails50.gemfile b/gemfiles/rails50.gemfile new file mode 100644 index 00000000..5cf9c7b4 --- /dev/null +++ b/gemfiles/rails50.gemfile @@ -0,0 +1,19 @@ +source :rubygems + +gem 'rails', '~> 5.0.0' + +gem 'rake' +gem 'responders' +gem 'stripe' + +group :test do + gem 'mocha' + gem 'simplecov', require: false + gem 'stripe-ruby-mock' + gem 'webmock' + # Required for system tests + gem 'capybara' + gem 'puma' + gem 'selenium-webdriver' + gem 'webdrivers' +end diff --git a/gemfiles/rails51.gemfile b/gemfiles/rails51.gemfile new file mode 100644 index 00000000..a71a71d1 --- /dev/null +++ b/gemfiles/rails51.gemfile @@ -0,0 +1,19 @@ +source :rubygems + +gem 'rails', '~> 5.1.0' + +gem 'rake' +gem 'responders' +gem 'stripe' + +group :test do + gem 'mocha' + gem 'simplecov', require: false + gem 'stripe-ruby-mock' + gem 'webmock' + # Required for system tests + gem 'capybara' + gem 'puma' + gem 'selenium-webdriver' + gem 'webdrivers' +end diff --git a/gemfiles/rails52.gemfile b/gemfiles/rails52.gemfile index ec122a00..01598941 100644 --- a/gemfiles/rails52.gemfile +++ b/gemfiles/rails52.gemfile @@ -1,6 +1,6 @@ source :rubygems -gem 'rails', '~> 5.2' +gem 'rails', '~> 5.2.0' gem 'rake' gem 'responders' From 6d37165290942201459fb85895980ede5a36589b Mon Sep 17 00:00:00 2001 From: SengMing Tan Date: Mon, 30 Mar 2020 13:11:19 -0400 Subject: [PATCH 11/25] copy --- Changelog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index 69a38b6f..44e1089b 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,4 +1,4 @@ -## 2.0.0 (2019-XX-XX) - Rails 6 +## 2.0.0 (2020-XX-XX) - Rails 6 * [Breaking] The gem will only be tested against Rails 6.0, Rails 5.2 and Rails 5.1. It will probably still work on older versions of Rails, I just won't be testing or supporting them. * [Breaking] It'll also tested Ruby 2.6 and Ruby 2.5 From f3eb14c74510e057e798aaddf6cdb768c55e2324 Mon Sep 17 00:00:00 2001 From: SengMing Tan Date: Mon, 30 Mar 2020 13:13:22 -0400 Subject: [PATCH 12/25] cleanup --- Changelog.md | 2 +- Gemfile | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Changelog.md b/Changelog.md index 44e1089b..efb0dbcb 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,7 +1,7 @@ ## 2.0.0 (2020-XX-XX) - Rails 6 * [Breaking] The gem will only be tested against Rails 6.0, Rails 5.2 and Rails 5.1. It will probably still work on older versions of Rails, I just won't be testing or supporting them. -* [Breaking] It'll also tested Ruby 2.6 and Ruby 2.5 +* [Breaking] It'll also only be tested on Ruby 2.6 and Ruby 2.5 ## 1.9.1 (2019-10-28) diff --git a/Gemfile b/Gemfile index 6e2a1e76..31faa28c 100644 --- a/Gemfile +++ b/Gemfile @@ -16,7 +16,6 @@ group :test do gem 'webmock' # System tests gem 'capybara' - gem 'webdrivers' gem 'puma' gem 'selenium-webdriver' gem 'webdrivers' From 099d8d4063946a3b9e4b62728c21e9b881073e43 Mon Sep 17 00:00:00 2001 From: SengMing Tan Date: Mon, 30 Mar 2020 13:13:51 -0400 Subject: [PATCH 13/25] gemspec to support Rails >=5.1 --- stripe-rails.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stripe-rails.gemspec b/stripe-rails.gemspec index 09deb078..ccb43232 100644 --- a/stripe-rails.gemspec +++ b/stripe-rails.gemspec @@ -14,7 +14,7 @@ Gem::Specification.new do |gem| gem.name = "stripe-rails" gem.require_paths = ["lib"] gem.version = Stripe::Rails::VERSION - gem.add_dependency 'rails', '>= 5' + gem.add_dependency 'rails', '>= 5.1' gem.add_dependency 'stripe', '>= 1.36.2' gem.add_dependency 'responders' end From ad99cb732ca4d0c15691f4e62b2d9133e589b625 Mon Sep 17 00:00:00 2001 From: SengMing Tan Date: Mon, 30 Mar 2020 13:16:28 -0400 Subject: [PATCH 14/25] fixes github CI --- .github/workflows/ruby.yml | 4 ++-- gemfiles/rails51.gemfile | 1 + gemfiles/rails52.gemfile | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index 65782225..9ce577da 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -8,8 +8,8 @@ jobs: strategy: matrix: - ruby: [2.4.x, 2.5.x, 2.6.x] - gemfile: [Gemfile, gemfiles/rails4.gemfile] + ruby: [2.5.x, 2.6.x] + gemfile: [Gemfile, gemfiles/rails51.gemfile, gemfiles/rails52.gemfile] steps: - uses: actions/checkout@v1 diff --git a/gemfiles/rails51.gemfile b/gemfiles/rails51.gemfile index a71a71d1..8dbc73e6 100644 --- a/gemfiles/rails51.gemfile +++ b/gemfiles/rails51.gemfile @@ -4,6 +4,7 @@ gem 'rails', '~> 5.1.0' gem 'rake' gem 'responders' +gem 'sprockets', '< 4' gem 'stripe' group :test do diff --git a/gemfiles/rails52.gemfile b/gemfiles/rails52.gemfile index 01598941..e18a6764 100644 --- a/gemfiles/rails52.gemfile +++ b/gemfiles/rails52.gemfile @@ -4,6 +4,7 @@ gem 'rails', '~> 5.2.0' gem 'rake' gem 'responders' +gem 'sprockets', '< 4' gem 'stripe' group :test do From 215ce835c458af7943e99a749aa790aef00e5a02 Mon Sep 17 00:00:00 2001 From: SengMing Tan Date: Mon, 30 Mar 2020 13:16:57 -0400 Subject: [PATCH 15/25] removes rails 5.0 gemfile --- gemfiles/rails50.gemfile | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 gemfiles/rails50.gemfile diff --git a/gemfiles/rails50.gemfile b/gemfiles/rails50.gemfile deleted file mode 100644 index e5a9afba..00000000 --- a/gemfiles/rails50.gemfile +++ /dev/null @@ -1,20 +0,0 @@ -source :rubygems - -gem 'rails', '~> 5.0.0' -gem 'sprockets', '< 4' - -gem 'rake' -gem 'responders' -gem 'stripe' - -group :test do - gem 'mocha' - gem 'simplecov', require: false - gem 'stripe-ruby-mock' - gem 'webmock' - # Required for system tests - gem 'capybara' - gem 'puma' - gem 'selenium-webdriver' - gem 'webdrivers' -end From b63cdeb075b6ead2cb457cfd56cb509656a22aea Mon Sep 17 00:00:00 2001 From: SengMing Tan Date: Fri, 29 May 2020 15:19:08 -0400 Subject: [PATCH 16/25] removes rails 4 system test hacks --- test/support/application_system_test_case.rb | 9 ++------- test/support/null_system_test_case.rb | 11 ----------- 2 files changed, 2 insertions(+), 18 deletions(-) delete mode 100644 test/support/null_system_test_case.rb diff --git a/test/support/application_system_test_case.rb b/test/support/application_system_test_case.rb index a0b09719..25e81e5f 100644 --- a/test/support/application_system_test_case.rb +++ b/test/support/application_system_test_case.rb @@ -1,8 +1,3 @@ -require File.expand_path("null_system_test_case", __dir__) - -# For Rails 4 compat -SystemTestCaseKlass = defined?(ActionDispatch::SystemTestCase) ? ActionDispatch::SystemTestCase : NullSystemTestCase - -class ApplicationSystemTestCase < SystemTestCaseKlass +class ApplicationSystemTestCase < ActionDispatch::SystemTestCase driven_by :selenium_chrome_headless -end \ No newline at end of file +end diff --git a/test/support/null_system_test_case.rb b/test/support/null_system_test_case.rb deleted file mode 100644 index 3d628dc1..00000000 --- a/test/support/null_system_test_case.rb +++ /dev/null @@ -1,11 +0,0 @@ -class NullSystemTestCase - def self.driven_by(*_) - end - - def self.setup - end - - def self.test(_) - warn 'WARNING: Skipping system test because this version of Rails does not support it!' - end -end \ No newline at end of file From ef3927e6cee8ee67d9b33ca10b0e2c4c3149eafa Mon Sep 17 00:00:00 2001 From: SengMing Tan Date: Fri, 29 May 2020 17:04:34 -0400 Subject: [PATCH 17/25] removes bundler hack for rails 4 --- .github/workflows/ruby.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index 229f0ce5..b84ab29b 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -34,8 +34,6 @@ jobs: CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }} RUBY_VERSION: ${{ matrix.ruby }} run: | - gem uninstall bundler - gem install bundler -v 1.17.3 bundle install --jobs 4 --retry 3 bundle exec rake if [ `basename $BUNDLE_GEMFILE` == "Gemfile" ] && [ $RUBY_VERSION == "2.6.x" ] && [ ! -z ${CC_TEST_REPORTER_ID} ] ; From 9ebf1fc692264d9e3fcb582cd0df3ebf80eb68c5 Mon Sep 17 00:00:00 2001 From: SengMing Tan Date: Fri, 29 May 2020 17:08:30 -0400 Subject: [PATCH 18/25] fixes changelog --- Changelog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index c6cb1c21..2a32328e 100644 --- a/Changelog.md +++ b/Changelog.md @@ -5,7 +5,7 @@ ## 2.0.0 (2020-XX-XX) - Rails 6 * [Breaking] The gem will only be tested against Rails 6.0, Rails 5.2 and Rails 5.1. It will probably still work on older versions of Rails, I just won't be testing or supporting them. -* [Breaking] It'll also only be tested on Ruby 2.6 and Ruby 2.5 +* [Breaking] It'll also only be tested on Ruby 2.7, 2.6 and 2.5 ## 1.10.1 (2020-05-29) From 2e427d6f02cafcd54655522cd6ab63ef653c4a01 Mon Sep 17 00:00:00 2001 From: SengMing Tan Date: Fri, 29 May 2020 17:11:01 -0400 Subject: [PATCH 19/25] Revert "reverts removal of transfer callbacks for backwards compatibility" This reverts commit c948c291f94b2d847f406c3273c3eacd6c85581f. --- lib/stripe/callbacks.rb | 4 ---- 1 file changed, 4 deletions(-) diff --git a/lib/stripe/callbacks.rb b/lib/stripe/callbacks.rb index d1b8c619..26fe83bf 100644 --- a/lib/stripe/callbacks.rb +++ b/lib/stripe/callbacks.rb @@ -105,10 +105,6 @@ module Callbacks callback 'ping' callback 'stripe.event' - # Deprecated - callback 'transfer.failed' # https://stripe.com/docs/upgrades#2017-04-06 - callback 'transfer.paid' # https://stripe.com/docs/upgrades#2017-04-06 - class << self def run_callbacks(evt, target) _run_callbacks evt.type, evt, target From 72734293db9ac477a95cd3586b50e0d5667b6f3f Mon Sep 17 00:00:00 2001 From: SengMing Tan Date: Fri, 29 May 2020 17:19:34 -0400 Subject: [PATCH 20/25] removes pings controller and it's friends --- app/controllers/stripe/pings_controller.rb | 10 ---------- app/models/stripe/ping.rb | 9 --------- test/pings_controller_spec.rb | 18 ------------------ 3 files changed, 37 deletions(-) delete mode 100644 app/controllers/stripe/pings_controller.rb delete mode 100644 app/models/stripe/ping.rb delete mode 100644 test/pings_controller_spec.rb diff --git a/app/controllers/stripe/pings_controller.rb b/app/controllers/stripe/pings_controller.rb deleted file mode 100644 index 06237bd7..00000000 --- a/app/controllers/stripe/pings_controller.rb +++ /dev/null @@ -1,10 +0,0 @@ -module Stripe - class PingsController < ::Stripe::ApplicationController - respond_to :json - - def show - @ping = Ping.new - respond_with @ping - end - end -end \ No newline at end of file diff --git a/app/models/stripe/ping.rb b/app/models/stripe/ping.rb deleted file mode 100644 index 32a4725b..00000000 --- a/app/models/stripe/ping.rb +++ /dev/null @@ -1,9 +0,0 @@ -module Stripe - class Ping - attr_reader :message - - def initialize - @message = "Your sound card works perfectly!" - end - end -end \ No newline at end of file diff --git a/test/pings_controller_spec.rb b/test/pings_controller_spec.rb deleted file mode 100644 index a317a5d2..00000000 --- a/test/pings_controller_spec.rb +++ /dev/null @@ -1,18 +0,0 @@ -require 'spec_helper' - -describe Stripe::PingsController do - parallelize_me! - include Rack::Test::Methods - - let(:app) { Rails.application } - before do - header 'Accept', 'application/json' - header 'Content-Type', 'application/json' - end - - describe 'the ping interface' do - subject { get '/stripe/ping' } - - it { _(subject).must_be :ok? } - end -end \ No newline at end of file From 63817f050dedeffe4ec6155d2764d130741105ea Mon Sep 17 00:00:00 2001 From: SengMing Tan Date: Fri, 29 May 2020 17:25:49 -0400 Subject: [PATCH 21/25] updates readme --- Changelog.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index 2a32328e..47e78942 100644 --- a/Changelog.md +++ b/Changelog.md @@ -5,7 +5,8 @@ ## 2.0.0 (2020-XX-XX) - Rails 6 * [Breaking] The gem will only be tested against Rails 6.0, Rails 5.2 and Rails 5.1. It will probably still work on older versions of Rails, I just won't be testing or supporting them. -* [Breaking] It'll also only be tested on Ruby 2.7, 2.6 and 2.5 +* [Breaking] It'll also only be tested on Ruby 2.7, 2.6 and 2.5. +* [Breaking] Removes Stripe::PingsController controller. ## 1.10.1 (2020-05-29) From 522534f38fc02d2c3596027f23a35239247e25f2 Mon Sep 17 00:00:00 2001 From: SengMing Tan Date: Fri, 29 May 2020 17:30:39 -0400 Subject: [PATCH 22/25] updated version number --- Changelog.md | 6 +++--- lib/stripe/rails/version.rb | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Changelog.md b/Changelog.md index 47e78942..08f5b51e 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,10 +2,10 @@ - -## 2.0.0 (2020-XX-XX) - Rails 6 +## 2.0.0.pre (2020-XX-XX) -* [Breaking] The gem will only be tested against Rails 6.0, Rails 5.2 and Rails 5.1. It will probably still work on older versions of Rails, I just won't be testing or supporting them. -* [Breaking] It'll also only be tested on Ruby 2.7, 2.6 and 2.5. +* [Breaking] Updated to work only with Rails >= 5.1 +* [Breaking] It'll only be tested on Ruby 2.7, 2.6 and 2.5. * [Breaking] Removes Stripe::PingsController controller. ## 1.10.1 (2020-05-29) diff --git a/lib/stripe/rails/version.rb b/lib/stripe/rails/version.rb index a2a245d3..77d9fd67 100644 --- a/lib/stripe/rails/version.rb +++ b/lib/stripe/rails/version.rb @@ -1,5 +1,5 @@ module Stripe module Rails - VERSION = '1.10.1'.freeze + VERSION = '2.0.0.pre'.freeze end end From 8628e37bcabc453698d88ccc42479a85108164cd Mon Sep 17 00:00:00 2001 From: SengMing Tan Date: Fri, 29 May 2020 17:35:14 -0400 Subject: [PATCH 23/25] updates stripe gem requirement --- Changelog.md | 1 + stripe-rails.gemspec | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index 08f5b51e..dcf6a79d 100644 --- a/Changelog.md +++ b/Changelog.md @@ -6,6 +6,7 @@ * [Breaking] Updated to work only with Rails >= 5.1 * [Breaking] It'll only be tested on Ruby 2.7, 2.6 and 2.5. +* [Breaking] Supports the Stripe gem => 3.15.0 (from 2 years ago) * [Breaking] Removes Stripe::PingsController controller. ## 1.10.1 (2020-05-29) diff --git a/stripe-rails.gemspec b/stripe-rails.gemspec index ccb43232..5595541e 100644 --- a/stripe-rails.gemspec +++ b/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', '>= 5.1' - gem.add_dependency 'stripe', '>= 1.36.2' + gem.add_dependency 'stripe', '>= 3.15.0' gem.add_dependency 'responders' end From be440e6ed1036624736672070208e2a98d1f2721 Mon Sep 17 00:00:00 2001 From: SengMing Tan Date: Fri, 29 May 2020 17:51:16 -0400 Subject: [PATCH 24/25] adds pre release date to changelog --- Changelog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index dcf6a79d..fc58fb6d 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,7 +2,7 @@ - -## 2.0.0.pre (2020-XX-XX) +## 2.0.0.pre (2020-05-29) * [Breaking] Updated to work only with Rails >= 5.1 * [Breaking] It'll only be tested on Ruby 2.7, 2.6 and 2.5. From d40421fce76c086bc50da5337070590c2575bd94 Mon Sep 17 00:00:00 2001 From: SengMing Tan Date: Fri, 18 Sep 2020 15:02:06 -0400 Subject: [PATCH 25/25] updates changelog --- Changelog.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Changelog.md b/Changelog.md index d65a76a1..84c9f901 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,5 +1,10 @@ ## Unreleased +## 2.0.0 (2020-09-18) + +- Everything from on the 2.0.0.pre release +- includes changes from the 1.10.2 release + ## 1.10.2 (2020-09-18) - adds missing callback `invoice.paid`. Thanks @SyborgStudios.