From 080e2a7abf8314338a41f72821703b23c86b3c45 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john_firebaugh@us.ibm.com>
Date: Fri, 1 Apr 2011 12:14:53 -0700
Subject: Enumerable should pass encoding options to children in
 #as_json/#to_json.

---
 activesupport/lib/active_support/json/encoding.rb |  4 ++-
 activesupport/test/json/encoding_test.rb          | 33 ++++++++++++++++-------
 2 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/activesupport/lib/active_support/json/encoding.rb b/activesupport/lib/active_support/json/encoding.rb
index 82b8a7e148..1fafc36ee8 100644
--- a/activesupport/lib/active_support/json/encoding.rb
+++ b/activesupport/lib/active_support/json/encoding.rb
@@ -205,7 +205,9 @@ class Regexp
 end
 
 module Enumerable
-  def as_json(options = nil) to_a end #:nodoc:
+  def as_json(options = nil) #:nodoc:
+    to_a.as_json(options)
+  end
 end
 
 class Array
diff --git a/activesupport/test/json/encoding_test.rb b/activesupport/test/json/encoding_test.rb
index d5fcbf15b7..8cf1a54a99 100644
--- a/activesupport/test/json/encoding_test.rb
+++ b/activesupport/test/json/encoding_test.rb
@@ -215,6 +215,30 @@ class TestJSONEncoding < Test::Unit::TestCase
     assert_equal(%([{"address":{"city":"London"}},{"address":{"city":"Paris"}}]), json)
   end
 
+  def test_enumerable_should_pass_encoding_options_to_children_in_as_json
+    people = [
+      { :name => 'John', :address => { :city => 'London', :country => 'UK' }},
+      { :name => 'Jean', :address => { :city => 'Paris' , :country => 'France' }}
+    ]
+    json = people.each.as_json :only => [:address, :city]
+    expected = [
+      { 'address' => { 'city' => 'London' }},
+      { 'address' => { 'city' => 'Paris' }}
+    ]
+
+    assert_equal(expected, json)
+  end
+
+  def test_enumerable_should_pass_encoding_options_to_children_in_to_json
+    people = [
+      { :name => 'John', :address => { :city => 'London', :country => 'UK' }},
+      { :name => 'Jean', :address => { :city => 'Paris' , :country => 'France' }}
+    ]
+    json = people.each.to_json :only => [:address, :city]
+
+    assert_equal(%([{"address":{"city":"London"}},{"address":{"city":"Paris"}}]), json)
+  end
+
   def test_struct_encoding
     Struct.new('UserNameAndEmail', :name, :email)
     Struct.new('UserNameAndDate', :name, :date)
@@ -259,12 +283,3 @@ class TestJSONEncoding < Test::Unit::TestCase
       old_tz ? ENV['TZ'] = old_tz : ENV.delete('TZ')
     end
 end
-
-class JsonOptionsTests < Test::Unit::TestCase
-  def test_enumerable_should_passthrough_options_to_elements
-    value, options = Object.new, Object.new
-    def value.as_json(options) options end
-    def options.encode_json(encoder) self end
-    assert_equal options, ActiveSupport::JSON.encode(value, options)
-  end
-end
-- 
cgit v1.2.3