Merge branch 'stable'

Rodrigo Souto
2 parents 0111638e 3048e9e9
Showing 16 changed files with 197 additions and 34 deletions Show diff stats
app/models/contact.rb
app/models/environment.rb
app/views/cms/view.rhtml
app/views/contact/sender/mail.rhtml
app/views/search/_article.rhtml
config/environment.rb
db/migrate/20110706171330_fix_misunderstood_script_filename.rb
db/migrate/20110714213405_symbolize_environment_settings_keys.rb
db/schema.rb
debian/changelog
lib/acts_as_having_settings.rb
lib/noosfero.rb
test/unit/acts_as_having_settings_test.rb
test/unit/contact_sender_test.rb
test/unit/contact_test.rb
test/unit/environment_test.rb
@@ -23,23 +23,26 @@ class Contact &lt; ActiveRecord::Base #WithoutTable
   class Sender < ActionMailer::Base
     def mail(contact)
+      content_type 'text/html'
       emails = contact.dest.notification_emails
       recipients emails
-      from "#{contact.name} <#{contact.email}>"
+      from "#{contact.name} <#{contact.dest.environment.contact_email}>"
+      reply_to contact.email
       if contact.sender
         headers 'X-Noosfero-Sender' => contact.sender.identifier
       end
       if contact.receive_a_copy
         cc "#{contact.name} <#{contact.email}>"
       end
-      subject contact.subject
+      subject "[#{contact.dest.short_name(30)}] " + contact.subject
       body :name => contact.name,
         :email => contact.email,
         :city => contact.city,
         :state => contact.state,
         :message => contact.message,
         :environment => contact.dest.environment.name,
-        :url => url_for(:host => contact.dest.environment.default_hostname, :controller => 'home')
+        :url => url_for(:host => contact.dest.environment.default_hostname, :controller => 'home'),
+        :target => contact.dest.name
     end
   end
@@ -9,10 +9,10 @@ class Environment &lt; ActiveRecord::Base
   has_many :tasks, :dependent => :destroy, :as => 'target'
-  IDENTIFY_SCRIPTS = /(?:php[0-9s]?(\..*)?|[sp]htm[l]?(\..*)?|pl|py|cgi|rb)/
+  IDENTIFY_SCRIPTS = /(php[0-9s]?|[sp]htm[l]?|pl|py|cgi|rb)/
   def self.verify_filename(filename)
-    filename += '.txt' if filename =~ IDENTIFY_SCRIPTS
+    filename += '.txt' if File.extname(filename) =~ IDENTIFY_SCRIPTS
     filename
   end
@@ -236,17 +236,17 @@ class Environment &lt; ActiveRecord::Base
   # Enables a feature identified by its name
   def enable(feature)
-    self.settings["#{feature}_enabled"] = true
+    self.settings["#{feature}_enabled".to_sym] = true
   end
   # Disables a feature identified by its name
   def disable(feature)
-    self.settings["#{feature}_enabled"] = false
+    self.settings["#{feature}_enabled".to_sym] = false
   end
   # Tells if a feature, identified by its name, is enabled
   def enabled?(feature)
-    self.settings["#{feature}_enabled"] == true
+    self.settings["#{feature}_enabled".to_sym] == true
   end
   # enables the features identified by <tt>features</tt>, which is expected to
@@ -50,7 +50,7 @@
       </td>
       <td class="article-controls">
         <%= button_without_text :edit, _('Edit'), :action => 'edit', :id => article.id %>
-        <%= button_without_text :eyes, _('Public view'), article.url %>
+        <%= button_without_text :eyes, _('Public view'), article.view_url %>
         <%= display_spread_button(profile, article) unless article.folder? %>
         <% if !environment.enabled?('cant_change_homepage') %>
           <%= button_without_text :home, _('Use as homepage'), { :action => 'set_home_page', :id => article.id }, :method => :post %>
