redmine_nonproject_modules 0.3.13 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88b51cb0833e8a780aec7e675021595329310eec2a02b4ee5832394bf26b2458
-  data.tar.gz: fe397fd0f0d46ef361c445b059262cf1d502c16e8f152ebd9bab58f26026eafc
+  metadata.gz: 9c393719a43c09b1fcaa018311f53571ba1943532d1254f17c7e3248b30ac285
+  data.tar.gz: aabcd0192dbede3d36b45e15c52930826bd84d7967404cc6448a833dd36f1da6
 SHA512:
-  metadata.gz: bd3beb69e696bb50702929177b9aa8fd4c1ebf6de789d37d2e0d26f6630bb43ef9633e02c7c29ec47af9a2e9d26fcd5b15a66ce30ba816de16b2ad52e36bd0eb
-  data.tar.gz: 69c0bbfe878852c912732d172f181d9da3ac19fa09de76fd7ff1e41983c54be067fa15ec7a47ebceb3f830fb2c06d0697d84cbd8aaabf8a6850b1bc60dbf9684
+  metadata.gz: c052d43b5619ddf692720f3da0c54facf5baf72c6a9e6afdaea0f9ac40bcecdde6758f74710776805bd0f3b0f89feb8a1a46c9494874c3a0c7476eec8fe94f11
+  data.tar.gz: b207fa51fb6d973da1f537265edd40883ffac3e27ade190f65d416c07b93ccff456361b49513fcd35f4f4edd907a96ef8414152389266db79dfe7612c2235d18

data/app/models/group_merge.rb

@@ -2,7 +2,7 @@
 
 require 'eac_rails_utils/models/tableless'
 
-class GroupMerge < ::EacRailsUtils::Models::Tableless
+class GroupMerge < EacRailsUtils::Models::Tableless
   ONLY_ON_TARGET = :only_on_target
   ONLY_ON_SOURCE = :only_on_source
   ON_BOTH = :on_both
@@ -12,9 +12,6 @@ class GroupMerge < ::EacRailsUtils::Models::Tableless
   belongs_to :source, class_name: 'Group'
   belongs_to :target, class_name: 'Group'
 
-  validates :source, presence: true
-  validates :target, presence: true
-
   def to_merge_elements
     (target_elements + source_elements).uniq.map do |x|
       [x[0], element_on_status(x)]

data/app/models/group_permission.rb

@@ -2,11 +2,10 @@
 
 require 'eac_ruby_utils/simple_cache'
 
-class GroupPermission < ActiveRecord::Base
+class GroupPermission < ActiveRecord::Base # rubocop:disable Rails/ApplicationRecord
   belongs_to :group
 
