Use Rails.xxx instead of RAILS_XXX

diff --git a/app/controllers/amf_controller.rb b/app/controllers/amf_controller.rb
index 078823cbb3dc72ec7826461954ce8b1cfd1a0793..534e41a8092f6a52f95593b347b436c9af2f158e 100644 (file)
--- a/app/controllers/amf_controller.rb
+++ b/app/controllers/amf_controller.rb
@@ -265,14 +265,14 @@ class AmfController < ApplicationController
     loaded_lang = 'en'
 
     # Load English defaults
-    en = YAML::load(File.open("#{RAILS_ROOT}/config/potlatch/locales/en.yml"))["en"]
+    en = YAML::load(File.open("#{Rails.root}/config/potlatch/locales/en.yml"))["en"]
 
     if lang == 'en'
       return [loaded_lang, en]
     else
       # Use English as a fallback
       begin
-        other = YAML::load(File.open("#{RAILS_ROOT}/config/potlatch/locales/#{lang}.yml"))[lang]
+        other = YAML::load(File.open("#{Rails.root}/config/potlatch/locales/#{lang}.yml"))[lang]
         loaded_lang = lang
       rescue
         other = en
@@ -916,7 +916,7 @@ class AmfController < ApplicationController
   end
 
   def getlocales
-    Dir.glob("#{RAILS_ROOT}/config/potlatch/locales/*").collect { |f| File.basename(f, ".yml") }
+    Dir.glob("#{Rails.root}/config/potlatch/locales/*").collect { |f| File.basename(f, ".yml") }
   end
   
   ##

diff --git a/app/views/site/key.html.erb b/app/views/site/key.html.erb
index d0fd361483c2a1c812abf53c783b940446c549a7..294224b189612ccefb5cefa335d3cbc112ef6fc3 100644 (file)
--- a/app/views/site/key.html.erb
+++ b/app/views/site/key.html.erb
@@ -1,6 +1,6 @@
 <div id="mapkey">
   <table class="mapkey-table">
-    <% YAML.load_file("#{RAILS_ROOT}/config/key.yml").each do |name,data| %>
+    <% YAML.load_file("#{Rails.root}/config/key.yml").each do |name,data| %>
       <% if params[:layer] == name %>
         <% data.each do |entry| %>
           <% if params[:zoom].to_i >= entry['min_zoom'] && params[:zoom].to_i <= entry['max_zoom'] %>

diff --git a/config/initializers/i18n.rb b/config/initializers/i18n.rb
index 8aadeaacf8edcba856e819b196777b6bfa927522..2561c07f21149ba5526e1db94c92e8194f9e0268 100644 (file)
--- a/config/initializers/i18n.rb
+++ b/config/initializers/i18n.rb
@@ -37,6 +37,6 @@ end
 
 I18n::Backend::Simple.send(:include, I18n::Backend::Pluralization)
 I18n::Backend::Simple.send(:include, I18n::Backend::PluralizationFallback)
-I18n.load_path << RAILS_ROOT + "/config/pluralizers.rb"
+I18n.load_path << "#{Rails.root}/config/pluralizers.rb"
 
 I18n::Backend::Simple.send(:include, I18n::Backend::Fallbacks)

diff --git a/config/initializers/wiki_pages.rb b/config/initializers/wiki_pages.rb
index dbaa4ddacb55d2e42a13e5c2e87bf2d07ada8e51..0b6f7be2a9f8c0fd794b1f565756a1adee9d26cf 100644 (file)
--- a/config/initializers/wiki_pages.rb
+++ b/config/initializers/wiki_pages.rb
@@ -1 +1 @@
-WIKI_PAGES = YAML.load_file("#{RAILS_ROOT}/config/wiki_pages.yml")
+WIKI_PAGES = YAML.load_file("#{Rails.root}/config/wiki_pages.yml")

diff --git a/db/migrate/034_create_languages.rb b/db/migrate/034_create_languages.rb
index ab5a7eee65ed3b7122a5e52b31b99b254e2b514f..27994b3fecd16cc7c903ea0289a8f128b91d2847 100644 (file)
--- a/db/migrate/034_create_languages.rb
+++ b/db/migrate/034_create_languages.rb
@@ -10,7 +10,7 @@ class CreateLanguages < ActiveRecord::Migration
 
     add_primary_key :languages, [:code]
 
-    Language.load(RAILS_ROOT + "/config/languages.yml")
+    Language.load("#{Rails.root}/config/languages.yml")
 
     add_foreign_key :users, [:locale], :languages, [:code]
     add_foreign_key :diary_entries, [:language_code], :languages, [:code]    

diff --git a/lib/osm.rb b/lib/osm.rb
index 60e33c7db8fd6e31ac5ce66fe6972c318322f419..8416aab5aad5169d628e33597d196e0cd6df8b87 100644 (file)
--- a/lib/osm.rb
+++ b/lib/osm.rb
@@ -529,8 +529,8 @@ module OSM
   end
 
   def self.legal_text_for_country(country_code)
