muck-friends 0.1.6 → 0.1.7

data/locales/zh-CN.yml

@@ -5,32 +5,40 @@ zh-CN:
       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: "出现了问题，而试图unfollow {{user}}"
+      removed_friendship: "删除{{user}}从您的朋友"
+      removed_friendship_error: "有一个问题，消除{{user}}从您的列表中的朋友"
       same_inviter_error_message: "用户不能成为朋友themself 。"
-      sign_up_to_follow: 注册后续
-      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: 查看全部
       you_are_now_following: "您现在以下{{user}}"

data/locales/zh-TW.yml

@@ -5,32 +5,40 @@ zh-TW:
       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: "出現了問題，而試圖unfollow {{user}}"
+      removed_friendship: "刪除{{user}}從您的朋友"
+      removed_friendship_error: "有一個問題，消除{{user}}從您的列表中的朋友"
       same_inviter_error_message: "用戶不能成為朋友themself 。"
-      sign_up_to_follow: 註冊後續
-      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: 查看全部
       you_are_now_following: "您現在以下{{user}}"

data/locales/zh.yml

@@ -5,32 +5,40 @@ zh:
       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: "出现了问题，而试图unfollow {{user}}"
+      removed_friendship: "删除{{user}}从您的朋友"
+      removed_friendship_error: "有一个问题，消除{{user}}从您的列表中的朋友"
       same_inviter_error_message: "用户不能成为朋友themself 。"
-      sign_up_to_follow: 注册后续
-      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: 查看全部
       you_are_now_following: "您现在以下{{user}}"

