muck-friends 0.1.9 → 0.1.10

data/muck-friends.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-friends}
-  s.version = "0.1.9"
+  s.version = "0.1.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball"]
-  s.date = %q{2009-08-13}
+  s.date = %q{2009-09-10}
   s.description = %q{Friend engine for the muck system.}
   s.email = %q{justinball@gmail.com}
   s.extra_rdoc_files = [
@@ -74,7 +74,6 @@ Gem::Specification.new do |s|
      "locales/no.yml",
      "locales/pl.yml",
      "locales/pt-PT.yml",
-     "locales/pt.yml",
      "locales/ro.yml",
      "locales/ru.yml",
      "locales/sk.yml",
@@ -107,6 +106,7 @@ Gem::Specification.new do |s|
      "test/rails_root/app/models/user.rb",
      "test/rails_root/app/models/user_session.rb",
      "test/rails_root/app/views/default/all_friends.html.erb",
+     "test/rails_root/app/views/default/block_user_link.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_link.html.erb",
@@ -347,12 +347,11 @@ Gem::Specification.new do |s|
      "test/rails_root/vendor/plugins/validation_reflection/test/validation_reflection_test.rb",
      "uninstall.rb"
   ]
-  s.has_rdoc = true
   s.homepage = %q{http://github.com/jbasdf/muck_friends}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{muck-friends}
-  s.rubygems_version = %q{1.3.1}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{Friends engine for the muck system}
   s.test_files = [
     "test/rails_root/app/controllers/application_controller.rb",
@@ -410,7 +409,7 @@ Gem::Specification.new do |s|
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
+    s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<muck-engine>, [">= 0"])

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

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

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

@@ -44,6 +44,49 @@ class Muck::DefaultControllerTest < ActionController::TestCase
       @controller.stubs(:other_user).returns(@quentin)
     end
     
+    context "block user link" do
+      context "users have no relationship" do
+        setup do
+          @controller.stubs(:current_user).returns(@aaron)
+          get :block_user_link
+        end
+        should_respond_with :success
+        should_render_template :block_user_link
+        should "not have block link in the body" do
+          assert !@response.body.include?(I18n.t('muck.friends.block', :user => @quentin.display_name))
+          assert !@response.body.include?(I18n.t('muck.friends.unblock', :user => @quentin.display_name))
+        end
+      end      
+      context "logged in as aaron" do
+        context "quentin following aaron" do
+          setup do
+            assert @quentin.follow(@aaron)
+            @controller.stubs(:current_user).returns(@aaron)
+            get :block_user_link
+          end
+          should_respond_with :success
+          should_render_template :block_user_link
+          should "have 'block' in the body" do
+            assert @response.body.include?(I18n.t('muck.friends.block', :user => @quentin.display_name))
+          end
+        end
+        context "aaron has blocked quentin" do
+          setup do
+            assert @quentin.follow(@aaron)
+            assert @aaron.block_user(@quentin)
+            assert @aaron.blocked?(@quentin)
+            @controller.stubs(:current_user).returns(@aaron)
+            get :block_user_link
+          end
+          should_respond_with :success
+          should_render_template :block_user_link
+          should "have 'unblock' in the body" do
+            assert @response.body.include?(I18n.t('muck.friends.unblock', :user => @quentin.display_name))
+          end
+        end
+      end
+    end
+    
     context "friend link" do
       setup do
         @enable_following = GlobalConfig.enable_following

data/test/rails_root/test/functional/friends_controller_test.rb

@@ -77,7 +77,7 @@ class Muck::FriendsControllerTest < ActionController::TestCase
       context "make a friendship" do
         setup do
           Friend.destroy_all
-          Friend.make_friends @quentin, @aaron
+          Friend.add_follower(@quentin, @aaron)
           post :create, { :id => @aaron.to_param, :format=>'js'}
         end
         should_respond_with :success
@@ -92,6 +92,39 @@ class Muck::FriendsControllerTest < ActionController::TestCase
         end
       end
 
+      context "update - block user" do
+        setup do
+          Friend.destroy_all
+          Friend.add_follower(@quentin, @aaron)
+          Friend.make_friends(@quentin, @aaron)
+          post :update, { :id => @aaron.to_param, :block => true, :format=>'js'}
+        end
+        should_respond_with :success
+        should_not_set_the_flash
+        should "block user" do
+          @quentin.reload
+          @aaron.reload
+          assert @quentin.blocked?(@aaron)
+        end
+      end
+
+      context "update - unblock user" do
+        setup do
+          Friend.destroy_all
+          Friend.add_follower(@quentin, @aaron)
+          Friend.make_friends(@quentin, @aaron)
+          @quentin.block_user(@aaron)
+          post :update, { :id => @aaron.to_param, :block => false, :format=>'js'}
+        end
+        should_respond_with :success
+        should_not_set_the_flash
+        should "unblock user" do
+          @quentin.reload
+          @aaron.reload
+          assert !@quentin.blocked?(@aaron)
+        end
+      end
+      
       context "error while trying to make an invalid friendship" do
         setup do
           Friend.destroy_all

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

@@ -149,6 +149,13 @@ class FriendTest < ActiveSupport::TestCase
         assert !@aaron.following?(@quentin)
         assert !@aaron.followed_by?(@quentin)
       end
+      
+      should "show if user is blocked" do
+        assert Friend.add_follower(@quentin, @aaron)
+        Friend.block_user(@aaron, @quentin)
+        assert Friend.blocked?(@aaron, @quentin)
+      end
+      
     end
     
     should "ignore block user request" do

data/test/rails_root/test/unit/user_test.rb

@@ -87,6 +87,7 @@ class UserTest < ActiveSupport::TestCase
         assert @aaron.following?(@quentin)
         assert !@aaron.followed_by?(@quentin)
       end
+      
       context "drop_friend" do
         setup do
           assert @quentin.follow(@aaron)
@@ -102,10 +103,6 @@ class UserTest < ActiveSupport::TestCase
           assert !@quentin.followings.any?{|f| f.id == @aaron.id}
         end
       end
-      should "become friends" do
-        assert @aaron.follow(@quentin)
-        assert @quentin.become_friends_with(@aaron)
-      end
 
       should "have friends" do
         assert @aaron.follow(@quentin)
@@ -176,6 +173,7 @@ class UserTest < ActiveSupport::TestCase
         assert @aaron.friends.any?{|f| f.id == @quentin.id}
         assert @quentin.friends.any?{|f| f.id == @aaron.id}
       end
+
       should "not have a network" do
         assert !@quentin.has_network?
       end
@@ -191,6 +189,7 @@ class UserTest < ActiveSupport::TestCase
         assert !@aaron.friends.any?{|f| f.id == @quentin.id}
         assert !@aaron.followers.any?{|f| f.id == @quentin.id}
         assert !@quentin.followings.any?{|f| f.id == @aaron.id}
+        assert @aaron.blocked?(@quentin)
       end
 
       should "unblock user" do
@@ -199,7 +198,18 @@ class UserTest < ActiveSupport::TestCase
         assert @aaron.unblock_user(@quentin)
         assert @aaron.followers.any?{|f| f.id == @quentin.id}
         assert @quentin.followings.any?{|f| f.id == @aaron.id}
+        assert !@aaron.blocked?(@quentin)
+      end
+      
+      should "have friend relation" do
+        assert @quentin.follow(@aaron)
+        assert @aaron.friendship_with(@quentin)
+      end
+      
+      should "not have friend relation" do
+        assert !@quentin.friendship_with(@aaron)
       end
+      
     end
     
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: muck-friends
 version: !ruby/object:Gem::Version 
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors: 
 - Justin Ball
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-13 00:00:00 -06:00
+date: 2009-09-10 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -109,7 +109,6 @@ files:
 - locales/no.yml
 - locales/pl.yml
 - locales/pt-PT.yml
-- locales/pt.yml
 - locales/ro.yml
 - locales/ru.yml
 - locales/sk.yml
@@ -142,6 +141,7 @@ files:
 - test/rails_root/app/models/user.rb
 - test/rails_root/app/models/user_session.rb
 - test/rails_root/app/views/default/all_friends.html.erb
+- test/rails_root/app/views/default/block_user_link.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_link.html.erb
@@ -383,6 +383,8 @@ files:
 - uninstall.rb
 has_rdoc: true
 homepage: http://github.com/jbasdf/muck_friends
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -403,9 +405,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: muck-friends
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Friends engine for the muck system
 test_files: 
 - test/rails_root/app/controllers/application_controller.rb

data/locales/pt.yml

@@ -1,6 +0,0 @@
---- 
-pt: 
-  muck: 
-    friends: 
-      friends_title: "Meus amigos"
-      same_inviter_error_message: "O usuário não pode tornar-se amigos com themself."