From 18b0ea1adfaa5f759a23a80db6630cb5768f4ce5 Mon Sep 17 00:00:00 2001 From: Alexander Meindl Date: Sun, 9 Aug 2020 08:37:45 +0200 Subject: [PATCH] Fixing coding standards --- .../messenger_settings_controller.rb | 6 +- app/models/messenger.rb | 66 +++++++++---------- app/models/messenger_setting.rb | 2 +- lib/redmine_messenger/hooks.rb | 6 +- lib/redmine_messenger/patches/issue_patch.rb | 4 +- test/integration/common_views_test.rb | 2 +- test/integration/routing_test.rb | 2 +- test/test_helper.rb | 6 +- test/unit/i18n_test.rb | 2 +- test/unit/issue_test.rb | 2 +- test/unit/project_test.rb | 2 +- 11 files changed, 50 insertions(+), 50 deletions(-) diff --git a/app/controllers/messenger_settings_controller.rb b/app/controllers/messenger_settings_controller.rb index 0f14dd3..68cb6f6 100644 --- a/app/controllers/messenger_settings_controller.rb +++ b/app/controllers/messenger_settings_controller.rb @@ -3,9 +3,9 @@ class MessengerSettingsController < ApplicationController before_action :authorize def update - setting = MessengerSetting.find_or_create(@project.id) - if setting.update(allowed_params) - flash[:notice] = l(:notice_successful_update) + setting = MessengerSetting.find_or_create @project.id + if setting.update allowed_params + flash[:notice] = l :notice_successful_update redirect_to settings_project_path(@project, tab: 'messenger') else flash[:error] = setting.errors.full_messages.flatten.join("\n") diff --git a/app/models/messenger.rb b/app/models/messenger.rb index 900e567..a10769e 100644 --- a/app/models/messenger.rb +++ b/app/models/messenger.rb @@ -35,7 +35,7 @@ class Messenger username = textfield_for_project(options[:project], :messenger_username) params[:username] = username if username.present? params[:attachments] = options[:attachment]&.any? ? [options[:attachment]] : [] - icon = textfield_for_project(options[:project], :messenger_icon) + icon = textfield_for_project options[:project], :messenger_icon if icon.present? if icon.start_with? ':' params[:icon_emoji] = icon @@ -50,24 +50,24 @@ class Messenger http_options = { use_ssl: uri.scheme == 'https' } http_options[:verify_mode] = OpenSSL::SSL::VERIFY_NONE unless RedmineMessenger.setting?(:messenger_verify_ssl) begin - req = Net::HTTP::Post.new(uri) - req.set_form_data(payload: params.to_json) + req = Net::HTTP::Post.new uri + req.set_form_data payload: params.to_json Net::HTTP.start(uri.hostname, uri.port, http_options) do |http| - response = http.request(req) + response = http.request req Rails.logger.warn(response.inspect) unless [Net::HTTPSuccess, Net::HTTPRedirection, Net::HTTPOK].include? response end rescue StandardError => e - Rails.logger.warn("cannot connect to #{url}") - Rails.logger.warn(e) + Rails.logger.warn "cannot connect to #{url}" + Rails.logger.warn e end end end def object_url(obj) if Setting.host_name.to_s =~ %r{\A(https?://)?(.+?)(:(\d+))?(/.+)?\z}i - host = Regexp.last_match(2) - port = Regexp.last_match(4) - prefix = Regexp.last_match(5) + host = Regexp.last_match 2 + port = Regexp.last_match 4 + prefix = Regexp.last_match 5 Rails.application.routes.url_for(obj.event_url(host: host, protocol: Setting.protocol, port: port, script_name: prefix)) else Rails.application.routes.url_for(obj.event_url(host: Setting.host_name, protocol: Setting.protocol, script_name: '')) @@ -78,11 +78,11 @@ class Messenger return if proj.blank? # project based - pm = MessengerSetting.find_by(project_id: proj.id) + pm = MessengerSetting.find_by project_id: proj.id return pm.messenger_url if !pm.nil? && pm.messenger_url.present? # parent project based - parent_url = url_for_project(proj.parent) + parent_url = url_for_project proj.parent return parent_url if parent_url.present? # system based return RedmineMessenger.settings[:messenger_url] if RedmineMessenger.settings[:messenger_url].present? @@ -102,15 +102,15 @@ class Messenger return if proj.blank? # project based - pm = MessengerSetting.find_by(project_id: proj.id) + pm = MessengerSetting.find_by project_id: proj.id return pm.send(config) if !pm.nil? && pm.send(config).present? - default_textfield(proj, config) + default_textfield proj, config end def default_textfield(proj, config) # parent project based - parent_field = textfield_for_project(proj.parent, config) + parent_field = textfield_for_project proj.parent, config return parent_field if parent_field.present? return RedmineMessenger.settings[config] if RedmineMessenger.settings[config].present? @@ -127,7 +127,7 @@ class Messenger return pm.messenger_channel.split(',').map!(&:strip).uniq end - default_project_channels(proj) + default_project_channels proj end def setting_for_project(proj, config) @@ -147,7 +147,7 @@ class Messenger def default_project_setting(proj, config) if proj.present? && proj.parent.present? - parent_setting = setting_for_project(proj.parent, config) + parent_setting = setting_for_project proj.parent, config return parent_setting if @setting_found == 1 end # system based @@ -162,7 +162,7 @@ class Messenger if journal.notes.present? if text.present? - text << "\n\n*" + l(:label_comment) + "*\n" + text << "\n\n*#{l :label_comment}*\n" text << journal.notes else text = journal.notes @@ -195,7 +195,7 @@ class Messenger title = I18n.t :field_db_relation if detail.value.present? - entry = DbEntry.visible.find_by(id: detail.value) + entry = DbEntry.visible.find_by id: detail.value value = entry.present? ? entry.name : detail.value.to_s end elsif detail.property == 'attr' && @@ -204,7 +204,7 @@ class Messenger title = I18n.t :field_password_relation if detail.value.present? - entry = Password.visible.find_by(id: detail.value) + entry = Password.visible.find_by id: detail.value value = entry.present? ? entry.name : detail.value.to_s end else @@ -225,35 +225,35 @@ class Messenger when 'description' return when 'tracker' - value = object_field_value(Tracker, detail.value) + value = object_field_value Tracker, detail.value when 'estimated_hours' value = format_hours(value.is_a?(String) ? (value.to_hours || value) : value) when 'project' - value = object_field_value(Project, detail.value) + value = object_field_value Project, detail.value when 'status' - value = object_field_value(IssueStatus, detail.value) + value = object_field_value IssueStatus, detail.value when 'priority' - value = object_field_value(IssuePriority, detail.value) + value = object_field_value IssuePriority, detail.value when 'category' - value = object_field_value(IssueCategory, detail.value) + value = object_field_value IssueCategory, detail.value when 'assigned_to' - value = object_field_value(User, detail.value) + value = object_field_value User, detail.value when 'fixed_version' - value = object_field_value(Version, detail.value) + value = object_field_value Version, detail.value when 'attachment' attachment = Attachment.find(detail.prop_key) value = if attachment.present? escape = false - "<#{object_url attachment}|#{markup_format(attachment.filename)}>" + "<#{object_url attachment}|#{markup_format attachment.filename}>" else detail.prop_key.to_s end when 'parent' - issue = Issue.find(detail.value) + issue = Issue.find detail.value value = if issue.present? escape = false - "<#{object_url issue}|#{markup_format(issue)}>" + "<#{object_url issue}|#{markup_format issue}>" else detail.value.to_s end @@ -262,7 +262,7 @@ class Messenger value = object_field_value(Version, detail.value) if detail.property == 'cf' && field_format == 'version' value = if value.present? if escape - markup_format(value) + markup_format value else value end @@ -279,13 +279,13 @@ class Messenger names = [] textfield_for_project(project, :default_mentions).split(',').each { |m| names.push m.strip } names += extract_usernames(text) unless text.nil? - names.present? ? ' To: ' + names.uniq.join(', ') : nil + names.present? ? " To: #{names.uniq.join ', '}" : nil end private def object_field_value(klass, id) - obj = klass.find_by(id: id) + obj = klass.find_by id: id obj.nil? ? id.to_s : obj.to_s end @@ -298,7 +298,7 @@ class Messenger def default_project_channels(proj) # parent project based - parent_channel = channels_for_project(proj.parent) + parent_channel = channels_for_project proj.parent return parent_channel if parent_channel.present? # system based if RedmineMessenger.settings[:messenger_channel].present? && diff --git a/app/models/messenger_setting.rb b/app/models/messenger_setting.rb index 3a76e74..1b4b449 100644 --- a/app/models/messenger_setting.rb +++ b/app/models/messenger_setting.rb @@ -4,7 +4,7 @@ class MessengerSetting < ActiveRecord::Base validates :messenger_url, url: { allow_blank: true, message: l(:error_messenger_invalid_url) } def self.find_or_create(p_id) - setting = MessengerSetting.find_by(project_id: p_id) + setting = MessengerSetting.find_by project_id: p_id unless setting setting = MessengerSetting.new setting.project_id = p_id diff --git a/lib/redmine_messenger/hooks.rb b/lib/redmine_messenger/hooks.rb index 015dde3..b3cf584 100644 --- a/lib/redmine_messenger/hooks.rb +++ b/lib/redmine_messenger/hooks.rb @@ -11,8 +11,8 @@ module RedmineMessenger return unless channels.present? && url && issue.changes.any? && Messenger.setting_for_project(issue.project, :post_updates) return if issue.is_private? && !Messenger.setting_for_project(issue.project, :post_private_issues) - msg = "[#{Messenger.markup_format(issue.project)}]" \ - " #{Messenger.markup_format(journal.user.to_s)} updated <#{Messenger.object_url issue}|#{Messenger.markup_format(issue)}>" + msg = "[#{Messenger.markup_format issue.project}]" \ + " #{Messenger.markup_format journal.user.to_s} updated <#{Messenger.object_url issue}|#{Messenger.markup_format issue}>" repository = changeset.repository @@ -46,7 +46,7 @@ module RedmineMessenger attachment = {} attachment[:text] = ll(Setting.default_language, :text_status_changed_by_changeset, - "<#{revision_url}|#{Messenger.markup_format(changeset.comments)}>") + "<#{revision_url}|#{Messenger.markup_format changeset.comments}>") attachment[:fields] = journal.details.map { |d| Messenger.detail_to_field d } Messenger.speak(msg, channels, url, attachment: attachment, project: repository.project) diff --git a/lib/redmine_messenger/patches/issue_patch.rb b/lib/redmine_messenger/patches/issue_patch.rb index 5faba81..5e76208 100644 --- a/lib/redmine_messenger/patches/issue_patch.rb +++ b/lib/redmine_messenger/patches/issue_patch.rb @@ -38,7 +38,7 @@ module RedmineMessenger attachments.each do |att| attachment[:fields] << { title: I18n.t(:label_attachment), - value: "<#{Messenger.object_url att}|#{ERB::Util.html_escape(att.filename)}>", + value: "<#{Messenger.object_url att}|#{ERB::Util.html_escape att.filename}>", short: true } end @@ -95,7 +95,7 @@ module RedmineMessenger Messenger.textfield_for_project(project, :default_mentions).present? mention_to = Messenger.mentions(project, text) end - "<#{Messenger.object_url(self)}|#{Messenger.markup_format(self)}>#{mention_to}" + "<#{Messenger.object_url self}|#{Messenger.markup_format self}>#{mention_to}" end end end diff --git a/test/integration/common_views_test.rb b/test/integration/common_views_test.rb index 2b2dae9..782c386 100644 --- a/test/integration/common_views_test.rb +++ b/test/integration/common_views_test.rb @@ -1,4 +1,4 @@ -require File.expand_path('../../test_helper', __FILE__) +require File.expand_path '../../test_helper', __FILE__ class CommonViewsTest < Redmine::IntegrationTest fixtures :projects, diff --git a/test/integration/routing_test.rb b/test/integration/routing_test.rb index b987134..84c4668 100644 --- a/test/integration/routing_test.rb +++ b/test/integration/routing_test.rb @@ -1,4 +1,4 @@ -require File.expand_path('../../test_helper', __FILE__) +require File.expand_path '../../test_helper', __FILE__ class RoutingTest < Redmine::RoutingTest test 'routing messenger' do diff --git a/test/test_helper.rb b/test/test_helper.rb index f90e3c5..2ec7af2 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -4,11 +4,11 @@ if ENV['JENKINS'] require 'simplecov' SimpleCov.start :rails do add_filter 'init.rb' - root File.expand_path(File.dirname(__FILE__) + '/..') + root File.expand_path "#{File.dirname __FILE__}/.." end end -require File.expand_path(File.dirname(__FILE__) + '/../../../test/test_helper') +require File.expand_path "#{File.dirname __FILE__}/../../../test/test_helper" module RedmineMessenger class TestCase @@ -21,7 +21,7 @@ module RedmineMessenger end Project.where(id: [1, 2]).each do |project| - EnabledModule.create(project: project, name: 'issue_tracking') + EnabledModule.create project: project, name: 'issue_tracking' end end end diff --git a/test/unit/i18n_test.rb b/test/unit/i18n_test.rb index b0ddbe5..7b872c8 100644 --- a/test/unit/i18n_test.rb +++ b/test/unit/i18n_test.rb @@ -1,4 +1,4 @@ -require File.expand_path('../../test_helper', __FILE__) +require File.expand_path '../../test_helper', __FILE__ class I18nTest < ActiveSupport::TestCase include Redmine::I18n diff --git a/test/unit/issue_test.rb b/test/unit/issue_test.rb index d83b93f..87d29fe 100644 --- a/test/unit/issue_test.rb +++ b/test/unit/issue_test.rb @@ -1,4 +1,4 @@ -require File.expand_path('../../test_helper', __FILE__) +require File.expand_path '../../test_helper', __FILE__ class IssueTest < ActiveSupport::TestCase fixtures :projects, :users, :members, :member_roles, :roles, diff --git a/test/unit/project_test.rb b/test/unit/project_test.rb index 7299ff0..6dd200c 100644 --- a/test/unit/project_test.rb +++ b/test/unit/project_test.rb @@ -1,4 +1,4 @@ -require File.expand_path('../../test_helper', __FILE__) +require File.expand_path '../../test_helper', __FILE__ class ProjectTest < ActiveSupport::TestCase fixtures :projects, :trackers, :issue_statuses, :issues,