Merge branch 'stable'

Rodrigo Souto
2 parents 0ce4ec09 a76f7cae
Showing 15 changed files with 120 additions and 45 deletions Show diff stats
AUTHORS
app/helpers/application_helper.rb
app/models/blog.rb
app/models/blog_archives_block.rb
app/views/search/_full_blog.html.erb
debian/changelog
lib/noosfero.rb
plugins/custom_forms/controllers/custom_forms_plugin_myprofile_controller.rb
plugins/custom_forms/db/migrate/20130702120732_add_position_to_custom_forms_plugin_fields.rb
plugins/custom_forms/lib/custom_forms_plugin/field.rb
plugins/custom_forms/lib/custom_forms_plugin/form.rb
plugins/custom_forms/test/functional/custom_forms_plugin_myprofile_controller_test.rb
plugins/custom_forms/test/unit/custom_forms_plugin/field_test.rb
public/javascripts/chat.js
test/unit/blog_archives_block_test.rb
@@ -153,6 +153,7 @@ Leandro Nunes dos Santos &lt;leandronunes@gmail.com&gt;
 Leandro Nunes dos Santos <leandro.santos@serpro.gov.br>
 LinguÁgil 2010 <linguagil.bahia@gmail.com>
 Lucas Melo <lucas@colivre.coop.br>
+Lucas Melo <lucaspradomelo@gmail.com>
 Luis David Aguilar Carlos <ludwig9003@gmail.com>
 Martín Olivera <molivera@solar.org.ar>
 Moises Machado <moises@colivre.coop.br>
@@ -1345,10 +1345,7 @@ module ApplicationHelper
     options[:on_ready] ||= 'null'
     result = text_field_tag(name, nil, text_field_options.merge(html_options.merge({:id => element_id})))
-    result +=
-    "
-    <script type='text/javascript'>
-      jQuery('##{element_id}')
+    result += javascript_tag("jQuery('##{element_id}')
       .tokenInput('#{url_for(search_action)}', {
         minChars: #{options[:min_chars].to_json},
         prePopulate: #{options[:pre_populate].to_json},
@@ -1364,16 +1361,15 @@ module ApplicationHelper
         onAdd: #{options[:on_add]},
         onDelete: #{options[:on_delete]},
         onReady: #{options[:on_ready]},
-      })
-    "
-    result += options[:focus] ? ".focus();" : ";"
+      });
+    ")
+    result += javascript_tag("jQuery('##{element_id}').focus();") if options[:focus]
     if options[:avoid_enter]
-      result += "jQuery('#token-input-#{element_id}')
+      result += javascript_tag("jQuery('#token-input-#{element_id}')
                     .live('keydown', function(event){
                     if(event.keyCode == '13') return false;
-                  });"
+                    });")
     end
-    result += "</script>"
     result
   end
@@ -82,4 +82,8 @@ class Blog &lt; Folder
     posts.empty?
   end
+  def last_posts(limit=3)
+    posts.where("type != 'RssFeed'").order(:updated_at).limit(limit)
+  end
+
 end
@@ -21,18 +21,22 @@ class BlogArchivesBlock &lt; Block
   end
   def visible_posts(person)
-    blog.posts.native_translations.select {|post| post.display_to?(person)}
+    #FIXME Performance issues with display_to. Must convert it to a scope.
+    # Checkout this page for further information: http://noosfero.org/Development/ActionItem2705
+    blog.posts.published.native_translations #.select {|post| post.display_to?(person)}
   end
   def content(args={})
     owner_blog = self.blog
     return nil unless owner_blog
     results = ''
-    visible_posts(args[:person]).group_by {|i| i.published_at.year }.sort_by { |year,count| -year }.each do |year, results_by_year|
-      results << content_tag('li', content_tag('strong', "#{year} (#{results_by_year.size})"))
+    posts = visible_posts(args[:person])
+    posts.count(:all, :group => 'EXTRACT(YEAR FROM published_at)').sort_by {|year, count| -year.to_i}.each do |year, count|
+      results << content_tag('li', content_tag('strong', "#{year} (#{count})"))
       results << "<ul class='#{year}-archive'>"
