Merge branch 'stable'

Daniela Feitosa
2 parents 14543855 dc6be7cf
Showing 21 changed files with 64 additions and 85 deletions Show diff stats
app/helpers/categories_helper.rb
app/models/comment.rb
app/models/community.rb
app/models/environment.rb
app/models/event.rb
app/models/organization.rb
app/models/text_article.rb
app/models/textile_article.rb
app/models/tiny_mce_article.rb
app/views/categories/_form.rhtml
lib/noosfero/translatable_content.rb
test/functional/categories_controller_test.rb
test/unit/categories_helper_test.rb
test/unit/comment_notifier_test.rb
test/unit/enterprise_test.rb
test/unit/environment_test.rb
test/unit/event_test.rb
test/unit/text_article_test.rb
test/unit/textile_article_test.rb
test/unit/tiny_mce_article_test.rb
@@ -34,8 +34,7 @@ module CategoriesHelper
   def select_category_type(field)
     value = params[field]
-    types = TYPES.select { |title,typename| environment.category_types.include?(typename) }
-    labelled_form_field(_('Type of category'), select_tag('type', options_for_select(types, value)))
+    labelled_form_field(_('Type of category'), select_tag('type', options_for_select(TYPES, value)))
   end
 end
@@ -70,7 +70,7 @@ class Comment &lt; ActiveRecord::Base
   end
   after_create do |comment|
-    if comment.article.notify_comments?
+    if comment.article.notify_comments? && !comment.article.profile.notification_emails.empty?
       Comment::Notifier.deliver_mail(comment)
     end
   end
@@ -97,10 +97,7 @@ class Comment &lt; ActiveRecord::Base
   class Notifier < ActionMailer::Base
     def mail(comment)
       profile = comment.article.profile
-      email = profile.notification_emails
-      return unless email
-      recipients email
-
+      recipients profile.notification_emails
       from "#{profile.environment.name} <#{profile.environment.contact_email}>"
       subject _("[%s] you got a new comment!") % [profile.environment.name]
       body :recipient => profile.nickname || profile.name,
@@ -75,8 +75,4 @@ class Community &lt; Organization
     end
   end
-  def receives_scrap_notification?
-    false
-  end
-
 end
@@ -207,7 +207,6 @@ class Environment &lt; ActiveRecord::Base
   settings_items :layout_template, :type => String, :default => 'default'
   settings_items :homepage, :type => String
   settings_items :description, :type => String, :default => '<div style="text-align: center"><a href="http://noosfero.org/"><img src="/images/noosfero-network.png" alt="Noosfero"/></a></div>'
-  settings_items :category_types, :type => Array, :default => ['Category']
   settings_items :enable_ssl
   settings_items :local_docs, :type => Array, :default => []
   settings_items :news_amount_by_folder, :type => Integer, :default => 4
@@ -120,10 +120,7 @@ class Event &lt; Article
     true
   end
-  def translatable?
-    true
-  end
-
+  include Noosfero::TranslatableContent
   include MaybeAddHttp
 end
@@ -132,4 +132,8 @@ class Organization &lt; Profile
     super({:domain => "conference.#{environment.default_hostname}"}.merge(options))
   end
+  def receives_scrap_notification?
+    false
+  end
+
 end
@@ -2,4 +2,6 @@
 class TextArticle < Article
   xss_terminate :only => [ :name, :abstract, :body ], :on => 'validation'
+
+  include Noosfero::TranslatableContent
 end
@@ -16,8 +16,4 @@ class TextileArticle &lt; TextArticle
     true
   end
-  def translatable?
-    true
-  end
-
 end
@@ -19,8 +19,4 @@ class TinyMceArticle &lt; TextArticle
     true
   end
-  def translatable?
-    true
-  end
-
 end
@@ -9,11 +9,7 @@
       <%= hidden_field_tag('parent_id', @category.parent.id) %>
       <%= hidden_field_tag('parent_type', @category.parent.class.name) %>
     <% else %>
-      <% if environment.category_types.length > 1 %>
         <%= select_category_type :type %>
-      <% else %>
-        <%= hidden_field_tag('type', @category.class.name) %>
-      <% end%>
     <% end %>
   <% end %>
