effective_resources 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2318bd8d0a93c63c8287583dd80a6b6e067bb5677f330b930d58588677d2cb55
-  data.tar.gz: 82af0a3fdbb5c27bd2498bf82017c398485b755d729674e8963796b5b72f85c9
+  metadata.gz: 8623ea704325f309e92ac90f7df48786d1cb44ce3f050628f094ac90a5a74590
+  data.tar.gz: 0c08de0bfeb8345152a89a68ab9031446ea455b3d6bcdb9cd39b5eb456be6baf
 SHA512:
-  metadata.gz: 5bd4c614b11beea8c848996a541b2e729092164543d9b69727ae346b6146783b0024c8ebeb428615c5806c87107146b10a7055800cf7ad0a7f42a80fea0f54bf
-  data.tar.gz: d942166674ede76968161547a5eef54c1f3e9db015c2878d67ebaaa930117ad53f19beeaeea5632e4d69d39282cadf848c0da5c2cf151b3079d6288d4daeadab
+  metadata.gz: 467e9ca96fca55a286f6104ebb1bb5b32821d796fe31531726114fa723344cbad3cfa3371998759dbd5a75688f6cbffe08345b9053ef756aacf972436340019c
+  data.tar.gz: 97bb18a3ea794fe2be6696096b6636f37522a06d1e67a782e1b17794088f60d5132edb736506c50067fc3686502c9768a4e5a640e845cdd62d6c255b08f7505d

data/app/models/effective/resources/actions.rb

@@ -30,7 +30,7 @@ module Effective
               ['effective', namespace, name].compact.join('/')
             ]
 
-            Rails::Engine.subclasses.each do |engine|
+            (Rails::Engine.subclasses.reverse + [Rails.application]).each do |engine|
               routes = engine.routes.routes.select do |route|
                 (matches & [route.defaults[:controller]]).present? && !route.name.to_s.end_with?('root')
               end

data/app/models/effective/resources/klass.rb

@@ -9,10 +9,11 @@ module Effective
       def datatable_klass
         if defined?(EffectiveDatatables)
           "#{namespaced_class_name.pluralize}Datatable".safe_constantize ||
-          "#{class_name.pluralize.camelize}Datatable".safe_constantize ||
-          "#{name.pluralize.camelize}Datatable".safe_constantize ||
+          "#{namespaced_module_name.pluralize}Datatable".safe_constantize ||
           "#{namespaced_class_name.pluralize.gsub('::', '')}Datatable".safe_constantize ||
+          "#{class_name.pluralize.camelize}Datatable".safe_constantize ||
           "#{class_name.pluralize.camelize.gsub('::', '')}Datatable".safe_constantize ||
+          "#{name.pluralize.camelize}Datatable".safe_constantize ||
           "#{name.pluralize.camelize.gsub('::', '')}Datatable".safe_constantize ||
           "Effective::Datatables::#{namespaced_class_name.pluralize}".safe_constantize ||
           "Effective::Datatables::#{class_name.pluralize.camelize}".safe_constantize ||

data/app/models/effective/resources/naming.rb

@@ -31,6 +31,10 @@ module Effective
         (Array(namespaces).map { |name| name.to_s.classify } + [class_name]) * '::'
       end
 
+      def namespaced_module_name # 'Admin::EffectivePosts'
+        Array(namespaces).map { |name| name.to_s.classify }.join('::') + '::' + class_name.gsub('::', '')
+      end
+
       def namespace # 'admin/things'
         (namespaces.join('/') if namespaces.present?)
       end

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.6.0'.freeze
+  VERSION = '1.6.1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Code and Effect
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: effective_datatables
+  name: effective_bootstrap
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: effective_developer
+  name: effective_datatables
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="