Update config in a true Rails 4 way

3 files changed, 70 insertions, 103 deletions

diff --git a/config/environments/development.rb b/config/environments/development.rb
index 8398242e6..f74798e78 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -1,26 +1,22 @@
-# ENV["CHOUETTE_RUN_MIGRATIONS"] = "true"
-ChouetteIhm::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb
+Rails.application.configure do
+  # 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
+  # every request. This slows down response time but is perfect for development
   # since you don't have to restart the web server when you make code changes.
   config.cache_classes = false
 
   # Do not eager load code on boot.
   config.eager_load = false
 
-  # Log error messages when you accidentally call methods on nil.
-  config.whiny_nils = true
-
-  # Show full error reports and disable caching
+  # Show full error reports and disable caching.
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
 
-  # 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
 
-  # Print deprecation notices to the Rails logger
+  # Print deprecation notices to the Rails logger.
   config.active_support.deprecation = :log
 
   # Raise an error on page load if there are pending migrations.
@@ -31,7 +27,7 @@ ChouetteIhm::Application.configure do
   # number of complex assets.
   config.assets.debug = true
 
-   # Adds additional error checking when serving assets at runtime.
+  # Adds additional error checking when serving assets at runtime.
   # Checks for improperly declared sprockets dependencies.
   # Raises helpful error messages.
   config.assets.raise_runtime_errors = true
@@ -39,11 +35,6 @@ ChouetteIhm::Application.configure do
   # Raises error for missing translations
   # config.action_view.raise_on_missing_translations = true
 
-  # uncomment to show chouette error view in development
-  #config.consider_all_requests_local = false
-
-  config.action_mailer.default_url_options = { :host => 'localhost:3000' }
-
   # replace this with your production tracker code
   GA.tracker = "UA-AAAAAAAA"
 
@@ -62,25 +53,27 @@ ChouetteIhm::Application.configure do
   # config.company_theme = "#32adb0"
   # config.company_contact = "http://www.cityway.fr/contact/?rub_code=14"
   # config.accept_user_creation = false
-
+  
   # file to data for demo
   config.demo_data = "tmp/demo.zip"
-
+  
   # link to validation specification pages
   config.validation_spec = "http://www.chouette.mobi/neptune-validation/v20/"
 
+  config.action_mailer.default_url_options = { :host => 'localhost:3000' }
+  
   # Configure the e-mail address which will be shown in Devise::Maile
   config.mailer_sender = "appli@chouette.mobi"
 
- config.action_mailer.delivery_method = :sendmail 
+  config.action_mailer.delivery_method = :sendmail 
   # change to true to allow email to be sent during development
   config.action_mailer.perform_deliveries = true
   config.action_mailer.raise_delivery_errors = true
   config.action_mailer.default :charset => "utf-8"
-
+  
   # api key to geoportail IGN (development key 3 month validity)
   # config.geoportail_api_key = "f1t6wihbh98njlbaf5cuzxy4"
-
+  
   config.to_prepare do
     Devise::Mailer.layout "mailer"
     #ApplicationMap.ign_api_key = "i2aqyge3x3iovnuhz7z06flp"
@@ -91,7 +84,6 @@ ChouetteIhm::Application.configure do
       Chouette::Command.command = "true"
     end
   end
-
+  
   config.i18n.available_locales = [:fr, :en]
-
 end
diff --git a/config/environments/production.rb b/config/environments/production.rb
index fbc3b3330..fab960e90 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -1,7 +1,7 @@
-ChouetteIhm::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb
+Rails.application.configure do
+  # Settings specified here will take precedence over those in config/application.rb.
 
-  # Code is not reloaded between requests
+  # Code is not reloaded between requests.
   config.cache_classes = true
 
   # Eager load code on boot. This eager loads most of Rails and
@@ -29,12 +29,11 @@ ChouetteIhm::Application.configure do
   # Do not fallback to assets pipeline if a precompiled asset is missed.
   config.assets.compile = false
 
-  # Generate digests for assets URLs
+  # Generate digests for assets URLs.
   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
@@ -57,10 +56,6 @@ ChouetteIhm::Application.configure do
   # 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 )
-
   # 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.
   # config.action_mailer.raise_delivery_errors = false
@@ -80,7 +75,7 @@ ChouetteIhm::Application.configure do
 
   # Do not dump schema after migrations.
   config.active_record.dump_schema_after_migration = false