data/muck-friends.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-friends}
-  s.version = "0.1.6"
+  s.version = "0.1.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball"]
-  s.date = %q{2009-08-12}
+  s.date = %q{2009-08-13}
   s.description = %q{Friend engine for the muck system.}
   s.email = %q{justinball@gmail.com}
   s.extra_rdoc_files = [
@@ -34,6 +34,7 @@ Gem::Specification.new do |s|
      "app/views/friends/_friend_icon.html.erb",
      "app/views/friends/_friend_requests.html.erb",
      "app/views/friends/_friend_simple.html.erb",
+     "app/views/friends/_friend_tiny_icon.html.erb",
      "app/views/friends/_mutual_friends.html.erb",
      "app/views/friends/index.html.erb",
      "config/muck_friends_routes.rb",

data/test/rails_root/test/functional/default_controller_test.rb

@@ -68,7 +68,7 @@ class Muck::DefaultControllerTest < ActionController::TestCase
           should_respond_with :success
           should_render_template :friend_link
           should "have login/signup in the body" do
-            assert @response.body.include?(I18n.t("muck.friends.muck.friends.login_or_sign_up_to_follow"), :login => link_to(I18n.t('muck.friends.login'), login_path), :signup => link_to(I18n.t('muck.friends.signup'), signup_path))
+            assert @response.body.include?(I18n.t('muck.friends.login'))
           end
         end
         context "current user is not friends with other user" do
@@ -120,7 +120,7 @@ class Muck::DefaultControllerTest < ActionController::TestCase
           should_respond_with :success
           should_render_template :friend_link
           should "have login/signup in the body" do
-            assert @response.body.include?(I18n.t("muck.friends.muck.friends.login_or_sign_up_to_follow"), :login => link_to(I18n.t('muck.friends.login'), login_path), :signup => link_to(I18n.t('muck.friends.signup'), signup_path))
+            assert @response.body.include?(I18n.t('muck.friends.login'))
           end
         end
         context "current user is not following other user" do
@@ -174,7 +174,7 @@ class Muck::DefaultControllerTest < ActionController::TestCase
           should_respond_with :success
           should_render_template :friend_link
           should "have login/signup in the body" do
-            assert @response.body.include?(I18n.t("muck.friends.muck.friends.login_or_sign_up_to_friend"), :login => link_to(I18n.t('muck.friends.login'), login_path), :signup => link_to(I18n.t('muck.friends.signup'), signup_path))
+            assert @response.body.include?(I18n.t('muck.friends.login'))
           end
         end
         context "current user is not friends with the other user" do

data/test/rails_root/test/unit/friend_test.rb

@@ -16,146 +16,139 @@ class FriendTest < ActiveSupport::TestCase
       @follower_guy = Factory(:user)
     end
 
-    should "be able to start and stop following aaron" do
-      Friend.destroy_all
-      assert !@friend_guy.following?(@aaron)
-      assert_difference "Friend.count" do
-        Friend.add_follower(@friend_guy, @aaron)
-        @aaron.reload
-        @friend_guy.reload
-        assert @friend_guy.following?(@aaron)
+    context "No entries in friends" do
+      setup do
+        Friend.destroy_all
       end
-      assert_difference "Friend.count", -1 do
-        Friend.stop_following(@friend_guy, @aaron)
-        @aaron.reload and @friend_guy.reload
+      should "be able to start and stop following aaron" do
         assert !@friend_guy.following?(@aaron)
+        assert_difference "Friend.count" do
+          Friend.add_follower(@friend_guy, @aaron)
+          @aaron.reload
+          @friend_guy.reload
+          assert @friend_guy.following?(@aaron)
+        end
+        assert_difference "Friend.count", -1 do
+          Friend.stop_following(@friend_guy, @aaron)
+          @aaron.reload and @friend_guy.reload
+          assert !@friend_guy.following?(@aaron)
+        end
       end
-    end
 
-    should "not have any effect on friends" do
-      Friend.destroy_all
-      assert_no_difference "Friend.count" do        
-        assert !Friend.stop_following(@friend_guy, @aaron)
-      end
-      assert_no_difference "Friend.count" do        
-        assert !Friend.stop_being_friends(@friend_guy, @aaron)
+      should "not have any effect on friends" do
+        assert_no_difference "Friend.count" do        
+          assert !Friend.stop_following(@friend_guy, @aaron)
+        end
+        assert_no_difference "Friend.count" do        
+          assert Friend.stop_being_friends(@friend_guy, @aaron) # will return true as long as no friend entries are found for the given users
+        end
       end
-    end
     
-    should "not create an association with the same user" do
-      Friend.destroy_all    
-      assert !Friend.add_follower(@quentin, @quentin)
-      assert_equal 0, Friend.count
-    end
+      should "not create an association with the same user" do
+        assert !Friend.add_follower(@quentin, @quentin)
+        assert_equal 0, Friend.count
+      end
 
-    should "create a new follower" do
-      Friend.destroy_all
-      assert Friend.add_follower(@quentin, @aaron)
-      assert_equal 1, Friend.count
-      assert !@quentin.reload.friend_of?(@aaron.reload)
-      assert @quentin.following?(@aaron)
-      assert @aaron.followed_by?(@quentin)
-    end
+      should "create a new follower" do
+        assert Friend.add_follower(@quentin, @aaron)
+        assert_equal 1, Friend.count
+        assert !@quentin.reload.friend_of?(@aaron.reload)
+        assert @quentin.following?(@aaron)
+        assert @aaron.followed_by?(@quentin)
+      end
 
-    should "not find a following to turn into a friendship so just makes a follower" do
-      Friend.destroy_all
-      assert Friend.make_friends(@quentin, @aaron)
-      assert_equal 1, Friend.count
-      assert !@quentin.reload.friend_of?(@aaron.reload)
-      assert @quentin.following?(@aaron)
-      assert @aaron.followed_by?(@quentin)
-    end
+      should "not find a following to turn into a friendship so just makes a follower" do
+        assert Friend.make_friends(@quentin, @aaron)
+        assert_equal 1, Friend.count
+        assert !@quentin.reload.friend_of?(@aaron.reload)
+        assert @quentin.following?(@aaron)
+        assert @aaron.followed_by?(@quentin)
+      end
 
-    should "turn a following into a friendship" do
-      Friend.destroy_all
-      assert Friend.add_follower(@quentin, @aaron)
-      assert_equal 1, Friend.count
-      assert Friend.make_friends(@aaron, @quentin)
-      assert_equal 2, Friend.count
-      @quentin.reload
-      @aaron.reload
-      assert @quentin.friend_of?(@aaron)
-      assert @aaron.friend_of?(@quentin)
-    end
+      should "turn a following into a friendship" do
+        assert Friend.add_follower(@quentin, @aaron)
+        assert_equal 1, Friend.count
+        assert Friend.make_friends(@aaron, @quentin)
+        assert_equal 2, Friend.count
+        @quentin.reload
+        @aaron.reload
+        assert @quentin.friend_of?(@aaron)
+        assert @aaron.friend_of?(@quentin)
+      end
 
-    should "turn a following into a friendship with reversed users" do
-      Friend.destroy_all
-      assert Friend.add_follower(@quentin, @aaron)
-      assert_equal 1, Friend.count
-      assert Friend.make_friends(@quentin, @aaron)
-      assert_equal 2, Friend.count
-      @quentin.reload
-      @aaron.reload
-      assert @quentin.friend_of?(@aaron)
-      assert @aaron.friend_of?(@quentin)
-    end
+      should "turn a following into a friendship with reversed users" do
+        assert Friend.add_follower(@quentin, @aaron)
+        assert_equal 1, Friend.count
+        assert Friend.make_friends(@quentin, @aaron)
+        assert_equal 2, Friend.count
+        @quentin.reload
+        @aaron.reload
+        assert @quentin.friend_of?(@aaron)
+        assert @aaron.friend_of?(@quentin)
+      end
 
-    should "not find a friendship so can't stop being friends" do
-      Friend.destroy_all
-      assert !Friend.revert_to_follower(@quentin, @aaron)
-    end
+      should "not find a friendship so can't stop being friends" do
+        assert !Friend.revert_to_follower(@quentin, @aaron) # revert_to_follower will return true as long as the desired state (reverted to follower) is achieved.
+      end
 
-    should "revert to follower" do
-      Friend.destroy_all
-      assert Friend.add_follower(@quentin, @aaron)
-      assert Friend.make_friends(@quentin, @aaron)
-      assert_equal 2, Friend.count
-      @quentin.reload
-      @aaron.reload
-      assert Friend.revert_to_follower(@quentin, @aaron)
-      assert_equal 1, Friend.count
-      @quentin.reload
-      @aaron.reload
-      assert !@quentin.friend_of?(@aaron)
-      assert !@quentin.following?(@aaron)
-      assert @quentin.followed_by?(@aaron)
-      assert !@aaron.friend_of?(@quentin)
-      assert @aaron.following?(@quentin)
-      assert !@aaron.followed_by?(@quentin)
-    end
+      should "revert to follower" do
+        assert Friend.add_follower(@quentin, @aaron)
+        assert Friend.make_friends(@quentin, @aaron)
+        assert_equal 2, Friend.count
+        @quentin.reload
+        @aaron.reload
+        assert Friend.revert_to_follower(@quentin, @aaron)
+        assert_equal 1, Friend.count
+        @quentin.reload
+        @aaron.reload
+        assert !@quentin.friend_of?(@aaron)
+        assert !@quentin.following?(@aaron)
+        assert @quentin.followed_by?(@aaron)
+        assert !@aaron.friend_of?(@quentin)
+        assert @aaron.following?(@quentin)
+        assert !@aaron.followed_by?(@quentin)
+      end
 
-    should "stop being friends" do
-      Friend.destroy_all
-      assert Friend.add_follower(@quentin, @aaron)
-      assert Friend.make_friends(@quentin, @aaron)
-      assert_equal 2, Friend.count
-      @quentin.reload
-      @aaron.reload
-      assert Friend.stop_being_friends(@quentin, @aaron)
-      @quentin.reload
-      @aaron.reload
-      assert !@quentin.friend_of?(@aaron)
-      assert !@quentin.following?(@aaron)
-      assert !@quentin.followed_by?(@aaron)
-      assert !@aaron.friend_of?(@quentin)
-      assert !@aaron.following?(@quentin)
-      assert !@aaron.followed_by?(@quentin)
-    end
+      should "stop being friends" do
+        assert Friend.add_follower(@quentin, @aaron)
+        assert Friend.make_friends(@quentin, @aaron)
+        assert_equal 2, Friend.count
+        @quentin.reload
+        @aaron.reload
+        assert Friend.stop_being_friends(@quentin, @aaron)
+        @quentin.reload
+        @aaron.reload
+        assert !@quentin.friend_of?(@aaron)
+        assert !@quentin.following?(@aaron)
+        assert !@quentin.followed_by?(@aaron)
+        assert !@aaron.friend_of?(@quentin)
+        assert !@aaron.following?(@quentin)
+        assert !@aaron.followed_by?(@quentin)
+      end
 
-    should "block friend" do
-      Friend.destroy_all
-      assert Friend.add_follower(@quentin, @aaron)
-      assert Friend.make_friends(@quentin, @aaron)
-      Friend.block_user(@quentin, @aaron)
-      assert @quentin.blocked_users.include?(@aaron)
-      assert !@quentin.friend_of?(@aaron)
-      assert !@quentin.followed_by?(@aaron)
-      assert !@quentin.following?(@aaron)
-      assert !@aaron.friend_of?(@quentin)
-      assert !@aaron.followed_by?(@quentin)
-      assert !@aaron.following?(@quentin)
-    end
+      should "block friend" do
+        assert Friend.add_follower(@quentin, @aaron)
+        assert Friend.make_friends(@quentin, @aaron)
+        Friend.block_user(@quentin, @aaron)
+        assert @quentin.blocked_users.include?(@aaron)
+        assert !@quentin.friend_of?(@aaron)
+        assert !@quentin.followed_by?(@aaron)
+        assert !@quentin.following?(@aaron)
+        assert !@aaron.friend_of?(@quentin)
+        assert !@aaron.followed_by?(@quentin)
+        assert !@aaron.following?(@quentin)
+      end
     
-    should "block follower" do
-      Friend.destroy_all
-      assert Friend.add_follower(@quentin, @aaron)
-      Friend.block_user(@aaron, @quentin)
-      assert @aaron.blocked_users.include?(@quentin)
-      assert !@quentin.friend_of?(@aaron)
-      assert !@quentin.following?(@aaron)
-      assert !@aaron.friend_of?(@quentin)
-      assert !@aaron.following?(@quentin)
-      assert !@aaron.followed_by?(@quentin)
+      should "block follower" do
+        assert Friend.add_follower(@quentin, @aaron)
+        Friend.block_user(@aaron, @quentin)
+        assert @aaron.blocked_users.include?(@quentin)
+        assert !@quentin.friend_of?(@aaron)
+        assert !@quentin.following?(@aaron)
+        assert !@aaron.friend_of?(@quentin)
+        assert !@aaron.following?(@quentin)
+        assert !@aaron.followed_by?(@quentin)
+      end
     end
     
     should "ignore block user request" do