Merge branch 'master' of github.com:diaspora/diaspora

app/models/request.rb

@@ -17,9 +17,8 @@ class Request
   belongs_to :to,   :class => Person
 
   validates_presence_of :from, :to
-  validate :not_already_connected_if_sent
+  validates_uniqueness_of :from_id, :scope => :to_id
-  validate :not_already_connected_if_not_sent
+  validate :not_already_connected
-  validate :no_pending_request, :if => :sent
   validate :not_friending_yourself
 
   scope :from, lambda { |person|
@@ -36,8 +35,7 @@ class Request
   def self.instantiate(opts = {})
     self.new(:from => opts[:from],
              :to   => opts[:to],
-             :into => opts[:into],
+             :into => opts[:into])
-             :sent => true)
   end
 
   def reverse_for accepting_user
@@ -75,27 +73,12 @@ class Request
     requests.map{|r| {:request => r, :sender => senders_hash[r.from_id]}}
   end
   private
-  def no_pending_request
-    if Request.first(:from_id => from_id, :to_id => to_id)
-      errors[:base] << 'You have already sent a request to that person'
-    end
-  end
 
-  def not_already_connected_if_sent
+  def not_already_connected
-    if self.sent
-      if Contact.first(:user_id => self.from.owner_id, :person_id => self.to.id)
-        errors[:base] << 'You have already connected to this person'
-      end
-    end
-  end
-
-  def not_already_connected_if_not_sent
-    unless self.sent
     if Contact.first(:user_id => self.to.owner_id, :person_id => self.from.id)
       errors[:base] << 'You have already connected to this person'
     end
   end
-  end
 
   def not_friending_yourself
     if self.to == self.from

app/views/people/_profile_sidebar.html.haml

@@ -35,7 +35,7 @@
       %br
       %hr{:style=>"width:300px;"}
 
-  -if contact || person == current_user.person
+  -if (contact && !contact.pending?) || person == current_user.person
     %ul#profile_information
       %li
         %h3 #{t('.bio')}

config/locales/diaspora/en.yml

@@ -44,19 +44,23 @@ en:
               user:
                   attributes:
                       person:
-                          invalid: "is invalid"
+                          invalid: "is invalid."
                       username:
-                          taken: "is already taken"
+                          taken: "is already taken."
                       email:
-                          taken: "is already taken"
+                          taken: "is already taken."
               person:
                   attributes:
                       diaspora_handle:
-                          taken: "is already taken"
+                          taken: "is already taken."
               contact:
                   attributes:
                       person_id:
-                          taken: "must be unique among this user's contacts"
+                          taken: "must be unique among this user's contacts."
+              request:
+                  attributes:
+                      from_id:
+                          taken: "is a duplicate of a pre-existing request."
   application:
       helper:
           unknown_person: "unknown person"

db/seeds.rb

@@ -10,5 +10,5 @@
 #   cities = City.create([{ :name => 'Chicago' }, { :name => 'Copenhagen' }])
 #   Mayor.create(:name => 'Daley', :city => citie
 
-require File.join(File.dirname(__FILE__), "..", "..", "config", "environment")
+require File.join(File.dirname(__FILE__), "..", "config", "environment")
 

db/seeds/dev.rb

@@ -5,7 +5,6 @@
 require File.join(File.dirname(__FILE__), "..", "..", "config", "environment")
 require File.join(File.dirname(__FILE__), "..", "..", "spec", "helper_methods")
 
-
 def set_app_config username
   current_config = YAML.load(File.read(Rails.root.join('config', 'app_config.yml.example')))
   current_config[Rails.env.to_s] ||= {}
@@ -21,6 +20,15 @@ set_app_config username unless File.exists?(Rails.root.join('config', 'app_confi
 
 require Rails.root.join('config',  "initializers", "_load_app_config.rb")
 include HelperMethods
+module Resque
+  def enqueue(klass, *args)
+    if $process_queue
+      klass.send(:perform, *args)
+    else
+      true
+    end
+  end
+end
 # Create seed user
 user = User.build( :email => "tom@tom.joindiaspora.com",
                      :username => "tom",
@@ -30,7 +38,7 @@ user = User.build( :email => "tom@tom.joindiaspora.com",
                       :profile => { :first_name => "Alexander", :last_name => "Hamiltom",
                       :image_url => "/images/user/tom.jpg"}})
 
-user.save
+user.save!
 user.person.save!
 user.seed_aspects
 
@@ -42,12 +50,9 @@ user2 = User.build( :email => "korth@tom.joindiaspora.com",
                       :image_url => "/images/user/korth.jpg"}})
 
 