@@ -0,0 +1,6 @@
+module Noosfero::TranslatableContent
+
+  def translatable?
+    parent.nil? || !parent.forum?
+  end
+end
@@ -155,28 +155,6 @@ class CategoriesControllerTest &lt; Test::Unit::TestCase
     assert_tag :tag => 'select', :attributes => { :name => "category[display_color]" }
   end
-  should 'not display category_type if only one category is available' do
-    env.category_types = ['Category']
-    get :new
-
-    assert_no_tag :tag => 'select', :attributes => { :name => "type" }
-  end
-
-  should 'have hidden_tag type if only one category is available' do
-    env.category_types = ['Category']
-    env.save!
-    get :new
-
-    assert_tag :tag => 'input', :attributes => { :name => 'type', :value => "Category", :type => 'hidden' }
-  end
-
- should 'display category_type if more than one category is available' do
-    env.category_types = 'Category', 'ProductCategory'
-    get :new
-
-    assert_tag :tag => 'select', :attributes => { :name => "type" }
-  end
-
   should 'not list regions and product categories' do
     Environment.default.categories.destroy_all
     c = Category.create!(:name => 'Regular category', :environment => Environment.default)
@@ -11,7 +11,6 @@ class CategoriesHelperTest &lt; Test::Unit::TestCase
   def _(s); s; end
   should 'generate list of category types for selection' do
-    environment.category_types = ['Category', 'ProductCategory', 'Region']
     expects(:params).returns({'fieldname' => 'fieldvalue'})
     expects(:options_for_select).with([['General Category', 'Category'],[ 'Product Category', 'ProductCategory'],[ 'Region', 'Region' ]], 'fieldvalue').returns('OPTIONS')
     expects(:select_tag).with('type', 'OPTIONS').returns('TAG')
@@ -20,14 +19,4 @@ class CategoriesHelperTest &lt; Test::Unit::TestCase
     assert_equal 'RESULT', select_category_type('fieldname')
   end
-  should 'only list the available types' do
-    environment.category_types = ['Category']
-    expects(:params).returns({'fieldname' => 'fieldvalue'})
-    expects(:options_for_select).with([['General Category', 'Category']], 'fieldvalue').returns('OPTIONS')
-    expects(:select_tag).with('type', 'OPTIONS').returns('TAG')
-    expects(:labelled_form_field).with(anything, 'TAG').returns('RESULT')
-    
-    assert_equal 'RESULT', select_category_type('fieldname')
-  end
-
 end
@@ -56,6 +56,15 @@ class CommentNotifierTest &lt; Test::Unit::TestCase
     assert_match /comment body/, sent.body
   end
+  should 'not deliver mail if has no notification emails' do
+    community = fast_create(Community)
+    assert_equal [], community.notification_emails
+    article = fast_create(Article, :name => 'Article test', :profile_id => community.id, :notify_comments => true)
+    assert_no_difference ActionMailer::Base.deliveries, :size do
+      article.comments << Comment.new(:author => @profile, :title => 'test comment', :body => 'there is no addresses to send notification')
+    end
+  end
+
   private
     def read_fixture(action)
@@ -408,4 +408,9 @@ class EnterpriseTest &lt; Test::Unit::TestCase
     assert_equal false, e.send(:followed_by?,p2)
   end
+  should 'receive scrap notification' do
+    enterprise = fast_create(Enterprise)
+    assert_equal false, enterprise.receives_scrap_notification?
+  end
+
 end
@@ -731,17 +731,6 @@ class EnvironmentTest &lt; Test::Unit::TestCase
     assert_equal ['contact_email'], env.required_community_fields
   end
-  should 'set category_types' do
-    env = Environment.new
-    env.category_types = ['Category', 'ProductCategory']
-
-    assert_equal ['Category', 'ProductCategory'], env.category_types
-  end
-
-  should 'have type /Category/ on category_types by default' do
-    assert_equal ['Category'], Environment.new.category_types
-  end
-
   should 'has tasks' do
     e = Environment.default
     assert_nothing_raised do
@@ -267,8 +267,7 @@ class EventTest &lt; ActiveSupport::TestCase
   end
   should 'be translatable' do
-    e = Event.new
-    assert e.translatable?
+    assert_kind_of Noosfero::TranslatableContent, Event.new
   end
 end
