Merge branch 'stable'

Antonio Terceiro
2 parents 66376b84 054a43b2
Showing 15 changed files with 72 additions and 44 deletions Show diff stats
app/controllers/public/contact_controller.rb
app/helpers/sweeper_helper.rb
app/models/published_article.rb
app/sweepers/article_sweeper.rb
app/sweepers/category_sweeper.rb
app/sweepers/friendship_sweeper.rb
app/sweepers/role_assignment_sweeper.rb
app/views/layouts/application.rhtml
app/views/shared/tiny_mce.rhtml
config/environment.rb
db/schema.rb
lib/noosfero.rb
test/functional/contact_controller_test.rb
test/integration/categories_menu_test.rb
test/unit/published_article_test.rb
 class ContactController < PublicController
+  before_filter :login_required
+
   needs_profile
   inverse_captcha :field => 'e_mail'
@@ -0,0 +1,11 @@
+module SweeperHelper
+
+  def expire_fragment(*args)
+    ActionController::Base.new().expire_fragment(*args)
+  end
+
+  def expire_timeout_fragment(*args)
+    ActionController::Base.new().expire_timeout_fragment(*args)
+  end
+
+end
@@ -14,10 +14,6 @@ class PublishedArticle &lt; Article
     _('A reference to another article published in another profile')    
   end
-  def body
-    reference_article.body
-  end
-
   before_validation_on_create :update_name
   def update_name
     self.name ||= self.reference_article.name
@@ -32,6 +28,6 @@ class PublishedArticle &lt; Article
   end
   def to_html(options={})
-    reference_article.to_html
+    reference_article ? reference_article.to_html : ('<em>' + _('The original text was removed.') + '</em>')
   end
 end
 class ArticleSweeper < ActiveRecord::Observer
+  include SweeperHelper
   observe :article
   def after_save(article)
@@ -21,11 +22,4 @@ protected
     end
   end
-  def expire_fragment(*args)
-    ActionController::Base.new().expire_fragment(*args)
-  end
-
-  def expire_timeout_fragment(*args)
-    ActionController::Base.new().expire_timeout_fragment(*args)
-  end
 end
@@ -0,0 +1,9 @@
+class CategorySweeper < ActiveRecord::Observer
+  observe :category
+  include SweeperHelper
+
+  def after_save(category)
+    expire_fragment(category.environment.name + "_categories_menu")
+  end
+
+end
 class FriendshipSweeper < ActiveRecord::Observer
   observe :friendship
+  include SweeperHelper
   def after_create(friendship)
     expire_caches(friendship)
@@ -26,7 +27,4 @@ protected
     blocks.map(&:cache_keys).each{|ck|expire_timeout_fragment(ck)}
   end
-  def expire_timeout_fragment(*args)
-    ActionController::Base.new().expire_timeout_fragment(*args)
-  end
 end
 class RoleAssignmentSweeper < ActiveRecord::Observer
   observe :role_assignment
+  include SweeperHelper
   def after_create(role_assignment)
     expire_caches(role_assignment)
@@ -28,7 +29,4 @@ protected
     }
   end
-  def expire_timeout_fragment(*args)
-    ActionController::Base.new().expire_timeout_fragment(*args)
-  end
 end
@@ -87,7 +87,7 @@
                         :id=>"menu_link_to_envhome",
                         :title=>@environment.name  %>
           <% unless environment.enabled?(:disable_categories) %>
-            <% cache(:controller => 'public', :action => 'categories_menu') do %>
+            <% cache(environment.name +  '_categories_menu') do %>
               <%= render :file => 'shared/categories_menu' %>
             <% end %>
           <% end %>
