diff options
| author | kennyj <kennyj@gmail.com> | 2013-06-01 13:05:29 +0900 |
|---|---|---|
| committer | kennyj <kennyj@gmail.com> | 2013-06-01 21:23:19 +0900 |
| commit | 6f3e01e8b78eff1b1685a0b35d70819376bfd773 (patch) | |
| tree | ecc75a2a25b6a0fea2731dfdd4a7f155e3667f8b /activesupport | |
| parent | f2855f6ef17254718f625abba285841212dfbb87 (diff) | |
| download | rails-6f3e01e8b78eff1b1685a0b35d70819376bfd773.tar.gz rails-6f3e01e8b78eff1b1685a0b35d70819376bfd773.tar.bz2 rails-6f3e01e8b78eff1b1685a0b35d70819376bfd773.zip | |
Remove active_support/json/variable was deprecated.
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/json/encoding.rb | 1 | ||||
| -rw-r--r-- | activesupport/lib/active_support/json/variable.rb | 18 | ||||
| -rw-r--r-- | activesupport/test/json/encoding_test.rb | 7 |
3 files changed, 0 insertions, 26 deletions
diff --git a/activesupport/lib/active_support/json/encoding.rb b/activesupport/lib/active_support/json/encoding.rb index 7f8b41d218..77b5d8d227 100644 --- a/activesupport/lib/active_support/json/encoding.rb +++ b/activesupport/lib/active_support/json/encoding.rb @@ -2,7 +2,6 @@ require 'active_support/core_ext/object/to_json' require 'active_support/core_ext/module/delegation' -require 'active_support/json/variable' require 'bigdecimal' require 'active_support/core_ext/big_decimal/conversions' # for #to_s diff --git a/activesupport/lib/active_support/json/variable.rb b/activesupport/lib/active_support/json/variable.rb deleted file mode 100644 index d69dab6408..0000000000 --- a/activesupport/lib/active_support/json/variable.rb +++ /dev/null @@ -1,18 +0,0 @@ -require 'active_support/deprecation' - -module ActiveSupport - module JSON - # Deprecated: A string that returns itself as its JSON-encoded form. - class Variable < String - def initialize(*args) - message = 'ActiveSupport::JSON::Variable is deprecated and will be removed in Rails 4.1. ' \ - 'For your own custom JSON literals, define #as_json and #encode_json yourself.' - ActiveSupport::Deprecation.warn message - super - end - - def as_json(options = nil) self end #:nodoc: - def encode_json(encoder) self end #:nodoc: - end - end -end diff --git a/activesupport/test/json/encoding_test.rb b/activesupport/test/json/encoding_test.rb index 14f4366f7b..ed1326705c 100644 --- a/activesupport/test/json/encoding_test.rb +++ b/activesupport/test/json/encoding_test.rb @@ -96,13 +96,6 @@ class TestJSONEncoding < ActiveSupport::TestCase end end - def test_json_variable - assert_deprecated do - assert_equal ActiveSupport::JSON::Variable.new('foo'), 'foo' - assert_equal ActiveSupport::JSON::Variable.new('alert("foo")'), 'alert("foo")' - end - end - def test_hash_encoding assert_equal %({\"a\":\"b\"}), ActiveSupport::JSON.encode(:a => :b) assert_equal %({\"a\":1}), ActiveSupport::JSON.encode('a' => 1) |