Refactored mezuro configuration

Renamed variables in view and controller. Renamed the helper of mezuro configuration ownership. signed-off-by: Fellipe Souto Sampaio <fllsouto@gmail.com>

Refactored mezuro configuration
Renamed variables in view and controller. Renamed the helper of mezuro configuration ownership. signed-off-by: Fellipe Souto Sampaio <fllsouto@gmail.com>
Guilherme Rojas V. de Lima · Rafael Manzo
1 parent 9b94cafd
Showing 12 changed files with 46 additions and 37 deletions Show diff stats
app/controllers/mezuro_configurations_controller.rb
app/helpers/mezuro_configurations_helper.rb
app/views/mezuro_configurations/_form.html.erb
app/views/mezuro_configurations/_list.html.erb
app/views/mezuro_configurations/_mezuro_configuration.html.erb
app/views/mezuro_configurations/show.html.erb
features/metric_configuration/create.feature
features/mezuro_configuration/deletion.feature
features/mezuro_configuration/show.feature
features/reading/new.feature
spec/controllers/mezuro_configurations_controller_spec.rb
spec/helpers/mezuro_configurations_helper_spec.rb
@@ -6,19 +6,19 @@ class MezuroConfigurationsController &lt; ApplicationController
   # GET /mezuro_configurations/new
   def new
-    @configuration = MezuroConfiguration.new
+    @mezuro_configuration = MezuroConfiguration.new
   end
   # GET /mezuro_configurations
   # GET /mezuro_configurations.json
   def index
-    @configurations = MezuroConfiguration.all
+    @mezuro_configurations = MezuroConfiguration.all
   end
   # POST /mezuro_configurations
   # POST /mezuro_configurations.json
   def create
-    @configuration = MezuroConfiguration.new(mezuro_configuration_params)
+    @mezuro_configuration = MezuroConfiguration.new(mezuro_configuration_params)
     respond_to do |format|
       create_and_redir(format)
     end
@@ -28,7 +28,7 @@ class MezuroConfigurationsController &lt; ApplicationController
   # GET /mezuro_configurations/1.json
   def show
     set_mezuro_configuration
-    @configuration_metric_configurations = @configuration.metric_configurations
+    @mezuro_configuration_metric_configurations = @mezuro_configuration.metric_configurations
   end
   # GET /mezuro_configurations/1/edit
@@ -40,8 +40,8 @@ class MezuroConfigurationsController &lt; ApplicationController
   def update
     set_mezuro_configuration
-    if @configuration.update(mezuro_configuration_params)
-      redirect_to(mezuro_configuration_path(@configuration.id))
+    if @mezuro_configuration.update(mezuro_configuration_params)
+      redirect_to(mezuro_configuration_path(@mezuro_configuration.id))
     else
       render "edit"
     end
@@ -51,8 +51,8 @@ class MezuroConfigurationsController &lt; ApplicationController
   # DELETE /mezuro_configurations/1.json
   def destroy
     set_mezuro_configuration
-    current_user.mezuro_configuration_ownerships.find_by_mezuro_configuration_id(@configuration.id).destroy
-    @configuration.destroy
+    current_user.mezuro_configuration_ownerships.find_by_mezuro_configuration_id(@mezuro_configuration.id).destroy
+    @mezuro_configuration.destroy
     respond_to do |format|
       format.html { redirect_to mezuro_configurations_url }
       format.json { head :no_content }
@@ -62,7 +62,7 @@ class MezuroConfigurationsController &lt; ApplicationController
   private
   # Use callbacks to share common setup or constraints between actions.
   def set_mezuro_configuration
-    @configuration = MezuroConfiguration.find(params[:id])
+    @mezuro_configuration = MezuroConfiguration.find(params[:id])
   end
   # Never trust parameters from the scary internet, only allow the white list through.
@@ -72,14 +72,14 @@ class MezuroConfigurationsController &lt; ApplicationController
   # Extracted code from create action
   def create_and_redir(format)
-    if @configuration.save
-      current_user.mezuro_configuration_ownerships.create mezuro_configuration_id: @configuration.id
+    if @mezuro_configuration.save
+      current_user.mezuro_configuration_ownerships.create mezuro_configuration_id: @mezuro_configuration.id
-      format.html { redirect_to mezuro_configuration_path(@configuration.id), notice: 'mezuro_configuration was successfully created.' }
-      format.json { render action: 'show', status: :created, location: @configuration }
+      format.html { redirect_to mezuro_configuration_path(@mezuro_configuration.id), notice: 'mezuro configuration was successfully created.' }
+      format.json { render action: 'show', status: :created, location: @mezuro_configuration }
     else
       format.html { render action: 'new' }
