From 72e751453530be04aab0376b1ceffe6fd5c4ff94 Mon Sep 17 00:00:00 2001
From: ilya <ilya@laptop.(none)>
Date: Sat, 10 Jul 2010 23:30:24 -0400
Subject: [PATCH] MS fixed your key fingerprint bug. ROML sux. all things
which are marshalled as a class need to be after the other fields, because
those fields were ignored. also, ids were no long being marshalled
correctlyw
---
app/models/person.rb | 5 +++--
gpg/diaspora-test/random_seed | Bin 600 -> 600 bytes
spec/user_encryption_spec.rb | 11 ++++++++---
3 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/app/models/person.rb b/app/models/person.rb
index 8a06ca688e..7ace2308da 100644
--- a/app/models/person.rb
+++ b/app/models/person.rb
@@ -4,14 +4,15 @@ class Person
xml_accessor :email
xml_accessor :url
- xml_accessor :profile, :as => Profile
xml_accessor :_id
xml_accessor :key_fingerprint
+ xml_accessor :profile, :as => Profile
+
key :email, String
key :url, String
key :active, Boolean, :default => false
- key :key_fingerprint, String, :default => ""
+ key :key_fingerprint, String
one :profile, :class_name => 'Profile', :foreign_key => :person_id
many :posts, :class_name => 'Post', :foreign_key => :person_id
diff --git a/gpg/diaspora-test/random_seed b/gpg/diaspora-test/random_seed
index 3662498f087ad7b8c9e7148f3cbd05527aa1322a..493229c8d4e6a7f7c601cc1effdbcbb6d4de23c1 100644
GIT binary patch
literal 600
zcmV-e0;m0J9H_HDTHkKTQ`0A7BpI(Xdhdasrve>APjT2e<1{JZPUQYgMNBzQa?V%J
z))x)^>9p#FS>RxP9ssz(AXk5H1k><r)%oQ25DPW3Z&4)t=YxLUs>?Sm1B$0+M9HZf
z+$D90tn^wXe*=!Vv;NPOKJ{W^h{6nE4Yk3axk(YZW<ZB@@-riy55iR(Z|eX`no!e*
zJLq(j7XL&H$5ouaVGnARE!hR$SUmyjFc?IA{IkNw7cnW7%hIGkke%Z;OKfki_jE^k
ztnrqP<`TU&A=hPK!y7hWh6JsXj~w$_OT@Ka#j$gLj%;x2v%W>ZMo#z_!>@sn(T+b>
zbvA;_;e{u2-h;b@1qFOpZzygIjC$Lp7$h}9F=3%tv9LZy8S{;9Vug@WyeFQ}%J0G^
z_FJeTlR~wiDc@mtRScCMCk}QLL3qgtquKO%<5M`O=OeWx8UMK`%p7?LLRSanLz54|
zDA!W$NKZu~EWAn?0AZSj-+|Z8+Ey?tuw%IOj4jPqtH2xC!{c?;16al+Ye0?;IbZ9%
z_;=CCyb8~#KZni+qC@J2rRVvzt&7X{VU-UT4w59fLIu4YXZ{QWp+;edNov0DnvJ9|
zrYR;<U#E}P%tlTj*2^UDenf>ALi$$C;Y<k8$W7Y~3R>OQR&y`Y+J-XultQvVA!$1i
z2>{{{)V%54MS;(P7BCA#Pcx6!rVGy{R2r=q)LKD9`ofBEDo36{`JcvvF&gmInT!Db
m#Cqxa9~ivQkZhA>Tt2%^(G9TdR0Bk-?Kk7CI{#JZsca=4bR*&b
literal 600
zcmV-e0;l~)hAhB1g<tgD-lWFR6(nszpm-;96wAJr#d(=H6Mq*sLBhB<0ZWlpKS9sH
zPj=EfE5{!8Ih-Lg#TITKU^aHtj>_<%i~YBl>bey+a6{KbYx*<iOX7^rWrh%zXY=*9
zIqT?}I*G;yS{3wlC9^-ssOx|xB5TvK>!ym0_v-<n=)|lS)}r&FF1IhS(1tF;5@Zp<
z-Aq$cuXdt%Y)lpl(2tW0VSjRSewoZT!*6SYQpa3?8=E%kRB+U+*|-!72y>A0=-__a
zD4VpV9J6DiHr!0hujp#g9cE#R59Do!h+G$&u$_oc4%n9tntZ%#Zv>>WNaf>|9w>Iw
zbovO9nv$p0tB4};pqzC8Kt82~#IHo)$`?s;Z|?j&)RCe_8f_2ApCi!H_D4GVDWb`$
z_}FMt^j>>oU(T6EjMC$GnU-ErWl(s$$RtDA|5tnGowpfu5>%I-kx1DKBM47zE_$0v
zSIR^!ru42gw)X9Z51g;Rrqp68_OJg!orB~rr(QB3BcTPsjOU{+DCoMkd7DaGJVSFB
zfW-XgN-+s303=X#&Yshfp#Xul4FPRe@TRUl@brBa^(jHbb8`ejyGWrdr!u1t=^|1J
za0L>zSZ{b4leLBI`kmSg70l$61_J@kMMcQgh3m_1m2^I#SF^S(HEa%XxWRwE(MB2b
z0tbX2YJ95k+UC~<TG*HzKIqYaf!i%v#t^6=yDM)nYHl36`qjx8qyOl<*Dw;Nv6tGD
m(F!3c0J4431|y~Q|8%F0`^UkKt*Ni}B70Dre<~pHyBHQ_VJ;W|
diff --git a/spec/user_encryption_spec.rb b/spec/user_encryption_spec.rb
index 3d0a266852..574a785925 100644
--- a/spec/user_encryption_spec.rb
+++ b/spec/user_encryption_spec.rb
@@ -37,17 +37,22 @@ describe 'user encryption' do
it 'should receive and marshal a public key from a request' do
person = Factory.build(:person, :url => "http://test.url/" )
+ person.key_fingerprint.nil?.should== false
+ #should move this to friend request, but i found it here
+ f = person.key_fingerprint
+ id = person.id
original_key = person.export_key
request = Request.instantiate(:to =>"http://www.google.com/", :from => person)
xml = Request.build_xml_for [request]
- puts xml
-
person.destroy
store_objects_from_xml(xml)
-
+ Person.all.count.should == 2
new_person = Person.first(:url => "http://test.url/")
+ new_person.key_fingerprint.nil?.should == false
+ new_person.id.should == id
+ new_person.key_fingerprint.should == f
new_person.export_key.should == original_key
end
end
--
GitLab