madmin 1.2.0 → 1.2.1

data/lib/madmin/resource.rb

@@ -1,14 +1,10 @@
 module Madmin
   class Resource
-    class_attribute :attributes, default: []
+    class_attribute :attributes, default: ActiveSupport::OrderedHash.new
     class_attribute :scopes, default: []
 
     class << self
       def inherited(base)
-        # Remove any old references
-        Madmin.resources.delete(base)
-        Madmin.resources << base
-
         base.attributes = attributes.dup
         base.scopes = scopes.dup
         super
@@ -30,11 +26,19 @@ module Madmin
         scopes << name
       end
 
+      def get_attribute(name)
+        attributes[name]
+      end
+
       def attribute(name, type = nil, **options)
-        attributes << {
+        type ||= infer_type(name)
+        field = options[:field] || field_for_type(type)
+
+        attributes[name] = OpenStruct.new(
           name: name,
-          field: field_for_type(name, type).new(**options.merge(attribute_name: name, model: model))
-        }
+          type: type,
+          field: field.new(**options.merge(attribute_name: name, model: model))
+        )
       end
 
       def friendly_name
@@ -42,7 +46,7 @@ module Madmin
       end
 
       def index_path(options = {})
-        route_name = "madmin_#{model.table_name}_path"
+        route_name = "madmin_#{model.model_name.plural}_path"
 
         url_helpers.send(route_name, options)
       end
@@ -70,7 +74,7 @@ module Madmin
       end
 
       def permitted_params
-        attributes.filter_map { |a| a[:field].to_param if a[:field].visible?(:form) }
+        attributes.values.filter_map { |a| a.field.to_param if a.field.visible?(:form) }
       end
 
       def display_name(record)
@@ -85,11 +89,13 @@ module Madmin
         model.column_names
       end
 
-      private
+      def searchable_attributes
+        attributes.values.select { |a| a.field.searchable? }
+      end
 
-      def field_for_type(name, type)
-        type ||= infer_type(name)
+      private
 
+      def field_for_type(type)
         {
           binary: Fields::String,
           blob: Fields::Text,

data/lib/madmin/search.rb

@@ -0,0 +1,60 @@
+# based on Administrate Search: https://github.com/thoughtbot/administrate/blob/main/lib/administrate/search.rb
+
+module Madmin
+  class Search
+    attr_reader :query
+
+    def initialize(scoped_resource, resource, term)
+      @resource = resource
+      @scoped_resource = scoped_resource
+      @query = term
+    end
+
+    def run
+      if query.blank?
+        @scoped_resource.all
+      else
+        search_results(@scoped_resource)
+      end
+    end
+
+    private
+
+    def search_results(resources)
+      resources.where(query_template, *query_values)
+    end
+
+    def query_template
+      search_attributes.map do |attr|
+        table_name = query_table_name(attr)
+        searchable_fields(attr).map do |field|
+          column_name = column_to_query(field)
+          "LOWER(CAST(#{table_name}.#{column_name} AS CHAR(256))) LIKE ?"
+        end.join(" OR ")
+      end.join(" OR ")
+    end
+
+    def searchable_fields(attr)
+      [attr[:name]]
+    end
+
+    def query_values
+      fields_count = search_attributes.sum do |attr|
+        searchable_fields(attr).count
+      end
+      ["%#{@query.mb_chars.downcase}%"] * fields_count
+    end
+
+    def search_attributes
+      @resource.searchable_attributes
+    end
+
+    def query_table_name(attr)
+      ActiveRecord::Base.connection.quote_column_name(@scoped_resource.table_name)
+    end
+
+    def column_to_query(attr)
+      ActiveRecord::Base.connection.quote_column_name(attr)
+    end
+  end
+end

data/lib/madmin/version.rb

@@ -1,3 +1,3 @@
 module Madmin
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end

data/lib/madmin.rb

@@ -6,6 +6,7 @@ module Madmin
   autoload :Field, "madmin/field"
   autoload :GeneratorHelpers, "madmin/generator_helpers"
   autoload :Resource, "madmin/resource"
+  autoload :Search, "madmin/search"
 
   module Fields
     autoload :Attachment, "madmin/fields/attachment"
@@ -30,14 +31,27 @@ module Madmin
     autoload :Time, "madmin/fields/time"
   end
 
-  mattr_accessor :resources, default: []
-
   class << self
     def resource_for(object)
-      Rails.application.eager_load!
+      "#{object.class.name}Resource".constantize
+    end
+
+    def resource_by_name(name)
+      "#{name}Resource".constantize
+    end
+
+    def resources
+      @resources ||= resource_names.map(&:constantize)
+    end
+
+    def reset_resources!
+      @resources = nil
+    end
 
-      klass_name = object.class.name
-      Madmin.resources.find { |r| r.model_name == klass_name }
+    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 }
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: madmin
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Chris Oliver
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-05 00:00:00.000000000 Z
+date: 2021-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -34,7 +34,7 @@ dependencies:
         version: '3.5'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -44,7 +44,7 @@ dependencies:
         version: '3.5'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
 description: It's an admin, obviously.
 email:
 - excid3@gmail.com
@@ -63,6 +63,7 @@ files:
 - app/controllers/madmin/dashboard_controller.rb
 - app/controllers/madmin/resource_controller.rb
 - app/helpers/madmin/application_helper.rb
+- app/helpers/madmin/nav_helper.rb
 - app/helpers/madmin/sort_helper.rb
 - app/views/layouts/madmin/application.html.erb
 - app/views/madmin/application/_form.html.erb
@@ -134,8 +135,15 @@ files:
 - app/views/madmin/fields/time/_form.html.erb
 - app/views/madmin/fields/time/_index.html.erb
 - app/views/madmin/fields/time/_show.html.erb
+- app/views/madmin/shared/_label.html.erb
+- lib/generators/madmin/field/field_generator.rb
+- lib/generators/madmin/field/templates/_form.html.erb
+- lib/generators/madmin/field/templates/_index.html.erb
+- lib/generators/madmin/field/templates/_show.html.erb
+- lib/generators/madmin/field/templates/field.rb.tt
 - lib/generators/madmin/install/install_generator.rb
 - lib/generators/madmin/install/templates/controller.rb.tt
+- lib/generators/madmin/install/templates/routes.rb.tt
 - lib/generators/madmin/resource/resource_generator.rb
 - lib/generators/madmin/resource/templates/controller.rb.tt
 - lib/generators/madmin/resource/templates/resource.rb.tt
@@ -174,6 +182,7 @@ files:
 - lib/madmin/generator_helpers.rb
 - lib/madmin/namespace.rb
 - lib/madmin/resource.rb
+- lib/madmin/search.rb
 - lib/madmin/version.rb
 - lib/madmin/view_generator.rb
 - lib/tasks/madmin_tasks.rake
@@ -196,7 +205,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: A modern admin for Ruby on Rails apps