Hash#to_json takes :only or :except options to specific or omit certain hash keys. Enumerable#to_json passes through its options to each element. Closes #9751.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7736 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

14 files changed, 28 insertions, 24 deletions

diff --git a/activesupport/lib/active_support/json/encoders/date.rb b/activesupport/lib/active_support/json/encoders/date.rb
index ee1a472f3f..de59e1b338 100644
--- a/activesupport/lib/active_support/json/encoders/date.rb
+++ b/activesupport/lib/active_support/json/encoders/date.rb
@@ -1,5 +1,5 @@
 class Date
-  def to_json #:nodoc:
+  def to_json(options = nil) #:nodoc:
     %("#{strftime("%m/%d/%Y")}")
   end
 end
diff --git a/activesupport/lib/active_support/json/encoders/date_time.rb b/activesupport/lib/active_support/json/encoders/date_time.rb
index 28cb18977d..229cefc007 100644
--- a/activesupport/lib/active_support/json/encoders/date_time.rb
+++ b/activesupport/lib/active_support/json/encoders/date_time.rb
@@ -1,5 +1,5 @@
 class DateTime
-  def to_json #:nodoc:
+  def to_json(options = nil) #:nodoc:
     %("#{strftime("%m/%d/%Y %H:%M:%S %Z")}")
   end
 end
diff --git a/activesupport/lib/active_support/json/encoders/enumerable.rb b/activesupport/lib/active_support/json/encoders/enumerable.rb
index 150d233939..d180049663 100644
--- a/activesupport/lib/active_support/json/encoders/enumerable.rb
+++ b/activesupport/lib/active_support/json/encoders/enumerable.rb
@@ -1,5 +1,5 @@
 module Enumerable
-  def to_json #:nodoc:
-    "[#{map { |value| ActiveSupport::JSON.encode(value) } * ', '}]"
+  def to_json(options = {}) #:nodoc:
+    "[#{map { |value| ActiveSupport::JSON.encode(value, options) } * ', '}]"
   end
 end
diff --git a/activesupport/lib/active_support/json/encoders/false_class.rb b/activesupport/lib/active_support/json/encoders/false_class.rb
index 78524e2a03..bf0844334b 100644
--- a/activesupport/lib/active_support/json/encoders/false_class.rb
+++ b/activesupport/lib/active_support/json/encoders/false_class.rb
@@ -1,5 +1,5 @@
 class FalseClass
-  def to_json #:nodoc:
+  def to_json(options = nil) #:nodoc:
     'false'
   end
 end
diff --git a/activesupport/lib/active_support/json/encoders/hash.rb b/activesupport/lib/active_support/json/encoders/hash.rb
index 9a9f074847..14b91a76a1 100644
--- a/activesupport/lib/active_support/json/encoders/hash.rb
+++ b/activesupport/lib/active_support/json/encoders/hash.rb
@@ -1,8 +1,16 @@
 class Hash
-  def to_json #:nodoc:
+  def to_json(options = {}) #:nodoc:
+    hash_keys = self.keys
+
+    if options[:except]
+      hash_keys = hash_keys - Array(options[:except])
+    elsif options[:only]
+      hash_keys = hash_keys & Array(options[:only])
+    end
+
     returning result = '{' do
-      result << map do |key, value|
-        "#{ActiveSupport::JSON.encode(key)}: #{ActiveSupport::JSON.encode(value)}"
+      result << hash_keys.map do |key|
+        "#{ActiveSupport::JSON.encode(key)}: #{ActiveSupport::JSON.encode(self[key], options)}"
       end * ', '
       result << '}'
     end
diff --git a/activesupport/lib/active_support/json/encoders/nil_class.rb b/activesupport/lib/active_support/json/encoders/nil_class.rb
index 98bb6fb677..4763471ac4 100644
--- a/activesupport/lib/active_support/json/encoders/nil_class.rb
+++ b/activesupport/lib/active_support/json/encoders/nil_class.rb
@@ -1,5 +1,5 @@
 class NilClass
-  def to_json #:nodoc:
+  def to_json(options = nil) #:nodoc:
     'null'
   end
 end
diff --git a/activesupport/lib/active_support/json/encoders/numeric.rb b/activesupport/lib/active_support/json/encoders/numeric.rb
index 5d9b2eea9e..38713fb369 100644
--- a/activesupport/lib/active_support/json/encoders/numeric.rb
+++ b/activesupport/lib/active_support/json/encoders/numeric.rb
@@ -1,5 +1,5 @@
 class Numeric
