muck-friends 0.1.6 → 0.1.7

data/Rakefile

@@ -35,7 +35,6 @@ rescue LoadError
   end
 end
 
-
 desc 'Generate documentation for the muck_friends plugin.'
 Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.1.7

data/app/controllers/muck/friends_controller.rb

@@ -12,65 +12,85 @@ class Muck::FriendsController < ApplicationController
   end
   
   def create
-    respond_to do |format|
-      if Friend.make_friends(@user, @target)
-        friend = current_user.reload.friend_of?(@target)
-        format.html do
-          if GlobalConfig.enable_following
-            flash[:notice] = t('muck.friends.you_are_now_following', :user => @target.display_name)
-          else
-            flash[:notice] = t('muck.friends.friend_request_sent')
-          end             
-          redirect_to profile_path(@target)
-        end
-        format.js { render(:update) {|page| page.replace make_id(@user, @target), friend_link(@user, @target)}}
-      else
-        if GlobalConfig.enable_following
-          message = t('muck.friends.problem_adding_follow', :user => @target.display_name)
-        else
-          message = t('muck.friends.problem_sending_friend_request', :user  => @target.display_name)
-        end
-        format.html do
-          flash[:notice] = message
-          redirect_to profile_path(@target)
-        end
-        format.js {render(:update){|page| page.alert message}}
-      end
-    end
-  end
+    success = Friend.make_friends(@user, @target)
 
-  def destroy
-    success = @user.drop_friend(@target)
-    if GlobalConfig.enable_friending 
+    if GlobalConfig.enable_following
       if success
-        message = t('muck.friends.removed_friendship', :user => @target.display_name)
+        message = t('muck.friends.you_are_now_following', :user => @target.display_name)
       else
-        message = t('muck.friends.removed_friendship_error', :user => @target.display_name)
+        message = t('muck.friends.problem_adding_follow', :user => @target.display_name)
       end
-    elsif GlobalConfig.enable_following
+    elsif GlobalConfig.enable_friending
       if success
-        message = t('muck.friends.stopped_following', :user => @target.display_name)
+        message = t('muck.friends.friend_request_sent')
       else
-        message = t('muck.friends.removed_following_error', :user => @target.display_name)
+        message = t('muck.friends.problem_sending_friend_request', :user  => @target.display_name)
       end
     end
+
     respond_to do |format|
-      format.html do
-        flash[:notice] = message
-        redirect_to profile_path(@target)
-      end
-      format.js do
-        if success
-          render(:update){|page| page.replace make_id(@user, @target), friend_link(@user, @target)}
-        else
-          format.js {render(:update){|page| page.alert message}}
-        end
-      end
+      format.html { render_after_create_html(success, message) }
+      format.js { render_after_create_js(success, message) }
+      format.pjs { render_after_create_js(success, message) }
+      format.json { render :json => { :success => success, :message => message, :friend_user => @target } }
+    end
+
+  end
+  
+  def destroy
+
+    success = true
+    # Other user may or may not be a friend.  If they weren't then revert_to_follower will return false.
+    # We don't care that the other user wasn't reverted to a follower (since they might not have been a friend) so return true
+    @user.drop_friend(@target)
+    if GlobalConfig.enable_friending 
+      message = t('muck.friends.removed_friendship', :user => @target.display_name)
+    elsif GlobalConfig.enable_following
+      message = t('muck.friends.stopped_following', :user => @target.display_name)
+    end
+
+    # if GlobalConfig.enable_friending 
+    #   message = t('muck.friends.removed_friendship_error', :user => @target.display_name)
+    # elsif GlobalConfig.enable_following
+    #   message = t('muck.friends.removed_following_error', :user => @target.display_name)
+    # end
+    
+    respond_to do |format|
+      format.html { render_after_destroy_html(success, message) }
+      format.js { render_after_destroy_js(success, message) }
+      format.pjs { render_after_destroy_js(success, message) }
+      format.json { render :json => { :success => success, :message => message } }
     end
   end
   
   protected
   
+  def render_after_create_html(success, message)
+    flash[:notice] = message
+    redirect_to profile_path(@target)
+  end
+
+  def render_after_create_js(success, message)
+    if success
+      render(:update){|page| page.replace make_id(@user, @target), friend_link(@user, @target)}
+    else
+      render(:update){|page| page.alert message}
+    end
+  end
+    
+  def render_after_destroy_html(success, message)
+    flash[:notice] = message
+    redirect_to profile_path(@target)
+  end
+  
+  def render_after_destroy_js(success, message)
+    if success
+      render(:update){|page| page.replace make_id(@user, @target), friend_link(@user, @target)}
+    else
+      render(:update){|page| page.alert message}
+    end
+  end
+
   def make_id(user, target)
     user.dom_id(target.dom_id + '_friendship_')
   end

