Merge branch 'stable'

Daniela Feitosa
2 parents 384439c7 a4abc843
Showing 20 changed files with 109 additions and 33 deletions Show diff stats
app/helpers/sweeper_helper.rb
app/models/add_member.rb
app/models/article.rb
app/models/block.rb
app/sweepers/article_sweeper.rb
app/sweepers/block_sweeper.rb
app/sweepers/friendship_sweeper.rb
app/sweepers/profile_sweeper.rb
app/sweepers/role_assignment_sweeper.rb
app/views/content_viewer/view_page.rhtml
app/views/layouts/_javascript.rhtml
app/views/shared/block.rhtml
features/caching.feature
features/step_definitions/noosfero_steps.rb
plugins/require_auth_to_comment/public/hide_comment_form.js
plugins/require_auth_to_comment/public/style.css
plugins/shopping_cart/public/style.css
test/factories.rb
test/functional/application_controller_test.rb
test/unit/add_member_test.rb
@@ -20,7 +20,7 @@ module SweeperHelper
     # friends blocks
     blocks = profile.blocks.select{|b| b.kind_of?(FriendsBlock)}
-    blocks.map(&:cache_key).each{|ck|expire_timeout_fragment(ck)}
+    BlockSweeper.expire_blocks(blocks)
   end
   def expire_communities(profile)
@@ -32,13 +32,13 @@ module SweeperHelper
     # communities block
     blocks = profile.blocks.select{|b| b.kind_of?(CommunitiesBlock)}
-    blocks.map(&:cache_key).each{|ck|expire_timeout_fragment(ck)}
+    BlockSweeper.expire_blocks(blocks)
   end
   def expire_enterprises(profile)
     # enterprises and favorite enterprises blocks
     blocks = profile.blocks.select {|b| [EnterprisesBlock, FavoriteEnterprisesBlock].any?{|klass| b.kind_of?(klass)} }
-    blocks.map(&:cache_key).each{|ck|expire_timeout_fragment(ck)}
+    BlockSweeper.expire_blocks(blocks)
   end
   def expire_profile_index(profile)
@@ -11,7 +11,9 @@ class AddMember &lt; Task
   settings_items :roles
   def perform
-    self.roles ||= [Profile::Roles.member(organization.environment.id).id]
+    if !self.roles or (self.roles.uniq.compact.length == 1 and self.roles.uniq.compact.first.to_i.zero?)
+      self.roles = [Profile::Roles.member(organization.environment.id).id]
+    end
     target.affiliate(requestor, self.roles.select{|r| !r.to_i.zero? }.map{|i| Role.find(i)})
   end
@@ -496,8 +496,8 @@ class Article &lt; ActiveRecord::Base
   end
   alias :active_record_cache_key :cache_key
-  def cache_key(params = {}, the_profile = nil)
-    active_record_cache_key +
+  def cache_key(params = {}, the_profile = nil, language = 'en')
+    active_record_cache_key+'-'+language +
       (allow_post_content?(the_profile) ? "-owner" : '') +
       (params[:npage] ? "-npage-#{params[:npage]}" : '') +
       (params[:year] ? "-year-#{params[:year]}" : '') +
@@ -127,6 +127,11 @@ class Block &lt; ActiveRecord::Base
     true
   end
+  alias :active_record_cache_key :cache_key
+  def cache_key(language='en')
+    active_record_cache_key+'-'+language
+  end
+
   def timeout
     4.hours
   end
@@ -13,15 +13,11 @@ class ArticleSweeper &lt; ActiveRecord::Observer
 protected
   def expire_caches(article)
-    article.hierarchy.each do |a|
-      if a != article
-        a.update_attribute(:updated_at, Time.now)
-      end
-    end
+    article.hierarchy.each { |a| a.touch if a != article }
     blocks = article.profile.blocks
     blocks += article.profile.environment.blocks if article.profile.environment
     blocks = blocks.select{|b|[RecentDocumentsBlock, BlogArchivesBlock].any?{|c| b.kind_of?(c)}}
-    blocks.map(&:cache_key).each{|ck|expire_timeout_fragment(ck)}
+    BlockSweeper.expire_blocks(blocks)
     env = article.profile.environment
     if env && (env.portal_community == article.profile)
       expire_fragment(env.portal_news_cache_key)
 class BlockSweeper < ActiveRecord::Observer
-  include SweeperHelper
   observe :block
