muck-friends 0.1.1 → 0.1.2

data/README.rdoc

@@ -2,8 +2,10 @@
 
 == Installation
 
-The muck friends engine is part of the muck framework and relies upon the muck_engine as well as the muck-users gem.  Both gems should be installed automatically when you install the muck-friends gem.  Refer
-to the documentation for muck-users for muck-users configuration.
+The muck friends engine is part of the muck framework and relies upon the muck-engine, muck-users and muck-profiles gems.  
+These gems should be installed automatically when you install the muck-friends gem.  Refer to the documentation for each
+to setup configuration.  The muck-activities gem is optional.  If it is installed and enable_friend_activity is true
+then friend and follow activity will be fed into the user's activity feeds
 
   sudo gem install muck-friends
 
@@ -24,7 +26,7 @@ Inside of global_config.yml add the following, changing the emails to match your
 
     # Friend configuration
     allow_following:  true        # If true then users can 'follow' each other.  If false then only friend requests will be used.
-    enable_friend_activity: true  # If true then friend related activity will show up in the activity feed.  Requires muck-activity gem
+    enable_friend_activity: true  # If true then friend related activity will show up in the activity feed.  Requires muck-activities gem
     
 == Usage
 
@@ -35,9 +37,7 @@ After installing the gem just create a friend model thus:
 
   class Friend < ActiveRecord::Base  
     acts_as_muck_friend
-    # install muck-activities and uncomment the following to have friend notifications show up in each user's activity feed.
-    # has_activities
-    # after_create :add_activity
+    has_activities  # requires the muck-activities gem
   end
 
 and a user model thus:
@@ -45,6 +45,8 @@ and a user model thus:
   class User < ActiveRecord::Base
     acts_as_muck_user
     acts_as_muck_friend_user
+    has_muck_profile
+    has_activities # requires the muck-activities gem
   end
 
 

data/Rakefile

@@ -58,16 +58,6 @@ begin
     gemspec.add_dependency "muck-engine"
     gemspec.add_dependency "muck-users"
     gemspec.add_dependency "muck-profiles"
-    # gemspec.files.include %w( 
-    #                         tasks/*
-    #                         db/migrate/*.rb
-    #                         app/**/**/**/*
-    #                         config/*
-    #                         locales/*
-    #                         rails/*
-    #                         test/*
-    #                         lib/**/*
-    #                         public/**/* )
   end
 rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/app/helpers/muck_friends_helper.rb

@@ -1,47 +1,52 @@
 module MuckFriendsHelper
 
-  def follow_or_friend_requests
-    # TODO
+  def mutual_friends(user1, user2, limit = 6)
+    mutual_friends = user1.friends & user2.friends
+    render :partial => 'friends/mutual_friends', :locals => { :mutual_friends => mutual_friends }
   end
-    
-  def follow_or_friend_request
-    render :partial => 'friends/friend_or_follow_request', :locals => { :user => user }
-  end
-
+  
   def all_friends(user)
-    render :partial => 'friends/friends', :locals => { :user => user }
+    render :partial => 'friends/all_friends', :locals => { :user => user }
   end
   
-  def friends(user)
+  def friends(user, limit = 6)
     return '' if user.nil?
-    users = user.friends.find(:all, :limit => size, :order => 'RAND()') rescue []
+    users = user.friends.find(:all, :limit => limit, :order => 'friends.created_at DESC')
     if users
-      render :partial => 'friends/friend_simple', :collection => users, :locals => { :user => user }
+      render :partial => 'friends/friend_simple', :collection => users
     else
       "<p>#{t('muck.friends.no_friends')}</p>"
     end
   end
   
-  def followers(user)
+  def followers(user, limit = 6)
     return '' if user.nil?
-    users = user.followers.find(:all, :limit => size, :order => 'RAND()') rescue []
+    users = user.followers.find(:all, :limit => limit, :order => 'friends.created_at DESC')
     if users
-      render :partial => 'friends/friend_simple', :collection => users, :locals => { :user => user }
+      render :partial => 'friends/friend_simple', :collection => users
     else
       "<p>#{t('muck.friends.no_followers')}</p>"
     end
   end
   
-  def followings(user)
+  def followings(user, limit = 6)
     return '' if user.nil?
-    users = user.followings.find(:all, :limit => size, :order => 'RAND()') rescue []
+    users = user.followings.find(:all, :limit => limit, :order => 'friends.created_at DESC')
     if users