-<%= _('Name: %s') % @name  %>
-<%= _('e-Mail: %s') % @email %>
-<% if @city || @state %>
-  <%= _('City and state: %s/%s') % [@city || '?', @state || '?'] %>
-<% end %>
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+  </head>
+  <body>
+    <p><%= _('This message was sent by %{sender} to %{target} on %{environment}.') %
+    {:sender => @name, :target => @target, :environment => @environment} %></p>
+    <%= _('Information about the user who sent this message:')%>
+    <ul>
+      <li><%= content_tag('b', _('Name')+': ') + @name.to_s %></li>
+      <li><%= content_tag('b', _('Email')+': ') + @email.to_s %></li>
+      <% if @city || @state %>
+        <li><%= content_tag('b', _('City and state')+': ') + (@city || '?')+'/'+(@state || '?') %></li>
+      <% end %>
+    </ul>
+    <hr/>
+    <%= content_tag('b', _('Message:')) %>
+    <p><%= word_wrap(@message) %></p>
-<%= _('Message:') %>
--------------------------------------------------------------------------------
-<%= word_wrap(@message) %>
--------------------------------------------------------------------------------
+    --<br/>
+    <%= _('Greetings,') %><br/>
+    <%= _('%s team.') % @environment %><br/>
+    <%= @url %>
+  </body>
+</html>
-<%= _('Greetings,') %>
-
---
-<%= _('%s team.') % @environment %>
-<%= @url %>
 <li class="<%= icon_for_article(article) %>">
-  <strong><%= link_to(article.title, article.url) %></strong>
+  <strong><%= link_to(article.title, article.view_url) %></strong>
   <div class="item_meta">
     <% if article.last_changed_by %>
       <span class="cat_item_by">
@@ -106,7 +106,7 @@ end
 # Include your application configuration below
-
+ActiveRecord::Base.store_full_sti_class = true
 Noosfero.locales = {
   'en' => 'English',
@@ -0,0 +1,63 @@
+#FIXME Don't know why, but this xss_terminate and sanitize_tag_list calls here
+# from the migration fall on a loop and breaks the migration. Both them are
+# related to alias_method_chain, probably there is a problem with this kind of
+# alias on the migration level.
+class Article < ActiveRecord::Base
+  def sanitize_tag_list
+  end
+end
+
+module XssTerminate
+  module InstanceMethods
+    def sanitize_fields_with_white_list
+    end
+  end
+end
+
+#FIXME This after save calls the environment methods 'blocks' and
+# 'portal_community'. Both acts as not defined don't know why.
+class ArticleSweeper < ActiveRecord::Observer
+  def after_save(article)
+  end
+end
+
+class Environment < ActiveRecord::Base
+  def self.verify_filename(filename)
+    filename
+  end
+end
+
+class FixMisunderstoodScriptFilename < ActiveRecord::Migration
+  def self.up
+    Image.all.select { |i| !i.thumbnail? && File.extname(i.filename) == '.txt'}.map do |image|
+      image.thumbnails.destroy_all
+      image.filename = fixed_name(image)
+      image.save!
+      image.create_thumbnails
+    end
+
+    UploadedFile.all.select { |u| u.image? && File.extname(u.filename) == '.txt' }.map do |uploaded_file|
+      uploaded_file.thumbnails.destroy_all
+      uploaded_file.filename = fixed_name(uploaded_file)
+      uploaded_file.save!
+      uploaded_file.create_thumbnails
+    end
+
+    Thumbnail.all.select { |u| u.image? && File.extname(u.filename) == '.txt' }.map do |thumbnail|
+      thumbnail.filename = fixed_name(thumbnail)
+      thumbnail.save!
+    end
+
+  end
+
+  def self.down
+    say "WARNING: cannot undo this migration"
+  end
+
+  class << self
+    def fixed_name(file)
+      file.filename.gsub('.txt', '')
+    end
+  end
+
+end
@@ -0,0 +1,13 @@
+class SymbolizeEnvironmentSettingsKeys < ActiveRecord::Migration
+  def self.up
+    select_all("select id from environments").each do |environment|
+      env = Environment.find(environment['id'])
+      env.settings.symbolize_keys!
+      env.save
+    end
+  end
+
+  def self.down
+    say "WARNING: cannot undo this migration"
+  end
+end
@@ -9,7 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20110527042608) do
+ActiveRecord::Schema.define(:version => 20110714213405) do
   create_table "action_tracker", :force => true do |t|
     t.integer  "user_id"
