From 09dad2d80fafa5fd7e5aea02bc31f26ed11efcfd Mon Sep 17 00:00:00 2001 From: danielvincent Date: Thu, 7 Oct 2010 14:10:14 -0700 Subject: [PATCH] DG MS; exporter includes comments. exporter spec --- lib/diaspora/exporter.rb | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/lib/diaspora/exporter.rb b/lib/diaspora/exporter.rb index 9e2f719a5..106c94bb0 100644 --- a/lib/diaspora/exporter.rb +++ b/lib/diaspora/exporter.rb @@ -4,11 +4,6 @@ module Diaspora - def self.bone(user) - exporter = Diaspora::Exporter.new(Diaspora::Exporters::XML) - exporter.execute(user) - end - class Exporter def initialize(strategy) self.class.send(:include, strategy) @@ -22,7 +17,7 @@ module Diaspora xml.user { xml.username user.username xml.serialized_private_key user.serialized_private_key - xml.person user.person.to_xml + xml.parent << user.person.to_xml xml.aspects { user.aspects.each do |aspect| @@ -36,8 +31,14 @@ module Diaspora end } xml.posts { - aspect.posts.each do |post| - xml.post post.to_xml if post.respond_to? :to_xml + aspect.posts.find_all_by_person_id(user.person.id).each do |post| + post_doc = post.to_xml + + post.comments.each do |comment| + post_doc << comment.to_xml + end + + xml.post post_doc end } }