github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-01-09 14:48:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

Don't require serializable_hash to take options.

Browse Source
This commit is contained in:
Jose and Yehuda
2011-09-27 17:34:47 -04:00
parent f5836543c3
commit e407dfb9bf
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
activemodel/lib/active_model/serializer.rb
View File

@@ -29,7 +29,7 @@ module ActiveModel
serializable_hash
end
def serializable_hash(*)
def serializable_hash
attributes
end

4
activemodel/test/cases/serializer_test.rb
View File

@@ -21,7 +21,7 @@ class SerializerTest < ActiveModel::TestCase
class User2Serializer < ActiveModel::Serializer
attributes :first_name, :last_name
def serializable_hash(*)
def serializable_hash
attributes.merge(:ok => true).merge(scope)
end
end
@@ -29,7 +29,7 @@ class SerializerTest < ActiveModel::TestCase
class MyUserSerializer < ActiveModel::Serializer
attributes :first_name, :last_name
def serializable_hash(*)
def serializable_hash
hash = attributes
hash = hash.merge(:super_user => true) if my_user.super_user?
hash