-      render :partial => 'friends/friend_simple', :collection => users, :locals => { :user => user }
+      render :partial => 'friends/friend_simple', :collection => users
     else
       "<p>#{t('muck.friends.not_following_anyone')}</p>"
     end
   end
 
+  # Render a list of all friend requests (if !GlobalConfig.allow_following)
+  def friend_requests(user)
+    if !GlobalConfig.allow_following 
+      followers = user.followers
+      render :partial => 'friends/friend_requests', :locals =>  { :followers => followers } unless followers.blank?
+    end
+  end
+  
   # TODO review this code
   def get_friend_link(user, target)
     
@@ -71,22 +76,22 @@ module MuckFriendsHelper
     
   end
 
-  def accept_follower_link user, target
+  def accept_follower_link(user, target)
     dom_id = make_id(user, target)
     wrap_get_friend_link(link_to_remote( I18n.t('muck.friends.accept'), { :url => user_friends_path(user, :id => target), :method => :post}, {:id => "accept-#{target.id}", :class => 'notification-link'}), dom_id)
   end
 
-  def ignore_friend_request_link user, target
+  def ignore_friend_request_link(user, target)
     dom_id = make_id(user, target)
     wrap_get_friend_link(link_to_remote( I18n.t('muck.friends.ignore'), { :url => user_friend_path(user, target), :method => :delete }, {:id => "ignore-#{target.id}", :class => 'notification-link'}), dom_id)
   end
 
   protected
-  def wrap_get_friend_link str, dom_id = ''
-    content_tag :span, str, :id => dom_id, :class => 'friendship-description'
+  def wrap_get_friend_link(link, dom_id = '')
+    content_tag(:span, link, :id => dom_id, :class => 'friendship-description')
   end
 
-  def make_id user, target
+  def make_id(user, target)
     user.dom_id(target.dom_id + '_friendship_')
   end
   

data/app/views/friends/_all_friends.html.erb

@@ -0,0 +1,8 @@
+<h2><%= t('muck.friends.friends') %></h2>
+<%= friends(user) %>
+<% if GlobalConfig.allow_following -%>
+  <h2><%= t('muck.friends.followers') %></h2>
+  <%= followers(user) %>  
+  <h2><%= t('muck.friends.following') %></h2>
+  <%= followings(user) %>
+<% end -%>

data/app/views/friends/_friend_requests.html.erb

@@ -0,0 +1,5 @@
+<% followers.each do |follower| %>
+  <li><%= t('muck.friends.friend_request_links', :profile => link_to(h(follower.full_name), profile_path(follower)), 
+                                                 :accept => accept_follower_link(current_user, follower),
+                                                 :ignore => ignore_friend_request_link(current_user, follower) ) -%></li>
+<% end %>

data/app/views/friends/_friend_simple.html.erb

@@ -1,4 +1,4 @@
 <div class="friend">
-	<%= icon friend %>
-	<%= link_to h(friend.display_name), profile_path(friend) %>
+  <%= icon friend_simple %>
+  <span class="friend-link"><%= link_to h(friend_simple.display_name), profile_path(friend_simple) %></span>
 </div>

data/app/views/friends/_mutual_friends.html.erb

@@ -0,0 +1,3 @@
+<h2><%= t('muck.friends.mutual_friends') %></h2>
+<%= render :partial => 'friends/friend_simple', :collection => mutual_friends %>
+

data/lib/active_record/acts/muck_friend.rb

@@ -12,7 +12,7 @@ module ActiveRecord
 
           belongs_to :inviter, :class_name => 'User'
           belongs_to :invited, :class_name => 'User'
-
+          
           include ActiveRecord::Acts::MuckFriend::InstanceMethods
           extend ActiveRecord::Acts::MuckFriend::SingletonMethods
           
@@ -117,7 +117,7 @@ module ActiveRecord
           FriendMailer.deliver_follow(inviter, invited)
         end
         
-        # 
+        # Add activity that indicates user is following another user
         def add_follow_activity
           return unless GlobalConfig.enable_friend_activity
           content = I18n.t('muck.friends.follow_activity', :inviter => self.inviter.full_name, :invited => self.invited.full_name)

data/locales/ar.yml

