Added as_json method for multibyte strings

2 files changed, 7 insertions, 0 deletions

diff --git a/activesupport/lib/active_support/multibyte/chars.rb b/activesupport/lib/active_support/multibyte/chars.rb
index ac61870871..7a0e1d458b 100644
--- a/activesupport/lib/active_support/multibyte/chars.rb
+++ b/activesupport/lib/active_support/multibyte/chars.rb
@@ -188,6 +188,10 @@ module ActiveSupport #:nodoc:
         chars(Unicode.tidy_bytes(@wrapped_string, force))
       end
 
+      def as_json(options = nil) #:nodoc:
+        to_s.as_json(options)
+      end
+
       %w(capitalize downcase reverse tidy_bytes upcase).each do |method|
         define_method("#{method}!") do |*args|
           @wrapped_string = send(method, *args).to_s
diff --git a/activesupport/test/multibyte_chars_test.rb b/activesupport/test/multibyte_chars_test.rb
index 63e7a35c01..90aa13b3e6 100644
--- a/activesupport/test/multibyte_chars_test.rb
+++ b/activesupport/test/multibyte_chars_test.rb
@@ -88,6 +88,9 @@ class MultibyteCharsTest < ActiveSupport::TestCase
     assert(('a'.mb_chars << 'b'.mb_chars).kind_of?(@proxy_class))
   end
 
+  def test_should_return_string_as_json
+    assert_equal UNICODE_STRING, @chars.as_json
+  end
 end
 
 class MultibyteCharsUTF8BehaviourTest < ActiveSupport::TestCase