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

app/helpers/requests_helper.rb

@@ -26,12 +26,13 @@ module RequestsHelper
   end
 
   def relationship_flow(identifier)
-    puts request.host
+    action = :none
-    if identifier.include?(request.host)
+    url = nil
-      person = Person.by_webfinger identifier
+    local_person = Person.by_webfinger identifier
-      action = (person == current_user.person ? :none : :friend)
+    if local_person
-      url = person.owner.receive_url
+      action = (local_person == current_user.local_person ? :none : :friend)
-    else
+      url = local_person.receive_url
+    elsif !(identifier.include?(request.host) || identifier.include?("localhost"))
       f = Redfinger.finger(identifier)
       action = subscription_mode(f)
       url = subscription_url(action, f)

app/models/person.rb

@@ -40,7 +40,7 @@ class Person
                this.profile.first_name.match(/^#{query}/i) ||
                this.profile.last_name.match(/^#{query}/i); }")
   end
- 
+
   def real_name
     "#{profile.first_name.to_s} #{profile.last_name.to_s}"
   end

spec/models/person_spec.rb

@@ -138,5 +138,8 @@ describe Person do
       people.include?(@friend_two).should == false
       people.include?(@friend_three).should == false
     end
+    it 'should search by email exactly' do
+      Person.by_webfinger(@friend_one.email).should == @friend_one
+    end
   end
 end