Merge branch 'master' of github.com:lifo/docrails

1 files changed, 30 insertions, 8 deletions

diff --git a/railties/lib/rails/deprecation.rb b/railties/lib/rails/deprecation.rb
index 3c5b8bdec7..43f08d13df 100644
--- a/railties/lib/rails/deprecation.rb
+++ b/railties/lib/rails/deprecation.rb
@@ -6,8 +6,8 @@ RAILS_ROOT = (Class.new(ActiveSupport::Deprecation::DeprecationProxy) do
     Rails.root
   end
 
-  def replace(val)
-    puts OMG
+  def replace(*args)
+    warn(caller, :replace, *args)
   end
 
   def warn(callstack, called, args)
@@ -16,10 +16,32 @@ RAILS_ROOT = (Class.new(ActiveSupport::Deprecation::DeprecationProxy) do
   end
 end).new
 
-module Rails
-  class Configuration
-    def gem(*args)
-      ActiveSupport::Deprecation.warn("config.gem has been deprecated in favor of the Gemfile.")
-    end
+RAILS_ENV = (Class.new(ActiveSupport::Deprecation::DeprecationProxy) do
+  def target
+    Rails.env
+  end
+
+  def replace(*args)
+    warn(caller, :replace, *args)
+  end
+
+  def warn(callstack, called, args)
+    msg = "RAILS_ENV is deprecated! Use Rails.env instead."
+    ActiveSupport::Deprecation.warn(msg, callstack)
+  end
+end).new
+
+RAILS_DEFAULT_LOGGER = (Class.new(ActiveSupport::Deprecation::DeprecationProxy) do
+  def target
+    Rails.logger
   end
-end
\ No newline at end of file
+
+  def replace(*args)
+    warn(caller, :replace, *args)
+  end
+
+  def warn(callstack, called, args)
+    msg = "RAILS_DEFAULT_LOGGER is deprecated! Use Rails.logger instead."
+    ActiveSupport::Deprecation.warn(msg, callstack)
+  end
+end).new