data/app/helpers/muck_friends_helper.rb

@@ -138,10 +138,10 @@ module MuckFriendsHelper
   
   # Handles render friend partials
   def render_friends(users, partial, no_friends_content)
-    if users
+    if users.length > 0
       render :partial => "friends/#{partial}", :collection => users
     else
-      if no_friends_content.length > 0
+      if no_friends_content.length > 0 # Do this so that a user can pass ' ' to get a blank string output
         no_friends_content
       else
         "<p class=\"no_friends_found\">#{no_friends_content}</p>"

data/app/models/friend_mailer.rb

@@ -20,6 +20,7 @@ class FriendMailer < ActionMailer::Base
     recipients  email
     from        "#{GlobalConfig.from_email_name} <#{GlobalConfig.from_email}>"
     sent_on     Time.now
+    content_type "text/html" # There is a bug in Rails that prevents multipart emails from working inside an engine.  See: https://rails.lighthouseapp.com/projects/8994-ruby-on-rails/tickets/2263-rails-232-breaks-implicit-multipart-actionmailer-tests#ticket-2263-22
   end
   
 end

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

@@ -1 +1 @@
-<%= icon friend_simple %>
+<%= icon friend_icon %>

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

@@ -0,0 +1 @@
+<%= icon(friend_tiny_icon, :tiny) %>

data/lib/active_record/acts/muck_friend.rb

@@ -28,7 +28,7 @@ module ActiveRecord
           return false if inviter.blank? || invited.blank? || inviter == invited
           success = false
           transaction do
-            friend = Friend.create(:inviter => inviter, :invited => invited, :status => MuckFriends::PENDING)
+            friend = Friend.create(:inviter => inviter, :invited => invited, :status => MuckFriends::FOLLOWING)
             friend.add_follow_activity
             success = !friend.new_record?
           end
@@ -40,8 +40,8 @@ module ActiveRecord
           return false if user.blank? || target.blank? || user == target
           transaction do
             begin
-              Friend.find(:first, :conditions => {:inviter_id => user.id, :invited_id => target.id, :status => MuckFriends::PENDING}).update_attribute(:status, MuckFriends::ACCEPTED)
-              friend = Friend.create!(:inviter_id => target.id, :invited_id => user.id, :status => MuckFriends::ACCEPTED)
+              Friend.find(:first, :conditions => {:inviter_id => user.id, :invited_id => target.id, :status => MuckFriends::FOLLOWING}).update_attribute(:status, MuckFriends::FRIENDING)
+              friend = Friend.create!(:inviter_id => target.id, :invited_id => user.id, :status => MuckFriends::FRIENDING)
               friend.add_friends_with_activity
             rescue Exception
               return make_friends(target, user) if user.followed_by?(target)
@@ -67,33 +67,43 @@ module ActiveRecord
         def revert_to_follower(user, target)
           return false if user.blank? || target.blank?
           transaction do
-            Friend.find(:first, :conditions => {:inviter_id => user.id, :invited_id => target.id}).destroy
+            friend = Friend.find(:first, :conditions => {:inviter_id => user.id, :invited_id => target.id})
+            friend.destroy if friend
             friend = Friend.find(:first, :conditions => {:inviter_id => target.id, :invited_id => user.id})
-            return friend.update_attribute(:status, MuckFriends::PENDING) if friend
+            if friend
+              return friend.update_attribute(:status, MuckFriends::FOLLOWING)
+            else
+              return false
+            end
           end
-          true
         end
 
+        # User stops following target
         def stop_following(user, target)
           return false if user.blank? || target.blank?
-          Friend.find(:first, :conditions => {:inviter_id => user.id, :invited_id => target.id}).destroy
-        end
-        
-        def block_user(user, target)
-          return false if user.blank? || target.blank?
-          Friend.find(:first, :conditions => {:inviter_id => target.id, :invited_id => user.id}).update_attribute(:status, MuckFriends::BLOCKED)
           friend = Friend.find(:first, :conditions => {:inviter_id => user.id, :invited_id => target.id})
           if friend
             friend.destroy
           else
-            true
+            false
           end
         end
         
