From 170be947c9b95643e91b586e9bcb4062e7649b9d Mon Sep 17 00:00:00 2001 From: Rafael Reggiani Manzo Date: Sun, 13 Apr 2014 19:20:43 -0300 Subject: [PATCH] Renamed BaseConfigurationsController to BaseMetricConfigurationsController --- app/controllers/base_configurations_controller.rb | 45 --------------------------------------------- app/controllers/base_metric_configurations_controller.rb | 45 +++++++++++++++++++++++++++++++++++++++++++++ app/controllers/compound_metric_configurations_controller.rb | 2 +- app/controllers/concerns/ownership_authentication.rb | 4 ++-- app/controllers/metric_configurations_controller.rb | 2 +- spec/controllers/base_metric_configurations_controller_spec.rb | 10 +++++----- 6 files changed, 54 insertions(+), 54 deletions(-) delete mode 100644 app/controllers/base_configurations_controller.rb create mode 100644 app/controllers/base_metric_configurations_controller.rb diff --git a/app/controllers/base_configurations_controller.rb b/app/controllers/base_configurations_controller.rb deleted file mode 100644 index 119950e..0000000 --- a/app/controllers/base_configurations_controller.rb +++ /dev/null @@ -1,45 +0,0 @@ -include OwnershipAuthentication -include MetricConfigurationsConcern - -class BaseConfigurationsController < ApplicationController - before_action :authenticate_user!, except: [:show, :index] - before_action :metric_configuration_owner?, only: [:edit, :update, :destroy] - before_action :mezuro_configuration_owner?, only: [:new, :create, :choose_metric] - before_action :set_metric_configuration, only: [:show, :edit, :update, :destroy] - - def new - update_metric_configuration(MetricConfiguration.new) - metric_configuration.configuration_id = params[:mezuro_configuration_id].to_i - end - - def show - if metric_configuration - @reading_group = ReadingGroup.find(metric_configuration.reading_group_id) - @mezuro_ranges = metric_configuration.mezuro_ranges - metric_configuration.configuration_id = params[:mezuro_configuration_id].to_i - else - raise NotImplementedError - end - end - - def create - update_metric_configuration(MetricConfiguration.new(metric_configuration_params)) - metric_configuration.configuration_id = params[:mezuro_configuration_id].to_i - end - - protected - - def metric_configuration - raise NotImplementedError - end - - def update_metric_configuration (new_metric_configuration) - raise NotImplementedError - end - - # Never trust parameters from the scary internet, only allow the white list through. - # TODO: this should be refactored to the concern metric configuration - def metric_configuration_params - params[:metric_configuration] - end -end \ No newline at end of file diff --git a/app/controllers/base_metric_configurations_controller.rb b/app/controllers/base_metric_configurations_controller.rb new file mode 100644 index 0000000..7f5a24e --- /dev/null +++ b/app/controllers/base_metric_configurations_controller.rb @@ -0,0 +1,45 @@ +include OwnershipAuthentication +include MetricConfigurationsConcern + +class BaseMetricConfigurationsController < ApplicationController + before_action :authenticate_user!, except: [:show, :index] + before_action :metric_configuration_owner?, only: [:edit, :update, :destroy] + before_action :mezuro_configuration_owner?, only: [:new, :create, :choose_metric] + before_action :set_metric_configuration, only: [:show, :edit, :update, :destroy] + + def new + update_metric_configuration(MetricConfiguration.new) + metric_configuration.configuration_id = params[:mezuro_configuration_id].to_i + end + + def show + if metric_configuration + @reading_group = ReadingGroup.find(metric_configuration.reading_group_id) + @mezuro_ranges = metric_configuration.mezuro_ranges + metric_configuration.configuration_id = params[:mezuro_configuration_id].to_i + else + raise NotImplementedError + end + end + + def create + update_metric_configuration(MetricConfiguration.new(metric_configuration_params)) + metric_configuration.configuration_id = params[:mezuro_configuration_id].to_i + end + + protected + + def metric_configuration + raise NotImplementedError + end + + def update_metric_configuration (new_metric_configuration) + raise NotImplementedError + end + + # Never trust parameters from the scary internet, only allow the white list through. + # TODO: this should be refactored to the concern metric configuration + def metric_configuration_params + params[:metric_configuration] + end +end \ No newline at end of file diff --git a/app/controllers/compound_metric_configurations_controller.rb b/app/controllers/compound_metric_configurations_controller.rb index 2b23d60..3647672 100644 --- a/app/controllers/compound_metric_configurations_controller.rb +++ b/app/controllers/compound_metric_configurations_controller.rb @@ -1,4 +1,4 @@ -class CompoundMetricConfigurationsController < BaseConfigurationsController +class CompoundMetricConfigurationsController < BaseMetricConfigurationsController before_action :set_metric_configurations, only: [:new, :edit] def create diff --git a/app/controllers/concerns/ownership_authentication.rb b/app/controllers/concerns/ownership_authentication.rb index dc0ebd3..656b7d0 100644 --- a/app/controllers/concerns/ownership_authentication.rb +++ b/app/controllers/concerns/ownership_authentication.rb @@ -16,7 +16,7 @@ module OwnershipAuthentication def repository_owner? check_project_ownership(params[:project_id]) end - + def reading_group_owner? if self.kind_of?(ReadingGroupsController) id = params[:id] @@ -36,7 +36,7 @@ module OwnershipAuthentication def mezuro_configuration_owner? if self.kind_of?(MezuroConfigurationsController) id = params[:id] - elsif (self.kind_of?(BaseConfigurationsController)) + elsif (self.kind_of?(BaseMetricConfigurationsController)) id = params[:mezuro_configuration_id] else raise "Not supported" diff --git a/app/controllers/metric_configurations_controller.rb b/app/controllers/metric_configurations_controller.rb index 6b175e8..dca743d 100644 --- a/app/controllers/metric_configurations_controller.rb +++ b/app/controllers/metric_configurations_controller.rb @@ -1,4 +1,4 @@ -class MetricConfigurationsController < BaseConfigurationsController +class MetricConfigurationsController < BaseMetricConfigurationsController def choose_metric @mezuro_configuration_id = params[:mezuro_configuration_id].to_i @metric_configuration_id = params[:metric_configuration_id].to_i diff --git a/spec/controllers/base_metric_configurations_controller_spec.rb b/spec/controllers/base_metric_configurations_controller_spec.rb index 6701b7a..5217a66 100644 --- a/spec/controllers/base_metric_configurations_controller_spec.rb +++ b/spec/controllers/base_metric_configurations_controller_spec.rb @@ -1,11 +1,11 @@ require 'spec_helper' -class CleanInheritsFromBaseConfigurationsController < BaseConfigurationsController +class CleanInheritsFromBaseMetricConfigurationsController < BaseMetricConfigurationsController def metric_configuration; super; end def update_metric_configuration (new_metric_configuration); super; end end -class InheritsFromBaseConfigurationsController < BaseConfigurationsController +class InheritsFromBaseMetricConfigurationsController < BaseMetricConfigurationsController def new render :nothing => true super @@ -40,14 +40,14 @@ class InheritsFromBaseConfigurationsController < BaseConfigurationsController end -describe InheritsFromBaseConfigurationsController do +describe InheritsFromBaseMetricConfigurationsController do let(:mezuro_configuration) { FactoryGirl.build(:mezuro_configuration) } before do Rails.application.routes.draw do resources :mezuro_configurations do match '/metric_configurations/choose_metric' => 'metric_configurations#choose_metric', as: :choose_metric, :via => [:get] - resources :inherits_from_base_configurations do + resources :inherits_from_base_metric_configurations do match '/metric_configurations/new' => 'metric_configurations#new', as: :new_metric_configuration, :via => [:post] match '/metric_configurations/:id' => 'metric_configurations#update', as: :metric_configuration_update, :via => [:put] end @@ -141,7 +141,7 @@ describe InheritsFromBaseConfigurationsController do context 'with a inheritance without overrides methods' do - subject { CleanInheritsFromBaseConfigurationsController.new } + subject { CleanInheritsFromBaseMetricConfigurationsController.new } describe 'metric_configuration' do it 'should raise a NotImplementedError' do -- libgit2 0.21.2