redmine_nonproject_modules 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 788c8dddd025d521cbe84b70b14ffb6a2b7738314b2a33b141bd4ee9605f98b8
-  data.tar.gz: 3e105c0da836e2bb6db91a03a3c6727ae76e040fa1ec45274360611fdc0978a0
+  metadata.gz: a4c4a90785e3aedfadc96446570f78a6fc678155b35c6d3e7a03c1bf959a8f60
+  data.tar.gz: 129c25698d6ba55645e2cdc81fd713b7ef0f15b6f524364f6998a8d36eda18c9
 SHA512:
-  metadata.gz: c728dfc89ec885e0a5c060765e29b088bc0a35f91bf0f556b515136cbd74659758bf3a0a5b95f5f41cdeb34475110f16773162f4275ec721266b04f23a75b3ce
-  data.tar.gz: 4916eea25a7b4014a16bc4750c1d2fb936cf5c10280d91e53f3ce47d9ca5ebfa284ac5a2dd6f1f7e9510c2317d838c2868d6265e7fc8f232a4aceaeb32c70eeb
+  metadata.gz: 70bed372f01297b8fd07d4a6cc4fcea688139ad5fa73498c78c886718f58b6ba6109b30adea119fedf823ace159ffe7c85bf239e6b1b7e27f19811210fa3896b
+  data.tar.gz: 18a3614bf6339c4905fef4fe28b3e6ff1c64cb20d28547c509243d460aab6bdfb4a91aed7e42de9646315180c81690986bae38afdafa132ba12982739f0b7661

data/config/initializers/001_patches.rb

@@ -1,8 +1,11 @@
 # frozen_string_literal: true
 
-require 'redmine_nonproject_modules/patches/controller_patch'
-require 'redmine_nonproject_modules/patches/group_patch'
-require 'redmine_nonproject_modules/patches/redmine/i18n'
-require 'redmine_nonproject_modules/patches/redmine/menu_manager/mapper'
-require 'redmine_nonproject_modules/patches/redmine/plugin'
-require 'redmine_nonproject_modules/patches/user_patch'
+ActiveScaffold::Actions::Core.patch_self(RedmineNonprojectModules::Patches::ActiveScaffoldJsResponse)
+ActiveSupport.on_load(:action_controller) do
+  include RedmineNonprojectModules::Patches::ControllerPatch
+end
+Group.include RedmineNonprojectModules::Patches::GroupPatch
+Redmine::I18n.patch_self(RedmineNonprojectModules::Patches::Redmine::I18n)
+Redmine::MenuManager::Mapper.include(RedmineNonprojectModules::Patches::Redmine::MenuManagerMapperPatch)
+Redmine::Plugin.include(RedmineNonprojectModules::Patches::Redmine::Plugin)
+User.include RedmineNonprojectModules::Patches::UserPatch

data/init.rb

@@ -11,9 +11,3 @@ Redmine::Plugin.register :redmine_nonproject_modules do
   url RedmineNonprojectModules::HOMEPAGE
   author_url 'https://github.com/eduardobogoni'
 end
-
-if Rails.respond_to?(:autoloaders)
-  Rails.autoloaders.each do |loader|
-    loader.ignore File.join(__dir__, 'lib/redmine_nonproject_modules/patches')
-  end
-end

data/lib/redmine_nonproject_modules/patches/active_scaffold_js_response.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+# Compatibility shim between ActiveScaffold's JS (expects raw HTML text) and modern rails-ujs
+# (auto-parses "text/html" responses into a Document before handing them over).
+module RedmineNonprojectModules
+  module Patches
+    module ActiveScaffoldJsResponse
+      # Intercepts "included" on ActiveScaffold::Actions::Core itself, so every controller that
+      # later includes it also gets this module and the after_action callback below.
+      module SingletonMethods
+        def included(base)
+          super
+          base.include RedmineNonprojectModules::Patches::ActiveScaffoldJsResponse
+          base.after_action :fix_active_scaffold_js_response_content_type
+        end
+      end
+
+      common_concern do
+        singleton_class.prepend(RedmineNonprojectModules::Patches::ActiveScaffoldJsResponse::SingletonMethods)
+      end
+
+      def fix_active_scaffold_js_response_content_type
+        return unless request.format.js? && response.media_type == 'text/html'
+
+        response.content_type = 'text/plain'
+      end
+    end
+  end
+end