+        def block_user(user, target)
+          return false if user.blank? || target.blank?
+          friend = Friend.find(:first, :conditions => {:inviter_id => user.id, :invited_id => target.id})
+          friend.destroy if friend
+          Friend.find(:first, :conditions => {:inviter_id => target.id, :invited_id => user.id}).update_attribute(:status, MuckFriends::BLOCKED)
+        end
+        
         def unblock_user(user, target)
           return false if user.blank? || target.blank?
           friend = Friend.find(:first, :conditions => {:inviter_id => target.id, :invited_id => user.id})
-          friend.update_attribute(:status, MuckFriends::PENDING) if friend
+          if friend
+            friend.update_attribute(:status, MuckFriends::FOLLOWING)
+          else
+            false
+          end
         end
 
         def has_network?(user)

data/lib/active_record/acts/muck_friend_user.rb

@@ -10,9 +10,9 @@ module ActiveRecord
 
         def acts_as_muck_friend_user(options = {})
 
-          has_many :friendships, :class_name  => "Friend", :foreign_key => 'inviter_id', :conditions => "status = #{MuckFriends::ACCEPTED}", :dependent => :destroy
-          has_many :follower_friends, :class_name => "Friend", :foreign_key => "invited_id", :conditions => "status = #{MuckFriends::PENDING}", :dependent => :destroy
-          has_many :following_friends, :class_name => "Friend", :foreign_key => "inviter_id", :conditions => "status = #{MuckFriends::PENDING}", :dependent => :destroy
+          has_many :friendships, :class_name  => "Friend", :foreign_key => 'inviter_id', :conditions => "status = #{MuckFriends::FRIENDING}", :dependent => :destroy
+          has_many :follower_friends, :class_name => "Friend", :foreign_key => "invited_id", :conditions => "status = #{MuckFriends::FOLLOWING}", :dependent => :destroy
+          has_many :following_friends, :class_name => "Friend", :foreign_key => "inviter_id", :conditions => "status = #{MuckFriends::FOLLOWING}", :dependent => :destroy
           has_many :blocked_friends, :class_name => "Friend", :foreign_key => "invited_id", :conditions => "status = #{MuckFriends::BLOCKED}", :dependent => :destroy
 
           has_many :friends,   :through => :friendships, :source => :invited
@@ -68,8 +68,7 @@ module ActiveRecord
         end
         
         # Call to remove friend or follower.  If following is enabled
-        # the user specified by 'user' will become a follower of 
-        # self.
+        # the user specified by 'user' will become a follower of self.
         def drop_friend(user)
           if GlobalConfig.enable_following
             Friend.revert_to_follower(self, user)

data/lib/muck_friends.rb

@@ -1,8 +1,8 @@
 module MuckFriends
   # Statuses Array
   BLOCKED = 2
-  ACCEPTED = 1
-  PENDING = 0
+  FRIENDING = 1
+  FOLLOWING = 0
 end
 
 ActiveRecord::Base.class_eval { include ActiveRecord::Acts::MuckFriend }

data/locales/ar.yml

@@ -5,32 +5,40 @@ ar:
       follow: أتباع
       friends_with: أصدقاء
     friends: 
-      acccept_friend_request: "قبول طلب صديق"
+      acccept_friend_request: "قبول طلب من صديق {{user}}"
       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: "{{name}} has sent you a friend request on {{application_name}}"
       friend_request_links: "{{profile}} sent you a friend request {{accept}} {{ignore}}"
       friend_request_pending: "طلب صديق في انتظار {{link}}"
+      friend_request_prompt: "ارسال طلب {{user}}صديق"
       friend_request_sent: "تم إرسال طلب صديق"
       friends: أصدقاء
       friends_title: أصدقائي
       friends_with: "{{inviter}} is now friends with {{invited}}"
       ignore: (تجاهل)
+      login: "تسجيل الدخول"
+      login_or_sign_up_to_follow: "{{login}} or {{signup}}لمتابعة هذا المستخدم"
+      login_or_sign_up_to_friend: "{{login}} or {{signup}}إرسال طلبات الأصدقاء"
       mutual_friends: "تبادل الأصدقاء"
-      no_followers: "أنت ليست لديها حاليا أي أتباع"
+      no_followers: "لا أتباع"
       no_friends: "أنت ليست لديها حاليا أي الأصدقاء"
