Ticket #9751: to_json_accepts_options.2.diff

activesupport/test/json/encoding_test.rb

@@ -69 +69 @@
-    assert_equal %w( "$" "A" "A0" "A0B" "_" "a" 0 1 ), object_keys(values.to_json)
-  end
-
+  def test_hash_should_allow_key_filtering_with_only
+    assert_equal %({"a": 1}), { 'a' => 1, :b => 2, :c => 3 }.to_json(:only => 'a')
+  end
+
+  def test_hash_should_allow_key_filtering_with_except
+    assert_equal %({"b": 2}), { 'foo' => 'bar', :b => 2, :c => 3 }.to_json(:except => ['foo', :c])
+  end
+
-  protected
-    def object_keys(json_object)
-      json_object[1..-2].scan(/([^{}:,\s]+):/).flatten.sort
-    end
-end
+
+uses_mocha 'JsonOptionsTests' do
+  
+  class JsonOptionsTests < Test::Unit::TestCase
+    def test_enumerable_should_passthrough_options_to_elements
+      json_options = { :include => :posts }
+      ActiveSupport::JSON.expects(:encode).with(1, json_options)
+      ActiveSupport::JSON.expects(:encode).with(2, json_options)
+      ActiveSupport::JSON.expects(:encode).with('foo', json_options)
+
+      [1, 2, 'foo'].to_json(json_options)
+    end
+  end
+end

activesupport/lib/active_support/json/encoders/date.rb

@@ -1 +1 @@
-class Date
-
+(options = {})
-    %("#{strftime("%m/%d/%Y")}")
-  end
-end

activesupport/lib/active_support/json/encoders/time.rb

@@ -1 +1 @@
-class Time
-
+(options = {})
-    %("#{strftime("%m/%d/%Y %H:%M:%S %Z")}")
-  end
-end

activesupport/lib/active_support/json/encoders/enumerable.rb

@@ -1 +1 @@
-module Enumerable
-
-
+(options = {})
+, options
-  end
-end

activesupport/lib/active_support/json/encoders/false_class.rb

@@ -1 +1 @@
-class FalseClass
-
+(options = {})
-    'false'
-  end
-end

activesupport/lib/active_support/json/encoders/numeric.rb

@@ -1 +1 @@
-class Numeric
-
+(options = {})
-    to_s
-  end
-end

activesupport/lib/active_support/json/encoders/hash.rb

@@ -1 +1 @@
-class Hash
-
+
+
+
+
+
+
+
+
+
-    returning result = '{' do
-map do |key, value
-value
+hash_keys.map do |key
+self[key], options
-      end * ', '
-      result << '}'
-    end

activesupport/lib/active_support/json/encoders/true_class.rb

@@ -1 +1 @@
-class TrueClass
-
+(options = {})
-    'true'
-  end
-end

activesupport/lib/active_support/json/encoders/symbol.rb

@@ -1 +1 @@
-class Symbol
-
+(options = {})
-    ActiveSupport::JSON.encode(to_s)
-  end
-end

activesupport/lib/active_support/json/encoders/object.rb

@@ -1 +1 @@
-class Object
-  # Dumps object in JSON (JavaScript Object Notation).  See www.json.org for more info.
-
-
-
-
-
-
+
+
-  end
-end

activesupport/lib/active_support/json/encoders/string.rb

@@ -17 +17 @@
-end
-
-class String
-
+(options = {})
-    '"' + gsub(/[\010\f\n\r\t"\\><]/) { |s|
-      ActiveSupport::JSON::Encoding::ESCAPED_CHARS[s]
-    }.gsub(/([\xC0-\xDF][\x80-\xBF]|

activesupport/lib/active_support/json/encoders/nil_class.rb

@@ -1 +1 @@
-class NilClass
-
+(options = {})
-    'null'
-  end
-end

activesupport/lib/active_support/json/encoders/regexp.rb

@@ -1 +1 @@
-class Regexp
-
+(options = {})
-    inspect
-  end
-end

activesupport/lib/active_support/json/encoders/date_time.rb

@@ -1 +1 @@
-class DateTime
-
+(options = {})
-    %("#{strftime("%m/%d/%Y %H:%M:%S %Z")}")
-  end
-end

activesupport/lib/active_support/json/encoding.rb

@@ -17 +17 @@
-      REFERENCE_STACK_VARIABLE = :json_reference_stack #:nodoc:
-
-      # Converts a Ruby object into a JSON string.
-
+, options = {}
-        raise_on_circular_reference(value) do
-
+, options
-        end
-      end
-

activerecord/test/json_serialization_test.rb

@@ -68 +68 @@
-
-  def setup
-    @david = authors(:david)
+    @mary = authors(:mary)
-  end
-
-  def test_includes_uses_association_name
-    json = @david.to_json(:include => :posts)
-
+
-    assert_match %r{"posts": \[}, json
-
-    assert_match %r{"id": 1}, json
@@ -140 +141 @@
-    assert_match %r{"favorite_quote": "Constraints are liberating"}, json
-    assert_equal %r{"favorite_quote": }.match(json).size, 1
-  end
+
+  def test_should_allow_only_option_for_list_of_authors
+    authors = [@david, @mary]
+
+    assert_equal %([{"name": "David"}, {"name": "Mary"}]), authors.to_json(:only => :name)
+  end
+
+  def test_should_allow_except_option_for_list_of_authors
+    authors = [@david, @mary]
+
+    assert_equal %([{"id": 1}, {"id": 2}]), authors.to_json(:except => [:name, :author_address_id])
+  end
+
+  def test_should_allow_includes_for_list_of_authors
+    authors = [@david, @mary]
+    json = authors.to_json(
+      :only => :name,
+      :include => {
+        :posts => { :only => :id }
+      }
+    )
+
+    assert_equal %([{"name": "David", "posts": [{"id": 1}, {"id": 2}, {"id": 4}, {"id": 5}, {"id": 6}]}, {"name": "Mary", "posts": [{"id": 7}]}]), json
+  end
+
+  def test_should_allow_options_for_hash_of_authors
+    authors_hash = {
+      1 => @david,
+      2 => @mary
+    }
+
+    assert_equal %({1: {"name": "David"}}), authors_hash.to_json(:only => [1, :name])
+  end
-end

activerecord/lib/active_record/serializers/json_serializer.rb

@@ -1 +1 @@
-module ActiveRecord #:nodoc:
-  module Serialization
-, &block
+
-      JsonSerializer.new(self, options).to_s
-    end
-