Removed Rails3 deprication warnings.

Oneil · Mar 29, 2010 · 9daf2fd · 9daf2fd
1 parent 17972b0
commit 9daf2fd
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/tasks/tiny_mce.rake → lib/tasks/tiny_mce.rake b/tasks/tiny_mce.rake → lib/tasks/tiny_mce.rake
@@ -1,6 +1,6 @@
 namespace :tiny_mce do
 
-  desc 'Install (or updated if they alread exist) the TinyMCE sources'
+  desc 'Install or update the TinyMCE sources'
   task :install => :environment do
     TinyMCE.install_or_update_tinymce
   end

diff --git a/lib/tiny_mce.rb b/lib/tiny_mce.rb
@@ -9,7 +9,7 @@ module TinyMCE
   def self.install_or_update_tinymce
     require 'fileutils'
     orig = File.join(File.dirname(__FILE__), 'tiny_mce', 'assets', 'tiny_mce')
-    dest = File.join(RAILS_ROOT, 'public', 'javascripts', 'tiny_mce')
+    dest = File.join(Rails.root, 'public', 'javascripts', 'tiny_mce')
     tiny_mce_js = File.join(dest, 'tiny_mce.js')
 
     unless File.exists?(tiny_mce_js) && FileUtils.identical?(File.join(orig, 'tiny_mce.js'), tiny_mce_js)
@@ -46,7 +46,7 @@ def self.install_or_update_tinymce
       end
     end
 
-    tiny_mce_yaml_filepath = File.join(RAILS_ROOT, 'config', 'tiny_mce.yml')
+    tiny_mce_yaml_filepath = File.join(Rails.root, 'config', 'tiny_mce.yml')
     unless File.exists?(tiny_mce_yaml_filepath)
       File.open(tiny_mce_yaml_filepath, 'w') do |f|
         f.puts '# Here you can specify default options for TinyMCE across all controllers'

diff --git a/lib/tiny_mce/configuration.rb b/lib/tiny_mce/configuration.rb
@@ -18,7 +18,7 @@ def self.default_options
     # might be valid. Catch all cases and make sure we always return a Hash
     def self.config_file_options
       @@config_file_options ||= begin
-        tiny_mce_yaml_filepath = File.join(RAILS_ROOT, 'config', 'tiny_mce.yml')
+        tiny_mce_yaml_filepath = File.join(Rails.root, 'config', 'tiny_mce.yml')
         (YAML::load(IO.read(tiny_mce_yaml_filepath)) rescue nil) || Hash.new
       end
     end

diff --git a/lib/tiny_mce/helpers.rb b/lib/tiny_mce/helpers.rb
@@ -35,7 +35,7 @@ def tiny_mce_init_if_needed(options = {}, raw_options = nil)
 
     # Form a JS include tag for the TinyMCE JS src for inclusion in the <head>
     def include_tiny_mce_js
-      javascript_include_tag (RAILS_ENV == 'development' ? "tiny_mce/tiny_mce_src" : "tiny_mce/tiny_mce")
+      javascript_include_tag (Rails.env == 'development' ? "tiny_mce/tiny_mce_src" : "tiny_mce/tiny_mce")
     end
     # Form a JS include tag for the TinyMCE JS src for inclusion in the <head>
     # (only if tiny mce is actually being used)