muck-friends 0.1.1 → 0.1.2

data/locales/sv.yml

@@ -9,13 +9,18 @@ sv:
       accept: (acceptera)
       delete: (radera)
       follow_activity: "{{inviter}} is now following {{invited}}"
+      followers: Efterföljare
+      following: Följande
       following_you: "{{name}} is now following you on {{application_name}}"
       friend_request: Vänbegäran
+      friend_request_links: "{{profile}} sent you a friend request {{accept}} {{ignore}}"
       friend_request_pending: "Vänbegäran väntan {{link}}"
       friend_request_sent: "Vänbegäran Skickat"
+      friends: Vänner
       friends_title: "Mina vänner"
       friends_with: "{{inviter}} is now friends with {{invited}}"
       ignore: (ignorera)
+      mutual_friends: "Ömsesidigt Vänner"
       no_followers: "Du för närvarande inte har några anhängare"
       no_friends: "Du för närvarande inte har några vänner"
       not_following_anyone: "Du är för närvarande inte efter någon"

data/locales/th.yml

@@ -9,13 +9,18 @@ th:
       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/tl.yml

@@ -9,13 +9,18 @@ tl:
       accept: (tanggapin)
       delete: (tanggalin)
       follow_activity: "{{inviter}} is now following {{invited}}"
+      followers: Mga
+      following: Sumusunod
       following_you: "{{name}} is now following you on {{application_name}}"
       friend_request: "Kaibigan ng Kahilingan"
+      friend_request_links: "{{profile}} sent you a friend request {{accept}} {{ignore}}"
       friend_request_pending: "Friend request pending {{link}}"
       friend_request_sent: "Kaibigan Naipadalang Kahilingan"
+      friends: "Mga kaibigan"
       friends_title: "Aking Kaibigan"
       friends_with: "{{inviter}} is now friends with {{invited}}"
       ignore: "(huwag pansinin)"
+      mutual_friends: "Mutual Kaibigan"
       no_followers: "Ikaw ay hindi kasalukuyan ay may anumang mga"
       no_friends: "Ikaw ay hindi kasalukuyan ay may anumang mga kaibigan"
       not_following_anyone: "Ikaw ay kasalukuyang hindi sumusunod na kahit sino"

data/locales/tr.yml

@@ -9,13 +9,18 @@ tr:
       accept: "() kabul"
       delete: (sil)
       follow_activity: "{{inviter}} is now following {{invited}}"
+      followers: Taraftar
+      following: Sonraki
       following_you: "{{name}} is now following you on {{application_name}}"
       friend_request: "Arkadaşına İstek"
+      friend_request_links: "{{profile}} sent you a friend request {{accept}} {{ignore}}"
       friend_request_pending: "Arkadaş isteğini bekleyen {{link}}"
       friend_request_sent: "Arkadaşına İstek Gönderildi"
+      friends: Arkadaşlar
       friends_title: Arkadaşlar
       friends_with: "{{inviter}} is now friends with {{invited}}"
       ignore: "() yok saymak"
+      mutual_friends: "Karşılıklı Arkadaşlar"
       no_followers: "Şu anda herhangi bir kişiyi yok"
       no_friends: "Şu anda herhangi bir arkadaş yok"
       not_following_anyone: "Şu anda herkes aşağıdaki değildir"

data/locales/uk.yml

@@ -9,13 +9,18 @@ uk:
       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/vi.yml

@@ -9,13 +9,18 @@ vi:
       accept: "(chấp nhận)"
       delete: (xóa)
       follow_activity: "{{inviter}} is now following {{invited}}"
+      followers: Những
+      following: Sau
       following_you: "{{name}} is now following you on {{application_name}}"
       friend_request: "Yêu cầu bạn bè"
+      friend_request_links: "{{profile}} sent you a friend request {{accept}} {{ignore}}"
       friend_request_pending: "Bạn bè đang chờ giải quyết yêu cầu {{link}}"
       friend_request_sent: "Yêu cầu người bạn đã gửi"
+      friends: "Bạn bè"
       friends_title: "Bạn bè của tôi"
       friends_with: "{{inviter}} is now friends with {{invited}}"
       ignore: "(bỏ qua)"
+      mutual_friends: "Cùng bạn bè"
       no_followers: "Bạn hiện tại không có bất kỳ những"
       no_friends: "Bạn hiện tại không có bất cứ bạn bè"
       not_following_anyone: "Bạn không có hiện sau đây bất cứ ai"

data/locales/zh-CN.yml

@@ -9,13 +9,18 @@ zh-CN:
       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/zh-TW.yml

@@ -9,13 +9,18 @@ zh-TW:
       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/zh.yml

@@ -9,13 +9,18 @@ zh:
       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/muck-friends.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-friends}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball"]
