redmine_nonproject_modules 0.2.1 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5376c3a5a50a27ab5825bf4c0d6c6cadc2d672047808792d8b7b2d5b47118443
-  data.tar.gz: b173b20f273e8236950d0ac67641e40b23a88395ad35a7157828a6c29dddc296
+  metadata.gz: c417f99f1a29888b41e9f436899fa571d059b836d596f2f7a27efe8c2f0c8420
+  data.tar.gz: ee4051f4b9b220d4e2c50f1e4492604932046d68984ffc79cdc5999763081415
 SHA512:
-  metadata.gz: 3b78a4ccfc86da2be65496081ad35730be443faec2b2da9a299ceb4ae8a31e89ede3f94a8b16098484fc5be448b7835179a386c8d494a2201e31173d92ab1446
-  data.tar.gz: 57bf1adcd605ee92b9d1be876d67c279cee75b90cc49017996c955dd61c81e61a31370958de94db143ac1fdde6b73c2a4152fcc8714aae1edfc90cfb72f1ed47
+  metadata.gz: 7a908fabb449db2afddef4909699133656ead7208f38305c7971aef6ac9e6c04e40cec91aaec9bec7789a8007b001eb0bdc3650e4489b5b672ac7ba372728ddb
+  data.tar.gz: a92620cf8505e8af7815c597bda645ca9c313595205e99c4ead35c8ca3019125f06aca2e96cd5e65a40015bc6faba03c27b16388f890113311c7b146c1335198

data/app/controllers/group_merge_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class GroupMergeController < ApplicationController
   require_permission 'group_merge'
   helper GroupMergeHelper
@@ -10,6 +12,7 @@ class GroupMergeController < ApplicationController
   def check
     @group_merge = ::GroupMerge.new(check_parameters)
     return if @group_merge.valid?
+
     build_targets_list
     render :index
   end

data/app/controllers/group_permissions_controller.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 class GroupPermissionsController < ApplicationController
   require_permission 'group_permissions'
-  before_action :set_group, only: [:show, :update]
+  before_action :set_group, only: %i[show update]
 
   def index
     @groups = Group.sorted

data/app/controllers/nonproject_modules_controller.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class NonprojectModulesController < ApplicationController
+  layout 'nonproject_modules'
+
+  def index; end
+end

data/app/helpers/group_merge_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GroupMergeHelper
   def group_merge_elements_sorted(group_merge)
     r = group_merge.to_merge_elements.map do |x|
@@ -8,8 +10,8 @@ module GroupMergeHelper
     r.sort_by { |x| [x[0], x[1]] }
   end
 
-  def group_merge_element_class(x)
-    "GroupMergeHelper_element_#{x[1]}"
+  def group_merge_element_class(element)
+    "GroupMergeHelper_element_#{element[1]}"
   end
 
   def group_merge_type_element_label(element)
@@ -21,11 +23,11 @@ module GroupMergeHelper
     respond_to?(m) ? send(m, element) : element.to_s
   end
 
-  def group_merge_member_element_label(m)
-    "#{t(:label_project)}: #{m.project} (#{m.roles.to_a.join(', ')})"
+  def group_merge_member_element_label(member)
+    "#{t(:label_project)}: #{member.project} (#{member.roles.to_a.join(', ')})"
   end
 
-  def group_merge_group_permission_element_label(gp)
-    gp.permission
+  def group_merge_group_permission_element_label(group_permission)
+    group_permission.permission
   end
 end

data/app/models/group_merge.rb

@@ -1,10 +1,8 @@
-require 'virtus'
+# frozen_string_literal: true
 
-class GroupMerge
-  include ActiveModel::Model
-  include Virtus.model
-  include ActiveModel::Associations
+require 'eac_rails_utils/models/tableless'
 
+class GroupMerge < ::EacRailsUtils::Models::Tableless
   ONLY_ON_TARGET = :only_on_target
   ONLY_ON_SOURCE = :only_on_source
   ON_BOTH = :on_both
@@ -17,14 +15,6 @@ class GroupMerge
   validates :source, presence: true
   validates :target, presence: true
 
-  def [](attr)
-    send(attr)
-  end
-
-  def []=(attr, value)
-    send("#{attr}=", value)
-  end
-
   def to_merge_elements
     (target_elements + source_elements).uniq.map do |x|
       [x[0], element_on_status(x)]
@@ -39,16 +29,17 @@ class GroupMerge
   end
 
   def associations_to_merge
-    [:users, :memberships, :permissions]
+    %i[users memberships permissions]
   end
 
   private
 