-      not_following_anyone: "انك لم تتابع حاليا أحدا"
+      no_mutual_friends: "لا أصدقاء للطرفين ، وجدت"
+      not_following_anyone: "لا وبعد كل"
       problem_adding_follow: "هناك مشكلة واضاف {{user}}لمتابعة القائمة الخاصة بك. يرجى المحاولة مرة أخرى."
       problem_sending_friend_request: "هناك مشكلة في ارسال طلب لصديق {{user}}. يرجى المحاولة مرة أخرى."
-      removed_friendship: "إزالة العلاقة صديق"
+      removed_following_error: "وثمة مشكلة وقعت بينما كان يحاول فولو غير {{user}}"
+      removed_friendship: "إزالة {{user}}من أصدقائك"
+      removed_friendship_error: "هناك مشكلة في إزالة {{user}}من قائمة الأصدقاء"
       same_inviter_error_message: "المستخدم لا يمكن أن يصبح صديقا لذاتهما."
-      sign_up_to_follow: "تسجيل الدخول لمتابعة"
-      start_following: "وبعد بدء"
-      stop_being_friends: "الكف عن أصدقاء"
-      stop_following: "وبعد توقف"
+      signup: الاشتراك
+      start_following: "يتبع {{user}}"
+      stop_being_friends_with: "العدو {{user}}"
+      stop_following: "وبعد توقف {{user}}"
+      stopped_following: "بنجاح بعد توقف {{user}}"
       view_all: "وبالنظر إلى جميع"
       you_are_now_following: "أنت الآن بعد {{user}}"

data/locales/bg.yml

@@ -5,32 +5,40 @@ bg:
       follow: Последователи
       friends_with: Приятели
     friends: 
-      acccept_friend_request: "Приеми приятел Запитване"
+      acccept_friend_request: "Приеми приятел искане от {{user}}"
       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: "{{name}} has sent you a friend request on {{application_name}}"
       friend_request_links: "{{profile}} sent you a friend request {{accept}} {{ignore}}"
       friend_request_pending: "Приятел запитване до {{link}}"
+      friend_request_prompt: "Изпрати на приятел {{user}} Запитване"
       friend_request_sent: "Приятел Искане Изпратени"
       friends: Приятели
       friends_title: "Моите приятели"
       friends_with: "{{inviter}} is now friends with {{invited}}"
       ignore: (пренебрегни)
+      login: влизам
+      login_or_sign_up_to_follow: "{{login}} or {{signup}} Да следват този потребител"
+      login_or_sign_up_to_friend: "{{login}} or {{signup}} Да изпратят молби за приятелство"
       mutual_friends: "Общи приятели"
-      no_followers: "Не е в момента имате някакви последователите"
-      no_friends: "Не Понастоящем приятели"
-      not_following_anyone: "Вие сте в момента не след никого"
+      no_followers: "Не последователите"
+      no_friends: "Вие в момента не са никакви приятели"
+      no_mutual_friends: "Не намери общи приятели"
+      not_following_anyone: "Не След Всеки"
       problem_adding_follow: "Имаше проблем при добавянето {{user}} да ви следват списък. Моля опитайте отново."
       problem_sending_friend_request: "Имаше проблем при изпращането на молба за приятелство с {{user}}. Моля опитайте отново."
-      removed_friendship: "Премахнато приятел отношения"
+      removed_following_error: "Актуален проблем се наблюдава, докато се опитва да unfollow {{user}}"
+      removed_friendship: "Премахнато {{user}} от приятелите си"
+      removed_friendship_error: "Имаше проблем при премахването {{user}} от своя списък с приятели"
       same_inviter_error_message: "Потребителят може да не станат приятели с themself."
-      sign_up_to_follow: "Sign-до Следвайте"
-      start_following: "Започнете След"
-      stop_being_friends: "Спри приятелство"
-      stop_following: "Спри След"
+      signup: логване
+      start_following: "Следвайте {{user}}"
+      stop_being_friends_with: "Unfriend {{user}}"
+      stop_following: "Спри След {{user}}"
+      stopped_following: "Успешно е спряна след {{user}}"
       view_all: "View All"
       you_are_now_following: "Сега след {{user}}"

data/locales/ca.yml

@@ -5,32 +5,40 @@ ca:
       follow: Seguidors
       friends_with: Amics
     friends: 
-      acccept_friend_request: "Acceptar la sol licitud d'amistat"
+      acccept_friend_request: "D'acceptar la sol licitud d'amistat {{user}}"
       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: "{{name}} has sent you a friend request on {{application_name}}"
       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_prompt: "Enviar a un amic Demana {{user}}"
       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)