-      format.json { render json: @configuration.errors, status: :unprocessable_entity }
+      format.json { render json: @mezuro_configuration.errors, status: :unprocessable_entity }
     end
   end
 end
 module MezuroConfigurationsHelper
-  def configuration_owner?(configuration_id)
-    user_signed_in? && !current_user.mezuro_configuration_ownerships.find_by_mezuro_configuration_id(configuration_id).nil?
+  def mezuro_configuration_owner?(mezuro_configuration_id)
+    user_signed_in? && !current_user.mezuro_configuration_ownerships.find_by_mezuro_configuration_id(mezuro_configuration_id).nil?
   end
 end
 \ No newline at end of file
-<%= form_for(@configuration, :html => { role: 'form' }) do |f|  %>
-  <%= render :partial => 'shared/form_errors', :locals => {:object => @configuration} %>
+<%= form_for(@mezuro_configuration, :html => { role: 'form' }) do |f|  %>
+  <%= render :partial => 'shared/form_errors', :locals => {:object => @mezuro_configuration} %>
   <div class="form-group">
     <%= f.label :name, class: 'control-label' %><br>
@@ -8,6 +8,6 @@
   </thead>
   <tbody>
-    <%= render @configurations %>
+    <%= render @mezuro_configurations %>
   </tbody>
 </table>
 \ No newline at end of file
@@ -3,7 +3,7 @@
   <td><%= mezuro_configuration.description %></td>
   <td><%= link_to 'Show', mezuro_configuration_path(mezuro_configuration.id), class: 'btn btn-info' %></td>
   <td>
-    <% if configuration_owner?(mezuro_configuration.id) %>
+    <% if mezuro_configuration_owner?(mezuro_configuration.id) %>
       <%= link_to 'Edit', edit_mezuro_configuration_path(mezuro_configuration.id), class: 'btn btn-info' %>
     <% end %>
   </td>
 <div class="page-header">
-  <h1><%= @configuration.name %></h1>
+  <h1><%= @mezuro_configuration.name %></h1>
 </div>
 <p>
   <strong>Description:</strong>
-  <%= @configuration.description %>
+  <%= @mezuro_configuration.description %>
 </p>
 <hr>
 <h2> Metrics </h2>
-<% if configuration_owner? @configuration.id %>
-  <%= link_to 'Add Metric', mezuro_configuration_choose_metric_path(@configuration), class: 'btn btn-info' %>
+<% if mezuro_configuration_owner? @mezuro_configuration.id %>
+  <%= link_to 'Add Metric', mezuro_configuration_choose_metric_path(@mezuro_configuration.id), class: 'btn btn-info' %>
 <% end %>
 <table class="table table-hover">
@@ -23,13 +23,22 @@
       <th>Weight</th>
     </tr>
   </thead>
+  <tbody>
+    <% if @mezuro_configuration_metric_configurations.size == 0 %>
+      <%= render partial: 'no_metric_configurations' %>
+    <% else %>
+      <% cache do %>
+        <%= render partial: 'metric_configurations', collection: @mezuro_configuration_metric_configurations, as: :metric_configuration %>      
+      <% end %>
+    <% end %>
+  </tbody>
 </table>
 <hr>
 <p>
  <%= link_to 'Back', mezuro_configurations_path, class: 'btn btn-default' %>
- <% if configuration_owner? @configuration.id %>
-   <%= link_to 'Destroy Configuration', mezuro_configuration_path(@configuration.id), method: :delete, data: { confirm: 'Are you sure?' }, class: 'btn btn-danger' %>
+ <% if mezuro_configuration_owner? @mezuro_configuration.id %>
+   <%= link_to 'Destroy Configuration', mezuro_configuration_path(@mezuro_configuration.id), method: :delete, data: { confirm: 'Are you sure?' }, class: 'btn btn-danger' %>
  <% end %>
 </p>
@@ -9,7 +9,7 @@ Feature: Metric Configuration Creation
     And I am at the Sample Configuration page
     Then I should not see New Metric Configuration
-  @kalibro_restart @wip
+  @kalibro_restart
   Scenario: metric configuration creation
     Given I am a regular user
     And I am signed in
@@ -23,6 +23,6 @@ Feature: Configuration Deletion
     And I am signed in
     And I own a sample configuration
     And I am at the Sample Configuration page
-    When I click the Destroy configuration link
+    When I click the Destroy Configuration link
     Then I should be in the All configurations page
-    And the sample configuration should not be there
 \ No newline at end of file
+    And the sample configuration should not be there
@@ -7,4 +7,4 @@ Feature: Show Configuration
 Scenario: Checking configuration contents
   Given I have a sample configuration
   When I am at the Sample Configuration page
 -  Then the sample configuration should be there