@@ -39,4 +39,8 @@ class TextArticleTest &lt; Test::Unit::TestCase
     assert_no_match /[<>]/, article.body
   end
+  should 'be translatable' do
+    assert_kind_of Noosfero::TranslatableContent, TextArticle.new
+  end
+
 end
@@ -145,10 +145,4 @@ class TextileArticleTest &lt; Test::Unit::TestCase
     assert_equal false, a.advertise?
     assert_equal false, a.is_trackable?
   end
-
-  should 'be translatable' do
-    a = TextileArticle.new
-    assert a.translatable?
-  end
-
 end
@@ -236,9 +236,4 @@ class TinyMceArticleTest &lt; Test::Unit::TestCase
     assert_equal false, a.advertise?
     assert_equal false, a.is_trackable?
   end
-
-  should 'be translatable' do
-    a = TinyMceArticle.new
-    assert a.translatable?
-  end
 end
@@ -0,0 +1,29 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class TranslatableContentTest < ActiveSupport::TestCase
+
+  class Content
+    attr_accessor :parent
+    include Noosfero::TranslatableContent
+  end
+
+  def setup
+    @content = Content.new
+  end
+  attr_reader :content
+
+  should 'be translatable if no parent' do
+    assert content.translatable?
+  end
+
+  should 'not be translatable if parent is a forum' do
+    content.parent = Forum.new
+    assert !content.translatable?
+  end
+
+  should 'be translatable if parent is not a forum' do
+    content.parent = Blog.new
+    assert content.translatable?
+  end
+
+end
	@@ -34,8 +34,7 @@ module CategoriesHelper		@@ -34,8 +34,7 @@ module CategoriesHelper
34		34
35	def select_category_type(field)	35	def select_category_type(field)
36	value = params[field]	36	value = params[field]
37	- types = TYPES.select { \|title,typename\| environment.category_types.include?(typename) }
38	- labelled_form_field(_('Type of category'), select_tag('type', options_for_select(types, value)))	37	+ labelled_form_field(_('Type of category'), select_tag('type', options_for_select(TYPES, value)))
39	end	38	end
40		39
41	end	40	end
	@@ -75,8 +75,4 @@ class Community < Organization		@@ -75,8 +75,4 @@ class Community < Organization
75	end	75	end
76	end	76	end
77		77
78	- def receives_scrap_notification?
79	- false
80	- end
81	-
82	end	78	end
	@@ -132,4 +132,8 @@ class Organization < Profile		@@ -132,4 +132,8 @@ class Organization < Profile
132	super({:domain => "conference.#{environment.default_hostname}"}.merge(options))	132	super({:domain => "conference.#{environment.default_hostname}"}.merge(options))
133	end	133	end
134		134
		135	+ def receives_scrap_notification?
		136	+ false
		137	+ end
		138	+
135	end	139	end
	@@ -2,4 +2,6 @@		@@ -2,4 +2,6 @@
2	class TextArticle < Article	2	class TextArticle < Article
3		3
4	xss_terminate :only => [ :name, :abstract, :body ], :on => 'validation'	4	xss_terminate :only => [ :name, :abstract, :body ], :on => 'validation'
		5	+
		6	+ include Noosfero::TranslatableContent
5	end	7	end
	@@ -16,8 +16,4 @@ class TextileArticle < TextArticle		@@ -16,8 +16,4 @@ class TextileArticle < TextArticle
16	true	16	true
17	end	17	end
18		18
19	- def translatable?
20	- true
21	- end
22	-
23	end	19	end
	@@ -19,8 +19,4 @@ class TinyMceArticle < TextArticle		@@ -19,8 +19,4 @@ class TinyMceArticle < TextArticle
19	true	19	true
20	end	20	end
21		21
22	- def translatable?
23	- true
24	- end
25	-
26	end	22	end
@@ -0,0 +1,6 @@		@@ -0,0 +1,6 @@
	1	+module Noosfero::TranslatableContent
	2	+
	3	+ def translatable?
	4	+ parent.nil? \|\| !parent.forum?
	5	+ end
	6	+end
	@@ -155,28 +155,6 @@ class CategoriesControllerTest < Test::Unit::TestCase		@@ -155,28 +155,6 @@ class CategoriesControllerTest < Test::Unit::TestCase
