madmin 2.1.3 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98cd062a740eb34ed7d97445424c1bc8ed2ca044d5c7a0249ddafb85c1d47696
-  data.tar.gz: c5b46f3800e5b950703e09b8b9bc18ea8a87d64fce310e5038d360af1b35b83e
+  metadata.gz: ca659d30c381297068616d7a51c89b00e60df503a44a9bfe667ba3330ebddbe8
+  data.tar.gz: f8d5bbfb4d9672e817a841eeda918501ad086e5184da6b188a7a7b4bd1dfbcb7
 SHA512:
-  metadata.gz: 0eb8b624193e5832242142b296edffe6a7e071a7ab766554d9c121e4c7d5526b82a6bf7ab46a9af511c8d8858cfd8c3131f83479fc08dba5093b8a95f4f95e6c
-  data.tar.gz: d2b68cc4f02941779aeab65676f01e931624e3237a31bbbab189a09ac4293835064f1388f79f8c219ce622d7c07a67600723dff2ca880470cd7e75f7ab41419e
+  metadata.gz: 12c7205ca6197e20175bfe1789110825c2ed6adc0c5ed97c63a1a7b7609150d0dba54838d05f9ba870d5ade58938ff9900344e553f94a0e2944a7a7ae186de59
+  data.tar.gz: e922436e1ad3116fbf932819b2b73d817e3ac3dafead25737d8ae3c58dd58e12215fb82170cf1e527438e2f3e569a0f207c45ab8b4579b27bdce6d838d99e13f

data/lib/madmin/engine.rb

@@ -5,8 +5,15 @@ module Madmin
     isolate_namespace Madmin
 
     config.before_configuration do |app|
-      app.config.eager_load_paths << File.expand_path("app/madmin/resources", Rails.root)
-      app.config.eager_load_paths << File.expand_path("app/madmin/fields", Rails.root)
+      app.config.eager_load_paths << app.root.join("app/madmin/resources")
+      app.config.eager_load_paths << app.root.join("app/madmin/fields")
+      Madmin.resource_locations << Rails.root.join("app/madmin/resources/")
+
+      Rails::Engine.subclasses.each do |engine|
+        app.config.eager_load_paths << engine.root.join("app/madmin/resources")
+        app.config.eager_load_paths << engine.root.join("app/madmin/fields")
+        Madmin.resource_locations << engine.root.join("app/madmin/resources/")
+      end
     end
 
     config.to_prepare do

data/lib/madmin/search.rb

@@ -50,7 +50,7 @@ module Madmin
     end
 
     def query_table_name(attr)
-      ::ActiveRecord::Base.connection.quote_column_name(@scoped_resource.table_name)
+      ::ActiveRecord::Base.connection.quote_table_name(@scoped_resource.table_name)
     end
 
     def column_to_query(attr)

data/lib/madmin/version.rb

@@ -1,3 +1,3 @@
 module Madmin
-  VERSION = "2.1.3"
+  VERSION = "2.2.1"
 end

data/lib/madmin.rb

@@ -40,6 +40,7 @@ module Madmin
   mattr_accessor :menu, default: Menu.new
   mattr_accessor :site_name
   mattr_accessor :stylesheets, default: []
+  mattr_accessor :resource_locations, default: []
 
   class MissingResource < StandardError
   end
@@ -99,9 +100,10 @@ module Madmin
     end
 
     def resource_names
-      root = Rails.root.join("app/madmin/resources/")
-      files = Dir.glob(root.join("**/*.rb"))
-      files.sort!.map! { |f| f.split(root.to_s).last.delete_suffix(".rb").classify }
+      resource_locations.flat_map do |root|
+        files = Dir.glob(root.join("**/*.rb"))
+        files.sort!.map! { |f| f.split(root.to_s).last.delete_suffix(".rb").classify }
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: madmin
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.2.1
 platform: ruby
 authors:
 - Chris Oliver