Some code cleanups

CHANGELOG.md

@@ -1,7 +1,7 @@
 Changelog
 =========
 
-## 1.0.1 - not bumped and tagged yet
+## 1.0.1
 
 * Japanese translation has been added - thanks @Yoto
 * Default mentions has been added - thanks @xstasi

app/models/messenger.rb

@@ -5,7 +5,7 @@ class Messenger
   include Redmine::I18n
 
   def self.speak(msg, channels, url, options)
-    url = RedmineMessenger.settings[:messenger_url] unless url
+    url ||= RedmineMessenger.settings[:messenger_url]
 
     return if url.blank?
     return if channels.blank?
@@ -32,7 +32,7 @@ class Messenger
       uri = URI(url)
       params[:channel] = channel
       http_options = { use_ssl: uri.scheme == 'https' }
-      if RedmineMessenger.settings[:messenger_verify_ssl] != 1
+      unless RedmineMessenger.setting?(:messenger_verify_ssl)
         http_options[:verify_mode] = OpenSSL::SSL::VERIFY_NONE
       end
 
@@ -137,7 +137,7 @@ class Messenger
       return parent_setting if @setting_found == 1
     end
     # system based
-    return true if RedmineMessenger.settings[config].present? && RedmineMessenger.settings[config] == '1'
+    return true if RedmineMessenger.settings[config].present? && RedmineMessenger.setting?(config)
     false
   end
 

lib/redmine_messenger.rb

@@ -10,6 +10,10 @@ Rails.configuration.to_prepare do
     def self.settings
       ActionController::Parameters.new(Setting[:plugin_redmine_messenger])
     end
+
+    def setting?(value)
+      return true if settings[value].to_i == 1
+    end
   end
 
   # Patches

lib/redmine_messenger/helpers.rb

@@ -3,9 +3,9 @@
 module RedmineMessenger
   module Helpers
     def project_messenger_options(active)
-      options_for_select({ l(:label_messenger_settings_default) => 0,
-                           l(:label_messenger_settings_disabled) => 1,
-                           l(:label_messenger_settings_enabled) => 2 }, active)
+      options_for_select({ l(:label_messenger_settings_default) => '0',
+                           l(:label_messenger_settings_disabled) => '1',
+                           l(:label_messenger_settings_enabled) => '2' }, active)
     end
 
     def project_setting_messenger_default_value(value)

lib/redmine_messenger/patches/issue_patch.rb

@@ -39,7 +39,7 @@ module RedmineMessenger
             short: true
           }]
 
-          if RedmineMessenger.settings[:display_watchers] == '1'
+          if RedmineMessenger.setting?(:display_watchers)
             attachment[:fields] << {
               title: I18n.t(:field_watcher),
               value: ERB::Util.html_escape(watcher_users.join(', ')),

test/test_helper.rb

@@ -1,16 +1,18 @@
 # Redmine Messenger plugin for Redmine
 
-require 'simplecov'
-require 'simplecov-rcov'
+unless ENV['SKIP_COVERAGE']
+  require 'simplecov'
+  require 'simplecov-rcov'
 
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
-  SimpleCov::Formatter::HTMLFormatter,
-  SimpleCov::Formatter::RcovFormatter
-]
+  SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+    SimpleCov::Formatter::HTMLFormatter,
+    SimpleCov::Formatter::RcovFormatter
+  ]
 
-SimpleCov.start :rails do
-  add_filter 'init.rb'
-  root File.expand_path(File.dirname(__FILE__) + '/..')
+  SimpleCov.start :rails do
+    add_filter 'init.rb'
+    root File.expand_path(File.dirname(__FILE__) + '/..')
+  end
 end
 
 require File.expand_path(File.dirname(__FILE__) + '/../../../test/test_helper')