rails3: fix comment_classification plugin

Victor Costa
1 parent 82c3dd7b
Showing 29 changed files with 151 additions and 147 deletions Show diff stats
plugins/comment_classification/features/step_definitions/plugin_steps.rb
plugins/comment_classification/lib/comment_classification_plugin.rb
plugins/comment_classification/lib/comment_classification_plugin/comment_label_user.rb
plugins/comment_classification/lib/comment_classification_plugin/comment_status_user.rb
plugins/comment_classification/lib/comment_classification_plugin/label.rb
plugins/comment_classification/lib/comment_classification_plugin/status.rb
plugins/comment_classification/views/comment/comment_extra.html.erb
plugins/comment_classification/views/comment/comment_extra.rhtml
plugins/comment_classification/views/comment/comments_labels_select.html.erb
plugins/comment_classification/views/comment/comments_labels_select.rhtml
plugins/comment_classification/views/comment_classification_plugin_admin/index.html.erb
plugins/comment_classification/views/comment_classification_plugin_admin/index.rhtml
plugins/comment_classification/views/comment_classification_plugin_labels/_form.html.erb
plugins/comment_classification/views/comment_classification_plugin_labels/_form.rhtml
plugins/comment_classification/views/comment_classification_plugin_labels/create.html.erb
plugins/comment_classification/views/comment_classification_plugin_labels/create.rhtml
plugins/comment_classification/views/comment_classification_plugin_labels/edit.html.erb
plugins/comment_classification/views/comment_classification_plugin_labels/edit.rhtml
plugins/comment_classification/views/comment_classification_plugin_labels/index.html.erb
plugins/comment_classification/views/comment_classification_plugin_labels/index.rhtml
 Given /^CommentClassificationPlugin is enabled$/ do
-  Given %{I am logged in as admin}
-  And %{I am on the environment control panel}
-  And %{I follow "Plugins"}
-  And %{I check "Comment Classification"}
-  And %{I press "Save changes"}
+  step %{I am logged in as admin}
+  step %{I am on the environment control panel}
+  step %{I follow "Plugins"}
+  step %{I check "Comment Classification"}
+  step %{I press "Save changes"}
   Environment.default.enabled_plugins.should include("CommentClassificationPlugin")
 end
  
@@ -20,15 +20,15 @@ class CommentClassificationPlugin &lt; Noosfero::Plugin
  
   def comment_form_extra_contents(args)
     comment = args[:comment]