-  
+
   # Use a different logger for distributed setups
   #if ENV['OS'] == 'Windows_NT'
   #  # args = log_path,number of files,file sizes
@@ -91,52 +86,33 @@ ChouetteIhm::Application.configure do
     logger.level = Logger::INFO
   end
   #end
-
+  
   if ENV['CHOUETTE_BASE_URL'].nil?
-     config.action_mailer.default_url_options = { :host => 'my-domain-name.com' }
+    config.action_mailer.default_url_options = { :host => 'my-domain-name.com' }
   else
-     config.action_mailer.default_url_options = { :host => ENV['CHOUETTE_BASE_URL'] }
+    config.action_mailer.default_url_options = { :host => ENV['CHOUETTE_BASE_URL'] }
   end  
   
   # Configure the e-mail address which will be shown in Devise::Maile
   if ENV['CHOUETTE_MAIL_SENDER'].nil?
-     config.mailer_sender = "chouette-production@my-domain-name.com"
-  else
-     config.mailer_sender = ENV['CHOUETTE_MAIL_SENDER']
-  end  
-
-  #  mailer configuration :
-  #  by default : set to smtp on windows platforms and sendmail on unix one
-  #               may be changed as convenience
-  #if ENV['OS'] == 'Windows_NT'
-  #  ## using SMTP (maybe useful for Windows or VM platforms):
-  #   ActionMailer::Base.delivery_method = :smtp
-  #   ActionMailer::Base.smtp_settings = {
-  #     :address => "smtp.sample.com",
-  #     :domain => "sample.com",
-  #     :user_name => "username",
-  #   }
-  #else
-  mailer = ""
-  if ENV['CHOUETTE_MAILER'].nil?
-    mailer = "smtp"
+    config.mailer_sender = "chouette-production@my-domain-name.com"
   else
-    mailer = ENV['CHOUETTE_MAILER']
+    config.mailer_sender = ENV['CHOUETTE_MAIL_SENDER']
   end
   if mailer == "smtp"
     if ENV['CHOUETTE_SMTP_USER'].nil?
       ActionMailer::Base.smtp_settings = {
-	:address        => ENV['CHOUETTE_SMTP_ADDRESS'].nil? ? "smtp.sample.com" : ENV['CHOUETTE_SMTP_ADDRESS'],
-	:port           => ENV['CHOUETTE_SMTP_PORT'].nil? ? 25 : ENV['CHOUETTE_SMTP_PORT'].to_i,
-	:domain         => ENV['CHOUETTE_SMTP_DOMAIN'].nil? ? "sample.com" : ENV['CHOUETTE_SMTP_DOMAIN']   }
+        :address        => ENV['CHOUETTE_SMTP_ADDRESS'].nil? ? "smtp.sample.com" : ENV['CHOUETTE_SMTP_ADDRESS'],
+        :port           => ENV['CHOUETTE_SMTP_PORT'].nil? ? 25 : ENV['CHOUETTE_SMTP_PORT'].to_i,
+        :domain         => ENV['CHOUETTE_SMTP_DOMAIN'].nil? ? "sample.com" : ENV['CHOUETTE_SMTP_DOMAIN']   }
     else
       ActionMailer::Base.smtp_settings = {
-	:address        => ENV['CHOUETTE_SMTP_ADDRESS'],
-	:port           => ENV['CHOUETTE_SMTP_PORT'].nil? ? 25 : ENV['CHOUETTE_SMTP_PORT'].to_i,
-	:domain         => ENV['CHOUETTE_SMTP_DOMAIN'],
-	:user_name      => ENV['CHOUETTE_SMTP_USER'],
-	:password       => ENV['CHOUETTE_SMTP_PASSWORD'],
-	:authentication => ENV['CHOUETTE_SMTP_AUTH']    }
+        :address        => ENV['CHOUETTE_SMTP_ADDRESS'],
+        :port           => ENV['CHOUETTE_SMTP_PORT'].nil? ? 25 : ENV['CHOUETTE_SMTP_PORT'].to_i,
+        :domain         => ENV['CHOUETTE_SMTP_DOMAIN'],
+        :user_name      => ENV['CHOUETTE_SMTP_USER'],
+        :password       => ENV['CHOUETTE_SMTP_PASSWORD'],
+        :authentication => ENV['CHOUETTE_SMTP_AUTH']    }
     end  
   end 
   #end
