From ebacd83dde7937a099d55a137212df48aa6ce488 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Sat, 26 Nov 2016 11:42:34 +1300 Subject: [PATCH] Case statement indentation clean up --- .rubocop_todo.yml | 10 ------ app/helpers/application_helper.rb | 16 ++++----- app/models/order.rb | 46 ++++++++++++------------- db/migrate/20150201052245_create_cms.rb | 8 ++--- 4 files changed, 35 insertions(+), 45 deletions(-) diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index e7662da23..dbde64ba3 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -393,16 +393,6 @@ Style/BracesAroundHashParameters: - 'spec/views/notifier/notify.html.haml_spec.rb' - 'spec/views/photos/new.html.haml_spec.rb' -# Offense count: 13 -# Cop supports --auto-correct. -# Configuration parameters: IndentWhenRelativeTo, SupportedStyles, IndentOneStep, IndentationWidth. -# SupportedStyles: case, end -Style/CaseIndentation: - Exclude: - - 'app/helpers/application_helper.rb' - - 'app/models/order.rb' - - 'db/migrate/20150201052245_create_cms.rb' - # Offense count: 4 # Configuration parameters: EnforcedStyle, SupportedStyles. # SupportedStyles: nested, compact diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 6bee33f0b..4085ea31b 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -26,14 +26,14 @@ module ApplicationHelper def build_alert_classes(alert_type = :info) classes = 'alert alert-dismissable ' case alert_type.to_sym - when :alert, :danger, :error, :validation_errors - classes += 'alert-danger' - when :warning, :todo - classes += 'alert-warning' - when :notice, :success - classes += 'alert-success' - when :info - classes += 'alert-info' + when :alert, :danger, :error, :validation_errors + classes += 'alert-danger' + when :warning, :todo + classes += 'alert-warning' + when :notice, :success + classes += 'alert-success' + when :info + classes += 'alert-info' end classes end diff --git a/app/models/order.rb b/app/models/order.rb index 8ccdaa9db..b5e1ee1ad 100644 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -65,29 +65,29 @@ class Order < ActiveRecord::Base def Order.search(args={}) if args[:for] case args[:by] - when "member" - member = Member.find_by_login_name(args[:for]) - if member - return member.orders - end - when "order_id" - order = Order.find_by_id(args[:for]) - if order - return [order] - end - when "paypal_token" - order = Order.find_by_paypal_express_token(args[:for]) - if order - return [order] - end - when "paypal_payer_id" - order = Order.find_by_paypal_express_payer_id(args[:for]) - if order - return [order] - end - when "referral_code" - # coerce to uppercase - return Order.where(referral_code: args[:for].upcase) + when "member" + member = Member.find_by_login_name(args[:for]) + if member + return member.orders + end + when "order_id" + order = Order.find_by_id(args[:for]) + if order + return [order] + end + when "paypal_token" + order = Order.find_by_paypal_express_token(args[:for]) + if order + return [order] + end + when "paypal_payer_id" + order = Order.find_by_paypal_express_payer_id(args[:for]) + if order + return [order] + end + when "referral_code" + # coerce to uppercase + return Order.where(referral_code: args[:for].upcase) end end return [] diff --git a/db/migrate/20150201052245_create_cms.rb b/db/migrate/20150201052245_create_cms.rb index 8eceef012..b5150d895 100644 --- a/db/migrate/20150201052245_create_cms.rb +++ b/db/migrate/20150201052245_create_cms.rb @@ -1,10 +1,10 @@ class CreateCms < ActiveRecord::Migration def self.up # rubocop:disable Metrics/MethodLength text_limit = case ActiveRecord::Base.connection.adapter_name - when 'PostgreSQL' - { } - else - { limit: 16777215 } + when 'PostgreSQL' + { } + else + { limit: 16777215 } end # -- Sites --------------------------------------------------------------