-user2.save
+user2.save!
 user2.person.save!
 user2.seed_aspects
 # connecting users
-aspect = user.aspects.create(:name => "other dudes") 
-aspect2 = user2.aspects.create(:name => "presidents")
 
-connect_users(user, aspect, user2, aspect2)
+connect_users(user, user.aspects.first, user2, user2.aspects.first)
-user.aspects.create(:name => "Presidents")

public/500.html

@@ -53,7 +53,7 @@
 <body>
   <!-- This file lives in public/500.html -->
   <header>
-		<img id="diaspora_logo" src="images/diaspora_logo_large.png"/>
+		<img id="diaspora_logo" src="images/logo_large.png"/>
   </header>
 
 	<h1>
@@ -65,17 +65,21 @@
 
 	<div id="satisfaction">
 		<script type="text/javascript" charset="utf-8">
+      if(window.location.hostname == 'joindiaspora.com'){
 			  var is_ssl = ("https:" == document.location.protocol);
 			  var asset_host = is_ssl ? "https://s3.amazonaws.com/getsatisfaction.com/" : "http://s3.amazonaws.com/getsatisfaction.com/";
 			  document.write(unescape("%3Cscript src='" + asset_host + "javascripts/feedback-v2.js' type='text/javascript'%3E%3C/script%3E"));
+      }
 		</script>
 
 		<script type="text/javascript" charset="utf-8">
+      if(window.location.hostname == 'joindiaspora.com'){
 			  var feedback_widget_options = {};
 			  feedback_widget_options.display = "inline";  
 			  feedback_widget_options.company = "diaspora";
 			  feedback_widget_options.style = 'problem';
         var feedback_widget = new GSFN.feedback_widget(feedback_widget_options);
+      }
 		</script>
 
 	</div>

spec/models/request_spec.rb

@@ -5,21 +5,23 @@
 require 'spec_helper'
 
 describe Request do
-  let(:user)   { make_user }
+  before do
-  let(:user2)  { make_user }
+    @user    = make_user
-  let(:person) { Factory :person }
+    @user2   = make_user
-  let(:aspect) { user.aspects.create(:name => "dudes") }
+    @person  = Factory :person
-  let(:request){ user.send_contact_request_to user2.person, aspect }
+    @aspect  = @user.aspects.create(:name => "dudes")
+    @aspect2 = @user2.aspects.create(:name => "Snoozers")
+  end
 
   describe 'validations' do
     before do
-      @request = Request.instantiate(:from => user.person, :to => user2.person, :into => aspect)
+      @request = Request.instantiate(:from => @user.person, :to => @user2.person, :into => @aspect)
     end
     it 'is valid' do
       @request.should be_valid
-      @request.from.should == user.person
+      @request.from.should == @user.person
-      @request.to.should   == user2.person
+      @request.to.should   == @user2.person
-      @request.into.should == aspect
+      @request.into.should == @aspect
     end
     it 'is from a person' do
       @request.from = nil
@@ -33,49 +35,49 @@ describe Request do
       @request.into = nil
       @request.should be_valid
     end
+    it 'is not from an existing friend' do
+      Contact.create(:user => @user2, :person => @user.person, :aspects => [@aspect2])
+      @request.should_not be_valid
+    end
     it 'is not a duplicate of an existing pending request' do
-      request
+      @request.save
-      @request.should_not be_valid
+      duplicate_request = Request.instantiate(:from => @user.person, :to => @user2.person, :into => @aspect)
+      duplicate_request.should_not be_valid
     end
-    it 'is not to an existing friend' do
-      connect_users(user, aspect, user2, user2.aspects.create(:name => 'new aspect'))
-      @request.should_not be_valid
-    end
-
     it 'is not to yourself' do
