From 4a0bd5fc0c8c9b74046533c5b1aa8745bbe423f1 Mon Sep 17 00:00:00 2001
From: ilya <ilya@laptop.(none)>
Date: Tue, 13 Jul 2010 17:36:18 -0700
Subject: [PATCH] RS IZ; removed validations on marshaling and removed key
 deletion on  person destroyw

---
 app/models/person.rb                    | 2 +-
 app/models/post.rb                      | 3 ++-
 app/models/user.rb                      | 3 ++-
 spec/helpers/application_helper_spec.rb | 2 +-
 spec/lib/xml_spec.rb                    | 2 +-
 spec/models/request_spec.rb             | 5 +----
 spec/user_encryption_spec.rb            | 2 ++
 7 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/models/person.rb b/app/models/person.rb
index d9774413f..70e8c7dee 100644
--- a/app/models/person.rb
+++ b/app/models/person.rb
@@ -26,7 +26,7 @@ class Person
   
   validates_true_for :url, :logic => lambda { self.url_unique?}
 
-  after_destroy :remove_all_traces, :remove_key
+  after_destroy :remove_all_traces#, :remove_key
 
   scope :friends,  where(:_type => "Person", :active => true)
 
diff --git a/app/models/post.rb b/app/models/post.rb
index e555ea426..ee004ce45 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -44,8 +44,9 @@ class Post
   end
 
 #ENCRYPTION
+  
   before_validation :sign_if_mine
-  validates_true_for :owner_signature, :logic => lambda {self.verify_signature}
+  #validates_true_for :owner_signature, :logic => lambda {self.verify_signature}
   
   key :owner_signature, String
   
diff --git a/app/models/user.rb b/app/models/user.rb
index b61717adf..a00c5ed16 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -4,7 +4,7 @@ class User < Person
          :recoverable, :rememberable, :trackable, :validatable
          
   
-  before_validation_on_create :assign_key
+  before_create :assign_key
   validates_presence_of :profile
   
   before_validation :do_bad_things
@@ -99,6 +99,7 @@ class User < Person
 
   def generate_key
     puts "Generating key"
+    puts paramstring
     ctx = GPGME::Ctx.new
     ctx.genkey(paramstring, nil, nil)
     
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index 20261308f..f47856265 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -4,7 +4,7 @@ include ApplicationHelper
 
 describe ApplicationHelper do
   before do
-    @user = Factory.create(:user, :email => "robert@grimm.com")
+    @user = Factory.create(:user)
     @person = Factory.create(:person)
   end
 
diff --git a/spec/lib/xml_spec.rb b/spec/lib/xml_spec.rb
index 5c1714d73..42b26d01c 100644
--- a/spec/lib/xml_spec.rb
+++ b/spec/lib/xml_spec.rb
@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/../spec_helper'
 
 describe Diaspora::XML do
   before do
-    @user = Factory.create(:user, :profile => { :first_name => "robert", :last_name => "grimm" } )
+    @user = Factory.create(:user) 
     Diaspora::XML::OWNER = @user
   end
 
diff --git a/spec/models/request_spec.rb b/spec/models/request_spec.rb
index a6289c4be..00fac8580 100644
--- a/spec/models/request_spec.rb
+++ b/spec/models/request_spec.rb
@@ -11,11 +11,8 @@ describe Request do
   end
 
   it 'should generate xml for the User as a Person' do 
-    user = Factory.build(:user, :email => "rob@bob.com")
+    user = Factory.create(:user)
 
-    user.profile = Factory.create(:profile)
-    
-    user.save(:validate => false)
     user.profile.save
     
     request = Request.instantiate(:to => "http://www.google.com/", :from => user)
diff --git a/spec/user_encryption_spec.rb b/spec/user_encryption_spec.rb
index 7c2ca2f34..65d772fff 100644
--- a/spec/user_encryption_spec.rb
+++ b/spec/user_encryption_spec.rb
@@ -30,6 +30,7 @@ describe 'user encryption' do
   #end
   
   it 'should remove the key from the keyring on person destroy' do
+    pending "We can implement deleting from the keyring later, its annoying to test b/c no stub any instance of"
     person = Factory.create :person
     keyid = person.key_fingerprint
     original_key = person.export_key
@@ -125,6 +126,7 @@ describe 'user encryption' do
       xml.include?(message.owner_signature).should be true
     end
     it 'the signature should be verified on marshaling' do
+      pending "We're going to work on embeded profile"
 
       message = Factory.build(:status_message, :person => @person)
       message.owner_signature = GPGME.sign(message.signable_string, nil,