+  Then the sample configuration should be there
 \ No newline at end of file
@@ -15,7 +15,7 @@ Feature: New reading
     And I should see "Grade"
     And I should see "Color"
-  @kalibro_restart @wip
+  @kalibro_restart 
   Scenario: With valid fields
     Given I am a regular user
     And I am signed in
@@ -164,8 +164,8 @@ describe MezuroConfigurationsController do
         it { should render_template(:edit) }
-        it 'should assign to @configuration the @subject' do
-          assigns(:configuration).should eq(@subject)
+        it 'should assign to @mezuro_configuration the @subject' do
+          assigns(:mezuro_configuration).should eq(@subject)
         end
       end
 require 'spec_helper'
 describe MezuroConfigurationsHelper do
-  describe 'configuration_owner?' do
+  describe 'mezuro_configuration_owner?' do
     before :each do
       @subject = FactoryGirl.build(:mezuro_configuration)
     end
@@ -10,7 +10,7 @@ describe MezuroConfigurationsHelper do
       before :each do
         helper.expects(:user_signed_in?).returns(false)
       end
-      it { helper.configuration_owner?(@subject.id).should be_false }
+      it { helper.mezuro_configuration_owner?(@subject.id).should be_false }
     end
     context 'returns false if is not the owner' do
@@ -24,7 +24,7 @@ describe MezuroConfigurationsHelper do
         User.any_instance.expects(:mezuro_configuration_ownerships).returns(@ownerships)
       end
-      it { helper.configuration_owner?(@subject.id).should be_false }
+      it { helper.mezuro_configuration_owner?(@subject.id).should be_false }
     end
     context 'returns true if user is the mezuro_configuration owner' do
@@ -38,7 +38,7 @@ describe MezuroConfigurationsHelper do
         User.any_instance.expects(:mezuro_configuration_ownerships).returns(@ownerships)
       end
-      it { helper.configuration_owner?(@subject.id).should be_true }
+      it { helper.mezuro_configuration_owner?(@subject.id).should be_true }
     end
   end
 end
 \ No newline at end of file
1	module MezuroConfigurationsHelper	1	module MezuroConfigurationsHelper
2	- def configuration_owner?(configuration_id)
3	- user_signed_in? && !current_user.mezuro_configuration_ownerships.find_by_mezuro_configuration_id(configuration_id).nil?	2	+ def mezuro_configuration_owner?(mezuro_configuration_id)
		3	+ user_signed_in? && !current_user.mezuro_configuration_ownerships.find_by_mezuro_configuration_id(mezuro_configuration_id).nil?
4	end	4	end
5	end	5	end
6	\ No newline at end of file	6	\ No newline at end of file
1	-<%= form_for(@configuration, :html => { role: 'form' }) do \|f\| %>
2	- <%= render :partial => 'shared/form_errors', :locals => {:object => @configuration} %>	1	+<%= form_for(@mezuro_configuration, :html => { role: 'form' }) do \|f\| %>
		2	+ <%= render :partial => 'shared/form_errors', :locals => {:object => @mezuro_configuration} %>
3		3
4	<div class="form-group">	4	<div class="form-group">
5	<%= f.label :name, class: 'control-label' %><br>	5	<%= f.label :name, class: 'control-label' %><br>
	@@ -8,6 +8,6 @@		@@ -8,6 +8,6 @@
8	</thead>	8	</thead>
9		9
10	<tbody>	10	<tbody>
11	- <%= render @configurations %>	11	+ <%= render @mezuro_configurations %>
12	</tbody>	12	</tbody>
13	</table>	13	</table>
14	\ No newline at end of file	14	\ No newline at end of file
	@@ -3,7 +3,7 @@		@@ -3,7 +3,7 @@
3	<td><%= mezuro_configuration.description %></td>	3	<td><%= mezuro_configuration.description %></td>
4	<td><%= link_to 'Show', mezuro_configuration_path(mezuro_configuration.id), class: 'btn btn-info' %></td>	4	<td><%= link_to 'Show', mezuro_configuration_path(mezuro_configuration.id), class: 'btn btn-info' %></td>
5	<td>	5	<td>
6	- <% if configuration_owner?(mezuro_configuration.id) %>	6	+ <% if mezuro_configuration_owner?(mezuro_configuration.id) %>
7	<%= link_to 'Edit', edit_mezuro_configuration_path(mezuro_configuration.id), class: 'btn btn-info' %>	7	<%= link_to 'Edit', edit_mezuro_configuration_path(mezuro_configuration.id), class: 'btn btn-info' %>
8	<% end %>	8	<% end %>
9	</td>	9	</td>
	@@ -9,7 +9,7 @@ Feature: Metric Configuration Creation		@@ -9,7 +9,7 @@ Feature: Metric Configuration Creation