-      @request = Request.instantiate(:from => user.person, :to => user.person, :into => aspect)
+      @request = Request.instantiate(:from => @user.person, :to => @user.person, :into => @aspect)
       @request.should_not be_valid
     end
   end
 
   describe 'scopes' do
     before do
-      @request = Request.instantiate(:from => user.person, :to => user2.person, :into => aspect)
+      @request = Request.instantiate(:from => @user.person, :to => @user2.person, :into => @aspect)
       @request.save
     end
     describe '.from' do
       it 'returns requests from a person' do
-        query = Request.from(user.person)
+        query = Request.from(@user.person)
         query.first.should == @request
       end
 
       it 'returns requests from a user' do
-        query = Request.from(user)
+        query = Request.from(@user)
         query.first.should == @request
       end
     end
     describe '.to' do
       it 'returns requests to a person' do
-        query = Request.to(user2.person)
+        query = Request.to(@user2.person)
         query.first.should == @request
       end
       it 'returns requests to a user' do
-        query = Request.to(user2)
+        query = Request.to(@user2)
         query.first.should == @request
       end
     end
     it 'chains' do
-      Request.from(user).to(user2.person).first.should == @request
+      Request.from(@user).to(@user2.person).first.should == @request
     end
   end
 
@@ -90,7 +92,7 @@ describe Request do
       @hash = @hashes.first
     end
     it 'gives back requests' do
-      @hash[:request].should == Request.from(@user2).to(@user).first(:sent => false)
+      @hash[:request].should == Request.from(@user2).to(@user).first
     end
     it 'gives back people' do
       @hash[:sender].should == @user2.person
@@ -101,24 +103,24 @@ describe Request do
   end
   describe 'xml' do
     before do
-      @request = Request.new(:from => user.person, :to => user2.person, :into => aspect)
+      @request = Request.new(:from => @user.person, :to => @user2.person, :into => @aspect)
       @xml = @request.to_xml.to_s
     end
     describe 'serialization' do
       it 'should not generate xml for the User as a Person' do
-        @xml.should_not include user.person.profile.first_name
+        @xml.should_not include @user.person.profile.first_name
       end
 
       it 'should serialize the handle and not the sender' do
-        @xml.should include user.person.diaspora_handle
+        @xml.should include @user.person.diaspora_handle
       end
 
       it 'serializes the intended recipient handle' do
-        @xml.should include user2.person.diaspora_handle
+        @xml.should include @user2.person.diaspora_handle
       end
 
       it 'should not serialize the exported key' do
-        @xml.should_not include user.person.exported_key
+        @xml.should_not include @user.person.exported_key
       end
 
       it 'does not serialize the id' do
@@ -131,10 +133,10 @@ describe Request do
         @marshalled = Request.from_xml @xml
       end
       it 'marshals the sender' do
-        @marshalled.from.should == user.person
+        @marshalled.from.should == @user.person
       end
       it 'marshals the recipient' do
-        @marshalled.to.should == user2.person
+        @marshalled.to.should == @user2.person
       end
       it 'knows nothing about the aspect' do
         @marshalled.into.should be_nil
@@ -146,10 +148,10 @@ describe Request do
         @marshalled = Diaspora::Parser.from_xml @d_xml
       end
       it 'marshals the sender' do
-        @marshalled.from.should == user.person
+        @marshalled.from.should == @user.person
       end
       it 'marshals the recipient' do
-        @marshalled.to.should == user2.person
+        @marshalled.to.should == @user2.person
       end
       it 'knows nothing about the aspect' do
         @marshalled.into.should be_nil

spec/models/user/connecting_spec.rb

@@ -93,11 +93,10 @@ describe Diaspora::UserModules::Connecting do
       let(:request2_for_user) {Request.instantiate(:to => user.person, :from => person_one)}
       let(:request_from_myself) {Request.instantiate(:to => user.person, :from => user.person)}
       before do
-        request_for_user.save
         user.receive(request_for_user.to_diaspora_xml, person)
-        @received_request = Request.from(person).to(user.person).first(:sent => false)
+        @received_request = Request.from(person).to(user.person).first
         user.receive(request2_for_user.to_diaspora_xml, person_one)
-        @received_request2 = Request.from(person_one).to(user.person).first(:sent => false)
+        @received_request2 = Request.from(person_one).to(user.person).first
         user.reload
       end