-    file_name = File.join(RAILS_ROOT, "config", "legales", country_code.to_s + ".yml")
-    file_name = File.join(RAILS_ROOT, "config", "legales", DEFAULT_LEGALE + ".yml") unless File.exist? file_name
+    file_name = File.join(Rails.root, "config", "legales", country_code.to_s + ".yml")
+    file_name = File.join(Rails.root, "config", "legales", DEFAULT_LEGALE + ".yml") unless File.exist? file_name
     YAML::load_file(file_name)
   end
 end

diff --git a/lib/potlatch.rb b/lib/potlatch.rb
index 29ab4535a1f399b8c5fe7fa1325adf9c635b1b11..ef3be79a80f748ebff407c6aeaf29f1e6d5ab41a 100644 (file)
--- a/lib/potlatch.rb
+++ b/lib/potlatch.rb
@@ -97,7 +97,7 @@ module Potlatch
          when 'FalseClass'
         0.chr+encodedouble(0)
       else
-        RAILS_DEFAULT_LOGGER.error("Unexpected Ruby type for AMF conversion: "+n.class.to_s)
+        Rails.logger.error("Unexpected Ruby type for AMF conversion: "+n.class.to_s)
       end
     end
 
@@ -130,7 +130,7 @@ module Potlatch
     #                          [3] colours, [4] casing, [5] areas, [6] autotags
     #                          (all hashes)
     def self.get_presets
-      RAILS_DEFAULT_LOGGER.info("  Message: getpresets")
+      Rails.logger.info("  Message: getpresets")
 
       # Read preset menus
       presets={}
@@ -139,7 +139,7 @@ module Potlatch
       presettype=''
       presetcategory=''
       #        StringIO.open(txt) do |file|
-      File.open("#{RAILS_ROOT}/config/potlatch/presets.txt") do |file|
+      File.open("#{Rails.root}/config/potlatch/presets.txt") do |file|
         file.each_line {|line|
           t=line.chomp
           if (t=~/(\w+)\/(\w+)/) then
@@ -160,7 +160,7 @@ module Potlatch
 
       # Read colours/styling
       colours={}; casing={}; areas={}
-      File.open("#{RAILS_ROOT}/config/potlatch/colours.txt") do |file|
+      File.open("#{Rails.root}/config/potlatch/colours.txt") do |file|
         file.each_line {|line|
           t=line.chomp
           if (t=~/(\w+)\s+([^\s]+)\s+([^\s]+)\s+([^\s]+)/) then
@@ -174,7 +174,7 @@ module Potlatch
 
       # Read relations colours/styling
       relcolours={}; relalphas={}; relwidths={}
-      File.open("#{RAILS_ROOT}/config/potlatch/relation_colours.txt") do |file|
+      File.open("#{Rails.root}/config/potlatch/relation_colours.txt") do |file|
         file.each_line {|line|
           t=line.chomp
           if (t=~/(\w+)\s+([^\s]+)\s+([^\s]+)\s+([^\s]+)/) then
@@ -188,7 +188,7 @@ module Potlatch
 
       # Read POI presets
       icon_list=[]; icon_tags={};
-      File.open("#{RAILS_ROOT}/config/potlatch/icon_presets.txt") do |file|
+      File.open("#{Rails.root}/config/potlatch/icon_presets.txt") do |file|
         file.each_line {|line|
           (icon,tags)=line.chomp.split("\t")
           icon_list.push(icon)
@@ -199,7 +199,7 @@ module Potlatch
       
       # Read auto-complete
       autotags={}; autotags['point']={}; autotags['way']={}; autotags['POI']={};
-      File.open("#{RAILS_ROOT}/config/potlatch/autocomplete.txt") do |file|
+      File.open("#{Rails.root}/config/potlatch/autocomplete.txt") do |file|
         file.each_line {|line|
           t=line.chomp
           if (t=~/^([\w:]+)\/(\w+)\s+(.+)$/) then

diff --git a/test/test_helper.rb b/test/test_helper.rb
index 16b678f83656cee154f3e51ac053b15d45872d6d..7d2aa405fcfde7962477d58da27c86b1acba9117 100644 (file)
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -168,7 +168,7 @@ class ActiveSupport::TestCase
       rots_response = Net::HTTP.get_response(URI.parse("http://localhost:1123/"))
     rescue
       # It isn't, so start a new instance.
-      rots = IO.popen(RAILS_ROOT + "/vendor/gems/rots-0.2.1/bin/rots --silent")
+      rots = IO.popen("#{Rails.root}/vendor/gems/rots-0.2.1/bin/rots --silent")
 
       # Wait for up to 30 seconds for the server to start and respond before continuing
       for i in (1 .. 30)