upgrade to rails 5.0.0.beta3

- ran `rails rails:update` - also updated rspec-rails to 3.5.0.beta3 for rails 5 compatibility - modified puma config

Author: audionerd

Gemfile

@@ -3,7 +3,7 @@ ruby "2.3.0"
 
 #
 # Bundle edge Rails instead: gem "rails", github: "rails/rails"
-gem "rails", "~>4.2"
+gem "rails", "5.0.0.beta3"
 
 # Note: We're using sqllite3 for development and testing
 gem "sqlite3", group: [:development, :test]
@@ -102,7 +102,7 @@ group :test do
  gem "generator_spec"
  gem "launchy"
  gem "poltergeist"
- gem "rspec-rails"
+ gem "rspec-rails", "3.5.0.beta3"
  gem "rspec-retry"
  gem "selenium-webdriver", require: !["poltergeist", "poltergeist_errors_ok", "webkit"].include?(ENV["DRIVER"])
 end

Gemfile.lock

@@ -1,45 +1,47 @@
 GEM
  remote: https://rubygems.org/
  specs:
- actionmailer (4.2.6)
- actionpack (= 4.2.6)
- actionview (= 4.2.6)
- activejob (= 4.2.6)
+ actioncable (5.0.0.beta3)
+ actionpack (= 5.0.0.beta3)
+ nio4r (~> 1.2)
+ websocket-driver (~> 0.6.1)
+ actionmailer (5.0.0.beta3)
+ actionpack (= 5.0.0.beta3)
+ actionview (= 5.0.0.beta3)
+ activejob (= 5.0.0.beta3)
  mail (~> 2.5, >= 2.5.4)
  rails-dom-testing (~> 1.0, >= 1.0.5)
- actionpack (4.2.6)
- actionview (= 4.2.6)
- activesupport (= 4.2.6)
- rack (~> 1.6)
- rack-test (~> 0.6.2)
+ actionpack (5.0.0.beta3)
+ actionview (= 5.0.0.beta3)
+ activesupport (= 5.0.0.beta3)
+ rack (~> 2.x)
+ rack-test (~> 0.6.3)
  rails-dom-testing (~> 1.0, >= 1.0.5)
  rails-html-sanitizer (~> 1.0, >= 1.0.2)
- actionview (4.2.6)
- activesupport (= 4.2.6)
+ actionview (5.0.0.beta3)
+ activesupport (= 5.0.0.beta3)
  builder (~> 3.1)
  erubis (~> 2.7.0)
  rails-dom-testing (~> 1.0, >= 1.0.5)
  rails-html-sanitizer (~> 1.0, >= 1.0.2)
- activejob (4.2.6)
- activesupport (= 4.2.6)
- globalid (>= 0.3.0)
- activemodel (4.2.6)
- activesupport (= 4.2.6)
-  builder (~> 3.1)
- activerecord (4.2.6)
- activemodel (= 4.2.6)
- activesupport (= 4.2.6)
-  arel (~> 6.0)
- activesupport (4.2.6)
+ activejob (5.0.0.beta3)
+ activesupport (= 5.0.0.beta3)
+ globalid (>= 0.3.6)
+ activemodel (5.0.0.beta3)
+ activesupport (= 5.0.0.beta3)
+ activerecord (5.0.0.beta3)
+  activemodel (= 5.0.0.beta3)
+ activesupport (= 5.0.0.beta3)
+ arel (~> 7.0)
+ activesupport (5.0.0.beta3)
+  concurrent-ruby (~> 1.0)
  i18n (~> 0.7)
- json (~> 1.7, >= 1.7.7)
  minitest (~> 5.1)
- thread_safe (~> 0.3, >= 0.3.4)
  tzinfo (~> 1.1)
  addressable (2.4.0)
  archive-zip (0.7.0)
  io-like (~> 0.3.0)
- arel (6.0.3)
+ arel (7.0.0)
  ast (2.2.0)
  autoprefixer-rails (6.3.6)
  execjs
@@ -60,8 +62,8 @@ GEM
  bundler-audit (0.5.0)
  bundler (~> 1.2)
  thor (~> 0.18)
- byebug (8.2.2)
- capybara (2.6.2)
+ byebug (8.2.3)
+ capybara (2.7.0)
  addressable
  mime-types (>= 1.16)
  nokogiri (>= 1.3.3)
@@ -71,8 +73,8 @@ GEM
  capybara-screenshot (1.0.12)
  capybara (>= 1.0, < 3)
  launchy
- capybara-webkit (1.9.0)
- capybara (>= 2.3.0, < 2.7.0)
+ capybara-webkit (1.10.0)
+ capybara (>= 2.3.0, < 2.8.0)
  json
  childprocess (0.5.9)
  ffi (~> 1.0, >= 1.0.11)
