Add some coverage for AR serialization with serializable_hash

ActiveRecord json/xml serialization should use as base
serializable_hash, provided by ActiveModel. Add some more coverage
around options :only and :except for both json and xml serialization.

3 files changed, 113 insertions, 26 deletions

diff --git a/activerecord/test/cases/json_serialization_test.rb b/activerecord/test/cases/json_serialization_test.rb
index d9e350abc0..7a66fe416c 100644
--- a/activerecord/test/cases/json_serialization_test.rb
+++ b/activerecord/test/cases/json_serialization_test.rb
@@ -83,6 +83,38 @@ class JsonSerializationTest < ActiveRecord::TestCase
     assert_match %r{"favorite_quote":"Constraints are liberating"}, methods_json
   end
 
+  def test_uses_serializable_hash_with_only_option
+    def @contact.serializable_hash(options=nil)
+      super(only: %w(name))
+    end
+
+    json = @contact.to_json
+    assert_match %r{"name":"Konata Izumi"}, json
+    assert_no_match %r{awesome}, json
+    assert_no_match %r{age}, json
+  end
+
+  def test_uses_serializable_hash_with_except_option
+    def @contact.serializable_hash(options=nil)
+      super(except: %w(age))
+    end
+
+    json = @contact.to_json
+    assert_match %r{"name":"Konata Izumi"}, json
+    assert_match %r{"awesome":true}, json
+    assert_no_match %r{age}, json
+  end
+
+  def test_does_not_include_inheritance_column_from_sti
+    @contact = ContactSti.new(@contact.attributes)
+    assert_equal 'ContactSti', @contact.type
+
+    json = @contact.to_json
+    assert_match %r{"name":"Konata Izumi"}, json
+    assert_no_match %r{type}, json
+    assert_no_match %r{ContactSti}, json
+  end
+
   def test_serializable_hash_should_not_modify_options_in_argument
     options = { :only => :name }
     @contact.serializable_hash(options)
diff --git a/activerecord/test/cases/xml_serialization_test.rb b/activerecord/test/cases/xml_serialization_test.rb
index 12373333b0..f8c784ef05 100644
--- a/activerecord/test/cases/xml_serialization_test.rb
+++ b/activerecord/test/cases/xml_serialization_test.rb
@@ -74,33 +74,73 @@ end
 
 class DefaultXmlSerializationTest < ActiveRecord::TestCase
   def setup
-    @xml = Contact.new(:name => 'aaron stack', :age => 25, :avatar => 'binarydata', :created_at => Time.utc(2006, 8, 1), :awesome => false, :preferences => { :gem => 'ruby' }).to_xml
+    @contact = Contact.new(
+      :name        => 'aaron stack',
+      :age         => 25,
+      :avatar      => 'binarydata',
+      :created_at  => Time.utc(2006, 8, 1),
+      :awesome     => false,
+      :preferences => { :gem => 'ruby' }
+    )
   end
 
   def test_should_serialize_string
-    assert_match %r{<name>aaron stack</name>},     @xml
+    assert_match %r{<name>aaron stack</name>}, @contact.to_xml
   end
 
   def test_should_serialize_integer
-    assert_match %r{<age type="integer">25</age>}, @xml
+    assert_match %r{<age type="integer">25</age>}, @contact.to_xml
   end
 
   def test_should_serialize_binary
-    assert_match %r{YmluYXJ5ZGF0YQ==\n</avatar>},    @xml
-    assert_match %r{<avatar(.*)(type="binary")},     @xml
-    assert_match %r{<avatar(.*)(encoding="base64")}, @xml
+    xml = @contact.to_xml
+    assert_match %r{YmluYXJ5ZGF0YQ==\n</avatar>},    xml
+    assert_match %r{<avatar(.*)(type="binary")},     xml
+    assert_match %r{<avatar(.*)(encoding="base64")}, xml
   end
 
   def test_should_serialize_datetime
