additional_tags 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74f23c86bdd928603d2740edb89fbecf6061fa559bbd1a030b3221929c81ec70
-  data.tar.gz: fb2c25b2a00e1ee5530cf677fcd3474280075c0c60d028209240ec933631f71b
+  metadata.gz: 05656ef90d3c7c796b1bd3d510f6a349fc77c8b1adbf43ca6135af8e48ca705e
+  data.tar.gz: a22552cd9d096d6963dd9349c207da4755b1e3ba1d8dec560d404b3207ee1458
 SHA512:
-  metadata.gz: 8a86b18dbebc7599d1afcb2b63edbea742e32825de1693254c5f066c7a12067aee4dec0649d5c5768480b13e830102e380784e0025f91b4a1da690f085b1b3fe
-  data.tar.gz: 2ccee9443f19a4a5b193cb63dc1a2d0ae6f965a2f2c11c937e3c2066149baa56272329b8ffa087f5f55d1446440da85a3c9e3d5b69b03ea6b5c99c78d72a3885
+  metadata.gz: 2eb18bdccf79be5d1f1b4327c11c3c838e434c8737edcfa096d62d61925170e53be4a6ae45fb486e0c5b3a008933dc30e3bd2c36de9db929fe1fb1e71225adf2
+  data.tar.gz: 97fd974a51bcdf337c0246cd95c0313639d43aa73f19ac9a81f0f9efa87da0e3c02736970b5c8148566ded5bb3e670a2fb332a03f99d85f59caed219d12410be

data/.github/workflows/linters.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
 
     - name: Install package dependencies
       run: >
@@ -22,7 +22,7 @@ jobs:
     - name: Setup Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 3.0
+        ruby-version: 3.1
         bundler-cache: true
 
     - name: Setup gems

data/.gitignore

@@ -8,3 +8,4 @@ Gemfile.lock
 .enable_*
 ._*
 *.gem
+rails_best_practices_output.html

data/.rubocop.yml

@@ -7,6 +7,7 @@ AllCops:
   TargetRubyVersion: 2.7
   TargetRailsVersion: 6.1
   NewCops: enable
+  ActiveSupportExtensionsEnabled: true
 
 Rails:
   Enabled: true
@@ -118,17 +119,14 @@ Style/MethodCallWithArgsParentheses:
   AllowParenthesesInChaining: true
   EnforcedStyle: omit_parentheses
 
-Style/HashTransformKeys:
-  Enabled: false
-
-Style/HashTransformValues:
-  Enabled: false
-
 Naming/VariableNumber:
   Enabled: true
   Exclude:
     - 'test/**/*'
 
+Layout/LineContinuationLeadingSpace:
+  Enabled: false
+
 # see https://github.com/rubocop/rubocop-rails/issues/578
 # redmine does not use load_defaults: https://rails.rubystyle.guide/#config-defaults
 Rails/RedundantPresenceValidationOnBelongsTo:

data/README.md