@@ -9,13 +9,18 @@ ar:
       accept: (قبول)
       delete: (حذف)
       follow_activity: "{{inviter}} is now following {{invited}}"
+      followers: أتباع
+      following: تال
       following_you: "{{name}} is now following you on {{application_name}}"
       friend_request: "طلب صديق"
+      friend_request_links: "{{profile}} sent you a friend request {{accept}} {{ignore}}"
       friend_request_pending: "طلب صديق في انتظار {{link}}"
       friend_request_sent: "تم إرسال طلب صديق"
+      friends: أصدقاء
       friends_title: أصدقائي
       friends_with: "{{inviter}} is now friends with {{invited}}"
       ignore: (تجاهل)
+      mutual_friends: "تبادل الأصدقاء"
       no_followers: "أنت ليست لديها حاليا أي أتباع"
       no_friends: "أنت ليست لديها حاليا أي الأصدقاء"
       not_following_anyone: "انك لم تتابع حاليا أحدا"

data/locales/bg.yml

@@ -9,15 +9,20 @@ bg:
       accept: (приеме)
       delete: (изтриване)
       follow_activity: "{{inviter}} is now following {{invited}}"
+      followers: Последователи
+      following: Следващ
       following_you: "{{name}} is now following you on {{application_name}}"
       friend_request: "Приятел Запитване"
+      friend_request_links: "{{profile}} sent you a friend request {{accept}} {{ignore}}"
       friend_request_pending: "Приятел запитване до {{link}}"
       friend_request_sent: "Приятел Искане Изпратени"
+      friends: Приятели
       friends_title: "Моите приятели"
       friends_with: "{{inviter}} is now friends with {{invited}}"
       ignore: (пренебрегни)
+      mutual_friends: "Общи приятели"
       no_followers: "Не е в момента имате някакви последователите"
-      no_friends: "Вие в момента не са никакви приятели"
+      no_friends: "Не Понастоящем приятели"
       not_following_anyone: "Вие сте в момента не след никого"
       problem_adding_follow: "Имаше проблем при добавянето {{user}} да ви следват списък. Моля опитайте отново."
       problem_sending_friend_request: "Имаше проблем при изпращането на молба за приятелство с {{user}}. Моля опитайте отново."

data/locales/ca.yml

@@ -9,13 +9,18 @@ ca:
       accept: (acceptar)
       delete: (eliminar)
       follow_activity: "{{inviter}} is now following {{invited}}"
+      followers: Seguidors
+      following: Següent
       following_you: "{{name}} is now following you on {{application_name}}"
       friend_request: "Sol licitud amic"
+      friend_request_links: "{{profile}} sent you a friend request {{accept}} {{ignore}}"
       friend_request_pending: "A l'espera de sol licitud d'amistat {{link}}"
       friend_request_sent: "La sol licitud s'ha enviat un amic"
+      friends: Amics
       friends_title: "Els meus amics"
       friends_with: "{{inviter}} is now friends with {{invited}}"
       ignore: (ignorar)
+      mutual_friends: "Amics mutus"
       no_followers: "Que actualment no té cap seguidors"
       no_friends: "Vostè no té actualment cap amic"
       not_following_anyone: "Vostè no està actualment següents a ningú"

data/locales/cs.yml

@@ -9,13 +9,18 @@ cs:
       accept: (přijmout)
       delete: (smazat)
       follow_activity: "{{inviter}} is now following {{invited}}"
+      followers: Následovníci
+      following: Následující
       following_you: "{{name}} is now following you on {{application_name}}"
       friend_request: "Zaslat příteli"
+      friend_request_links: "{{profile}} sent you a friend request {{accept}} {{ignore}}"
       friend_request_pending: "Přátelství čeká {{link}}"
       friend_request_sent: "Zaslat příteli Posláno"
+      friends: Kamarádi
       friends_title: "Moji kamarádi"
       friends_with: "{{inviter}} is now friends with {{invited}}"
       ignore: (ignorovat)
+      mutual_friends: "Vzájemné Přátelé"
       no_followers: "Nemusíte mít v současné době žádné následovníky"
       no_friends: "Nemusíte mít v současné době žádné přátele"
       not_following_anyone: "Ty v současné době nejsou tyto kdokoliv"

data/locales/da.yml

@@ -9,13 +9,18 @@ da:
       accept: (accepter)
       delete: (slet)
       follow_activity: "{{inviter}} is now following {{invited}}"
