additional_tags 1.0.1 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f6573f962ff7b251ce5afae13e2659985887d486d320fcb99f4c99892fa8a52
-  data.tar.gz: a258bcf71c8c53b40a5b7bcec92e9b6ff8a7dde6070fe5cfdc3eac0adb3d2ccb
+  metadata.gz: d10d32f78d464486a2921a86274972ec068f3aad16c988f9037e89a433ac4efa
+  data.tar.gz: 50833ac552b8b3de0cba5eb5d9710cdbafdf17b3c2d53e742031ed22a52c9e86
 SHA512:
-  metadata.gz: 46e6f62fae40af6b03d6b09a2b237f4049ab4d54ce30289e1fa7a74b9ee7f57df586feb3cf695f4268a86478365fee580db550e9b044c84281fcb464e2fde321
-  data.tar.gz: 8b1c9a8b5873b2b993f27d80186e9c7e0a024e201aba3c0125f47331c6fda50d673cbb1f572c17b2aef1b613b687f6a66c86c17d9b325f8c20e9c2bd8e6bf103
+  metadata.gz: 837feb0dba819a2191dbd5151f523a3f65aac23918faaa2f93277a0b51c33e4483353c43dd7ae69ae98b43886099fe7f3005b33daafe9d05d4b593ce1866e657
+  data.tar.gz: 2d54a07615b231470a074e42ec5f4d275af5b5838338a360e8d7401fa742deeba0b500a1ca94069a3b37240e23947e9110c6b2f6f785ec3517ae1cfc63a66351

data/.github/workflows/codeql-analysis.yml

@@ -0,0 +1,70 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master ]
+  schedule:
+    - cron: '35 20 * * 2'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'javascript', 'ruby' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://git.io/codeql-language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

data/.github/workflows/linters.yml

@@ -16,7 +16,8 @@ jobs:
 
     - name: Setup Gemfile
       run: |
-        cp test/support/gemfile.rb Gemfile
+        touch .enable_linters
+        sed -i "3isource 'https://rubygems.org'" Gemfile
 
     - name: Setup Ruby
       uses: ruby/setup-ruby@v1
@@ -36,3 +37,7 @@ jobs:
       run: |
         bundle exec slim-lint app/views
       if: always()
+
+    - name: Run Brakeman
+      run: |
+        bundle exec brakeman -5

data/.github/workflows/tests.yml

@@ -10,17 +10,21 @@ jobs:
 
     strategy:
       matrix:
