Upgrade to Ruby 2.2.4, Rails 4.0.13

NOTE: This doesn't boot yet! There's something changed in the `devise` API that we'll need to fix!

```
/vagrant/config/initializers/devise.rb:46:in `block in <top (required)>': undefined method `encryptor=' for Devise:Module (NoMethodError)
```

But yeah, we navigated the gem upgrades, and also I ran `rake rails:update` and hand-processed the suggestions it had for our config files.

.ruby-version

@@ -1 +1 @@
-1.9.3-p551
+2.2.4

Gemfile

@@ -1,19 +1,17 @@
 source 'http://rubygems.org'
+ruby '2.2.4'
 
 gem 'dotenv-rails'
 gem 'dotenv-deployment'
 
-gem 'rails', '= 3.2.22.5'
+gem 'rails', '= 4.0.13'
 #gem 'sqlite3-ruby', '~> 1.3.1', :require => 'sqlite3'
 gem 'mysql2', '>= 0.3.11'
 
-# https://groups.google.com/d/topic/rubyonrails-security/4_YvCpLzL58/discussion
-gem 'json', '~> 1.8.1'
-
 gem 'haml', '~> 4.0.0'
 gem 'rdiscount', '~> 1.6.5'
 gem 'will_paginate', '~> 3.0.pre2'
-gem 'devise', '~> 2.2.3'
+gem 'devise', '~> 3.5.10'
 
 # unstable version of RocketAMF interprets info registry as a hash instead of an array
 gem 'RocketAMF', :git => 'https://github.com/rubyamf/rocketamf.git'
@@ -48,13 +46,13 @@ gem 'neopets', '~> 0.2.0', :git => 'https://github.com/matchu/neopets.git'
 gem "mini_magick", "~> 3.4"
 
 gem "fog", "~> 1.8.0"
-gem "carrierwave", "~> 0.8.0"
+gem 'carrierwave', '~> 1.3', '>= 1.3.3'
 
 gem "parallel", "~> 1.13.0"
 
 gem "http_accept_language", :git => "https://github.com/iain/http_accept_language.git"
 
-gem "globalize3", :git => "https://github.com/matchu/globalize3.git"
+gem 'globalize', '~> 4.0.3'
 
 # My flex branch fixes a minor pagination bug. Once it's merged into the
 # original gem, we can switch back.
@@ -63,18 +61,20 @@ gem "patron", "~> 0.4.18"
 
 gem "rest-client", "~> 1.6.7"
 
-gem "rails-i18n"
+gem 'rails-i18n', '~> 4.0', '>= 4.0.9'
 
 gem 'rack-attack', '~> 2.2.0'
 
-gem 'react-rails', '~> 0.8.0.0'
+gem 'react-rails', '~> 2.7', '>= 2.7.1'
 
 gem "letter_opener", :group => :development
 
-gem 'sass-rails',    "~> 3.2.6"
+gem 'sass-rails',    "~> 4.0.5"
 gem 'compass-rails', "~> 1.0.3"
 gem 'uglifier',      ">= 1.0.3"
 
+gem 'rails-observers', '~> 0.1.5'
+
 group :development do
   gem 'capistrano', '~> 2.15.5', require: false
   gem 'rvm-capistrano', '~> 1.5.6', require: false

Gemfile.lock

@@ -13,15 +13,6 @@ GIT
       progressbar (~> 0.11.0)
       prompter (~> 0.1.5)
 
-GIT
-  remote: https://github.com/matchu/globalize3.git
-  revision: e23277864270131bbee29033f8a3abfb74ffe1f8
-  specs:
-    globalize3 (0.3.0)
-      activemodel (>= 3.0.0)
-      activerecord (>= 3.0.0)
-      paper_trail (~> 2)
-
 GIT
   remote: https://github.com/matchu/neopets.git
   revision: 5d13a720b616ba57fbbd54541f3e5daf02b3fedc
@@ -38,51 +29,52 @@ GIT
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.22.5)
+    actionmailer (4.0.13)
-      actionpack (= 3.2.22.5)
+      actionpack (= 4.0.13)
-      mail (~> 2.5.4)
+      mail (~> 2.5, >= 2.5.4)
-    actionpack (3.2.22.5)
+    actionpack (4.0.13)
-      activemodel (= 3.2.22.5)
+      activesupport (= 4.0.13)
-      activesupport (= 3.2.22.5)
+      builder (~> 3.1.0)
-      builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      journey (~> 1.0.4)
+      rack (~> 1.5.2)
-      rack (~> 1.4.5)
+      rack-test (~> 0.6.2)
-      rack-cache (~> 1.2)
+    activemodel (4.0.13)
-      rack-test (~> 0.6.1)
+      activesupport (= 4.0.13)
-      sprockets (~> 2.2.1)
+      builder (~> 3.1.0)
-    activemodel (3.2.22.5)
+    activerecord (4.0.13)
-      activesupport (= 3.2.22.5)
+      activemodel (= 4.0.13)
-      builder (~> 3.0.0)
+      activerecord-deprecated_finders (~> 1.0.2)
-    activerecord (3.2.22.5)
+      activesupport (= 4.0.13)
-      activemodel (= 3.2.22.5)
+      arel (~> 4.0.0)
-      activesupport (= 3.2.22.5)
+    activerecord-deprecated_finders (1.0.4)
-      arel (~> 3.0.2)
+    activesupport (4.0.13)
-      tzinfo (~> 0.3.29)
+      i18n (~> 0.6, >= 0.6.9)
-    activeresource (3.2.22.5)
+      minitest (~> 4.2)
-      activemodel (= 3.2.22.5)
+      multi_json (~> 1.3)
-      activesupport (= 3.2.22.5)
+      thread_safe (~> 0.1)
-    activesupport (3.2.22.5)
+      tzinfo (~> 0.3.37)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
     addressable (2.3.8)
     airbrake (3.1.17)
       builder
       multi_json
-    arel (3.0.3)
+    arel (4.0.2)
-    bcrypt (3.1.10)
+    babel-source (5.8.35)
-    bcrypt-ruby (3.1.5)
+    babel-transpiler (0.7.0)
-      bcrypt (>= 3.1.3)
+      babel-source (>= 4.0, < 6)
-    builder (3.0.4)
+      execjs (~> 2.0)
+    bcrypt (3.1.19)
+    builder (3.1.4)
     capistrano (2.15.5)
       highline
       net-scp (>= 1.0.0)
       net-sftp (>= 2.0.0)
       net-ssh (>= 2.0.14)
       net-ssh-gateway (>= 1.1.0)
-    carrierwave (0.8.0)
+    carrierwave (1.3.3)
-      activemodel (>= 3.2.0)
+      activemodel (>= 4.0.0)
-      activesupport (>= 3.2.0)
+      activesupport (>= 4.0.0)
+      mime-types (>= 1.16)
+      ssrf_filter (~> 1.0, < 1.1.0)
     character-encodings (0.4.1)
     chronic (0.6.7)
     chunky_png (1.3.4)
@@ -92,12 +84,15 @@ GEM
       sass (~> 3.2.19)
     compass-rails (1.0.3)
       compass (>= 0.12.2, < 0.14)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
-    devise (2.2.8)
+    connection_pool (2.2.5)
-      bcrypt-ruby (~> 3.0)
+    devise (3.5.10)
+      bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
-      railties (~> 3.1)
+      railties (>= 3.2.6, < 5)
-      warden (~> 1.2.1)
+      responders
+      thread_safe (~> 0.1)
+      warden (~> 1.2.3)
     diff-lcs (1.2.5)
     dotenv (2.0.1)
     dotenv-deployment (0.0.2)
@@ -124,25 +119,28 @@ GEM
       ruby-hmac
     formatador (0.2.5)
     fssm (0.2.10)
+    globalize (4.0.3)
+      activemodel (>= 4.0.0, < 5)
+      activerecord (>= 4.0.0, < 5)
     haml (4.0.6)
       tilt
     highline (1.7.2)
     hike (1.2.3)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    journey (1.0.4)
+    json (2.5.1)
-    json (1.8.6)
     launchy (2.4.3)
       addressable (~> 2.3)
     letter_opener (1.4.1)
       launchy (~> 2.2)
-    mail (2.5.5)
+    mail (2.7.1)
-      mime-types (~> 1.16)
+      mini_mime (>= 0.1.1)
-      treetop (~> 1.4.8)
     memcache-client (1.8.5)
     mime-types (1.25.1)
     mini_magick (3.8.1)
       subexec (~> 0.2.1)
+    mini_mime (1.1.2)
+    minitest (4.7.5)
     msgpack (0.5.12)
     multi_json (1.3.7)
     mysql2 (0.3.18)
@@ -158,58 +156,51 @@ GEM
     openneo-auth-signatory (0.1.0)
       ruby-hmac
     orm_adapter (0.5.0)
-    paper_trail (2.7.2)
-      activerecord (~> 3.0)
-      railties (~> 3.0)
     parallel (1.13.0)
     passenger_monit (0.1.1)
     patron (0.4.20)
-    polyglot (0.3.5)
     progressbar (0.11.0)
     prompter (0.1.6)
       dye (>= 0.1.1)
       yard (>= 0.6.3)
-    rack (1.4.7)
+    rack (1.5.5)
     rack-attack (2.2.1)
       rack
-    rack-cache (1.7.1)
-      rack (>= 0.4)
     rack-protection (1.5.3)
       rack
-    rack-ssl (1.3.4)
-      rack
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (3.2.22.5)
+    rails (4.0.13)
-      actionmailer (= 3.2.22.5)
+      actionmailer (= 4.0.13)
-      actionpack (= 3.2.22.5)
+      actionpack (= 4.0.13)
-      activerecord (= 3.2.22.5)
+      activerecord (= 4.0.13)
-      activeresource (= 3.2.22.5)
+      activesupport (= 4.0.13)
-      activesupport (= 3.2.22.5)
+      bundler (>= 1.3.0, < 2.0)
-      bundler (~> 1.0)
+      railties (= 4.0.13)
-      railties (= 3.2.22.5)
+      sprockets-rails (~> 2.0)
-    rails-i18n (3.0.1)
+    rails-i18n (4.0.9)
-      i18n (~> 0.5)
+      i18n (~> 0.7)
-      rails (>= 3.0.0, < 4.0.0)
+      railties (~> 4.0)
-    railties (3.2.22.5)
+    rails-observers (0.1.5)
-      actionpack (= 3.2.22.5)
+      activemodel (>= 4.0)
-      activesupport (= 3.2.22.5)
+    railties (4.0.13)
-      rack-ssl (~> 1.3.2)
+      actionpack (= 4.0.13)
+      activesupport (= 4.0.13)
       rake (>= 0.8.7)
-      rdoc (~> 3.4)
+      thor (>= 0.18.1, < 2.0)
-      thor (>= 0.14.6, < 2.0)
+    rake (13.0.6)
-    rake (12.2.1)
     rdiscount (1.6.8)
-    rdoc (3.12.2)
+    react-rails (2.7.1)
-      json (~> 1.4)
+      babel-transpiler (>= 0.7.0)
-    react-rails (0.8.0.0)
+      connection_pool
       execjs
-      rails (>= 3.1)
+      railties (>= 3.2)
-      react-source (= 0.8.0)
+      tilt
-    react-source (0.8.0)
     redis (3.2.1)
     redis-namespace (1.5.2)
       redis (~> 3.0, >= 3.0.4)
+    responders (1.1.2)
+      railties (>= 3.2, < 4.2)
     resque (1.23.1)
       multi_json (~> 1.0)
       redis-namespace (~> 1.0)
@@ -246,33 +237,37 @@ GEM
     sanitize (2.0.6)
       nokogiri (>= 1.4.4)
     sass (3.2.19)
-    sass-rails (3.2.6)
+    sass-rails (4.0.5)
-      railties (~> 3.2.0)
+      railties (>= 4.0.0, < 5.0)
-      sass (>= 3.1.10)
+      sass (~> 3.2.2)
-      tilt (~> 1.3)
+      sprockets (~> 2.8, < 3.0)
+      sprockets-rails (~> 2.0)
     sinatra (1.4.6)
       rack (~> 1.4)
       rack-protection (~> 1.4)
       tilt (>= 1.3, < 3)
-    sprockets (2.2.3)
+    sprockets (2.12.5)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
+    sprockets-rails (2.3.3)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (>= 2.8, < 4.0)
+    ssrf_filter (1.0.8)
     subexec (0.2.3)
     swf_converter (0.0.3)
-    thor (0.20.3)
+    thor (1.2.2)
+    thread_safe (0.3.6)
     tilt (1.4.1)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
     tzinfo (0.3.62)
     uglifier (2.7.1)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
     vegas (0.1.11)
       rack (>= 1.0.0)
-    warden (1.2.3)
+    warden (1.2.7)
       rack (>= 1.0)
     whenever (0.7.3)
       activesupport (>= 2.3.4)
@@ -288,19 +283,18 @@ DEPENDENCIES
   addressable
   airbrake (~> 3.1.8)
   capistrano (~> 2.15.5)
-  carrierwave (~> 0.8.0)
+  carrierwave (~> 1.3, >= 1.3.3)
   character-encodings (~> 0.4.1)
   compass-rails (~> 1.0.3)
-  devise (~> 2.2.3)
+  devise (~> 3.5.10)
   dotenv-deployment
   dotenv-rails
   factory_girl_rails (~> 1.0)
   flex!
   fog (~> 1.8.0)
-  globalize3!
+  globalize (~> 4.0.3)
   haml (~> 4.0.0)
   http_accept_language!
-  json (~> 1.8.1)
   letter_opener
   memcache-client (~> 1.8.5)
   mini_magick (~> 3.4)
@@ -314,10 +308,11 @@ DEPENDENCIES
   passenger_monit (~> 0.1.1)
   patron (~> 0.4.18)
   rack-attack (~> 2.2.0)
-  rails (= 3.2.22.5)
+  rails (= 4.0.13)
-  rails-i18n
+  rails-i18n (~> 4.0, >= 4.0.9)
+  rails-observers (~> 0.1.5)
   rdiscount (~> 1.6.5)
-  react-rails (~> 0.8.0.0)
+  react-rails (~> 2.7, >= 2.7.1)
   resque (~> 1.23.0)
   resque-retry (~> 0.1.0)
   resque-scheduler (~> 2.0.0.d)
@@ -326,11 +321,14 @@ DEPENDENCIES
   rspec-rails (~> 2.0.0.beta.22)
   rvm-capistrano (~> 1.5.6)
   sanitize (~> 2.0.3)
-  sass-rails (~> 3.2.6)
+  sass-rails (~> 4.0.5)
   swf_converter (~> 0.0.3)
   uglifier (>= 1.0.3)
   whenever (~> 0.7.3)
   will_paginate (~> 3.0.pre2)
 
+RUBY VERSION
+   ruby 2.2.4p230
+
 BUNDLED WITH
    1.17.3

Vagrantfile

@@ -72,10 +72,8 @@ Vagrant.configure("2") do |config|
   # documentation for more information about their specific syntax and use.
   config.vm.provision "shell", inline: <<-SHELL
     apt-get update
-    apt-get install -y rbenv libssl1.0-dev
+    apt-get install -y rbenv libmysqlclient-dev libcurl4-openssl-dev nodejs
-    su vagrant -c 'curl -fsSL https://gist.github.com/FiveYellowMice/c50490693d47577cfe7e6ac9fc3bf6cf.txt | rbenv install --patch 1.9.3-p551'
+    su vagrant -c 'rbenv install 2.2.4 && gem install bundler -v 1.17.3'
-    apt-get remove -y libssl1.0-dev
-    apt-get install -y libmysqlclient-dev libcurl4-openssl-dev nodejs
     echo 'When you log in as vagrant, run `rbenv init` and follow the instructions!'
   SHELL
 end

bin/bundle

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+load Gem.bin_path('bundler', 'bundle')

bin/rails

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+APP_PATH = File.expand_path('../../config/application',  __FILE__)
+require_relative '../config/boot'
+require 'rails/commands'

bin/rake

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+require_relative '../config/boot'
+require 'rake'
+Rake.application.run

config/application.rb

@@ -2,9 +2,9 @@ require File.expand_path('../boot', __FILE__)
 
 require 'rails/all'
 
-# If you have a Gemfile, require the gems listed there, including any gems
+# Require the gems listed in Gemfile, including any gems
 # you've limited to :test, :development, or :production.
-Bundler.require(:default, Rails.env) if defined?(Bundler)
+Bundler.require(*Rails.groups)
 
 module OpenneoImpressItems
   class Application < Rails::Application
@@ -12,13 +12,6 @@ module OpenneoImpressItems
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.
 
-    # Add additional load paths for your own custom dirs
-    # config.load_paths += %W( #{config.root}/extras )
-
-    # Only load the plugins named here, in the order given (default is alphabetical).
-    # :all can be used as a placeholder for all plugins not explicitly named
-    # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
-
     # Activate observers that should always be running
     config.active_record.observers = [:closet_hanger_observer,
       :closet_list_observer, :contribution_observer, :item_observer,
@@ -33,16 +26,6 @@ module OpenneoImpressItems
     # config.i18n.default_locale = :de
     config.i18n.fallbacks = true
 
-    # Configure generators values. Many other options are available, be sure to check the documentation.
-    # config.generators do |g|
-    #   g.orm             :active_record
-    #   g.template_engine :erb
-    #   g.test_framework  :test_unit, :fixture => true
-    # end
-
-    # Configure sensitive parameters which will be filtered from the log file.
-    config.filter_parameters << :password
-
     Mime::Type.register "image/gif", :gif
 
     ActionController::Base.config.relative_url_root = ''

config/boot.rb

@@ -1,14 +1,4 @@
-# Use locked gems if present.
+# Set up gems listed in the Gemfile.
-begin
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
-  require File.expand_path('../../.bundle/environment', __FILE__)
 
-rescue LoadError
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
-  # Otherwise, use RubyGems.
-  require 'rubygems'
-
-  # And set up the gems listed in the Gemfile.
-  if File.exist?(File.expand_path('../../Gemfile', __FILE__))
-    require 'bundler'
-    Bundler.setup
-  end
-end

config/environment.rb

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

config/environments/development.rb

@@ -1,36 +1,33 @@
 OpenneoImpressItems::Application.configure do
-  # Settings specified here will take precedence over those in config/environment.rb
+  # Settings specified here will take precedence over those in config/application.rb
 
   # In the development environment your application's code is reloaded on
   # every request. This slows down response time but is perfect for development
-  # since you don't have to restart the webserver when you make code changes.
+  # since you don't have to restart the web server when you make code changes.
   config.cache_classes = false
 
-  # Log error messages when you accidentally call methods on nil.
+  # Do not eager load code on boot.
-  config.whiny_nils = true
+  config.eager_load = false
 
-  # Show full error reports and disable caching
+  # Show full error reports and disable caching.
+  # NOTE: We have caching on in development, to make it easier to test it!
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = true
 
-  # Don't care if the mailer can't send
+  # Don't care if the mailer can't send.
   config.action_mailer.raise_delivery_errors = false
   config.action_mailer.default_url_options = {host: "impress.dev.openneo.net"}
   config.action_mailer.delivery_method = :letter_opener
 
+  # Print deprecation notices to the Rails logger.
   config.active_support.deprecation = :log
 
-  # Raise exception on mass assignment protection for Active Record models
+  # Raise an error on page load if there are pending migrations
-  config.active_record.mass_assignment_sanitizer = :strict
+  config.active_record.migration_error = :page_load
 
-  # Log the query plan for queries taking more than this (works
+  # Debug mode disables concatenation and preprocessing of assets.
-  # with SQLite, MySQL, and PostgreSQL)
+  # This option may cause significant delays in view rendering with a large
-  config.active_record.auto_explain_threshold_in_seconds = 0.5
+  # number of complex assets.
-
-  # Do not compress assets
-  config.assets.compress = false
-   
-  # Expands the lines which load the assets
   config.assets.debug = true
 
   config.react.variant = :development

config/environments/production.rb

@@ -1,7 +1,6 @@
 OpenneoImpressItems::Application.configure do
-  # Settings specified here will take precedence over those in config/environment.rb
+  # Settings specified here will take precedence over those in config/application.rb
 
-  # The production environment is meant for finished, "live" apps.
   # Code is not reloaded between requests
   config.cache_classes = true
 
@@ -76,6 +75,9 @@ OpenneoImpressItems::Application.configure do
   }
   config.action_mailer.raise_delivery_errors = true
   config.action_mailer.perform_deliveries = true
+
+  # Use default logging formatter so that PID and timestamp are not suppressed.
+  config.log_formatter = ::Logger::Formatter.new
 end
 
 LocalImpressHost = 'newimpress.openneo.net'

config/environments/test.rb

@@ -1,5 +1,5 @@
 OpenneoImpressItems::Application.configure do
-  # Settings specified here will take precedence over those in config/environment.rb
+  # Settings specified here will take precedence over those in config/application.rb.
 
   # The test environment is used exclusively to run your application's
   # test suite. You never need to work with it otherwise. Remember that
@@ -7,14 +7,23 @@ OpenneoImpressItems::Application.configure do
   # and recreated between test runs. Don't rely on the data there!
   config.cache_classes = true
 
-  # Log error messages when you accidentally call methods on nil.
+  # Do not eager load code on boot. This avoids loading your whole application
-  config.whiny_nils = true
+  # just for the purpose of running a single test. If you are using a tool that
+  # preloads Rails for running tests, you may have to set it to true.
+  config.eager_load = false
 
-  # Show full error reports and disable caching
+  # Configure static asset server for tests with Cache-Control for performance.
+  config.serve_static_assets  = true
+  config.static_cache_control = "public, max-age=3600"
+
+  # Show full error reports and disable caching.
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
 
-  # Disable request forgery protection in test environment
+  # Raise exceptions instead of rendering exception templates.
+  config.action_dispatch.show_exceptions = false
+
+  # Disable request forgery protection in test environment.
   config.action_controller.allow_forgery_protection = false
 
   # Tell Action Mailer not to deliver emails to the real world.
@@ -22,19 +31,9 @@ OpenneoImpressItems::Application.configure do
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
 
-  # Use SQL instead of Active Record's schema dumper when creating the test database.
+  # Print deprecation notices to the stderr.
-  # This is necessary if your schema can't be completely dumped by the schema dumper,
-  # like if you have constraints or database-specific column types
-  # config.active_record.schema_format = :sql
-  
   config.active_support.deprecation = :stderr
 
-  # Raise exception on mass assignment protection for Active Record models
+  # Raises error for missing translations
-  config.active_record.mass_assignment_sanitizer = :strict
+  # config.action_view.raise_on_missing_translations = true
-
-  # Configure static asset server for tests with Cache-Control for performance
-  config.serve_static_assets = true
-  config.static_cache_control = "public, max-age=3600"
 end
-
-RemoteImpressHost = 'impress.openneo.net'

config/initializers/filter_parameter_logging.rb

@@ -0,0 +1,4 @@
+# Be sure to restart your server when you modify this file.
+
+# Configure sensitive parameters which will be filtered from the log file.
+Rails.application.config.filter_parameters += [:password]

config/initializers/inflections.rb

@@ -1,10 +1,16 @@
 # Be sure to restart your server when you modify this file.
 
-# Add new inflection rules using the following format 
+# Add new inflection rules using the following format. Inflections
-# (all these examples are active by default):
+# are locale specific, and you may define rules for as many different
-# ActiveSupport::Inflector.inflections do |inflect|
+# locales as you wish. All of these examples are active by default:
+# ActiveSupport::Inflector.inflections(:en) do |inflect|
 #   inflect.plural /^(ox)$/i, '\1en'
 #   inflect.singular /^(ox)en/i, '\1'
 #   inflect.irregular 'person', 'people'
 #   inflect.uncountable %w( fish sheep )
 # end
+
+# These inflection rules are supported but not enabled by default:
+# ActiveSupport::Inflector.inflections(:en) do |inflect|
+#   inflect.acronym 'RESTful'
+# end

config/initializers/secret_token.rb

@@ -1,7 +1,12 @@
 # Be sure to restart your server when you modify this file.
 
-# Your secret key for verifying the integrity of signed cookies.
+# Your secret key is used for verifying the integrity of signed cookies.
 # If you change this key, all old signed cookies will become invalid!
+
 # Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
-OpenneoImpressItems::Application.config.secret_token = ENV.fetch('SECRET_TOKEN')
+# You can use `rake secret` to generate a secure secret key.
+
+# Make sure your secret_key_base is kept private
+# if you're sharing your code publicly.
+OpenneoImpressItems::Application.config.secret_key_base = ENV.fetch('SECRET_TOKEN')

config/initializers/session_store.rb

@@ -1,10 +1,3 @@
 # Be sure to restart your server when you modify this file.
 
-Rails.application.config.session_store :cookie_store, {
+OpenneoImpressItems::Application.config.session_store :cookie_store, key: '_openneo_impress_session'
-  :key => '_openneo_impress_session',
-}
-
-# Use the database for sessions instead of the cookie-based default,
-# which shouldn't be used to store highly confidential information
-# (create the session table with "rake db:sessions:create")
-# Rails.application.config.session_store :active_record_store

config/initializers/wrap_parameters.rb

@@ -1,13 +1,14 @@
 # Be sure to restart your server when you modify this file.
+
 # This file contains settings for ActionController::ParamsWrapper which
 # is enabled by default.
 
 # Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
 ActiveSupport.on_load(:action_controller) do
-  wrap_parameters format: [:json]
+  wrap_parameters format: [:json] if respond_to?(:wrap_parameters)
 end
 
-# Disable root element in JSON by default.
+# To enable root element in JSON for ActiveRecord objects.
-ActiveSupport.on_load(:active_record) do
+# ActiveSupport.on_load(:active_record) do
-  self.include_root_in_json = false
+#  self.include_root_in_json = true
-end
+# end

lib/tasks/rspec.rake

@@ -1,70 +0,0 @@
-begin
-  require 'rspec/core'
-  require 'rspec/core/rake_task'
-rescue MissingSourceFile 
-  module Rspec
-    module Core
-      class RakeTask
-        include Rake::DSL
-        def initialize(name)
-          task name do
-            # if rspec-rails is a configured gem, this will output helpful material and exit ...
-            require File.expand_path(File.dirname(__FILE__) + "/../../config/environment")
-
-            # ... otherwise, do this:
-            raise <<-MSG
-
-#{"*" * 80}
-*  You are trying to run an rspec rake task defined in
-*  #{__FILE__},
-*  but rspec can not be found in vendor/gems, vendor/plugins or system gems.
-#{"*" * 80}
-MSG
-          end
-        end
-      end
-    end
-  end
-end
-
-Rake.application.instance_variable_get('@tasks').delete('default')
-
-spec_prereq = Rails.root.join('config', 'database.yml').exist? ? "db:test:prepare" : :noop
-task :noop do
-end
-
-task :default => :spec
-task :stats => "spec:statsetup"
-
-desc "Run all specs in spec directory (excluding plugin specs)"
-Rspec::Core::RakeTask.new(:spec => spec_prereq)
-
-namespace :spec do
-  [:requests, :models, :controllers, :views, :helpers, :mailers, :lib].each do |sub|
-    desc "Run the code examples in spec/#{sub}"
-    Rspec::Core::RakeTask.new(sub => spec_prereq) do |t|
-      t.pattern = "./spec/#{sub}/**/*_spec.rb"
-    end
-  end
-
-  task :statsetup do
-    require 'rails/code_statistics'
-    ::STATS_DIRECTORIES << %w(Model\ specs spec/models) if File.exist?('spec/models')
-    ::STATS_DIRECTORIES << %w(View\ specs spec/views) if File.exist?('spec/views')
-    ::STATS_DIRECTORIES << %w(Controller\ specs spec/controllers) if File.exist?('spec/controllers')
-    ::STATS_DIRECTORIES << %w(Helper\ specs spec/helpers) if File.exist?('spec/helpers')
-    ::STATS_DIRECTORIES << %w(Library\ specs spec/lib) if File.exist?('spec/lib')
-    ::STATS_DIRECTORIES << %w(Mailer\ specs spec/mailers) if File.exist?('spec/mailers')
-    ::STATS_DIRECTORIES << %w(Routing\ specs spec/routing) if File.exist?('spec/routing')
-    ::STATS_DIRECTORIES << %w(Request\ specs spec/requests) if File.exist?('spec/requests')
-    ::CodeStatistics::TEST_TYPES << "Model specs" if File.exist?('spec/models')
-    ::CodeStatistics::TEST_TYPES << "View specs" if File.exist?('spec/views')
-    ::CodeStatistics::TEST_TYPES << "Controller specs" if File.exist?('spec/controllers')
-    ::CodeStatistics::TEST_TYPES << "Helper specs" if File.exist?('spec/helpers')
-    ::CodeStatistics::TEST_TYPES << "Library specs" if File.exist?('spec/lib')
-    ::CodeStatistics::TEST_TYPES << "Mailer specs" if File.exist?('spec/mailer')
-    ::CodeStatistics::TEST_TYPES << "Routing specs" if File.exist?('spec/routing')
-    ::CodeStatistics::TEST_TYPES << "Request specs" if File.exist?('spec/requests')
-  end
-end
-