More refactoring and cleanups

.rubocop.yml

@@ -17,4 +17,6 @@ Metrics/PerceivedComplexity:
 # Offense count: 15
 Metrics/AbcSize:
   Max: 25
-  
+
+Style/Documentation:
+  Enabled: false

README.md

@@ -115,6 +115,7 @@ Note: Redmine must be restarted after changing "Custom Help URL"</tt> value befo
 - fixed garfield caching macro probem
 - you can add content to overview page now (top and bottom)
 - some content and view optimization (removed wiki_sidebar compatiblitity problems with other Redmine plugins)
+- Code cleanups and refactoring
 
 ### 0.5.4
 

app/views/settings/_redmine_tweaks_general.html.erb

@@ -20,6 +20,12 @@
   <em class="info"><%= l(:remove_help_info) %></em>
 </p>
 
+<p>
+  <%= content_tag(:label, l(:label_remove_mypage)) %>
+  <%= check_box_tag 'settings[remove_mypage]', 1, @settings[:remove_mypage] %>
+  <em class="info"><%= l(:remove_mypage_info) %></em>
+</p>
+
 <p>
   <%= content_tag(:label, l(:label_remove_news)) %>
   <%= check_box_tag 'settings[remove_news]', 1, @settings[:remove_news] %>
@@ -38,12 +44,6 @@
   <em class="info"><%= t(:label_add_go_to_top_info) %></em>
 </p>
 
-<p>
-  <%= content_tag(:label, l(:label_remove_mypage)) %>
-  <%= check_box_tag 'settings[remove_mypage]', 1, @settings[:remove_mypage] %>
-  <em class="info"><%= l(:remove_mypage_info) %></em>
-</p>
-
 <p>
 <% disabled_modules = Struct.new(:id, :name) %>  
   <%= content_tag(:label, l(:label_disabled_modules)) %>

config/routes.rb

@@ -1,4 +1,4 @@
 # Plugin's routes
 # See: http://guides.rubyonrails.org/routing.html
 
-match 'garfield/:name/:type', :to => 'garfield#show', :via => :get
+match 'garfield/:name/:type', to: 'garfield#show', via: :get

init.rb

@@ -42,23 +42,26 @@ Redmine::Plugin.register :redmine_tweaks do
   end
 
   5.times do |i|
-    default_settings['custom_menu'+i.to_s+'_name'] = '';
-    default_settings['custom_menu'+i.to_s+'_url'] = '';
-    default_settings['custom_menu'+i.to_s+'_title'] = '';
+    default_settings['custom_menu' + i.to_s + '_name'] = ''
+    default_settings['custom_menu' + i.to_s + '_url'] = ''
+    default_settings['custom_menu' + i.to_s + '_title'] = ''
   end
 
-  settings(:default => default_settings, :partial => 'settings/redmine_tweaks')
+  settings(default: default_settings, partial: 'settings/redmine_tweaks')
 
   # required redmine version
-  requires_redmine :version_or_higher => '2.6.0'
+  requires_redmine version_or_higher: '2.6.0'
 
   # remove help menu (it will be added later again)
   delete_menu_item(:top_menu, :help)
 
   # remove my page
   delete_menu_item(:top_menu, :my_page)
-  menu :top_menu, :my_page, { :controller => 'my', :action => 'page'}, :via => :get,
-   :if => Proc.new{User.current && !RedmineTweaks.settings[:remove_mypage] }
+  menu :top_menu,
+       :my_page,
+       { controller: 'my', action: 'page' },
+       via: :get,
+       if: proc { User.current && !RedmineTweaks.settings[:remove_mypage] }
 
-  RedCloth3::ALLOWED_TAGS << "div"
+  RedCloth3::ALLOWED_TAGS << 'div'
 end

lib/redmine_tweaks/wiki_macros/date_macros.rb

@@ -1,9 +1,8 @@
 # Redmine Tweaks plugin for Redmine
 # Copyright (C) 2013-2015 AlphaNodes GmbH
 
-# Wiki macro definition
+# Date wiki macros
 module RedmineTweaks
-  # Date wiki macros
   module WikiMacros
     Redmine::WikiFormatting::Macros.register do
       desc <<-EOHELP

lib/redmine_tweaks/wiki_macros/garfield_macros.rb

@@ -3,9 +3,8 @@
 
 require 'net/http'
 
-# Wiki macro definition
+# Garfield wiki macros
 module RedmineTweaks
-  # Garfield wiki macros
   module WikiMacros
     Redmine::WikiFormatting::Macros.register do
       desc <<-EOHELP

lib/redmine_tweaks/wiki_macros/project_macros.rb

@@ -1,9 +1,8 @@
 # Redmine Tweaks plugin for Redmine
 # Copyright (C) 2013-2015 AlphaNodes GmbH
 
-# Wiki macro definition
+# Project wiki macros
 module RedmineTweaks
-  # Project wiki macros
   module WikiMacros
     Redmine::WikiFormatting::Macros.register do
       desc <<-EOHELP

lib/redmine_tweaks/wiki_macros/user_macros.rb

@@ -1,9 +1,8 @@
 # Redmine Tweaks plugin for Redmine
 # Copyright (C) 2013-2015 AlphaNodes GmbH
 
-# Wiki macro definition
+# User wiki macros
 module RedmineTweaks
-  # User wiki macros
   module WikiMacros
     Redmine::WikiFormatting::Macros.register do
       desc <<-EOHELP

lib/redmine_tweaks/wiki_macros/youtube_macros.rb

@@ -1,9 +1,8 @@
 # Redmine Tweaks plugin for Redmine
 # Copyright (C) 2013-2015 AlphaNodes GmbH
 
-# Wiki macro definition
+# Youtube wiki macros
 module RedmineTweaks
-  # Youtube wiki macros
   module WikiMacros
     Redmine::WikiFormatting::Macros.register do
       desc <<-EOHELP