From c3832cd2a77840d6488634fd1d468c2f60a17907 Mon Sep 17 00:00:00 2001 From: Raphael Date: Sun, 11 Jul 2010 13:03:39 -0700 Subject: [PATCH 1/5] Reverting gemfile change --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 7be06ae84..4f2c736a1 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'http://rubygems.org' source 'http://gemcutter.org' -gem 'rails', :git =>'http://github.com/rails/rails.git' +gem 'rails', '3.0.0.beta4' gem 'bundler' gem 'mongo_mapper', :git => "http://github.com/BadMinus/mongomapper.git" gem 'devise', :git => "http://github.com/BadMinus/devise.git" From 49c30425c145adb5a115e65033a098992e6c78a7 Mon Sep 17 00:00:00 2001 From: Raphael Date: Mon, 12 Jul 2010 10:25:56 -0700 Subject: [PATCH 2/5] Added user url to db seed --- db/seeds/backer.rb | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/db/seeds/backer.rb b/db/seeds/backer.rb index a4d5c48d4..3497a7f5b 100644 --- a/db/seeds/backer.rb +++ b/db/seeds/backer.rb @@ -52,7 +52,10 @@ def create(backer_number, password) # Create seed user email = backer_info[backer_number][2].gsub(/ /,'').downcase - user = User.create( :email => "#{email}@joindiaspora.com", :password => "#{email+backer_info[backer_number][0].to_s}", :profile => Profile.create( :first_name => backer_info[backer_number][1], :last_name => backer_info[backer_number][2] )) + user = User.create( :email => "#{email}@joindiaspora.com", + :password => "#{email+backer_info[backer_number][0].to_s}", + :profile => Profile.create( :first_name => backer_info[backer_number][1], :last_name => backer_info[backer_number][2] ) + :url=> "#{email}.joindiaspora.com") # Make connection with Diaspora Tom Person.create( :email => "tom@joindiaspora.com", :url => "http://tom.joindiaspora.com/", :active => true, :profile => Profile.create(:first_name => "Alexander", :last_name => "Hamiltom")) @@ -60,7 +63,11 @@ def create(backer_number, password) (0..10).each { |n| email = backer_info[n][2].gsub(/ /,'').downcase - Person.create( :email => "#{email}@joindiaspora.com", :url => "http://#{email}.joindiaspora.com/", :active => true, :profile => Profile.create(:first_name => backer_info[n][1], :last_name => backer_info[n][2])) unless n == backer_number + Person.create( :email => "#{email}@joindiaspora.com", + :url => "http://#{email}.joindiaspora.com/", + :active => true, + :profile => Profile.create(:first_name => backer_info[n][1], :last_name => backer_info[n][2])) + unless n == backer_number } end From 2c4cad2b4ca7138f080b151df1f0a0ddf833f5ca Mon Sep 17 00:00:00 2001 From: Raphael Date: Mon, 12 Jul 2010 10:37:41 -0700 Subject: [PATCH 3/5] Forgot a comma --- db/seeds/backer.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/seeds/backer.rb b/db/seeds/backer.rb index 3497a7f5b..ae0f314ac 100644 --- a/db/seeds/backer.rb +++ b/db/seeds/backer.rb @@ -54,7 +54,7 @@ def create(backer_number, password) email = backer_info[backer_number][2].gsub(/ /,'').downcase user = User.create( :email => "#{email}@joindiaspora.com", :password => "#{email+backer_info[backer_number][0].to_s}", - :profile => Profile.create( :first_name => backer_info[backer_number][1], :last_name => backer_info[backer_number][2] ) + :profile => Profile.create( :first_name => backer_info[backer_number][1], :last_name => backer_info[backer_number][2] ), :url=> "#{email}.joindiaspora.com") # Make connection with Diaspora Tom From e420b65591524acc208274a3207d46bb1b54f3f8 Mon Sep 17 00:00:00 2001 From: Raphael Date: Mon, 12 Jul 2010 10:42:27 -0700 Subject: [PATCH 4/5] I am bad at syntax --- db/seeds/backer.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/db/seeds/backer.rb b/db/seeds/backer.rb index ae0f314ac..13be3e6be 100644 --- a/db/seeds/backer.rb +++ b/db/seeds/backer.rb @@ -66,8 +66,7 @@ def create(backer_number, password) Person.create( :email => "#{email}@joindiaspora.com", :url => "http://#{email}.joindiaspora.com/", :active => true, - :profile => Profile.create(:first_name => backer_info[n][1], :last_name => backer_info[n][2])) - unless n == backer_number + :profile => Profile.create(:first_name => backer_info[n][1], :last_name => backer_info[n][2])) unless n == backer_number } end From 18760f13f827eed8a523224253de3c670141e6df Mon Sep 17 00:00:00 2001 From: maxwell Date: Mon, 12 Jul 2010 11:25:53 -0700 Subject: [PATCH 5/5] push changes --- app/models/retraction.rb | 4 ++-- spec/lib/parser_spec.rb | 15 +++++++++++++++ spec/models/person_spec.rb | 2 -- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/app/models/retraction.rb b/app/models/retraction.rb index c799df5fd..538f89513 100644 --- a/app/models/retraction.rb +++ b/app/models/retraction.rb @@ -19,7 +19,7 @@ class Retraction attr_accessor :type def perform - puts('GO GO GO') + puts self.inspect self.type.constantize.destroy(self.post_id) end @@ -35,7 +35,7 @@ class Retraction def self.type_name(object) if object.is_a? Post object.class - elsif object.is_a? User + elsif object.is_a? Person 'Person' else 'Clowntown' diff --git a/spec/lib/parser_spec.rb b/spec/lib/parser_spec.rb index 36150b3ea..92673e06c 100644 --- a/spec/lib/parser_spec.rb +++ b/spec/lib/parser_spec.rb @@ -141,6 +141,21 @@ describe "parser in application helper" do Person.where(:url => @person.url).first.active.should be true end + + it 'should marshal a retraction for a person' do + retraction = Retraction.for(@user) + + request = Retraction.build_xml_for( [retraction] ) + + + puts request.inspect + + Person.count.should == 2 + store_objects_from_xml( request ) + Person.count.should == 1 + + end + end end diff --git a/spec/models/person_spec.rb b/spec/models/person_spec.rb index 8c6dd30bf..a882b9849 100644 --- a/spec/models/person_spec.rb +++ b/spec/models/person_spec.rb @@ -62,11 +62,9 @@ describe Person do f = Factory.create(:person, :active => true) - Person.friends.all.count.should == 1 u.unfriend(f.id) Person.friends.all.count.should == 0 - end end