Support Rails 5.0

Highlights include:

- Stop deprecation notices relating to:
  - `:back` for redirects
  - `render nothing: true`
  - Rails 5.0 on using `to_hash`
  - `static_cache_control`
  - `before_filter` -> `before_action`
- Compatibility shim to support params keywords in controller specs
- Upgrade CI SQLite to avoid Rails 5.0 migration bug rails/rails#24440
- Upgrade CI Ruby to 2.3.1
- Upgrade Rack to version required by Rails 5.0
- Dummy app upgrade to Rails 5 (and downgrades to 4.x when required for tests)

Author: eliotsykes

Diff for: .gitignore

@@ -1,14 +1,17 @@
-.bundle/
 log/*.log
 pkg/
 spec/dummy/db/*.sqlite3
 spec/dummy/db/*.sqlite3-journal
 spec/dummy/log/*.log
 spec/dummy/tmp/
 spec/dummy/.sass-cache
-Gemfile.lock
 coverage
 .rspec
 *.sublime-*
 .idea
-vendor/bundle*
+
+# Bundler-related
+.bundle/
+vendor/bundle
+Gemfile.lock
+gemfiles/*.lock

Diff for: Gemfile

@@ -8,4 +8,4 @@ group :test do
 end
 gem 'rspec_junit_formatter'
 
-gem 'rails', git: 'https://github.com/rails/rails', branch: '4-2-stable'
+gem 'rails', git: 'https://github.com/rails/rails', branch: '5-0-stable'

Diff for: Rakefile

@@ -10,21 +10,22 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title    = 'Payola'
   rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.rdoc')
+  rdoc.rdoc_files.include('README.md')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
 APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
 load 'rails/tasks/engine.rake'
 
-Bundler::GemHelper.install_tasks
+load 'rails/tasks/statistics.rake'
+require 'bundler/gem_tasks'
 
 Dir[File.join(File.dirname(__FILE__), 'tasks/**/*.rake')].each {|f| load f }
 
 require 'rspec/core'
 require 'rspec/core/rake_task'
 
 desc "Run all specs in spec directory (excluding plugin specs)"
-RSpec::Core::RakeTask.new(:spec => 'app:db:test:prepare')
+RSpec::Core::RakeTask.new(spec: 'app:db:test:prepare')
 
-task :default => :spec
+task default: :spec

Diff for: app/assets/javascripts/payola/application.js

@@ -2,12 +2,12 @@
 // listed below.
 //
 // Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
-// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
+// or any plugin's vendor/assets/javascripts directory can be referenced here using a relative path.
 //
 // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// compiled file.
+// compiled file. JavaScript code in this file should be added after the last require_* statement.
 //
-// Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
+// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
 // about supported directives.
 //
 //= require_tree .

Diff for: app/assets/stylesheets/payola/application.css

@@ -3,12 +3,12 @@
  * listed below.
  *
  * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
- * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
+ * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path.
  *
  * You're free to add application-wide styles to this file and they'll appear at the bottom of the
- * compiled file so the styles you add here take precedence over styles defined in any styles
- * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
- * file per style scope.
+ * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS
+ * files in this directory. Styles in this file should be added after the last require_* statement.
+ * It is generally better to create a new file per style scope.
  *
  *= require_tree .
  *= require_self

Diff for: app/controllers/concerns/payola/affiliate_behavior.rb

@@ -3,7 +3,7 @@ module AffiliateBehavior
     extend ActiveSupport::Concern
 
     included do
-      before_filter :find_affiliate
+      before_action :find_affiliate
     end
 
     def find_affiliate

Diff for: app/controllers/concerns/payola/status_behavior.rb

@@ -3,7 +3,7 @@ module StatusBehavior
     extend ActiveSupport::Concern
 
     def render_payola_status(object)
-      render nothing: true, status: 404 and return unless object
+      head :not_found and return unless object
 
       errors = ([object.error.presence] + object.errors.full_messages).compact.to_sentence
 

Diff for: app/controllers/payola/application_controller.rb

@@ -1,5 +1,13 @@
 module Payola
   class ApplicationController < ::ApplicationController
     helper PriceHelper
+
+    private
+
+    def return_to
+      return params[:return_to] if params[:return_to]
+      request.headers["Referer"] or raise ActionController::RedirectBackError
+    end
+
   end
 end

Diff for: app/controllers/payola/cards_controller.rb

@@ -1,24 +1,26 @@
 module Payola
   class CardsController < ApplicationController
-  
-    before_filter :check_modify_permissions, only: [:create, :destroy]
-    
+
+    before_action :check_modify_permissions, only: [:create, :destroy]
+
     def create
       if params[:customer_id].present? && params[:stripeToken].present?
         Payola::CreateCard.call(params[:customer_id], params[:stripeToken])
-        redirect_to return_to, notice: t('payola.cards.created')
+        flash_options = { notice: t('payola.cards.created') }
       else
-        redirect_to return_to, alert: t('payola.cards.not_created')
-      end  
+        flash_options = { alert: t('payola.cards.not_created') }
+      end
+      redirect_to return_to, flash: flash_options
     end
 
     def destroy
       if params[:id].present? && params[:customer_id].present?
         Payola::DestroyCard.call(params[:id], params[:customer_id])
-        redirect_to return_to, notice: t('payola.cards.destroyed')
+        flash_options = { notice: t('payola.cards.destroyed') }
       else
-        redirect_to return_to, alert: t('payola.cards.not_destroyed')
-      end  
+        flash_options = { alert: t('payola.cards.not_destroyed') }
+      end
+      redirect_to return_to, flash: flash_options
     end
 
     private
@@ -32,9 +34,5 @@ def check_modify_permissions
       end
     end
 
