Download as
Browse Code »

Commit c722f4b7c436ae4bcdd717a40d2dd8bfe0460dc6

Authored by Rodrigo Souto
2 parents ca78d2e2 341aff13
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Merge branch 'stable' of https://gitlab.com/noosfero/noosfero into stable

Showing 5 changed files with 44 additions and 2 deletions   Show diff stats
app/models/block.rb
  Diff comments   View file @c722f4b
... ... @@ -130,7 +130,7 @@ class Block < ActiveRecord::Base
130 130 end
131 131  
132 132 alias :active_record_cache_key :cache_key
133   - def cache_key(language='en')
  133 + def cache_key(language='en', user=nil)
134 134 active_record_cache_key+'-'+language
135 135 end
136 136  
... ...
app/models/members_block.rb
  Diff comments   View file @c722f4b
... ... @@ -36,4 +36,15 @@ class MembersBlock < ProfileListBlock
36 36 }
37 37 end
38 38  
  39 + def cache_key(language='en', user=nil)
  40 + logged = ''
  41 + if user
  42 + logged += '-logged-in'
  43 + if user.is_member_of? self.owner
  44 + logged += '-member'
  45 + end
  46 + end
  47 + super + logged
  48 + end
  49 +
39 50 end
... ...
app/views/shared/block.rhtml
  Diff comments   View file @c722f4b
1 1 <% if block.cacheable? && use_cache %>
2   - <% cache_timeout(block.cache_key(language), block.timeout) do %>
  2 + <% cache_timeout(block.cache_key(language, user), block.timeout) do %>
3 3 <%= display_block_content(block, user, main_content) %>
4 4 <% end %>
5 5 <% else %>
... ...
test/unit/block_test.rb
  Diff comments   View file @c722f4b
... ... @@ -165,4 +165,11 @@ class BlockTest &lt; ActiveSupport::TestCase
165 165 conditions = Block.expire_on
166 166 assert conditions[:environment].kind_of?(Array)
167 167 end
  168 +
  169 + should 'accept user as parameter on cache_key without change its value' do
  170 + person = fast_create(Person)
  171 + block = Block.new
  172 + assert_equal block.cache_key('en'), block.cache_key('en', person)
  173 + end
  174 +
168 175 end
... ...
test/unit/members_block_test.rb
  Diff comments   View file @c722f4b
... ... @@ -35,4 +35,28 @@ class MembersBlockTest &lt; ActiveSupport::TestCase
35 35 assert_same list, block.profiles
36 36 end
37 37  
  38 + should 'use logged-in to compose cache key' do
  39 + person = fast_create(Person)
  40 + community = fast_create(Community)
  41 + block = MembersBlock.create
  42 + block.expects(:owner).returns(community)
  43 +
  44 + assert_match(/-logged-in/,block.cache_key('en', person))
  45 + end
  46 +
  47 + should 'use logged-in and member to compose cache key for members' do
  48 + person = fast_create(Person)
  49 + community = fast_create(Community)
  50 + community.add_member person
  51 + block = MembersBlock.create
  52 + block.expects(:owner).returns(community)
  53 +
  54 + assert_match(/-logged-in-member/,block.cache_key('en', person))
  55 + end
  56 +
  57 + should 'not change block cache key if user is nil' do
  58 + block = MembersBlock.new
  59 + assert_equal block.cache_key('en'), block.cache_key('en', nil)
  60 + end
  61 +
38 62 end
... ...