-      results_by_year.group_by{|i| [ ('%02d' % i.published_at.month()), gettext(MONTHS[i.published_at.month() - 1])]}.sort.reverse.each do |month, results_by_month|
-        results << content_tag('li', link_to("#{month[1]} (#{results_by_month.size})", owner_blog.url.merge(:year => year, :month => month[0])))
+      posts.count(:all, :conditions => ['EXTRACT(YEAR FROM published_at)=?', year], :group => 'EXTRACT(MONTH FROM published_at)').sort_by {|month, count| -month.to_i}.each do |month, count|
+        month_name = gettext(MONTHS[month.to_i - 1])
+        results << content_tag('li', link_to("#{month_name} (#{count})", owner_blog.url.merge(:year => year, :month => month)))
       end
       results << "</ul>"
     end
@@ -7,12 +7,12 @@
     <tr class="search-blog-items">
       <td class="search-field-label"><%= _("Last posts") %></td>
-      <% r = blog.children.find(:all, :order => :updated_at, :conditions => ['type != ?', 'RssFeed']).last(3) %>
-      <td class="<%= "search-field-none" if r.empty? %>">
-        <% r.each do |a| %>
-          <%= link_to a.title, a.view_url, :class => 'search-blog-sample-item '+icon_for_article(a) %>
+      <% last_posts = blog.last_posts %>
+      <td class="<%= "search-field-none" if last_posts.empty? %>">
+        <% last_posts.each do |post| %>
+          <%= link_to post.title, post.view_url, :class => 'search-blog-sample-item '+icon_for_article(post) %>
         <% end %>
-        <%= _('None') if r.empty? %>
+        <%= _('None') if last_posts.empty? %>
       </td>
     </tr>
+noosfero (0.43.1) unstable; urgency=low
+
+  * Bugfix release
+
+ -- Rodrigo Souto <rodrigo@colivre.coop.br>  Wed, 17 Jul 2013 01:20:46 -0300
+
 noosfero (0.43.0) unstable; urgency=low
   * Solr search converted to a plugin
@@ -3,7 +3,7 @@ require &#39;fast_gettext&#39;
 module Noosfero
   PROJECT = 'noosfero'
-  VERSION = '0.43.0'
+  VERSION = '0.43.1'
   def self.pattern_for_controllers_in_directory(dir)
     disjunction = controllers_in_directory(dir).join('|')
@@ -70,7 +70,8 @@ class CustomFormsPluginMyprofileController &lt; MyProfileController
   private
   def new_fields(params)
-    result = params[:fields].map {|id, hash| hash.has_key?(:real_id) ? nil : hash}.compact
+    keys = params[:fields].keys.sort{|a, b| a.to_i <=> b.to_i}
+    result = keys.map { |id| (hash = params[:fields][id]).has_key?(:real_id) ? nil : hash}.compact
     result.delete_if {|field| field[:name].blank?}
     result
   end
@@ -0,0 +1,13 @@
+class AddPositionToCustomFormsPluginFields < ActiveRecord::Migration
+  def self.up
+    change_table :custom_forms_plugin_fields do |t|
+      t.integer :position, :default => 0
+    end
+  end
+
+  def self.down
+    change_table :custom_forms_plugin_fields do |t|
+      t.remove :position
+    end
+  end
+end
@@ -12,5 +12,11 @@ class CustomFormsPlugin::Field &lt; ActiveRecord::Base
   before_validation do |field|
     field.slug = field.name.to_slug if field.name.present?
   end
+
+  before_create do |field|
+    if field.form.fields.exists?
+      field.position = field.form.fields.order('position').last.position + 1
+    end
+  end
 end
 class CustomFormsPlugin::Form < Noosfero::Plugin::ActiveRecord
   belongs_to :profile
