additional_tags 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d10d32f78d464486a2921a86274972ec068f3aad16c988f9037e89a433ac4efa
-  data.tar.gz: 50833ac552b8b3de0cba5eb5d9710cdbafdf17b3c2d53e742031ed22a52c9e86
+  metadata.gz: 74f23c86bdd928603d2740edb89fbecf6061fa559bbd1a030b3221929c81ec70
+  data.tar.gz: fb2c25b2a00e1ee5530cf677fcd3474280075c0c60d028209240ec933631f71b
 SHA512:
-  metadata.gz: 837feb0dba819a2191dbd5151f523a3f65aac23918faaa2f93277a0b51c33e4483353c43dd7ae69ae98b43886099fe7f3005b33daafe9d05d4b593ce1866e657
-  data.tar.gz: 2d54a07615b231470a074e42ec5f4d275af5b5838338a360e8d7401fa742deeba0b500a1ca94069a3b37240e23947e9110c6b2f6f785ec3517ae1cfc63a66351
+  metadata.gz: 8a86b18dbebc7599d1afcb2b63edbea742e32825de1693254c5f066c7a12067aee4dec0649d5c5768480b13e830102e380784e0025f91b4a1da690f085b1b3fe
+  data.tar.gz: 2ccee9443f19a4a5b193cb63dc1a2d0ae6f965a2f2c11c937e3c2066149baa56272329b8ffa087f5f55d1446440da85a3c9e3d5b69b03ea6b5c99c78d72a3885

data/.github/workflows/linters.yml

@@ -22,7 +22,7 @@ jobs:
     - name: Setup Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.6
+        ruby-version: 3.0
         bundler-cache: true
 
     - name: Setup gems

data/.github/workflows/tests.yml

@@ -10,16 +10,9 @@ jobs:
 
     strategy:
       matrix:
-        ruby: ['2.7', '2.6', '3.0']
-        redmine: ['4.1-stable', '4.2-stable', 'master']
+        ruby: ['2.7', '3.0', '3.1']
+        redmine: ['5.0-stable', 'master']
         db: ['postgres', 'mysql']
-        exclude:
-          - ruby: '2.7'
-            redmine: 4.1-stable
-          - ruby: '3.0'
-            redmine: 4.1-stable
-          - ruby: '3.0'
-            redmine: 4.2-stable
       fail-fast: false
 
     services:

data/.rubocop.yml

@@ -1,14 +1,22 @@
 require:
   - rubocop-performance
   - rubocop-rails
+  - rubocop-minitest
+
+AllCops:
+  TargetRubyVersion: 2.7
+  TargetRailsVersion: 6.1
+  NewCops: enable
 
 Rails:
   Enabled: true
 
-AllCops:
-  TargetRubyVersion: 2.6
-  TargetRailsVersion: 5.2
-  NewCops: enable
+Minitest/MultipleAssertions:
+  Max: 15
+  Enabled: true
+
+Minitest/AssertPredicate:
+  Enabled: false
 
 Metrics/AbcSize:
   Enabled: false

data/README.md

@@ -38,8 +38,8 @@ Start using it, too. The example image shows the centralized tag management in t
 
 ## Requirements
 
-- Redmine `>= 4.1.0`
-- Ruby `>= 2.6`
+- Redmine `>= 5.0`
+- Ruby `>= 2.7`
 - Redmine plugins: [additionals](https://www.redmine.org/plugins/additionals)
 
 ## Installing

data/additional_tags.gemspec

@@ -22,9 +22,9 @@ Gem::Specification.new do |spec|
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename f }
   spec.require_paths = ['lib']
-  spec.required_ruby_version = '>= 2.6'
+  spec.required_ruby_version = '>= 2.7'
 
-  spec.add_runtime_dependency 'acts-as-taggable-on', '~> 7.0'
+  spec.add_runtime_dependency 'acts-as-taggable-on', '~> 9.0'
   spec.add_runtime_dependency 'redmine_plugin_kit'
 
   spec.add_development_dependency 'bundler'

