aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2013-07-01 22:15:33 +0200
committerYves Senn <yves.senn@gmail.com>2013-07-01 22:16:37 +0200
commitcfa35c55bb38b27af305ad21408e181bc3cd739e (patch)
tree479c8b510a189247b59e25a5d18234b2dff89a00 /activesupport
parentcd74f0292f0e4caa13fae2b9869f5f190c081839 (diff)
downloadrails-cfa35c55bb38b27af305ad21408e181bc3cd739e.tar.gz
rails-cfa35c55bb38b27af305ad21408e181bc3cd739e.tar.bz2
rails-cfa35c55bb38b27af305ad21408e181bc3cd739e.zip
remove deprecated `BufferedLogger`.
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/CHANGELOG.md4
-rw-r--r--activesupport/lib/active_support/buffered_logger.rb21
-rw-r--r--activesupport/lib/active_support/log_subscriber/test_helper.rb1
-rw-r--r--activesupport/test/deprecation/buffered_logger_test.rb22
4 files changed, 4 insertions, 44 deletions
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index ecf856daf7..2f440d7e52 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -1,3 +1,7 @@
+* Remove deprecated `BufferedLogger`.
+
+ *Yves Senn*
+
* Remove deprecated `assert_present` and `assert_blank` methods.
*Yves Senn*
diff --git a/activesupport/lib/active_support/buffered_logger.rb b/activesupport/lib/active_support/buffered_logger.rb
deleted file mode 100644
index 1cd0c2f790..0000000000
--- a/activesupport/lib/active_support/buffered_logger.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-require 'active_support/deprecation'
-require 'active_support/logger'
-
-module ActiveSupport
- class BufferedLogger < Logger
-
- def initialize(*args)
- self.class._deprecation_warning
- super
- end
-
- def self.inherited(*)
- _deprecation_warning
- super
- end
-
- def self._deprecation_warning
- ::ActiveSupport::Deprecation.warn 'ActiveSupport::BufferedLogger is deprecated! Use ActiveSupport::Logger instead.'
- end
- end
-end
diff --git a/activesupport/lib/active_support/log_subscriber/test_helper.rb b/activesupport/lib/active_support/log_subscriber/test_helper.rb
index f9a98686d3..e50784ea0e 100644
--- a/activesupport/lib/active_support/log_subscriber/test_helper.rb
+++ b/activesupport/lib/active_support/log_subscriber/test_helper.rb
@@ -1,5 +1,4 @@
require 'active_support/log_subscriber'
-require 'active_support/buffered_logger'
require 'active_support/notifications'
module ActiveSupport
diff --git a/activesupport/test/deprecation/buffered_logger_test.rb b/activesupport/test/deprecation/buffered_logger_test.rb
deleted file mode 100644
index bf11a4732c..0000000000
--- a/activesupport/test/deprecation/buffered_logger_test.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-require 'abstract_unit'
-require 'active_support/buffered_logger'
-
-class BufferedLoggerTest < ActiveSupport::TestCase
-
- def test_can_be_subclassed
- warn = 'ActiveSupport::BufferedLogger is deprecated! Use ActiveSupport::Logger instead.'
-
- ActiveSupport::Deprecation.expects(:warn).with(warn).once
-
- Class.new(ActiveSupport::BufferedLogger)
- end
-
- def test_issues_deprecation_when_instantiated
- warn = 'ActiveSupport::BufferedLogger is deprecated! Use ActiveSupport::Logger instead.'
-
- ActiveSupport::Deprecation.expects(:warn).with(warn).once
-
- ActiveSupport::BufferedLogger.new(STDOUT)
- end
-
-end