+      login: "inici de sessió"
+      login_or_sign_up_to_follow: "{{login}} or {{signup}} A aquest usuari"
+      login_or_sign_up_to_friend: "{{login}} or {{signup}} Per enviar sol licituds d'amistat"
       mutual_friends: "Amics mutus"
-      no_followers: "Que actualment no té cap seguidors"
+      no_followers: "Els seguidors no"
       no_friends: "Vostè no té actualment cap amic"
-      not_following_anyone: "Vostè no està actualment següents a ningú"
+      no_mutual_friends: "No va trobar amics"
+      not_following_anyone: "Després no Qualsevol"
       problem_adding_follow: "Hi ha hagut un problema {{user}} afegir a la seva llista de seguiment. Torneu-ho de nou."
       problem_sending_friend_request: "Hi ha hagut un problema l'enviament d'una sol licitud d'amistat {{user}}. Torneu-ho de nou."
-      removed_friendship: "Esborrat relació amic"
+      removed_following_error: "Un problema es va produir en intentar unfollow {{user}}"
+      removed_friendship: "{{user}} Esborrat dels teus amics"
+      removed_friendship_error: "Hi ha hagut un problema {{user}} eliminar de la llista d'amics"
       same_inviter_error_message: "L'usuari no pot convertir-se en amics amb ell mateix."
-      sign_up_to_follow: "Subscriu-te a seguir"
-      start_following: "Després d'iniciar"
-      stop_being_friends: "Deixar de ser amics"
-      stop_following: "Després de deixar de"
+      signup: registre
+      start_following: "Siga {{user}}"
+      stop_being_friends_with: "Unfriend {{user}}"
+      stop_following: "Després d'aturar {{user}}"
+      stopped_following: "Èxit detingut després {{user}}"
       view_all: "Veure tots"
       you_are_now_following: "Ara està després {{user}}"

data/locales/cs.yml

@@ -5,32 +5,40 @@ cs:
       follow: Následovníci
       friends_with: Kamarádi
     friends: 
-      acccept_friend_request: "Přijměte přátelství"
+      acccept_friend_request: "Přijměte přítele žádost {{user}}"
       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: "{{name}} has sent you a friend request on {{application_name}}"
       friend_request_links: "{{profile}} sent you a friend request {{accept}} {{ignore}}"
       friend_request_pending: "Přátelství čeká {{link}}"
+      friend_request_prompt: "Poslat {{user}} přítele Žádost"
       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)
+      login: přihlásit
+      login_or_sign_up_to_follow: "{{login}} or {{signup}} Následovat tohoto uživatele"
+      login_or_sign_up_to_friend: "{{login}} or {{signup}} Poslat kamarádovi žádostí"
       mutual_friends: "Vzájemné Přátelé"
-      no_followers: "Nemusíte mít v současné době žádné následovníky"
+      no_followers: "Ne následovníci"
       no_friends: "Nemusíte mít v současné době žádné přátele"
-      not_following_anyone: "Ty v současné době nejsou tyto kdokoliv"
+      no_mutual_friends: "No nalézt společné přátele"
+      not_following_anyone: "Po ne Kdokoliv"
       problem_adding_follow: "Došlo k problému {{user}} přidáte do svého seznamu následovat. Prosím, zkuste to znovu."
       problem_sending_friend_request: "Došlo k problému při odesílání příteli žádost {{user}}. Prosím, zkuste to znovu."
-      removed_friendship: "Odstraněny příteli vztah"
+      removed_following_error: "A problém nastal při pokusu o unfollow {{user}}"
+      removed_friendship: "Odstraněny {{user}} z vašich přátel"
+      removed_friendship_error: "Došlo k problému odstranění {{user}} z vašeho seznamu přátel"
       same_inviter_error_message: "Uživatel se nemůže stát přítelem themself."
-      sign_up_to_follow: "Zaregistruj-až Následná"
-      start_following: "Start Po"
-      stop_being_friends: "Stop Být Přátelé"
-      stop_following: "Stop Po"
+      signup: přihlášení
+      start_following: "Postupujte {{user}}"
+      stop_being_friends_with: "Unfriend {{user}}"
+      stop_following: "Stop Po {{user}}"
+      stopped_following: "Úspěšně zastavil po {{user}}"
       view_all: "Zobrazit vše"
       you_are_now_following: "Ty jsou nyní tyto {{user}}"