effective_resources 1.6.0 → 1.6.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 2318bd8d0a93c63c8287583dd80a6b6e067bb5677f330b930d58588677d2cb55
4
- data.tar.gz: 82af0a3fdbb5c27bd2498bf82017c398485b755d729674e8963796b5b72f85c9
3
+ metadata.gz: 8623ea704325f309e92ac90f7df48786d1cb44ce3f050628f094ac90a5a74590
4
+ data.tar.gz: 0c08de0bfeb8345152a89a68ab9031446ea455b3d6bcdb9cd39b5eb456be6baf
5
5
  SHA512:
6
- metadata.gz: 5bd4c614b11beea8c848996a541b2e729092164543d9b69727ae346b6146783b0024c8ebeb428615c5806c87107146b10a7055800cf7ad0a7f42a80fea0f54bf
7
- data.tar.gz: d942166674ede76968161547a5eef54c1f3e9db015c2878d67ebaaa930117ad53f19beeaeea5632e4d69d39282cadf848c0da5c2cf151b3079d6288d4daeadab
6
+ metadata.gz: 467e9ca96fca55a286f6104ebb1bb5b32821d796fe31531726114fa723344cbad3cfa3371998759dbd5a75688f6cbffe08345b9053ef756aacf972436340019c
7
+ data.tar.gz: 97bb18a3ea794fe2be6696096b6636f37522a06d1e67a782e1b17794088f60d5132edb736506c50067fc3686502c9768a4e5a640e845cdd62d6c255b08f7505d
@@ -30,7 +30,7 @@ module Effective
30
30
  ['effective', namespace, name].compact.join('/')
31
31
  ]
32
32
 
33
- Rails::Engine.subclasses.each do |engine|
33
+ (Rails::Engine.subclasses.reverse + [Rails.application]).each do |engine|
34
34
  routes = engine.routes.routes.select do |route|
35
35
  (matches & [route.defaults[:controller]]).present? && !route.name.to_s.end_with?('root')
36
36
  end
@@ -9,10 +9,11 @@ module Effective
9
9
  def datatable_klass
10
10
  if defined?(EffectiveDatatables)
11
11
  "#{namespaced_class_name.pluralize}Datatable".safe_constantize ||
12
- "#{class_name.pluralize.camelize}Datatable".safe_constantize ||
13
- "#{name.pluralize.camelize}Datatable".safe_constantize ||
12
+ "#{namespaced_module_name.pluralize}Datatable".safe_constantize ||
14
13
  "#{namespaced_class_name.pluralize.gsub('::', '')}Datatable".safe_constantize ||
14
+ "#{class_name.pluralize.camelize}Datatable".safe_constantize ||
15
15
  "#{class_name.pluralize.camelize.gsub('::', '')}Datatable".safe_constantize ||
16
+ "#{name.pluralize.camelize}Datatable".safe_constantize ||
16
17
  "#{name.pluralize.camelize.gsub('::', '')}Datatable".safe_constantize ||
17
18
  "Effective::Datatables::#{namespaced_class_name.pluralize}".safe_constantize ||
18
19
  "Effective::Datatables::#{class_name.pluralize.camelize}".safe_constantize ||
@@ -31,6 +31,10 @@ module Effective
31
31
  (Array(namespaces).map { |name| name.to_s.classify } + [class_name]) * '::'
32
32
  end
33
33
 
34
+ def namespaced_module_name # 'Admin::EffectivePosts'
35
+ Array(namespaces).map { |name| name.to_s.classify }.join('::') + '::' + class_name.gsub('::', '')
36
+ end
37
+
34
38
  def namespace # 'admin/things'
35
39
  (namespaces.join('/') if namespaces.present?)
36
40
  end
@@ -1,3 +1,3 @@
1
1
  module EffectiveResources
2
- VERSION = '1.6.0'.freeze
2
+ VERSION = '1.6.1'.freeze
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: effective_resources
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.6.0
4
+ version: 1.6.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Code and Effect
@@ -39,7 +39,7 @@ dependencies:
39
39
  - !ruby/object:Gem::Version
40
40
  version: '0'
41
41
  - !ruby/object:Gem::Dependency
42
- name: effective_datatables
42
+ name: effective_bootstrap
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
45
  - - ">="
@@ -53,7 +53,7 @@ dependencies:
53
53
  - !ruby/object:Gem::Version
54
54
  version: '0'
55
55
  - !ruby/object:Gem::Dependency
56
- name: effective_developer
56
+ name: effective_datatables
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
59
  - - ">="