redmine_nonproject_modules 0.4.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc031e4d77cdf5071904532778bcb3125b62b71a94e028e37143df2bb7e08a04
-  data.tar.gz: 79d18b5296b28eb9c8d2e420b9e6597d21af7636c07bd176a719381df5206db1
+  metadata.gz: 9f9433cc7007312e8ef5c011eee4ddb3b79974c6ccd8cd85e680208b6a0649e1
+  data.tar.gz: 1a41f84dd10c23981d902370e2c9807151ae1f57dde131ca96439a09c0ba56cf
 SHA512:
-  metadata.gz: 8375cafd48467e31dbbafa7d20861a58f0122882127e05c598c2f043cbd65391f11025edb8f8066505d516c00c1bb660be284cb44dbc6fc4813d5397069cdd8e
-  data.tar.gz: a735ddf06ea745d50adac99bbd33d385a301821afcabc81f57866537f28ae4051243487fd70d8b6ab8a2bff889b79b16586e3a53c806827de68b57f88e131c20
+  metadata.gz: c85ec4ca425a83d840800b041d64b12aadb295be0520afdd4b5534e4ad98731cfe9cfe2a964f013b4da0b6497b67844f203ea79107216afc47b6942c9daefe97
+  data.tar.gz: 11dc39bc9fdef85a9358697f58345bc61efb1aa1715319044b2752b4314d114394f0241a486cd94c7ba77c9c21b2559609543ef40bcd63629a8467d39f3d3c38

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

@@ -5,8 +5,7 @@ require 'eac_ruby_utils/simple_cache'
 class GroupPermission < ActiveRecord::Base
   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,6 +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/init.rb

@@ -8,9 +8,9 @@ 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}"
+    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

@@ -16,4 +16,4 @@ module RedmineNonprojectModules
   end
 end
 
-::Redmine::Plugin.include(::RedmineNonprojectModules::Patches::Redmine::Plugin)
+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.4.0'
+  VERSION = '0.5.1'
 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.4.0
+  version: 0.5.1
 platform: ruby
 authors:
-- 0.4.0
+- 0.5.1
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-18 00:00:00.000000000 Z
+date: 2024-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eac_active_scaffold
@@ -19,7 +19,7 @@ dependencies:
         version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.5.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.5.3
 - !ruby/object:Gem::Dependency
   name: eac_rails_utils
   requirement: !ruby/object:Gem::Requirement
@@ -56,25 +56,22 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.119'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.119.2
+        version: '0.121'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.119'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.119.2
+        version: '0.121'
 - !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
@@ -82,6 +79,9 @@ dependencies:
   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
@@ -99,19 +99,25 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.6'
 - !ruby/object:Gem::Dependency
-  name: eac_ruby_gem_support
+  name: eac_rails_gem_support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: '0.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: '0.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.2
 description: 
 email: 
 executables: []
@@ -147,9 +153,11 @@ 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
@@ -166,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:
   - - ">="