-  validates :group, presence: true
-  validates :permission, presence: true, uniqueness: { scope: [:group],
+  validates :permission, presence: true, uniqueness: { scope: [:group], # rubocop:disable Rails/UniqueValidationWithoutIndex
                                                        case_sensitive: false }
 
   def permission=(value)
@@ -27,7 +26,7 @@ class GroupPermission < ActiveRecord::Base
       permission(key).description
     end
 
-    def permission?(permission, user = false)
+    def permission?(permission, user = false) # rubocop:disable Style/OptionalBooleanParameter
       return permission_by_hash?(permission, user) if permission.is_a?(Hash)
 
       permission(permission).user_has?(user || User.current)

data/config/initializers/001_patches.rb

@@ -3,5 +3,6 @@
 require 'redmine_nonproject_modules/patches/controller_patch'
 require 'redmine_nonproject_modules/patches/group_patch'
 require 'redmine_nonproject_modules/patches/redmine/i18n_patch'
-require 'redmine_nonproject_modules/patches/redmine/menu_manager_patch'
+require 'redmine_nonproject_modules/patches/redmine/menu_manager/mapper'
+require 'redmine_nonproject_modules/patches/redmine/plugin'
 require 'redmine_nonproject_modules/patches/user_patch'

data/config/initializers/group_permissions.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 
-::GroupPermission.add_permission('group_permissions')
-::GroupPermission.add_permission('group_merge')
+GroupPermission.add_permission('group_permissions')
+GroupPermission.add_permission('group_merge')

data/config/initializers/i18n.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+require 'i18n/backend/recursive_lookup'
+I18n::Backend::Simple.include I18n::Backend::RecursiveLookup

data/init.rb

@@ -4,18 +4,13 @@ require 'active_scaffold'
 require 'jquery/rails'
 
 require 'redmine'
-
-require 'redmine_nonproject_modules/patches/controller_patch'
-require 'redmine_nonproject_modules/patches/group_patch'
-require 'redmine_nonproject_modules/patches/redmine/i18n_patch'
-require 'redmine_nonproject_modules/patches/redmine/menu_manager_patch'
 require 'redmine_nonproject_modules/version'
 
 Redmine::Plugin.register :redmine_nonproject_modules do
   name 'Redmine non-project modules'
-  author ::RedmineNonprojectModules::AUTHOR
-  description ::RedmineNonprojectModules::SUMMARY
-  version ::RedmineNonprojectModules::VERSION
-  url ::RedmineNonprojectModules::HOMEPAGE
+  author RedmineNonprojectModules::AUTHOR
+  description RedmineNonprojectModules::SUMMARY
+  version RedmineNonprojectModules::VERSION
+  url RedmineNonprojectModules::HOMEPAGE
   author_url 'https://github.com/eduardobogoni'
 end

data/lib/redmine_nonproject_modules/menu_controller_entry.rb

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module RedmineNonprojectModules
+  class MenuControllerEntry
+    # @!method initialize(controller, options = {})
+    # @param controller [String]
+    # @param options [Hash]
+    common_constructor :controller, :options, default: [{}] do
+      self.controller = controller.to_s
+      self.options = options.with_indifferent_access
+    end
+
+    def build
+      [build_name, build_url, build_options]
+    end
+
+    def permissions
+      parse_permissions(permissions_const)
+    end
+
+    private
+
+    def build_name
+      r = controller
+      r = "#{r}_#{action}" unless action == 'index'
+      r.to_sym
+    end
+
+    def build_url
+      { controller: controller, action: action, id: id }
+    end
+
+    def build_options
+      {
+        caption: build_caption,
+        if: proc { GroupPermission.permission?(permissions_const) }
+      }
+    end
+
+    def build_caption
+      "label_#{build_name}".to_sym
+    end
+
+    def controller_class
+      Object.const_get("#{controller.camelize}Controller")
+    end
+
+    def action
+      options[:action] || 'index'
+    end
+
+    def id
+      options[:id]
+    end
+
+    def permissions_const
+      controller_class.const_get('PERMISSIONS')
+    end
+
+    def parse_permissions(permission)
+      return parse_permissions(permission.values) if permission.is_a?(Hash)
+      return permission.flat_map { |v| parse_permissions(v) } if permission.is_a?(Enumerable)
+
+      [permission.to_s]
+    end
+  end
+end

data/lib/redmine_nonproject_modules/patches/controller_patch.rb

@@ -28,5 +28,7 @@ end
 unless ActionController::Base.included_modules.include?(
   RedmineNonprojectModules::Patches::ControllerPatch
 )
-  ActionController::Base.include RedmineNonprojectModules::Patches::ControllerPatch
+  ActiveSupport.on_load(:action_controller) do
+    include RedmineNonprojectModules::Patches::ControllerPatch
+  end
 end

data/lib/redmine_nonproject_modules/patches/group_patch.rb

@@ -22,6 +22,6 @@ module RedmineNonprojectModules
   end
 end
 
-unless ::Group.included_modules.include?(RedmineNonprojectModules::Patches::GroupPatch)
-  ::Group.include RedmineNonprojectModules::Patches::GroupPatch
+unless Group.included_modules.include?(RedmineNonprojectModules::Patches::GroupPatch)
+  Group.include RedmineNonprojectModules::Patches::GroupPatch
 end

data/lib/redmine_nonproject_modules/patches/redmine/i18n_patch.rb

@@ -23,7 +23,7 @@ module RedmineNonprojectModules
   end
 end
 
-x = ::Redmine::I18n
-y = ::RedmineNonprojectModules::Patches::Redmine::I18nPatch
+x = Redmine::I18n
+y = RedmineNonprojectModules::Patches::Redmine::I18nPatch
 
 x.send(:include, y) unless x.included_modules.include?(y)

data/lib/redmine_nonproject_modules/patches/redmine/menu_manager/mapper.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module RedmineNonprojectModules
+  module Patches
+    module Redmine
+      module MenuManagerMapperPatch
+        def push_controller(*args)
+          e = ::RedmineNonprojectModules::MenuControllerEntry.new(*args)
+          push(*e.build)
+          e.permissions.each do |p|
+            ::GroupPermission.add_permission(p)
+          end
+        end
+      end
+    end
+  end
+end
+
+Redmine::MenuManager::Mapper
+  .include(RedmineNonprojectModules::Patches::Redmine::MenuManagerMapperPatch)

data/lib/redmine_nonproject_modules/patches/redmine/menu_manager_patch.rb

@@ -3,92 +3,31 @@
 module RedmineNonprojectModules
   module Patches
     module Redmine
-      module MenuManagerMapperPatch
-        def self.included(base)
-          base.send(:include, InstanceMethods)
-        end
-      end
-
-      module InstanceMethods
-        def push_controller(*args)
-          e = ControllerEntry.new(*args)
-          push(*e.build)
-          e.permissions.each do |p|
-            ::GroupPermission.add_permission(p)
+      module MenuManager
+        module Mapper
+          def self.included(base)
+            base.send(:include, InstanceMethods)
           end
         end
-      end
-
-      class ControllerEntry
-        def initialize(controller, options = {})
-          @controller = controller.to_s
-          @options = options.with_indifferent_access
-        end
-
-        def build
-          [build_name, build_url, build_options]
-        end
-
-        def permissions
-          parse_permissions(permissions_const)
-        end
-
-        private
-
-        attr_reader :controller, :options
-
-        def build_name
-          r = controller
-          r = "#{r}_#{action}" unless action == 'index'
-          r.to_sym
-        end
-
-        def build_url
-          { controller: controller, action: action, id: id }
-        end
-
-        def build_options
-          {
-            caption: build_caption,
-            if: proc { GroupPermission.permission?(permissions_const) }
-          }
-        end
-
-        def build_caption
-          "label_#{build_name}".to_sym
-        end
-
-        def controller_class
-          Object.const_get("#{controller.camelize}Controller")
-        end
 
-        def action
-          @options[:action] || 'index'
-        end
-
-        def id
-          @options[:id]
-        end
-
-        def permissions_const
-          controller_class.const_get('PERMISSIONS')
-        end
-
-        def parse_permissions(permission)
-          return parse_permissions(permission.values) if permission.is_a?(Hash)
-          return permission.flat_map { |v| parse_permissions(v) } if permission.is_a?(Enumerable)
-
-          [permission.to_s]
+        module InstanceMethods
+          def push_controller(*args)
+            e = ::RedmineNonprojectModules::MenuControllerEntry.new(*args)
+            push(*e.build)
+            e.permissions.each do |p|
+              ::GroupPermission.add_permission(p)
+            end
+          end
         end
       end
     end
   end
 end
 
-unless ::Redmine::MenuManager::Mapper.included_modules.include?(
-  ::RedmineNonprojectModules::Patches::Redmine::MenuManagerMapperPatch
+unless Redmine::MenuManager::Mapper.included_modules.include?(
+  RedmineNonprojectModules::Patches::Redmine::MenuManager::Mapper
 )
-  ::Redmine::MenuManager::Mapper.include(
-    ::RedmineNonprojectModules::Patches::Redmine::MenuManagerMapperPatch
+  Redmine::MenuManager::Mapper.include(
+    RedmineNonprojectModules::Patches::Redmine::MenuManager::Mapper
   )
 end

data/lib/redmine_nonproject_modules/patches/redmine/plugin.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module RedmineNonprojectModules
+  module Patches
+    module Redmine
+      module Plugin
+        common_concern
+
+        def nonprojects_menu(&block)
+          ::Redmine::MenuManager.map(id, &block)
+        end
+      end
+    end
+  end
+end
+
+Redmine::Plugin.include(RedmineNonprojectModules::Patches::Redmine::Plugin)

data/lib/redmine_nonproject_modules/patches/user_patch.rb

@@ -16,6 +16,6 @@ module RedmineNonprojectModules
   end
 end
 
-unless ::User.included_modules.include?(RedmineNonprojectModules::Patches::UserPatch)
-  ::User.include RedmineNonprojectModules::Patches::UserPatch
+unless User.included_modules.include?(RedmineNonprojectModules::Patches::UserPatch)
+  User.include RedmineNonprojectModules::Patches::UserPatch
 end

data/lib/redmine_nonproject_modules/version.rb

@@ -4,5 +4,5 @@ module RedmineNonprojectModules
   AUTHOR = 'Eduardo Henrique Bogoni'
   HOMEPAGE = 'https://github.com/esquilo-azul/redmine_nonproject_modules'
   SUMMARY = 'Support to non-project modules.'
-  VERSION = '0.3.13'
+  VERSION = '0.5.0'
 end

data/lib/tasks/redmine_nonproject_modules.rake

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 
 require 'redmine_plugins_helper/test_tasks/rspec'
-::RedminePluginsHelper::TestTasks::Rspec.register(:redmine_nonproject_modules, :test)
+RedminePluginsHelper::TestTasks::Rspec.register(:redmine_nonproject_modules, :test)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redmine_nonproject_modules
 version: !ruby/object:Gem::Version
-  version: 0.3.13
+  version: 0.5.0
 platform: ruby
 authors:
-- 0.3.13
+- 0.5.0
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-20 00:00:00.000000000 Z
+date: 2023-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eac_active_scaffold
@@ -36,14 +36,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.21'
+        version: '0.22'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.22.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.21'
+        version: '0.22'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.22.2
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement
@@ -64,6 +70,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.119.2
+- !ruby/object:Gem::Dependency
+  name: i18n-recursive-lookup
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.5
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -84,14 +110,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.8.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.8.1
 description: 
 email: 
 executables: []
@@ -119,6 +145,7 @@ files:
 - config/initializers/001_patches.rb
 - config/initializers/assets.rb
 - config/initializers/group_permissions.rb
+- config/initializers/i18n.rb
 - config/initializers/menus.rb
 - config/locales/en.yml
 - config/locales/pt-BR.yml
@@ -126,10 +153,13 @@ files:
 - init.rb
 - lib/redmine_nonproject_modules.rb
 - lib/redmine_nonproject_modules/dispatcher_finder.rb
+- lib/redmine_nonproject_modules/menu_controller_entry.rb
 - lib/redmine_nonproject_modules/patches/controller_patch.rb
 - lib/redmine_nonproject_modules/patches/group_patch.rb
 - lib/redmine_nonproject_modules/patches/redmine/i18n_patch.rb
+- lib/redmine_nonproject_modules/patches/redmine/menu_manager/mapper.rb
 - lib/redmine_nonproject_modules/patches/redmine/menu_manager_patch.rb
+- lib/redmine_nonproject_modules/patches/redmine/plugin.rb
 - lib/redmine_nonproject_modules/patches/user_patch.rb
 - lib/redmine_nonproject_modules/version.rb
 - lib/tasks/redmine_nonproject_modules.rake
@@ -144,7 +174,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="