-    lambda {
-      render :file => 'comment/comments_labels_select.rhtml', :locals => {:comment => comment }
+    proc {
+      render :file => 'comment/comments_labels_select', :locals => {:comment => comment }
     }
   end
  
   def comment_extra_contents(args)
     comment = args[:comment]
-    lambda {
-      render :file => 'comment/comment_extra.rhtml', :locals => {:comment => comment}
+    proc {
+      render :file => 'comment/comment_extra', :locals => {:comment => comment}
     }
   end
  
@@ -46,10 +46,6 @@ class CommentClassificationPlugin &lt; Noosfero::Plugin
     end
   end
  
- def js_files
-    'comment_classification.js'
-  end
-
   def stylesheet?
     true
   end
-class CommentClassificationPlugin::CommentLabelUser < Noosfero::Plugin::ActiveRecord
+class CommentClassificationPlugin::CommentLabelUser < ActiveRecord::Base
   set_table_name :comment_classification_plugin_comment_label_user
  
   belongs_to :profile
   belongs_to :comment
   belongs_to :label, :class_name => 'CommentClassificationPlugin::Label'
  
+  attr_accessible :profile, :comment, :label
+
   validates_presence_of :profile
   validates_presence_of :comment
   validates_presence_of :label
-class CommentClassificationPlugin::CommentStatusUser < Noosfero::Plugin::ActiveRecord
+class CommentClassificationPlugin::CommentStatusUser < ActiveRecord::Base
   set_table_name :comment_classification_plugin_comment_status_user
  
   belongs_to :profile
   belongs_to :comment
   belongs_to :status, :class_name => 'CommentClassificationPlugin::Status'
  
+  attr_accessible :name, :enabled, :profile, :comment, :status_id, :reason
+
   validates_presence_of :profile
   validates_presence_of :comment
   validates_presence_of :status
@@ -4,7 +4,9 @@ class CommentClassificationPlugin::Label &lt; Noosfero::Plugin::ActiveRecord
  
   validates_presence_of :name
  
-  named_scope :enabled, :conditions => { :enabled => true }
+  scope :enabled, :conditions => { :enabled => true }
+
+  attr_accessible :name, :enabled, :color
  
   COLORS = ['red', 'green', 'yellow', 'gray', 'blue']
 end
@@ -2,7 +2,9 @@ class CommentClassificationPlugin::Status &lt; Noosfero::Plugin::ActiveRecord
  
   belongs_to :owner, :polymorphic => true
  
+  attr_accessible :name, :enabled
+
   validates_presence_of :name
  
-  named_scope :enabled, :conditions => { :enabled => true }
+  scope :enabled, :conditions => { :enabled => true }
 end
@@ -0,0 +1,17 @@
+<div class='comment-classification-options'>
+
+  <% unless comment.label.nil? %>
+    <p class='label-name' style='color:<%= comment.label.color %>'>
+      <%= comment.label.name %>
+    </p>
+  <% end %>
+
+  <% statuses = CommentClassificationPlugin::Status.enabled %>
+  <% if profile.organization? && user && user.has_permission?(:moderate_comments, profile) && !statuses.empty? %>
+    <div class='comment-classification-status'>
+      <%= link_to(_('Status'), :profile => profile.identifier, :controller => :comment_classification_plugin_myprofile, :action => :add_status, :id => comment.id)
+    %>
+    </div>
+  <% end %>
+
+</div>
@@ -1,17 +0,0 @@
-<div class='comment-classification-options'>
-
-  <% unless comment.label.nil? %>
-    <p class='label-name' style='color:<%= comment.label.color %>'>
-      <%= comment.label.name %>
-    </p>
-  <% end %>
-
-  <% statuses = CommentClassificationPlugin::Status.enabled %>
-  <% if profile.organization? && user && user.has_permission?(:moderate_comments, profile) && !statuses.empty? %>
-    <div class='comment-classification-status'>
-      <%= link_to(_('Status'), :profile => profile.identifier, :controller => :comment_classification_plugin_myprofile, :action => :add_status, :id => comment.id)
-    %>
-    </div>
-  <% end %>
-
-</div>
@@ -0,0 +1,4 @@
+<% labels = CommentClassificationPlugin::Label.enabled  %>
+<% if logged_in? && user.has_permission?(:moderate_comments, profile) && !labels.empty? %>
+  <%= labelled_form_field(_('Label'), select_tag('comment_label_id', options_for_select( [[_('[Select ...]'), nil]] + labels.map{|l|[l.name,l.id]}, @comment.label.nil? ? '' : @comment.label.id)))  %>
+<% end %>
@@ -1,4 +0,0 @@
-<% labels = CommentClassificationPlugin::Label.enabled  %>
-<% if logged_in? && user.has_permission?(:moderate_comments, profile) && !labels.empty? %>
-  <%= labelled_form_field(_('Label'), select_tag('comment_label_id', options_for_select( [[_('[Select ...]'), nil]] + labels.map{|l|[l.name,l.id]}, @comment.label.nil? ? '' : @comment.label.id)))  %>
-<% end %>
@@ -0,0 +1,6 @@
+<h1><%= _('Comments classification options')%></h1>
+
+<ul>
+  <li><%= link_to _('Manage Labels'), :controller => 'comment_classification_plugin_labels' %></li>
+  <li><%= link_to _('Manage Status'), :controller => 'comment_classification_plugin_status' %></li>
+</ul>
@@ -1,6 +0,0 @@
-<h1><%= _('Comments classification options')%></h1>
-
-<ul>
-  <li><%= link_to _('Manage Labels'), :controller => 'comment_classification_plugin_labels' %></li>
-  <li><%= link_to _('Manage Status'), :controller => 'comment_classification_plugin_status' %></li>
-</ul>
@@ -0,0 +1,13 @@
+<%= error_messages_for :label %>
+
+<%= form_for :label do |f| %>
+  <%= required_fields_message %>
+
+  <%= required labelled_form_field(_('Name'), f.text_field(:name)) %>
+  <%= labelled_form_field(_('Color'), f.select(:color, @colors.map{|s|[s.capitalize,s]}))  %>
+  <%= labelled_form_field(f.check_box(:enabled) + _('Enable this label?'),'') %>
+
+  <% button_bar do %>
+    <%= submit_button('save', _('Save'), :cancel => {:action => 'index'}  ) %>
+  <% end %>
+<% end %>
@@ -1,13 +0,0 @@
-<%= error_messages_for :label %>
-
-<% form_for :label, @label do |f| %>
-  <%= required_fields_message %>
-
-  <%= required labelled_form_field(_('Name'), f.text_field(:name)) %>
-  <%= labelled_form_field(_('Color'), f.select(:color, @colors.map{|s|[s.capitalize,s]}))  %>
-  <%= labelled_form_field(f.check_box(:enabled) + _('Enable this label?'),'') %>
-
-  <% button_bar do %>
-    <%= submit_button('save', _('Save'), :cancel => {:action => 'index'}  ) %>
-  <% end %>
-<% end %>
@@ -0,0 +1,3 @@
+<h2> <%= _("Add a new label") %> </h2>
+
+<%= render :partial => 'form' %>
@@ -1,3 +0,0 @@
-<h2> <%= _("Add a new label") %> </h2>
-
-<%= render :partial => 'form' %>
@@ -0,0 +1,3 @@
+<h2> <%= _("Editing label %s") % @label.name %> </h2>
+
+<%= render :partial => 'form' %>
@@ -1,3 +0,0 @@
-<h2> <%= _("Editing label %s") % @label.name %> </h2>
-
-<%= render :partial => 'form' %>
@@ -0,0 +1,32 @@
+<h1><%= _("Manage comments labels") %></h1>
+
+<div id='comment-classification-labels'>
+  <% if @labels.empty? %>
+    <%= _('(no label registered yet)') %>
+  <% else %>
+    <table>
+      <tr>
+        <th><%= _('Label') %></th>
+        <th><%= _('Color') %></th>
+        <th><%= _('Enabled') %></th>
+        <th><%= _('Actions') %></th>
+      </tr>
+      <% @labels.each do |label| %>
+        <tr>
+          <td><%= label.name %></td>
+          <td><%= label.color %></td>
+          <td><%= label.enabled %></td>
+          <td>
+            <%= button_without_text :edit, _('Edit'), {:action => 'edit', :id => label} %>
+            <%= button_without_text :delete, _('Remove'), {:action => 'destroy', :id => label}, :confirm => _('Are you sure you want to  remove this label?') %>
+          </td>
+        </tr>
+      <% end %>
+    </table>
+  <% end %>
+
+  <% button_bar do %>
+    <%= button(:add, _('Add a new label'), :action => 'create')%>
+    <%= button :back, _('Back to admin panel'), :controller => 'admin_panel' %>
+  <% end %>
+</div>
@@ -1,32 +0,0 @@
-<h1><%= _("Manage comments labels") %></h1>
-
-<div id='comment-classification-labels'>
-  <% if @labels.empty? %>
-    <%= _('(no label registered yet)') %>
-  <% else %>
-    <table>
-      <tr>
-        <th><%= _('Label') %></th>
-        <th><%= _('Color') %></th>
-        <th><%= _('Enabled') %></th>
-        <th><%= _('Actions') %></th>
-      </tr>
-      <% @labels.each do |label| %>
-        <tr>
-          <td><%= label.name %></td>
-          <td><%= label.color %></td>
-          <td><%= label.enabled %></td>
-          <td>
-            <%= button_without_text :edit, _('Edit'), {:action => 'edit', :id => label} %>
-            <%= button_without_text :delete, _('Remove'), {:action => 'destroy', :id => label}, :confirm => _('Are you sure you want to  remove this label?') %>
-          </td>
-        </tr>
-      <% end %>
-    </table>
-  <% end %>
-
-  <% button_bar do %>
-    <%= button(:add, _('Add a new label'), :action => 'create')%>
-    <%= button :back, _('Back to admin panel'), :controller => 'admin_panel' %>
-  <% end %>
-</div>
 <%= error_messages_for :status %>
  
-<% form_for :status, @status do |f| %>
+<%= form_for :status do |f| %>
   <%= required_fields_message %>
  
   <%= labelled_form_field(_('Status'), f.select(:status_id, @statuses.map{|s|[s.name,s.id]}))  %>
@@ -0,0 +1,13 @@
+<%= error_messages_for :status %>
+
+<%= form_for :status do |f| %>
+  <%= required_fields_message %>
+
+  <%= required labelled_form_field(_('Name'), f.text_field(:name)) %>
+  <%= labelled_form_field(f.check_box(:enabled) + _('Enable this status?'),'') %>
+  <%#= labelled_form_field(f.check_box(:enable_reason) + _('This status allows reason?'),'') %>
+
+  <% button_bar do %>
+    <%= submit_button('save', _('Save'), :cancel => {:action => 'index'}  ) %>
+  <% end %>
+<% end %>
@@ -1,13 +0,0 @@
-<%= error_messages_for :status %>
-
-<% form_for :status, @status do |f| %>
-  <%= required_fields_message %>
-
-  <%= required labelled_form_field(_('Name'), f.text_field(:name)) %>
-  <%= labelled_form_field(f.check_box(:enabled) + _('Enable this status?'),'') %>
-  <%#= labelled_form_field(f.check_box(:enable_reason) + _('This status allows reason?'),'') %>
-
-  <% button_bar do %>
-    <%= submit_button('save', _('Save'), :cancel => {:action => 'index'}  ) %>
-  <% end %>
-<% end %>
@@ -0,0 +1,3 @@
+<h2> <%= _("Add a new status") %> </h2>
+
+<%= render :partial => 'form' %>
@@ -1,3 +0,0 @@
-<h2> <%= _("Add a new status") %> </h2>
-
-<%= render :partial => 'form' %>
@@ -0,0 +1,3 @@
+<h2> <%= _("Editing status %s") % @status.name %> </h2>
+
+<%= render :partial => 'form' %>
@@ -1,3 +0,0 @@
-<h2> <%= _("Editing status %s") % @status.name %> </h2>
-
-<%= render :partial => 'form' %>
@@ -0,0 +1,32 @@
+<h1> <%= _("Manage comments status") %></h1>
+
+<div id='comment-classification-status'>
+  <% if @status.empty? %>
+    <%= _('(no status registered yet)') %>
+  <% else %>
+    <table>
+      <tr>
+        <th><%= _('Status') %></th>
+        <th><%= _('Enabled') %></th>
+        <th><%= _('Reason enabled?') %></th>
+        <th><%= _('Actions') %></th>
+      </tr>
+      <% @status.each do |st| %>
+        <tr>
+          <td><%= st.name %></td>
+          <td><%= st.enabled %></td>
+          <td><%= st.enable_reason %></td>
+          <td>
+            <%= button_without_text :edit, _('Edit'), {:action => 'edit', :id => st} %>
+            <%= button_without_text :delete, _('Remove'), {:action => 'destroy', :id => st}, :confirm => _('Are you sure you want to remove this status?') %>
+          </td>
+        </tr>
+      <% end %>
+    </table>
+  <% end %>
+
+  <% button_bar do %>
+    <%= button(:add, _('Add a new status'), :action => 'create')%>
+    <%= button :back, _('Back to admin panel'), :controller => 'admin_panel' %>
+  <% end %>
+</div>
@@ -1,32 +0,0 @@
-<h1> <%= _("Manage comments status") %></h1>
-
-<div id='comment-classification-status'>
-  <% if @status.empty? %>
-    <%= _('(no status registered yet)') %>
-  <% else %>
-    <table>
-      <tr>
-        <th><%= _('Status') %></th>
-        <th><%= _('Enabled') %></th>
-        <th><%= _('Reason enabled?') %></th>
-        <th><%= _('Actions') %></th>
-      </tr>
-      <% @status.each do |st| %>
-        <tr>
-          <td><%= st.name %></td>
-          <td><%= st.enabled %></td>
-          <td><%= st.enable_reason %></td>
-          <td>
-            <%= button_without_text :edit, _('Edit'), {:action => 'edit', :id => st} %>
-            <%= button_without_text :delete, _('Remove'), {:action => 'destroy', :id => st}, :confirm => _('Are you sure you want to remove this status?') %>
-          </td>
-        </tr>
-      <% end %>
-    </table>
-  <% end %>
-
-  <% button_bar do %>
-    <%= button(:add, _('Add a new status'), :action => 'create')%>
-    <%= button :back, _('Back to admin panel'), :controller => 'admin_panel' %>
-  <% end %>
-</div>
1	1	Given /^CommentClassificationPlugin is enabled$/ do
2		- Given %{I am logged in as admin}
3		- And %{I am on the environment control panel}
4		- And %{I follow "Plugins"}
5		- And %{I check "Comment Classification"}
6		- And %{I press "Save changes"}
	2	+ step %{I am logged in as admin}
	3	+ step %{I am on the environment control panel}
	4	+ step %{I follow "Plugins"}
	5	+ step %{I check "Comment Classification"}
	6	+ step %{I press "Save changes"}
7	7	Environment.default.enabled_plugins.should include("CommentClassificationPlugin")
8	8	end
9	9
...	...
...	...	@@ -20,15 +20,15 @@ class CommentClassificationPlugin < Noosfero::Plugin
20	20
21	21	def comment_form_extra_contents(args)
22	22	comment = args[:comment]
23		- lambda {
24		- render :file => 'comment/comments_labels_select.rhtml', :locals => {:comment => comment }
	23	+ proc {
	24	+ render :file => 'comment/comments_labels_select', :locals => {:comment => comment }
25	25	}
26	26	end
27	27
28	28	def comment_extra_contents(args)
29	29	comment = args[:comment]
30		- lambda {
31		- render :file => 'comment/comment_extra.rhtml', :locals => {:comment => comment}
	30	+ proc {
	31	+ render :file => 'comment/comment_extra', :locals => {:comment => comment}
32	32	}
33	33	end
34	34
...	...	@@ -46,10 +46,6 @@ class CommentClassificationPlugin < Noosfero::Plugin
46	46	end
47	47	end
48	48
49		- def js_files
50		- 'comment_classification.js'
51		- end
52		-
53	49	def stylesheet?
54	50	true
55	51	end
...	...
1		-class CommentClassificationPlugin::CommentLabelUser < Noosfero::Plugin::ActiveRecord
	1	+class CommentClassificationPlugin::CommentLabelUser < ActiveRecord::Base
2	2	set_table_name :comment_classification_plugin_comment_label_user
3	3
4	4	belongs_to :profile
5	5	belongs_to :comment
6	6	belongs_to :label, :class_name => 'CommentClassificationPlugin::Label'
7	7
	8	+ attr_accessible :profile, :comment, :label
	9	+
8	10	validates_presence_of :profile
9	11	validates_presence_of :comment
10	12	validates_presence_of :label
...	...
...	...	@@ -4,7 +4,9 @@ class CommentClassificationPlugin::Label < Noosfero::Plugin::ActiveRecord
4	4
5	5	validates_presence_of :name
6	6
7		- named_scope :enabled, :conditions => { :enabled => true }
	7	+ scope :enabled, :conditions => { :enabled => true }
	8	+
	9	+ attr_accessible :name, :enabled, :color
8	10
9	11	COLORS = ['red', 'green', 'yellow', 'gray', 'blue']
10	12	end
...	...
...	...	@@ -2,7 +2,9 @@ class CommentClassificationPlugin::Status < Noosfero::Plugin::ActiveRecord
2	2
3	3	belongs_to :owner, :polymorphic => true
4	4
	5	+ attr_accessible :name, :enabled
	6	+
5	7	validates_presence_of :name
6	8
7		- named_scope :enabled, :conditions => { :enabled => true }
	9	+ scope :enabled, :conditions => { :enabled => true }
8	10	end
...	...
...	...	@@ -0,0 +1,17 @@
	1	+<div class='comment-classification-options'>
	2	+
	3	+ <% unless comment.label.nil? %>
	4	+ <p class='label-name' style='color:<%= comment.label.color %>'>
	5	+ <%= comment.label.name %>
	6	+ </p>
	7	+ <% end %>
	8	+
	9	+ <% statuses = CommentClassificationPlugin::Status.enabled %>
	10	+ <% if profile.organization? && user && user.has_permission?(:moderate_comments, profile) && !statuses.empty? %>
	11	+ <div class='comment-classification-status'>
	12	+ <%= link_to(_('Status'), :profile => profile.identifier, :controller => :comment_classification_plugin_myprofile, :action => :add_status, :id => comment.id)
	13	+ %>
	14	+ </div>
	15	+ <% end %>
	16	+
	17	+</div>
...	...
...	...	@@ -1,17 +0,0 @@
1		-<div class='comment-classification-options'>
2		-
3		- <% unless comment.label.nil? %>
4		- <p class='label-name' style='color:<%= comment.label.color %>'>
5		- <%= comment.label.name %>
6		- </p>
7		- <% end %>
8		-
9		- <% statuses = CommentClassificationPlugin::Status.enabled %>
10		- <% if profile.organization? && user && user.has_permission?(:moderate_comments, profile) && !statuses.empty? %>
11		- <div class='comment-classification-status'>
12		- <%= link_to(_('Status'), :profile => profile.identifier, :controller => :comment_classification_plugin_myprofile, :action => :add_status, :id => comment.id)
13		- %>
14		- </div>
15		- <% end %>
16		-
17		-</div>
...	...	@@ -0,0 +1,4 @@
	1	+<% labels = CommentClassificationPlugin::Label.enabled %>
	2	+<% if logged_in? && user.has_permission?(:moderate_comments, profile) && !labels.empty? %>
	3	+ <%= labelled_form_field(_('Label'), select_tag('comment_label_id', options_for_select( [[_('[Select ...]'), nil]] + labels.map{\|l\|[l.name,l.id]}, @comment.label.nil? ? '' : @comment.label.id))) %>
	4	+<% end %>
...	...
...	...	@@ -1,4 +0,0 @@
1		-<% labels = CommentClassificationPlugin::Label.enabled %>
2		-<% if logged_in? && user.has_permission?(:moderate_comments, profile) && !labels.empty? %>
3		- <%= labelled_form_field(_('Label'), select_tag('comment_label_id', options_for_select( [[_('[Select ...]'), nil]] + labels.map{\|l\|[l.name,l.id]}, @comment.label.nil? ? '' : @comment.label.id))) %>
4		-<% end %>
...	...	@@ -0,0 +1,6 @@
	1	+<h1><%= _('Comments classification options')%></h1>
	2	+
	3	+<ul>
	4	+ <li><%= link_to _('Manage Labels'), :controller => 'comment_classification_plugin_labels' %></li>
	5	+ <li><%= link_to _('Manage Status'), :controller => 'comment_classification_plugin_status' %></li>
	6	+</ul>
...	...