data/lib/redmine_nonproject_modules/patches/controller_patch.rb

@@ -24,9 +24,3 @@ module RedmineNonprojectModules
     end
   end
 end
-
-unless 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

@@ -21,7 +21,3 @@ module RedmineNonprojectModules
     end
   end
 end
-
-unless Group.include?(RedmineNonprojectModules::Patches::GroupPatch)
-  Group.include RedmineNonprojectModules::Patches::GroupPatch
-end

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

@@ -23,5 +23,3 @@ module RedmineNonprojectModules
     end
   end
 end
-
-Redmine::I18n.patch_self(RedmineNonprojectModules::Patches::Redmine::I18n)

data/lib/redmine_nonproject_modules/patches/redmine/{menu_manager/mapper.rb → menu_manager_mapper_patch.rb}

@@ -15,6 +15,3 @@ module RedmineNonprojectModules
     end
   end
 end
-
-Redmine::MenuManager::Mapper
-  .include(RedmineNonprojectModules::Patches::Redmine::MenuManagerMapperPatch)

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

@@ -13,5 +13,3 @@ module RedmineNonprojectModules
     end
   end
 end
-
-Redmine::Plugin.include(RedmineNonprojectModules::Patches::Redmine::Plugin)

data/lib/redmine_nonproject_modules/patches/user_patch.rb

@@ -15,7 +15,3 @@ module RedmineNonprojectModules
     end
   end
 end
-
-unless User.include?(RedmineNonprojectModules::Patches::UserPatch)
-  User.include RedmineNonprojectModules::Patches::UserPatch
-end

data/lib/redmine_nonproject_modules/version.rb

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

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification
 name: redmine_nonproject_modules
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
-- 0.6.4
+- 0.6.5
 bindir: bin
 cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
@@ -35,34 +35,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.29'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.29.5
+        version: '0.31'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.29'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.29.5
+        version: '0.31'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.132'
+        version: '0.134'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.132'
+        version: '0.134'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -89,20 +83,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.13.2
+        version: '0.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.13.2
+        version: '0.15'
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -136,11 +124,11 @@ files:
 - 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/active_scaffold_js_response.rb
 - lib/redmine_nonproject_modules/patches/controller_patch.rb
 - lib/redmine_nonproject_modules/patches/group_patch.rb
 - lib/redmine_nonproject_modules/patches/redmine/i18n.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/menu_manager_mapper_patch.rb
 - lib/redmine_nonproject_modules/patches/redmine/plugin.rb
 - lib/redmine_nonproject_modules/patches/user_patch.rb
 - lib/redmine_nonproject_modules/version.rb

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

@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-
-module RedmineNonprojectModules
-  module Patches
-    module Redmine
-      module MenuManager
-        module Mapper
-          def self.included(base)
-            base.send(:include, InstanceMethods)
-          end
-        end
-
-        module InstanceMethods
-          def push_controller(*)
-            e = ::RedmineNonprojectModules::MenuControllerEntry.new(*)
-            push(*e.build)
-            e.permissions.each do |p|
-              ::GroupPermission.add_permission(p)
-            end
-          end
-        end
-      end
-    end
-  end
-end
-
-unless Redmine::MenuManager::Mapper.include?(RedmineNonprojectModules::Patches::Redmine::MenuManager::Mapper)
-  Redmine::MenuManager::Mapper.include(
-    RedmineNonprojectModules::Patches::Redmine::MenuManager::Mapper
-  )
-end