-  def element_on_status(x)
-    return ON_BOTH if target_elements.include?(x) && source_elements.include?(x)
-    return ONLY_ON_TARGET if target_elements.include?(x)
-    return ONLY_ON_SOURCE if source_elements.include?(x)
-    raise "Element is neither on source nor on target: #{x}"
+  def element_on_status(element)
+    return ON_BOTH if target_elements.include?(element) && source_elements.include?(element)
+    return ONLY_ON_TARGET if target_elements.include?(element)
+    return ONLY_ON_SOURCE if source_elements.include?(element)
+
+    raise "Element is neither on source nor on target: #{element}"
   end
 
   def target_elements
@@ -68,8 +59,8 @@ class GroupMerge
   end
 
   def source_new_elements
-    source_elements.select do |x|
-      !target_elements.include?(x)
+    source_elements.reject do |x|
+      target_elements.include?(x)
     end
   end
 

data/app/models/group_permission.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'eac_ruby_utils/simple_cache'
 
 class GroupPermission < ActiveRecord::Base
@@ -27,23 +29,26 @@ class GroupPermission < ActiveRecord::Base
 
     def permission?(permission, user = false)
       return permission_by_hash?(permission, user) if permission.is_a?(Hash)
+
       permission(permission).user_has?(user || User.current)
     end
 
     def permission(key)
       key = key.to_s
       return permissions_hash[key] if permissions_hash.key?(key)
+
       raise "Not found \"#{key}\" in GroupPermission::permissions"
     end
 
     private
 
     def permissions_hash
-      @permissions ||= {}.with_indifferent_access
+      @permissions_hash ||= {}.with_indifferent_access
     end
 
     def permission_by_hash?(hash, user)
-      raise 'Hasy should have :or parameter' unless hash[:or].present?
+      raise 'Hasy should have :or parameter' if hash[:or].blank?
+
       ps = hash[:or].is_a?(Array) ? hash[:or] : [hash[:or]]
       ps.any? { |p| permission?(p, user) }
     end
@@ -53,8 +58,8 @@ class GroupPermission < ActiveRecord::Base
     include ::EacRubyUtils::SimpleCache
 
     class << self
-      def sanitize_key(k)
-        k.to_s.downcase
+      def sanitize_key(key)
+        key.to_s.downcase
       end
     end
 
@@ -75,11 +80,13 @@ class GroupPermission < ActiveRecord::Base
 
     def user_has?(user)
       return true if user.admin
+
       GroupPermission.where(group: user_groups(user), permission: depends_recursive.to_a).any?
     end
 
     def depends_recursive(visited = Set.new)
       return [] if visited.include?(key)
+
       r = Set.new([key])
       visited << key
       depends.each do |d|
@@ -96,6 +103,7 @@ class GroupPermission < ActiveRecord::Base
 
     def user_groups(user)
       return [Group.anonymous] if user.anonymous?
+
       [Group.anonymous, Group.non_member] + user.groups
     end
 

data/app/models/group_permissions_setup.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class GroupPermissionsSetup
   include ActiveModel::Model
 

data/app/views/layouts/_nonproject_modules_menu.html.erb

@@ -0,0 +1,14 @@
+<% any_available = false %>
+<% ::Redmine::Plugin.registered_plugins.keys.each do |plugin_key| %>
+  <% content = render_menu plugin_key %>
+  <% if content %>
+    <% any_available = true %>
+    <div style="margin-bottom: 1.0em">
+      <h4><%= t("menu_#{plugin_key}") %></h4>
+      <%= content %>
+    </div>
+  <% end %>
+<% end %>
+<% unless any_available %>
+  <p><em><%= t(:none_module_available) %></em></p>
+<% end %>

data/app/views/layouts/nonproject_modules.html.erb

@@ -0,0 +1,5 @@
+<% content_for :sidebar do %>
+  <h3><%= t(:label_nonproject_modules) %></h3>
+  <%= render partial: 'layouts/nonproject_modules_menu' %>
+<% end %>
+<%= render :file => "layouts/base" %>

data/app/views/nonproject_modules/index.html.erb

@@ -0,0 +1,7 @@
+<h2><%= t(:label_nonproject_modules) %></h2>
+<% if User.current.anonymous? %>
+  <p>Faça o <%= link_to('login', signin_path) %> para que o acesso aos módulos
+    apareçam à direita.</p>
+<% else %>
+  <p>Navegue pelo menu à direita.</p>
+<% end %>

data/config/initializers/000_dependencies.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Redmine::Plugin.post_register :redmine_nonproject_modules do
   # Source: https://github.com/esquilo-azul/redmine_plugins_helper
   requires_redmine_plugin(:redmine_plugins_helper, version_or_higher: '0.5.2')

data/config/locales/en.yml

@@ -4,7 +4,9 @@ en:
   in_both_group: In both groups.
   label_group_permission: Group permission
   label_group_permission_plural: Groups / Permissions
