More code climate style fixes

This commit is contained in:
Jyri-Petteri Paloposki 2020-10-10 13:58:13 +03:00
parent d8acf60049
commit 67a426a2e9
28 changed files with 157 additions and 172 deletions

View file

@ -1,5 +1,4 @@
module Tracks
class AttributeHandler
attr_reader :attributes
@ -10,7 +9,7 @@ module Tracks
end
def get(attribute)
@attributes[attribute.to_sym]
@attributes[attribute.to_sym]
end
def [](attribute)
@ -37,7 +36,7 @@ module Tracks
@attributes.key?(key.to_sym)
end
def selector_key_present?(key)
def selector_key_present?(key)
key?(key)
end
@ -78,9 +77,9 @@ module Tracks
object = relation.build(:name => name)
new_object_created = true
end
return object, new_object_created
end
end
def specified_by_name?(object_type)
self.send("#{object_type}_specified_by_name?")
@ -115,25 +114,23 @@ module Tracks
ActionController::Parameters.new(attributes).permit(
:context, :project,
# model attributes
:context_id, :project_id, :description, :notes, :state, :start_from,
:context_id, :project_id, :description, :notes, :state, :start_from,
:ends_on, :end_date, :number_of_occurrences, :occurrences_count, :target,
:show_from_delta, :recurring_period, :recurrence_selector, :every_other1,
:every_other2, :every_other3, :every_day, :only_work_days, :every_count,
:show_from_delta, :recurring_period, :recurrence_selector, :every_other1,
:every_other2, :every_other3, :every_day, :only_work_days, :every_count,
:weekday, :show_always, :context_name, :project_name, :tag_list,
# form attributes
:recurring_period, :daily_selector, :monthly_selector, :yearly_selector,
:recurring_target, :daily_every_x_days, :monthly_day_of_week,
:monthly_every_x_day, :monthly_every_x_month2, :monthly_every_x_month,
:monthly_every_xth_day, :recurring_show_days_before,
:recurring_period, :daily_selector, :monthly_selector, :yearly_selector,
:recurring_target, :daily_every_x_days, :monthly_day_of_week,
:monthly_every_x_day, :monthly_every_x_month2, :monthly_every_x_month,
:monthly_every_xth_day, :recurring_show_days_before,
:recurring_show_always, :weekly_every_x_week, :weekly_return_monday,
:yearly_day_of_week, :yearly_every_x_day, :yearly_every_xth_day,
:yearly_day_of_week, :yearly_every_x_day, :yearly_every_xth_day,
:yearly_month_of_year2, :yearly_month_of_year,
# derived attributes
:weekly_return_monday, :weekly_return_tuesday, :weekly_return_wednesday,
:weekly_return_monday, :weekly_return_tuesday, :weekly_return_wednesday,
:weekly_return_thursday, :weekly_return_friday, :weekly_return_saturday, :weekly_return_sunday
)
)
end
end
end

View file

@ -1,11 +1,9 @@
module Tracks
class Config
def self.auth_schemes
SITE_CONFIG['authentication_schemes'] || []
end
def self.openid_enabled?
auth_schemes.include?('open_id')
end
@ -13,7 +11,7 @@ module Tracks
def self.cas_enabled?
auth_schemes.include?('cas')
end
def self.prefered_auth?
if SITE_CONFIG['prefered_auth']
SITE_CONFIG['prefered_auth']
@ -21,7 +19,5 @@ module Tracks
auth_schemes.first
end
end
end
end

View file

@ -1,14 +1,11 @@
# Inspiration from Bruce Williams [http://codefluency.com/articles/2006/07/01/rails-views-getting-in-context/]
module Tracks
module SourceViewSwitching
class Responder
def initialize(source_view)
@source_view = source_view.underscore.gsub(/\s+/,'_').to_sym rescue nil
end
def nil?
yield if @source_view.nil? && block_given?
end
@ -16,53 +13,46 @@ module Tracks
def context
yield if :context == @source_view && block_given?
end
def method_missing(check_source_view,*args)
def method_missing(check_source_view, *args)
yield if check_source_view == @source_view && block_given?
end
end
module Controller
def self.included(base)
base.send(:helper, Tracks::SourceViewSwitching::Helper)
base.send(:helper_method, :source_view)
end
def source_view_is( s )
def source_view_is(s)
s == (params[:_source_view] || @source_view).to_sym
end
def source_view_is_one_of( *s )
def source_view_is_one_of(*s)
s.include?(params[:_source_view].to_sym)
end
def source_view
responder = Tracks::SourceViewSwitching::Responder.new(params[:_source_view] || @source_view)
block_given? ? yield(responder) : responder
end
end
module Helper
def source_view_tag(name)
hidden_field_tag :_source_view, name.underscore.gsub(/\s+/,'_')
end
def source_view_is( s )
def source_view_is(s)
s == (params[:_source_view] || @source_view).to_sym
end
def source_view_is_one_of( *s )
def source_view_is_one_of(*s)
s.include?((params[:_source_view] || @source_view).to_sym)
end
end
end
end
ActionController::Base.send(:include, Tracks::SourceViewSwitching::Controller)