From f50ca7fd7a5451963394496b40abf8a84fbaec28 Mon Sep 17 00:00:00 2001 From: Joenio Costa Date: Thu, 5 Jun 2014 17:32:46 -0300 Subject: [PATCH] removing blocks from core --- app/models/friends_block.rb | 26 -------------------------- app/models/members_block.rb | 52 ---------------------------------------------------- test/unit/members_block_test.rb | 62 -------------------------------------------------------------- 3 files changed, 0 insertions(+), 140 deletions(-) delete mode 100644 app/models/friends_block.rb delete mode 100644 app/models/members_block.rb delete mode 100644 test/unit/members_block_test.rb diff --git a/app/models/friends_block.rb b/app/models/friends_block.rb deleted file mode 100644 index 03604dc..0000000 --- a/app/models/friends_block.rb +++ /dev/null @@ -1,26 +0,0 @@ -class FriendsBlock < ProfileListBlock - - def self.description - _('Friends') - end - - def default_title - n_('{#} friend', '{#} friends', profile_count) - end - - def help - _('This block displays your friends.') - end - - def footer - owner_id = owner.identifier - proc do - link_to s_('friends|View all'), :profile => owner_id, :controller => 'profile', :action => 'friends' - end - end - - def profiles - owner.friends - end - -end diff --git a/app/models/members_block.rb b/app/models/members_block.rb deleted file mode 100644 index b0630e5..0000000 --- a/app/models/members_block.rb +++ /dev/null @@ -1,52 +0,0 @@ -class MembersBlock < ProfileListBlock - settings_items :show_join_leave_button, :type => :boolean, :default => false - - attr_accessible :show_join_leave_button - - def self.description - _('Members') - end - - def default_title - _('{#} members') - end - - def help - _('This block presents the members of a collective.') - end - - def footer - profile = self.owner - s = show_join_leave_button - - proc do - render :file => 'blocks/members', :locals => { :profile => profile, :show_join_leave_button => s} - end - end - - def profiles - owner.members - end - - def extra_option - data = { - :human_name => _("Show join leave button"), - :name => 'block[show_join_leave_button]', - :value => true, - :checked => show_join_leave_button, - :options => {} - } - end - - def cache_key(language='en', user=nil) - logged = '' - if user - logged += '-logged-in' - if user.is_member_of? self.owner - logged += '-member' - end - end - super + logged - end - -end diff --git a/test/unit/members_block_test.rb b/test/unit/members_block_test.rb deleted file mode 100644 index 8254a98..0000000 --- a/test/unit/members_block_test.rb +++ /dev/null @@ -1,62 +0,0 @@ -require File.dirname(__FILE__) + '/../test_helper' - -class MembersBlockTest < ActiveSupport::TestCase - - should 'inherit from ProfileListBlock' do - assert_kind_of ProfileListBlock, MembersBlock.new - end - - should 'describe itself' do - assert_not_equal ProfileListBlock.description, MembersBlock.description - end - - should 'provide a default title' do - assert_not_equal ProfileListBlock.new.default_title, MembersBlock.new.default_title - end - - should 'display members file' do - community = fast_create(Community) - block = MembersBlock.create - block.expects(:owner).returns(community) - - self.expects(:render).with(:file => 'blocks/members', :locals => { :profile => community, :show_join_leave_button => false}).returns('file-with-members-list') - assert_equal 'file-with-members-list', instance_eval(&block.footer) - end - - should 'pick random members' do - block = MembersBlock.new - - owner = mock - block.expects(:owner).returns(owner) - - list = [] - owner.expects(:members).returns(list) - - assert_same list, block.profiles - end - - should 'use logged-in to compose cache key' do - person = fast_create(Person) - community = fast_create(Community) - block = MembersBlock.create - block.expects(:owner).returns(community) - - assert_match(/-logged-in/,block.cache_key('en', person)) - end - - should 'use logged-in and member to compose cache key for members' do - person = fast_create(Person) - community = fast_create(Community) - community.add_member person - block = MembersBlock.create - block.expects(:owner).returns(community) - - assert_match(/-logged-in-member/,block.cache_key('en', person)) - end - - should 'not change block cache key if user is nil' do - block = MembersBlock.new - assert_equal block.cache_key('en'), block.cache_key('en', nil) - end - -end -- libgit2 0.21.2