Improve settings management

Victor Costa
1 parent 1811287f
Showing 9 changed files with 57 additions and 39 deletions Show diff stats
controllers/gamification_plugin_admin_controller.rb
lib/merit/point_rules.rb
test/functional/gamification_plugin_admin_controller_test.rb
views/gamification_plugin_admin/index.html.erb
views/gamification_plugin_admin/points.html.erb
views/gamification_plugin_badges/edit.html.erb
views/gamification_plugin_badges/index.html.erb
views/gamification_plugin_badges/new.html.erb
views/gamification_plugin_badges/show.html.erb
  
 class GamificationPluginAdminController < PluginAdminController
  
-  def index
-    settings = params[:settings]
-    settings ||= {}
+  before_filter :load_settings
  
-    @settings = Noosfero::Plugin::Settings.new(environment, GamificationPlugin, settings)
-    if request.post?
-      @settings.save!
-      session[:notice] = 'Settings succefully saved.'
-      redirect_to :action => 'index'
+  def points
+    if save_settings
+      render :file => 'gamification_plugin_admin/index'
+    else
+      render :file => 'gamification_plugin_admin/points'
     end
   end
  
-  def new_badge
-    if request.post?
-      badge = GamificationPlugin::Badge.new(params[:badge])
-      badge.owner = environment
-      badge.save!
-      session[:notice] = 'Settings succefully saved.'
-      redirect_to :action => 'index'
-    else
-      render :file => 'gamification_plugin_admin/new_badge'
-    end
+  protected
+
+  def save_settings
+    return false unless request.post?
+    @settings.save!
+    session[:notice] = 'Settings succefully saved.'
+    true
+  end
+
+  def load_settings
+    settings = params[:settings] || {}
+    @settings = Noosfero::Plugin::Settings.new(environment, GamificationPlugin, settings)
   end
  
 end
@@ -8,6 +8,7 @@ module Merit
         :undo_action => 'comment#destroy',
         :to => :author,
         :value => 1,
+        :description => _('Point weight for comment author'),
         :default_weight => 10
       },
       :article_author => {
@@ -15,6 +16,7 @@ module Merit
         :undo_action => 'article#destroy',
         :to => :author,
         :value => 1,
+        :description => _('Point weight for article author'),
         :default_weight => 50
       },
       :vote_voteable_author => {
@@ -23,6 +25,7 @@ module Merit
         :to => lambda {|vote| vote.voteable.author},
         :profile => lambda {|vote| vote.voteable.profile},
         :value => lambda {|vote| vote.vote},
+        :description => _('Point weight for the author of a voted content'),
         :default_weight => 5
       },
       :vote_voteable => {
@@ -31,6 +34,7 @@ module Merit
         :to => lambda {|vote| vote.voteable},
         :profile => lambda {|vote| vote.voteable.profile},
         :value => lambda {|vote| vote.vote},
+        :description => _('Point weight for a voted content'),
         :default_weight => 5
       },
       # TODO comment_voter and article_voter
@@ -11,13 +11,13 @@ class GamificationPluginAdminControllerTest &lt; ActionController::TestCase
   attr_accessor :person, :environment
  
   should 'save point rules' do
-    post :index, :settings => {:point_rules => {'comment_author' => {'weight' => '10'}}}
+    post :points, :settings => {:point_rules => {'comment_author' => {'weight' => '10'}}}
     @settings = Noosfero::Plugin::Settings.new(environment.reload, GamificationPlugin)
     assert_equal({:point_rules => {'comment_author' => {'weight' => '10'}}}, @settings.settings)
   end
  
   should 'load default weights for point rules' do
-    get :index
+    get :points
     Merit::PointRules::AVAILABLE_RULES.each do |category, setting|
       assert_select 'input[name=?][value=?]', "settings[point_rules][#{category}[weight]]", setting[:default_weight]
     end
@@ -27,7 +27,7 @@ class GamificationPluginAdminControllerTest &lt; ActionController::TestCase
     settings = Noosfero::Plugin::Settings.new(environment, GamificationPlugin, {})
     settings.set_setting(:point_rules, {'comment_author' => {'weight' => '500'}})
     settings.save!
-    get :index
+    get :points
     assert_select 'input[name=?][value=?]', "settings[point_rules][comment_author[weight]]", 500
   end
  
 <h1><%= _('Gamification Settings')%></h1>
  
-<%= form_for(:settings) do |f| %>
-  <%= f.fields_for :point_rules do |p| %>
-    <div class="point-rules">
-      <h3><%= _('Point Rules') %></h3>
-      <% Merit::PointRules::AVAILABLE_RULES.each do |category, setting| %>
-        <%= labelled_form_field(_(category), p.text_field("#{category}[weight]", :value => @settings.settings.fetch(:point_rules, {}).fetch(category.to_s, {}).fetch('weight', setting[:default_weight]))) %>
-      <% end %>
-    </div>
-  <% end %>
+<div>
+  <%= link_to _('Manage Point Rules'), :controller => 'gamification_plugin_admin', :action => :points %>
+</div>
  