-  def to_json #:nodoc:
+  def to_json(options = nil) #:nodoc:
     to_s
   end
 end
diff --git a/activesupport/lib/active_support/json/encoders/object.rb b/activesupport/lib/active_support/json/encoders/object.rb
index 51852e17cb..6da0d1d1c1 100644
--- a/activesupport/lib/active_support/json/encoders/object.rb
+++ b/activesupport/lib/active_support/json/encoders/object.rb
@@ -1,10 +1,6 @@
 class Object
   # Dumps object in JSON (JavaScript Object Notation).  See www.json.org for more info.
-  #
-  #   Account.find(1).to_json
-  #   => "{attributes: {username: \"foo\", id: \"1\", password: \"bar\"}}"
-  #
-  def to_json
-    ActiveSupport::JSON.encode(instance_values)
+  def to_json(options = {})
+    ActiveSupport::JSON.encode(instance_values, options)
   end
 end
diff --git a/activesupport/lib/active_support/json/encoders/regexp.rb b/activesupport/lib/active_support/json/encoders/regexp.rb
index a3f32eafa2..b6116b70b5 100644
--- a/activesupport/lib/active_support/json/encoders/regexp.rb
+++ b/activesupport/lib/active_support/json/encoders/regexp.rb
@@ -1,5 +1,5 @@
 class Regexp
-  def to_json #:nodoc:
+  def to_json(options = nil) #:nodoc:
     inspect
   end
 end
diff --git a/activesupport/lib/active_support/json/encoders/string.rb b/activesupport/lib/active_support/json/encoders/string.rb
index f357262fc6..963cd10969 100644
--- a/activesupport/lib/active_support/json/encoders/string.rb
+++ b/activesupport/lib/active_support/json/encoders/string.rb
@@ -17,7 +17,7 @@ module ActiveSupport
 end
 
 class String
-  def to_json #:nodoc:
+  def to_json(options = nil) #:nodoc:
     '"' + gsub(/[\010\f\n\r\t"\\><]/) { |s|
       ActiveSupport::JSON::Encoding::ESCAPED_CHARS[s]
     }.gsub(/([\xC0-\xDF][\x80-\xBF]|
diff --git a/activesupport/lib/active_support/json/encoders/symbol.rb b/activesupport/lib/active_support/json/encoders/symbol.rb
index 57291e5448..485112f97c 100644
--- a/activesupport/lib/active_support/json/encoders/symbol.rb
+++ b/activesupport/lib/active_support/json/encoders/symbol.rb
@@ -1,5 +1,5 @@
 class Symbol
-  def to_json #:nodoc:
-    ActiveSupport::JSON.encode(to_s)
+  def to_json(options = {}) #:nodoc:
+    ActiveSupport::JSON.encode(to_s, options)
   end
 end
diff --git a/activesupport/lib/active_support/json/encoders/time.rb b/activesupport/lib/active_support/json/encoders/time.rb
index 080e9392f1..b9b52be9ed 100644
--- a/activesupport/lib/active_support/json/encoders/time.rb
+++ b/activesupport/lib/active_support/json/encoders/time.rb
@@ -1,5 +1,5 @@
 class Time
-  def to_json #:nodoc:
+  def to_json(options = nil) #:nodoc:
     %("#{strftime("%m/%d/%Y %H:%M:%S %Z")}")
   end
 end
diff --git a/activesupport/lib/active_support/json/encoders/true_class.rb b/activesupport/lib/active_support/json/encoders/true_class.rb
index f652f8bb54..037d812b3f 100644
--- a/activesupport/lib/active_support/json/encoders/true_class.rb
+++ b/activesupport/lib/active_support/json/encoders/true_class.rb
@@ -1,5 +1,5 @@
 class TrueClass
-  def to_json #:nodoc:
+  def to_json(options = nil) #:nodoc:
     'true'
   end
 end
diff --git a/activesupport/lib/active_support/json/encoding.rb b/activesupport/lib/active_support/json/encoding.rb
index 67656109c0..adfbfd5f72 100644
--- a/activesupport/lib/active_support/json/encoding.rb
+++ b/activesupport/lib/active_support/json/encoding.rb
@@ -17,9 +17,9 @@ module ActiveSupport
       REFERENCE_STACK_VARIABLE = :json_reference_stack #:nodoc:
 
       # Converts a Ruby object into a JSON string.
-      def encode(value)
+      def encode(value, options = {})
         raise_on_circular_reference(value) do
-          value.send(:to_json)
+          value.send(:to_json, options)
         end
       end