-        ruby: ['2.7', '2.6', '2.5']
+        ruby: ['2.7', '2.6', '3.0']
         redmine: ['4.1-stable', '4.2-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:
       postgres:
-        image: postgres:13
+        image: postgres:14
         env:
           POSTGRES_DB: redmine
           POSTGRES_USER: postgres
@@ -83,6 +87,10 @@ jobs:
           libpq-dev
           libmysqlclient-dev
 
+      - name: Setup Gemfile
+        run: |
+          touch .enable_test
+
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
@@ -94,6 +102,7 @@ jobs:
         run: |
           cp plugins/additional_tags/test/support/database-${{ matrix.db }}.yml config/database.yml
           cp plugins/additional_tags/test/support/configuration.yml config/configuration.yml
+          cp plugins/additionals/test/support/additional_environment.rb config/additional_environment.rb
 
       - name: Install Ruby dependencies
         working-directory: redmine

data/.gitignore

@@ -5,4 +5,6 @@ tmp/
 Gemfile.lock
 .project
 .settings/
+.enable_*
 ._*
+*.gem

data/.rubocop.yml

@@ -6,7 +6,7 @@ Rails:
   Enabled: true
 
 AllCops:
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 2.6
   TargetRailsVersion: 5.2
   NewCops: enable
 
@@ -16,6 +16,10 @@ Metrics/AbcSize:
 Metrics/BlockLength:
   Enabled: false
 
+Metrics/ParameterLists:
+  Enabled: true
+  CountKeywordArgs: false
+
 Metrics/ClassLength:
   Enabled: false
 
@@ -34,9 +38,23 @@ Metrics/ModuleLength:
 Metrics/PerceivedComplexity:
   Max: 25
 
+Style/ExpandPathArguments:
+  Enabled: true
+  Exclude:
+    - additional_tags.gemspec
+    - test/**/*
+
 Rails/ApplicationJob:
   Enabled: false
 
+Lint/AmbiguousOperatorPrecedence:
+  Enabled: false
+
+Rails/ContentTag:
+  Enabled: true
+  Exclude:
+    - app/helpers/additional_tags_issues_helper.rb
+
 Rails/ApplicationRecord:
   Enabled: false
 
@@ -56,14 +74,41 @@ Style/AutoResourceCleanup:
   Enabled: true
 
 Style/FrozenStringLiteralComment:
-  Enabled: false
+  Enabled: true
+  Exclude:
+    - '/**/*.rsb'
 
 Style/Documentation:
   Enabled: false
 
-# required for travis/ci (symbolic links problem)
-Style/ExpandPathArguments:
-  Enabled: false
+Style/OptionHash:
+  Enabled: true
+  SuspiciousParamNames:
+    - options
+    - api_options
+    - opts
+    - args
+    - params
+    - parameters
+    - settings
+
+# postgresql and mysql are supported
+# autodetect does not work without database configuration
+Rails/BulkChangeTable:
+  Enabled: true
+  Database: postgresql
+
+Style/ReturnNil:
+  Enabled: true
+
+Style/UnlessLogicalOperators:
+  Enabled: true
+
+Style/MethodCallWithArgsParentheses:
+  Enabled: true
+  AllowParenthesesInMultilineCall: true
+  AllowParenthesesInChaining: true
+  EnforcedStyle: omit_parentheses
 
 Style/HashTransformKeys:
   Enabled: false
@@ -75,3 +120,8 @@ Naming/VariableNumber:
   Enabled: true
   Exclude:
     - 'test/**/*'
+
+# see https://github.com/rubocop/rubocop-rails/issues/578
+# redmine does not use load_defaults: https://rails.rubystyle.guide/#config-defaults
+Rails/RedundantPresenceValidationOnBelongsTo:
+  Enabled: false

data/.slim-lint.yml

@@ -17,10 +17,11 @@ linters:
       - Layout/MultilineMethodCallIndentation
       - Layout/MultilineMethodDefinitionBraceLayout
       - Layout/MultilineOperationIndentation
+      - Layout/SpaceBeforeBrackets
       - Layout/TrailingEmptyLines
       - Lint/Void
       - Rails/OutputSafety
+      - Style/FrozenStringLiteralComment
       - Style/IfUnlessModifier
-      - Style/WhileUntilModifier
       - Style/Next
-      - Layout/SpaceBeforeBrackets
+      - Style/WhileUntilModifier

data/README.md

@@ -1,30 +1,29 @@
 # Additional Tags - Tags for Redmine
 
-[![Rate at redmine.org](https://img.shields.io/badge/rate%20at-redmine.org-blue.svg?style=flat)](https://www.redmine.org/plugins/additional_tags) [![Run Linters](https://github.com/AlphaNodes/additional_tags/workflows/Run%20Linters/badge.svg)](https://github.com/AlphaNodes/additional_tags/actions?query=workflow%3A%22Run+Linters%22) [![Run Brakeman](https://github.com/AlphaNodes/additional_tags/workflows/Run%20Brakeman/badge.svg)](https://github.com/AlphaNodes/additional_tags/actions?query=workflow%3A%22Run+Brakeman%22) [![Run Tests](https://github.com/AlphaNodes/additional_tags/workflows/Tests/badge.svg)](https://github.com/AlphaNodes/additional_tags/actions?query=workflow%3ATests)
-
+[![Rate at redmine.org](https://img.shields.io/badge/rate%20at-redmine.org-blue.svg?style=flat)](https://www.redmine.org/plugins/additional_tags) [![Run Linters](https://github.com/AlphaNodes/additional_tags/workflows/Run%20Linters/badge.svg)](https://github.com/AlphaNodes/additional_tags/actions?query=workflow%3A%22Run+Linters%22) [![Run Tests](https://github.com/AlphaNodes/additional_tags/workflows/Tests/badge.svg)](https://github.com/AlphaNodes/additional_tags/actions?query=workflow%3ATests)
 
 ## Features
 
--   Tags for issues
--   Tags for wiki pages
--   Accented and non-latin characters supported for tag order
--   View, edit and create tag permissions for issues
--   Create permission for wiki tags
--   Managing tags
--   Custom tags and tagging tables (additional_tags and additional_taggings). If a other plugin
+- Tags for issues
+- Tags for wiki pages
+- Accented and non-latin characters supported for tag order
+- View, edit and create tag permissions for issues
+- Create permission for wiki tags
+- Managing tags
+- Custom tags and tagging tables (additional_tags and additional_taggings). If a other plugin
   used tags or tagging tables for issue or wiki tagging, there tags will be migrated automatically
--   Based on the very popular [acts-as-taggable-on](https://github.com/mbleigh/acts-as-taggable-on)
+- Based on the very popular [acts-as-taggable-on](https://github.com/mbleigh/acts-as-taggable-on)
 
 ![screenshot](https://raw.githubusercontent.com/AlphaNodes/additional_tags/master/doc/images/additional-tags.gif)
 
 Other plugins use additional_tags as framework in order to support tags for their entities.
 At the moment this are:
 
--   redmine_db (db entry tagging)
--   redmine_passwords (password tagging)
--   redmine_reporting (project tagging)
--   redmine_hrm (holiday tagging)
--   redmine_servicedesk (contact tagging)
+- redmine_db (db entry tagging)
+- redmine_passwords (password tagging)
+- redmine_reporting (project tagging)
+- redmine_hrm (holiday tagging)
+- redmine_servicedesk (contact tagging)
 
 Start using it, too. The example image shows the centralized tag management in the plugin configuration.
 
@@ -40,7 +39,7 @@ Start using it, too. The example image shows the centralized tag management in t
 ## Requirements
 
 - Redmine `>= 4.1.0`
-- Ruby `>= 2.5`
+- Ruby `>= 2.6`
 - Redmine plugins: [additionals](https://www.redmine.org/plugins/additionals)
 
 ## Installing
@@ -52,7 +51,7 @@ To install stable version of additional_tags, use
 ```shell
 cd $REDMINE_ROOT
 git clone -b stable https://www.github.com/alphanodes/additionals.git plugins/additionals
-git clone -b 1.0.0 https://www.github.com/alphanodes/additional_tags.git plugins/additional_tags
+git clone -b stable https://www.github.com/alphanodes/additional_tags.git plugins/additional_tags
 ```
 
 It is also possible to use stable version as a gem package as an alternative. If you want it, add this to your $REDMINE_ROOT/Gemfile.local:

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'rake/testtask'
 

data/additional_tags.gemspec

@@ -1,12 +1,15 @@
+# frozen_string_literal: true
+
 lib = File.expand_path '../lib', __FILE__
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'additional_tags/version'
+$LOAD_PATH.unshift lib unless $LOAD_PATH.include? lib
+require 'additional_tags/plugin_version'
 
 Gem::Specification.new do |spec|
   spec.name          = 'additional_tags'
-  spec.version       = AdditionalTags::VERSION
+  spec.version       = AdditionalTags::PluginVersion::VERSION
   spec.authors       = ['AlphaNodes']
   spec.email         = ['alex@alphanodes.com']
+  spec.metadata      = { 'rubygems_mfa_required' => 'true' }
 
   spec.summary       = 'Redmine plugin for adding tag functionality'
   spec.description   = 'Redmine plugin for adding tag functionality'
@@ -14,14 +17,15 @@ Gem::Specification.new do |spec|
   spec.license       = 'GPL-2.0'
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^((test|spec|features)/|Gemfile)})
+    f.match %r{^((test|spec|features)/|Gemfile)}
   end
   spec.bindir        = 'exe'
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename f }
   spec.require_paths = ['lib']
-  spec.required_ruby_version = '>= 2.5'
+  spec.required_ruby_version = '>= 2.6'
 
   spec.add_runtime_dependency 'acts-as-taggable-on', '~> 7.0'
+  spec.add_runtime_dependency 'redmine_plugin_kit'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'

data/app/controllers/additional_tags_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AdditionalTagsController < ApplicationController
   before_action :require_admin
   before_action :find_tag, only: %i[edit update]
@@ -56,7 +58,7 @@ class AdditionalTagsController < ApplicationController
   end
 
   def bulk_find_tags
-    @tags = ActsAsTaggableOn::Tag.joins("JOIN #{ActiveRecord::Base.connection.quote_table_name ActsAsTaggableOn.taggings_table}" \
+    @tags = ActsAsTaggableOn::Tag.joins("LEFT JOIN #{ActiveRecord::Base.connection.quote_table_name ActsAsTaggableOn.taggings_table}" \
                                         " ON #{ActiveRecord::Base.connection.quote_table_name ActsAsTaggableOn.taggings_table}.tag_id =" \
                                         " #{ActiveRecord::Base.connection.quote_table_name ActsAsTaggableOn.tags_table}.id ")
                                  .select("#{ActiveRecord::Base.connection.quote_table_name ActsAsTaggableOn.tags_table}.id," \
@@ -67,6 +69,7 @@ class AdditionalTagsController < ApplicationController
                                  .group("#{ActiveRecord::Base.connection.quote_table_name ActsAsTaggableOn.tags_table}.id" \
                                         ", #{ActiveRecord::Base.connection.quote_table_name ActsAsTaggableOn.tags_table}.name" \
                                         ", #{ActiveRecord::Base.connection.quote_table_name ActsAsTaggableOn.tags_table}.taggings_count")
+
     raise ActiveRecord::RecordNotFound if @tags.empty?
   end
 

data/app/controllers/issue_tags_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class IssueTagsController < ApplicationController
   before_action :find_issues, only: %i[edit update]
 
@@ -25,7 +27,7 @@ class IssueTagsController < ApplicationController
       tags = params[:issue] && params[:issue][:tag_list] ? params[:issue][:tag_list].reject(&:empty?) : []
 
       unless User.current.allowed_to?(:create_issue_tags, @projects.first) || Issue.allowed_tags?(tags)
-        flash[:error] = t(:notice_failed_to_add_tags)
+        flash[:error] = t :notice_failed_to_add_tags
         return
       end
 
@@ -35,13 +37,13 @@ class IssueTagsController < ApplicationController
           issue.save!
         end
       end
-      flash[:notice] = t(:notice_tags_added)
+      flash[:notice] = t :notice_tags_added
     else
-      flash[:error] = t(:notice_failed_to_add_tags)
+      flash[:error] = t :notice_failed_to_add_tags
     end
   rescue StandardError => e
     Rails.logger.warn "Failed to add tags: #{e.inspect}"
-    flash[:error] = t(:notice_failed_to_add_tags)
+    flash[:error] = t :notice_failed_to_add_tags
   ensure
     redirect_to_referer_or { render text: 'Tags updated.', layout: true }
   end