+  class << self
+    include SweeperHelper
+
+    def cache_key_regex(block)
+      regex = '-[a-z]*$'
+      clean_ck = block.cache_key.gsub(/#{regex}/,'')
+      %r{#{clean_ck+regex}}
+    end
+
+    # Expire block's all languages cache
+    def expire_block(block)
+      expire_timeout_fragment(cache_key_regex(block))
+    end
+
+    def expire_blocks(blocks)
+      blocks.each { |block| expire_block(block) }
+    end
+  end
+
   def after_save(block)
-    expire_fragment(block.cache_key)
+    self.class.expire_block(block)
   end
 end
@@ -35,7 +35,7 @@ protected
     end
     blocks = profile.blocks.select{|b| b.kind_of?(FriendsBlock)}
-    blocks.map(&:cache_key).each{|ck|expire_timeout_fragment(ck)}
+    BlockSweeper.expire_blocks(blocks)
   end
 end
@@ -31,7 +31,7 @@ protected
   def expire_statistics_block_cache(profile)
     blocks = profile.environment.blocks.select { |b| b.kind_of?(EnvironmentStatisticsBlock) }
-    blocks.map(&:cache_key).each{|ck|expire_timeout_fragment(ck)}
+    BlockSweeper.expire_blocks(blocks)
   end
   def expire_blogs(profile)
@@ -25,7 +25,7 @@ protected
     profile.blocks_to_expire_cache.each { |block|
       blocks = profile.blocks.select{|b| b.kind_of?(block)}
-      blocks.map(&:cache_key).each{|ck|expire_timeout_fragment(ck)}
+      BlockSweeper.expire_blocks(blocks)
     }
   end
@@ -52,7 +52,7 @@
 </div>
 <% end %>
-<% cache(@page.cache_key(params, user)) do %>
+<% cache(@page.cache_key(params, user, language)) do %>
   <div class="<%="article-body article-body-" + @page.css_class_name %>">
     <% options = @page.image? ? {:gallery_view => true} : {} %>
     <%= article_to_html(@page, options) %>
 <%= javascript_include_tag :defaults, 'jquery-latest.js', 'jquery.noconflict.js', 'jquery.cycle.all.min.js', 'thickbox.js', 'lightbox', 'jquery-ui-1.8.2.custom.min', 'jquery.scrollTo', 'jquery.form.js', 'jquery.cookie', 'reflection', 'add-and-join', 'jquery.tokeninput', 'report-abuse','colorbox', 'jquery-validation/jquery.validate', 'catalog', 'manage-products', :cache => 'cache-general' %>
+
 <% language = FastGettext.locale %>
-<%= javascript_include_tag 'jquery-validation/localization/messages_'+language, 'jquery-validation/localization/methods_'+language %>
+<% %w{messages methods}.each do |type| %>
+  <% require_path = File.join('jquery-validation', 'localization', type+'_'+language) %>
+  <% full_path = File.join(Rails.root, 'public', 'javascripts', require_path+'.js')%>
+  <%= javascript_include_tag require_path if File.exists?(full_path) %>
+<% end %>
 <% if block.cacheable? && use_cache %>
-  <% cache_timeout(block.cache_key, block.timeout) do %>
+  <% cache_timeout(block.cache_key(language), block.timeout) do %>
     <%= display_block_content(block, user, main_content) %>
   <% end %>
 <% else %>
@@ -0,0 +1,30 @@
+Feature: caching
+  As a user
+  I want to see the contents according with my language
+  Even with the contents being cached
+
+  Background:
+    Given the cache is turned on
+    And the following user
+      | login | name        |
+      | mario | Mario |
+    And I am logged in as "mario"
+
+  Scenario: blog view page
+    Given the following blogs
+      | owner | name         | display_posts_in_current_language | visualization_format |
+      | mario | Sample Blog  | false                             | short                |
+    And the following articles
+      | owner | name  | parent       |
+      | mario | Post1 | Sample Blog  |
+      | mario | Post2 | Sample Blog  |
+    When I go to article "Sample Blog"
+    Then I should see "No comments yet"
+    When I follow "Português"
+    Then I should see "Sem comentários ainda"
+
+  Scenario: blocks
+    Given I am on Mario's homepage
+    Then I should see "Recent content"
+    When I follow "Português"
+    Then I should see "Conteúdo recente"
@@ -572,3 +572,7 @@ When /^I edit my profile$/ do
   visit "/myprofile/#{@current_user}"
   click_link "Edit Profile"
 end
+
+Given /^the cache is turned (on|off)$/ do |state|
+  ActionController::Base.perform_caching = (state == 'on')
+end
@@ -3,6 +3,7 @@
     if (data.login || $('meta[name=profile.allow_unauthenticated_comments]').length > 0) {
       $('.post-comment-button').show();
       $('#page-comment-form').show();
+      $('.comment-footer').show();
     }
   });
 })(jQuery);