data/app/controllers/additional_tags_controller.rb

@@ -7,6 +7,29 @@ class AdditionalTagsController < ApplicationController
   before_action :set_tag_list_path
 
   helper :additional_tags_issues
+  include AdditionalTagsHelper
+
+  accept_api_auth :index
+
+  # used by api calls
+  def index
+    raise 'type is not provided' if params[:type].blank?
+
+    type_info = manageable_tag_columns.detect { |m| m.first.to_s == params[:type] }
+    raise 'type is not supported' unless type_info
+
+    klass = type_info.first.to_s.camelize.constantize
+    raise "#{klass.name} does not support tags" unless klass.respond_to? :available_tags
+
+    @tags = klass.available_tags.to_a
+    @count = @tags.count
+    @tag_type = klass.name
+
+    respond_to do |format|
+      format.html { head :not_acceptable }
+      format.api
+    end
+  end
 
   def edit; end
 

data/app/helpers/additional_tags_helper.rb

@@ -168,7 +168,7 @@ module AdditionalTagsHelper
   def additional_tags_from_params(str)
     tags = str.is_a?(Array) ? str : str.to_s.split(',')
     tags.map!(&:strip)
-    tags.reject(&:blank?)
+    tags.compact_blank
   end
 
   def additional_tag_links(tag_list, **options)

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

@@ -18,7 +18,7 @@
                     onclick: "$('#edit_tags_form').show(); $('#tags-data').hide(); return false;",
                     id: 'edit_tags_link'
 
-      #edit_tags_form style="display: none;"
+      #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 }

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

@@ -10,7 +10,4 @@ ul
                 merge_additional_tags_path(ids: @tags.collect(&:id)),
                 class: 'icon icon-tags-merge'
   li
-    = link_to l(:button_delete),
-              additional_tags_path(ids: @tags.collect(&:id), back_url: @back),
-              method: :delete, data: { confirm: l(:text_are_you_sure) },
-              class: 'icon icon-del'
+    = delete_link additional_tags_path(ids: @tags.collect(&:id), back_url: @back)

data/app/views/additional_tags/index.api.rsb

@@ -0,0 +1,5 @@
+api.array :tags, api_meta(total_count: @count, tag_type: @tag_type) do
+  @tags.each do |tag|
+    api.tag id: tag.id, name: tag.name, count: tag.count
+  end
+end

data/app/views/additional_tags/settings/_manage_tags.html.slim

@@ -23,8 +23,7 @@
             td.buttons
               = link_to l(:button_edit), edit_additional_tag_path(tag),
                         class: 'icon icon-edit'
-              = link_to l(:button_delete), additional_tags_path(ids: tag), method: :delete,
-                        data: { confirm: l(:text_are_you_sure) }, class: 'icon icon-del'
+              = delete_link additional_tags_path(ids: tag)
 - else
   p.nodata = l :label_no_data
 

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

@@ -1,5 +1,8 @@
 - if AdditionalTags.setting?(:active_issue_tags) && \
-     User.current.allowed_to?(:view_issue_tags, @project, global: true) && sidebar_tags.present?
+     User.current.allowed_to?(:view_issue_tags, @project, global: true) && \
+     defined?(sidebar_tags) && \
+     sidebar_tags.present?
+
   .sidebar-tags
     h3 = l :field_tags
     = render_sidebar_tags

data/config/initializers/zeitwerk.rb

@@ -1,6 +1,4 @@
 # frozen_string_literal: true
 
-if Rails.version > '6.0'
-  plugin_dir = RedminePluginKit::Loader.plugin_dir plugin_id: 'additional_tags'
-  Rails.autoloaders.main.push_dir "#{plugin_dir}/lib"
-end
+plugin_dir = RedminePluginKit::Loader.plugin_dir plugin_id: 'additional_tags'
+Rails.autoloaders.main.push_dir "#{plugin_dir}/lib"