-  <% button_bar do %>
-    <%= submit_button(:save, c_('Save'), :cancel => {:controller => 'plugins', :action => 'index'}) %>
-  <% end %>
+<div>
+  <%= link_to _('Manage Badges'), :controller => 'gamification_plugin_badges' %>
+</div>
  
-<% end %>
+<div>
+  <%#= link_to _('Manage Levels'), :controller => 'gamification_plugin_admin', :action => :levels %>
+</div>
  
-<%= link_to _('Badges'), :controller => 'gamification_plugin_badges' %>
+<%= button :cancel, _('Cancel'), :controller => :plugins, :action => :index %>
@@ -0,0 +1,18 @@
+<h1><%= _('Gamification Settings: Point Rules')%></h1>
+
+<%= form_for(:settings) do |f| %>
+  <%= f.fields_for :point_rules do |p| %>
+    <div class="point-rules">
+      <h3><%= _('Point Rules') %></h3>
+      <% Merit::PointRules::AVAILABLE_RULES.each do |category, setting| %>
+        <%= labelled_form_field(_(setting[:description]), p.text_field("#{category}[weight]", :value => @settings.settings.fetch(:point_rules, {}).fetch(category.to_s, {}).fetch('weight', setting[:default_weight]))) %>
+      <% end %>
+    </div>
+  <% end %>
+
+  <% button_bar do %>
+    <%= submit_button(:save, c_('Save'), :cancel => {:action => 'index'}) %>
+  <% end %>
+
+<% end %>
+
-<h1><%= _('Gamification Plugin: Editing Badge') %></h1>
+<h1><%= _('Gamification Settings: Editing Badge') %></h1>
  
 <%= render 'form' %>
  
-<h1><%= _('Gamification Plugin: Listing Badges') %></h1>
+<h1><%= _('Gamification Settings: Listing Badges') %></h1>
  
 <table>
   <tr>
-<h1><%= _('Gamification Plugin: New Badge') %></h1>
+<h1><%= _('Gamification Settings: New Badge') %></h1>
  
 <%= render 'form' %>
  
-<h1><%= _('Gamification Plugin: Show Badge') %></h1>
+<h1><%= _('Gamification Settings: Show Badge') %></h1>
  
 <p id="notice"><%= notice %></p>
1	1
2	2	class GamificationPluginAdminController < PluginAdminController
3	3
4		- def index
5		- settings = params[:settings]
6		- settings \|\|= {}
	4	+ before_filter :load_settings
7	5
8		- @settings = Noosfero::Plugin::Settings.new(environment, GamificationPlugin, settings)
9		- if request.post?
10		- @settings.save!
11		- session[:notice] = 'Settings succefully saved.'
12		- redirect_to :action => 'index'
	6	+ def points
	7	+ if save_settings
	8	+ render :file => 'gamification_plugin_admin/index'
	9	+ else
	10	+ render :file => 'gamification_plugin_admin/points'
13	11	end
14	12	end
15	13
16		- def new_badge
17		- if request.post?
18		- badge = GamificationPlugin::Badge.new(params[:badge])
19		- badge.owner = environment
20		- badge.save!
21		- session[:notice] = 'Settings succefully saved.'
22		- redirect_to :action => 'index'
23		- else
24		- render :file => 'gamification_plugin_admin/new_badge'
25		- end
	14	+ protected
	15	+
	16	+ def save_settings
	17	+ return false unless request.post?
	18	+ @settings.save!
	19	+ session[:notice] = 'Settings succefully saved.'
	20	+ true
	21	+ end
	22	+
	23	+ def load_settings
	24	+ settings = params[:settings] \|\| {}
	25	+ @settings = Noosfero::Plugin::Settings.new(environment, GamificationPlugin, settings)
26	26	end
27	27
28	28	end
...	...
...	...	@@ -8,6 +8,7 @@ module Merit
8	8	:undo_action => 'comment#destroy',
9	9	:to => :author,
10	10	:value => 1,
	11	+ :description => _('Point weight for comment author'),
11	12	:default_weight => 10
12	13	},
13	14	:article_author => {
...	...	@@ -15,6 +16,7 @@ module Merit
15	16	:undo_action => 'article#destroy',
16	17	:to => :author,
17	18	:value => 1,
	19	+ :description => _('Point weight for article author'),
18	20	:default_weight => 50
19	21	},
20	22	:vote_voteable_author => {
...	...	@@ -23,6 +25,7 @@ module Merit
23	25	:to => lambda {\|vote\| vote.voteable.author},
24	26	:profile => lambda {\|vote\| vote.voteable.profile},
25	27	:value => lambda {\|vote\| vote.vote},
	28	+ :description => _('Point weight for the author of a voted content'),
26	29	:default_weight => 5
27	30	},
28	31	:vote_voteable => {
...	...	@@ -31,6 +34,7 @@ module Merit
31	34	:to => lambda {\|vote\| vote.voteable},
32	35	:profile => lambda {\|vote\| vote.voteable.profile},
33	36	:value => lambda {\|vote\| vote.vote},
	37	+ :description => _('Point weight for a voted content'),
34	38	:default_weight => 5
35	39	},
36	40	# TODO comment_voter and article_voter
...	...
...	...	@@ -11,13 +11,13 @@ class GamificationPluginAdminControllerTest < ActionController::TestCase
11	11	attr_accessor :person, :environment
12	12
13	13	should 'save point rules' do
14		- post :index, :settings => {:point_rules => {'comment_author' => {'weight' => '10'}}}
	14	+ post :points, :settings => {:point_rules => {'comment_author' => {'weight' => '10'}}}