-.post-comment-button, #page-comment-form {
+.post-comment-button, #page-comment-form, .comment-footer {
   display: none;
 }
 @import url(colorbox/colorbox.css);
 .cart-add-item .ui-icon-cart {
-      background: url("images/button-icon.png") no-repeat scroll left center transparent;
-          width: 22px;
-        }
-         .cart-buy .ui-icon-cart {
-                 background: url("images/button-icon.png") no-repeat scroll left center transparent;
-                           width: 22px;
-                                   }
+  background: url("/plugins/shopping_cart/images/button-icon.png") no-repeat scroll left center transparent;
+  width: 22px;
+}
+.cart-buy .ui-icon-cart {
+  background: url("/plugins/shopping_cart/images/button-icon.png") no-repeat scroll left center transparent;
+  width: 22px;
+}
 .cart-add-item .ui-button-text {
   padding-left: 2.6em;
 }
@@ -183,10 +183,10 @@ label.error {
   vertical-align: top;
 }
-.controller-profile_editor a.control-panel-shopping-cart-purchase-report {background-image: url(images/control-panel/purchase-report.png)}
-.controller-profile_editor .msie6 a.control-panel-shopping-cart-purchase-report {background-image: url(images/control-panel/purchase-report.gif)}
-.controller-profile_editor a.control-panel-shopping-cart-icon {background-image: url(images/control-panel/icon.png)}
-.controller-profile_editor .msie6 a.control-panel-shopping-cart-icon {background-image: url(images/control-panel/icon.gif)}
+.controller-profile_editor a.control-panel-shopping-cart-purchase-report {background-image: url("/plugins/shopping_cart/images/control-panel/purchase-report.png")}
+.controller-profile_editor .msie6 a.control-panel-shopping-cart-purchase-report {background-image: url("/plugins/shopping_cart/images/control-panel/purchase-report.gif")}
+.controller-profile_editor a.control-panel-shopping-cart-icon {background-image: url("/plugins/shopping_cart/images/control-panel/icon.png")}
+.controller-profile_editor .msie6 a.control-panel-shopping-cart-icon {background-image: url("/plugins/shopping_cart/images/control-panel/icon.gif")}
 .action-shopping_cart_plugin_myprofile-reports td.order-info {
   padding: 0px;
@@ -249,7 +249,7 @@ module Noosfero::Factory
   ###############################################
   def defaults_for_blog
     name = 'My blog ' + factory_num_seq.to_s
-    { :name => name, :slug => name.to_slug }
+    { :name => name, :slug => name.to_slug, :path => name.to_slug }
   end
   def create_blog
@@ -438,6 +438,13 @@ class ApplicationControllerTest &lt; ActionController::TestCase
     assert_tag :tag => 'style', :content => 'This is Plugin2 speaking!'
   end
+  should 'not include jquery-validation language script if they do not exist' do
+    Noosfero.stubs(:available_locales).returns(['bli'])
+    get :index, :lang => 'bli'
+    assert_no_tag :tag => 'script', :attributes => {:src => /messages_bli/}
+    assert_no_tag :tag => 'script', :attributes => {:src => /methods_bli/}
+  end
+
   if ActiveRecord::Base.connection.adapter_name == 'PostgreSQL'
     should 'change postgresql schema' do
@@ -22,6 +22,14 @@ class AddMemberTest &lt; ActiveSupport::TestCase
     assert_equal [person], community.members
   end
+  should 'make member role the default role' do
+    TaskMailer.stubs(:deliver_target_notification)
+    task = AddMember.create!(:roles => ["0", "0", nil], :person => person, :organization => community)
+    task.finish
+
+    assert_equal [person], community.members
+  end
+
   should 'require requestor' do
     task = AddMember.new
     task.valid?
	@@ -20,7 +20,7 @@ module SweeperHelper		@@ -20,7 +20,7 @@ module SweeperHelper
20		20
21	# friends blocks	21	# friends blocks
22	blocks = profile.blocks.select{\|b\| b.kind_of?(FriendsBlock)}	22	blocks = profile.blocks.select{\|b\| b.kind_of?(FriendsBlock)}
23	- blocks.map(&:cache_key).each{\|ck\|expire_timeout_fragment(ck)}	23	+ BlockSweeper.expire_blocks(blocks)
24	end	24	end
25		25
26	def expire_communities(profile)	26	def expire_communities(profile)
	@@ -32,13 +32,13 @@ module SweeperHelper		@@ -32,13 +32,13 @@ module SweeperHelper
32		32
33	# communities block	33	# communities block
34	blocks = profile.blocks.select{\|b\| b.kind_of?(CommunitiesBlock)}	34	blocks = profile.blocks.select{\|b\| b.kind_of?(CommunitiesBlock)}
35	- blocks.map(&:cache_key).each{\|ck\|expire_timeout_fragment(ck)}	35	+ BlockSweeper.expire_blocks(blocks)
36	end	36	end
37		37
38	def expire_enterprises(profile)	38	def expire_enterprises(profile)
39	# enterprises and favorite enterprises blocks	39	# enterprises and favorite enterprises blocks
40	blocks = profile.blocks.select {\|b\| [EnterprisesBlock, FavoriteEnterprisesBlock].any?{\|klass\| b.kind_of?(klass)} }	40	blocks = profile.blocks.select {\|b\| [EnterprisesBlock, FavoriteEnterprisesBlock].any?{\|klass\| b.kind_of?(klass)} }
41	- blocks.map(&:cache_key).each{\|ck\|expire_timeout_fragment(ck)}	41	+ BlockSweeper.expire_blocks(blocks)
42	end	42	end
43		43
44	def expire_profile_index(profile)	44	def expire_profile_index(profile)
1	class BlockSweeper < ActiveRecord::Observer	1	class BlockSweeper < ActiveRecord::Observer
2		2
3	- include SweeperHelper
4	observe :block	3	observe :block
5		4
		5	+ class << self
		6	+ include SweeperHelper
		7	+
		8	+ def cache_key_regex(block)
		9	+ regex = '-[a-z]*$'
		10	+ clean_ck = block.cache_key.gsub(/#{regex}/,'')
		11	+ %r{#{clean_ck+regex}}
		12	+ end
		13	+
		14	+ # Expire block's all languages cache
		15	+ def expire_block(block)
		16	+ expire_timeout_fragment(cache_key_regex(block))
		17	+ end
		18	+
		19	+ def expire_blocks(blocks)
		20	+ blocks.each { \|block\| expire_block(block) }
		21	+ end
		22	+ end
		23	+
6	def after_save(block)	24	def after_save(block)
7	- expire_fragment(block.cache_key)	25	+ self.class.expire_block(block)
8	end	26	end
9		27
10	end	28	end
	@@ -35,7 +35,7 @@ protected		@@ -35,7 +35,7 @@ protected
35	end	35	end
36		36
37	blocks = profile.blocks.select{\|b\| b.kind_of?(FriendsBlock)}	37	blocks = profile.blocks.select{\|b\| b.kind_of?(FriendsBlock)}
38	- blocks.map(&:cache_key).each{\|ck\|expire_timeout_fragment(ck)}	38	+ BlockSweeper.expire_blocks(blocks)
39	end	39	end
40		40
41	end	41	end
	@@ -31,7 +31,7 @@ protected		@@ -31,7 +31,7 @@ protected
31		31
32	def expire_statistics_block_cache(profile)	32	def expire_statistics_block_cache(profile)
33	blocks = profile.environment.blocks.select { \|b\| b.kind_of?(EnvironmentStatisticsBlock) }	33	blocks = profile.environment.blocks.select { \|b\| b.kind_of?(EnvironmentStatisticsBlock) }
34	- blocks.map(&:cache_key).each{\|ck\|expire_timeout_fragment(ck)}	34	+ BlockSweeper.expire_blocks(blocks)
35	end	35	end
36		36
37	def expire_blogs(profile)	37	def expire_blogs(profile)
	@@ -25,7 +25,7 @@ protected		@@ -25,7 +25,7 @@ protected
25		25
26	profile.blocks_to_expire_cache.each { \|block\|	26	profile.blocks_to_expire_cache.each { \|block\|
27	blocks = profile.blocks.select{\|b\| b.kind_of?(block)}	27	blocks = profile.blocks.select{\|b\| b.kind_of?(block)}
28	- blocks.map(&:cache_key).each{\|ck\|expire_timeout_fragment(ck)}	28	+ BlockSweeper.expire_blocks(blocks)
29	}	29	}
30	end	30	end
31		31
	@@ -52,7 +52,7 @@		@@ -52,7 +52,7 @@
52	</div>	52	</div>
53	<% end %>	53	<% end %>
54		54
55	-<% cache(@page.cache_key(params, user)) do %>	55	+<% cache(@page.cache_key(params, user, language)) do %>
56	<div class="<%="article-body article-body-" + @page.css_class_name %>">	56	<div class="<%="article-body article-body-" + @page.css_class_name %>">
57	<% options = @page.image? ? {:gallery_view => true} : {} %>	57	<% options = @page.image? ? {:gallery_view => true} : {} %>
58	<%= article_to_html(@page, options) %>	58	<%= article_to_html(@page, options) %>
1	<%= javascript_include_tag :defaults, 'jquery-latest.js', 'jquery.noconflict.js', 'jquery.cycle.all.min.js', 'thickbox.js', 'lightbox', 'jquery-ui-1.8.2.custom.min', 'jquery.scrollTo', 'jquery.form.js', 'jquery.cookie', 'reflection', 'add-and-join', 'jquery.tokeninput', 'report-abuse','colorbox', 'jquery-validation/jquery.validate', 'catalog', 'manage-products', :cache => 'cache-general' %>	1	<%= javascript_include_tag :defaults, 'jquery-latest.js', 'jquery.noconflict.js', 'jquery.cycle.all.min.js', 'thickbox.js', 'lightbox', 'jquery-ui-1.8.2.custom.min', 'jquery.scrollTo', 'jquery.form.js', 'jquery.cookie', 'reflection', 'add-and-join', 'jquery.tokeninput', 'report-abuse','colorbox', 'jquery-validation/jquery.validate', 'catalog', 'manage-products', :cache => 'cache-general' %>
		2	+
2	<% language = FastGettext.locale %>	3	<% language = FastGettext.locale %>
3	-<%= javascript_include_tag 'jquery-validation/localization/messages_'+language, 'jquery-validation/localization/methods_'+language %>	4	+<% %w{messages methods}.each do \|type\| %>
		5	+ <% require_path = File.join('jquery-validation', 'localization', type+'_'+language) %>
		6	+ <% full_path = File.join(Rails.root, 'public', 'javascripts', require_path+'.js')%>
		7	+ <%= javascript_include_tag require_path if File.exists?(full_path) %>
		8	+<% end %>
1	<% if block.cacheable? && use_cache %>	1	<% if block.cacheable? && use_cache %>
2	- <% cache_timeout(block.cache_key, block.timeout) do %>	2	+ <% cache_timeout(block.cache_key(language), block.timeout) do %>
3	<%= display_block_content(block, user, main_content) %>	3	<%= display_block_content(block, user, main_content) %>
4	<% end %>	4	<% end %>
5	<% else %>	5	<% else %>
@@ -0,0 +1,30 @@		@@ -0,0 +1,30 @@
	1	+Feature: caching
	2	+ As a user
	3	+ I want to see the contents according with my language
	4	+ Even with the contents being cached
	5	+
	6	+ Background:
	7	+ Given the cache is turned on
	8	+ And the following user
	9	+ \| login \| name \|
	10	+ \| mario \| Mario \|
	11	+ And I am logged in as "mario"
	12	+
	13	+ Scenario: blog view page
	14	+ Given the following blogs
	15	+ \| owner \| name \| display_posts_in_current_language \| visualization_format \|
	16	+ \| mario \| Sample Blog \| false \| short \|
	17	+ And the following articles
	18	+ \| owner \| name \| parent \|
	19	+ \| mario \| Post1 \| Sample Blog \|
	20	+ \| mario \| Post2 \| Sample Blog \|
	21	+ When I go to article "Sample Blog"
	22	+ Then I should see "No comments yet"
	23	+ When I follow "Português"
	24	+ Then I should see "Sem comentários ainda"
	25	+
	26	+ Scenario: blocks
	27	+ Given I am on Mario's homepage
	28	+ Then I should see "Recent content"
	29	+ When I follow "Português"
	30	+ Then I should see "Conteúdo recente"
	@@ -572,3 +572,7 @@ When /^I edit my profile$/ do		@@ -572,3 +572,7 @@ When /^I edit my profile$/ do
572	visit "/myprofile/#{@current_user}"	572	visit "/myprofile/#{@current_user}"
573	click_link "Edit Profile"	573	click_link "Edit Profile"
574	end	574	end
		575	+
		576	+Given /^the cache is turned (on\|off)$/ do \|state\|
		577	+ ActionController::Base.perform_caching = (state == 'on')
		578	+end