-    assert_match %r{<created-at type=\"dateTime\">2006-08-01T00:00:00Z</created-at>}, @xml
+    assert_match %r{<created-at type=\"dateTime\">2006-08-01T00:00:00Z</created-at>}, @contact.to_xml
   end
 
   def test_should_serialize_boolean
-    assert_match %r{<awesome type=\"boolean\">false</awesome>}, @xml
+    assert_match %r{<awesome type=\"boolean\">false</awesome>}, @contact.to_xml
   end
 
   def test_should_serialize_hash
-    assert_match %r{<preferences>\s*<gem>ruby</gem>\s*</preferences>}m, @xml
+    assert_match %r{<preferences>\s*<gem>ruby</gem>\s*</preferences>}m, @contact.to_xml
+  end
+
+  def test_uses_serializable_hash_with_only_option
+    def @contact.serializable_hash(options=nil)
+      super(only: %w(name))
+    end
+
+    xml = @contact.to_xml
+    assert_match %r{<name>aaron stack</name>}, xml
+    assert_no_match %r{age}, xml
+    assert_no_match %r{awesome}, xml
+  end
+
+  def test_uses_serializable_hash_with_except_option
+    def @contact.serializable_hash(options=nil)
+      super(except: %w(age))
+    end
+
+    xml = @contact.to_xml
+    assert_match %r{<name>aaron stack</name>}, xml
+    assert_match %r{<awesome type=\"boolean\">false</awesome>}, xml
+    assert_no_match %r{age}, xml
+  end
+
+  def test_does_not_include_inheritance_column_from_sti
+    @contact = ContactSti.new(@contact.attributes)
+    assert_equal 'ContactSti', @contact.type
+
+    xml = @contact.to_xml
+    assert_match %r{<name>aaron stack</name>}, xml
+    assert_no_match %r{<type}, xml
+    assert_no_match %r{ContactSti}, xml
   end
 end
 
diff --git a/activerecord/test/models/contact.rb b/activerecord/test/models/contact.rb
index 3d15c7fbed..a1cb8d62b6 100644
--- a/activerecord/test/models/contact.rb
+++ b/activerecord/test/models/contact.rb
@@ -1,25 +1,40 @@
-class Contact < ActiveRecord::Base
-  establish_connection(:adapter => 'fake')
+module ContactFakeColumns
+  def self.extended(base)
+    base.class_eval do
+      establish_connection(:adapter => 'fake')
+
+      connection.tables = [table_name]
+      connection.primary_keys = {
+        table_name => 'id'
+      }
+
+      column :name,           :string
+      column :age,            :integer
+      column :avatar,         :binary
+      column :created_at,     :datetime
+      column :awesome,        :boolean
+      column :preferences,    :string
+      column :alternative_id, :integer
+
+      serialize :preferences
 
-  connection.tables = ['contacts']
-  connection.primary_keys = {
-    'contacts' => 'id'
-  }
+      belongs_to :alternative, :class_name => 'Contact'
+    end
+  end
 
   # mock out self.columns so no pesky db is needed for these tests
-  def self.column(name, sql_type = nil, options = {})
-    connection.merge_column('contacts', name, sql_type, options)
+  def column(name, sql_type = nil, options = {})
+    connection.merge_column(table_name, name, sql_type, options)
   end
+end
 
-  column :name,           :string
-  column :age,            :integer
-  column :avatar,         :binary
-  column :created_at,     :datetime
-  column :awesome,        :boolean
-  column :preferences,    :string
-  column :alternative_id, :integer
+class Contact < ActiveRecord::Base
+  extend ContactFakeColumns
+end
 
-  serialize :preferences
+class ContactSti < ActiveRecord::Base
+  extend ContactFakeColumns
+  column :type, :string
 
-  belongs_to :alternative, :class_name => 'Contact'
+  def type; 'ContactSti' end
 end