+      followers: Tilhængere
+      following: Følgende
       following_you: "{{name}} is now following you on {{application_name}}"
       friend_request: "Friend Request"
+      friend_request_links: "{{profile}} sent you a friend request {{accept}} {{ignore}}"
       friend_request_pending: "Ven anmodning indtil {{link}}"
       friend_request_sent: "Ven Anmodning Sendte"
+      friends: Venner
       friends_title: "Mine venner"
       friends_with: "{{inviter}} is now friends with {{invited}}"
       ignore: (ignore)
+      mutual_friends: "Fælles venner"
       no_followers: "Du kan i øjeblikket ikke har nogen followers"
       no_friends: "Du kan i øjeblikket ikke har nogen venner"
       not_following_anyone: "Du er ikke i øjeblikket efter nogen"

data/locales/de.yml

@@ -9,18 +9,23 @@ de:
       accept: (akzeptieren)
       delete: (Löschen)
       follow_activity: "{{inviter}} is now following {{invited}}"
+      followers: Anhänger
+      following: Folgend
       following_you: "{{name}} is now following you on {{application_name}}"
       friend_request: "Friend Request"
+      friend_request_links: "{{profile}} sent you a friend request {{accept}} {{ignore}}"
       friend_request_pending: "Freund Anfrage bis {{link}}"
       friend_request_sent: "Freund Anfrage gesendet"
+      friends: Freunde
       friends_title: "Meine Freunde"
       friends_with: "{{inviter}} is now friends with {{invited}}"
       ignore: (ignore)
+      mutual_friends: "Gemeinsame Freunde"
       no_followers: "Sie derzeit nicht über alle Anhänger"
       no_friends: "Sie derzeit nicht haben keine Freunde"
       not_following_anyone: "Sie sind derzeit noch nicht nach jeder"
-      problem_adding_follow: "Es gab ein Problem hinzufügen {{user}} zu Ihrer Liste folgen. Bitte versuchen Sie es noch einmal."
-      problem_sending_friend_request: "Es wurde ein Problem, das Senden einer Anfrage an {{user}}. Bitte versuchen Sie es noch einmal."
+      problem_adding_follow: "Es gab ein Problem hinzufügen {{user}} zu Ihrer Liste folgen. Bitte versuchen Sie es erneut."
+      problem_sending_friend_request: "Es wurde ein Problem, das Senden einer Anfrage an {{user}}. Bitte versuchen Sie es erneut."
       removed_friendship: "Entfernt Freund Beziehung"
       same_inviter_error_message: "User können sich nicht selbst mit Freunden."
       sign_up_to_follow: "Melden Sie sich an Folgen"

data/locales/el.yml

@@ -9,13 +9,18 @@ el:
       accept: (αποδεχθεί)
       delete: (διαγραφή)
       follow_activity: "{{inviter}} is now following {{invited}}"
+      followers: "Οι οπαδοί"
+      following: Ακολουθία
       following_you: "{{name}} is now following you on {{application_name}}"
       friend_request: "Αίτηση Φίλου"
+      friend_request_links: "{{profile}} sent you a friend request {{accept}} {{ignore}}"
       friend_request_pending: "Φίλος εκκρεμεί αίτηση {{link}}"
       friend_request_sent: "Φίλος Αίτηση Σταλθέντα"
+      friends: Φίλοι
       friends_title: "My Friends"
       friends_with: "{{inviter}} is now friends with {{invited}}"
       ignore: (ignore)
+      mutual_friends: "Αμοιβαία Φίλοι"
       no_followers: "Εσείς δεν έχουν σήμερα καμία οπαδοί"
       no_friends: "Μπορείτε επί του παρόντος δεν έχει φίλους"
       not_following_anyone: "Αυτή τη στιγμή δεν ακόλουθες κανέναν"

data/locales/en.yml

@@ -1,10 +1,15 @@
 en:
   muck:
     friends:
+      friends: "Friends"
+      followers: "Followers"
+      following: "Following"
+      mutual_friends: "Mutual Friends"
       friends_title: "My Friends"
       same_inviter_error_message: "User cannot become friends with themself."
       following_you: "{{name}} is now following you on {{application_name}}"
       friend_request: "{{name}} has sent you a friend request on {{application_name}}"
