kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Added options to control the :only/:except for included associations on Base#to_xml [DHH]

Browse source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3832 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
David Heinemeier Hansson 2006-03-10 03:50:00 +00:00
parent db37c0c95f
commit 3442e0c671
2 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
activerecord/lib/active_record/base.rb
View file

@ -1522,25 +1522,29 @@ module ActiveRecord #:nodoc:
# Turns this record into XML
def to_xml(options = {})
options[:root] ||= self.class.to_s.underscore
options[:except] = Array(options[:except]) << self.class.inheritance_column unless options[:only]
only_or_except = { :only => options[:only], :except => options[:except] }
options[:root] ||= self.class.to_s.underscore
options[:except] = Array(options[:except]) << self.class.inheritance_column unless options[:only]
root_only_or_except = { :only => options[:only], :except => options[:except] }
attributes_for_xml = attributes(only_or_except)
attributes_for_xml = attributes(root_only_or_except)
if include_associations = options.delete(:include)
for association in Array(include_associations)
include_has_options = include_associations.is_a?(Hash)
for association in include_has_options ? include_associations.keys : Array(include_associations)
association_options = include_has_options ? include_associations[association] : root_only_or_except
case self.class.reflect_on_association(association).macro
when :has_many, :has_and_belongs_to_many
records = send(association).to_a
unless records.empty?
attributes_for_xml[association] = records.collect do |record|
record.attributes(only_or_except)
record.attributes(association_options)
end
end
when :has_one, :belongs_to
if record = send(association)
attributes_for_xml[association] = record.attributes(only_or_except)
attributes_for_xml[association] = record.attributes(association_options)
end
end
end

11
activerecord/test/base_test.rb
View file

@ -1203,6 +1203,17 @@ class BasicsTest < Test::Unit::TestCase
assert xml.include?(%(<clients><client>))
end
def test_to_xml_including_multiple_associations_with_options
xml = companies(:first_firm).to_xml(
:indent => 0, :skip_instruct => true,
:include => { :clients => { :only => :name } }
)
assert_equal "<firm>", xml.first(6)
assert xml.include?(%(<client><name>Summit</name></client>))
assert xml.include?(%(<clients><client>))
end
def test_except_attributes
assert_equal(
%w( author_name type id approved replies_count bonus_time written_on content author_email_address parent_id last_read),