+noosfero (0.31.4) unstable; urgency=low
+
+  * Bugfix Version release
+
+ -- Rodrigo Souto <rodrigo@colivre.coop.br>  Fri, 15 Jul 2011 16:40:05 -0300
+
 noosfero (0.31.3) unstable; urgency=low
   * Bugfix Version release.
@@ -14,6 +14,11 @@ module ActsAsHavingSettings
         def #{settings_field}
           self[:#{settings_field}] ||= Hash.new
         end
+        before_save :symbolize_settings_keys
+        private
+        def symbolize_settings_keys
+          self[:#{settings_field}] && self[:#{settings_field}].symbolize_keys!
+        end
       CODE
       settings_items(*args)
     end
 module Noosfero
   PROJECT = 'noosfero'
-  VERSION = '0.31.3'
+  VERSION = '0.31.4'
   def self.pattern_for_controllers_in_directory(dir)
     disjunction = controllers_in_directory(dir).join('|')
@@ -74,4 +74,10 @@ class ActsAsHavingSettingsTest &lt; Test::Unit::TestCase
     assert_equal true, obj.flag
   end
+  should 'symbolize keys when save' do
+    obj = TestClass.new
+    obj.settings.expects(:symbolize_keys!).once
+    assert obj.save
+  end
+
 end
@@ -16,8 +16,8 @@ class ContactSenderTest &lt; Test::Unit::TestCase
     ent.contact_email = 'contact@invalid.com'
     c = build(Contact, :dest => ent)
     response = Contact::Sender.deliver_mail(c)
-    assert_equal c.email, response.from
-    assert_equal c.subject, response.subject
+    assert_equal Environment.default.contact_email, response.from.to_s
+    assert_equal "[#{ent.name}] #{c.subject}", response.subject
   end
   should 'deliver mail to contact_email' do
@@ -22,7 +22,7 @@ class ContactTest &lt; ActiveSupport::TestCase
   should 'validates format of email only if not empty' do
     contact = Contact.new
     contact.valid?
-    assert_match /^.* can't be blank$/, contact.errors[:email]
+    assert_match(/^.* can't be blank$/, contact.errors[:email])
   end
   should 'inicialize fields on instanciate' do
@@ -44,4 +44,25 @@ class ContactTest &lt; ActiveSupport::TestCase
     assert !c.deliver
   end
+  should 'use sender name and environment contact_email on from' do
+    ent = fast_create(Enterprise, :name => 'my enterprise', :identifier => 'myent')
+    c = Contact.new(:name => 'john', :email => 'john@invalid.com', :subject => 'hi', :message => 'hi, all', :dest => ent)
+    email = c.deliver
+    assert_equal "#{c.name} <#{ent.environment.contact_email}>", email['from'].to_s
+  end
+
+  should 'add dest name on subject' do
+    ent = fast_create(Enterprise, :name => 'my enterprise', :identifier => 'myent')
+    c = Contact.new(:name => 'john', :email => 'john@invalid.com', :subject => 'hi', :message => 'hi, all', :dest => ent)
+    email = c.deliver
+    assert_equal "[#{ent.short_name(30)}] #{c.subject}", email['subject'].to_s
+  end
+
+  should 'add sender email on reply_to' do
+    ent = fast_create(Enterprise, :name => 'my enterprise', :identifier => 'myent')
+    c = Contact.new(:name => 'john', :email => 'john@invalid.com', :subject => 'hi', :message => 'hi, all', :dest => ent)
+    email = c.deliver
+    assert_equal c.email, email.reply_to.to_s
+  end
+
 end
@@ -1124,15 +1124,25 @@ class EnvironmentTest &lt; Test::Unit::TestCase
   end
   should 'identify scripts with regex' do
-    scripts_extensions = %w[php php1 php4 phps php.bli cgi shtm phtm shtml phtml pl py rb]
-    name = 'uploaded_file'
+    scripts_extensions = %w[php php1 php4 phps cgi shtm phtm shtml phtml pl py rb]
     scripts_extensions.each do |extension|
-      assert_not_nil name+'.'+extension =~ Environment::IDENTIFY_SCRIPTS
+      assert_not_nil extension =~ Environment::IDENTIFY_SCRIPTS
     end
   end
+  should 'filter file as script only if it has the extension as a script extension' do
+    name = 'file_php_testing'
+    assert_equal name, Environment.verify_filename(name)
+
+    name += '.php'
+    assert_equal name+'.txt', Environment.verify_filename(name)
+
+    name += '.bli'
+    assert_equal name, Environment.verify_filename(name)
+  end
+
   should 'verify filename and append .txt if script' do
-    scripts_extensions = %w[php php1 php4 phps php.bli cgi shtm phtm shtml phtml pl py rb]
+    scripts_extensions = %w[php php1 php4 phps cgi shtm phtm shtml phtml pl py rb]
     name = 'uploaded_file'
     scripts_extensions.each do |extension|
       filename = name+'.'+extension
@@ -1140,4 +1150,29 @@ class EnvironmentTest &lt; Test::Unit::TestCase
     end
   end
+  should 'not conflict to save classes with namespace on sti' do
+    class School; end;
+    class Work; end;
+    class School::Project < Article; end
+    class Work::Project < Article; end
+
+    title1 = "Sample Article1"
+    title2 = "Sample Article2"
+    profile = fast_create(Profile)
+
+    p1 = School::Project.new(:name => title1, :profile => profile)
+    p2 = Work::Project.new(:name => title2, :profile => profile)
+
+    p1.save!
+    p2.save!
+  end
+
+  should 'always store setting keys as symbol' do
+    env = Environment.default
+    env.settings['string_key'] = 'new value'
+    env.save!; env.reload
+    assert_nil env.settings['string_key']
+    assert_equal env.settings[:string_key], 'new value'
+  end
+
 end
	@@ -9,10 +9,10 @@ class Environment < ActiveRecord::Base		@@ -9,10 +9,10 @@ class Environment < ActiveRecord::Base
9		9
10	has_many :tasks, :dependent => :destroy, :as => 'target'	10	has_many :tasks, :dependent => :destroy, :as => 'target'
11		11
12	- IDENTIFY_SCRIPTS = /(?:php[0-9s]?(\..)?\|[sp]htm[l]?(\..)?\|pl\|py\|cgi\|rb)/	12	+ IDENTIFY_SCRIPTS = /(php[0-9s]?\|[sp]htm[l]?\|pl\|py\|cgi\|rb)/
13		13
14	def self.verify_filename(filename)	14	def self.verify_filename(filename)
15	- filename += '.txt' if filename =~ IDENTIFY_SCRIPTS	15	+ filename += '.txt' if File.extname(filename) =~ IDENTIFY_SCRIPTS
16	filename	16	filename
17	end	17	end
18		18
	@@ -236,17 +236,17 @@ class Environment < ActiveRecord::Base		@@ -236,17 +236,17 @@ class Environment < ActiveRecord::Base
236		236
237	# Enables a feature identified by its name	237	# Enables a feature identified by its name
238	def enable(feature)	238	def enable(feature)
239	- self.settings["#{feature}_enabled"] = true	239	+ self.settings["#{feature}_enabled".to_sym] = true
240	end	240	end
241		241
242	# Disables a feature identified by its name	242	# Disables a feature identified by its name
243	def disable(feature)	243	def disable(feature)
244	- self.settings["#{feature}_enabled"] = false	244	+ self.settings["#{feature}_enabled".to_sym] = false
245	end	245	end
246		246
247	# Tells if a feature, identified by its name, is enabled	247	# Tells if a feature, identified by its name, is enabled
248	def enabled?(feature)	248	def enabled?(feature)
249	- self.settings["#{feature}_enabled"] == true	249	+ self.settings["#{feature}_enabled".to_sym] == true
250	end	250	end
251		251
252	# enables the features identified by <tt>features</tt>, which is expected to	252	# enables the features identified by <tt>features</tt>, which is expected to
	@@ -50,7 +50,7 @@		@@ -50,7 +50,7 @@
50	</td>	50	</td>
51	<td class="article-controls">	51	<td class="article-controls">
52	<%= button_without_text :edit, _('Edit'), :action => 'edit', :id => article.id %>	52	<%= button_without_text :edit, _('Edit'), :action => 'edit', :id => article.id %>
53	- <%= button_without_text :eyes, _('Public view'), article.url %>	53	+ <%= button_without_text :eyes, _('Public view'), article.view_url %>
54	<%= display_spread_button(profile, article) unless article.folder? %>	54	<%= display_spread_button(profile, article) unless article.folder? %>
55	<% if !environment.enabled?('cant_change_homepage') %>	55	<% if !environment.enabled?('cant_change_homepage') %>
56	<%= button_without_text :home, _('Use as homepage'), { :action => 'set_home_page', :id => article.id }, :method => :post %>	56	<%= button_without_text :home, _('Use as homepage'), { :action => 'set_home_page', :id => article.id }, :method => :post %>
1	-<%= _('Name: %s') % @name %>
2	-<%= _('e-Mail: %s') % @email %>
3	-<% if @city \|\| @state %>
4	- <%= _('City and state: %s/%s') % [@city \|\| '?', @state \|\| '?'] %>
5	-<% end %>	1	+<!DOCTYPE html>
		2	+<html>
		3	+ <head>
		4	+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
		5	+ </head>
		6	+ <body>
		7	+ <p><%= _('This message was sent by %{sender} to %{target} on %{environment}.') %
		8	+ {:sender => @name, :target => @target, :environment => @environment} %></p>
		9	+ <%= _('Information about the user who sent this message:')%>
		10	+ <ul>
		11	+ <li><%= content_tag('b', _('Name')+': ') + @name.to_s %></li>
		12	+ <li><%= content_tag('b', _('Email')+': ') + @email.to_s %></li>
		13	+ <% if @city \|\| @state %>
		14	+ <li><%= content_tag('b', _('City and state')+': ') + (@city \|\| '?')+'/'+(@state \|\| '?') %></li>
		15	+ <% end %>
		16	+ </ul>
		17	+ <hr/>
		18	+ <%= content_tag('b', _('Message:')) %>
		19	+ <p><%= word_wrap(@message) %></p>
6		20
7	-<%= _('Message:') %>
8	--------------------------------------------------------------------------------
9	-<%= word_wrap(@message) %>
10	--------------------------------------------------------------------------------	21	+ --<br/>
		22	+ <%= _('Greetings,') %><br/>
		23	+ <%= _('%s team.') % @environment %><br/>
		24	+ <%= @url %>
		25	+ </body>
		26	+</html>
11		27
12	-<%= _('Greetings,') %>
13	-
14	---
15	-<%= _('%s team.') % @environment %>
16	-<%= @url %>
1	<li class="<%= icon_for_article(article) %>">	1	<li class="<%= icon_for_article(article) %>">
2	- <strong><%= link_to(article.title, article.url) %></strong>	2	+ <strong><%= link_to(article.title, article.view_url) %></strong>
3	<div class="item_meta">	3	<div class="item_meta">
4	<% if article.last_changed_by %>	4	<% if article.last_changed_by %>
5	<span class="cat_item_by">	5	<span class="cat_item_by">
	@@ -106,7 +106,7 @@ end		@@ -106,7 +106,7 @@ end
106		106
107	# Include your application configuration below	107	# Include your application configuration below
108		108
109	-	109	+ActiveRecord::Base.store_full_sti_class = true
110		110
111	Noosfero.locales = {	111	Noosfero.locales = {
112	'en' => 'English',	112	'en' => 'English',
@@ -0,0 +1,63 @@		@@ -0,0 +1,63 @@
	1	+#FIXME Don't know why, but this xss_terminate and sanitize_tag_list calls here
	2	+# from the migration fall on a loop and breaks the migration. Both them are
	3	+# related to alias_method_chain, probably there is a problem with this kind of
	4	+# alias on the migration level.
	5	+class Article < ActiveRecord::Base
	6	+ def sanitize_tag_list
	7	+ end
	8	+end
	9	+
	10	+module XssTerminate
	11	+ module InstanceMethods
	12	+ def sanitize_fields_with_white_list
	13	+ end
	14	+ end
	15	+end
	16	+
	17	+#FIXME This after save calls the environment methods 'blocks' and
	18	+# 'portal_community'. Both acts as not defined don't know why.
	19	+class ArticleSweeper < ActiveRecord::Observer
	20	+ def after_save(article)
	21	+ end
	22	+end
	23	+
	24	+class Environment < ActiveRecord::Base
	25	+ def self.verify_filename(filename)
	26	+ filename
	27	+ end
	28	+end
	29	+
	30	+class FixMisunderstoodScriptFilename < ActiveRecord::Migration
	31	+ def self.up
	32	+ Image.all.select { \|i\| !i.thumbnail? && File.extname(i.filename) == '.txt'}.map do \|image\|
	33	+ image.thumbnails.destroy_all
	34	+ image.filename = fixed_name(image)
	35	+ image.save!
	36	+ image.create_thumbnails
	37	+ end
	38	+
	39	+ UploadedFile.all.select { \|u\| u.image? && File.extname(u.filename) == '.txt' }.map do \|uploaded_file\|
	40	+ uploaded_file.thumbnails.destroy_all
	41	+ uploaded_file.filename = fixed_name(uploaded_file)
	42	+ uploaded_file.save!
	43	+ uploaded_file.create_thumbnails
	44	+ end
	45	+
	46	+ Thumbnail.all.select { \|u\| u.image? && File.extname(u.filename) == '.txt' }.map do \|thumbnail\|
	47	+ thumbnail.filename = fixed_name(thumbnail)
	48	+ thumbnail.save!
	49	+ end
	50	+
	51	+ end
	52	+
	53	+ def self.down
	54	+ say "WARNING: cannot undo this migration"
	55	+ end
	56	+
	57	+ class << self
	58	+ def fixed_name(file)
	59	+ file.filename.gsub('.txt', '')
	60	+ end
	61	+ end
	62	+
	63	+end
@@ -0,0 +1,13 @@		@@ -0,0 +1,13 @@
	1	+class SymbolizeEnvironmentSettingsKeys < ActiveRecord::Migration
	2	+ def self.up
	3	+ select_all("select id from environments").each do \|environment\|
	4	+ env = Environment.find(environment['id'])
	5	+ env.settings.symbolize_keys!
	6	+ env.save
	7	+ end
	8	+ end
	9	+
	10	+ def self.down
	11	+ say "WARNING: cannot undo this migration"
	12	+ end
	13	+end
	@@ -9,7 +9,7 @@		@@ -9,7 +9,7 @@
9	#	9	#
10	# It's strongly recommended to check this file into your version control system.	10	# It's strongly recommended to check this file into your version control system.
11		11
12	-ActiveRecord::Schema.define(:version => 20110527042608) do	12	+ActiveRecord::Schema.define(:version => 20110714213405) do
13		13
14	create_table "action_tracker", :force => true do \|t\|	14	create_table "action_tracker", :force => true do \|t\|
15	t.integer "user_id"	15	t.integer "user_id"
		1	+noosfero (0.31.4) unstable; urgency=low
		2	+
		3	+ * Bugfix Version release
		4	+
		5	+ -- Rodrigo Souto <rodrigo@colivre.coop.br> Fri, 15 Jul 2011 16:40:05 -0300
		6	+
1	noosfero (0.31.3) unstable; urgency=low	7	noosfero (0.31.3) unstable; urgency=low
2		8
3	* Bugfix Version release.	9	* Bugfix Version release.
1	module Noosfero	1	module Noosfero
2	PROJECT = 'noosfero'	2	PROJECT = 'noosfero'
3	- VERSION = '0.31.3'	3	+ VERSION = '0.31.4'
4		4
5	def self.pattern_for_controllers_in_directory(dir)	5	def self.pattern_for_controllers_in_directory(dir)
6	disjunction = controllers_in_directory(dir).join('\|')	6	disjunction = controllers_in_directory(dir).join('\|')