9	And I am at the Sample Configuration page	9	And I am at the Sample Configuration page
10	Then I should not see New Metric Configuration	10	Then I should not see New Metric Configuration
11		11
12	- @kalibro_restart @wip	12	+ @kalibro_restart
13	Scenario: metric configuration creation	13	Scenario: metric configuration creation
14	Given I am a regular user	14	Given I am a regular user
15	And I am signed in	15	And I am signed in
	@@ -7,4 +7,4 @@ Feature: Show Configuration		@@ -7,4 +7,4 @@ Feature: Show Configuration
7	Scenario: Checking configuration contents	7	Scenario: Checking configuration contents
8	Given I have a sample configuration	8	Given I have a sample configuration
9	When I am at the Sample Configuration page	9	When I am at the Sample Configuration page
10	- Then the sample configuration should be there	10	- Then the sample configuration should be there
		11	+ Then the sample configuration should be there
11	\ No newline at end of file	12	\ No newline at end of file
	@@ -15,7 +15,7 @@ Feature: New reading		@@ -15,7 +15,7 @@ Feature: New reading
15	And I should see "Grade"	15	And I should see "Grade"
16	And I should see "Color"	16	And I should see "Color"
17		17
18	- @kalibro_restart @wip	18	+ @kalibro_restart
19	Scenario: With valid fields	19	Scenario: With valid fields
20	Given I am a regular user	20	Given I am a regular user
21	And I am signed in	21	And I am signed in
	@@ -164,8 +164,8 @@ describe MezuroConfigurationsController do		@@ -164,8 +164,8 @@ describe MezuroConfigurationsController do
164		164
165	it { should render_template(:edit) }	165	it { should render_template(:edit) }
166		166
167	- it 'should assign to @configuration the @subject' do
168	- assigns(:configuration).should eq(@subject)	167	+ it 'should assign to @mezuro_configuration the @subject' do
		168	+ assigns(:mezuro_configuration).should eq(@subject)
169	end	169	end
170	end	170	end
171		171
1	require 'spec_helper'	1	require 'spec_helper'
2		2
3	describe MezuroConfigurationsHelper do	3	describe MezuroConfigurationsHelper do
4	- describe 'configuration_owner?' do	4	+ describe 'mezuro_configuration_owner?' do
5	before :each do	5	before :each do
6	@subject = FactoryGirl.build(:mezuro_configuration)	6	@subject = FactoryGirl.build(:mezuro_configuration)
7	end	7	end
	@@ -10,7 +10,7 @@ describe MezuroConfigurationsHelper do		@@ -10,7 +10,7 @@ describe MezuroConfigurationsHelper do
10	before :each do	10	before :each do
11	helper.expects(:user_signed_in?).returns(false)	11	helper.expects(:user_signed_in?).returns(false)
12	end	12	end
13	- it { helper.configuration_owner?(@subject.id).should be_false }	13	+ it { helper.mezuro_configuration_owner?(@subject.id).should be_false }
14	end	14	end
15		15
16	context 'returns false if is not the owner' do	16	context 'returns false if is not the owner' do
	@@ -24,7 +24,7 @@ describe MezuroConfigurationsHelper do		@@ -24,7 +24,7 @@ describe MezuroConfigurationsHelper do
24	User.any_instance.expects(:mezuro_configuration_ownerships).returns(@ownerships)	24	User.any_instance.expects(:mezuro_configuration_ownerships).returns(@ownerships)
25	end	25	end
26		26
27	- it { helper.configuration_owner?(@subject.id).should be_false }	27	+ it { helper.mezuro_configuration_owner?(@subject.id).should be_false }
28	end	28	end
29		29
30	context 'returns true if user is the mezuro_configuration owner' do	30	context 'returns true if user is the mezuro_configuration owner' do
	@@ -38,7 +38,7 @@ describe MezuroConfigurationsHelper do		@@ -38,7 +38,7 @@ describe MezuroConfigurationsHelper do
38	User.any_instance.expects(:mezuro_configuration_ownerships).returns(@ownerships)	38	User.any_instance.expects(:mezuro_configuration_ownerships).returns(@ownerships)
39	end	39	end
40		40
41	- it { helper.configuration_owner?(@subject.id).should be_true }	41	+ it { helper.mezuro_configuration_owner?(@subject.id).should be_true }
42	end	42	end
43	end	43	end
44	end	44	end
45	\ No newline at end of file	45	\ No newline at end of file