From 9f8ef8ae3b5dd41859c0ddfe9c6e5eacfff63f03 Mon Sep 17 00:00:00 2001 From: Hexagon Date: Sat, 13 Nov 2010 10:33:00 +0100 Subject: [PATCH 01/13] Translation fix "Invite someone" --- app/views/shared/_invitations.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/shared/_invitations.haml b/app/views/shared/_invitations.haml index adf0396fe..2ef7683f8 100644 --- a/app/views/shared/_invitations.haml +++ b/app/views/shared/_invitations.haml @@ -1,6 +1,6 @@ %h4 = t('.invites') -= link_to t('.invite_someone'), "#invite_user_pane", :class => "invite_user_button", :title => "Invite someone" += link_to t('.invite_someone'), "#invite_user_pane", :class => "invite_user_button", :title => t('.invite_someone') = t('.invitations_left', :count => invites) %br .yo{ :style => "display:none;"} From 35095f8859e81ffa74804e5f116e2c7df8688b80 Mon Sep 17 00:00:00 2001 From: Hexagon Date: Sat, 13 Nov 2010 11:09:08 +0100 Subject: [PATCH 02/13] Update of sv.yml to reflect latest changes + small fix to en.yml --- app/views/registrations/edit.html.haml | 2 +- config/locales/devise/devise.sv.yml | 34 +++++++++--- config/locales/diaspora/sv.yml | 72 ++++++++++++++------------ 3 files changed, 68 insertions(+), 40 deletions(-) diff --git a/app/views/registrations/edit.html.haml b/app/views/registrations/edit.html.haml index 80da58fe5..a71cd97c7 100644 --- a/app/views/registrations/edit.html.haml +++ b/app/views/registrations/edit.html.haml @@ -25,4 +25,4 @@ %h3 t('.cancel_my_account') %p = t('.unhappy') #{link_to t('.cancel_my_account'), registration_path(resource_name), :confirm => t('are_you_sure'), :method => :delete}. -= link_to t('.back'), :back += link_to t('back'), :back diff --git a/config/locales/devise/devise.sv.yml b/config/locales/devise/devise.sv.yml index 419d90deb..aa9172c13 100644 --- a/config/locales/devise/devise.sv.yml +++ b/config/locales/devise/devise.sv.yml @@ -26,11 +26,16 @@ sv: username: 'Användarnamn' password: 'Lösenord' sign_in: 'Logga in' + have_a_problem: "Har du problem att komma in? Klicka här" + remember_me: "Kom ihåg mig" signed_in: 'Inloggning ok.' signed_out: 'Utloggning ok.' passwords: send_instructions: 'Du kommer att få ett ebrev med instruktioner för att återställa lösenordet inom några minuter.' updated: 'Ditt lösenord har ändrats och du är inloggad.' + new: + forgot_password: "Glömt ditt lösenord?" + send_password_instructions: "Skicka mig information om hur jag återställer lösenordet" confirmations: send_instructions: 'Du kommer att få ett ebrev med instruktioner för att verifiera ditt konto inom några minuter.' confirmed: 'Ditt konto har verifierats och du är inloggad.' @@ -46,14 +51,31 @@ sv: invitation_token_invalid: 'Denna inbjudan är ej giltig!' updated: 'Ditt lösenord är nu inställt och du är inloggad.' mailer: - confirmation_instructions: - subject: 'Instruktioner för att verifiera ditt konto.' - reset_password_instructions: - subject: 'Instruktioner för att återställa ditt lösenord.' - unlock_instructions: - subject: 'Instruktioner för att låsa upp ditt konto.' + welcome: "Välkommen %{email}!" + hello: "Hej %{email}!" + confirmation_instructions: + subject: 'Instruktioner för att aktivera ditt konto' + you_can_confirm: "Klicka på länken nedan för att aktivera ditt konto:" + confirm: "Aktivera mitt konto" + reset_password_instructions: + subject: 'Instruktioner för att återställa lösenordet' + someone_requested: "Du har efterfrågat en länk för att återställa ditt lösenord. För att fullfölja det, klicka på länken neda." + change: "Återställ mitt lösenord" + wont_change: "Dit lösenord kommer inte ändras förrän du klickat på länken och ändrat det." + ignore: "Om det inte är du som vill byta lösenord så kan du ignorera det här mailet." + unlock_instructions: + subject: 'Instruktioner för upplåsning' + account_locked: "Ditt konto har låsts eftersom du eller någon annan har angett fel lösenord för många gånger." + click_to_unlock: "Klicka på länken nedan för att låsa upp ditt konto:" + unlock: "Lås upp mitt konto" invitation: subject: 'En vän vill att du ska gå med i Diaspora!' + has_invited_you: "%{name} har bjudit in dig till Diaspora" + have_invited_you: "%{names} har bjudit in dig till Diaspora" + accept_at: ", gå till %{url} för att acceptera din inbjudan." + accept: "Acceptera inbjudan" + ignore: "Om du inte vill gå med i Diaspora kan du ignorera detta mail." + no_account_till: "Ditt konto kommer inte skapas förrän du klickat på knappen ovan och skapat ett nytt konto." shared: links: sign_in: 'Logga in' diff --git a/config/locales/diaspora/sv.yml b/config/locales/diaspora/sv.yml index 55a3114c1..180f486da 100644 --- a/config/locales/diaspora/sv.yml +++ b/config/locales/diaspora/sv.yml @@ -20,7 +20,8 @@ # request: (vän-) förfrågan # profile: profil # seed: frö -# +# contact: kontakt + sv: settings: "Inställningar" @@ -88,13 +89,13 @@ sv: share_with_all: "Dela på alla sidor" share_with: "Dela med %{aspect}" all: "alla" - aspect_friends: - add_friends: "lägg till vänner" + aspect_contacts: + add_contacts: "lägg till kontakter" everyone: "Alla" add_to: "lägg till i %{aspect}" invitations: invites: "Inbjudningar" - invite_a_friend: "Bjud in en vän" + invite_someone: "Bjud in en kontakt" invitations_left: "(%{count} kvar)" reshare: reshare: "Återdela" @@ -110,18 +111,18 @@ sv: notification: new: "Ny %{type} från %{from}" aspects: - no_friends_message: - nobody: "Vi vet att du har vänner, bjud in dem till Diaspora!" + no_contacts_message: + nobody: "Vi vet att du har kontakter, bjud in dem till Diaspora!" nobody_in_aspect: "Sidan '%{aspect_name}' är tom." - add_friend: "Lägg till en vän" - add_friend_to: "Lägg till en vän i %{aspect_name}" - invite: "Bjud in en vän till Diaspora!" + add_contact: "Lägg till en kontakt" + add_contact_to: "Lägg till en kontakt i %{aspect_name}" + invite: "Bjud in en kontakt till Diaspora!" no_posts_message: start_talking: "Ingen har sagt något än. Bli först!" manage: add_a_new_aspect: "Lägg till en ny sida" - add_a_new_friend: "Lägg till en ny vän" - requests: "Vänförfrågningar" + add_a_new_contact: "Lägg till en ny kontakt" + requests: "Kontaktförfrågningar" no_requests: "Inga nya förfrågningar" manage_aspects: "Hantera sidor" drag_to_add: "Dra för att lägga till personer" @@ -136,10 +137,10 @@ sv: success: "%{name} är nu borttagen." update: success: "Din sida %{name} är nu ändrad." - move_friend: + move_contact: failure: "fungerade inte %{inspect}" success: "Personen flyttades till den nya sidan" - error: "Kunde inte flytta vän: %{inspect}" + error: "Kunde inte flytta kontakt: %{inspect}" add_to_aspect: failure: "Misslyckades med att lägga in personen på den nya sidan." success: "Personen tillagt på sidan." @@ -152,7 +153,7 @@ sv: failure: "Misslyckades med att ta bort personen från vald sida" users: edit: - invite_friends: "Bjud in en vän" + invite_contacts: "Bjud in en kontakt" export_data: "Exportera data" close_account: "Stäng kontot" change_language: "Ändra språk" @@ -178,7 +179,7 @@ sv: add: "Lägg till" step_3: your_services: "Dina tjänster" - description: 'Anslut dina befintliga tjänster till ditt Diaspora-konto. Du kommer att kunna skicka meddelanden genom dessa om du väljer "gör publik." på sidan för alla vänner.' + description: 'Anslut dina befintliga tjänster till ditt Diaspora-konto. Du kommer att kunna skicka meddelanden genom dessa om du väljer "gör publik." på sidan för alla kontakter.' step_4: set_up: "Nu är guiden klar, %{name}!" ready_to_share: "Du är nu redo att börja dela med " @@ -234,12 +235,19 @@ sv: sign_up_for_diaspora: "Gå med i Diaspora" create: success: "Du har nu gått med i Diaspora!" + edit: + edit: "Ändra %{name}" + leave_blank: "(lämna tomt om du inte vill ändra det)" + password_to_confirm: "(det nuvarande lösenordet krävs för att bekräfta ändringarna)" + unhappy: "Missnöjd?" + update: "Uppdatera" + cancel_my_account: "Avsluta mitt konto" invitations: create: sent: 'Din inbjudan är nu skickad.' no_more: 'Du har inga fler inbjudningar.' already_sent: 'Du har redan bjudit in denna person.' - already_friends: 'Du är redan vän med den här personen' + already_friends: 'Den här personen finns redan bland dina kontakter' new: invite_someone_to_join: "Bjud in en än till Diaspora!" if_they_accept_info: "om de accepterar så kommer de att läggas till på den sida du valde" @@ -257,21 +265,19 @@ sv: destroy: "Ta bort" helper: no_message_to_display: "Inget meddelande att visa." - index: - status_messages: "statusmeddelanden" people: person: pending_request: "väntande förfrågningar" - already_friends: "Redan vänner" + already_friends: "Finns i dina kontakter" thats_you: "Detta är du!" + add_contact: "lägg till kontakt" index: results_for: "sökresultat för" show: no_posts: "inga meddelanden att visa!" - add_friend: "lägg till vän" - not_friends: "Du ärr närvarande inte vän med %{name}" - request_people: "Om du känner för det så skulle du kunna skicka en vänförfrågan." - already_requested: "Du har redan skickat en vänförfrågan till %{name}." + not_friends: "%{name} finns inte bland dina kontakter" + request_people: "Om du känner för det så skulle du kunna skicka en kontaktförfrågan." + already_requested: "Du har redan skickat en kontaktförfrågan till %{name}." does_not_exist: "Den här personen finns inte!" edit: info_available_to: "Den här informationen kommer vara synlig för alla som du ansluter till på diaspora." @@ -291,7 +297,7 @@ sv: updated: "Profilen är uppdaterad" failed: "Misslyckades med att uppdatera profilen" profile_sidebar: - remove_friend: "ta bort vän" + remove_contact: "ta bort kontakt" edit_my_profile: "Ändra min profil" last_seen: "senast sedd: %{how_long_ago}" bio: "bio" @@ -301,16 +307,16 @@ sv: results_for: " resultat för %{params}" people_on_pod_are_aware_of: " personer på denna plats är medvetna om att" requests: - new_request: - add_a_new_friend_to: "Lägg till en vän till" + manage_aspect_contacts: + add_a_new_contact_to: "Lägg till en kontakt till" enter_a_diaspora_username: "Ange ett användarnamn:" your_diaspora_username_is: "Din Diaspora-adress är: %{diaspora_handle}" - friends_username: "Vännens Diaspora-adress" + contact_username: "Kontaktens Diaspora-adress" create_request: "Skapa förfrågan" destroy: - success: "Ni är nu vänner." + success: "Kontakten är nu tillagd." error: "Var god välj en aspekt!" - ignore: "Ignorerade vänförfrågan." + ignore: "Ignorerade kontaktförfrågan." create: tried: "vi gjorde vårat bästa för att skicka meddelandet till %{account}" services: @@ -332,13 +338,13 @@ sv: love: "hälsningar," diaspora: "Diasporas mailrobot" new_request: - subject: "ny Diaspora vänförfågan från %{from}" - just_sent_you: "skickade nyss en vänförfrågan till dig på Diaspora" + subject: "ny kontaktförfrågan från %{from}" + just_sent_you: "skickade nyss en kontaktförfrågan till dig på Diaspora" try_it_out: "Du borde verkligen överväga att kolla upp detta." sign_in: "logga in här" request_accepted: - subject: "%{name} har accepterat din vänförfrågan på Diaspora" - accepted: "har accepterat din vänförfrågan. Denne finns nu på " + subject: "%{name} har accepterat din kontaktförfrågan på Diaspora" + accepted: "har accepterat din kontaktförfrågan. Denne finns nu på " aspect: "sidan." # The following is from the rails-i18n project at http://github.com/svenfuchs/rails-i18n From 1d3d2565dff7ba1cb6af170e738cbe511bbe10ac Mon Sep 17 00:00:00 2001 From: Hexagon Date: Sat, 13 Nov 2010 11:18:58 +0100 Subject: [PATCH 03/13] Forgot to change en.yml, here it is --- config/locales/diaspora/en.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml index f79c8d43a..797384e33 100644 --- a/config/locales/diaspora/en.yml +++ b/config/locales/diaspora/en.yml @@ -223,7 +223,6 @@ en: leave_blank: "(leave blank if you don't want to change it)" password_to_confirm: "(we need your current password to confirm your changes)" unhappy: "Unhappy?" - back: "Back" update: "Update" cancel_my_account: "Cancel my account" invitations: From 13a2b8ce07b67fdde664de576401420613362537 Mon Sep 17 00:00:00 2001 From: Hexagon Date: Mon, 15 Nov 2010 19:43:47 +0100 Subject: [PATCH 04/13] Small fix to devise.sv --- config/locales/devise/devise.sv.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/devise/devise.sv.yml b/config/locales/devise/devise.sv.yml index aa9172c13..eeabea803 100644 --- a/config/locales/devise/devise.sv.yml +++ b/config/locales/devise/devise.sv.yml @@ -2,7 +2,7 @@ # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. # -# See config/locales/devise/devise.sv.yml for Swedish Diaspora terms. +# See config/locales/diaspora/sv.yml for Swedish Diaspora terms. sv: errors: From 248e768846bf63ee86a56cdecc0bfd41f2d652c9 Mon Sep 17 00:00:00 2001 From: Raphael Date: Mon, 15 Nov 2010 19:13:27 -0800 Subject: [PATCH 05/13] search now sockets a person --- app/controllers/people_controller.rb | 29 ++++++++++++++++++++++++++++ app/helpers/sockets_helper.rb | 12 +++++++----- app/models/person.rb | 3 ++- app/views/js/_websocket_js.haml | 8 +++++++- app/views/people/_person.html.haml | 2 +- app/views/people/index.html.haml | 4 ++-- spec/helpers/sockets_helper_spec.rb | 13 +++++++++++++ 7 files changed, 61 insertions(+), 10 deletions(-) create mode 100644 spec/helpers/sockets_helper_spec.rb diff --git a/app/controllers/people_controller.rb b/app/controllers/people_controller.rb index 6f2634be0..8ffa6651c 100644 --- a/app/controllers/people_controller.rb +++ b/app/controllers/people_controller.rb @@ -10,10 +10,39 @@ class PeopleController < ApplicationController def index @aspect = :search + @people = Person.search(params[:q]).paginate :page => params[:page], :per_page => 25, :order => 'created_at DESC' + + + # dont do it@people.first.diaspora_handle == params[:q] + + #only do it if it is an email address + if params[:q].try(:match, Devise.email_regexp) + find_remote_user(params[:q]) + end + respond_with @people end + def find_remote_user(account) + + finger = EMWebfinger.new(account) + finger.on_person do |response| + begin + puts response.inspect + if response.class == Person + + response.socket_to_uid(current_user.id, :aspects => @aspects) + else + require File.join(Rails.root,'lib/diaspora/websocket') + puts Diaspora::WebSocket + Diaspora::WebSocket.queue_to_user(current_user.id, {:class => 'person', :query => account, :response => response}) + end + rescue + end + end + end + def show @person = Person.find(params[:id].to_id) diff --git a/app/helpers/sockets_helper.rb b/app/helpers/sockets_helper.rb index 7c70b8e21..1ad68551b 100644 --- a/app/helpers/sockets_helper.rb +++ b/app/helpers/sockets_helper.rb @@ -3,17 +3,19 @@ # the COPYRIGHT file. module SocketsHelper - include ApplicationHelper + include ApplicationHelper - def obj_id(object) - (object.is_a? Post) ? object.id : object.post_id + def obj_id(object) + object.respond_to?(:post_id) ? object.post_id : object.id end def action_hash(uid, object, opts={}) begin user = User.find_by_id uid if object.is_a? Post - v = render_to_string(:partial => 'shared/stream_element', :locals => {:post => object, :current_user => user}) unless object.is_a? Retraction + v = render_to_string(:partial => 'shared/stream_element', :locals => {:post => object, :current_user => user}) + elsif object.is_a? Person + v = render_to_string(:partial => type_partial(object), :locals => {:person => object, :current_user => user}) unless object.is_a? Retraction else v = render_to_string(:partial => type_partial(object), :locals => {:post => object, :current_user => user}) unless object.is_a? Retraction end @@ -32,7 +34,7 @@ module SocketsHelper action_hash[:notification] = notification(object) end - action_hash[:mine?] = object.person && (object.person.owner.id == uid) + action_hash[:mine?] = object.person && (object.person.owner.id == uid) if object.respond_to?(:person) action_hash.to_json end diff --git a/app/models/person.rb b/app/models/person.rb index b7025a25e..62cc5759b 100644 --- a/app/models/person.rb +++ b/app/models/person.rb @@ -8,6 +8,8 @@ class Person include MongoMapper::Document include ROXML include Encryptor::Public + require File.join(Rails.root, 'lib/diaspora/websocket') + include Diaspora::Socketable xml_accessor :_id xml_accessor :diaspora_handle @@ -148,7 +150,6 @@ class Person } } end - protected def clean_url diff --git a/app/views/js/_websocket_js.haml b/app/views/js/_websocket_js.haml index 4e4d26170..fa2636e35 100644 --- a/app/views/js/_websocket_js.haml +++ b/app/views/js/_websocket_js.haml @@ -17,6 +17,8 @@ if(obj['notice']){ processNotification(obj['notice']); + }else if (obj['class'] == 'people'){ + processPerson(obj['html']); }else{ debug("got a " + obj['class'] + " for aspects " + obj['aspect_ids']); @@ -42,6 +44,10 @@ }); + function processPerson(html){ + $('.people#stream').prepend(html).slideDown('slow', function(){}) + } + function processNotification(html){ $('#notification').html(html).fadeIn(200).delay(4000).fadeOut(200, function(){ $(this).html("");}); } @@ -97,7 +103,7 @@ function processPhotoInAlbum(photoHash){ if (location.href.indexOf(photoHash['album_id']) == -1){ return ; - } + }› html = "
\ \ \"New \ diff --git a/app/views/people/_person.html.haml b/app/views/people/_person.html.haml index 0a441452d..a66632e88 100644 --- a/app/views/people/_person.html.haml +++ b/app/views/people/_person.html.haml @@ -18,7 +18,7 @@ - elsif current_user.pending_requests.find_by_person_id(person.id) = link_to =t('.pending_request'), aspects_manage_path - else - = render :partial => 'requests/new_request_to_person', :locals => {:aspects => @aspects, :person => person} + = render :partial => 'requests/new_request_to_person', :locals => {:aspects => aspects, :person => person} .info = person.diaspora_handle diff --git a/app/views/people/index.html.haml b/app/views/people/index.html.haml index f5c3fd5e6..cf6bb2a55 100644 --- a/app/views/people/index.html.haml +++ b/app/views/people/index.html.haml @@ -7,8 +7,8 @@ =t('.results_for') %u= params[:q] - %ul#stream + %ul#stream.people - for person in @people - = render 'people/person', :person => person + = render 'people/person', :person => person, :aspects => @aspects = will_paginate @people diff --git a/spec/helpers/sockets_helper_spec.rb b/spec/helpers/sockets_helper_spec.rb new file mode 100644 index 000000000..bb65f4ccd --- /dev/null +++ b/spec/helpers/sockets_helper_spec.rb @@ -0,0 +1,13 @@ +# Copyright (c) 2010, Diaspora Inc. This file is +# licensed under the Affero General Public License version 3 or later. See +# the COPYRIGHT file. +# +require 'spec_helper' + +describe SocketsHelper do + + describe '#obj_id' do + + end + +end From 0b12c4e2725a62cb24e443e38fda041e1e858bd9 Mon Sep 17 00:00:00 2001 From: Sarah Mei Date: Mon, 15 Nov 2010 21:06:45 -0800 Subject: [PATCH 06/13] Cucumber user by default is done with getting started. --- features/step_definitions/session_steps.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/features/step_definitions/session_steps.rb b/features/step_definitions/session_steps.rb index abc9e87df..53cdf9f99 100644 --- a/features/step_definitions/session_steps.rb +++ b/features/step_definitions/session_steps.rb @@ -11,7 +11,7 @@ end Given 'I am signed in' do - @me ||= Factory(:user) + @me ||= Factory(:user, :getting_started => false) When %(I go to the new user session page) When %(I fill in "Username" with "#{@me.username}") When %(I fill in "Password" with "#{@me.password}") From 9fa47c9bfa43bbcba85d96f1673409944c3b83e7 Mon Sep 17 00:00:00 2001 From: Sarah Mei Date: Mon, 15 Nov 2010 21:19:21 -0800 Subject: [PATCH 07/13] Fix a failing spec under 1.9 in receive_spec --- lib/diaspora/user/connecting.rb | 38 +- spec/fixtures/users.yaml | 1226 +++++++++++++++--------------- spec/models/user/receive_spec.rb | 1 + 3 files changed, 635 insertions(+), 630 deletions(-) diff --git a/lib/diaspora/user/connecting.rb b/lib/diaspora/user/connecting.rb index 40d05c1f2..db9f840bf 100644 --- a/lib/diaspora/user/connecting.rb +++ b/lib/diaspora/user/connecting.rb @@ -7,12 +7,12 @@ module Diaspora module Connecting def send_contact_request_to(desired_contact, aspect) # should have different exception types for these? - raise "You cannot connect yourself" if desired_contact.nil? - raise "You have already sent a contact request to that person!" if self.pending_requests.detect{ - |x| x.to == desired_contact} + raise "You cannot connect yourself" if desired_contact.nil? + raise "You have already sent a contact request to that person!" if self.pending_requests.detect { + |x| x.to == desired_contact } raise "You are already connected to that person!" if contact_for desired_contact request = Request.instantiate( - :to => desired_contact, + :to => desired_contact, :from => self.person, :into => aspect) if request.save @@ -39,8 +39,8 @@ module Diaspora end def accept_and_respond(contact_request_id, aspect_id) - request = pending_requests.find!(contact_request_id) - requester = request.from + request = pending_requests.find!(contact_request_id) + requester = request.from reversed_request = accept_contact_request(request, aspect_by_id(aspect_id)) dispatch_contact_acceptance reversed_request, requester end @@ -58,7 +58,7 @@ module Diaspora def receive_contact_request(contact_request) Rails.logger.info("receiving contact request #{contact_request.to_json}") - + #response from a contact request you sent if original_request = original_request(contact_request) destination_aspect = self.aspect_by_id(original_request.into_id) @@ -72,7 +72,7 @@ module Diaspora self.save Request.send_request_accepted(self, contact_request.from, destination_aspect) - #this is a new contact request + #this is a new contact request elsif !request_from_me?(contact_request) self.pending_requests << contact_request self.save! @@ -94,19 +94,23 @@ module Diaspora def remove_contact(bad_contact) contact = contact_for(bad_contact) - contact.aspects.each{|aspect| + contact.aspects.each do |aspect| contact.aspects.delete(aspect) - aspect.posts.each { |post| + aspect.posts.each do |post| aspect.post_ids.delete(post.id) if post.person == bad_contact - } + end aspect.save - } + end - self.raw_visible_posts.find_all_by_person_id( bad_contact.id ).each{|post| - self.visible_post_ids.delete( post.id ) + self.raw_visible_posts.find_all_by_person_id(bad_contact.id).each do |post| + self.visible_post_ids.delete(post.id) post.user_refs -= 1 - (post.user_refs > 0 || post.person.owner.nil? == false) ? post.save : post.destroy - } + if (post.user_refs > 0) || post.person.owner.nil? == false + post.save + else + post.destroy + end + end self.save raise "Contact not deleted" unless contact.destroy bad_contact.save @@ -133,7 +137,7 @@ module Diaspora end def requests_for_me - pending_requests.select{|req| req.to == self.person} + pending_requests.select { |req| req.to == self.person } end end end diff --git a/spec/fixtures/users.yaml b/spec/fixtures/users.yaml index 5d6b5ade4..70a11bc36 100644 --- a/spec/fixtures/users.yaml +++ b/spec/fixtures/users.yaml @@ -1,908 +1,908 @@ --- :users: -- :person: !map:ActiveSupport::HashWithIndifferentAccess - created_at: 2010-11-15 05:41:26 Z - profile: !map:ActiveSupport::HashWithIndifferentAccess - searchable: true - image_url: - _id: !ruby/object:BSON::ObjectId - data: - - 76 - - 224 - - 200 - - 6 - - 35 - - 103 - - 188 - - 184 - - 81 - - 0 - - 0 - - 237 - gender: - diaspora_handle: - birthday: - last_name: Grimm6636c824 - bio: - first_name: Robert661d698e - updated_at: 2010-11-15 05:41:26 Z - _id: !ruby/object:BSON::ObjectId - data: - - 76 - - 224 - - 200 - - 6 - - 35 - - 103 - - 188 - - 184 - - 81 - - 0 - - 0 - - 238 - url: http://google-6640be67.com/ - serialized_public_key: | - -----BEGIN RSA PUBLIC KEY----- - MIGJAoGBALyeFYuLxcf026PvVbNIZgVK6YGQ6rTPzdmUpC+LTwi4Nbu5pnPK5f4Y - rqwy2DxgeVYEa+5j8/3ugMjPvq3RRJZLCqcZdNoCoduMJDWrg5xsNuidaArpW5Qk - EoePeAZjakz4c7gH3Iw3Kp0byh3SK4Mh2uHHr0WjrF56esQzGUtHAgMBAAE= - -----END RSA PUBLIC KEY----- - - owner_id: &id001 !ruby/object:BSON::ObjectId - data: - - 76 - - 224 - - 200 - - 5 - - 35 - - 103 - - 188 - - 184 - - 81 - - 0 - - 0 - - 236 - diaspora_handle: bob65f3c2eb@example.org - :user: !map:ActiveSupport::HashWithIndifferentAccess - encrypted_password: $2a$10$LI/pdUI/E.aHa3WCBLu1LO1XV53nSKZhYHZqiSVonBTHmVc8fiDa2 +- :user: !map:ActiveSupport::HashWithIndifferentAccess + encrypted_password: $2a$10$bhNYPzsgOcew.b55X1fwROLMmLS4kRgOv0M1wnMSKZ5jSUB8MMbBa serialized_private_key: &id002 | -----BEGIN RSA PRIVATE KEY----- - MIICXAIBAAKBgQC8nhWLi8XH9Nuj71WzSGYFSumBkOq0z83ZlKQvi08IuDW7uaZz - yuX+GK6sMtg8YHlWBGvuY/P97oDIz76t0USWSwqnGXTaAqHbjCQ1q4OcbDbonWgK - 6VuUJBKHj3gGY2pM+HO4B9yMNyqdG8od0iuDIdrhx69Fo6xeenrEMxlLRwIDAQAB - AoGActSfc0yOBbVJvt1nxHVwPwqjbJEogxn8TdnTt2pNnJZhiD93WgmNyguG1ClE - QkXNuROKDiFmGxOH7jmj8bh00ypWzy9TWnbUf/PL/g+gSiG0ft0CM+0i93VXlMv9 - AR2U/fOLdEy9Bra+ntwnFQaJ78rAUD5ccbWSBqg/TtSS0NECQQDyUvSIAr92tlLg - ywM3ObyxcznLItQ12Oq6R/dDKnajaMORzGCNqVV6frwYM989ln8+CctXWCi4ZcWh - /Uyp59RPAkEAx0MwVMvcfOZjtCU4aTL54CdrSaFqNvdZcjcp0+KO0N+eBOtkl0Ai - FbAIZEXjBg2HUKDgWI6z1ZwmMwDw2QhDiQJAVg5TvQGM0THKmP4/tBsTAcmz2ooR - 5tWT9necPgQUgc+wtFRqbaSXMJtVXRr+yrZplbSQvAIY4/NwjiiQUz57TQJAbQJv - 1WP1iorLrsjR9JNDqgJGqnBY2Bs3XsmY42bFNLWxEAXq8OfP/cdgv+KP0UbjaROp - yCjBbzHOoAZ6vHDN6QJBALRtEh3jaOulkia82LV6ZzOl6Gsp86Y/D1FWHPKNVNoS - 8f++mBU56ozNy3JnU2gyIJSoy5zn9VdHR8qvhLtV/R8= + MIICXAIBAAKBgQDiXe3c4vKyLoo1Sorhu+W/8JL/vDsdxW8LevE5j83aYXVvULMI + 6Jq5bpscbTx5LKCEH056r5GIsACBrWrk+T/lvslgg7AfSOkBrYYs5a95dQ8Svh8g + XJwEWdCar3rU/J+eX44fJVeXxTSOolIeApWPMAkT3wiYQ5aTgPvhYRsyVQIDAQAB + AoGAboMCzDKz349fA/NXaCruWE1fxqAjkD5CHy2vNLXi/rlTtruEHFZKqzq3WSJv + Qo0p9DbAfp7WAxBBvw1lwVF6AolrLRn2pUctgZplF+6r6zLWRZvZP8WJ0v4FvYKh + VTB8yimyWIzVsYz/izDbm48xPNBpYdGp09QkhKw1HW2xs4ECQQD6rFfnu0Hkfezt + E9tqdDQEOkMXNaYYKRAjmSJUkJT1A0L3Iay4RhJRK/Ait0QY3B3IJOEl3kjvCRv1 + G/ovsHchAkEA5y1cKkbaCHxTVI9kZ/1d2sGOexkrCF7yUyCZKlETXDVJqk1FqmVl + M+MLM0IxrBu/DYH5Eu0WoCtt2+u7Ww/4tQJAbnqOs58gR2gIh+R8i8pzMnnLH+uR + LIzMhCP1sXeXbvTlCq5YxU58vDG1QFetN5eruI4ofNwfINrO65RNC7+mgQJAHNVN + f4BixVgsVIml7kptoFEv4i6bbWnaM4AHWn3OOlvzGiiVHdGTs8sHpJcG9v5m79pc + JH4pqkSAaUOXlJ4DWQJBALEGoxLLXFgii/SNuO+KGG17XUpB3LAPJBYIiamQXFtK + euBSIlWL7QegDMGWf5Sf2nqG7dq0sJUJnO0cNeCb4uA= -----END RSA PRIVATE KEY----- pending_request_ids: [] last_sign_in_ip: invites: 5 - _id: *id001 + _id: &id001 !ruby/object:BSON::ObjectId + data: + - 76 + - 226 + - 19 + - 128 + - 35 + - 103 + - 188 + - 228 + - 45 + - 0 + - 0 + - 246 last_sign_in_at: - username: bob65f3c2eb + username: bob653e0d00 language: en sign_in_count: 0 visible_person_ids: [] - password_salt: $2a$10$LI/pdUI/E.aHa3WCBLu1LO + password_salt: $2a$10$bhNYPzsgOcew.b55X1fwRO remember_token: reset_password_token: current_sign_in_ip: remember_created_at: current_sign_in_at: invitation_sent_at: - email: bob665b3e89@pivotallabs.com + email: bob6685303f@pivotallabs.com invitation_token: visible_post_ids: [] getting_started: true -- :person: !map:ActiveSupport::HashWithIndifferentAccess - created_at: 2010-11-15 05:41:26 Z + :person: !map:ActiveSupport::HashWithIndifferentAccess + created_at: 2010-11-16 05:15:44 Z profile: !map:ActiveSupport::HashWithIndifferentAccess searchable: true image_url: _id: !ruby/object:BSON::ObjectId data: - 76 - - 224 - - 200 - - 6 + - 226 + - 19 + - 128 - 35 - 103 - 188 - - 184 - - 81 + - 228 + - 45 - 0 - 0 - - 240 + - 247 gender: diaspora_handle: birthday: - last_name: Grimm6771b344 + last_name: Grimm663a77d7 bio: - first_name: Robert6710f3e5 - updated_at: 2010-11-15 05:41:26 Z + first_name: Robert66802968 + updated_at: 2010-11-16 05:15:44 Z _id: !ruby/object:BSON::ObjectId data: - 76 - - 224 - - 200 - - 6 + - 226 + - 19 + - 128 - 35 - 103 - 188 - - 184 - - 81 - - 0 - - 0 - - 241 - url: http://google-67db2778.com/ - serialized_public_key: | - -----BEGIN RSA PUBLIC KEY----- - MIGJAoGBALyeFYuLxcf026PvVbNIZgVK6YGQ6rTPzdmUpC+LTwi4Nbu5pnPK5f4Y - rqwy2DxgeVYEa+5j8/3ugMjPvq3RRJZLCqcZdNoCoduMJDWrg5xsNuidaArpW5Qk - EoePeAZjakz4c7gH3Iw3Kp0byh3SK4Mh2uHHr0WjrF56esQzGUtHAgMBAAE= - -----END RSA PUBLIC KEY----- - - owner_id: &id003 !ruby/object:BSON::ObjectId - data: - - 76 - - 224 - - 200 - - 6 - - 35 - - 103 - - 188 - - 184 - - 81 - - 0 - - 0 - - 239 - diaspora_handle: bob66ac6ea2@example.org - :user: !map:ActiveSupport::HashWithIndifferentAccess - encrypted_password: $2a$10$iDAabZ1errQEROqCsUQWuuDKQYzPqIjoFJ92Kg5vHlKFJNCmfJv86 - serialized_private_key: *id002 - pending_request_ids: [] - - last_sign_in_ip: - invites: 5 - _id: *id003 - last_sign_in_at: - username: bob66ac6ea2 - language: en - sign_in_count: 0 - visible_person_ids: [] - - password_salt: $2a$10$iDAabZ1errQEROqCsUQWuu - remember_token: - reset_password_token: - current_sign_in_ip: - remember_created_at: - current_sign_in_at: - invitation_sent_at: - email: bob67836b18@pivotallabs.com - invitation_token: - visible_post_ids: [] - - getting_started: true -- :person: !map:ActiveSupport::HashWithIndifferentAccess - created_at: 2010-11-15 05:41:26 Z - profile: !map:ActiveSupport::HashWithIndifferentAccess - searchable: true - image_url: - _id: !ruby/object:BSON::ObjectId - data: - - 76 - - 224 - - 200 - - 6 - - 35 - - 103 - - 188 - - 184 - - 81 - - 0 - - 0 - - 243 - gender: - diaspora_handle: - birthday: - last_name: Grimm68338cab - bio: - first_name: Robert688c74c6 - updated_at: 2010-11-15 05:41:26 Z - _id: !ruby/object:BSON::ObjectId - data: - - 76 - - 224 - - 200 - - 6 - - 35 - - 103 - - 188 - - 184 - - 81 - - 0 - - 0 - - 244 - url: http://google-68c8c56e.com/ - serialized_public_key: | - -----BEGIN RSA PUBLIC KEY----- - MIGJAoGBALyeFYuLxcf026PvVbNIZgVK6YGQ6rTPzdmUpC+LTwi4Nbu5pnPK5f4Y - rqwy2DxgeVYEa+5j8/3ugMjPvq3RRJZLCqcZdNoCoduMJDWrg5xsNuidaArpW5Qk - EoePeAZjakz4c7gH3Iw3Kp0byh3SK4Mh2uHHr0WjrF56esQzGUtHAgMBAAE= - -----END RSA PUBLIC KEY----- - - owner_id: &id004 !ruby/object:BSON::ObjectId - data: - - 76 - - 224 - - 200 - - 6 - - 35 - - 103 - - 188 - - 184 - - 81 - - 0 - - 0 - - 242 - diaspora_handle: bob67325b0d@example.org - :user: !map:ActiveSupport::HashWithIndifferentAccess - encrypted_password: $2a$10$qq5OzGMgVhQqebKvxkABNOqL3rR3bNoazye1w5Y1Mo4a85xDxM/qu - serialized_private_key: *id002 - pending_request_ids: [] - - last_sign_in_ip: - invites: 5 - _id: *id004 - last_sign_in_at: - username: bob67325b0d - language: en - sign_in_count: 0 - visible_person_ids: [] - - password_salt: $2a$10$qq5OzGMgVhQqebKvxkABNO - remember_token: - reset_password_token: - current_sign_in_ip: - remember_created_at: - current_sign_in_at: - invitation_sent_at: - email: bob68ce9277@pivotallabs.com - invitation_token: - visible_post_ids: [] - - getting_started: true -- :person: !map:ActiveSupport::HashWithIndifferentAccess - created_at: 2010-11-15 05:41:26 Z - profile: !map:ActiveSupport::HashWithIndifferentAccess - searchable: true - image_url: - _id: !ruby/object:BSON::ObjectId - data: - - 76 - - 224 - - 200 - - 6 - - 35 - - 103 - - 188 - - 184 - - 81 - - 0 - - 0 - - 246 - gender: - diaspora_handle: - birthday: - last_name: Grimm69687805 - bio: - first_name: Robert69e76d9c - updated_at: 2010-11-15 05:41:26 Z - _id: !ruby/object:BSON::ObjectId - data: - - 76 - - 224 - - 200 - - 6 - - 35 - - 103 - - 188 - - 184 - - 81 - - 0 - - 0 - - 247 - url: http://google-691b7ba8.com/ - serialized_public_key: | - -----BEGIN RSA PUBLIC KEY----- - MIGJAoGBALyeFYuLxcf026PvVbNIZgVK6YGQ6rTPzdmUpC+LTwi4Nbu5pnPK5f4Y - rqwy2DxgeVYEa+5j8/3ugMjPvq3RRJZLCqcZdNoCoduMJDWrg5xsNuidaArpW5Qk - EoePeAZjakz4c7gH3Iw3Kp0byh3SK4Mh2uHHr0WjrF56esQzGUtHAgMBAAE= - -----END RSA PUBLIC KEY----- - - owner_id: &id005 !ruby/object:BSON::ObjectId - data: - - 76 - - 224 - - 200 - - 6 - - 35 - - 103 - - 188 - - 184 - - 81 - - 0 - - 0 - - 245 - diaspora_handle: bob68406c00@example.org - :user: !map:ActiveSupport::HashWithIndifferentAccess - encrypted_password: $2a$10$xjffVd8FCJAawRTn3FE.t.kANNz54w8d1rvCvjkoT5IS1ZsI9wmxa - serialized_private_key: *id002 - pending_request_ids: [] - - last_sign_in_ip: - invites: 5 - _id: *id005 - last_sign_in_at: - username: bob68406c00 - language: en - sign_in_count: 0 - visible_person_ids: [] - - password_salt: $2a$10$xjffVd8FCJAawRTn3FE.t. - remember_token: - reset_password_token: - current_sign_in_ip: - remember_created_at: - current_sign_in_at: - invitation_sent_at: - email: bob69833eca@pivotallabs.com - invitation_token: - visible_post_ids: [] - - getting_started: true -- :person: !map:ActiveSupport::HashWithIndifferentAccess - created_at: 2010-11-15 05:41:26 Z - profile: !map:ActiveSupport::HashWithIndifferentAccess - searchable: true - image_url: - _id: !ruby/object:BSON::ObjectId - data: - - 76 - - 224 - - 200 - - 6 - - 35 - - 103 - - 188 - - 184 - - 81 - - 0 - - 0 - - 249 - gender: - diaspora_handle: - birthday: - last_name: Grimm700c8917 - bio: - first_name: Robert70a53a88 - updated_at: 2010-11-15 05:41:26 Z - _id: !ruby/object:BSON::ObjectId - data: - - 76 - - 224 - - 200 - - 6 - - 35 - - 103 - - 188 - - 184 - - 81 - - 0 - - 0 - - 250 - url: http://google-70785b34.com/ - serialized_public_key: | - -----BEGIN RSA PUBLIC KEY----- - MIGJAoGBALyeFYuLxcf026PvVbNIZgVK6YGQ6rTPzdmUpC+LTwi4Nbu5pnPK5f4Y - rqwy2DxgeVYEa+5j8/3ugMjPvq3RRJZLCqcZdNoCoduMJDWrg5xsNuidaArpW5Qk - EoePeAZjakz4c7gH3Iw3Kp0byh3SK4Mh2uHHr0WjrF56esQzGUtHAgMBAAE= - -----END RSA PUBLIC KEY----- - - owner_id: &id006 !ruby/object:BSON::ObjectId - data: - - 76 - - 224 - - 200 - - 6 - - 35 - - 103 - - 188 - - 184 - - 81 + - 228 + - 45 - 0 - 0 - 248 - diaspora_handle: bob6991ced9@example.org - :user: !map:ActiveSupport::HashWithIndifferentAccess - encrypted_password: $2a$10$eSZ1FwJbg5bBKhXoRTZ6Ie0jmuQsqLnZ0AA2mbaAj.3Zuar1doBuq + url: http://google-6648e74a.com/ + serialized_public_key: | + -----BEGIN RSA PUBLIC KEY----- + MIGJAoGBAOJd7dzi8rIuijVKiuG75b/wkv+8Ox3Fbwt68TmPzdphdW9Qswjomrlu + mxxtPHksoIQfTnqvkYiwAIGtauT5P+W+yWCDsB9I6QGthizlr3l1DxK+HyBcnARZ + 0JqvetT8n55fjh8lV5fFNI6iUh4ClY8wCRPfCJhDlpOA++FhGzJVAgMBAAE= + -----END RSA PUBLIC KEY----- + + owner_id: *id001 + diaspora_handle: bob653e0d00@example.org +- :user: !map:ActiveSupport::HashWithIndifferentAccess + encrypted_password: $2a$10$UeymWlCKWg2R8u/6BXjcHeVgKpjrwtlY.nNqhYb7ZleM73f0AemNe serialized_private_key: *id002 pending_request_ids: [] last_sign_in_ip: invites: 5 - _id: *id006 + _id: &id003 !ruby/object:BSON::ObjectId + data: + - 76 + - 226 + - 19 + - 128 + - 35 + - 103 + - 188 + - 228 + - 45 + - 0 + - 0 + - 249 last_sign_in_at: - username: bob6991ced9 + username: bob66e8fd21 language: en sign_in_count: 0 visible_person_ids: [] - password_salt: $2a$10$eSZ1FwJbg5bBKhXoRTZ6Ie + password_salt: $2a$10$UeymWlCKWg2R8u/6BXjcHe remember_token: reset_password_token: current_sign_in_ip: remember_created_at: current_sign_in_at: invitation_sent_at: - email: bob702c4173@pivotallabs.com + email: bob678d2ea8@pivotallabs.com invitation_token: visible_post_ids: [] getting_started: true -- :person: !map:ActiveSupport::HashWithIndifferentAccess - created_at: 2010-11-15 05:41:26 Z + :person: !map:ActiveSupport::HashWithIndifferentAccess + created_at: 2010-11-16 05:15:44 Z profile: !map:ActiveSupport::HashWithIndifferentAccess searchable: true image_url: _id: !ruby/object:BSON::ObjectId data: - 76 - - 224 - - 200 - - 6 + - 226 + - 19 + - 128 - 35 - 103 - 188 - - 184 - - 81 + - 228 + - 45 - 0 - 0 - - 252 + - 250 gender: diaspora_handle: birthday: - last_name: Grimm7151040b + last_name: Grimm677f019f bio: - first_name: Robert71f8e668 - updated_at: 2010-11-15 05:41:26 Z + first_name: Robert6707c9cf + updated_at: 2010-11-16 05:15:44 Z _id: !ruby/object:BSON::ObjectId data: - 76 - - 224 - - 200 - - 6 + - 226 + - 19 + - 128 - 35 - 103 - 188 - - 184 - - 81 - - 0 - - 0 - - 253 - url: http://google-71c0bddc.com/ - serialized_public_key: | - -----BEGIN RSA PUBLIC KEY----- - MIGJAoGBALyeFYuLxcf026PvVbNIZgVK6YGQ6rTPzdmUpC+LTwi4Nbu5pnPK5f4Y - rqwy2DxgeVYEa+5j8/3ugMjPvq3RRJZLCqcZdNoCoduMJDWrg5xsNuidaArpW5Qk - EoePeAZjakz4c7gH3Iw3Kp0byh3SK4Mh2uHHr0WjrF56esQzGUtHAgMBAAE= - -----END RSA PUBLIC KEY----- - - owner_id: &id007 !ruby/object:BSON::ObjectId - data: - - 76 - - 224 - - 200 - - 6 - - 35 - - 103 - - 188 - - 184 - - 81 + - 228 + - 45 - 0 - 0 - 251 - diaspora_handle: bob706b2562@example.org - :user: !map:ActiveSupport::HashWithIndifferentAccess - encrypted_password: $2a$10$3LSXM5oDBCjm7Bs/bx4TK.B909pIUcsLWo4s7VADEGg3GH3EZVL2S + url: http://google-676c7937.com/ + serialized_public_key: | + -----BEGIN RSA PUBLIC KEY----- + MIGJAoGBAOJd7dzi8rIuijVKiuG75b/wkv+8Ox3Fbwt68TmPzdphdW9Qswjomrlu + mxxtPHksoIQfTnqvkYiwAIGtauT5P+W+yWCDsB9I6QGthizlr3l1DxK+HyBcnARZ + 0JqvetT8n55fjh8lV5fFNI6iUh4ClY8wCRPfCJhDlpOA++FhGzJVAgMBAAE= + -----END RSA PUBLIC KEY----- + + owner_id: *id003 + diaspora_handle: bob66e8fd21@example.org +- :user: !map:ActiveSupport::HashWithIndifferentAccess + encrypted_password: $2a$10$YMicxE0PCxlgFNJEuk/V7.W7g1TqsOcIZzfxzGqzVYSgJeyQ47S8y serialized_private_key: *id002 pending_request_ids: [] last_sign_in_ip: invites: 5 - _id: *id007 + _id: &id004 !ruby/object:BSON::ObjectId + data: + - 76 + - 226 + - 19 + - 128 + - 35 + - 103 + - 188 + - 228 + - 45 + - 0 + - 0 + - 252 last_sign_in_at: - username: bob706b2562 + username: bob676dda01 language: en sign_in_count: 0 visible_person_ids: [] - password_salt: $2a$10$3LSXM5oDBCjm7Bs/bx4TK. + password_salt: $2a$10$YMicxE0PCxlgFNJEuk/V7. remember_token: reset_password_token: current_sign_in_ip: remember_created_at: current_sign_in_at: invitation_sent_at: - email: bob71a027dc@pivotallabs.com + email: bob68e5bd53@pivotallabs.com invitation_token: visible_post_ids: [] getting_started: true -- :person: !map:ActiveSupport::HashWithIndifferentAccess - created_at: 2010-11-15 05:41:26 Z + :person: !map:ActiveSupport::HashWithIndifferentAccess + created_at: 2010-11-16 05:15:45 Z profile: !map:ActiveSupport::HashWithIndifferentAccess searchable: true image_url: _id: !ruby/object:BSON::ObjectId data: - 76 - - 224 - - 200 - - 6 + - 226 + - 19 + - 129 - 35 - 103 - 188 - - 184 - - 81 + - 228 + - 45 - 0 - 0 - - 255 + - 253 gender: diaspora_handle: birthday: - last_name: Grimm7297a30f + last_name: Grimm687c58a4 bio: - first_name: Robert728f5b14 - updated_at: 2010-11-15 05:41:26 Z + first_name: Robert6815709a + updated_at: 2010-11-16 05:15:45 Z _id: !ruby/object:BSON::ObjectId data: - 76 - - 224 - - 200 - - 6 + - 226 + - 19 + - 129 - 35 - 103 - 188 - - 184 - - 81 - - 0 - - 1 - - 0 - url: http://google-7226d696.com/ - serialized_public_key: | - -----BEGIN RSA PUBLIC KEY----- - MIGJAoGBALyeFYuLxcf026PvVbNIZgVK6YGQ6rTPzdmUpC+LTwi4Nbu5pnPK5f4Y - rqwy2DxgeVYEa+5j8/3ugMjPvq3RRJZLCqcZdNoCoduMJDWrg5xsNuidaArpW5Qk - EoePeAZjakz4c7gH3Iw3Kp0byh3SK4Mh2uHHr0WjrF56esQzGUtHAgMBAAE= - -----END RSA PUBLIC KEY----- - - owner_id: &id008 !ruby/object:BSON::ObjectId - data: - - 76 - - 224 - - 200 - - 6 - - 35 - - 103 - - 188 - - 184 - - 81 + - 228 + - 45 - 0 - 0 - 254 - diaspora_handle: bob71844d77@example.org - :user: !map:ActiveSupport::HashWithIndifferentAccess - encrypted_password: $2a$10$YaRZkC1M7yPyGlY92.1E0uDtbwGOmoHOmbSN1lqQU/YT22nVmWtjC + url: http://google-68073606.com/ + serialized_public_key: | + -----BEGIN RSA PUBLIC KEY----- + MIGJAoGBAOJd7dzi8rIuijVKiuG75b/wkv+8Ox3Fbwt68TmPzdphdW9Qswjomrlu + mxxtPHksoIQfTnqvkYiwAIGtauT5P+W+yWCDsB9I6QGthizlr3l1DxK+HyBcnARZ + 0JqvetT8n55fjh8lV5fFNI6iUh4ClY8wCRPfCJhDlpOA++FhGzJVAgMBAAE= + -----END RSA PUBLIC KEY----- + + owner_id: *id004 + diaspora_handle: bob676dda01@example.org +- :user: !map:ActiveSupport::HashWithIndifferentAccess + encrypted_password: $2a$10$52UEDjOJ53CV0PJBS61X8.MErGDAnhLIUaKJ0aboo.IDoBfbMZUkm serialized_private_key: *id002 pending_request_ids: [] last_sign_in_ip: invites: 5 - _id: *id008 + _id: &id005 !ruby/object:BSON::ObjectId + data: + - 76 + - 226 + - 19 + - 129 + - 35 + - 103 + - 188 + - 228 + - 45 + - 0 + - 0 + - 255 last_sign_in_at: - username: bob71844d77 + username: bob68c9902f language: en sign_in_count: 0 visible_person_ids: [] - password_salt: $2a$10$YaRZkC1M7yPyGlY92.1E0u + password_salt: $2a$10$52UEDjOJ53CV0PJBS61X8. remember_token: reset_password_token: current_sign_in_ip: remember_created_at: current_sign_in_at: invitation_sent_at: - email: bob72ad638d@pivotallabs.com + email: bob69c80b3a@pivotallabs.com invitation_token: visible_post_ids: [] getting_started: true -- :person: !map:ActiveSupport::HashWithIndifferentAccess - created_at: 2010-11-15 05:41:27 Z + :person: !map:ActiveSupport::HashWithIndifferentAccess + created_at: 2010-11-16 05:15:45 Z profile: !map:ActiveSupport::HashWithIndifferentAccess searchable: true image_url: _id: !ruby/object:BSON::ObjectId data: - 76 - - 224 - - 200 - - 6 + - 226 + - 19 + - 129 - 35 - 103 - 188 - - 184 - - 81 + - 228 + - 45 - 0 - 1 - - 2 + - 0 gender: diaspora_handle: birthday: - last_name: Grimm738d6448 + last_name: Grimm69b38d63 bio: - first_name: Robert73400d64 - updated_at: 2010-11-15 05:41:27 Z + first_name: Robert69aafe84 + updated_at: 2010-11-16 05:15:45 Z _id: !ruby/object:BSON::ObjectId data: - 76 - - 224 - - 200 - - 6 + - 226 + - 19 + - 129 - 35 - 103 - 188 - - 184 - - 81 + - 228 + - 45 - 0 - 1 - - 3 - url: http://google-7393c201.com/ + - 1 + url: http://google-6923f678.com/ serialized_public_key: | -----BEGIN RSA PUBLIC KEY----- - MIGJAoGBALyeFYuLxcf026PvVbNIZgVK6YGQ6rTPzdmUpC+LTwi4Nbu5pnPK5f4Y - rqwy2DxgeVYEa+5j8/3ugMjPvq3RRJZLCqcZdNoCoduMJDWrg5xsNuidaArpW5Qk - EoePeAZjakz4c7gH3Iw3Kp0byh3SK4Mh2uHHr0WjrF56esQzGUtHAgMBAAE= + MIGJAoGBAOJd7dzi8rIuijVKiuG75b/wkv+8Ox3Fbwt68TmPzdphdW9Qswjomrlu + mxxtPHksoIQfTnqvkYiwAIGtauT5P+W+yWCDsB9I6QGthizlr3l1DxK+HyBcnARZ + 0JqvetT8n55fjh8lV5fFNI6iUh4ClY8wCRPfCJhDlpOA++FhGzJVAgMBAAE= -----END RSA PUBLIC KEY----- - owner_id: &id009 !ruby/object:BSON::ObjectId - data: - - 76 - - 224 - - 200 - - 6 - - 35 - - 103 - - 188 - - 184 - - 81 - - 0 - - 1 - - 1 - diaspora_handle: bob721dc5ae@example.org - :user: !map:ActiveSupport::HashWithIndifferentAccess - encrypted_password: $2a$10$mLxEStJ91n/TAQK2o0JHtOj5hGNXuoRUnzUDMn/51K2x65ylT813S + owner_id: *id005 + diaspora_handle: bob68c9902f@example.org +- :user: !map:ActiveSupport::HashWithIndifferentAccess + encrypted_password: $2a$10$oEY6Fsv8jHx.E.68XTCrveF0zPsXt0lhehhl1UcpwQXXau4vjy.R. serialized_private_key: *id002 pending_request_ids: [] last_sign_in_ip: invites: 5 - _id: *id009 + _id: &id006 !ruby/object:BSON::ObjectId + data: + - 76 + - 226 + - 19 + - 129 + - 35 + - 103 + - 188 + - 228 + - 45 + - 0 + - 1 + - 2 last_sign_in_at: - username: bob721dc5ae + username: bob699808b4 language: en sign_in_count: 0 visible_person_ids: [] - password_salt: $2a$10$mLxEStJ91n/TAQK2o0JHtO + password_salt: $2a$10$oEY6Fsv8jHx.E.68XTCrve remember_token: reset_password_token: current_sign_in_ip: remember_created_at: current_sign_in_at: invitation_sent_at: - email: bob737e94bd@pivotallabs.com + email: bob70eaa796@pivotallabs.com invitation_token: visible_post_ids: [] getting_started: true -- :person: !map:ActiveSupport::HashWithIndifferentAccess - created_at: 2010-11-15 05:41:27 Z + :person: !map:ActiveSupport::HashWithIndifferentAccess + created_at: 2010-11-16 05:15:45 Z profile: !map:ActiveSupport::HashWithIndifferentAccess searchable: true image_url: _id: !ruby/object:BSON::ObjectId data: - 76 - - 224 - - 200 - - 7 + - 226 + - 19 + - 129 - 35 - 103 - 188 - - 184 - - 81 + - 228 + - 45 - 0 - 1 - - 5 + - 3 gender: diaspora_handle: birthday: - last_name: Grimm746b8de8 + last_name: Grimm7031dc47 bio: - first_name: Robert747fd2d3 - updated_at: 2010-11-15 05:41:27 Z + first_name: Robert7077b495 + updated_at: 2010-11-16 05:15:45 Z _id: !ruby/object:BSON::ObjectId data: - 76 - - 224 - - 200 - - 7 + - 226 + - 19 + - 129 - 35 - 103 - 188 - - 184 - - 81 - - 0 - - 1 - - 6 - url: http://google-746c487f.com/ - serialized_public_key: | - -----BEGIN RSA PUBLIC KEY----- - MIGJAoGBALyeFYuLxcf026PvVbNIZgVK6YGQ6rTPzdmUpC+LTwi4Nbu5pnPK5f4Y - rqwy2DxgeVYEa+5j8/3ugMjPvq3RRJZLCqcZdNoCoduMJDWrg5xsNuidaArpW5Qk - EoePeAZjakz4c7gH3Iw3Kp0byh3SK4Mh2uHHr0WjrF56esQzGUtHAgMBAAE= - -----END RSA PUBLIC KEY----- - - owner_id: &id010 !ruby/object:BSON::ObjectId - data: - - 76 - - 224 - - 200 - - 7 - - 35 - - 103 - - 188 - - 184 - - 81 + - 228 + - 45 - 0 - 1 - 4 - diaspora_handle: bob73df386f@example.org - :user: !map:ActiveSupport::HashWithIndifferentAccess - encrypted_password: $2a$10$07OZA4E5oTdLOm66OG4NA.gJN.hW5oPGkNlDSBFTNeOCGJkBdhm0e + url: http://google-70c0a6ec.com/ + serialized_public_key: | + -----BEGIN RSA PUBLIC KEY----- + MIGJAoGBAOJd7dzi8rIuijVKiuG75b/wkv+8Ox3Fbwt68TmPzdphdW9Qswjomrlu + mxxtPHksoIQfTnqvkYiwAIGtauT5P+W+yWCDsB9I6QGthizlr3l1DxK+HyBcnARZ + 0JqvetT8n55fjh8lV5fFNI6iUh4ClY8wCRPfCJhDlpOA++FhGzJVAgMBAAE= + -----END RSA PUBLIC KEY----- + + owner_id: *id006 + diaspora_handle: bob699808b4@example.org +- :user: !map:ActiveSupport::HashWithIndifferentAccess + encrypted_password: $2a$10$/sAx4oq4US61NX/bb8w9UeRG72Wf8gczP4D1DGpRmbmHY.SewAsiu serialized_private_key: *id002 pending_request_ids: [] last_sign_in_ip: invites: 5 - _id: *id010 + _id: &id007 !ruby/object:BSON::ObjectId + data: + - 76 + - 226 + - 19 + - 129 + - 35 + - 103 + - 188 + - 228 + - 45 + - 0 + - 1 + - 5 last_sign_in_at: - username: bob73df386f + username: bob700b8621 language: en sign_in_count: 0 visible_person_ids: [] - password_salt: $2a$10$07OZA4E5oTdLOm66OG4NA. + password_salt: $2a$10$/sAx4oq4US61NX/bb8w9Ue remember_token: reset_password_token: current_sign_in_ip: remember_created_at: current_sign_in_at: invitation_sent_at: - email: bob7456fb90@pivotallabs.com + email: bob712e0bd0@pivotallabs.com invitation_token: visible_post_ids: [] getting_started: true -- :person: !map:ActiveSupport::HashWithIndifferentAccess - created_at: 2010-11-15 05:41:27 Z + :person: !map:ActiveSupport::HashWithIndifferentAccess + created_at: 2010-11-16 05:15:45 Z profile: !map:ActiveSupport::HashWithIndifferentAccess searchable: true image_url: _id: !ruby/object:BSON::ObjectId data: - 76 - - 224 - - 200 - - 7 + - 226 + - 19 + - 129 - 35 - 103 - 188 - - 184 - - 81 + - 228 + - 45 - 0 - 1 - - 8 + - 6 gender: diaspora_handle: birthday: - last_name: Grimm75cb676d + last_name: Grimm7112113f bio: - first_name: Robert755ea0ff - updated_at: 2010-11-15 05:41:27 Z + first_name: Robert71bffacf + updated_at: 2010-11-16 05:15:45 Z _id: !ruby/object:BSON::ObjectId data: - 76 - - 224 - - 200 - - 7 + - 226 + - 19 + - 129 - 35 - 103 - 188 - - 184 - - 81 + - 228 + - 45 - 0 - 1 - - 9 - url: http://google-752dbc95.com/ + - 7 + url: http://google-71737eda.com/ serialized_public_key: | -----BEGIN RSA PUBLIC KEY----- - MIGJAoGBALyeFYuLxcf026PvVbNIZgVK6YGQ6rTPzdmUpC+LTwi4Nbu5pnPK5f4Y - rqwy2DxgeVYEa+5j8/3ugMjPvq3RRJZLCqcZdNoCoduMJDWrg5xsNuidaArpW5Qk - EoePeAZjakz4c7gH3Iw3Kp0byh3SK4Mh2uHHr0WjrF56esQzGUtHAgMBAAE= + MIGJAoGBAOJd7dzi8rIuijVKiuG75b/wkv+8Ox3Fbwt68TmPzdphdW9Qswjomrlu + mxxtPHksoIQfTnqvkYiwAIGtauT5P+W+yWCDsB9I6QGthizlr3l1DxK+HyBcnARZ + 0JqvetT8n55fjh8lV5fFNI6iUh4ClY8wCRPfCJhDlpOA++FhGzJVAgMBAAE= -----END RSA PUBLIC KEY----- - owner_id: &id011 !ruby/object:BSON::ObjectId - data: - - 76 - - 224 - - 200 - - 7 - - 35 - - 103 - - 188 - - 184 - - 81 - - 0 - - 1 - - 7 - diaspora_handle: bob74969a13@example.org - :user: !map:ActiveSupport::HashWithIndifferentAccess - encrypted_password: $2a$10$wfKkOyqv4zvnmb2YF93vTOu7MBL9xZenGhJRr0wYYzngfMDO5pB5G + owner_id: *id007 + diaspora_handle: bob700b8621@example.org +- :user: !map:ActiveSupport::HashWithIndifferentAccess + encrypted_password: $2a$10$tBD.IvpYSZePtoUrGDBat.P4hiZCSddO21ybeHfr06mP0ZXuXoAm6 serialized_private_key: *id002 pending_request_ids: [] last_sign_in_ip: invites: 5 - _id: *id011 + _id: &id008 !ruby/object:BSON::ObjectId + data: + - 76 + - 226 + - 19 + - 129 + - 35 + - 103 + - 188 + - 228 + - 45 + - 0 + - 1 + - 8 last_sign_in_at: - username: bob74969a13 + username: bob713504e2 language: en sign_in_count: 0 visible_person_ids: [] - password_salt: $2a$10$wfKkOyqv4zvnmb2YF93vTO + password_salt: $2a$10$tBD.IvpYSZePtoUrGDBat. remember_token: reset_password_token: current_sign_in_ip: remember_created_at: current_sign_in_at: invitation_sent_at: - email: bob75cb5e31@pivotallabs.com + email: bob724b8456@pivotallabs.com invitation_token: visible_post_ids: [] getting_started: true + :person: !map:ActiveSupport::HashWithIndifferentAccess + created_at: 2010-11-16 05:15:45 Z + profile: !map:ActiveSupport::HashWithIndifferentAccess + searchable: true + image_url: + _id: !ruby/object:BSON::ObjectId + data: + - 76 + - 226 + - 19 + - 129 + - 35 + - 103 + - 188 + - 228 + - 45 + - 0 + - 1 + - 9 + gender: + diaspora_handle: + birthday: + last_name: Grimm72b805a8 + bio: + first_name: Robert7208f525 + updated_at: 2010-11-16 05:15:45 Z + _id: !ruby/object:BSON::ObjectId + data: + - 76 + - 226 + - 19 + - 129 + - 35 + - 103 + - 188 + - 228 + - 45 + - 0 + - 1 + - 10 + url: http://google-72408681.com/ + serialized_public_key: | + -----BEGIN RSA PUBLIC KEY----- + MIGJAoGBAOJd7dzi8rIuijVKiuG75b/wkv+8Ox3Fbwt68TmPzdphdW9Qswjomrlu + mxxtPHksoIQfTnqvkYiwAIGtauT5P+W+yWCDsB9I6QGthizlr3l1DxK+HyBcnARZ + 0JqvetT8n55fjh8lV5fFNI6iUh4ClY8wCRPfCJhDlpOA++FhGzJVAgMBAAE= + -----END RSA PUBLIC KEY----- + + owner_id: *id008 + diaspora_handle: bob713504e2@example.org +- :user: !map:ActiveSupport::HashWithIndifferentAccess + encrypted_password: $2a$10$wQlwAvMWNAupJeX2R1CVJeSoy5pFNFtJlmk/Dlrlv0DDCUtcQ46o. + serialized_private_key: *id002 + pending_request_ids: [] + + last_sign_in_ip: + invites: 5 + _id: &id009 !ruby/object:BSON::ObjectId + data: + - 76 + - 226 + - 19 + - 129 + - 35 + - 103 + - 188 + - 228 + - 45 + - 0 + - 1 + - 11 + last_sign_in_at: + username: bob7231bf9d + language: en + sign_in_count: 0 + visible_person_ids: [] + + password_salt: $2a$10$wQlwAvMWNAupJeX2R1CVJe + remember_token: + reset_password_token: + current_sign_in_ip: + remember_created_at: + current_sign_in_at: + invitation_sent_at: + email: bob73f03e09@pivotallabs.com + invitation_token: + visible_post_ids: [] + + getting_started: true + :person: !map:ActiveSupport::HashWithIndifferentAccess + created_at: 2010-11-16 05:15:45 Z + profile: !map:ActiveSupport::HashWithIndifferentAccess + searchable: true + image_url: + _id: !ruby/object:BSON::ObjectId + data: + - 76 + - 226 + - 19 + - 129 + - 35 + - 103 + - 188 + - 228 + - 45 + - 0 + - 1 + - 12 + gender: + diaspora_handle: + birthday: + last_name: Grimm73dc935a + bio: + first_name: Robert73e0fa13 + updated_at: 2010-11-16 05:15:45 Z + _id: !ruby/object:BSON::ObjectId + data: + - 76 + - 226 + - 19 + - 129 + - 35 + - 103 + - 188 + - 228 + - 45 + - 0 + - 1 + - 13 + url: http://google-735c77d0.com/ + serialized_public_key: | + -----BEGIN RSA PUBLIC KEY----- + MIGJAoGBAOJd7dzi8rIuijVKiuG75b/wkv+8Ox3Fbwt68TmPzdphdW9Qswjomrlu + mxxtPHksoIQfTnqvkYiwAIGtauT5P+W+yWCDsB9I6QGthizlr3l1DxK+HyBcnARZ + 0JqvetT8n55fjh8lV5fFNI6iUh4ClY8wCRPfCJhDlpOA++FhGzJVAgMBAAE= + -----END RSA PUBLIC KEY----- + + owner_id: *id009 + diaspora_handle: bob7231bf9d@example.org +- :user: !map:ActiveSupport::HashWithIndifferentAccess + encrypted_password: $2a$10$RsK0MX7BQ/wn57TRhN6B7eYakNmEEu/R.mpam2gosWm18vlP/kW.m + serialized_private_key: *id002 + pending_request_ids: [] + + last_sign_in_ip: + invites: 5 + _id: &id010 !ruby/object:BSON::ObjectId + data: + - 76 + - 226 + - 19 + - 129 + - 35 + - 103 + - 188 + - 228 + - 45 + - 0 + - 1 + - 14 + last_sign_in_at: + username: bob7331f4aa + language: en + sign_in_count: 0 + visible_person_ids: [] + + password_salt: $2a$10$RsK0MX7BQ/wn57TRhN6B7e + remember_token: + reset_password_token: + current_sign_in_ip: + remember_created_at: + current_sign_in_at: + invitation_sent_at: + email: bob742d57c1@pivotallabs.com + invitation_token: + visible_post_ids: [] + + getting_started: true + :person: !map:ActiveSupport::HashWithIndifferentAccess + created_at: 2010-11-16 05:15:45 Z + profile: !map:ActiveSupport::HashWithIndifferentAccess + searchable: true + image_url: + _id: !ruby/object:BSON::ObjectId + data: + - 76 + - 226 + - 19 + - 129 + - 35 + - 103 + - 188 + - 228 + - 45 + - 0 + - 1 + - 15 + gender: + diaspora_handle: + birthday: + last_name: Grimm749f55a0 + bio: + first_name: Robert74242b3e + updated_at: 2010-11-16 05:15:46 Z + _id: !ruby/object:BSON::ObjectId + data: + - 76 + - 226 + - 19 + - 129 + - 35 + - 103 + - 188 + - 228 + - 45 + - 0 + - 1 + - 16 + url: http://google-7458f489.com/ + serialized_public_key: | + -----BEGIN RSA PUBLIC KEY----- + MIGJAoGBAOJd7dzi8rIuijVKiuG75b/wkv+8Ox3Fbwt68TmPzdphdW9Qswjomrlu + mxxtPHksoIQfTnqvkYiwAIGtauT5P+W+yWCDsB9I6QGthizlr3l1DxK+HyBcnARZ + 0JqvetT8n55fjh8lV5fFNI6iUh4ClY8wCRPfCJhDlpOA++FhGzJVAgMBAAE= + -----END RSA PUBLIC KEY----- + + owner_id: *id010 + diaspora_handle: bob7331f4aa@example.org +- :user: !map:ActiveSupport::HashWithIndifferentAccess + encrypted_password: $2a$10$Q7y8zX6oy3k13CuQW.HiSOXamH1sjI3wxGoDrwVULqx3gC2JzGHnm + serialized_private_key: *id002 + pending_request_ids: [] + + last_sign_in_ip: + invites: 5 + _id: &id011 !ruby/object:BSON::ObjectId + data: + - 76 + - 226 + - 19 + - 130 + - 35 + - 103 + - 188 + - 228 + - 45 + - 0 + - 1 + - 17 + last_sign_in_at: + username: bob74d19148 + language: en + sign_in_count: 0 + visible_person_ids: [] + + password_salt: $2a$10$Q7y8zX6oy3k13CuQW.HiSO + remember_token: + reset_password_token: + current_sign_in_ip: + remember_created_at: + current_sign_in_at: + invitation_sent_at: + email: bob75f20c85@pivotallabs.com + invitation_token: + visible_post_ids: [] + + getting_started: true + :person: !map:ActiveSupport::HashWithIndifferentAccess + created_at: 2010-11-16 05:15:46 Z + profile: !map:ActiveSupport::HashWithIndifferentAccess + searchable: true + image_url: + _id: !ruby/object:BSON::ObjectId + data: + - 76 + - 226 + - 19 + - 130 + - 35 + - 103 + - 188 + - 228 + - 45 + - 0 + - 1 + - 18 + gender: + diaspora_handle: + birthday: + last_name: Grimm75d1d02e + bio: + first_name: Robert75f7c86e + updated_at: 2010-11-16 05:15:46 Z + _id: !ruby/object:BSON::ObjectId + data: + - 76 + - 226 + - 19 + - 130 + - 35 + - 103 + - 188 + - 228 + - 45 + - 0 + - 1 + - 19 + url: http://google-7584bb85.com/ + serialized_public_key: | + -----BEGIN RSA PUBLIC KEY----- + MIGJAoGBAOJd7dzi8rIuijVKiuG75b/wkv+8Ox3Fbwt68TmPzdphdW9Qswjomrlu + mxxtPHksoIQfTnqvkYiwAIGtauT5P+W+yWCDsB9I6QGthizlr3l1DxK+HyBcnARZ + 0JqvetT8n55fjh8lV5fFNI6iUh4ClY8wCRPfCJhDlpOA++FhGzJVAgMBAAE= + -----END RSA PUBLIC KEY----- + + owner_id: *id011 + diaspora_handle: bob74d19148@example.org diff --git a/spec/models/user/receive_spec.rb b/spec/models/user/receive_spec.rb index b02da36b9..2eef85e9d 100644 --- a/spec/models/user/receive_spec.rb +++ b/spec/models/user/receive_spec.rb @@ -100,6 +100,7 @@ describe User do it 'should be remove a post if the noone links to it' do person = user2.person user2.delete + person.reload lambda {user.disconnect(person)}.should change(Post, :count).by(-1) end From 686cea659537b0e7fd91dc6bffbd810ac95b6316 Mon Sep 17 00:00:00 2001 From: Sarah Mei Date: Mon, 15 Nov 2010 21:52:02 -0800 Subject: [PATCH 08/13] 1.9.2 doesn't like friending people when the target doesn't have any aspects. ::sigh:: And with that, I fix the cucumber feature that was failing under 1.9. --- Gemfile.lock | 2 +- features/manages_contact_requests.feature | 3 +- features/step_definitions/user_steps.rb | 7 +- spec/fixtures/users.yaml | 586 +++++++++++----------- 4 files changed, 299 insertions(+), 299 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 39a139ddd..16db626dc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -353,7 +353,7 @@ GEM eventmachine (>= 0.12.6) rack (>= 1.0.0) thor (0.14.4) - treetop (1.4.8) + treetop (1.4.9) polyglot (>= 0.3.1) twitter (0.9.12) hashie (~> 0.4.0) diff --git a/features/manages_contact_requests.feature b/features/manages_contact_requests.feature index df7ccef2f..f4157c373 100644 --- a/features/manages_contact_requests.feature +++ b/features/manages_contact_requests.feature @@ -2,6 +2,7 @@ Feature: managing contact requests Background: Given I am signed in + And I have an aspect called "Family" And I have one contact request Scenario: seeing contact requests @@ -10,8 +11,6 @@ Feature: managing contact requests @javascript @wip Scenario: accepting a contact request - Given I have an aspect called "Family" - When I am on the home page And I follow "Manage (1)" Then I should see 1 contact request diff --git a/features/step_definitions/user_steps.rb b/features/step_definitions/user_steps.rb index 10b8fb8b8..6b71ed61a 100644 --- a/features/step_definitions/user_steps.rb +++ b/features/step_definitions/user_steps.rb @@ -14,10 +14,11 @@ end Given /^I have one contact request$/ do other_user = make_user - other_user.aspects.create!(:name => "meh") + other_aspect = other_user.aspects.create!(:name => "meh") + other_user.send_contact_request_to(@me.person, other_aspect) + other_user.reload - - other_user.send_contact_request_to(@me.person, other_user.aspects.first) + other_aspect.reload @me.reload end diff --git a/spec/fixtures/users.yaml b/spec/fixtures/users.yaml index 70a11bc36..5bdb83af1 100644 --- a/spec/fixtures/users.yaml +++ b/spec/fixtures/users.yaml @@ -1,22 +1,22 @@ --- :users: - :user: !map:ActiveSupport::HashWithIndifferentAccess - encrypted_password: $2a$10$bhNYPzsgOcew.b55X1fwROLMmLS4kRgOv0M1wnMSKZ5jSUB8MMbBa + encrypted_password: $2a$10$B0qLxtgAlNmd7z.wpBfmIetcEhxPIr02.ZdS65zN3guDFD6zkNCci serialized_private_key: &id002 | -----BEGIN RSA PRIVATE KEY----- - MIICXAIBAAKBgQDiXe3c4vKyLoo1Sorhu+W/8JL/vDsdxW8LevE5j83aYXVvULMI - 6Jq5bpscbTx5LKCEH056r5GIsACBrWrk+T/lvslgg7AfSOkBrYYs5a95dQ8Svh8g - XJwEWdCar3rU/J+eX44fJVeXxTSOolIeApWPMAkT3wiYQ5aTgPvhYRsyVQIDAQAB - AoGAboMCzDKz349fA/NXaCruWE1fxqAjkD5CHy2vNLXi/rlTtruEHFZKqzq3WSJv - Qo0p9DbAfp7WAxBBvw1lwVF6AolrLRn2pUctgZplF+6r6zLWRZvZP8WJ0v4FvYKh - VTB8yimyWIzVsYz/izDbm48xPNBpYdGp09QkhKw1HW2xs4ECQQD6rFfnu0Hkfezt - E9tqdDQEOkMXNaYYKRAjmSJUkJT1A0L3Iay4RhJRK/Ait0QY3B3IJOEl3kjvCRv1 - G/ovsHchAkEA5y1cKkbaCHxTVI9kZ/1d2sGOexkrCF7yUyCZKlETXDVJqk1FqmVl - M+MLM0IxrBu/DYH5Eu0WoCtt2+u7Ww/4tQJAbnqOs58gR2gIh+R8i8pzMnnLH+uR - LIzMhCP1sXeXbvTlCq5YxU58vDG1QFetN5eruI4ofNwfINrO65RNC7+mgQJAHNVN - f4BixVgsVIml7kptoFEv4i6bbWnaM4AHWn3OOlvzGiiVHdGTs8sHpJcG9v5m79pc - JH4pqkSAaUOXlJ4DWQJBALEGoxLLXFgii/SNuO+KGG17XUpB3LAPJBYIiamQXFtK - euBSIlWL7QegDMGWf5Sf2nqG7dq0sJUJnO0cNeCb4uA= + MIICWwIBAAKBgQCgVvQNHt2PoNkydPT7FKmoiIgv5p+ze6B3gjVJ+8P4Nv4JbNzm + Z+8loFKrGDcHkOrIufrirxu3USQ+Zxj9NEousX8XxiupXCGouDd6DzYpeKmAL00H + mpj1ZwtIU00xKDdyeGrZkOSjkPclFVK2Bprj9WkOwF4ASTVCitXv7vI5cQIDAQAB + AoGADSrW4/Ty8Qaej5w3Oh9aR3Le7EAeQVkXtnjE84xvbYTmm9OK2IkUhJyD7XUR + n9dw0IclaVREDGvndBB3ZuPSa5300ftj3p62Hp6YTaYr3uWkyxxJRm1ykl80Zt/e + 5pG7/jWhq1uSyEe1R75Ol/l9WahEMVm5YZ7m4bobbmwZWKECQQDMpl5RAl3ldYJm + I1P/nR4tGtZkfkd2UoKXPn7NMCMvMpQ5gX70+rhlL1MfcSxtsV1jf5mtWX99ajeW + Kr4ED0FNAkEAyJJUauTk+pXTVOOGT9Wv/dlmrEB+j7oK19lvnHrtybYyXDfKbNEY + nuk80DFW+7D2dp3AIye7q1RJynhejoZGtQJAC7zzJfRbzGB8FT2rgLrTU0T5zRPN + J4U+BkzIWx6KthdRlybNUGHdF7iqLOCB6tzEfYOBHgdHH7tq6ssS0QrK9QJAfxf6 + ViHk1sTJvSjPmxcVBg4UeWIE0J5a8JvflZBvzTmef8D6jCmTKF8zIdmh/KsOAevE + LIKo8M/gUmQjxrxfYQJAG5R0P97db0ir18hFcZaVLLvAwmxZfpZHJhBbmWcJ4GFB + muUTxKzY3VVCKyGnO7f3HUOW7a0oZp4e3vHoIUCEwQ== -----END RSA PRIVATE KEY----- pending_request_ids: [] @@ -27,36 +27,36 @@ data: - 76 - 226 - - 19 - - 128 + - 27 + - 52 - 35 - 103 - 188 - - 228 - - 45 + - 240 + - 29 - 0 - 0 - - 246 + - 247 last_sign_in_at: - username: bob653e0d00 + username: bob6531af64 language: en sign_in_count: 0 visible_person_ids: [] - password_salt: $2a$10$bhNYPzsgOcew.b55X1fwRO + password_salt: $2a$10$B0qLxtgAlNmd7z.wpBfmIe remember_token: reset_password_token: current_sign_in_ip: remember_created_at: current_sign_in_at: invitation_sent_at: - email: bob6685303f@pivotallabs.com + email: bob66b89c2f@pivotallabs.com invitation_token: visible_post_ids: [] getting_started: true :person: !map:ActiveSupport::HashWithIndifferentAccess - created_at: 2010-11-16 05:15:44 Z + created_at: 2010-11-16 05:48:36 Z profile: !map:ActiveSupport::HashWithIndifferentAccess searchable: true image_url: @@ -64,49 +64,49 @@ data: - 76 - 226 - - 19 - - 128 + - 27 + - 52 - 35 - 103 - 188 - - 228 - - 45 + - 240 + - 29 - 0 - 0 - - 247 + - 248 gender: diaspora_handle: birthday: - last_name: Grimm663a77d7 + last_name: Grimm668078c1 bio: - first_name: Robert66802968 - updated_at: 2010-11-16 05:15:44 Z + first_name: Robert66c44515 + updated_at: 2010-11-16 05:48:36 Z _id: !ruby/object:BSON::ObjectId data: - 76 - 226 - - 19 - - 128 + - 27 + - 52 - 35 - 103 - 188 - - 228 - - 45 + - 240 + - 29 - 0 - 0 - - 248 - url: http://google-6648e74a.com/ + - 249 + url: http://google-66630fc7.com/ serialized_public_key: | -----BEGIN RSA PUBLIC KEY----- - MIGJAoGBAOJd7dzi8rIuijVKiuG75b/wkv+8Ox3Fbwt68TmPzdphdW9Qswjomrlu - mxxtPHksoIQfTnqvkYiwAIGtauT5P+W+yWCDsB9I6QGthizlr3l1DxK+HyBcnARZ - 0JqvetT8n55fjh8lV5fFNI6iUh4ClY8wCRPfCJhDlpOA++FhGzJVAgMBAAE= + MIGJAoGBAKBW9A0e3Y+g2TJ09PsUqaiIiC/mn7N7oHeCNUn7w/g2/gls3OZn7yWg + UqsYNweQ6si5+uKvG7dRJD5nGP00Si6xfxfGK6lcIai4N3oPNil4qYAvTQeamPVn + C0hTTTEoN3J4atmQ5KOQ9yUVUrYGmuP1aQ7AXgBJNUKK1e/u8jlxAgMBAAE= -----END RSA PUBLIC KEY----- owner_id: *id001 - diaspora_handle: bob653e0d00@example.org + diaspora_handle: bob6531af64@example.org - :user: !map:ActiveSupport::HashWithIndifferentAccess - encrypted_password: $2a$10$UeymWlCKWg2R8u/6BXjcHeVgKpjrwtlY.nNqhYb7ZleM73f0AemNe + encrypted_password: $2a$10$NbaWXB3GC39ag65zGdlJYeFYYlfEdpvgrAO/yMKWS7KUO2fy2laom serialized_private_key: *id002 pending_request_ids: [] @@ -116,36 +116,36 @@ data: - 76 - 226 - - 19 - - 128 + - 27 + - 52 - 35 - 103 - 188 - - 228 - - 45 + - 240 + - 29 - 0 - 0 - - 249 + - 250 last_sign_in_at: - username: bob66e8fd21 + username: bob66062336 language: en sign_in_count: 0 visible_person_ids: [] - password_salt: $2a$10$UeymWlCKWg2R8u/6BXjcHe + password_salt: $2a$10$NbaWXB3GC39ag65zGdlJYe remember_token: reset_password_token: current_sign_in_ip: remember_created_at: current_sign_in_at: invitation_sent_at: - email: bob678d2ea8@pivotallabs.com + email: bob67f2488b@pivotallabs.com invitation_token: visible_post_ids: [] getting_started: true :person: !map:ActiveSupport::HashWithIndifferentAccess - created_at: 2010-11-16 05:15:44 Z + created_at: 2010-11-16 05:48:37 Z profile: !map:ActiveSupport::HashWithIndifferentAccess searchable: true image_url: @@ -153,49 +153,49 @@ data: - 76 - 226 - - 19 - - 128 + - 27 + - 53 - 35 - 103 - 188 - - 228 - - 45 + - 240 + - 29 - 0 - 0 - - 250 + - 251 gender: diaspora_handle: birthday: - last_name: Grimm677f019f + last_name: Grimm671d9246 bio: - first_name: Robert6707c9cf - updated_at: 2010-11-16 05:15:44 Z + first_name: Robert67a09bcb + updated_at: 2010-11-16 05:48:37 Z _id: !ruby/object:BSON::ObjectId data: - 76 - 226 - - 19 - - 128 + - 27 + - 53 - 35 - 103 - 188 - - 228 - - 45 + - 240 + - 29 - 0 - 0 - - 251 - url: http://google-676c7937.com/ + - 252 + url: http://google-67c7227d.com/ serialized_public_key: | -----BEGIN RSA PUBLIC KEY----- - MIGJAoGBAOJd7dzi8rIuijVKiuG75b/wkv+8Ox3Fbwt68TmPzdphdW9Qswjomrlu - mxxtPHksoIQfTnqvkYiwAIGtauT5P+W+yWCDsB9I6QGthizlr3l1DxK+HyBcnARZ - 0JqvetT8n55fjh8lV5fFNI6iUh4ClY8wCRPfCJhDlpOA++FhGzJVAgMBAAE= + MIGJAoGBAKBW9A0e3Y+g2TJ09PsUqaiIiC/mn7N7oHeCNUn7w/g2/gls3OZn7yWg + UqsYNweQ6si5+uKvG7dRJD5nGP00Si6xfxfGK6lcIai4N3oPNil4qYAvTQeamPVn + C0hTTTEoN3J4atmQ5KOQ9yUVUrYGmuP1aQ7AXgBJNUKK1e/u8jlxAgMBAAE= -----END RSA PUBLIC KEY----- owner_id: *id003 - diaspora_handle: bob66e8fd21@example.org + diaspora_handle: bob66062336@example.org - :user: !map:ActiveSupport::HashWithIndifferentAccess - encrypted_password: $2a$10$YMicxE0PCxlgFNJEuk/V7.W7g1TqsOcIZzfxzGqzVYSgJeyQ47S8y + encrypted_password: $2a$10$VJJqWic8JDaChjxs6QrMie/X6qi65bfDbh9Cvh7wuEYNnCAefHoWK serialized_private_key: *id002 pending_request_ids: [] @@ -205,36 +205,36 @@ data: - 76 - 226 - - 19 - - 128 + - 27 + - 53 - 35 - 103 - 188 - - 228 - - 45 + - 240 + - 29 - 0 - 0 - - 252 + - 253 last_sign_in_at: - username: bob676dda01 + username: bob67cc7bd8 language: en sign_in_count: 0 visible_person_ids: [] - password_salt: $2a$10$YMicxE0PCxlgFNJEuk/V7. + password_salt: $2a$10$VJJqWic8JDaChjxs6QrMie remember_token: reset_password_token: current_sign_in_ip: remember_created_at: current_sign_in_at: invitation_sent_at: - email: bob68e5bd53@pivotallabs.com + email: bob6895d8c3@pivotallabs.com invitation_token: visible_post_ids: [] getting_started: true :person: !map:ActiveSupport::HashWithIndifferentAccess - created_at: 2010-11-16 05:15:45 Z + created_at: 2010-11-16 05:48:37 Z profile: !map:ActiveSupport::HashWithIndifferentAccess searchable: true image_url: @@ -242,49 +242,49 @@ data: - 76 - 226 - - 19 - - 129 + - 27 + - 53 - 35 - 103 - 188 - - 228 - - 45 + - 240 + - 29 - 0 - 0 - - 253 + - 254 gender: diaspora_handle: birthday: - last_name: Grimm687c58a4 + last_name: Grimm689efd3e bio: - first_name: Robert6815709a - updated_at: 2010-11-16 05:15:45 Z + first_name: Robert6875d184 + updated_at: 2010-11-16 05:48:37 Z _id: !ruby/object:BSON::ObjectId data: - 76 - 226 - - 19 - - 129 + - 27 + - 53 - 35 - 103 - 188 - - 228 - - 45 + - 240 + - 29 - 0 - 0 - - 254 - url: http://google-68073606.com/ + - 255 + url: http://google-68fe6fbd.com/ serialized_public_key: | -----BEGIN RSA PUBLIC KEY----- - MIGJAoGBAOJd7dzi8rIuijVKiuG75b/wkv+8Ox3Fbwt68TmPzdphdW9Qswjomrlu - mxxtPHksoIQfTnqvkYiwAIGtauT5P+W+yWCDsB9I6QGthizlr3l1DxK+HyBcnARZ - 0JqvetT8n55fjh8lV5fFNI6iUh4ClY8wCRPfCJhDlpOA++FhGzJVAgMBAAE= + MIGJAoGBAKBW9A0e3Y+g2TJ09PsUqaiIiC/mn7N7oHeCNUn7w/g2/gls3OZn7yWg + UqsYNweQ6si5+uKvG7dRJD5nGP00Si6xfxfGK6lcIai4N3oPNil4qYAvTQeamPVn + C0hTTTEoN3J4atmQ5KOQ9yUVUrYGmuP1aQ7AXgBJNUKK1e/u8jlxAgMBAAE= -----END RSA PUBLIC KEY----- owner_id: *id004 - diaspora_handle: bob676dda01@example.org + diaspora_handle: bob67cc7bd8@example.org - :user: !map:ActiveSupport::HashWithIndifferentAccess - encrypted_password: $2a$10$52UEDjOJ53CV0PJBS61X8.MErGDAnhLIUaKJ0aboo.IDoBfbMZUkm + encrypted_password: $2a$10$xHw0wzf6gqXr7u4BHAvqmeZ4EO7rvbfY2AC4txXgxCIBPRWTmcb9K serialized_private_key: *id002 pending_request_ids: [] @@ -294,36 +294,36 @@ data: - 76 - 226 - - 19 - - 129 + - 27 + - 53 - 35 - 103 - 188 - - 228 - - 45 + - 240 + - 29 - 0 + - 1 - 0 - - 255 last_sign_in_at: - username: bob68c9902f + username: bob6840745f language: en sign_in_count: 0 visible_person_ids: [] - password_salt: $2a$10$52UEDjOJ53CV0PJBS61X8. + password_salt: $2a$10$xHw0wzf6gqXr7u4BHAvqme remember_token: reset_password_token: current_sign_in_ip: remember_created_at: current_sign_in_at: invitation_sent_at: - email: bob69c80b3a@pivotallabs.com + email: bob69990f95@pivotallabs.com invitation_token: visible_post_ids: [] getting_started: true :person: !map:ActiveSupport::HashWithIndifferentAccess - created_at: 2010-11-16 05:15:45 Z + created_at: 2010-11-16 05:48:37 Z profile: !map:ActiveSupport::HashWithIndifferentAccess searchable: true image_url: @@ -331,49 +331,49 @@ data: - 76 - 226 - - 19 - - 129 + - 27 + - 53 - 35 - 103 - 188 - - 228 - - 45 + - 240 + - 29 - 0 - 1 - - 0 + - 1 gender: diaspora_handle: birthday: - last_name: Grimm69b38d63 + last_name: Grimm697be41b bio: - first_name: Robert69aafe84 - updated_at: 2010-11-16 05:15:45 Z + first_name: Robert69fbff42 + updated_at: 2010-11-16 05:48:37 Z _id: !ruby/object:BSON::ObjectId data: - 76 - 226 - - 19 - - 129 + - 27 + - 53 - 35 - 103 - 188 - - 228 - - 45 + - 240 + - 29 - 0 - 1 - - 1 - url: http://google-6923f678.com/ + - 2 + url: http://google-69b5b537.com/ serialized_public_key: | -----BEGIN RSA PUBLIC KEY----- - MIGJAoGBAOJd7dzi8rIuijVKiuG75b/wkv+8Ox3Fbwt68TmPzdphdW9Qswjomrlu - mxxtPHksoIQfTnqvkYiwAIGtauT5P+W+yWCDsB9I6QGthizlr3l1DxK+HyBcnARZ - 0JqvetT8n55fjh8lV5fFNI6iUh4ClY8wCRPfCJhDlpOA++FhGzJVAgMBAAE= + MIGJAoGBAKBW9A0e3Y+g2TJ09PsUqaiIiC/mn7N7oHeCNUn7w/g2/gls3OZn7yWg + UqsYNweQ6si5+uKvG7dRJD5nGP00Si6xfxfGK6lcIai4N3oPNil4qYAvTQeamPVn + C0hTTTEoN3J4atmQ5KOQ9yUVUrYGmuP1aQ7AXgBJNUKK1e/u8jlxAgMBAAE= -----END RSA PUBLIC KEY----- owner_id: *id005 - diaspora_handle: bob68c9902f@example.org + diaspora_handle: bob6840745f@example.org - :user: !map:ActiveSupport::HashWithIndifferentAccess - encrypted_password: $2a$10$oEY6Fsv8jHx.E.68XTCrveF0zPsXt0lhehhl1UcpwQXXau4vjy.R. + encrypted_password: $2a$10$aboTU2McWzsN4lfPuNf.s..Sc2JBYzQi.CBS8bVwN4Rcxbcl/LEVG serialized_private_key: *id002 pending_request_ids: [] @@ -383,36 +383,36 @@ data: - 76 - 226 - - 19 - - 129 + - 27 + - 53 - 35 - 103 - 188 - - 228 - - 45 + - 240 + - 29 - 0 - 1 - - 2 + - 3 last_sign_in_at: - username: bob699808b4 + username: bob69d45905 language: en sign_in_count: 0 visible_person_ids: [] - password_salt: $2a$10$oEY6Fsv8jHx.E.68XTCrve + password_salt: $2a$10$aboTU2McWzsN4lfPuNf.s. remember_token: reset_password_token: current_sign_in_ip: remember_created_at: current_sign_in_at: invitation_sent_at: - email: bob70eaa796@pivotallabs.com + email: bob70256d7a@pivotallabs.com invitation_token: visible_post_ids: [] getting_started: true :person: !map:ActiveSupport::HashWithIndifferentAccess - created_at: 2010-11-16 05:15:45 Z + created_at: 2010-11-16 05:48:37 Z profile: !map:ActiveSupport::HashWithIndifferentAccess searchable: true image_url: @@ -420,49 +420,49 @@ data: - 76 - 226 - - 19 - - 129 + - 27 + - 53 - 35 - 103 - 188 - - 228 - - 45 + - 240 + - 29 - 0 - 1 - - 3 + - 4 gender: diaspora_handle: birthday: - last_name: Grimm7031dc47 + last_name: Grimm70af0833 bio: - first_name: Robert7077b495 - updated_at: 2010-11-16 05:15:45 Z + first_name: Robert70b78dc3 + updated_at: 2010-11-16 05:48:37 Z _id: !ruby/object:BSON::ObjectId data: - 76 - 226 - - 19 - - 129 + - 27 + - 53 - 35 - 103 - 188 - - 228 - - 45 + - 240 + - 29 - 0 - 1 - - 4 - url: http://google-70c0a6ec.com/ + - 5 + url: http://google-70c7a24a.com/ serialized_public_key: | -----BEGIN RSA PUBLIC KEY----- - MIGJAoGBAOJd7dzi8rIuijVKiuG75b/wkv+8Ox3Fbwt68TmPzdphdW9Qswjomrlu - mxxtPHksoIQfTnqvkYiwAIGtauT5P+W+yWCDsB9I6QGthizlr3l1DxK+HyBcnARZ - 0JqvetT8n55fjh8lV5fFNI6iUh4ClY8wCRPfCJhDlpOA++FhGzJVAgMBAAE= + MIGJAoGBAKBW9A0e3Y+g2TJ09PsUqaiIiC/mn7N7oHeCNUn7w/g2/gls3OZn7yWg + UqsYNweQ6si5+uKvG7dRJD5nGP00Si6xfxfGK6lcIai4N3oPNil4qYAvTQeamPVn + C0hTTTEoN3J4atmQ5KOQ9yUVUrYGmuP1aQ7AXgBJNUKK1e/u8jlxAgMBAAE= -----END RSA PUBLIC KEY----- owner_id: *id006 - diaspora_handle: bob699808b4@example.org + diaspora_handle: bob69d45905@example.org - :user: !map:ActiveSupport::HashWithIndifferentAccess - encrypted_password: $2a$10$/sAx4oq4US61NX/bb8w9UeRG72Wf8gczP4D1DGpRmbmHY.SewAsiu + encrypted_password: $2a$10$Iw3.gNSjAxvz4EZLIenceufVGrmluj1Cawj3fuGSjwzalkZwWIUEq serialized_private_key: *id002 pending_request_ids: [] @@ -472,36 +472,36 @@ data: - 76 - 226 - - 19 - - 129 + - 27 + - 53 - 35 - 103 - 188 - - 228 - - 45 + - 240 + - 29 - 0 - 1 - - 5 + - 6 last_sign_in_at: - username: bob700b8621 + username: bob70454bde language: en sign_in_count: 0 visible_person_ids: [] - password_salt: $2a$10$/sAx4oq4US61NX/bb8w9Ue + password_salt: $2a$10$Iw3.gNSjAxvz4EZLIenceu remember_token: reset_password_token: current_sign_in_ip: remember_created_at: current_sign_in_at: invitation_sent_at: - email: bob712e0bd0@pivotallabs.com + email: bob716140b2@pivotallabs.com invitation_token: visible_post_ids: [] getting_started: true :person: !map:ActiveSupport::HashWithIndifferentAccess - created_at: 2010-11-16 05:15:45 Z + created_at: 2010-11-16 05:48:37 Z profile: !map:ActiveSupport::HashWithIndifferentAccess searchable: true image_url: @@ -509,49 +509,49 @@ data: - 76 - 226 - - 19 - - 129 + - 27 + - 53 - 35 - 103 - 188 - - 228 - - 45 + - 240 + - 29 - 0 - 1 - - 6 + - 7 gender: diaspora_handle: birthday: - last_name: Grimm7112113f + last_name: Grimm71f52863 bio: - first_name: Robert71bffacf - updated_at: 2010-11-16 05:15:45 Z + first_name: Robert7178c8c4 + updated_at: 2010-11-16 05:48:37 Z _id: !ruby/object:BSON::ObjectId data: - 76 - 226 - - 19 - - 129 + - 27 + - 53 - 35 - 103 - 188 - - 228 - - 45 + - 240 + - 29 - 0 - 1 - - 7 - url: http://google-71737eda.com/ + - 8 + url: http://google-71a1a295.com/ serialized_public_key: | -----BEGIN RSA PUBLIC KEY----- - MIGJAoGBAOJd7dzi8rIuijVKiuG75b/wkv+8Ox3Fbwt68TmPzdphdW9Qswjomrlu - mxxtPHksoIQfTnqvkYiwAIGtauT5P+W+yWCDsB9I6QGthizlr3l1DxK+HyBcnARZ - 0JqvetT8n55fjh8lV5fFNI6iUh4ClY8wCRPfCJhDlpOA++FhGzJVAgMBAAE= + MIGJAoGBAKBW9A0e3Y+g2TJ09PsUqaiIiC/mn7N7oHeCNUn7w/g2/gls3OZn7yWg + UqsYNweQ6si5+uKvG7dRJD5nGP00Si6xfxfGK6lcIai4N3oPNil4qYAvTQeamPVn + C0hTTTEoN3J4atmQ5KOQ9yUVUrYGmuP1aQ7AXgBJNUKK1e/u8jlxAgMBAAE= -----END RSA PUBLIC KEY----- owner_id: *id007 - diaspora_handle: bob700b8621@example.org + diaspora_handle: bob70454bde@example.org - :user: !map:ActiveSupport::HashWithIndifferentAccess - encrypted_password: $2a$10$tBD.IvpYSZePtoUrGDBat.P4hiZCSddO21ybeHfr06mP0ZXuXoAm6 + encrypted_password: $2a$10$iUYYRHwC8M1M2ftXmmqV3.QjB/qC3DK0Mu.neH51oxLDW.eznOxla serialized_private_key: *id002 pending_request_ids: [] @@ -561,36 +561,36 @@ data: - 76 - 226 - - 19 - - 129 + - 27 + - 53 - 35 - 103 - 188 - - 228 - - 45 + - 240 + - 29 - 0 - 1 - - 8 + - 9 last_sign_in_at: - username: bob713504e2 + username: bob71cec5e5 language: en sign_in_count: 0 visible_person_ids: [] - password_salt: $2a$10$tBD.IvpYSZePtoUrGDBat. + password_salt: $2a$10$iUYYRHwC8M1M2ftXmmqV3. remember_token: reset_password_token: current_sign_in_ip: remember_created_at: current_sign_in_at: invitation_sent_at: - email: bob724b8456@pivotallabs.com + email: bob72c78b26@pivotallabs.com invitation_token: visible_post_ids: [] getting_started: true :person: !map:ActiveSupport::HashWithIndifferentAccess - created_at: 2010-11-16 05:15:45 Z + created_at: 2010-11-16 05:48:37 Z profile: !map:ActiveSupport::HashWithIndifferentAccess searchable: true image_url: @@ -598,49 +598,49 @@ data: - 76 - 226 - - 19 - - 129 + - 27 + - 53 - 35 - 103 - 188 - - 228 - - 45 + - 240 + - 29 - 0 - 1 - - 9 + - 10 gender: diaspora_handle: birthday: - last_name: Grimm72b805a8 + last_name: Grimm720d9169 bio: - first_name: Robert7208f525 - updated_at: 2010-11-16 05:15:45 Z + first_name: Robert72e84b05 + updated_at: 2010-11-16 05:48:37 Z _id: !ruby/object:BSON::ObjectId data: - 76 - 226 - - 19 - - 129 + - 27 + - 53 - 35 - 103 - 188 - - 228 - - 45 + - 240 + - 29 - 0 - 1 - - 10 - url: http://google-72408681.com/ + - 11 + url: http://google-725651e7.com/ serialized_public_key: | -----BEGIN RSA PUBLIC KEY----- - MIGJAoGBAOJd7dzi8rIuijVKiuG75b/wkv+8Ox3Fbwt68TmPzdphdW9Qswjomrlu - mxxtPHksoIQfTnqvkYiwAIGtauT5P+W+yWCDsB9I6QGthizlr3l1DxK+HyBcnARZ - 0JqvetT8n55fjh8lV5fFNI6iUh4ClY8wCRPfCJhDlpOA++FhGzJVAgMBAAE= + MIGJAoGBAKBW9A0e3Y+g2TJ09PsUqaiIiC/mn7N7oHeCNUn7w/g2/gls3OZn7yWg + UqsYNweQ6si5+uKvG7dRJD5nGP00Si6xfxfGK6lcIai4N3oPNil4qYAvTQeamPVn + C0hTTTEoN3J4atmQ5KOQ9yUVUrYGmuP1aQ7AXgBJNUKK1e/u8jlxAgMBAAE= -----END RSA PUBLIC KEY----- owner_id: *id008 - diaspora_handle: bob713504e2@example.org + diaspora_handle: bob71cec5e5@example.org - :user: !map:ActiveSupport::HashWithIndifferentAccess - encrypted_password: $2a$10$wQlwAvMWNAupJeX2R1CVJeSoy5pFNFtJlmk/Dlrlv0DDCUtcQ46o. + encrypted_password: $2a$10$jOs.e9M1eMgt2tmi7pzOsuZBbA4egroTrOrV39V8w.OCrZmTy8S7C serialized_private_key: *id002 pending_request_ids: [] @@ -650,36 +650,36 @@ data: - 76 - 226 - - 19 - - 129 + - 27 + - 53 - 35 - 103 - 188 - - 228 - - 45 + - 240 + - 29 - 0 - 1 - - 11 + - 12 last_sign_in_at: - username: bob7231bf9d + username: bob720bd2d7 language: en sign_in_count: 0 visible_person_ids: [] - password_salt: $2a$10$wQlwAvMWNAupJeX2R1CVJe + password_salt: $2a$10$jOs.e9M1eMgt2tmi7pzOsu remember_token: reset_password_token: current_sign_in_ip: remember_created_at: current_sign_in_at: invitation_sent_at: - email: bob73f03e09@pivotallabs.com + email: bob73e98f23@pivotallabs.com invitation_token: visible_post_ids: [] getting_started: true :person: !map:ActiveSupport::HashWithIndifferentAccess - created_at: 2010-11-16 05:15:45 Z + created_at: 2010-11-16 05:48:37 Z profile: !map:ActiveSupport::HashWithIndifferentAccess searchable: true image_url: @@ -687,49 +687,49 @@ data: - 76 - 226 - - 19 - - 129 + - 27 + - 53 - 35 - 103 - 188 - - 228 - - 45 + - 240 + - 29 - 0 - 1 - - 12 + - 13 gender: diaspora_handle: birthday: - last_name: Grimm73dc935a + last_name: Grimm737ff256 bio: - first_name: Robert73e0fa13 - updated_at: 2010-11-16 05:15:45 Z + first_name: Robert73522ede + updated_at: 2010-11-16 05:48:37 Z _id: !ruby/object:BSON::ObjectId data: - 76 - 226 - - 19 - - 129 + - 27 + - 53 - 35 - 103 - 188 - - 228 - - 45 + - 240 + - 29 - 0 - 1 - - 13 - url: http://google-735c77d0.com/ + - 14 + url: http://google-73fa2dca.com/ serialized_public_key: | -----BEGIN RSA PUBLIC KEY----- - MIGJAoGBAOJd7dzi8rIuijVKiuG75b/wkv+8Ox3Fbwt68TmPzdphdW9Qswjomrlu - mxxtPHksoIQfTnqvkYiwAIGtauT5P+W+yWCDsB9I6QGthizlr3l1DxK+HyBcnARZ - 0JqvetT8n55fjh8lV5fFNI6iUh4ClY8wCRPfCJhDlpOA++FhGzJVAgMBAAE= + MIGJAoGBAKBW9A0e3Y+g2TJ09PsUqaiIiC/mn7N7oHeCNUn7w/g2/gls3OZn7yWg + UqsYNweQ6si5+uKvG7dRJD5nGP00Si6xfxfGK6lcIai4N3oPNil4qYAvTQeamPVn + C0hTTTEoN3J4atmQ5KOQ9yUVUrYGmuP1aQ7AXgBJNUKK1e/u8jlxAgMBAAE= -----END RSA PUBLIC KEY----- owner_id: *id009 - diaspora_handle: bob7231bf9d@example.org + diaspora_handle: bob720bd2d7@example.org - :user: !map:ActiveSupport::HashWithIndifferentAccess - encrypted_password: $2a$10$RsK0MX7BQ/wn57TRhN6B7eYakNmEEu/R.mpam2gosWm18vlP/kW.m + encrypted_password: $2a$10$SLp7SqBRHaw3eHfKDQ.uTOQTf0T4E8TzGwhvDu06UZT6xpW7uz3ku serialized_private_key: *id002 pending_request_ids: [] @@ -739,36 +739,36 @@ data: - 76 - 226 - - 19 - - 129 + - 27 + - 53 - 35 - 103 - 188 - - 228 - - 45 + - 240 + - 29 - 0 - 1 - - 14 + - 15 last_sign_in_at: - username: bob7331f4aa + username: bob735b2f3a language: en sign_in_count: 0 visible_person_ids: [] - password_salt: $2a$10$RsK0MX7BQ/wn57TRhN6B7e + password_salt: $2a$10$SLp7SqBRHaw3eHfKDQ.uTO remember_token: reset_password_token: current_sign_in_ip: remember_created_at: current_sign_in_at: invitation_sent_at: - email: bob742d57c1@pivotallabs.com + email: bob74c12dcc@pivotallabs.com invitation_token: visible_post_ids: [] getting_started: true :person: !map:ActiveSupport::HashWithIndifferentAccess - created_at: 2010-11-16 05:15:45 Z + created_at: 2010-11-16 05:48:37 Z profile: !map:ActiveSupport::HashWithIndifferentAccess searchable: true image_url: @@ -776,49 +776,49 @@ data: - 76 - 226 - - 19 - - 129 + - 27 + - 53 - 35 - 103 - 188 - - 228 - - 45 + - 240 + - 29 - 0 - 1 - - 15 + - 16 gender: diaspora_handle: birthday: - last_name: Grimm749f55a0 + last_name: Grimm74fcbc6f bio: - first_name: Robert74242b3e - updated_at: 2010-11-16 05:15:46 Z + first_name: Robert745bb282 + updated_at: 2010-11-16 05:48:37 Z _id: !ruby/object:BSON::ObjectId data: - 76 - 226 - - 19 - - 129 + - 27 + - 53 - 35 - 103 - 188 - - 228 - - 45 + - 240 + - 29 - 0 - 1 - - 16 - url: http://google-7458f489.com/ + - 17 + url: http://google-746a9b0c.com/ serialized_public_key: | -----BEGIN RSA PUBLIC KEY----- - MIGJAoGBAOJd7dzi8rIuijVKiuG75b/wkv+8Ox3Fbwt68TmPzdphdW9Qswjomrlu - mxxtPHksoIQfTnqvkYiwAIGtauT5P+W+yWCDsB9I6QGthizlr3l1DxK+HyBcnARZ - 0JqvetT8n55fjh8lV5fFNI6iUh4ClY8wCRPfCJhDlpOA++FhGzJVAgMBAAE= + MIGJAoGBAKBW9A0e3Y+g2TJ09PsUqaiIiC/mn7N7oHeCNUn7w/g2/gls3OZn7yWg + UqsYNweQ6si5+uKvG7dRJD5nGP00Si6xfxfGK6lcIai4N3oPNil4qYAvTQeamPVn + C0hTTTEoN3J4atmQ5KOQ9yUVUrYGmuP1aQ7AXgBJNUKK1e/u8jlxAgMBAAE= -----END RSA PUBLIC KEY----- owner_id: *id010 - diaspora_handle: bob7331f4aa@example.org + diaspora_handle: bob735b2f3a@example.org - :user: !map:ActiveSupport::HashWithIndifferentAccess - encrypted_password: $2a$10$Q7y8zX6oy3k13CuQW.HiSOXamH1sjI3wxGoDrwVULqx3gC2JzGHnm + encrypted_password: $2a$10$/zxM7Gd4MC8hXUXGd9CJoek1nCLT.BHWEJjIXRwaN1vuWQHGRCDru serialized_private_key: *id002 pending_request_ids: [] @@ -828,36 +828,36 @@ data: - 76 - 226 - - 19 - - 130 + - 27 + - 53 - 35 - 103 - 188 - - 228 - - 45 + - 240 + - 29 - 0 - 1 - - 17 + - 18 last_sign_in_at: - username: bob74d19148 + username: bob743c29a3 language: en sign_in_count: 0 visible_person_ids: [] - password_salt: $2a$10$Q7y8zX6oy3k13CuQW.HiSO + password_salt: $2a$10$/zxM7Gd4MC8hXUXGd9CJoe remember_token: reset_password_token: current_sign_in_ip: remember_created_at: current_sign_in_at: invitation_sent_at: - email: bob75f20c85@pivotallabs.com + email: bob752b56e9@pivotallabs.com invitation_token: visible_post_ids: [] getting_started: true :person: !map:ActiveSupport::HashWithIndifferentAccess - created_at: 2010-11-16 05:15:46 Z + created_at: 2010-11-16 05:48:38 Z profile: !map:ActiveSupport::HashWithIndifferentAccess searchable: true image_url: @@ -865,44 +865,44 @@ data: - 76 - 226 - - 19 - - 130 + - 27 + - 54 - 35 - 103 - 188 - - 228 - - 45 + - 240 + - 29 - 0 - 1 - - 18 + - 19 gender: diaspora_handle: birthday: - last_name: Grimm75d1d02e + last_name: Grimm75a9ea85 bio: - first_name: Robert75f7c86e - updated_at: 2010-11-16 05:15:46 Z + first_name: Robert75314372 + updated_at: 2010-11-16 05:48:38 Z _id: !ruby/object:BSON::ObjectId data: - 76 - 226 - - 19 - - 130 + - 27 + - 54 - 35 - 103 - 188 - - 228 - - 45 + - 240 + - 29 - 0 - 1 - - 19 - url: http://google-7584bb85.com/ + - 20 + url: http://google-751c673f.com/ serialized_public_key: | -----BEGIN RSA PUBLIC KEY----- - MIGJAoGBAOJd7dzi8rIuijVKiuG75b/wkv+8Ox3Fbwt68TmPzdphdW9Qswjomrlu - mxxtPHksoIQfTnqvkYiwAIGtauT5P+W+yWCDsB9I6QGthizlr3l1DxK+HyBcnARZ - 0JqvetT8n55fjh8lV5fFNI6iUh4ClY8wCRPfCJhDlpOA++FhGzJVAgMBAAE= + MIGJAoGBAKBW9A0e3Y+g2TJ09PsUqaiIiC/mn7N7oHeCNUn7w/g2/gls3OZn7yWg + UqsYNweQ6si5+uKvG7dRJD5nGP00Si6xfxfGK6lcIai4N3oPNil4qYAvTQeamPVn + C0hTTTEoN3J4atmQ5KOQ9yUVUrYGmuP1aQ7AXgBJNUKK1e/u8jlxAgMBAAE= -----END RSA PUBLIC KEY----- owner_id: *id011 - diaspora_handle: bob74d19148@example.org + diaspora_handle: bob743c29a3@example.org From 08073ff27e0fbfd4608e7b70c6e34e15ba77d7ff Mon Sep 17 00:00:00 2001 From: Sarah Mei Date: Mon, 15 Nov 2010 22:41:31 -0800 Subject: [PATCH 09/13] new point releases of haml and nokogiri --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 16db626dc..234b8c003 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -195,7 +195,7 @@ GEM gherkin (2.2.9) json (~> 1.4.6) term-ansicolor (~> 1.0.5) - haml (3.0.23) + haml (3.0.24) hashie (0.4.0) highline (1.6.1) http_connection (1.4.0) @@ -244,7 +244,7 @@ GEM net-ssh (2.0.23) net-ssh-gateway (1.0.1) net-ssh (>= 1.99.1) - nokogiri (1.4.3.1) + nokogiri (1.4.4) oa-basic (0.1.6) multi_json (~> 0.0.2) nokogiri (~> 1.4.2) From 2cf4350faba18d423c1ce1df005055f3c8779467 Mon Sep 17 00:00:00 2001 From: Sarah Mei Date: Mon, 15 Nov 2010 22:42:09 -0800 Subject: [PATCH 10/13] Clean up unused variable --- spec/helper_methods.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/helper_methods.rb b/spec/helper_methods.rb index 74b950d3f..60c9c4c92 100644 --- a/spec/helper_methods.rb +++ b/spec/helper_methods.rb @@ -27,7 +27,7 @@ module HelperMethods end def connect_users(user1, aspect1, user2, aspect2) - request = user1.send_contact_request_to(user2.person, aspect1) + user1.send_contact_request_to(user2.person, aspect1) user1.reload aspect1.reload From 44bd4534ce0212d8b947f4e079b4e0370b0316e3 Mon Sep 17 00:00:00 2001 From: Sarah Mei Date: Mon, 15 Nov 2010 22:44:55 -0800 Subject: [PATCH 11/13] I found where we needed the one-line addition. Ruby 1.9 build now works. I feel pretty badass. --- app/models/user.rb | 1 + spec/fixtures/users.yaml | 526 +++++++++++++++++++-------------------- 2 files changed, 264 insertions(+), 263 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index a0a6d6fa0..44be1e3cc 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -239,6 +239,7 @@ class User end def push_to_person(salmon, post, person) + person.reload # Sadly, we need this for Ruby 1.9. # person.owner will always return a ProxyObject. # calling nil? performs a necessary evaluation. unless person.owner.nil? diff --git a/spec/fixtures/users.yaml b/spec/fixtures/users.yaml index 5bdb83af1..45d9f0294 100644 --- a/spec/fixtures/users.yaml +++ b/spec/fixtures/users.yaml @@ -1,22 +1,22 @@ --- :users: - :user: !map:ActiveSupport::HashWithIndifferentAccess - encrypted_password: $2a$10$B0qLxtgAlNmd7z.wpBfmIetcEhxPIr02.ZdS65zN3guDFD6zkNCci + encrypted_password: $2a$10$t9c8prIPVgWLFCEfjpSkl.PkjHJw..tyrDWBRACdTNzGCsn0Yh/Cy serialized_private_key: &id002 | -----BEGIN RSA PRIVATE KEY----- - MIICWwIBAAKBgQCgVvQNHt2PoNkydPT7FKmoiIgv5p+ze6B3gjVJ+8P4Nv4JbNzm - Z+8loFKrGDcHkOrIufrirxu3USQ+Zxj9NEousX8XxiupXCGouDd6DzYpeKmAL00H - mpj1ZwtIU00xKDdyeGrZkOSjkPclFVK2Bprj9WkOwF4ASTVCitXv7vI5cQIDAQAB - AoGADSrW4/Ty8Qaej5w3Oh9aR3Le7EAeQVkXtnjE84xvbYTmm9OK2IkUhJyD7XUR - n9dw0IclaVREDGvndBB3ZuPSa5300ftj3p62Hp6YTaYr3uWkyxxJRm1ykl80Zt/e - 5pG7/jWhq1uSyEe1R75Ol/l9WahEMVm5YZ7m4bobbmwZWKECQQDMpl5RAl3ldYJm - I1P/nR4tGtZkfkd2UoKXPn7NMCMvMpQ5gX70+rhlL1MfcSxtsV1jf5mtWX99ajeW - Kr4ED0FNAkEAyJJUauTk+pXTVOOGT9Wv/dlmrEB+j7oK19lvnHrtybYyXDfKbNEY - nuk80DFW+7D2dp3AIye7q1RJynhejoZGtQJAC7zzJfRbzGB8FT2rgLrTU0T5zRPN - J4U+BkzIWx6KthdRlybNUGHdF7iqLOCB6tzEfYOBHgdHH7tq6ssS0QrK9QJAfxf6 - ViHk1sTJvSjPmxcVBg4UeWIE0J5a8JvflZBvzTmef8D6jCmTKF8zIdmh/KsOAevE - LIKo8M/gUmQjxrxfYQJAG5R0P97db0ir18hFcZaVLLvAwmxZfpZHJhBbmWcJ4GFB - muUTxKzY3VVCKyGnO7f3HUOW7a0oZp4e3vHoIUCEwQ== + MIICXQIBAAKBgQDDkWNWHlt9VZp8wH3LhUCGxJWvxmbmEAJ2dGTopSqan1+gCCDW + JXKZ5LcUcRFOyW+voWqPqsW6LvYy8MQ2V0cQX46/sKJapEdp79WUpK9Iy83OTJaU + ETeXqs7NwWI7FBqYBcWTeWRPr9Wkglo/duv2bd4kxtAjQObFp0Q6F/LwGwIDAQAB + AoGBAKYo5t+Kl20byFBqM/cxViuq5wsbZN3fiFggeIP5oQMSmeqcPVn1IzOB0dN6 + ZZwtJclxOdqq26hesiuByRPqf6L5hSrqgCysQ4JoKBiiGasmiQgKg4+ERNQRBJpW + PINkRl9f674s0MzmcbGUwhDQilhxbxZia+J2mEj9teUq3IpBAkEA94Ts+qzOStF9 + DcY3jkllfhl7MNMuz6XlKWX/2I+rhUmifBeNO1WwdgURJG0UNHmx1PXk5b9DIGyI + 4kGY+T2GqwJBAMpEx6aPxZPbkuIaiowJ0jMjlRXOgyG3P5hr7KdnpGZEXjtHB6pC + nxUKehZrAWj1jPkEKqZmbnuWiFNT2GzB/FECQQCfMBFNQvhF7Cc2RaYTT6cDi5XM + F/YCPBp/HoeGGxhf17S1hFwjrf+YV7fnqnOVMDMr2J1HGVQttT/v6+pbWbOTAkBg + BZbiM46QSsTIIeFz6ZWoQVQdLhSChQPj0BhgwIsDIaG6clXpNgdfbcHXsqTQtwFd + leTJagc5FJVTOZKcztqBAkBAt/ALKlMLjyV/wp2dBkUNW+QrseFmS9WM7QrMCgAE + q+bpDQWCIuIypFn9t/z0gK3VA+vpP/7vH6lz0Gai921N -----END RSA PRIVATE KEY----- pending_request_ids: [] @@ -27,36 +27,36 @@ data: - 76 - 226 - - 27 - - 52 + - 39 + - 146 - 35 - 103 - 188 - - 240 - - 29 + - 2 + - 77 - 0 - 0 - 247 last_sign_in_at: - username: bob6531af64 + username: bob65ba0a0f language: en sign_in_count: 0 visible_person_ids: [] - password_salt: $2a$10$B0qLxtgAlNmd7z.wpBfmIe + password_salt: $2a$10$t9c8prIPVgWLFCEfjpSkl. remember_token: reset_password_token: current_sign_in_ip: remember_created_at: current_sign_in_at: invitation_sent_at: - email: bob66b89c2f@pivotallabs.com + email: bob66d17e1f@pivotallabs.com invitation_token: visible_post_ids: [] getting_started: true :person: !map:ActiveSupport::HashWithIndifferentAccess - created_at: 2010-11-16 05:48:36 Z + created_at: 2010-11-16 06:41:22 Z profile: !map:ActiveSupport::HashWithIndifferentAccess searchable: true image_url: @@ -64,49 +64,49 @@ data: - 76 - 226 - - 27 - - 52 + - 39 + - 146 - 35 - 103 - 188 - - 240 - - 29 + - 2 + - 77 - 0 - 0 - 248 gender: diaspora_handle: birthday: - last_name: Grimm668078c1 + last_name: Grimm66823757 bio: - first_name: Robert66c44515 - updated_at: 2010-11-16 05:48:36 Z + first_name: Robert6661a188 + updated_at: 2010-11-16 06:41:22 Z _id: !ruby/object:BSON::ObjectId data: - 76 - 226 - - 27 - - 52 + - 39 + - 146 - 35 - 103 - 188 - - 240 - - 29 + - 2 + - 77 - 0 - 0 - 249 - url: http://google-66630fc7.com/ + url: http://google-66e43e1c.com/ serialized_public_key: | -----BEGIN RSA PUBLIC KEY----- - MIGJAoGBAKBW9A0e3Y+g2TJ09PsUqaiIiC/mn7N7oHeCNUn7w/g2/gls3OZn7yWg - UqsYNweQ6si5+uKvG7dRJD5nGP00Si6xfxfGK6lcIai4N3oPNil4qYAvTQeamPVn - C0hTTTEoN3J4atmQ5KOQ9yUVUrYGmuP1aQ7AXgBJNUKK1e/u8jlxAgMBAAE= + MIGJAoGBAMORY1YeW31VmnzAfcuFQIbEla/GZuYQAnZ0ZOilKpqfX6AIINYlcpnk + txRxEU7Jb6+hao+qxbou9jLwxDZXRxBfjr+wolqkR2nv1ZSkr0jLzc5MlpQRN5eq + zs3BYjsUGpgFxZN5ZE+v1aSCWj926/Zt3iTG0CNA5sWnRDoX8vAbAgMBAAE= -----END RSA PUBLIC KEY----- owner_id: *id001 - diaspora_handle: bob6531af64@example.org + diaspora_handle: bob65ba0a0f@example.org - :user: !map:ActiveSupport::HashWithIndifferentAccess - encrypted_password: $2a$10$NbaWXB3GC39ag65zGdlJYeFYYlfEdpvgrAO/yMKWS7KUO2fy2laom + encrypted_password: $2a$10$9MEqr/j2z5GLNSfg9Lh0eOPs9Fi9.qdQ65kPlzrE/yAnTib/6pgYu serialized_private_key: *id002 pending_request_ids: [] @@ -116,36 +116,36 @@ data: - 76 - 226 - - 27 - - 52 + - 39 + - 146 - 35 - 103 - 188 - - 240 - - 29 + - 2 + - 77 - 0 - 0 - 250 last_sign_in_at: - username: bob66062336 + username: bob664bf731 language: en sign_in_count: 0 visible_person_ids: [] - password_salt: $2a$10$NbaWXB3GC39ag65zGdlJYe + password_salt: $2a$10$9MEqr/j2z5GLNSfg9Lh0eO remember_token: reset_password_token: current_sign_in_ip: remember_created_at: current_sign_in_at: invitation_sent_at: - email: bob67f2488b@pivotallabs.com + email: bob67b75eb0@pivotallabs.com invitation_token: visible_post_ids: [] getting_started: true :person: !map:ActiveSupport::HashWithIndifferentAccess - created_at: 2010-11-16 05:48:37 Z + created_at: 2010-11-16 06:41:22 Z profile: !map:ActiveSupport::HashWithIndifferentAccess searchable: true image_url: @@ -153,49 +153,49 @@ data: - 76 - 226 - - 27 - - 53 + - 39 + - 146 - 35 - 103 - 188 - - 240 - - 29 + - 2 + - 77 - 0 - 0 - 251 gender: diaspora_handle: birthday: - last_name: Grimm671d9246 + last_name: Grimm67fe61ab bio: - first_name: Robert67a09bcb - updated_at: 2010-11-16 05:48:37 Z + first_name: Robert6768875d + updated_at: 2010-11-16 06:41:22 Z _id: !ruby/object:BSON::ObjectId data: - 76 - 226 - - 27 - - 53 + - 39 + - 146 - 35 - 103 - 188 - - 240 - - 29 + - 2 + - 77 - 0 - 0 - 252 - url: http://google-67c7227d.com/ + url: http://google-67c71b1c.com/ serialized_public_key: | -----BEGIN RSA PUBLIC KEY----- - MIGJAoGBAKBW9A0e3Y+g2TJ09PsUqaiIiC/mn7N7oHeCNUn7w/g2/gls3OZn7yWg - UqsYNweQ6si5+uKvG7dRJD5nGP00Si6xfxfGK6lcIai4N3oPNil4qYAvTQeamPVn - C0hTTTEoN3J4atmQ5KOQ9yUVUrYGmuP1aQ7AXgBJNUKK1e/u8jlxAgMBAAE= + MIGJAoGBAMORY1YeW31VmnzAfcuFQIbEla/GZuYQAnZ0ZOilKpqfX6AIINYlcpnk + txRxEU7Jb6+hao+qxbou9jLwxDZXRxBfjr+wolqkR2nv1ZSkr0jLzc5MlpQRN5eq + zs3BYjsUGpgFxZN5ZE+v1aSCWj926/Zt3iTG0CNA5sWnRDoX8vAbAgMBAAE= -----END RSA PUBLIC KEY----- owner_id: *id003 - diaspora_handle: bob66062336@example.org + diaspora_handle: bob664bf731@example.org - :user: !map:ActiveSupport::HashWithIndifferentAccess - encrypted_password: $2a$10$VJJqWic8JDaChjxs6QrMie/X6qi65bfDbh9Cvh7wuEYNnCAefHoWK + encrypted_password: $2a$10$EM9yQHKbk5CQjamC1mNLPuMvHuUM/a5CRKi0WO/GTFZ9tzg4.MKj2 serialized_private_key: *id002 pending_request_ids: [] @@ -205,36 +205,36 @@ data: - 76 - 226 - - 27 - - 53 + - 39 + - 146 - 35 - 103 - 188 - - 240 - - 29 + - 2 + - 77 - 0 - 0 - 253 last_sign_in_at: - username: bob67cc7bd8 + username: bob675fe58c language: en sign_in_count: 0 visible_person_ids: [] - password_salt: $2a$10$VJJqWic8JDaChjxs6QrMie + password_salt: $2a$10$EM9yQHKbk5CQjamC1mNLPu remember_token: reset_password_token: current_sign_in_ip: remember_created_at: current_sign_in_at: invitation_sent_at: - email: bob6895d8c3@pivotallabs.com + email: bob68129496@pivotallabs.com invitation_token: visible_post_ids: [] getting_started: true :person: !map:ActiveSupport::HashWithIndifferentAccess - created_at: 2010-11-16 05:48:37 Z + created_at: 2010-11-16 06:41:23 Z profile: !map:ActiveSupport::HashWithIndifferentAccess searchable: true image_url: @@ -242,49 +242,49 @@ data: - 76 - 226 - - 27 - - 53 + - 39 + - 147 - 35 - 103 - 188 - - 240 - - 29 + - 2 + - 77 - 0 - 0 - 254 gender: diaspora_handle: birthday: - last_name: Grimm689efd3e + last_name: Grimm6833357c bio: - first_name: Robert6875d184 - updated_at: 2010-11-16 05:48:37 Z + first_name: Robert6844f470 + updated_at: 2010-11-16 06:41:23 Z _id: !ruby/object:BSON::ObjectId data: - 76 - 226 - - 27 - - 53 + - 39 + - 147 - 35 - 103 - 188 - - 240 - - 29 + - 2 + - 77 - 0 - 0 - 255 - url: http://google-68fe6fbd.com/ + url: http://google-6805a0b4.com/ serialized_public_key: | -----BEGIN RSA PUBLIC KEY----- - MIGJAoGBAKBW9A0e3Y+g2TJ09PsUqaiIiC/mn7N7oHeCNUn7w/g2/gls3OZn7yWg - UqsYNweQ6si5+uKvG7dRJD5nGP00Si6xfxfGK6lcIai4N3oPNil4qYAvTQeamPVn - C0hTTTEoN3J4atmQ5KOQ9yUVUrYGmuP1aQ7AXgBJNUKK1e/u8jlxAgMBAAE= + MIGJAoGBAMORY1YeW31VmnzAfcuFQIbEla/GZuYQAnZ0ZOilKpqfX6AIINYlcpnk + txRxEU7Jb6+hao+qxbou9jLwxDZXRxBfjr+wolqkR2nv1ZSkr0jLzc5MlpQRN5eq + zs3BYjsUGpgFxZN5ZE+v1aSCWj926/Zt3iTG0CNA5sWnRDoX8vAbAgMBAAE= -----END RSA PUBLIC KEY----- owner_id: *id004 - diaspora_handle: bob67cc7bd8@example.org + diaspora_handle: bob675fe58c@example.org - :user: !map:ActiveSupport::HashWithIndifferentAccess - encrypted_password: $2a$10$xHw0wzf6gqXr7u4BHAvqmeZ4EO7rvbfY2AC4txXgxCIBPRWTmcb9K + encrypted_password: $2a$10$M9uOZAkFoR7Jveck7ANtb.cdXpBBTLwrKAVrxW6uihXNVITjuz566 serialized_private_key: *id002 pending_request_ids: [] @@ -294,36 +294,36 @@ data: - 76 - 226 - - 27 - - 53 + - 39 + - 147 - 35 - 103 - 188 - - 240 - - 29 + - 2 + - 77 - 0 - 1 - 0 last_sign_in_at: - username: bob6840745f + username: bob6817ab67 language: en sign_in_count: 0 visible_person_ids: [] - password_salt: $2a$10$xHw0wzf6gqXr7u4BHAvqme + password_salt: $2a$10$M9uOZAkFoR7Jveck7ANtb. remember_token: reset_password_token: current_sign_in_ip: remember_created_at: current_sign_in_at: invitation_sent_at: - email: bob69990f95@pivotallabs.com + email: bob69e4cca3@pivotallabs.com invitation_token: visible_post_ids: [] getting_started: true :person: !map:ActiveSupport::HashWithIndifferentAccess - created_at: 2010-11-16 05:48:37 Z + created_at: 2010-11-16 06:41:23 Z profile: !map:ActiveSupport::HashWithIndifferentAccess searchable: true image_url: @@ -331,49 +331,49 @@ data: - 76 - 226 - - 27 - - 53 + - 39 + - 147 - 35 - 103 - 188 - - 240 - - 29 + - 2 + - 77 - 0 - 1 - 1 gender: diaspora_handle: birthday: - last_name: Grimm697be41b + last_name: Grimm69e9a248 bio: - first_name: Robert69fbff42 - updated_at: 2010-11-16 05:48:37 Z + first_name: Robert69d41918 + updated_at: 2010-11-16 06:41:23 Z _id: !ruby/object:BSON::ObjectId data: - 76 - 226 - - 27 - - 53 + - 39 + - 147 - 35 - 103 - 188 - - 240 - - 29 + - 2 + - 77 - 0 - 1 - 2 - url: http://google-69b5b537.com/ + url: http://google-69ad5f42.com/ serialized_public_key: | -----BEGIN RSA PUBLIC KEY----- - MIGJAoGBAKBW9A0e3Y+g2TJ09PsUqaiIiC/mn7N7oHeCNUn7w/g2/gls3OZn7yWg - UqsYNweQ6si5+uKvG7dRJD5nGP00Si6xfxfGK6lcIai4N3oPNil4qYAvTQeamPVn - C0hTTTEoN3J4atmQ5KOQ9yUVUrYGmuP1aQ7AXgBJNUKK1e/u8jlxAgMBAAE= + MIGJAoGBAMORY1YeW31VmnzAfcuFQIbEla/GZuYQAnZ0ZOilKpqfX6AIINYlcpnk + txRxEU7Jb6+hao+qxbou9jLwxDZXRxBfjr+wolqkR2nv1ZSkr0jLzc5MlpQRN5eq + zs3BYjsUGpgFxZN5ZE+v1aSCWj926/Zt3iTG0CNA5sWnRDoX8vAbAgMBAAE= -----END RSA PUBLIC KEY----- owner_id: *id005 - diaspora_handle: bob6840745f@example.org + diaspora_handle: bob6817ab67@example.org - :user: !map:ActiveSupport::HashWithIndifferentAccess - encrypted_password: $2a$10$aboTU2McWzsN4lfPuNf.s..Sc2JBYzQi.CBS8bVwN4Rcxbcl/LEVG + encrypted_password: $2a$10$AAP80uGF0kvx99PBaUtHheN4moo0NKxd5XpE7TstrAucSc6huR7gq serialized_private_key: *id002 pending_request_ids: [] @@ -383,36 +383,36 @@ data: - 76 - 226 - - 27 - - 53 + - 39 + - 147 - 35 - 103 - 188 - - 240 - - 29 + - 2 + - 77 - 0 - 1 - 3 last_sign_in_at: - username: bob69d45905 + username: bob69cc6176 language: en sign_in_count: 0 visible_person_ids: [] - password_salt: $2a$10$aboTU2McWzsN4lfPuNf.s. + password_salt: $2a$10$AAP80uGF0kvx99PBaUtHhe remember_token: reset_password_token: current_sign_in_ip: remember_created_at: current_sign_in_at: invitation_sent_at: - email: bob70256d7a@pivotallabs.com + email: bob70494e36@pivotallabs.com invitation_token: visible_post_ids: [] getting_started: true :person: !map:ActiveSupport::HashWithIndifferentAccess - created_at: 2010-11-16 05:48:37 Z + created_at: 2010-11-16 06:41:23 Z profile: !map:ActiveSupport::HashWithIndifferentAccess searchable: true image_url: @@ -420,49 +420,49 @@ data: - 76 - 226 - - 27 - - 53 + - 39 + - 147 - 35 - 103 - 188 - - 240 - - 29 + - 2 + - 77 - 0 - 1 - 4 gender: diaspora_handle: birthday: - last_name: Grimm70af0833 + last_name: Grimm70846a3c bio: - first_name: Robert70b78dc3 - updated_at: 2010-11-16 05:48:37 Z + first_name: Robert70b16097 + updated_at: 2010-11-16 06:41:23 Z _id: !ruby/object:BSON::ObjectId data: - 76 - 226 - - 27 - - 53 + - 39 + - 147 - 35 - 103 - 188 - - 240 - - 29 + - 2 + - 77 - 0 - 1 - 5 - url: http://google-70c7a24a.com/ + url: http://google-702d3ff4.com/ serialized_public_key: | -----BEGIN RSA PUBLIC KEY----- - MIGJAoGBAKBW9A0e3Y+g2TJ09PsUqaiIiC/mn7N7oHeCNUn7w/g2/gls3OZn7yWg - UqsYNweQ6si5+uKvG7dRJD5nGP00Si6xfxfGK6lcIai4N3oPNil4qYAvTQeamPVn - C0hTTTEoN3J4atmQ5KOQ9yUVUrYGmuP1aQ7AXgBJNUKK1e/u8jlxAgMBAAE= + MIGJAoGBAMORY1YeW31VmnzAfcuFQIbEla/GZuYQAnZ0ZOilKpqfX6AIINYlcpnk + txRxEU7Jb6+hao+qxbou9jLwxDZXRxBfjr+wolqkR2nv1ZSkr0jLzc5MlpQRN5eq + zs3BYjsUGpgFxZN5ZE+v1aSCWj926/Zt3iTG0CNA5sWnRDoX8vAbAgMBAAE= -----END RSA PUBLIC KEY----- owner_id: *id006 - diaspora_handle: bob69d45905@example.org + diaspora_handle: bob69cc6176@example.org - :user: !map:ActiveSupport::HashWithIndifferentAccess - encrypted_password: $2a$10$Iw3.gNSjAxvz4EZLIenceufVGrmluj1Cawj3fuGSjwzalkZwWIUEq + encrypted_password: $2a$10$IsaVWabsS2/4FtABG9mEqOywauuP4J7X1LKlnyvoc7v/lK.MVztyW serialized_private_key: *id002 pending_request_ids: [] @@ -472,36 +472,36 @@ data: - 76 - 226 - - 27 - - 53 + - 39 + - 147 - 35 - 103 - 188 - - 240 - - 29 + - 2 + - 77 - 0 - 1 - 6 last_sign_in_at: - username: bob70454bde + username: bob701d7610 language: en sign_in_count: 0 visible_person_ids: [] - password_salt: $2a$10$Iw3.gNSjAxvz4EZLIenceu + password_salt: $2a$10$IsaVWabsS2/4FtABG9mEqO remember_token: reset_password_token: current_sign_in_ip: remember_created_at: current_sign_in_at: invitation_sent_at: - email: bob716140b2@pivotallabs.com + email: bob71139cd8@pivotallabs.com invitation_token: visible_post_ids: [] getting_started: true :person: !map:ActiveSupport::HashWithIndifferentAccess - created_at: 2010-11-16 05:48:37 Z + created_at: 2010-11-16 06:41:23 Z profile: !map:ActiveSupport::HashWithIndifferentAccess searchable: true image_url: @@ -509,49 +509,49 @@ data: - 76 - 226 - - 27 - - 53 + - 39 + - 147 - 35 - 103 - 188 - - 240 - - 29 + - 2 + - 77 - 0 - 1 - 7 gender: diaspora_handle: birthday: - last_name: Grimm71f52863 + last_name: Grimm71880db2 bio: - first_name: Robert7178c8c4 - updated_at: 2010-11-16 05:48:37 Z + first_name: Robert71a60bd8 + updated_at: 2010-11-16 06:41:23 Z _id: !ruby/object:BSON::ObjectId data: - 76 - 226 - - 27 - - 53 + - 39 + - 147 - 35 - 103 - 188 - - 240 - - 29 + - 2 + - 77 - 0 - 1 - 8 - url: http://google-71a1a295.com/ + url: http://google-714d3345.com/ serialized_public_key: | -----BEGIN RSA PUBLIC KEY----- - MIGJAoGBAKBW9A0e3Y+g2TJ09PsUqaiIiC/mn7N7oHeCNUn7w/g2/gls3OZn7yWg - UqsYNweQ6si5+uKvG7dRJD5nGP00Si6xfxfGK6lcIai4N3oPNil4qYAvTQeamPVn - C0hTTTEoN3J4atmQ5KOQ9yUVUrYGmuP1aQ7AXgBJNUKK1e/u8jlxAgMBAAE= + MIGJAoGBAMORY1YeW31VmnzAfcuFQIbEla/GZuYQAnZ0ZOilKpqfX6AIINYlcpnk + txRxEU7Jb6+hao+qxbou9jLwxDZXRxBfjr+wolqkR2nv1ZSkr0jLzc5MlpQRN5eq + zs3BYjsUGpgFxZN5ZE+v1aSCWj926/Zt3iTG0CNA5sWnRDoX8vAbAgMBAAE= -----END RSA PUBLIC KEY----- owner_id: *id007 - diaspora_handle: bob70454bde@example.org + diaspora_handle: bob701d7610@example.org - :user: !map:ActiveSupport::HashWithIndifferentAccess - encrypted_password: $2a$10$iUYYRHwC8M1M2ftXmmqV3.QjB/qC3DK0Mu.neH51oxLDW.eznOxla + encrypted_password: $2a$10$CzfJH2e2saVBN5wAl6jA0OGGv4ADC.QePPe95ea5Y17QKfzcCwlEu serialized_private_key: *id002 pending_request_ids: [] @@ -561,36 +561,36 @@ data: - 76 - 226 - - 27 - - 53 + - 39 + - 147 - 35 - 103 - 188 - - 240 - - 29 + - 2 + - 77 - 0 - 1 - 9 last_sign_in_at: - username: bob71cec5e5 + username: bob7113ba50 language: en sign_in_count: 0 visible_person_ids: [] - password_salt: $2a$10$iUYYRHwC8M1M2ftXmmqV3. + password_salt: $2a$10$CzfJH2e2saVBN5wAl6jA0O remember_token: reset_password_token: current_sign_in_ip: remember_created_at: current_sign_in_at: invitation_sent_at: - email: bob72c78b26@pivotallabs.com + email: bob72bae398@pivotallabs.com invitation_token: visible_post_ids: [] getting_started: true :person: !map:ActiveSupport::HashWithIndifferentAccess - created_at: 2010-11-16 05:48:37 Z + created_at: 2010-11-16 06:41:23 Z profile: !map:ActiveSupport::HashWithIndifferentAccess searchable: true image_url: @@ -598,49 +598,49 @@ data: - 76 - 226 - - 27 - - 53 + - 39 + - 147 - 35 - 103 - 188 - - 240 - - 29 + - 2 + - 77 - 0 - 1 - 10 gender: diaspora_handle: birthday: - last_name: Grimm720d9169 + last_name: Grimm72f28f7b bio: - first_name: Robert72e84b05 - updated_at: 2010-11-16 05:48:37 Z + first_name: Robert72bde61e + updated_at: 2010-11-16 06:41:23 Z _id: !ruby/object:BSON::ObjectId data: - 76 - 226 - - 27 - - 53 + - 39 + - 147 - 35 - 103 - 188 - - 240 - - 29 + - 2 + - 77 - 0 - 1 - 11 - url: http://google-725651e7.com/ + url: http://google-7210e5ac.com/ serialized_public_key: | -----BEGIN RSA PUBLIC KEY----- - MIGJAoGBAKBW9A0e3Y+g2TJ09PsUqaiIiC/mn7N7oHeCNUn7w/g2/gls3OZn7yWg - UqsYNweQ6si5+uKvG7dRJD5nGP00Si6xfxfGK6lcIai4N3oPNil4qYAvTQeamPVn - C0hTTTEoN3J4atmQ5KOQ9yUVUrYGmuP1aQ7AXgBJNUKK1e/u8jlxAgMBAAE= + MIGJAoGBAMORY1YeW31VmnzAfcuFQIbEla/GZuYQAnZ0ZOilKpqfX6AIINYlcpnk + txRxEU7Jb6+hao+qxbou9jLwxDZXRxBfjr+wolqkR2nv1ZSkr0jLzc5MlpQRN5eq + zs3BYjsUGpgFxZN5ZE+v1aSCWj926/Zt3iTG0CNA5sWnRDoX8vAbAgMBAAE= -----END RSA PUBLIC KEY----- owner_id: *id008 - diaspora_handle: bob71cec5e5@example.org + diaspora_handle: bob7113ba50@example.org - :user: !map:ActiveSupport::HashWithIndifferentAccess - encrypted_password: $2a$10$jOs.e9M1eMgt2tmi7pzOsuZBbA4egroTrOrV39V8w.OCrZmTy8S7C + encrypted_password: $2a$10$D6YlUNQcRnbHg62qvx4CxefviCIh5b41X8gYKf6W8pq86K8rP/ViC serialized_private_key: *id002 pending_request_ids: [] @@ -650,36 +650,36 @@ data: - 76 - 226 - - 27 - - 53 + - 39 + - 147 - 35 - 103 - 188 - - 240 - - 29 + - 2 + - 77 - 0 - 1 - 12 last_sign_in_at: - username: bob720bd2d7 + username: bob72548563 language: en sign_in_count: 0 visible_person_ids: [] - password_salt: $2a$10$jOs.e9M1eMgt2tmi7pzOsu + password_salt: $2a$10$D6YlUNQcRnbHg62qvx4Cxe remember_token: reset_password_token: current_sign_in_ip: remember_created_at: current_sign_in_at: invitation_sent_at: - email: bob73e98f23@pivotallabs.com + email: bob734a58b5@pivotallabs.com invitation_token: visible_post_ids: [] getting_started: true :person: !map:ActiveSupport::HashWithIndifferentAccess - created_at: 2010-11-16 05:48:37 Z + created_at: 2010-11-16 06:41:23 Z profile: !map:ActiveSupport::HashWithIndifferentAccess searchable: true image_url: @@ -687,49 +687,49 @@ data: - 76 - 226 - - 27 - - 53 + - 39 + - 147 - 35 - 103 - 188 - - 240 - - 29 + - 2 + - 77 - 0 - 1 - 13 gender: diaspora_handle: birthday: - last_name: Grimm737ff256 + last_name: Grimm737fc0c5 bio: - first_name: Robert73522ede - updated_at: 2010-11-16 05:48:37 Z + first_name: Robert7347ed2f + updated_at: 2010-11-16 06:41:23 Z _id: !ruby/object:BSON::ObjectId data: - 76 - 226 - - 27 - - 53 + - 39 + - 147 - 35 - 103 - 188 - - 240 - - 29 + - 2 + - 77 - 0 - 1 - 14 - url: http://google-73fa2dca.com/ + url: http://google-73d73d16.com/ serialized_public_key: | -----BEGIN RSA PUBLIC KEY----- - MIGJAoGBAKBW9A0e3Y+g2TJ09PsUqaiIiC/mn7N7oHeCNUn7w/g2/gls3OZn7yWg - UqsYNweQ6si5+uKvG7dRJD5nGP00Si6xfxfGK6lcIai4N3oPNil4qYAvTQeamPVn - C0hTTTEoN3J4atmQ5KOQ9yUVUrYGmuP1aQ7AXgBJNUKK1e/u8jlxAgMBAAE= + MIGJAoGBAMORY1YeW31VmnzAfcuFQIbEla/GZuYQAnZ0ZOilKpqfX6AIINYlcpnk + txRxEU7Jb6+hao+qxbou9jLwxDZXRxBfjr+wolqkR2nv1ZSkr0jLzc5MlpQRN5eq + zs3BYjsUGpgFxZN5ZE+v1aSCWj926/Zt3iTG0CNA5sWnRDoX8vAbAgMBAAE= -----END RSA PUBLIC KEY----- owner_id: *id009 - diaspora_handle: bob720bd2d7@example.org + diaspora_handle: bob72548563@example.org - :user: !map:ActiveSupport::HashWithIndifferentAccess - encrypted_password: $2a$10$SLp7SqBRHaw3eHfKDQ.uTOQTf0T4E8TzGwhvDu06UZT6xpW7uz3ku + encrypted_password: $2a$10$VIFBMncLU/Lb9ksLIDbA9eCmix8A6X4h0vrD5xWKqSqJC8E79S38C serialized_private_key: *id002 pending_request_ids: [] @@ -739,36 +739,36 @@ data: - 76 - 226 - - 27 - - 53 + - 39 + - 147 - 35 - 103 - 188 - - 240 - - 29 + - 2 + - 77 - 0 - 1 - 15 last_sign_in_at: - username: bob735b2f3a + username: bob731c2e5c language: en sign_in_count: 0 visible_person_ids: [] - password_salt: $2a$10$SLp7SqBRHaw3eHfKDQ.uTO + password_salt: $2a$10$VIFBMncLU/Lb9ksLIDbA9e remember_token: reset_password_token: current_sign_in_ip: remember_created_at: current_sign_in_at: invitation_sent_at: - email: bob74c12dcc@pivotallabs.com + email: bob7429561a@pivotallabs.com invitation_token: visible_post_ids: [] getting_started: true :person: !map:ActiveSupport::HashWithIndifferentAccess - created_at: 2010-11-16 05:48:37 Z + created_at: 2010-11-16 06:41:23 Z profile: !map:ActiveSupport::HashWithIndifferentAccess searchable: true image_url: @@ -776,49 +776,49 @@ data: - 76 - 226 - - 27 - - 53 + - 39 + - 147 - 35 - 103 - 188 - - 240 - - 29 + - 2 + - 77 - 0 - 1 - 16 gender: diaspora_handle: birthday: - last_name: Grimm74fcbc6f + last_name: Grimm74c46e04 bio: - first_name: Robert745bb282 - updated_at: 2010-11-16 05:48:37 Z + first_name: Robert74bcc7db + updated_at: 2010-11-16 06:41:23 Z _id: !ruby/object:BSON::ObjectId data: - 76 - 226 - - 27 - - 53 + - 39 + - 147 - 35 - 103 - 188 - - 240 - - 29 + - 2 + - 77 - 0 - 1 - 17 - url: http://google-746a9b0c.com/ + url: http://google-748c88f6.com/ serialized_public_key: | -----BEGIN RSA PUBLIC KEY----- - MIGJAoGBAKBW9A0e3Y+g2TJ09PsUqaiIiC/mn7N7oHeCNUn7w/g2/gls3OZn7yWg - UqsYNweQ6si5+uKvG7dRJD5nGP00Si6xfxfGK6lcIai4N3oPNil4qYAvTQeamPVn - C0hTTTEoN3J4atmQ5KOQ9yUVUrYGmuP1aQ7AXgBJNUKK1e/u8jlxAgMBAAE= + MIGJAoGBAMORY1YeW31VmnzAfcuFQIbEla/GZuYQAnZ0ZOilKpqfX6AIINYlcpnk + txRxEU7Jb6+hao+qxbou9jLwxDZXRxBfjr+wolqkR2nv1ZSkr0jLzc5MlpQRN5eq + zs3BYjsUGpgFxZN5ZE+v1aSCWj926/Zt3iTG0CNA5sWnRDoX8vAbAgMBAAE= -----END RSA PUBLIC KEY----- owner_id: *id010 - diaspora_handle: bob735b2f3a@example.org + diaspora_handle: bob731c2e5c@example.org - :user: !map:ActiveSupport::HashWithIndifferentAccess - encrypted_password: $2a$10$/zxM7Gd4MC8hXUXGd9CJoek1nCLT.BHWEJjIXRwaN1vuWQHGRCDru + encrypted_password: $2a$10$jFJRSk/FAZolHC4iPq9wcu2P/BFneTWATArmKB3ozauh9c/9SDoL. serialized_private_key: *id002 pending_request_ids: [] @@ -828,36 +828,36 @@ data: - 76 - 226 - - 27 - - 53 + - 39 + - 147 - 35 - 103 - 188 - - 240 - - 29 + - 2 + - 77 - 0 - 1 - 18 last_sign_in_at: - username: bob743c29a3 + username: bob74eccef3 language: en sign_in_count: 0 visible_person_ids: [] - password_salt: $2a$10$/zxM7Gd4MC8hXUXGd9CJoe + password_salt: $2a$10$jFJRSk/FAZolHC4iPq9wcu remember_token: reset_password_token: current_sign_in_ip: remember_created_at: current_sign_in_at: invitation_sent_at: - email: bob752b56e9@pivotallabs.com + email: bob757cde24@pivotallabs.com invitation_token: visible_post_ids: [] getting_started: true :person: !map:ActiveSupport::HashWithIndifferentAccess - created_at: 2010-11-16 05:48:38 Z + created_at: 2010-11-16 06:41:24 Z profile: !map:ActiveSupport::HashWithIndifferentAccess searchable: true image_url: @@ -865,44 +865,44 @@ data: - 76 - 226 - - 27 - - 54 + - 39 + - 148 - 35 - 103 - 188 - - 240 - - 29 + - 2 + - 77 - 0 - 1 - 19 gender: diaspora_handle: birthday: - last_name: Grimm75a9ea85 + last_name: Grimm753d284e bio: - first_name: Robert75314372 - updated_at: 2010-11-16 05:48:38 Z + first_name: Robert750a18cf + updated_at: 2010-11-16 06:41:24 Z _id: !ruby/object:BSON::ObjectId data: - 76 - 226 - - 27 - - 54 + - 39 + - 148 - 35 - 103 - 188 - - 240 - - 29 + - 2 + - 77 - 0 - 1 - 20 - url: http://google-751c673f.com/ + url: http://google-756eeb91.com/ serialized_public_key: | -----BEGIN RSA PUBLIC KEY----- - MIGJAoGBAKBW9A0e3Y+g2TJ09PsUqaiIiC/mn7N7oHeCNUn7w/g2/gls3OZn7yWg - UqsYNweQ6si5+uKvG7dRJD5nGP00Si6xfxfGK6lcIai4N3oPNil4qYAvTQeamPVn - C0hTTTEoN3J4atmQ5KOQ9yUVUrYGmuP1aQ7AXgBJNUKK1e/u8jlxAgMBAAE= + MIGJAoGBAMORY1YeW31VmnzAfcuFQIbEla/GZuYQAnZ0ZOilKpqfX6AIINYlcpnk + txRxEU7Jb6+hao+qxbou9jLwxDZXRxBfjr+wolqkR2nv1ZSkr0jLzc5MlpQRN5eq + zs3BYjsUGpgFxZN5ZE+v1aSCWj926/Zt3iTG0CNA5sWnRDoX8vAbAgMBAAE= -----END RSA PUBLIC KEY----- owner_id: *id011 - diaspora_handle: bob743c29a3@example.org + diaspora_handle: bob74eccef3@example.org From f6c6030c6de4b98da6b202e324b6368ee05984e2 Mon Sep 17 00:00:00 2001 From: maxwell Date: Mon, 15 Nov 2010 23:08:57 -0800 Subject: [PATCH 12/13] fixing a translation --- config/locales/diaspora/en.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml index 0d09be811..506ef2f6e 100644 --- a/config/locales/diaspora/en.yml +++ b/config/locales/diaspora/en.yml @@ -264,6 +264,7 @@ en: request_people: "If you'd like, you can request to place him/her in one of your aspects." already_requested: "You have already sent a request to %{name}." does_not_exist: "Person does not exist!" + not_connected: "You are not connected with this person" edit: info_available_to: "This info will be available to whomever you connect with on Diaspora." your_profile: "Your profile" From 8c647aa169aea16a250f45bf6ebd137beaff7e6a Mon Sep 17 00:00:00 2001 From: maxwell Date: Tue, 16 Nov 2010 10:05:15 -0800 Subject: [PATCH 13/13] adding instafail --- .rspec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.rspec b/.rspec index 4e1e0d2f7..e9a033bef 100644 --- a/.rspec +++ b/.rspec @@ -1 +1,3 @@ --color +--require rspec/instafail +--format RSpec::Instafail