Merge branch 'create-default-serializer' into HEAD

Conflicts:
	lib/active_model/array_serializer.rb
This commit is contained in:
Adam Stanton
2013-03-05 21:48:58 -08:00
3 changed files with 18 additions and 2 deletions

View File

@@ -395,4 +395,20 @@ module ActiveModel
ActiveSupport::Notifications.instrument(event_name, payload, &block)
end
end
# DefaultSerializer
#
# Provides a constant interface for all items, particularly
# for ArraySerializer.
class DefaultSerializer
attr_reader :object, :options
def initialize(object, options={})
@object, @options = object, options
end
def serializable_hash
@object.as_json
end
end
end