data/config/routes.rb

@@ -9,7 +9,7 @@ Rails.application.routes.draw do
     end
   end
 
-  resources :additional_tags, only: %i[edit update] do
+  resources :additional_tags, only: %i[index edit update] do
     collection do
       post :merge
       get :context_menu, :merge

data/init.rb

@@ -13,7 +13,7 @@ Redmine::Plugin.register :additional_tags do
   author_url  'https://alphanodes.com/'
   directory __dir__
 
-  requires_redmine version_or_higher: '4.1'
+  requires_redmine version_or_higher: '5.0'
 
   settings default: loader.default_settings,
            partial: 'additional_tags/settings/settings'
@@ -35,4 +35,3 @@ Redmine::Plugin.register :additional_tags do
 end
 
 RedminePluginKit::Loader.persisting { loader.load_model_hooks! }
-RedminePluginKit::Loader.to_prepare { AdditionalTags.setup!(loader) } if Rails.version < '6.0'

data/lib/additional_tags/hooks/model_hook.rb

@@ -4,8 +4,6 @@ module AdditionalTags
   module Hooks
     class ModelHook < Redmine::Hook::Listener
       def after_plugins_loaded(_context = {})
-        return if Rails.version < '6.0'
-
         AdditionalTags.setup!
       end
     end

data/lib/additional_tags/hooks/view_hook.rb

@@ -54,13 +54,15 @@ module AdditionalTags
 
         pdf.ln
         pdf.SetFontStyle '', 8
-        pdf.RDMCell 190, 5, page.tag_list.join(', ')
+        pdf.RDMCell 190, 5, page.tag_list.to_list
         pdf.ln
       end
 
       private
 
       def issues_bulk_tags_fix(issue, params)
+        return unless params && params[:issue]
+
         old_tags = issue.tags.map(&:name)
         new_tags = Array(params[:issue][:tag_list]).reject(&:empty?)
         issue.tag_list = (old_tags + new_tags).uniq

data/lib/additional_tags/patches/issue_patch.rb

@@ -56,29 +56,29 @@ module AdditionalTags
         end
 
         def safe_attributes_with_tags=(attrs, user = User.current)
-          if attrs && attrs[:tag_list]
-            tags = attrs.delete :tag_list
-            tags = Array(tags).reject(&:empty?)
-
-            if user.allowed_to?(:create_issue_tags, project) ||
-               user.allowed_to?(:edit_issue_tags, project) && Issue.allowed_tags?(tags)
-              attrs[:tag_list] = tags
-              self.tag_list = tags
-            end
-          end
+          send :safe_attributes_without_tags=, attrs, user # required to fire first to get loaded project
+          return unless attrs && attrs[:tag_list]
+
+          tags = attrs.delete :tag_list
+          tags = Array(tags).reject(&:empty?)
+
+          Additionals.debug "tags: #{tags.inspect} - project: #{project&.id} - access: #{user.allowed_to? :create_issue_tags, project}"
 
-          send :safe_attributes_without_tags=, attrs, user
+          if user.allowed_to?(:create_issue_tags, project) ||
+             user.allowed_to?(:edit_issue_tags, project) && Issue.allowed_tags?(tags)
+            attrs[:tag_list] = tags # required fix for journal details
+            self.tag_list = tags    # required fix for tags
+          end
         end
 
-        # copy_from requires hash for Redmine - works with Ruby 3
-        # rubocop: disable Style/OptionHash
-        def copy_from_with_tags(arg, options = {})
-          copy_from_without_tags arg, options
+        def copy_from_with_tags(arg, options = nil)
+          options ||= {} # works with Ruby 3
+
+          copy_from_without_tags arg, **options
           issue = arg.is_a?(Issue) ? arg : Issue.visible.find(arg)
           self.tag_list = issue.tag_list
           self
         end