@@ -144,14 +120,14 @@ ChouetteIhm::Application.configure do
   # replace this with your production tracker code
   # replace this with your production tracker code
   if ENV['CHOUETTE_GOOGLE_ANALYTICS'].nil?
-     GA.tracker = "UA-AAAAAAAA"
+    GA.tracker = "UA-AAAAAAAA"
   else
-     GA.tracker = ENV['CHOUETTE_GOOGLE_ANALYTICS']
+    GA.tracker = ENV['CHOUETTE_GOOGLE_ANALYTICS']
   end  
-
+  
   # api key to geoportail IGN (production key link to application url root referer)
   if !ENV['CHOUETTE_GEOPORTAIL_KEY'].nil?
-     config.geoportail_api_key = ENV['CHOUETTE_GEOPORTAIL_KEY']
+    config.geoportail_api_key = ENV['CHOUETTE_GEOPORTAIL_KEY']
   end  
 
   # Specific theme for each company
@@ -166,13 +142,13 @@ ChouetteIhm::Application.configure do
   # config.company_theme = "#32adb0"
   # config.company_contact = "http://www.cityway.fr/contact/?rub_code=14"
   # config.accept_user_creation = false  
-
+  
   # file to data for demo
   config.demo_data = ENV['CHOUETTE_DEMO_DATA'].nil? ? "/path/to/demo.zip" : ENV['CHOUETTE_DEMO_DATA']
-
+  
   # link to validation specification pages
   config.validation_spec = "http://www.chouette.mobi/neptune-validation/v20/"
-
+  
   # paths for external resources
   config.to_prepare do
     Devise::Mailer.layout "mailer"
diff --git a/config/environments/test.rb b/config/environments/test.rb
index a138599bb..e878822cd 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -1,49 +1,37 @@
-ChouetteIhm::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb
+Rails.application.configure do
+  # 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
+  # test suite. You never need to work with it otherwise. Remember that
   # your test database is "scratch space" for the test suite and is wiped
-  # and recreated between test runs.  Don't rely on the data there!
+  # and recreated between test runs. Don't rely on the data there!
   config.cache_classes = true
 
   # Do not eager load code on boot. This avoids loading your whole application
   # 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
-  
-  # Configure static asset server for tests with Cache-Control for performance
-  config.serve_static_assets = true
-  config.static_cache_control = "public, max-age=3600"
 
-  # Log error messages when you accidentally call methods on nil
-  config.whiny_nils = 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'
 
-  # Show full error reports and disable caching
+  # Show full error reports and disable caching.
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
 
-  # Raise exceptions instead of rendering exception templates
+  # 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
-
-  # Configure the e-mail address which will be shown in Devise::Maile
-  config.mailer_sender = "appli@chouette.mobi"
+  # 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.
   # The :test delivery method accumulates sent emails in the
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
-  config.action_mailer.default_url_options = { :host => 'localhost:3000' }
 
-  # Use SQL instead of Active Record's schema dumper when creating the test database.
-  # 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
-
-  # Print deprecation notices to the stderr
+  # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr
 
   # Raises error for missing translations
@@ -51,10 +39,10 @@ ChouetteIhm::Application.configure do
 
   # replace this with your production tracker code
   GA.tracker = "UA-AAAAAAAA"
-
+  
   # api key to geoportail IGN (production key link to application url root referer)
   config.geoportail_api_key = "aaaaaaaaaaaaaa" 
-
+  
   # Specific theme for each company
   # AFIMB
   config.company_name = "afimb"  
@@ -70,13 +58,24 @@ ChouetteIhm::Application.configure do
   
   # file to data for demo
   config.demo_data = "tmp/demo.zip"
-
+  
   # link to validation specification pages
   config.validation_spec = "http://www.chouette.mobi/neptune-validation/v20/"
 
+  config.action_mailer.default_url_options = { :host => 'localhost:3000' }
+  
+  # Configure the e-mail address which will be shown in Devise::Maile
+  config.mailer_sender = "appli@chouette.mobi"
+
+  config.action_mailer.delivery_method = :sendmail 
+  # change to true to allow email to be sent during development
+  config.action_mailer.perform_deliveries = false
+  config.action_mailer.raise_delivery_errors = false
+  config.action_mailer.default :charset => "utf-8"
+  
   config.to_prepare do
     Chouette::Command.command = "true"
   end
-
+  
   config.i18n.available_locales = [:fr, :en]
 end