redmine_nonproject_modules 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cac35d44b2746a8c17b91fb736e51ba687efe35999cb897fceb6535e99071a75
-  data.tar.gz: edd9ab896f725f414666429f33615b644151d6d52826d943a4f45afc8921327b
+  metadata.gz: f3021f986ccdc1df38523dd127151dcac47bfa63a565eb8d1f1c8448129c704f
+  data.tar.gz: db420508c1647e3e1cdd19f5c7c3f5640d8b4760ed5f540023c39ca875c30188
 SHA512:
-  metadata.gz: 25c6571aebc3f0aecbfa7ab0ce366f2918e3b92723298d83301f0e2fb596613c0b2a516a8d8449361e8ecc77777cc6b78350f2c1fa2c68261eea03c716205229
-  data.tar.gz: 524ace81f94bbdae93279e192f4bde5b8e4d35e6f1dc87ffb3f6b37cd9d88d408c575aa9b86bf0182bac00f4eb62ee83576044084839dc1e3c23d850d08985f3
+  metadata.gz: c142e394b73792e7ac5e743f6911f067722d7109ffe86a05cce2ce97f81101bd878518e4b7013ed1eb09e9cb90d0fa92604b6d9b3c237050cfc09b25222d2e9c
+  data.tar.gz: f0075df6cbaeb64f91189ce7af9ed06fe7dd5b746649d297b49f5e44d9c05c930be22fb09166f846230fb57f3cc7c584ff967cb5c4ea4a1b2886cc81163b263e

data/app/models/group_merge.rb

@@ -1,12 +1,8 @@
 # frozen_string_literal: true
 
-require 'virtus'
-
-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
@@ -19,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)]

data/init.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'active_scaffold'
+require 'jquery/rails'
 
 require 'redmine'
 

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/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.1'
+  VERSION = '0.3.2'
 end

data/lib/tasks/redmine_nonproject_modules.rake

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'rake/testtask'
+
 namespace :redmine_nonproject_modules do
   Rake::TestTask.new(test: 'db:test:prepare') do |t|
     plugin_root = ::File.dirname(::File.dirname(__dir__))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redmine_nonproject_modules
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
-- 0.3.1
+- 0.3.2
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-29 00:00:00.000000000 Z
+date: 2020-07-06 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.11'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.11.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.11'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.11.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: '4.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: '4.4'
 - !ruby/object:Gem::Dependency
   name: virtus
   requirement: !ruby/object:Gem::Requirement