15	15	@settings = Noosfero::Plugin::Settings.new(environment.reload, GamificationPlugin)
16	16	assert_equal({:point_rules => {'comment_author' => {'weight' => '10'}}}, @settings.settings)
17	17	end
18	18
19	19	should 'load default weights for point rules' do
20		- get :index
	20	+ get :points
21	21	Merit::PointRules::AVAILABLE_RULES.each do \|category, setting\|
22	22	assert_select 'input[name=?][value=?]', "settings[point_rules][#{category}[weight]]", setting[:default_weight]
23	23	end
...	...	@@ -27,7 +27,7 @@ class GamificationPluginAdminControllerTest < ActionController::TestCase
27	27	settings = Noosfero::Plugin::Settings.new(environment, GamificationPlugin, {})
28	28	settings.set_setting(:point_rules, {'comment_author' => {'weight' => '500'}})
29	29	settings.save!
30		- get :index
	30	+ get :points
31	31	assert_select 'input[name=?][value=?]', "settings[point_rules][comment_author[weight]]", 500
32	32	end
33	33
...	...
1	1	<h1><%= _('Gamification Settings')%></h1>
2	2
3		-<%= form_for(:settings) do \|f\| %>
4		- <%= f.fields_for :point_rules do \|p\| %>
5		- <div class="point-rules">
6		- <h3><%= _('Point Rules') %></h3>
7		- <% Merit::PointRules::AVAILABLE_RULES.each do \|category, setting\| %>
8		- <%= labelled_form_field(_(category), p.text_field("#{category}[weight]", :value => @settings.settings.fetch(:point_rules, {}).fetch(category.to_s, {}).fetch('weight', setting[:default_weight]))) %>
9		- <% end %>
10		- </div>
11		- <% end %>
	3	+<div>
	4	+ <%= link_to _('Manage Point Rules'), :controller => 'gamification_plugin_admin', :action => :points %>
	5	+</div>
12	6
13		- <% button_bar do %>
14		- <%= submit_button(:save, c_('Save'), :cancel => {:controller => 'plugins', :action => 'index'}) %>
15		- <% end %>
	7	+<div>
	8	+ <%= link_to _('Manage Badges'), :controller => 'gamification_plugin_badges' %>
	9	+</div>
16	10
17		-<% end %>
	11	+<div>
	12	+ <%#= link_to _('Manage Levels'), :controller => 'gamification_plugin_admin', :action => :levels %>
	13	+</div>
18	14
19		-<%= link_to _('Badges'), :controller => 'gamification_plugin_badges' %>
	15	+<%= button :cancel, _('Cancel'), :controller => :plugins, :action => :index %>
...	...
...	...	@@ -0,0 +1,18 @@
	1	+<h1><%= _('Gamification Settings: Point Rules')%></h1>
	2	+
	3	+<%= form_for(:settings) do \|f\| %>
	4	+ <%= f.fields_for :point_rules do \|p\| %>
	5	+ <div class="point-rules">
	6	+ <h3><%= _('Point Rules') %></h3>
	7	+ <% Merit::PointRules::AVAILABLE_RULES.each do \|category, setting\| %>
	8	+ <%= labelled_form_field(_(setting[:description]), p.text_field("#{category}[weight]", :value => @settings.settings.fetch(:point_rules, {}).fetch(category.to_s, {}).fetch('weight', setting[:default_weight]))) %>
	9	+ <% end %>
	10	+ </div>
	11	+ <% end %>
	12	+
	13	+ <% button_bar do %>
	14	+ <%= submit_button(:save, c_('Save'), :cancel => {:action => 'index'}) %>
	15	+ <% end %>
	16	+
	17	+<% end %>
	18	+
...	...
1		-<h1><%= _('Gamification Plugin: Editing Badge') %></h1>
	1	+<h1><%= _('Gamification Settings: Editing Badge') %></h1>
2	2
3	3	<%= render 'form' %>
4	4
...	...
1		-<h1><%= _('Gamification Plugin: Listing Badges') %></h1>
	1	+<h1><%= _('Gamification Settings: Listing Badges') %></h1>
2	2
3	3	<table>
4	4	<tr>
...	...
1		-<h1><%= _('Gamification Plugin: New Badge') %></h1>
	1	+<h1><%= _('Gamification Settings: New Badge') %></h1>
2	2
3	3	<%= render 'form' %>
4	4
...	...
1		-<h1><%= _('Gamification Plugin: Show Badge') %></h1>
	1	+<h1><%= _('Gamification Settings: Show Badge') %></h1>
2	2
3	3	<p id="notice"><%= notice %></p>
4	4
...	...