-        # rubocop: enable Style/OptionHash
 
         private
 

data/lib/additional_tags/patches/wiki_page_patch.rb

@@ -49,7 +49,7 @@ module AdditionalTags
 
           tags = Array tag
           tags.map!(&:strip)
-          tags.reject!(&:blank?)
+          tags.compact_blank!
           return [] if tags.count.zero?
 
           tags.map!(&:downcase)

data/lib/additional_tags/plugin_version.rb

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

data/lib/additional_tags/tags.rb

@@ -25,7 +25,7 @@ module AdditionalTags
 
         columns << "MIN(#{TAGGING_TABLE_NAME}.created_at) AS last_created" if options[:sort_by] == 'last_created'
 
-        scope.select(columns.join(', '))
+        scope.select(columns.to_list)
              .joins(tag_for_joins(klass, **options.slice(:project_join, :project, :without_projects)))
              .group("#{TAG_TABLE_NAME}.id, #{TAG_TABLE_NAME}.name, #{TAG_TABLE_NAME}.taggings_count").having('COUNT(*) > 0')
              .order(build_order_sql(options[:sort_by], options[:order]))
@@ -35,7 +35,7 @@ module AdditionalTags
         ActsAsTaggableOn::Tag.all
                              .joins(tag_for_joins(klass, without_projects: without_projects))
                              .distinct
-                             .order("#{TAG_TABLE_NAME}.name")
+                             .order(:name)
       end
 
       def tag_to_joins(klass)
@@ -49,7 +49,8 @@ module AdditionalTags
       end
 
       def remove_unused_tags
-        ActsAsTaggableOn::Tag.where.not(id: ActsAsTaggableOn::Tagging.select(:tag_id).distinct)
+        ActsAsTaggableOn::Tag.left_outer_joins(:taggings)
+                             .where(taggings: { id: nil })
                              .each(&:destroy)
       end
 

data/lib/additional_tags.rb

@@ -46,14 +46,11 @@ module AdditionalTags
       loader.add_patch({ target: Redmine::Helpers::TimeReport,
                          patch: 'TimeReport' })
 
-      # because of this bug: https://www.redmine.org/issues/33290
-      if RedminePluginKit::Loader.redmine_database_ready? TAG_TABLE_NAME
-        loader.add_patch %w[IssueQuery TimeEntryQuery]
-
-        if Redmine::Plugin.installed? 'redmine_agile'
-          loader.add_patch %w[AgileQuery AgileBoardsController]
-          loader.add_patch %w[AgileVersionsController AgileVersionsQuery] if AGILE_VERSION_TYPE == 'PRO version'
-        end
+      loader.add_patch %w[IssueQuery TimeEntryQuery]
+
+      if Redmine::Plugin.installed? 'redmine_agile'
+        loader.add_patch %w[AgileQuery AgileBoardsController]
+        loader.add_patch %w[AgileVersionsController AgileVersionsQuery] if AGILE_VERSION_TYPE == 'PRO version'
       end
 
       # Apply patches and helper

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: additional_tags
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - AlphaNodes
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-18 00:00:00.000000000 Z
+date: 2022-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts-as-taggable-on
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '9.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '9.0'
 - !ruby/object:Gem::Dependency
   name: redmine_plugin_kit
   requirement: !ruby/object:Gem::Requirement
@@ -100,6 +100,7 @@ files:
 - app/views/additional_tags/_tag_list.html.slim
 - app/views/additional_tags/context_menu.html.slim
 - app/views/additional_tags/edit.html.slim
+- app/views/additional_tags/index.api.rsb
 - app/views/additional_tags/merge.html.slim
 - app/views/additional_tags/settings/_general.html.slim
 - app/views/additional_tags/settings/_manage_tags.html.slim
@@ -187,14 +188,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Redmine plugin for adding tag functionality