Rename variable to avoid using name "include"

Better syntax highlight :)
This commit is contained in:
Carlos Antonio da Silva 2012-03-09 21:58:56 -03:00
parent 3d04d726fd
commit 3508da50f0

@ -9,7 +9,6 @@ module ActiveModel
# A minimal implementation could be:
#
# class Person
#
# include ActiveModel::Serialization
#
# attr_accessor :name
@ -17,7 +16,6 @@ module ActiveModel
# def attributes
# {'name' => nil}
# end
#
# end
#
# Which would provide you with:
@ -41,7 +39,6 @@ module ActiveModel
# So a minimal implementation including XML and JSON would be:
#
# class Person
#
# include ActiveModel::Serializers::JSON
# include ActiveModel::Serializers::Xml
#
@ -50,7 +47,6 @@ module ActiveModel
# def attributes
# {'name' => nil}
# end
#
# end
#
# Which would provide you with:
@ -124,13 +120,13 @@ def serializable_hash(options = nil)
# +records+ - the association record(s) to be serialized
# +opts+ - options for the association records
def serializable_add_includes(options = {}) #:nodoc:
return unless include = options[:include]
return unless includes = options[:include]
unless include.is_a?(Hash)
include = Hash[Array(include).map { |n| n.is_a?(Hash) ? n.to_a.first : [n, {}] }]
unless includes.is_a?(Hash)
includes = Hash[Array(includes).map { |n| n.is_a?(Hash) ? n.to_a.first : [n, {}] }]
end
include.each do |association, opts|
includes.each do |association, opts|
if records = send(association)
yield association, records, opts
end