From a86d965079819e75b39d2a0d5fc415fff1919079 Mon Sep 17 00:00:00 2001
From: maxwell <maxwell@joindiaspora.com>
Date: Wed, 13 Oct 2010 17:07:16 -0700
Subject: [PATCH] DG MS; importer now takes params for username, password, and
 diaspora handle

---
 lib/diaspora/importer.rb  | 16 ++++++++--------
 spec/lib/importer_spec.rb | 12 ++++++++++--
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/lib/diaspora/importer.rb b/lib/diaspora/importer.rb
index c0a7aa255..dbe15825a 100644
--- a/lib/diaspora/importer.rb
+++ b/lib/diaspora/importer.rb
@@ -9,21 +9,21 @@ module Diaspora
       self.class.send(:include, strategy)
     end
     
-    def commit(user, person, aspects, people, posts)
+    def commit(user, person, aspects, people, posts, opts = {})
       filter = verify_and_clean(user, person, people, aspects, posts)
       #assume data is good
       
       # to go 
-      user.email = "tits@tits.tits"
-      user.password= "megatits@tits.tits"
-      user.password_confirmation = "megatits@tits.tits"
+      user.email = opts[:email]
+      user.password= opts[:password]
+      user.password_confirmation = opts[:pasword_confirmation]
 
      
      
       user.person = person
 
 
-      user.person.diaspora_handle = "obby@foo.com"
+      user.person.diaspora_handle = opts[:diaspora_handle] 
       
       user.visible_post_ids = filter[:whitelist].keys
 
@@ -46,7 +46,7 @@ module Diaspora
 
 
       people.each do |p|
-        p.save! #if filter[:people].include? person.id
+        p.save! if filter[:people].include? p.id.to_s
       end
     end
 
@@ -121,7 +121,7 @@ module Diaspora
 
   module Parsers
     module XML
-      def execute(xml)
+      def execute(xml, opts = {})
         doc = Nokogiri::XML.parse(xml)
 
         user, person = parse_user_and_person(doc)
@@ -130,7 +130,7 @@ module Diaspora
         posts = parse_posts(doc)
 
         user
-        commit(user, person, aspects, people, posts)
+        commit(user, person, aspects, people, posts, opts)
       end
 
       def parse_user_and_person(doc)
diff --git a/spec/lib/importer_spec.rb b/spec/lib/importer_spec.rb
index 7385c35b2..d243ae345 100644
--- a/spec/lib/importer_spec.rb
+++ b/spec/lib/importer_spec.rb
@@ -109,7 +109,11 @@ describe Diaspora::Importer do
 
     it 'should import a user' do
       pending
-      user = @importer.execute(@xml)
+      user = @importer.execute(@xml,
+                              :email => "bob@bob.com",
+                              :password => "bobbybob",
+                              :password => "bobbybob",
+                              :diaspora_handle => "bob@diaspora.com")
       user.class.should == User
     end
 
@@ -200,7 +204,11 @@ describe Diaspora::Importer do
         User.count.should == 0
         Person.count.should == 0
         
-        @importer.execute(@xml)
+        @importer.execute(@xml,
+                          :email => "bob@bob.com",
+                          :password => "bobbybob",
+                          :password => "bobbybob",
+                          :diaspora_handle => "bob@diaspora.com")
         
         User.count.should == 1
         n = User.first