-  s.date = %q{2009-07-07}
+  s.date = %q{2009-07-08}
   s.description = %q{Friend engine for the muck system.}
   s.email = %q{justinball@gmail.com}
   s.extra_rdoc_files = [
@@ -27,10 +27,10 @@ Gem::Specification.new do |s|
      "app/views/friend_mailer/follow.text.plain.erb",
      "app/views/friend_mailer/friend_request.text.html.erb",
      "app/views/friend_mailer/friend_request.text.plain.erb",
+     "app/views/friends/_all_friends.html.erb",
+     "app/views/friends/_friend_requests.html.erb",
      "app/views/friends/_friend_simple.html.erb",
-     "app/views/friends/_friends.html.erb",
-     "app/views/friends/_notifications.html.erb",
-     "app/views/friends/friend_or_follow_request.html.erb",
+     "app/views/friends/_mutual_friends.html.erb",
      "app/views/friends/index.html.erb",
      "config/muck_friends_routes.rb",
      "db/migrate/20090608073052_create_friends.rb",
@@ -98,9 +98,15 @@ Gem::Specification.new do |s|
      "test/rails_root/app/models/.keep",
      "test/rails_root/app/models/activity.rb",
      "test/rails_root/app/models/friend.rb",
+     "test/rails_root/app/models/profile.rb",
      "test/rails_root/app/models/user.rb",
      "test/rails_root/app/models/user_session.rb",
-     "test/rails_root/app/views/default/index.html.erb",
+     "test/rails_root/app/views/default/all_friends.html.erb",
+     "test/rails_root/app/views/default/followers.html.erb",
+     "test/rails_root/app/views/default/followings.html.erb",
+     "test/rails_root/app/views/default/friend_requests.html.erb",
+     "test/rails_root/app/views/default/friends.html.erb",
+     "test/rails_root/app/views/default/mutual_friends.html.erb",
      "test/rails_root/app/views/layouts/default.html.erb",
      "test/rails_root/config/amazon_s3.yml",
      "test/rails_root/config/boot.rb",
@@ -118,6 +124,7 @@ Gem::Specification.new do |s|
      "test/rails_root/db/.keep",
      "test/rails_root/db/migrate/20090320174818_create_muck_permissions_and_roles.rb",
      "test/rails_root/db/migrate/20090402033319_add_muck_activities.rb",
+     "test/rails_root/db/migrate/20090512013727_create_profiles.rb",
      "test/rails_root/db/migrate/20090602041838_create_users.rb",
      "test/rails_root/db/migrate/20090608073052_create_friends.rb",
      "test/rails_root/features/step_definitions/webrat_steps.rb",
@@ -279,6 +286,7 @@ Gem::Specification.new do |s|
      "test/rails_root/script/server",
      "test/rails_root/test/factories.rb",
      "test/rails_root/test/functional/.keep",
+     "test/rails_root/test/functional/default_controller_test.rb",
      "test/rails_root/test/functional/friends_controller_test.rb",
      "test/rails_root/test/integration/.keep",
      "test/rails_root/test/mocks/development/.keep",
@@ -320,6 +328,7 @@ Gem::Specification.new do |s|
      "test/rails_root/app/helpers/application_helper.rb",
      "test/rails_root/app/models/activity.rb",
      "test/rails_root/app/models/friend.rb",
+     "test/rails_root/app/models/profile.rb",
      "test/rails_root/app/models/user.rb",
      "test/rails_root/app/models/user_session.rb",
      "test/rails_root/config/boot.rb",
@@ -334,6 +343,7 @@ Gem::Specification.new do |s|
      "test/rails_root/config/routes.rb",
      "test/rails_root/db/migrate/20090320174818_create_muck_permissions_and_roles.rb",
      "test/rails_root/db/migrate/20090402033319_add_muck_activities.rb",
+     "test/rails_root/db/migrate/20090512013727_create_profiles.rb",
      "test/rails_root/db/migrate/20090602041838_create_users.rb",
      "test/rails_root/db/migrate/20090608073052_create_friends.rb",
      "test/rails_root/db/schema.rb",
@@ -342,6 +352,7 @@ Gem::Specification.new do |s|
      "test/rails_root/public/dispatch.rb",
      "test/rails_root/script/create_project.rb",
      "test/rails_root/test/factories.rb",
+     "test/rails_root/test/functional/default_controller_test.rb",
      "test/rails_root/test/functional/friends_controller_test.rb",
      "test/rails_root/test/shoulda_macros/controller.rb",
      "test/rails_root/test/shoulda_macros/forms.rb",

data/test/rails_root/Rakefile

@@ -13,3 +13,4 @@ require 'muck_engine/tasks'
 require 'muck_users/tasks'
 require 'muck_activities/tasks'
 require 'muck_friends/tasks'
+require 'muck_profiles/tasks'

data/test/rails_root/app/controllers/default_controller.rb

@@ -1,7 +1,9 @@
 class DefaultController < ApplicationController
+  before_filter :get_user
   
-  def index
-    @user = User.create
+  def get_user
+    # a bit of a hack but this grabs the 'other_user' stubbed out in the test and makes @user available to helper methods
+    @user = other_user
   end
   
 end

data/test/rails_root/app/models/profile.rb

@@ -0,0 +1,3 @@
+class Profile < ActiveRecord::Base
+  acts_as_muck_profile
+end

data/test/rails_root/app/models/user.rb

@@ -4,5 +4,6 @@ class User < ActiveRecord::Base
   end
   acts_as_muck_user
   acts_as_muck_friend_user
+  has_muck_profile
   has_activities
 end

data/test/rails_root/app/views/default/followers.html.erb

@@ -0,0 +1 @@
+<%= followers(current_user) %>

data/test/rails_root/app/views/default/followings.html.erb

@@ -0,0 +1 @@
+<%= followings(current_user) %>

data/test/rails_root/app/views/default/friend_requests.html.erb

@@ -0,0 +1 @@
+<%= friend_requests(current_user) %>

data/test/rails_root/app/views/default/friends.html.erb

@@ -0,0 +1 @@
+<%= friends(current_user) %>

data/test/rails_root/app/views/default/mutual_friends.html.erb

@@ -0,0 +1 @@
+<%= mutual_friends(current_user, @user) %>

data/test/rails_root/config/environment.rb

@@ -17,6 +17,7 @@ Rails::Initializer.run do |config|
   config.time_zone = 'UTC'
   config.gem "authlogic"
   config.gem "bcrypt-ruby", :lib => "bcrypt"
+  config.gem 'thoughtbot-paperclip', :lib => 'paperclip', :source => "http://gems.github.com"
   config.gem 'muck-engine', :lib => 'muck_engine'
   config.gem 'muck-users', :lib => 'muck_users'
   config.gem 'muck-profiles', :lib => 'muck_profiles'

data/test/rails_root/config/routes.rb

@@ -1,3 +1,5 @@
 ActionController::Routing::Routes.draw do |map|
-  map.root :controller => 'default', :action => 'index'
+  map.connect ':controller/:action/:id'
+  map.connect ':controller/:action/:id.:format'
+  
 end

data/test/rails_root/db/migrate/20090512013727_create_profiles.rb

@@ -0,0 +1,21 @@
+class CreateProfiles < ActiveRecord::Migration
+  
+  def self.up
+  
+    create_table :profiles, :force => true do |t|
+      t.integer  :user_id
+      t.string :photo_file_name
+      t.string :photo_content_type
+      t.integer :photo_file_size
+      t.timestamps
+    end
+
+    add_index :profiles, ['user_id']
+
+  end
+
+  def self.down
+    drop_table :profiles
+  end
+  
+end

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

@@ -0,0 +1,101 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+# this tests the friends helper methods
+class Muck::DefaultControllerTest < ActionController::TestCase
+
+  tests DefaultController
+
+  context "" do
+    setup do
+      @aaron = Factory(:user)
+      @quentin = Factory(:user)
+      @follower1 = Factory(:user)
+      @follower2 = Factory(:user)
+      @friend1 = Factory(:user)
+      @friend2 = Factory(:user)
+      @friend3 = Factory(:user)
+      @mutual_friend1 = Factory(:user)
+      @mutual_friend2 = Factory(:user)
+      
+      # aaron's followers
+      @follower1.follow(@aaron)
+      @follower2.follow(@aaron)
+      
+      # aaron's friends
+      @friend1.follow(@aaron)
+      @friend2.follow(@aaron)
+      @friend2.follow(@aaron)
+      @aaron.become_friends_with(@friend1)
+      @aaron.become_friends_with(@friend2)
+      @aaron.become_friends_with(@friend3)
+                  
+      # mutual friends
+      @mutual_friend1.follow(@aaron)
+      @mutual_friend2.follow(@aaron)
+      @aaron.become_friends_with(@mutual_friend1)
+      @aaron.become_friends_with(@mutual_friend2)
+
+      @mutual_friend1.follow(@quentin)
+      @mutual_friend2.follow(@quentin)
+      @quentin.become_friends_with(@mutual_friend1)
+      @quentin.become_friends_with(@mutual_friend2)
+      
+      @controller.stubs(:current_user).returns(@aaron)
+      @controller.stubs(:other_user).returns(@quentin)
+    end
+    
+    context 'all friends' do
+      setup do
+        get :all_friends
+      end
+      should_respond_with :success
+      should_render_template :all_friends
+    end
+  
+    context 'mutual friends' do
+      setup do
+        get :mutual_friends
+      end
+      should_respond_with :success
+      should_render_template :mutual_friends
+    end
+    
+    context 'friends' do
+      setup do
+        get :friends
+      end
+      should_respond_with :success
+      should_render_template :friends
+    end
+    
+    context 'followers' do
+      setup do
+        get :followers
+      end
+      should_respond_with :success
+      should_render_template :followers
+    end
+    
+    context 'followings' do
+      setup do
+        get :followings
+      end
+      should_respond_with :success
+      should_render_template :followings
+    end
+    
+    context 'friend requests' do
+      setup do
+        @allow_following = GlobalConfig.allow_following
+        GlobalConfig.allow_following = false
+        get :friend_requests
+      end
+      teardown do
+        GlobalConfig.allow_following = @allow_following
+      end
+      should_respond_with :success
+      should_render_template :friend_requests
+    end
+    
+  end
+end