@@ -139,6 +141,7 @@ GEM
  mini_portile2 (2.0.0)
  minitest (5.8.4)
  multi_json (1.11.2)
+ nio4r (1.2.1)
  nokogiri (1.6.7.2)
  mini_portile2 (~> 2.0.0.rc2)
  parser (2.3.0.7)
@@ -168,21 +171,23 @@ GEM
  pry-stack_explorer (0.4.9.2)
  binding_of_caller (>= 0.7)
  pry (>= 0.9.11)
- puma (3.3.0)
- rack (1.6.4)
+ puma (3.4.0)
+ rack (2.0.0.alpha)
+ json
  rack-test (0.6.3)
  rack (>= 1.0)
- rails (4.2.6)
- actionmailer (= 4.2.6)
- actionpack (= 4.2.6)
- actionview (= 4.2.6)
- activejob (= 4.2.6)
- activemodel (= 4.2.6)
- activerecord (= 4.2.6)
- activesupport (= 4.2.6)
+ rails (5.0.0.beta3)
+ actioncable (= 5.0.0.beta3)
+ actionmailer (= 5.0.0.beta3)
+ actionpack (= 5.0.0.beta3)
+ actionview (= 5.0.0.beta3)
+ activejob (= 5.0.0.beta3)
+ activemodel (= 5.0.0.beta3)
+ activerecord (= 5.0.0.beta3)
+ activesupport (= 5.0.0.beta3)
  bundler (>= 1.3.0, < 2.0)
- railties (= 4.2.6)
- sprockets-rails
+ railties (= 5.0.0.beta3)
+ sprockets-rails (>= 2.0.0)
  rails-deprecated_sanitizer (1.0.3)
  activesupport (>= 4.2.0.alpha)
  rails-dom-testing (1.0.7)
@@ -196,9 +201,10 @@ GEM
  rails_stdout_logging
  rails_serve_static_assets (0.0.5)
  rails_stdout_logging (0.0.5)
- railties (4.2.6)
- actionpack (= 4.2.6)
- activesupport (= 4.2.6)
+ railties (5.0.0.beta3)
+ actionpack (= 5.0.0.beta3)
+ activesupport (= 5.0.0.beta3)
+ method_source
  rake (>= 0.8.7)
  thor (>= 0.18.1, < 2.0)
  rainbow (2.1.0)
@@ -212,25 +218,25 @@ GEM
  rails (>= 3.2)
  rainbow (~> 2.1)
  ref (2.0.0)
- rspec-core (3.4.4)
- rspec-support (~> 3.4.0)
- rspec-expectations (3.4.0)
+ rspec-core (3.5.0.beta3)
+ rspec-support (= 3.5.0.beta3)
+ rspec-expectations (3.5.0.beta3)
  diff-lcs (>= 1.2.0, < 2.0)
- rspec-support (~> 3.4.0)
- rspec-mocks (3.4.1)
+ rspec-support (= 3.5.0.beta3)
+ rspec-mocks (3.5.0.beta3)
  diff-lcs (>= 1.2.0, < 2.0)
- rspec-support (~> 3.4.0)
- rspec-rails (3.4.2)
- actionpack (>= 3.0, < 4.3)
- activesupport (>= 3.0, < 4.3)
- railties (>= 3.0, < 4.3)
- rspec-core (~> 3.4.0)
- rspec-expectations (~> 3.4.0)
- rspec-mocks (~> 3.4.0)
- rspec-support (~> 3.4.0)
+ rspec-support (= 3.5.0.beta3)
+ rspec-rails (3.5.0.beta3)
+ actionpack (>= 3.0)
+ activesupport (>= 3.0)
+ railties (>= 3.0)
+ rspec-core (= 3.5.0.beta3)
+ rspec-expectations (= 3.5.0.beta3)
+ rspec-mocks (= 3.5.0.beta3)
+ rspec-support (= 3.5.0.beta3)
  rspec-retry (0.4.5)
  rspec-core
- rspec-support (3.4.1)
+ rspec-support (3.5.0.beta3)
  rubocop (0.39.0)
  parser (>= 2.3.0.7, < 3.0)
  powerpack (~> 0.1)
@@ -343,12 +349,12 @@ DEPENDENCIES
  pry-rescue
  pry-stack_explorer
  puma
- rails (~> 4.2)
+ rails (= 5.0.0.beta3)
  rails-html-sanitizer
  rails_12factor
  rainbow
  react_on_rails (~> 5.1.1)
- rspec-rails
+ rspec-rails (= 3.5.0.beta3)
  rspec-retry
  rubocop
  ruby-lint

bin/rails

