replace RAILS_ENV with Rails.env

tsechingho · Feb 12, 2010 · 9bf040f · 9bf040f
1 parent eed6bb6
commit 9bf040f
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/config/initializers/footnotes.rb b/config/initializers/footnotes.rb
@@ -1,4 +1,4 @@
-if ENV['RAILS_ENV'] == 'development' && defined?(Footnotes)
+if Rails.env == 'development' && defined?(Footnotes)
   # NOT Textmate editor:
   # if defined?(Footnotes)
   #  Footnotes::Filter.prefix = 'txmt://open?url=file://%s&line=%d&column=%d'

diff --git a/lib/authlogic_bundle/authorization.rb b/lib/authlogic_bundle/authorization.rb
@@ -31,7 +31,7 @@ def permission_denied
     # all rules and privilleges of each auth_dsl_file will be considered
     # in controller, @authorization_engine will be used
     # in model, Authorization::Engine.instance will be used
-    # if RAILS_ENV is development, a new Authorization::Engine.instance
+    # if Rails.env is development, a new Authorization::Engine.instance
     # will always be created without hacking
     def merge_authorization_rules
       reader = ::Authorization::Reader::DSLReader.new

diff --git a/lib/authlogic_bundle/maintenance.rb b/lib/authlogic_bundle/maintenance.rb
@@ -26,7 +26,7 @@ def delete_user_by_login(login)
     end
 
     def create_roles_from_rule_file(file=nil, skips=[:guest])
-      file ||= "#{RAILS_ROOT}/config/authorization_rules.rb"
+      file ||= "#{Rails.root}/config/authorization_rules.rb"
       puts "Reading #{file} ..." if speak
       reader = ::Authorization::Reader::DSLReader.load file
       reader.auth_rules_reader.roles.each do |role|

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -27,7 +27,7 @@
   # in your config/boot.rb
   config.use_transactional_fixtures = true
   config.use_instantiated_fixtures  = false
-  config.fixture_path = RAILS_ROOT + '/spec/fixtures/'
+  config.fixture_path = Rails.root + '/spec/fixtures/'
 
   # == Fixtures
   #
@@ -46,7 +46,7 @@
   #
   # You can also declare which fixtures to use (for example fixtures for test/fixtures):
   #
-  # config.fixture_path = RAILS_ROOT + '/spec/fixtures/'
+  # config.fixture_path = Rails.root + '/spec/fixtures/'
   #
   # == Mock Framework
   #

diff --git a/templates/base.rb b/templates/base.rb
@@ -105,7 +105,7 @@
   def ssl_required?
     return ENV['SSL'] == 'on' ? true : false if defined? ENV['SSL']
     return false if local_request?
-    return false if RAILS_ENV == 'test'
+    return false if Rails.env == 'test'
     super
   end
 CODE

diff --git a/templates/monitor.rb b/templates/monitor.rb
@@ -10,7 +10,7 @@
 rake 'gems:install', :sudo => true, :env => 'development'
 
 initializer 'footnotes.rb', <<-CODE
-if ENV['RAILS_ENV'] == 'development' && defined?(Footnotes)
+if Rails.env == 'development' && defined?(Footnotes)
   # NOT Textmate editor:
   # if defined?(Footnotes)
   #  Footnotes::Filter.prefix = 'txmt://open?url=file://%s&line=%d&column=%d'