+      friend_request_links: "{{profile}} sent you a friend request {{accept}} {{ignore}}"
       follow_activity: "{{inviter}} is now following {{invited}}"
       friends_with: "{{inviter}} is now friends with {{invited}}"
       not_following_anyone: "You aren't currently following anyone"

data/locales/es.yml

@@ -9,13 +9,18 @@ es:
       accept: (aceptar)
       delete: (suprimir)
       follow_activity: "{{inviter}} is now following {{invited}}"
+      followers: Seguidores
+      following: Siguiente
       following_you: "{{name}} is now following you on {{application_name}}"
       friend_request: "Solicitud amigo"
+      friend_request_links: "{{profile}} sent you a friend request {{accept}} {{ignore}}"
       friend_request_pending: "En espera de solicitud de amistad {{link}}"
       friend_request_sent: "La solicitud se ha enviado un amigo"
+      friends: Amigos
       friends_title: "Mis amigos"
       friends_with: "{{inviter}} is now friends with {{invited}}"
       ignore: (ignorar)
+      mutual_friends: "Amigos mutuos"
       no_followers: "Que actualmente no tiene ningún seguidores"
       no_friends: "Usted no tiene actualmente ningún amigo"
       not_following_anyone: "Usted no está actualmente siguientes a nadie"

data/locales/et.yml

@@ -9,13 +9,18 @@ et:
       accept: (nõus)
       delete: "(välja jäetud)"
       follow_activity: "{{inviter}} is now following {{invited}}"
+      followers: Järgijad
+      following: Järgnev
       following_you: "{{name}} is now following you on {{application_name}}"
       friend_request: "Sõber Soov"
+      friend_request_links: "{{profile}} sent you a friend request {{accept}} {{ignore}}"
       friend_request_pending: "Sõber taotleda kuni {{link}}"
       friend_request_sent: "Sõber Taotlus saadetud"
+      friends: Sõbrad
       friends_title: "Minu sõbrad"
       friends_with: "{{inviter}} is now friends with {{invited}}"
       ignore: (ignoreerib)
+      mutual_friends: "Ühised sõbrad"
       no_followers: "Sul ei ole praegu mingit järgijaid"
       no_friends: "Sul ei ole praegu ühtegi sõpra"
       not_following_anyone: "Sa ei ole hetkel järgmised igaüks"

data/locales/fa.yml

@@ -9,13 +9,18 @@ fa:
       accept: (قبول)
       delete: (حذف)
       follow_activity: "{{inviter}} is now following {{invited}}"
+      followers: پیروان
+      following: زیر
       following_you: "{{name}} is now following you on {{application_name}}"
       friend_request: "درخواست دوستان"
+      friend_request_links: "{{profile}} sent you a friend request {{accept}} {{ignore}}"
       friend_request_pending: "درخواست دوستان در انتظار {{link}}"
       friend_request_sent: "درخواست ارسال به دوستان"
+      friends: دوستان
       friends_title: "دوستان من"
       friends_with: "{{inviter}} is now friends with {{invited}}"
       ignore: "(نادیده گرفتن)"
+      mutual_friends: "دوستان متقابل"
       no_followers: "شما در حال حاضر نیست به هر پیروان"
       no_friends: "شما در حال حاضر نیست به هر دوستان"
       not_following_anyone: "شما در حال حاضر نیست زیر هر کسی"

data/locales/fi.yml

@@ -9,13 +9,18 @@ fi:
       accept: (hyväksy)
       delete: (poista)
       follow_activity: "{{inviter}} is now following {{invited}}"
+      followers: Seuraajat
+      following: Seuraava
       following_you: "{{name}} is now following you on {{application_name}}"
       friend_request: "Friend Request"
+      friend_request_links: "{{profile}} sent you a friend request {{accept}} {{ignore}}"
       friend_request_pending: "Kaveriksitulopyynnön kunnes {{link}}"
       friend_request_sent: "Friend Pyyntö lähetetty"
+      friends: Ystävät
       friends_title: Ystävät
       friends_with: "{{inviter}} is now friends with {{invited}}"
       ignore: (ohittaa)
+      mutual_friends: "Keskinäinen Ystävät"
       no_followers: "Sinulla ei tällä hetkellä ole seuraajia"
       no_friends: "Sinulla ei tällä hetkellä ole yhtään ystävää"
       not_following_anyone: "Et ole tällä hetkellä seuraavat kukaan"