@@ -71,14 +71,14 @@ git clone https://github.com/alphanodes/additionals.git plugins/additionals
 git clone https://github.com/alphanodes/additional_tags.git plugins/additional_tags
 ```
 
-### 2. Install dependencies and migrate database.
+### 2. Install dependencies and migrate database
 
 ```shell
 bundle install
 bundle exec rake redmine:plugins:migrate RAILS_ENV=production
 ```
 
-### 3. Restart your Redmine web server.
+### 3. Restart your Redmine web server
 
 ## Running tests
 

data/app/controllers/additional_tags_controller.rb

@@ -35,8 +35,8 @@ class AdditionalTagsController < ApplicationController
 
   def destroy
     @tags.each do |tag|
-      tag.reload.destroy
-    rescue ::ActiveRecord::RecordNotFound
+      tag.reload.destroy!
+    rescue ::ActiveRecord::RecordNotFound, ::ActiveRecord::RecordNotDestroyed
       Rails.logger.warn "Tag #{tag} could not be deleted"
     end
     redirect_back_or_default @tag_list_path
@@ -54,7 +54,7 @@ class AdditionalTagsController < ApplicationController
       end
     else
       respond_to do |format|
-        format.html { render action: 'edit' }
+        format.html { render :edit }
       end
     end
   end

data/app/helpers/additional_tags_wiki_helper.rb

@@ -18,18 +18,23 @@ module AdditionalTagsWikiHelper
     render_tags_list sidebar_tags, **options
   end
 
-  def render_wiki_index_title(project, tag = nil)
+  def render_wiki_index_title(project: nil, name: nil, tag: nil, title: :label_wiki)
     if tag.present?
-      if project.nil?
-        title = [link_to(l(:label_wiki), wiki_index_path)]
+      if project
+        t :label_wiki_index_for_tag_html, tag: tag
+      else
+        title = [link_to(l(title), wiki_index_path)]
         title << Additionals::LIST_SEPARATOR
         title << t(:label_wiki_index_for_tag_html, tag: tag)
         safe_join title, ' '
-      else
-        t :label_wiki_index_for_tag_html, tag: tag
       end
+    elsif name.present?
+      title = [link_to(l(title), wiki_index_path)]
+      title << Additionals::LIST_SEPARATOR
+      title << name
+      safe_join title, ' '
     else
-      l :label_wiki
+      l title
     end
   end
 end

data/app/jobs/additional_tags_remove_unused_tag_job.rb

@@ -2,11 +2,16 @@
 
 class AdditionalTagsRemoveUnusedTagJob < AdditionalTagsJob
   def perform
-    # only once a minute to reduce load
-    cache_key = self.class.to_s
-    return if Rails.cache.read(cache_key) && !Rails.env.test?
-
-    Rails.cache.write cache_key, true, expires_in: 60
-    AdditionalTags::Tags.remove_unused_tags
+    if Rails.env.test?
+      # no cache for testing
+      AdditionalTags::Tags.remove_unused_tags
+    else
+      # only once a minute to reduce load
+      cache = ActiveSupport::Cache::MemoryStore.new expires_in: 1.minute
+      cache.fetch self.class.to_s do
+        AdditionalTags::Tags.remove_unused_tags
+        true
+      end
+    end
   end
 end

data/app/views/additional_tags/_tag_list.html.slim

@@ -20,8 +20,8 @@
 
       #edit_tags_form.hidden
         = form_tag update_url, method: :put do
-          = render partial: defined?(tags_form) ? tags_form : 'tags_form',
-                   locals: { css_id: defined?(css_id) ? css_id : nil }
+          = render defined?(tags_form) ? tags_form : 'tags_form',
+                   css_id: defined?(css_id) ? css_id : nil
           '
           = submit_tag l(:button_save), class: 'button-small'
           '

data/app/views/dashboards/blocks/_issue_tags.html.slim

@@ -7,12 +7,12 @@ h3 = block_definition[:label]
                                                 statuses: { true => :closed, false => :open },
                                                 group_id_is_bool: true
 
-= render partial: 'common/tag_summary_block',
-         locals: { tags: tags,
-                   entities_label: l(:label_issue_plural),
-                   totals_link: link_to_issue_tags_totals(entries: counts,
-                                                          project: @project,
-                                                          open_issues_only: open_issues_only) }
+= render 'common/tag_summary_block',
+         tags: tags,
+         entities_label: l(:label_issue_plural),
+         totals_link: link_to_issue_tags_totals(entries: counts,
+                                                project: @project,
+                                                open_issues_only: open_issues_only)
 
 - if RedminePluginKit.true? settings[:with_table_of_values]
   - if tags.present?

data/app/views/issue_tags/edit.js.erb

@@ -1,2 +1,2 @@
-$('#ajax-modal').html('<%= escape_javascript(render partial: 'issue_tags/edit_modal') %>');
+$('#ajax-modal').html("<%= escape_javascript(render 'issue_tags/edit_modal') %>");
 showModal('ajax-modal', '600px');

data/app/views/issues/_tags.html.slim

@@ -1,8 +1,8 @@
 - if AdditionalTags.setting?(:active_issue_tags) && User.current.allowed_to?(:view_issue_tags, issue.project)
-  = render partial: 'additional_tags/tag_list',
-           locals: { entry: issue,
-                     show_always: true,
-                     editable: issue.editable?(User.current),
-                     css_id: 'issue_tag_list_show',
-                     update_url: issue_path(issue),
-                     use_colors: AdditionalTags.setting?(:use_colors) }
+  = render 'additional_tags/tag_list',
+           entry: issue,
+           show_always: true,
+           editable: issue.editable?(User.current),
+           css_id: 'issue_tag_list_show',
+           update_url: issue_path(issue),
+           use_colors: AdditionalTags.setting?(:use_colors)

data/app/views/issues/_tags_form_details.html.slim

@@ -3,5 +3,4 @@
   div
     p#issue_tags
       = label_tag l(:field_tag_list)
-      = render partial: tags_form,
-               locals: { project: project }
+      = render tags_form, project: project

data/app/views/wiki/_tags_form_bottom.html.slim

@@ -1,5 +1,4 @@
 - if AdditionalTags.setting?(:active_wiki_tags) && User.current.allowed_to?(:add_wiki_tags, @project)
   p#wiki_tags
     = label_tag l(:field_tag_list)
-    = render partial: 'wiki/tags_form',
-             locals: { project: project, page: page }
+    = render 'wiki/tags_form', project: project, page: page

data/app/views/wiki/_tags_show.html.slim

@@ -1,9 +1,9 @@
 - if AdditionalTags.setting? :active_wiki_tags
   .wiki-attributes
-    = render partial: 'additional_tags/tag_list',
-             locals: { entry: page,
-                       show_always: true,
-                       link_wiki_tag: true,
-                       editable: User.current.allowed_to?(:add_wiki_tags, @project),
-                       update_url: update_tags_project_wiki_page_path(@project, page.title),
-                       use_colors: AdditionalTags.setting?(:use_colors) }
+    = render 'additional_tags/tag_list',
+             entry: page,
+             show_always: true,
+             link_wiki_tag: true,
+             editable: User.current.allowed_to?(:add_wiki_tags, @project),
+             update_url: update_tags_project_wiki_page_path(@project, page.title),
+             use_colors: AdditionalTags.setting?(:use_colors)

data/app/views/wiki/tag_index.html.slim

@@ -2,7 +2,7 @@
   - if User.current.allowed_to? :edit_wiki_pages, @project
     = link_to l(:label_wiki_page_new), new_project_wiki_page_path(@project), remote: true, class: 'icon icon-add'
 
-h2 = render_wiki_index_title @project, @tag
+h2 = render_wiki_index_title project: @project, tag: @tag
 
 - if @pages.empty?
   p.nodata = l :label_no_data
@@ -18,4 +18,4 @@ h2 = render_wiki_index_title @project, @tag
             = link_to page.parent.pretty_title, project_wiki_page_path(@project, page.parent.title)
 
 - content_for :sidebar do
-  = render partial: 'sidebar'
+  = render 'sidebar'

data/lib/additional_tags/patches/query_patch.rb

@@ -44,7 +44,7 @@ module AdditionalTags
           subsql = ActsAsTaggableOn::Tagging.joins("INNER JOIN #{quoted_joined_table}" \
                                                    " ON additional_taggings.taggable_id = #{quoted_joined_table}.#{quoted_target_field}")
                                             .where(taggable_type: klass.name)
-                                            .where("#{self.class.connection.quote_table_name queried_table_name}.#{quoted_source_field} ="\
+                                            .where("#{self.class.connection.quote_table_name queried_table_name}.#{quoted_source_field} =" \
                                                    " #{quoted_joined_table}.#{quoted_joined_field}")
                                             .select(1)
 

data/lib/additional_tags/patches/wiki_page_patch.rb

@@ -41,10 +41,11 @@ module AdditionalTags
           scope
         end
 
-        def with_tags(tag, project: nil, order: 'title_asc', max_entries: nil)
+        def with_tags(tag, project: nil, order: 'title_asc', max_entries: nil, exclude_page: nil)
           wiki = project&.wiki
 
           scope = with_tags_scope wiki: wiki, project: project
+          scope = scope.where.not id: exclude_page.id if exclude_page
           scope = scope.limit max_entries if max_entries
 
           tags = Array tag

data/lib/additional_tags/plugin_version.rb

@@ -2,6 +2,6 @@
 
 module AdditionalTags
   module PluginVersion
-    VERSION = '1.0.5' unless defined? VERSION
+    VERSION = '1.0.6' unless defined? VERSION
   end
 end

data/lib/additional_tags/tags.rb

@@ -49,8 +49,7 @@ module AdditionalTags
       end
 
       def remove_unused_tags
-        ActsAsTaggableOn::Tag.left_outer_joins(:taggings)
-                             .where(taggings: { id: nil })
+        ActsAsTaggableOn::Tag.where.missing(:taggings)
                              .each(&:destroy)
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: additional_tags
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - AlphaNodes
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-25 00:00:00.000000000 Z
+date: 2022-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts-as-taggable-on