From 493e667d8aaa4fec0d6ade4e04762c6f52f5b061 Mon Sep 17 00:00:00 2001 From: Erik Michaels-Ober Date: Sat, 29 Nov 2014 12:36:18 +0100 Subject: [PATCH] Update rails to version 4.2.0.rc1 --- .gitignore | 3 +- Gemfile | 2 +- Gemfile.lock | 92 ++++++++++++++++---------- app/assets/javascripts/application.js | 2 +- app/assets/stylesheets/application.css | 4 +- bin/rails | 6 +- bin/rake | 4 -- bin/setup | 29 ++++++++ config.ru | 2 +- config/application.rb | 3 + config/boot.rb | 3 +- config/environments/development.rb | 4 ++ config/environments/production.rb | 26 ++++---- config/environments/test.rb | 3 + config/initializers/assets.rb | 11 +++ config/initializers/session_store.rb | 2 +- test/performance/browsing_test.rb | 12 ---- 17 files changed, 129 insertions(+), 79 deletions(-) create mode 100755 bin/setup create mode 100644 config/initializers/assets.rb delete mode 100644 test/performance/browsing_test.rb diff --git a/.gitignore b/.gitignore index d4798c3..caa3d71 100644 --- a/.gitignore +++ b/.gitignore @@ -16,5 +16,6 @@ /db/*.sqlite3-journal # Ignore all logfiles and tempfiles. -/log/*.log +/log/* +!/log/.keep /tmp diff --git a/Gemfile b/Gemfile index afd7524..90eb92d 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' ruby '2.2.0' -gem 'rails', '~> 4.1.8' +gem 'rails', '~> 4.2.0.rc1' gem 'arel' gem 'devise' diff --git a/Gemfile.lock b/Gemfile.lock index fe7dd3a..50ee69c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,34 +1,43 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (4.1.8) - actionpack (= 4.1.8) - actionview (= 4.1.8) + actionmailer (4.2.0.rc1) + actionpack (= 4.2.0.rc1) + actionview (= 4.2.0.rc1) + activejob (= 4.2.0.rc1) mail (~> 2.5, >= 2.5.4) - actionpack (4.1.8) - actionview (= 4.1.8) - activesupport (= 4.1.8) - rack (~> 1.5.2) + rails-dom-testing (~> 1.0, >= 1.0.5) + actionpack (4.2.0.rc1) + actionview (= 4.2.0.rc1) + activesupport (= 4.2.0.rc1) + rack (~> 1.6.0.beta2) rack-test (~> 0.6.2) - actionview (4.1.8) - activesupport (= 4.1.8) + rails-dom-testing (~> 1.0, >= 1.0.5) + rails-html-sanitizer (~> 1.0, >= 1.0.1) + actionview (4.2.0.rc1) + activesupport (= 4.2.0.rc1) builder (~> 3.1) erubis (~> 2.7.0) - activemodel (4.1.8) - activesupport (= 4.1.8) + rails-dom-testing (~> 1.0, >= 1.0.5) + rails-html-sanitizer (~> 1.0, >= 1.0.1) + activejob (4.2.0.rc1) + activesupport (= 4.2.0.rc1) + globalid (>= 0.3.0) + activemodel (4.2.0.rc1) + activesupport (= 4.2.0.rc1) builder (~> 3.1) - activerecord (4.1.8) - activemodel (= 4.1.8) - activesupport (= 4.1.8) - arel (~> 5.0.0) - activesupport (4.1.8) - i18n (~> 0.6, >= 0.6.9) + activerecord (4.2.0.rc1) + activemodel (= 4.2.0.rc1) + activesupport (= 4.2.0.rc1) + arel (~> 6.0) + activesupport (4.2.0.rc1) + i18n (>= 0.7.0.beta1, < 0.8) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.1) tzinfo (~> 1.1) addressable (2.3.6) - arel (5.0.1.20140414130214) + arel (6.0.0) ast (2.0.0) astrolabe (1.3.0) parser (>= 2.2.0.pre.3, < 3.0) @@ -65,11 +74,13 @@ GEM railties (>= 3.2, < 5.0) geokit (1.9.0) multi_json (>= 1.3.2) + globalid (0.3.0) + activesupport (>= 4.1.0) haml (4.0.5) tilt hike (1.2.3) http_accept_language (2.0.2) - i18n (0.6.11) + i18n (0.7.0.beta1) jquery-rails (3.1.2) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) @@ -79,6 +90,8 @@ GEM kaminari (0.16.1) actionpack (>= 3.0.0) activesupport (>= 3.0.0) + loofah (2.0.1) + nokogiri (>= 1.5.9) mail (2.6.3) mime-types (>= 1.16, < 3) method_source (0.8.2) @@ -102,22 +115,31 @@ GEM slop (~> 3.4) puma (2.10.2) rack (>= 1.1, < 2.0) - rack (1.5.2) + rack (1.6.0.beta2) rack-pjax (0.8.0) nokogiri (~> 1.5) rack (~> 1.1) rack-test (0.6.2) rack (>= 1.0) - rails (4.1.8) - actionmailer (= 4.1.8) - actionpack (= 4.1.8) - actionview (= 4.1.8) - activemodel (= 4.1.8) - activerecord (= 4.1.8) - activesupport (= 4.1.8) + rails (4.2.0.rc1) + actionmailer (= 4.2.0.rc1) + actionpack (= 4.2.0.rc1) + actionview (= 4.2.0.rc1) + activejob (= 4.2.0.rc1) + activemodel (= 4.2.0.rc1) + activerecord (= 4.2.0.rc1) + activesupport (= 4.2.0.rc1) bundler (>= 1.3.0, < 2.0) - railties (= 4.1.8) - sprockets-rails (~> 2.0) + railties (= 4.2.0.rc1) + sprockets-rails + rails-deprecated_sanitizer (1.0.3) + activesupport (>= 4.2.0.alpha) + rails-dom-testing (1.0.5) + activesupport (>= 4.2.0.beta, < 5.0) + nokogiri (~> 1.6.0) + rails-deprecated_sanitizer (>= 1.0.1) + rails-html-sanitizer (1.0.1) + loofah (~> 2.0) rails_12factor (0.0.3) rails_serve_static_assets rails_stdout_logging @@ -137,16 +159,16 @@ GEM sass-rails (~> 4.0) rails_serve_static_assets (0.0.2) rails_stdout_logging (0.0.3) - railties (4.1.8) - actionpack (= 4.1.8) - activesupport (= 4.1.8) + railties (4.2.0.rc1) + actionpack (= 4.2.0.rc1) + activesupport (= 4.2.0.rc1) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (2.0.0) rake (10.4.0) remotipart (1.2.1) - responders (1.1.2) - railties (>= 3.2, < 4.2) + responders (2.0.2) + railties (>= 4.2.0.alpha, < 5) rest-client (1.7.2) mime-types (>= 1.16, < 3.0) netrc (~> 0.7) @@ -217,7 +239,7 @@ DEPENDENCIES pg pry puma - rails (~> 4.1.8) + rails (~> 4.2.0.rc1) rails_12factor rails_admin rubocop diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 5bc2e1c..c28e5ba 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -2,7 +2,7 @@ // 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. diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index dce151f..f9cd5b3 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -3,13 +3,13 @@ * 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. * - *= require_self *= require_tree . + *= require_self */ diff --git a/bin/rails b/bin/rails index 7feb6a3..5191e69 100755 --- a/bin/rails +++ b/bin/rails @@ -1,8 +1,4 @@ #!/usr/bin/env ruby -begin - load File.expand_path("../spring", __FILE__) -rescue LoadError -end -APP_PATH = File.expand_path('../../config/application', __FILE__) +APP_PATH = File.expand_path('../../config/application', __FILE__) require_relative '../config/boot' require 'rails/commands' diff --git a/bin/rake b/bin/rake index 8017a02..1724048 100755 --- a/bin/rake +++ b/bin/rake @@ -1,8 +1,4 @@ #!/usr/bin/env ruby -begin - load File.expand_path("../spring", __FILE__) -rescue LoadError -end require_relative '../config/boot' require 'rake' Rake.application.run diff --git a/bin/setup b/bin/setup new file mode 100755 index 0000000..acdb2c1 --- /dev/null +++ b/bin/setup @@ -0,0 +1,29 @@ +#!/usr/bin/env ruby +require 'pathname' + +# path to your application root. +APP_ROOT = Pathname.new File.expand_path('../../', __FILE__) + +Dir.chdir APP_ROOT do + # This script is a starting point to setup your application. + # Add necessary setup steps to this file: + + puts "== Installing dependencies ==" + system "gem install bundler --conservative" + system "bundle check || bundle install" + + # puts "\n== Copying sample files ==" + # unless File.exist?("config/database.yml") + # system "cp config/database.yml.sample config/database.yml" + # end + + puts "\n== Preparing database ==" + system "bin/rake db:setup" + + puts "\n== Removing old logs and tempfiles ==" + system "rm -f log/*" + system "rm -rf tmp/cache" + + puts "\n== Restarting application server ==" + system "touch tmp/restart.txt" +end diff --git a/config.ru b/config.ru index 5bc2a61..bd83b25 100644 --- a/config.ru +++ b/config.ru @@ -1,4 +1,4 @@ # This file is used by Rack-based servers to start the application. -require ::File.expand_path('../config/environment', __FILE__) +require ::File.expand_path('../config/environment', __FILE__) run Rails.application diff --git a/config/application.rb b/config/application.rb index 243e698..0d0e499 100644 --- a/config/application.rb +++ b/config/application.rb @@ -19,5 +19,8 @@ module AdoptAThing # 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 + + # Do not swallow errors in after_commit/after_rollback callbacks. + config.active_record.raise_in_transactional_callbacks = true end end diff --git a/config/boot.rb b/config/boot.rb index 5e5f0c1..6b750f0 100644 --- a/config/boot.rb +++ b/config/boot.rb @@ -1,4 +1,3 @@ -# Set up gems listed in the Gemfile. ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__) -require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE']) +require 'bundler/setup' # Set up gems listed in the Gemfile. diff --git a/config/environments/development.rb b/config/environments/development.rb index 4ec7cb1..e0e0ea8 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -28,6 +28,10 @@ Rails.application.configure do # number of complex assets. config.assets.debug = true + # Asset digests allow you to set far-future HTTP expiration dates on all assets, + # yet still be able to expire them through the digest params. + config.assets.digest = true + # Adds additional error checking when serving assets at runtime. # Checks for improperly declared sprockets dependencies. # Raises helpful error messages. diff --git a/config/environments/production.rb b/config/environments/production.rb index 02690a9..05bed26 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -16,10 +16,11 @@ Rails.application.configure do # Enable Rack::Cache to put a simple HTTP cache in front of your application # Add `rack-cache` to your Gemfile before enabling this. - # For large-scale production use, consider using a caching reverse proxy like nginx, varnish or squid. + # For large-scale production use, consider using a caching reverse proxy like + # NGINX, varnish or squid. # config.action_dispatch.rack_cache = true - # Disable Rails's static asset server (Apache or nginx will already do this). + # Disable Rails's static asset server (Apache or NGINX will already do this). config.serve_static_assets = false # Compress JavaScripts and CSS. @@ -29,21 +30,22 @@ Rails.application.configure do # Do not fallback to assets pipeline if a precompiled asset is missed. config.assets.compile = false - # Generate digests for assets URLs. + # Asset digests allow you to set far-future HTTP expiration dates on all assets, + # yet still be able to expire them through the digest params. config.assets.digest = true - # Version of your assets, change this if you want to expire all your assets. - config.assets.version = '1.0' + # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb # Specifies the header that your server uses for sending files. - # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache - # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx + # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache + # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. # config.force_ssl = true - # Set to :debug to see everything in the log. - config.log_level = :info + # Use the lowest log level to ensure availability of diagnostic information + # when problems arise. + config.log_level = :debug # Prepend all log lines with the following tags. # config.log_tags = [ :subdomain, :uuid ] @@ -55,11 +57,7 @@ Rails.application.configure do # config.cache_store = :mem_cache_store # Enable serving of images, stylesheets, and JavaScripts from an asset server. - # config.action_controller.asset_host = "http://assets.example.com" - - # Precompile additional assets. - # application.js, application.css, and all non-JS/CSS in app/assets folder are already added. - # config.assets.precompile += %w( search.js ) + # config.action_controller.asset_host = 'http://assets.example.com' # Ignore bad email addresses and do not raise email delivery errors. # Set this to true and configure the email server for immediate delivery to raise delivery errors. diff --git a/config/environments/test.rb b/config/environments/test.rb index a2de27d..19f714f 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -32,6 +32,9 @@ Rails.application.configure do config.action_mailer.delivery_method = :test config.action_mailer.default_url_options = {host: 'localhost:3000'} + # Randomize the order test cases are executed + config.active_support.test_order = :random + # Print deprecation notices to the stderr. config.active_support.deprecation = :stderr diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb new file mode 100644 index 0000000..01ef3e6 --- /dev/null +++ b/config/initializers/assets.rb @@ -0,0 +1,11 @@ +# Be sure to restart your server when you modify this file. + +# Version of your assets, change this if you want to expire all your assets. +Rails.application.config.assets.version = '1.0' + +# Add additional assets to the asset load path +# Rails.application.config.assets.paths << Emoji.images_path + +# Precompile additional assets. +# application.js, application.css, and all non-JS/CSS in app/assets folder are already added. +# Rails.application.config.assets.precompile += %w( search.js ) diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb index dc11565..8fcfb0c 100644 --- a/config/initializers/session_store.rb +++ b/config/initializers/session_store.rb @@ -1,3 +1,3 @@ # Be sure to restart your server when you modify this file. -Rails.application.config.session_store :cookie_store, key: '_adopt-a-hydrant_session' +Rails.application.config.session_store :cookie_store, key: '_adopt-a-thing_session' diff --git a/test/performance/browsing_test.rb b/test/performance/browsing_test.rb deleted file mode 100644 index 0cdd952..0000000 --- a/test/performance/browsing_test.rb +++ /dev/null @@ -1,12 +0,0 @@ -require 'test_helper' -require 'rails/performance_test_help' - -class BrowsingTest < ActionDispatch::PerformanceTest - # Refer to the documentation for all available options - # self.profile_options = { runs: 5, metrics: [:wall_time, :memory] - # output: 'tmp/performance', formats: [:flat] } - - def test_homepage - get '/' - end -end