155	assert_tag :tag => 'select', :attributes => { :name => "category[display_color]" }	155	assert_tag :tag => 'select', :attributes => { :name => "category[display_color]" }
156	end	156	end
157		157
158	- should 'not display category_type if only one category is available' do
159	- env.category_types = ['Category']
160	- get :new
161	-
162	- assert_no_tag :tag => 'select', :attributes => { :name => "type" }
163	- end
164	-
165	- should 'have hidden_tag type if only one category is available' do
166	- env.category_types = ['Category']
167	- env.save!
168	- get :new
169	-
170	- assert_tag :tag => 'input', :attributes => { :name => 'type', :value => "Category", :type => 'hidden' }
171	- end
172	-
173	- should 'display category_type if more than one category is available' do
174	- env.category_types = 'Category', 'ProductCategory'
175	- get :new
176	-
177	- assert_tag :tag => 'select', :attributes => { :name => "type" }
178	- end
179	-
180	should 'not list regions and product categories' do	158	should 'not list regions and product categories' do
181	Environment.default.categories.destroy_all	159	Environment.default.categories.destroy_all
182	c = Category.create!(:name => 'Regular category', :environment => Environment.default)	160	c = Category.create!(:name => 'Regular category', :environment => Environment.default)
	@@ -11,7 +11,6 @@ class CategoriesHelperTest < Test::Unit::TestCase		@@ -11,7 +11,6 @@ class CategoriesHelperTest < Test::Unit::TestCase
11	def _(s); s; end	11	def _(s); s; end
12		12
13	should 'generate list of category types for selection' do	13	should 'generate list of category types for selection' do
14	- environment.category_types = ['Category', 'ProductCategory', 'Region']
15	expects(:params).returns({'fieldname' => 'fieldvalue'})	14	expects(:params).returns({'fieldname' => 'fieldvalue'})
16	expects(:options_for_select).with([['General Category', 'Category'],[ 'Product Category', 'ProductCategory'],[ 'Region', 'Region' ]], 'fieldvalue').returns('OPTIONS')	15	expects(:options_for_select).with([['General Category', 'Category'],[ 'Product Category', 'ProductCategory'],[ 'Region', 'Region' ]], 'fieldvalue').returns('OPTIONS')
17	expects(:select_tag).with('type', 'OPTIONS').returns('TAG')	16	expects(:select_tag).with('type', 'OPTIONS').returns('TAG')
	@@ -20,14 +19,4 @@ class CategoriesHelperTest < Test::Unit::TestCase		@@ -20,14 +19,4 @@ class CategoriesHelperTest < Test::Unit::TestCase
20	assert_equal 'RESULT', select_category_type('fieldname')	19	assert_equal 'RESULT', select_category_type('fieldname')
21	end	20	end
22		21
23	- should 'only list the available types' do
24	- environment.category_types = ['Category']
25	- expects(:params).returns({'fieldname' => 'fieldvalue'})
26	- expects(:options_for_select).with([['General Category', 'Category']], 'fieldvalue').returns('OPTIONS')
27	- expects(:select_tag).with('type', 'OPTIONS').returns('TAG')
28	- expects(:labelled_form_field).with(anything, 'TAG').returns('RESULT')
29	-
30	- assert_equal 'RESULT', select_category_type('fieldname')
31	- end
32	-
33	end	22	end
	@@ -56,6 +56,15 @@ class CommentNotifierTest < Test::Unit::TestCase		@@ -56,6 +56,15 @@ class CommentNotifierTest < Test::Unit::TestCase
56	assert_match /comment body/, sent.body	56	assert_match /comment body/, sent.body
57	end	57	end
58		58
		59	+ should 'not deliver mail if has no notification emails' do
		60	+ community = fast_create(Community)
		61	+ assert_equal [], community.notification_emails
		62	+ article = fast_create(Article, :name => 'Article test', :profile_id => community.id, :notify_comments => true)
		63	+ assert_no_difference ActionMailer::Base.deliveries, :size do
		64	+ article.comments << Comment.new(:author => @profile, :title => 'test comment', :body => 'there is no addresses to send notification')
		65	+ end
		66	+ end
		67	+
59	private	68	private
60		69
61	def read_fixture(action)	70	def read_fixture(action)