+  label_nonproject_modules: Non-project
   merge: Merge
+  none_module_available: 'No modules available.'
   group_will_receive_elements: 'The group "%{group}" will receive the following elements:'
   only_in_group: 'Only in "%{group}".'
   permission_group_permissions_description: Read/write access to groups' permissions.

data/config/locales/pt-BR.yml

@@ -5,7 +5,9 @@ pt-BR:
   in_both_group: Em ambos os grupos.
   label_group_permission: Permissão de grupo
   label_group_permission_plural: Grupos / Permissões
+  label_nonproject_modules: Não-projetos
   merge: Mesclar
+  none_module_available: 'Nenhum módulo disponível.'
   group_will_receive_elements: 'O grupo "%{group}" receberá os seguintes elementos:'
   only_in_group: 'Somente em "%{group}".'
   permission_group_permissions_description: Visualização/modificação das

data/config/routes.rb

@@ -1,5 +1,8 @@
+# frozen_string_literal: true
+
 RedmineApp::Application.routes.draw do
-  resources(:group_permissions, only: [:index, :show, :update])
+  resources(:group_permissions, only: %i[index show update])
+  resources(:nonproject_modules, only: [:index])
   get '/group/:id/merge', to: 'group_merge#index', as: :merge_group
   post '/group/:id/merge_check', to: 'group_merge#check', as: :merge_check_group
   post '/group/:id/merge_confirm', to: 'group_merge#confirm', as: :merge_confirm_group

data/init.rb

@@ -1,6 +1,7 @@
-# coding: utf-8
+# frozen_string_literal: true
 
 require 'active_scaffold'
+require 'jquery/rails'
 
 require 'redmine'
 
@@ -24,6 +25,11 @@ Redmine::Plugin.register :redmine_nonproject_modules do
               if: proc { GroupPermission.permission?('group_permissions') }
   end
 
+  Redmine::MenuManager.map :top_menu do |menu|
+    menu.push :nonproject_modules, { controller: 'nonproject_modules', action: 'index', id: nil },
+              caption: :label_nonproject_modules
+  end
+
   ActiveScaffold.delayed_setup = true
 end
 

data/lib/redmine_nonproject_modules/dispatcher_finder.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 require 'eac_ruby_utils/simple_cache'
 
 module RedmineNonprojectModules
   # https://stackoverflow.com/questions/12088025/detect-if-application-was-started-as...
   # https://github.com/newrelic/rpm/blob/master/lib/new_relic/local_environment.rb
   class DispatcherFinder
-    WEBSERVER_DISPATCHERS = %w(webrick passenger).freeze
+    WEBSERVER_DISPATCHERS = %w[webrick passenger].freeze
     DISPATCHERS = WEBSERVER_DISPATCHERS
 
     class << self

data/lib/redmine_nonproject_modules/patches/controller_patch.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RedmineNonprojectModules
   module Patches
     module ControllerPatch
@@ -7,14 +9,15 @@ module RedmineNonprojectModules
       end
 
       module ClassMethods
-        def require_permission(permission)
-          before_action { |c| c.before_action_require_permission(permission) }
+        def require_permission(permission, options = {})
+          before_action(options) { |c| c.before_action_require_permission(permission) }
         end
       end
 
       module InstanceMethods
         def before_action_require_permission(permission)
           return true if GroupPermission.permission?(permission)
+
           deny_access
         end
       end
@@ -25,5 +28,5 @@ end
 unless ActionController::Base.included_modules.include?(
   RedmineNonprojectModules::Patches::ControllerPatch
 )
-  ActionController::Base.send(:include, RedmineNonprojectModules::Patches::ControllerPatch)
+  ActionController::Base.include RedmineNonprojectModules::Patches::ControllerPatch
 end

data/lib/redmine_nonproject_modules/patches/group_patch.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RedmineNonprojectModules
   module Patches
     module GroupPatch
@@ -12,6 +14,7 @@ module RedmineNonprojectModules
         def add_permission(permission)
           permission = permission.permission if permission.is_a?(::GroupPermission)
           return if permissions.pluck(:permission).include?(permission)
+
           ::GroupPermission.create!(group: self, permission: permission)
         end
       end
@@ -20,5 +23,5 @@ module RedmineNonprojectModules
 end
 
 unless ::Group.included_modules.include?(RedmineNonprojectModules::Patches::GroupPatch)
-  ::Group.send(:include, RedmineNonprojectModules::Patches::GroupPatch)
+  ::Group.include RedmineNonprojectModules::Patches::GroupPatch
 end

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

@@ -4,18 +4,11 @@ module RedmineNonprojectModules
   module Patches
     module Redmine
       module I18nPatch