@@ -23,7 +23,8 @@ tinyMCE.init({
         paste_use_dialog: false,
         apply_source_formatting : true,
         content_css: '/stylesheets/tinymce.css',
-        language: <%= tinymce_language.inspect %>
+        language: <%= tinymce_language.inspect %>,
+        cleanup_callback : "customCleanup"
         });
 function convertWord(type, content) {
@@ -41,8 +42,17 @@ function convertWord(type, content) {
   return content;
 }
-</script>
-
-
+function customCleanup(type, value) {
+  switch (type) {
+    case "get_from_editor":
+      value = value.replace(/&amp;amp;/g,"&amp;");
+		break;
+    case "insert_to_editor":
+      value = value.replace(/&amp;amp;/g,"&amp;");
+		break;
+  }
+  return value;
+}
+</script>
@@ -67,7 +67,7 @@ Rails::Initializer.run do |config|
   # don't load the sweepers while loading the database
   unless $PROGRAM_NAME =~ /rake$/ && ARGV.first == 'db:schema:load'
-    config.active_record.observers = :article_sweeper, :role_assignment_sweeper, :friendship_sweeper
+    config.active_record.observers = :article_sweeper, :role_assignment_sweeper, :friendship_sweeper, :category_sweeper
   end
   # Make Active Record use UTC-base instead of local time
   # config.active_record.default_timezone = :utc
@@ -89,15 +89,16 @@ ActiveRecord::Schema.define(:version =&gt; 69) do
     t.boolean "virtual",     :default => false
   end
-  add_index "articles_categories", ["article_id"], :name => "index_articles_categories_on_article_id"
   add_index "articles_categories", ["category_id"], :name => "index_articles_categories_on_category_id"
+  add_index "articles_categories", ["article_id"], :name => "index_articles_categories_on_article_id"
   create_table "blocks", :force => true do |t|
-    t.string  "title"
-    t.integer "box_id"
-    t.string  "type"
-    t.text    "settings"
-    t.integer "position"
+    t.string   "title"
+    t.integer  "box_id"
+    t.string   "type"
+    t.text     "settings"
+    t.integer  "position"
+    t.datetime "last_updated"
   end
   add_index "blocks", ["box_id"], :name => "index_blocks_on_box_id"
@@ -169,13 +170,13 @@ ActiveRecord::Schema.define(:version =&gt; 69) do
   create_table "external_feeds", :force => true do |t|
     t.string   "feed_title"
-    t.date     "fetched_at"
     t.string   "address"
     t.integer  "blog_id",                      :null => false
     t.boolean  "enabled",    :default => true, :null => false
     t.boolean  "only_once",  :default => true, :null => false
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.datetime "fetched_at"
   end
   create_table "favorite_enteprises_people", :id => false, :force => true do |t|
@@ -290,8 +291,8 @@ ActiveRecord::Schema.define(:version =&gt; 69) do
     t.datetime "created_at"
   end
-  add_index "taggings", ["tag_id"], :name => "index_taggings_on_tag_id"
   add_index "taggings", ["taggable_id", "taggable_type"], :name => "index_taggings_on_taggable_id_and_taggable_type"
+  add_index "taggings", ["tag_id"], :name => "index_taggings_on_tag_id"
   create_table "tags", :force => true do |t|
     t.string  "name"
 module Noosfero
   PROJECT = 'noosfero'
-  VERSION = '0.18.3'
+  VERSION = '0.18.4'
   SVN_ROOT = 'https://svn.colivre.coop.br/svn/noosfero'
   def self.pattern_for_controllers_in_directory(dir)
@@ -15,6 +15,8 @@ class ContactControllerTest &lt; Test::Unit::TestCase
     @profile = create_user('contact_test_user').person
     @enterprise = Enterprise.create!(:identifier => 'contact_test_enterprise', :name => 'Test contact enteprise')
+
+    login_as('contact_test_user')
   end
   attr_reader :profile, :enterprise
@@ -50,13 +52,11 @@ class ContactControllerTest &lt; Test::Unit::TestCase
   end
   should 'fill email if user logged in' do
-    login_as(profile.identifier)
     get :new, :profile => enterprise.identifier
     assert_tag :tag => 'input', :attributes => {:name => 'contact[email]', :value => profile.email}
   end
   should 'fill name if user logged in' do
-    login_as(profile.identifier)
     get :new, :profile => enterprise.identifier
     assert_tag :tag => 'input', :attributes => {:name => 'contact[name]', :value => profile.name}
   end
@@ -111,5 +111,11 @@ class ContactControllerTest &lt; Test::Unit::TestCase
     assert_response :success
     assert_template 'new'
   end
-  
+
+  should 'not allow if not logged' do
+    logout
+    get :new, :profile => profile.identifier
+    assert_response :redirect
+    assert_redirected_to :controller => 'account', :action => 'login'
+  end
 end
@@ -35,7 +35,7 @@ class CategoriesMenuTest &lt; ActionController::IntegrationTest
   end
   should 'cache the categories menu' do
-    ActionView::Base.any_instance.expects(:cache).with(:controller => 'public', :action => 'categories_menu')
+    ActionView::Base.any_instance.expects(:cache).with(Environment.default.name + "_categories_menu")
     get '/'
   end
@@ -17,13 +17,6 @@ class PublishedArticleTest &lt; ActiveSupport::TestCase
     assert_equal @article, p.reference_article
   end
-  should 'have same content as reference article' do
-    prof = Community.create!(:name => 'test_comm', :identifier => 'test_comm')
-    p = PublishedArticle.create(:reference_article => @article, :profile => prof)
-
-    assert_equal @article.body, p.body
-  end
-
   should 'have a different name than reference article' do
     prof = Community.create!(:name => 'test_comm', :identifier => 'test_comm')
     p = PublishedArticle.create(:reference_article => @article, :profile => prof, :name => 'other title')
@@ -107,4 +100,14 @@ class PublishedArticleTest &lt; ActiveSupport::TestCase
     assert_equal textile_article.to_html, p.to_html
   end
+
+  should 'display message when reference_article does not exist' do
+    prof = Community.create!(:name => 'test_comm', :identifier => 'test_comm')
+    textile_article = TextileArticle.new(:name => 'textile_article', :body => '*my text*', :profile => prof)
+    p = PublishedArticle.create!(:reference_article => textile_article, :profile => prof)
+    textile_article.destroy
+    p.reload
+
+    assert_match /removed/, p.to_html
+  end
 end
1	class ContactController < PublicController	1	class ContactController < PublicController
2		2
		3	+ before_filter :login_required
		4	+
3	needs_profile	5	needs_profile
4		6
5	inverse_captcha :field => 'e_mail'	7	inverse_captcha :field => 'e_mail'
@@ -0,0 +1,11 @@		@@ -0,0 +1,11 @@
	1	+module SweeperHelper
	2	+
	3	+ def expire_fragment(*args)
	4	+ ActionController::Base.new().expire_fragment(*args)
	5	+ end
	6	+
	7	+ def expire_timeout_fragment(*args)
	8	+ ActionController::Base.new().expire_timeout_fragment(*args)
	9	+ end
	10	+
	11	+end
@@ -0,0 +1,9 @@		@@ -0,0 +1,9 @@
	1	+class CategorySweeper < ActiveRecord::Observer
	2	+ observe :category
	3	+ include SweeperHelper
	4	+
	5	+ def after_save(category)
	6	+ expire_fragment(category.environment.name + "_categories_menu")
	7	+ end
	8	+
	9	+end
	@@ -87,7 +87,7 @@		@@ -87,7 +87,7 @@
87	:id=>"menu_link_to_envhome",	87	:id=>"menu_link_to_envhome",
88	:title=>@environment.name %>	88	:title=>@environment.name %>
89	<% unless environment.enabled?(:disable_categories) %>	89	<% unless environment.enabled?(:disable_categories) %>
90	- <% cache(:controller => 'public', :action => 'categories_menu') do %>	90	+ <% cache(environment.name + '_categories_menu') do %>
91	<%= render :file => 'shared/categories_menu' %>	91	<%= render :file => 'shared/categories_menu' %>
92	<% end %>	92	<% end %>
93	<% end %>	93	<% end %>
	@@ -67,7 +67,7 @@ Rails::Initializer.run do \|config\|		@@ -67,7 +67,7 @@ Rails::Initializer.run do \|config\|
67		67
68	# don't load the sweepers while loading the database	68	# don't load the sweepers while loading the database
69	unless $PROGRAM_NAME =~ /rake$/ && ARGV.first == 'db:schema:load'	69	unless $PROGRAM_NAME =~ /rake$/ && ARGV.first == 'db:schema:load'
70	- config.active_record.observers = :article_sweeper, :role_assignment_sweeper, :friendship_sweeper	70	+ config.active_record.observers = :article_sweeper, :role_assignment_sweeper, :friendship_sweeper, :category_sweeper
71	end	71	end
72	# Make Active Record use UTC-base instead of local time	72	# Make Active Record use UTC-base instead of local time
73	# config.active_record.default_timezone = :utc	73	# config.active_record.default_timezone = :utc
1	module Noosfero	1	module Noosfero
2	PROJECT = 'noosfero'	2	PROJECT = 'noosfero'
3	- VERSION = '0.18.3'	3	+ VERSION = '0.18.4'
4	SVN_ROOT = 'https://svn.colivre.coop.br/svn/noosfero'	4	SVN_ROOT = 'https://svn.colivre.coop.br/svn/noosfero'
5		5
6	def self.pattern_for_controllers_in_directory(dir)	6	def self.pattern_for_controllers_in_directory(dir)
	@@ -35,7 +35,7 @@ class CategoriesMenuTest < ActionController::IntegrationTest		@@ -35,7 +35,7 @@ class CategoriesMenuTest < ActionController::IntegrationTest
35	end	35	end
36		36
37	should 'cache the categories menu' do	37	should 'cache the categories menu' do
38	- ActionView::Base.any_instance.expects(:cache).with(:controller => 'public', :action => 'categories_menu')	38	+ ActionView::Base.any_instance.expects(:cache).with(Environment.default.name + "_categories_menu")
39	get '/'	39	get '/'
40	end	40	end
41		41