-    def return_to
-      params[:return_to] || :back
-    end
-
   end
 end

Diff for: app/controllers/payola/customers_controller.rb

@@ -1,15 +1,16 @@
 module Payola
   class CustomersController < ApplicationController
 
-    before_filter :check_modify_permissions, only: [:update]
+    before_action :check_modify_permissions, only: [:update]
 
     def update
       if params[:id].present?
         Payola::UpdateCustomer.call(params[:id], customer_params)
-        redirect_to return_to, notice: t('payola.customers.updated')
+        flash_options = { notice: t('payola.customers.updated') }
       else
-        redirect_to return_to, alert: t('payola.customers.not_updated')
+        flash_options = { alert: t('payola.customers.not_updated') }
       end
+      redirect_to return_to, flash: flash_options
     end
 
     private
@@ -29,9 +30,5 @@ def check_modify_permissions
       end
     end
 
-    def return_to
-      params[:return_to] || :back
-    end
-
   end
 end

Diff for: app/controllers/payola/subscriptions_controller.rb

@@ -4,8 +4,8 @@ class SubscriptionsController < ApplicationController
     include Payola::StatusBehavior
     include Payola::AsyncBehavior
 
-    before_filter :find_plan_coupon_and_quantity, only: [:create, :change_plan]
-    before_filter :check_modify_permissions, only: [:destroy, :change_plan, :change_quantity, :update_card]
+    before_action :find_plan_coupon_and_quantity, only: [:create, :change_plan]
+    before_action :check_modify_permissions, only: [:destroy, :change_plan, :change_quantity, :update_card]
 
     def show
       show_object(Subscription)
@@ -21,7 +21,7 @@ def create
 
     def destroy
       subscription = Subscription.find_by!(guid: params[:guid])
-      Payola::CancelSubscription.call(subscription, at_period_end: ActiveRecord::ConnectionAdapters::Column::TRUE_VALUES.include?(params[:at_period_end]))
+      Payola::CancelSubscription.call(subscription, at_period_end: to_boolean(params[:at_period_end]))
       redirect_to confirm_subscription_path(subscription)
     end
 
@@ -89,5 +89,11 @@ def confirm_with_message(message)
       end
     end
 
+    TRUE_VALUES = [true, 1, '1', 't', 'T', 'true', 'TRUE', 'on', 'ON'].to_set
+
+    def to_boolean(value)
+      TRUE_VALUES.include?(value)
+    end
+
   end
 end

Diff for: app/controllers/payola/transactions_controller.rb

@@ -4,7 +4,7 @@ class TransactionsController < ApplicationController
     include Payola::StatusBehavior
     include Payola::AsyncBehavior
 
-    before_filter :find_product_and_coupon, only: [:create]
+    before_action :find_product_and_coupon, only: [:create]
 
     def show
       show_object(Sale)

Diff for: app/services/payola/update_customer.rb

@@ -3,7 +3,7 @@ class UpdateCustomer
     def self.call(stripe_customer_id, options)
       secret_key = Payola.secret_key
       customer = Stripe::Customer.retrieve(stripe_customer_id, secret_key)
-      customer.save(options)
+      customer.save(options.to_h)
     end
   end
 end

Diff for: bin/rails

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
-# This command will automatically be run when you run "rails" with Rails 4 gems installed from the root of your application.
+# This command will automatically be run when you run "rails" with Rails gems
+# installed from the root of your application.
 
 ENGINE_ROOT = File.expand_path('../..', __FILE__)
 ENGINE_PATH = File.expand_path('../../lib/payola/engine', __FILE__)

Diff for: circle.yml

@@ -1,18 +1,30 @@
+machine:
+  environment:
+    RAILS_ENV: test
+  ruby:
+    version: 2.3.1
+
 dependencies:
+  pre:
+    # Sqlite version should be > 3.7.9 to avoid issues with Rails 5.0
+    # https://github.com/rails/rails/pull/24440
+    - sudo apt-get install --only-upgrade sqlite3 libsqlite3-dev
+    - sqlite3 --version
+
   cache_directories:
-    - "vendor/bundle_rails-4.2"
-    - "vendor/bundle_rails-4.1"
+    - "vendor/bundle"
 
   override:
-    - bundle install --path=vendor/bundle_rails-4.2
-    - bundle install --gemfile=gemfiles/rails-4.1.gemfile --path=../vendor/bundle_rails-4.1
+    - bundle install --gemfile=Gemfile --path=vendor/bundle
+    - bundle install --gemfile=gemfiles/rails_4_2.gemfile --path=../vendor/bundle
+    - bundle install --gemfile=gemfiles/rails_4_1.gemfile --path=../vendor/bundle
 
 database:
   override:
-    - cp config/database.yml.ci config/database.yml
-    - bundle exec rake db:create db:migrate db:seed --trace
+    - echo "Do nothing in database step, default rake default task sets up db."
 
 test:
   override:
-    - bundle exec rake
-    - BUNDLE_GEMFILE=gemfiles/rails-4.1.gemfile bundle exec rake
+    - BUNDLE_GEMFILE=Gemfile bundle exec rake
+    - BUNDLE_GEMFILE=gemfiles/rails_4_2.gemfile bundle exec rake
+    - BUNDLE_GEMFILE=gemfiles/rails_4_1.gemfile bundle exec rake

Diff for: config/database.yml.ci

@@ -0,0 +1,12 @@
+source 'https://rubygems.org'
+
+gemspec path: '..'
+
+group :test do
+  gem 'rspec-rails', '~> 3.5'
+  gem 'simplecov', require: false
+  gem 'codeclimate-test-reporter', require: nil
+end
+gem 'rspec_junit_formatter'
+
+gem 'rails', git: 'https://github.com/rails/rails', branch: '4-2-stable'