-        def self.included(base)
-          base.include(InstanceMethods)
-          base.alias_method_chain :l, :active_scaffold
-        end
-
-        module InstanceMethods
-          def l_with_active_scaffold(*args)
-            if (args.first.is_a?(Time) || args.first.is_a?(Date)) && args.last.is_a?(Hash)
-              ::I18n.l(args.first, args.last)
-            else
-              l_without_active_scaffold(*args)
-            end
+        def l(*args)
+          if (args.first.is_a?(Time) || args.first.is_a?(Date)) && args.last.is_a?(Hash)
+            ::I18n.l(args.first, args.last)
+          else
+            super(*args)
           end
         end
       end
@@ -26,4 +19,4 @@ end
 x = ::Redmine::I18n
 y = ::RedmineNonprojectModules::Patches::Redmine::I18nPatch
 
-x.send(:include, y) unless x.included_modules.include?(y)
+x.send(:prepend, y) unless x.included_modules.include?(y)

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RedmineNonprojectModules
   module Patches
     module Redmine
@@ -72,10 +74,11 @@ module RedmineNonprojectModules
           controller_class.const_get('PERMISSIONS')
         end
 
-        def parse_permissions(p)
-          return parse_permissions(p.values) if p.is_a?(Hash)
-          return p.flat_map { |v| parse_permissions(v) } if p.is_a?(Enumerable)
-          [p.to_s]
+        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
@@ -85,7 +88,7 @@ end
 unless ::Redmine::MenuManager::Mapper.included_modules.include?(
   ::RedmineNonprojectModules::Patches::Redmine::MenuManagerMapperPatch
 )
-  ::Redmine::MenuManager::Mapper.send(
-    :include, ::RedmineNonprojectModules::Patches::Redmine::MenuManagerMapperPatch
+  ::Redmine::MenuManager::Mapper.include(
+    ::RedmineNonprojectModules::Patches::Redmine::MenuManagerMapperPatch
   )
 end

data/lib/redmine_nonproject_modules/patches/user_patch.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RedmineNonprojectModules
   module Patches
     module UserPatch
@@ -15,5 +17,5 @@ module RedmineNonprojectModules
 end
 
 unless ::User.included_modules.include?(RedmineNonprojectModules::Patches::UserPatch)
-  ::User.send(: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.2.1'
+  VERSION = '0.3.4'
 end

data/lib/tasks/redmine_nonproject_modules.rake

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+require 'redmine_plugins_helper/plugin_rake_task'
+::RedminePluginsHelper::PluginRakeTask.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.2.1
+  version: 0.3.4
 platform: ruby
 authors:
-- 0.2.1
+- 0.3.4
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-26 00:00:00.000000000 Z
+date: 2020-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_scaffold
@@ -17,9 +17,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.5'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.5.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,43 +24,54 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.5'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.5.4
 - !ruby/object:Gem::Dependency
-  name: activemodel-associations
+  name: eac_rails_utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.12'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.12.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.12'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.12.2
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: '0.33'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
-    - - ">="
+        version: '0.33'
+- !ruby/object:Gem::Dependency
+  name: jquery-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: '4.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.4'
 - !ruby/object:Gem::Dependency
   name: virtus
   requirement: !ruby/object:Gem::Requirement
@@ -78,6 +86,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: eac_ruby_gem_support
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.2
 description: 
 email: 
 executables: []
@@ -88,6 +116,7 @@ files:
 - app/assets/stylesheets/redmine_nonproject_modules.css
 - app/controllers/group_merge_controller.rb
 - app/controllers/group_permissions_controller.rb
+- app/controllers/nonproject_modules_controller.rb
 - app/helpers/group_merge_helper.rb
 - app/models/group_merge.rb
 - app/models/group_permission.rb
@@ -98,6 +127,9 @@ files:
 - app/views/group_permissions/_member_context.html.erb
 - app/views/group_permissions/index.html.erb
 - app/views/group_permissions/show.html.erb
+- app/views/layouts/_nonproject_modules_menu.html.erb
+- app/views/layouts/nonproject_modules.html.erb
+- app/views/nonproject_modules/index.html.erb
 - config/initializers/000_dependencies.rb
 - config/locales/en.yml
 - config/locales/pt-BR.yml
@@ -111,6 +143,7 @@ files:
 - lib/redmine_nonproject_modules/patches/redmine/menu_manager_patch.rb
 - lib/redmine_nonproject_modules/patches/user_patch.rb
 - lib/redmine_nonproject_modules/version.rb
+- lib/tasks/redmine_nonproject_modules.rake
 homepage: https://github.com/esquilo-azul/redmine_nonproject_modules
 licenses: []
 metadata: {}
@@ -129,8 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Support to non-project modules.