-  has_many :fields, :class_name => 'CustomFormsPlugin::Field', :dependent => :destroy
+  has_many :fields, :class_name => 'CustomFormsPlugin::Field', :dependent => :destroy, :order => 'position'
   has_many :submissions, :class_name => 'CustomFormsPlugin::Submission'
   serialize :access
@@ -40,7 +40,7 @@ class CustomFormsPluginMyprofileControllerTest &lt; ActionController::TestCase
   should 'create a form' do
     format = '%Y-%m-%d %H:%M'
     begining = Time.now.strftime(format)
-    ending = (Time.now + 1.day).strftime('%Y-%m-%d %H:%M')
+    ending = (Time.now + 1.day).strftime(format)
     assert_difference CustomFormsPlugin::Form, :count, 1 do
       post :create, :profile => profile.identifier,
         :form => {
@@ -90,12 +90,42 @@ class CustomFormsPluginMyprofileControllerTest &lt; ActionController::TestCase
     assert f2.kind_of?(CustomFormsPlugin::SelectField)
   end
+  should 'create fields in the order they are sent' do
+    format = '%Y-%m-%d %H:%M'
+    num_fields = 10
+    begining = Time.now.strftime(format)
+    ending = (Time.now + 1.day).strftime(format)
+    fields = {}
+    num_fields.times do |i|
+      fields[i.to_s] = {
+        :name => i.to_s,
+        :default_value => '',
+        :type => 'text_field'
+      }
+    end
+    assert_difference CustomFormsPlugin::Form, :count, 1 do
+      post :create, :profile => profile.identifier,
+        :form => {
+        :name => 'My Form',
+        :access => 'logged',
+        :begining => begining,
+        :ending => ending,
+        :description => 'Cool form'},
+        :fields => fields
+    end
+    form = CustomFormsPlugin::Form.find_by_name('My Form')
+    assert_equal num_fields, form.fields.count
+    form.fields.find_each do |f|
+      assert_equal f.position, f.name.to_i
+    end
+  end
+
   should 'edit a form' do
     form = CustomFormsPlugin::Form.create!(:profile => profile, :name => 'Free Software')
     field = CustomFormsPlugin::TextField.create!(:form => form, :name => 'License')
     format = '%Y-%m-%d %H:%M'
     begining = Time.now.strftime(format)
-    ending = (Time.now + 1.day).strftime('%Y-%m-%d %H:%M')
+    ending = (Time.now + 1.day).strftime(format)
     post :edit, :profile => profile.identifier, :id => form.id,
       :form => {:name => 'My Form', :access => 'logged', :begining => begining, :ending => ending, :description => 'Cool form'},
@@ -71,5 +71,15 @@ class CustomFormsPlugin::FieldTest &lt; ActiveSupport::TestCase
     end
     assert_equal form.fields, [license_field]
   end
+
+  should 'give positions by creation order' do
+    form = CustomFormsPlugin::Form.create!(:name => 'Free Software', :profile => fast_create(Profile))
+    field_0 = CustomFormsPlugin::Field.create!(:name => 'License', :form => form)
+    field_1 = CustomFormsPlugin::Field.create!(:name => 'URL', :form => form)
+    field_2 = CustomFormsPlugin::Field.create!(:name => 'Wiki', :form => form)
+    assert_equal 0, field_0.position
+    assert_equal 1, field_1.position
+    assert_equal 2, field_2.position
+  end
 end
@@ -99,6 +99,7 @@ jQuery(function($) {
      },
      render_body_message: function(body) {
+        body = body.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/\r?\n/g, '<br>');
         body = $().emoticon(body);
         body = linkify(body, {
            callback: function(text, href) {
@@ -38,7 +38,7 @@ class BlogArchivesBlockTest &lt; ActiveSupport::TestCase
     end
     block = BlogArchivesBlock.new
     block.stubs(:owner).returns(profile)
-    assert_tag_in_string block.content, :tag => 'a', :content => 'January (10)', :attributes => {:href => /^http:\/\/.*\/flatline\/blog-one\?month=01&year=2008$/ }
+    assert_tag_in_string block.content, :tag => 'a', :content => 'January (10)', :attributes => {:href => /^http:\/\/.*\/flatline\/blog-one\?month=1&year=2008$/ }
   end
   should 'order list of amount posts' do
@@ -131,7 +131,7 @@ class BlogArchivesBlockTest &lt; ActiveSupport::TestCase
     end
     block = BlogArchivesBlock.new
     block.stubs(:owner).returns(profile)
-    assert_tag_in_string block.content, :tag => 'a', :content => 'January (2)', :attributes => {:href => /^http:\/\/.*\/flatline\/blog-one\?month=01&year=2008$/ }
+    assert_tag_in_string block.content, :tag => 'a', :content => 'January (2)', :attributes => {:href => /^http:\/\/.*\/flatline\/blog-one\?month=1&year=2008$/ }
   end
   should 'not try to load a removed blog' do
@@ -157,22 +157,25 @@ class BlogArchivesBlockTest &lt; ActiveSupport::TestCase
     end
   end
-  should 'not count articles if the user can\'t see them' do
-    person = create_user('testuser').person
-    blog = fast_create(Blog, :profile_id => profile.id, :path => 'blog_path')
-    block = fast_create(BlogArchivesBlock)
-
-    feed = mock()
-    feed.stubs(:url).returns(blog.url)
-    blog.stubs(:feed).returns(feed)
-    block.stubs(:blog).returns(blog)
-    block.stubs(:owner).returns(profile)
-
-    public_post = fast_create(TextileArticle, :profile_id => profile.id, :parent_id => blog.id, :published => true, :published_at => Time.mktime(2012, 'jan'))
-    private_post = fast_create(TextileArticle, :profile_id => profile.id, :parent_id => blog.id, :published => false, :published_at => Time.mktime(2012, 'jan'))
-
-    assert_match /January \(1\)/, block.content({:person => person})
-    assert_match /January \(1\)/, block.content()
-    assert_match /January \(2\)/, block.content({:person => profile})
-  end
+#FIXME Performance issues with display_to. Must convert it to a scope.
+# Checkout this page for further information: http://noosfero.org/Development/ActionItem2705
+#
+#  should 'not count articles if the user can\'t see them' do
+#    person = create_user('testuser').person
+#    blog = fast_create(Blog, :profile_id => profile.id, :path => 'blog_path')
+#    block = fast_create(BlogArchivesBlock)
+#
+#    feed = mock()
+#    feed.stubs(:url).returns(blog.url)
+#    blog.stubs(:feed).returns(feed)
+#    block.stubs(:blog).returns(blog)
+#    block.stubs(:owner).returns(profile)
+#
+#    public_post = fast_create(TextileArticle, :profile_id => profile.id, :parent_id => blog.id, :published => true, :published_at => Time.mktime(2012, 'jan'))
+#    private_post = fast_create(TextileArticle, :profile_id => profile.id, :parent_id => blog.id, :published => false, :published_at => Time.mktime(2012, 'jan'))
+#
+#    assert_match /January \(1\)/, block.content({:person => person})
+#    assert_match /January \(1\)/, block.content()
+#    assert_match /January \(2\)/, block.content({:person => profile})
+#  end
 end
	@@ -82,4 +82,8 @@ class Blog < Folder		@@ -82,4 +82,8 @@ class Blog < Folder
82	posts.empty?	82	posts.empty?
83	end	83	end
84		84
		85	+ def last_posts(limit=3)
		86	+ posts.where("type != 'RssFeed'").order(:updated_at).limit(limit)
		87	+ end
		88	+
85	end	89	end
		1	+noosfero (0.43.1) unstable; urgency=low
		2	+
		3	+ * Bugfix release
		4	+
		5	+ -- Rodrigo Souto <rodrigo@colivre.coop.br> Wed, 17 Jul 2013 01:20:46 -0300
		6	+
1	noosfero (0.43.0) unstable; urgency=low	7	noosfero (0.43.0) unstable; urgency=low
2		8
3	* Solr search converted to a plugin	9	* Solr search converted to a plugin
	@@ -3,7 +3,7 @@ require 'fast_gettext'		@@ -3,7 +3,7 @@ require 'fast_gettext'
3		3
4	module Noosfero	4	module Noosfero
5	PROJECT = 'noosfero'	5	PROJECT = 'noosfero'
6	- VERSION = '0.43.0'	6	+ VERSION = '0.43.1'
7		7
8	def self.pattern_for_controllers_in_directory(dir)	8	def self.pattern_for_controllers_in_directory(dir)
9	disjunction = controllers_in_directory(dir).join('\|')	9	disjunction = controllers_in_directory(dir).join('\|')
@@ -0,0 +1,13 @@		@@ -0,0 +1,13 @@
	1	+class AddPositionToCustomFormsPluginFields < ActiveRecord::Migration
	2	+ def self.up
	3	+ change_table :custom_forms_plugin_fields do \|t\|
	4	+ t.integer :position, :default => 0
	5	+ end
	6	+ end
	7	+
	8	+ def self.down
	9	+ change_table :custom_forms_plugin_fields do \|t\|
	10	+ t.remove :position
	11	+ end
	12	+ end
	13	+end
	@@ -12,5 +12,11 @@ class CustomFormsPlugin::Field < ActiveRecord::Base		@@ -12,5 +12,11 @@ class CustomFormsPlugin::Field < ActiveRecord::Base
12	before_validation do \|field\|	12	before_validation do \|field\|
13	field.slug = field.name.to_slug if field.name.present?	13	field.slug = field.name.to_slug if field.name.present?
14	end	14	end
		15	+
		16	+ before_create do \|field\|
		17	+ if field.form.fields.exists?
		18	+ field.position = field.form.fields.order('position').last.position + 1
		19	+ end
		20	+ end
15	end	21	end
16		22
1	class CustomFormsPlugin::Form < Noosfero::Plugin::ActiveRecord	1	class CustomFormsPlugin::Form < Noosfero::Plugin::ActiveRecord
2	belongs_to :profile	2	belongs_to :profile
3		3
4	- has_many :fields, :class_name => 'CustomFormsPlugin::Field', :dependent => :destroy	4	+ has_many :fields, :class_name => 'CustomFormsPlugin::Field', :dependent => :destroy, :order => 'position'
5	has_many :submissions, :class_name => 'CustomFormsPlugin::Submission'	5	has_many :submissions, :class_name => 'CustomFormsPlugin::Submission'
6		6
7	serialize :access	7	serialize :access
	@@ -40,7 +40,7 @@ class CustomFormsPluginMyprofileControllerTest < ActionController::TestCase		@@ -40,7 +40,7 @@ class CustomFormsPluginMyprofileControllerTest < ActionController::TestCase
40	should 'create a form' do	40	should 'create a form' do
41	format = '%Y-%m-%d %H:%M'	41	format = '%Y-%m-%d %H:%M'
42	begining = Time.now.strftime(format)	42	begining = Time.now.strftime(format)
43	- ending = (Time.now + 1.day).strftime('%Y-%m-%d %H:%M')	43	+ ending = (Time.now + 1.day).strftime(format)
44	assert_difference CustomFormsPlugin::Form, :count, 1 do	44	assert_difference CustomFormsPlugin::Form, :count, 1 do
45	post :create, :profile => profile.identifier,	45	post :create, :profile => profile.identifier,
46	:form => {	46	:form => {
	@@ -90,12 +90,42 @@ class CustomFormsPluginMyprofileControllerTest < ActionController::TestCase		@@ -90,12 +90,42 @@ class CustomFormsPluginMyprofileControllerTest < ActionController::TestCase
90	assert f2.kind_of?(CustomFormsPlugin::SelectField)	90	assert f2.kind_of?(CustomFormsPlugin::SelectField)
91	end	91	end
92		92
		93	+ should 'create fields in the order they are sent' do
		94	+ format = '%Y-%m-%d %H:%M'
		95	+ num_fields = 10
		96	+ begining = Time.now.strftime(format)
		97	+ ending = (Time.now + 1.day).strftime(format)
		98	+ fields = {}
		99	+ num_fields.times do \|i\|
		100	+ fields[i.to_s] = {
		101	+ :name => i.to_s,
		102	+ :default_value => '',
		103	+ :type => 'text_field'
		104	+ }
		105	+ end
		106	+ assert_difference CustomFormsPlugin::Form, :count, 1 do
		107	+ post :create, :profile => profile.identifier,
		108	+ :form => {
		109	+ :name => 'My Form',
		110	+ :access => 'logged',
		111	+ :begining => begining,
		112	+ :ending => ending,
		113	+ :description => 'Cool form'},
		114	+ :fields => fields
		115	+ end
		116	+ form = CustomFormsPlugin::Form.find_by_name('My Form')
		117	+ assert_equal num_fields, form.fields.count
		118	+ form.fields.find_each do \|f\|
		119	+ assert_equal f.position, f.name.to_i
		120	+ end
		121	+ end
		122	+
93	should 'edit a form' do	123	should 'edit a form' do
94	form = CustomFormsPlugin::Form.create!(:profile => profile, :name => 'Free Software')	124	form = CustomFormsPlugin::Form.create!(:profile => profile, :name => 'Free Software')
95	field = CustomFormsPlugin::TextField.create!(:form => form, :name => 'License')	125	field = CustomFormsPlugin::TextField.create!(:form => form, :name => 'License')
96	format = '%Y-%m-%d %H:%M'	126	format = '%Y-%m-%d %H:%M'
97	begining = Time.now.strftime(format)	127	begining = Time.now.strftime(format)
98	- ending = (Time.now + 1.day).strftime('%Y-%m-%d %H:%M')	128	+ ending = (Time.now + 1.day).strftime(format)
99		129
100	post :edit, :profile => profile.identifier, :id => form.id,	130	post :edit, :profile => profile.identifier, :id => form.id,
101	:form => {:name => 'My Form', :access => 'logged', :begining => begining, :ending => ending, :description => 'Cool form'},	131	:form => {:name => 'My Form', :access => 'logged', :begining => begining, :ending => ending, :description => 'Cool form'},
	@@ -71,5 +71,15 @@ class CustomFormsPlugin::FieldTest < ActiveSupport::TestCase		@@ -71,5 +71,15 @@ class CustomFormsPlugin::FieldTest < ActiveSupport::TestCase
71	end	71	end
72	assert_equal form.fields, [license_field]	72	assert_equal form.fields, [license_field]
73	end	73	end
		74	+
		75	+ should 'give positions by creation order' do
		76	+ form = CustomFormsPlugin::Form.create!(:name => 'Free Software', :profile => fast_create(Profile))
		77	+ field_0 = CustomFormsPlugin::Field.create!(:name => 'License', :form => form)
		78	+ field_1 = CustomFormsPlugin::Field.create!(:name => 'URL', :form => form)
		79	+ field_2 = CustomFormsPlugin::Field.create!(:name => 'Wiki', :form => form)
		80	+ assert_equal 0, field_0.position
		81	+ assert_equal 1, field_1.position
		82	+ assert_equal 2, field_2.position
		83	+ end
74	end	84	end
75		85
	@@ -99,6 +99,7 @@ jQuery(function($) {		@@ -99,6 +99,7 @@ jQuery(function($) {
99	},	99	},
100		100
101	render_body_message: function(body) {	101	render_body_message: function(body) {
		102	+ body = body.replace(/&/g, '&').replace(/</g, '<').replace(/>/g, '>').replace(/\r?\n/g, '<br>');
102	body = $().emoticon(body);	103	body = $().emoticon(body);
103	body = linkify(body, {	104	body = linkify(body, {
104	callback: function(text, href) {	105	callback: function(text, href) {