@@ -1,9 +1,4 @@
 #!/usr/bin/env ruby
-begin
- load File.expand_path('../spring', __FILE__)
-rescue LoadError => e
- raise unless e.message.include?('spring')
-end
 APP_PATH = File.expand_path('../../config/application', __FILE__)
 require_relative '../config/boot'
 require 'rails/commands'

bin/rake

@@ -1,9 +1,4 @@
 #!/usr/bin/env ruby
-begin
- load File.expand_path('../spring', __FILE__)
-rescue LoadError => e
- raise unless e.message.include?('spring')
-end
 require_relative '../config/boot'
 require 'rake'
 Rake.application.run

bin/setup

@@ -1,29 +1,34 @@
 #!/usr/bin/env ruby
 require 'pathname'
+require 'fileutils'
+include FileUtils
 
 # path to your application root.
-APP_ROOT = Pathname.new File.expand_path('../../',  __FILE__)
+APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
 
-Dir.chdir APP_ROOT do
+def system!(*args)
+ system(*args) || abort("\n== Command #{args} failed ==")
+end
+
+chdir APP_ROOT do
  # This script is a starting point to setup your application.
- # Add necessary setup steps to this file:
+ # Add necessary setup steps to this file.
 
- puts "== Installing dependencies =="
- system "gem install bundler --conservative"
- system "bundle check || bundle install"
+ puts '== Installing dependencies =='
+ system! 'gem install bundler --conservative'
+ system('bundle check') or system!('bundle install')
 
  # puts "\n== Copying sample files =="
- # unless File.exist?("config/database.yml")
- # system "cp config/database.yml.sample config/database.yml"
+ # unless File.exist?('config/database.yml')
+ # cp 'config/database.yml.sample', 'config/database.yml'
  # end
 
  puts "\n== Preparing database =="
- system "bin/rake db:setup"
+ system! 'bin/rails db:setup'
 
  puts "\n== Removing old logs and tempfiles =="
- system "rm -f log/*"
- system "rm -rf tmp/cache"
+ system! 'bin/rails log:clear tmp:clear'
 
  puts "\n== Restarting application server =="
- system "touch tmp/restart.txt"
+ system! 'bin/rails restart'
 end

bin/update

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+require 'pathname'
+require 'fileutils'
+include FileUtils
+
+# path to your application root.
+APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
+
+def system!(*args)
+ system(*args) || abort("\n== Command #{args} failed ==")
+end
+
+chdir APP_ROOT do
+ # This script is a way to update your development environment automatically.
+ # Add necessary update steps to this file.
+
+ puts '== Installing dependencies =='
+ system! 'gem install bundler --conservative'
+ system 'bundle check' or system! 'bundle install'
+
+ puts "\n== Updating database =="
+ system! 'bin/rails db:migrate'
+
+ puts "\n== Removing old logs and tempfiles =="
+ system! 'bin/rails log:clear tmp:clear'
+
+ puts "\n== Restarting application server =="
+ system! 'bin/rails restart'
+end

config/application.rb

@@ -1,6 +1,6 @@
-require File.expand_path("../boot", __FILE__)
+require File.expand_path('../boot', __FILE__)
 
-require "rails/all"
+require 'rails/all'
 
 # Require the gems listed in Gemfile, including any gems
 # you've limited to :test, :development, or :production.
@@ -11,16 +11,5 @@ class Application < Rails::Application
  # Settings in config/environments/* take precedence over those specified here.
  # Application configuration should go into files in config/initializers
  # -- all .rb files in that directory are automatically loaded.
-
- # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
- # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
- # config.time_zone = "Central Time (US & Canada)"
-
- # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
- # config.i18n.load_path += Dir[Rails.root.join("my", "locales", "*.{rb,yml}").to_s]
- # config.i18n.default_locale = :de
-
- # For not swallow errors in after_commit/after_rollback callbacks.
- config.active_record.raise_in_transactional_callbacks = true
  end
 end

config/boot.rb

@@ -1,3 +1,3 @@
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", __FILE__)
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
 
-require "bundler/setup" # Set up gems listed in the Gemfile.
+require 'bundler/setup' # Set up gems listed in the Gemfile.

config/cable.yml

@@ -0,0 +1,10 @@
+# Action Cable uses Redis by default to administer connections, channels, and sending/receiving messages over the WebSocket.
+production:
+ adapter: redis
+ url: redis://localhost:6379/1
+
+development:
+ adapter: async
+
+test:
+ adapter: async

config/environment.rb

@@ -1,5 +1,5 @@
 # Load the Rails application.
-require File.expand_path("../application", __FILE__)
+require File.expand_path('../application', __FILE__)
 
 # Initialize the Rails application.
 Rails.application.initialize!