administrate 0.13.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a347d47197b8258a2233e4bed126e17faf34cedf8b87ca21ad61283c7f5b8dcf
-  data.tar.gz: 2a63e64339323c68e2daae8df8c48a50c2a85aa25cfded6a14899a275e523573
+  metadata.gz: e8120deb0ddc3a88302230382298ce39c25d60e4effca6336787016c46024d91
+  data.tar.gz: ad6262c38fca6d8be885d8687db7b02444da05c751c8dcb25a71d7a292d43f05
 SHA512:
-  metadata.gz: e8e751c67ebafc99997f82646120be75a79f021e6a78ea207b1a393e38438abd2c9fe00596a9772514d86e9b079984b6dd110eaef6541517dbf369b27acce590
-  data.tar.gz: ad12aac58cee58d0eb620c0b60627f07bfddaa7853e6c518b0a2cbe4d219c61d64a41b761d7a958bf8b65c4003ecca74b572245ae1db54e2616aafe4420e494c
+  metadata.gz: e6bfde68398c548cfe04665c21c5e44fd8f659c404ddfcb141c5b358396cb6d0ca1c087b459a322553ff9dfeb195f033d817829d7a84bc80024004f1390faf5c
+  data.tar.gz: 794416e6cc50fadef9674c2fcb5316be67e7523d19c31431dfe3f80165a5355f3ce12019aad78681b6f5ede71797f3b3bab9b911236e8f3231bd0fcdacd15bc2

data/app/assets/javascripts/administrate/components/{has_many_form.js → associative.js}

@@ -1,3 +1,4 @@
 $(function() {
+  $('.field-unit--belongs-to select').selectize({});
   $(".field-unit--has-many select").selectize({});
 });

data/app/assets/stylesheets/administrate/base/_tables.scss

@@ -21,6 +21,9 @@ tr {
 tbody tr {
   &:hover {
     background-color: $base-background-color;
+  }
+
+  [role=link] {
     cursor: pointer;
   }
 

data/app/assets/stylesheets/administrate/components/_flashes.scss

@@ -1,11 +1,3 @@
-$base-spacing: 1.5em !default;
-$flashes: (
-  "alert": #fff6bf,
-  "error": #fbe3e4,
-  "notice": #e5edf8,
-  "success": #e6efc2,
-) !default;
-
 @each $flash-type, $color in $flashes {
   .flash-#{$flash-type} {
     background-color: $color;

data/app/assets/stylesheets/administrate/library/_variables.scss

@@ -22,8 +22,10 @@ $black: #000 !default;
 
 $blue: #1976d2 !default;
 $red: #d32f2f !default;
-$light-yellow: #f0cd66 !default;
-$light-green: #4ab471 !default;
+$light-yellow: #fff6bf !default;
+$light-red: #fbe3e4 !default;
+$light-green: #e6efc2 !default;
+$light-blue: #e5edf8 !default;
 
 $grey-0: #f6f7f7 !default;
 $grey-1: #dfe0e1 !default;
@@ -47,12 +49,12 @@ $focus-outline: $focus-outline-width solid $focus-outline-color;
 $focus-outline-offset: 1px;
 
 // Flash Colors
-$flash-colors: (
-  alert: $light-yellow,
-  error: $red,
-  notice: mix($white, $blue, 50%),
-  success: $light-green
-);
+$flashes: (
+  "alert": $light-yellow,
+  "error": $light-red,
+  "notice": $light-blue,
+  "success": $light-green
+) !default;
 
 // Border
 $base-border-color: $grey-1 !default;

data/app/controllers/administrate/application_controller.rb

@@ -27,7 +27,7 @@ module Administrate
     end
 
     def new
-      resource = resource_class.new
+      resource = new_resource
       authorize_resource(resource)
       render locals: {
         page: Administrate::Page::Form.new(dashboard, resource),
@@ -101,12 +101,31 @@ module Administrate
     end
 
     def order
-      @order ||= Administrate::Order.new(
-        params.fetch(resource_name, {}).fetch(:order, nil),
-        params.fetch(resource_name, {}).fetch(:direction, nil),
+      @order ||= Administrate::Order.new(sorting_attribute, sorting_direction)
+    end
+
+    def sorting_attribute
+      params.fetch(resource_name, {}).fetch(
+        :order,
+        default_sorting_attribute,
       )
     end
 
+    def default_sorting_attribute
+      nil
+    end
+
+    def sorting_direction
+      params.fetch(resource_name, {}).fetch(
+        :direction,
+        default_sorting_direction,
+      )
+    end
+
+    def default_sorting_direction
+      nil
+    end
+
     def dashboard
       @dashboard ||= dashboard_class.new
     end
@@ -144,6 +163,8 @@ module Administrate
         else
           raise "Unrecognised param data: #{data.inspect}"
         end
+      elsif data.is_a?(ActionController::Parameters)
+        data.transform_values { |v| read_param_value(v) }
       else
         data
       end

data/app/helpers/administrate/application_helper.rb

@@ -11,7 +11,7 @@ module Administrate
     end
 
     def render_field(field, locals = {})
-      locals.merge!(field: field)
+      locals[:field] = field
       render locals: locals, partial: field.to_partial_path
     end
 
@@ -34,17 +34,20 @@ module Administrate
       resource_class.validators_on(field_name)
     end
 
-    def class_from_resource(resource_name)
-      resource_name.to_s.classify.constantize
+    def dashboard_from_resource(resource_name)
+      "#{resource_name.to_s.singularize}_dashboard".classify.constantize
+    end
+
+    def model_from_resource(resource_name)
+      dashboard = dashboard_from_resource(resource_name)
+      dashboard.try(:model) || resource_name.to_sym
     end
 
     def display_resource_name(resource_name)
-      class_from_resource(resource_name).
-        model_name.
-        human(
-          count: PLURAL_MANY_COUNT,
-          default: resource_name.to_s.pluralize.titleize,
-        )
+      dashboard_from_resource(resource_name).resource_name(
+        count: PLURAL_MANY_COUNT,
+        default: default_resource_name(resource_name),
+      )
     end
 
     def sort_order(order)
@@ -55,8 +58,11 @@ module Administrate
       end
     end
 
-    def resource_index_route_key(resource_name)
-      ActiveModel::Naming.route_key(class_from_resource(resource_name))
+    def resource_index_route(resource_name)
+      url_for(
+        action: "index",
+        controller: "/#{namespace}/#{resource_name}",
+      )
     end
 
     def sanitized_order_params(page, current_field_name)
@@ -72,5 +78,11 @@ module Administrate
         :per_page, resource_name => %i[order direction]
       )
     end
+
+    private
+
+    def default_resource_name(resource_name)
+      resource_name.to_s.pluralize.gsub("/", "_").titleize
+    end
   end
 end

data/app/views/administrate/application/_collection.html.erb

@@ -55,19 +55,21 @@ to display a collection of resources in an HTML table.
   <tbody>
     <% resources.each do |resource| %>
       <tr class="js-table-row"
-          tabindex="0"
-          <% if valid_action? :show, collection_presenter.resource_name %>
-            <%= %(role=link data-url=#{polymorphic_path([namespace, resource])}) %>
+          <% if show_action? :show, resource %>
+            <%= %(tabindex=0 role=link data-url=#{polymorphic_path([namespace, resource])}) %>
           <% end %>
           >
         <% collection_presenter.attributes_for(resource).each do |attribute| %>
           <td class="cell-data cell-data--<%= attribute.html_class %>">
             <% if show_action? :show, resource -%>
               <a href="<%= polymorphic_path([namespace, resource]) -%>"
+                 tabindex="-1"
                  class="action-show"
                  >
                 <%= render_field attribute %>
               </a>
+            <% else %>
+              <%= render_field attribute %>
             <% end -%>
           </td>
         <% end %>

data/app/views/administrate/application/_form.html.erb

@@ -21,7 +21,7 @@ and renders all form fields for a resource's editable attributes.
         <%= t(
           "administrate.form.errors",
           pluralized_errors: pluralize(page.resource.errors.count, t("administrate.form.error")),
-          resource_name: display_resource_name(page.resource_name)
+          resource_name: display_resource_name(page.resource_name).singularize
         ) %>
       </h2>
 

data/app/views/administrate/application/_navigation.html.erb

@@ -8,13 +8,13 @@ as defined by the routes in the `admin/` namespace
 %>
 
 <nav class="navigation" role="navigation">
-  <%= link_to "Back to app", root_url, class: "button button--alt" %> 
+  <%= link_to(t("administrate.navigation.back_to_app"), root_url, class: "button button--alt") if defined?(root_url) %>
 
-  <% Administrate::Namespace.new(namespace).resources.each do |resource| %>
+  <% Administrate::Namespace.new(namespace).resources_with_index_route.each do |resource| %>
     <%= link_to(
       display_resource_name(resource),
-      [namespace, resource_index_route_key(resource)],
+      resource_index_route(resource),
       class: "navigation__link navigation__link--#{nav_link_state(resource)}"
-    ) if valid_action? :index, resource  %>
+    ) if valid_action?(:index, resource) && show_action?(:index, model_from_resource(resource)) %>
   <% end %>
 </nav>

data/app/views/fields/select/_form.html.erb

@@ -19,13 +19,25 @@ to be displayed on a resource's edit form page.
   <%= f.label field.attribute %>
 </div>
 <div class="field-unit__field">
-  <%= f.select(
-    field.attribute,
-    options_from_collection_for_select(
-      field.selectable_options,
-      :to_s,
-      :to_s,
-      field.data.presence,
-    )
-  ) %>
+  <% if field.selectable_options.first&.is_a?(Array) %>
+    <%= f.select(
+      field.attribute,
+      options_from_collection_for_select(
+        field.selectable_options,
+        :last,
+        :first,
+        field.data.presence,
+      )
+    ) %>
+  <% else %>
+    <%= f.select(
+      field.attribute,
+      options_from_collection_for_select(
+        field.selectable_options,
+        :to_s,
+        :to_s,
+        field.data.presence,
+      )
+    ) %>
+  <% end %>
 </div>

data/app/views/fields/time/_form.html.erb

@@ -2,7 +2,7 @@
 # Time Form Partial
 
 This partial renders an input element for time attributes.
-By default, the input is a select field for the time attributes.
+By default, the input is a text field that is augmented with [DateTimePicker].
 
 ## Local variables:
 
@@ -12,11 +12,12 @@ By default, the input is a select field for the time attributes.
   An instance of [Administrate::Field::Time][1].
   A wrapper around the tmie attributes pulled from the model.
 
+[DateTimePicker]: https://github.com/Eonasdan/bootstrap-datetimepicker
 %>
 
 <div class="field-unit__label">
   <%= f.label field.attribute %>
 </div>
 <div class="field-unit__field">
-  <%= f.text_field field.attribute, data: { type: 'time' } %>
+  <%= f.text_field field.attribute, data: { type: 'time' }, value: field.data&.strftime("%H:%M:%S") %>
 </div>

data/config/locales/administrate.ar.yml

@@ -23,6 +23,8 @@ ar:
     form:
       error: error
       errors: "%{pluralized_errors} prohibited this %{resource_name} from being saved:"
+    navigation:
+      back_to_app: العودة إلى التطبيق
     search:
       clear: مسح البحث
       label: بحث %{resource}

data/config/locales/administrate.bs.yml

@@ -22,6 +22,8 @@ bs:
     form:
       error: error
       errors: "%{pluralized_errors} prohibited this %{resource_name} from being saved:"
+    navigation:
+      back_to_app: Natrag na aplikaciju
     search:
       clear: Izbriši pretraživanje
       label: Pretraga %{resource}

data/config/locales/administrate.ca.yml

@@ -23,6 +23,8 @@ ca:
     form:
       error: error
       errors: "%{pluralized_errors} han impedit que %{resource_name} es guardés amb èxit:"
+    navigation:
+      back_to_app: Torna a l'aplicació
     search:
       clear: Esborrar la cerca
       label: Cerca %{resource}

data/config/locales/administrate.da.yml

@@ -23,6 +23,8 @@ da:
     form:
       error: error
       errors: "%{pluralized_errors} prohibited this %{resource_name} from being saved:"
+    navigation:
+      back_to_app: Tilbage til app
     search:
       clear: Ryd søgning
       label: Søg %{resource}

data/config/locales/administrate.de.yml

@@ -23,6 +23,8 @@ de:
     form:
       error: error
       errors: "%{pluralized_errors} haben das Speichern dieses %{resource_name} verhindert:"
+    navigation:
+      back_to_app: Zurück zur App
     search:
       clear: Suche zurücksetzen
       label: "%{resource} durchsuchen"

data/config/locales/administrate.en.yml

@@ -23,6 +23,8 @@ en:
     form:
       error: error
       errors: "%{pluralized_errors} prohibited this %{resource_name} from being saved:"
+    navigation:
+      back_to_app: Back to app
     search:
       clear: Clear search
       label: Search %{resource}

data/config/locales/administrate.es.yml

@@ -23,6 +23,8 @@ es:
     form:
       error: error
       errors: "%{pluralized_errors} no permitieron guardar este %{resource_name}:"
+    navigation:
+      back_to_app: Regresar a la aplicación
     search:
       clear: Borrar búsqueda
       label: Buscar %{resource}

data/config/locales/administrate.fr.yml

@@ -23,6 +23,8 @@ fr:
     form:
       error: erreur
       errors: "%{pluralized_errors} ont empêchés %{resource_name} d'être sauvergardé :"
+    navigation:
+      back_to_app: Retour à l'application
     search:
       clear: Effacer la recherche
       label: Chercher %{resource}

data/config/locales/administrate.id.yml

@@ -23,6 +23,8 @@ id:
     form:
       error: error
       errors: "%{pluralized_errors} membuat %{resource_name} tidak bisa tersimpan:"
+    navigation:
+      back_to_app: Kembali ke aplikasi
     search:
       clear: Kosongkan pencarian
       label: Cari %{resource}

data/config/locales/administrate.it.yml

@@ -23,6 +23,8 @@ it:
     form:
       error: error
       errors: "%{pluralized_errors} prohibited this %{resource_name} from being saved:"
+    navigation:
+      back_to_app: Torna all'app
     search:
       clear: Cancella ricerca
       label: Ricerca %{resource}

data/config/locales/administrate.ja.yml

@@ -23,6 +23,8 @@ ja:
     form:
       error: エラー
       errors: "%{pluralized_errors}のため%{resource_name}を保存できません。"
+    navigation:
+      back_to_app: アプリに戻る
     search:
       clear: 検索をクリアする
       label: サーチ %{resource}

data/config/locales/administrate.ko.yml

@@ -23,6 +23,8 @@ ko:
     form:
       error: 에러
       errors: "%{pluralized_errors}로 인하여 %{resource_name}을(를) 저장하는데 실패하였습니다."
+    navigation:
+      back_to_app: 앱으로 돌아 가기
     search:
       clear: 검색 초기화
       label: "%{resource} 검색"

data/config/locales/administrate.nl.yml

@@ -23,6 +23,8 @@ nl:
     form:
       error: error
       errors: "%{pluralized_errors} prohibited this %{resource_name} from being saved:"
+    navigation:
+      back_to_app: Terug naar app
     search:
-      clear: CDuidelijke zoek
+      clear: Wissen
       label: Zoeken %{resource}

data/config/locales/administrate.pl.yml

@@ -23,6 +23,8 @@ pl:
     form:
       error: error
       errors: "%{pluralized_errors} prohibited this %{resource_name} from being saved:"
+    navigation:
+      back_to_app: Powrót do aplikacji
     search:
       clear: Wyczyść wyszukiwanie
       label: Szukanie %{resource}

data/config/locales/administrate.pt-BR.yml

@@ -24,6 +24,8 @@ pt-BR:
     form:
       error: error
       errors: "%{pluralized_errors} prohibited this %{resource_name} from being saved:"
+    navigation:
+      back_to_app: Voltar ao aplicativo
     search:
       clear: Limpar pesquisa
       label: Pesquisa %{resource}

data/config/locales/administrate.pt.yml

@@ -24,6 +24,8 @@ pt:
     form:
       error: error
       errors: "%{pluralized_errors} prohibited this %{resource_name} from being saved:"
+    navigation:
+      back_to_app: Voltar ao aplicativo
     search:
       clear: Limpar pesquisa
       label: Pesquisa %{resource}

data/config/locales/administrate.ru.yml

@@ -23,6 +23,8 @@ ru:
     form:
       error: Ошибка
       errors: "При сохранении %{resource_name} произошли ошибки:"
+    navigation:
+      back_to_app: Вернуться в приложение
     search:
       clear: Очистить поиск
       label: Поиск %{resource}

data/config/locales/{administrate.al.yml → administrate.sq.yml}

@@ -1,5 +1,5 @@
 ---
-al:
+sq:
   administrate:
     actions:
       confirm: A jeni te sigurtë?
@@ -23,6 +23,8 @@ al:
     form:
       error: gabim
       errors: "%{pluralized_errors} nuk e lejoj %{resource_name} të ruhet:"
+    navigation:
+      back_to_app: Kthehu tek aplikacioni
     search:
       clear: Pastro kërkimin
       label: Kërko %{resource}

data/config/locales/administrate.sv.yml

@@ -23,6 +23,8 @@ sv:
     form:
       error: error
       errors: "%{pluralized_errors} prohibited this %{resource_name} from being saved:"
+    navigation:
+      back_to_app: Tillbaka till appen
     search:
       clear: Rensa sökningen
       label: Sök %{resource}

data/config/locales/administrate.uk.yml

@@ -23,6 +23,8 @@ uk:
     form:
       error: error
       errors: "%{pluralized_errors} prohibited this %{resource_name} from being saved:"
+    navigation:
+      back_to_app: Повернутися до програми
     search:
       clear: Очистити пошук
       label: пошук %{resource}

data/config/locales/administrate.vi.yml

@@ -23,6 +23,8 @@ vi:
     form:
       error: error
       errors: "%{pluralized_errors} prohibited this %{resource_name} from being saved:"
+    navigation:
+      back_to_app: Quay lại ứng dụng
     search:
       clear: Tìm kiếm rõ ràng
       label: Tìm kiếm %{resource}

data/config/locales/administrate.zh-CN.yml

@@ -23,6 +23,8 @@ zh-CN:
     form:
       error: 错误
       errors: "%{resource_name} 保存前出现了 %{pluralized_errors} 个错误："
+    navigation:
+      back_to_app: 返回应用
     search:
       clear: 清除搜索
       label: 搜索 %{resource}

data/config/locales/administrate.zh-TW.yml

@@ -23,6 +23,8 @@ zh-TW:
     form:
       error: 錯誤
       errors: "%{pluralized_errors} 導致此 %{resource_name} 不能被儲存："
+    navigation:
+      back_to_app: 返回应用
     search:
       clear: 清除搜尋
       label: 搜尋 %{resource}

data/docs/adding_controllers_without_related_model.md

@@ -0,0 +1,36 @@
+# Adding Controllers without a related Model
+
+Sometimes you may want to add a custom controller that has no resource
+related to it (for example for a statistics page).
+
+To do that, you must define an `index` route, as only controllers with index
+routes are displayed in the sidebar and then add a custom dashboard:
+
+```erb
+# app/views/admin/stats/index.html.erb 
+
+<div style="padding: 20px">
+  <h1>Stats</h1>
+  <br>
+  <p><b>Total Customers:</b> <%= @stats[:customer_count] %></h1>
+  <br>
+  <p><b>Total Orders:</b> <%= @stats[:order_count] %></h1>
+</div>
+```
+
+```ruby
+# app/dashboards/stat_dashboard.rb
+require "administrate/custom_dashboard"
+
+class StatDashboard < Administrate::CustomDashboard
+  resource "Stats" # used by administrate in the views
+end
+```
+
+```ruby
+# config/routes.rb
+namespace :admin do
+  # ...
+  resources :stats, only: [:index]
+end
+```

data/docs/customizing_controller_actions.md

@@ -56,3 +56,17 @@ end
 ```
 
 Action is one of `new`, `edit`, `show`, `destroy`.
+
+## Customizing Default Sorting
+
+To set the default sorting on the index action you could override `default_sorting_attribute` or `default_sorting_direction` in your dashboard controller like this:
+
+```ruby
+def default_sorting_attribute
+  :age
+end
+
+def default_sorting_direction
+  :desc
+end
+```

data/docs/customizing_dashboards.md

@@ -93,7 +93,7 @@ Defaults to `:#{attribute}.to_s.singularize.camelcase`.
 `:searchable` - Specify if the attribute should be considered when searching.
 Default is `false`.
 
-`searchable_field` - Specify which column to use on the search, only applies
+`searchable_fields` - Specify which columns to use on the search, only applies
 if `searchable` is `true`
 
 For example:
@@ -101,7 +101,7 @@ For example:
 ```ruby
   country: Field::BelongsTo.with_options(
     searchable: true,
-    searchable_field: 'name',
+    searchable_fields: ['name'],
   )
 ```
 
@@ -132,7 +132,7 @@ Defaults to `:#{attribute}.to_s.singularize.camelcase`.
 `:searchable` - Specify if the attribute should be considered when searching.
 Default is `false`.
 
-`searchable_field` - Specify which column to use on the search, only applies if
+`searchable_fields` - Specify which columns to use on the search, only applies if
 `searchable` is `true`
 
 For example:
@@ -140,7 +140,7 @@ For example:
 ```ruby
   cities: Field::HasMany.with_options(
     searchable: true,
-    searchable_field: 'name',
+    searchable_fields: ['name'],
   )
 ```
 
@@ -200,7 +200,8 @@ objects to display as.
 
 **Field::Select**
 
-`:collection` - Specify the array or range to select from. Defaults to `[]`.
+`:collection` - Specify the options shown on the select field. It accept either
+an array or an object responding to `:call`. Defaults to `[]`.
 
 `:searchable` - Specify if the attribute should be considered when searching.
 Default is `true`.

data/docs/customizing_page_views.md

@@ -2,12 +2,24 @@
 title: Customizing page views
 ---
 
-In order to change the appearance of any page,
-you can write custom Rails views.
+You can provide replacements for any of Administrate's templates.
+This way you can change the appearance of any page or element of
+the interface.
+
+In general, you can override any of the views under Administrate's
+[/app/views][1].
+For example, say that you want to customize the template used for flash
+messages. You can provide your own as
+`/app/views/administrate/application/_flashes.html.erb`, and it will replace
+Administrate's own.
+
+Figuring out which views are available and where can be repetitive. You can
+spare yourself some effort by using the built-in view generators.
+
+[1]: https://github.com/thoughtbot/administrate/tree/master/app/views
 
 ## Customizing for all resources
 
-The easiest way to get started is by using the built-in generators.
 In order to change the appearance of views for all resource types,
 call the generators with no arguments.
 

data/lib/administrate/base_dashboard.rb

@@ -18,6 +18,18 @@ module Administrate
   class BaseDashboard
     include Administrate
 
+    DASHBOARD_SUFFIX = "Dashboard".freeze
+
+    class << self
+      def model
+        to_s.chomp(DASHBOARD_SUFFIX).classify.constantize
+      end
+
+      def resource_name(opts)
+        model.model_name.human(opts)
+      end
+    end
+
     def attribute_types
       self.class::ATTRIBUTE_TYPES
     end
@@ -74,18 +86,11 @@ module Administrate
       "Attribute #{attr} could not be found in #{self.class}::ATTRIBUTE_TYPES"
     end
 
-    def association_classes
-      @association_classes ||=
-        ObjectSpace.each_object(Class).
-          select { |klass| klass < Administrate::Field::Associative }
-    end
-
     def attribute_includes(attributes)
       attributes.map do |key|
         field = self.class::ATTRIBUTE_TYPES[key]
 
-        next key if association_classes.include?(field)
-        key if association_classes.include?(field.try(:deferred_class))
+        key if field.associative?
       end.compact
     end
   end

data/lib/administrate/custom_dashboard.rb

@@ -0,0 +1,15 @@
+module Administrate
+  class CustomDashboard
+    include Administrate
+
+    class << self
+      def resource_name(_opts)
+        named_resource.pluralize.titleize
+      end
+
+      def resource(resource_name)
+        define_singleton_method(:named_resource) { resource_name }
+      end
+    end
+  end
+end

data/lib/administrate/field/associative.rb

@@ -11,7 +11,7 @@ module Administrate
         associated_class_name.constantize
       end
 
-      protected
+      private
 
       def associated_dashboard
         "#{associated_class_name}Dashboard".constantize.new

data/lib/administrate/field/base.rb

@@ -12,6 +12,10 @@ module Administrate
         field_type.dasherize
       end
 
+      def self.associative?
+        self < Associative
+      end
+
       def self.searchable?
         false
       end

data/lib/administrate/field/deferred.rb

@@ -21,14 +21,29 @@ module Administrate
           options == other.options
       end
 
+      def associative?
+        deferred_class.associative?
+      end
+
       def searchable?
         options.fetch(:searchable, deferred_class.searchable?)
       end
 
       def searchable_field
+        ActiveSupport::Deprecation.warn(
+          "searchable_field is deprecated, use searchable_fields instead",
+        )
         options.fetch(:searchable_field)
       end
 
+      def searchable_fields
+        if options.key?(:searchable_field)
+          [searchable_field]
+        else
+          options.fetch(:searchable_fields)
+        end
+      end
+
       def permitted_attribute(attr, _options = nil)
         options.fetch(:foreign_key,
           deferred_class.permitted_attribute(attr, options))

data/lib/administrate/field/polymorphic.rb

@@ -23,7 +23,7 @@ module Administrate
         data ? data.to_global_id : nil
       end
 
-      protected
+      private
 
       def associated_dashboard(klass = data.class)
         "#{klass.name}Dashboard".constantize.new

data/lib/administrate/field/select.rb

@@ -14,7 +14,12 @@ module Administrate
       private
 
       def collection
-        @collection ||= options.fetch(:collection, [])
+        values = options.fetch(:collection, [])
+        if values.respond_to? :call
+          return values.arity.positive? ? values.call(self) : values.call
+        end
+
+        @collection ||= values
       end
     end
   end

data/lib/administrate/namespace.rb

@@ -18,6 +18,10 @@ module Administrate
       end
     end
 
+    def resources_with_index_route
+      routes.select { |_resource, route| route == "index" }.map(&:first).uniq
+    end
+
     private
 
     attr_reader :namespace

data/lib/administrate/page/base.rb

@@ -23,7 +23,7 @@ module Administrate
         dashboard.try(:item_includes) || []
       end
 
-      protected
+      private
 
       def attribute_field(dashboard, resource, attribute_name, page)
         value = get_attribute_value(resource, attribute_name)

data/lib/administrate/page/form.rb

@@ -20,7 +20,7 @@ module Administrate
         dashboard.display_resource(resource)
       end
 
-      protected
+      private
 
       attr_reader :dashboard
     end

data/lib/administrate/search.rb

@@ -81,14 +81,24 @@ module Administrate
     def query_template
       search_attributes.map do |attr|
         table_name = query_table_name(attr)
-        attr_name = column_to_query(attr)
-
-        "LOWER(CAST(#{table_name}.#{attr_name} AS CHAR(256))) LIKE ?"
+        searchable_fields(attr).map do |field|
+          attr_name = column_to_query(field)
+          "LOWER(CAST(#{table_name}.#{attr_name} AS CHAR(256))) LIKE ?"
+        end.join(" OR ")
       end.join(" OR ")
     end
 
+    def searchable_fields(attr)
+      return [attr] unless association_search?(attr)
+
+      attribute_types[attr].searchable_fields
+    end
+
     def query_values
-      ["%#{term.mb_chars.downcase}%"] * search_attributes.count
+      fields_count = search_attributes.sum do |attr|
+        searchable_fields(attr).count
+      end
+      ["%#{term.mb_chars.downcase}%"] * fields_count
     end
 
     def search_attributes
@@ -117,7 +127,12 @@ module Administrate
 
     def query_table_name(attr)
       if association_search?(attr)
-        ActiveRecord::Base.connection.quote_table_name(attr.to_s.pluralize)
+        provided_class_name = attribute_types[attr].options[:class_name]
+        if provided_class_name
+          provided_class_name.constantize.table_name
+        else
+          ActiveRecord::Base.connection.quote_table_name(attr.to_s.pluralize)
+        end
       else
         ActiveRecord::Base.connection.
           quote_table_name(@scoped_resource.table_name)
@@ -125,12 +140,7 @@ module Administrate
     end
 
     def column_to_query(attr)
-      if association_search?(attr)
-        ActiveRecord::Base.connection.
-          quote_column_name(attribute_types[attr].searchable_field)
-      else
-        ActiveRecord::Base.connection.quote_column_name(attr)
-      end
+      ActiveRecord::Base.connection.quote_column_name(attr)
     end
 
     def tables_to_join
@@ -140,13 +150,7 @@ module Administrate
     end
 
     def association_search?(attribute)
-      return unless attribute_types[attribute].respond_to?(:deferred_class)
-
-      [
-        Administrate::Field::BelongsTo,
-        Administrate::Field::HasMany,
-        Administrate::Field::HasOne,
-      ].include?(attribute_types[attribute].deferred_class)
+      attribute_types[attribute].associative?
     end
 
     def term

data/lib/administrate/version.rb

@@ -1,3 +1,3 @@
 module Administrate
-  VERSION = "0.13.0".freeze
+  VERSION = "0.14.0".freeze
 end

data/lib/generators/administrate/dashboard/dashboard_generator.rb

@@ -7,7 +7,7 @@ module Administrate
         boolean: "Field::Boolean",
         date: "Field::Date",
         datetime: "Field::DateTime",
-        enum: "Field::String",
+        enum: "Field::Select",
         float: "Field::Number",
         integer: "Field::Number",
         time: "Field::Time",
@@ -16,7 +16,9 @@ module Administrate
       }
 
       ATTRIBUTE_OPTIONS_MAPPING = {
-        enum: { searchable: false },
+        # procs must be defined in one line!
+        enum: {  searchable: false,
+                 collection: ->(field) { field.resource.class.send(field.attribute.to_s.pluralize).keys } },
         float: { decimals: 2 },
       }
 
@@ -136,7 +138,16 @@ module Administrate
       end
 
       def inspect_hash_as_ruby(hash)
-        hash.map { |key, value| "#{key}: #{value.inspect}" }.join(", ")
+        hash.map do |key, value|
+          v_str = value.respond_to?(:call) ? proc_string(value) : value.inspect
+          "#{key}: #{v_str}"
+        end.join(", ")
+      end
+
+      def proc_string(value)
+        source = value.source_location
+        proc_string = IO.readlines(source.first)[source.second - 1]
+        proc_string[/->[^}]*} | (lambda|proc).*end/x]
       end
     end
   end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: administrate
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Nick Charlton
 - Grayson Wright
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-13 00:00:00.000000000 Z
+date: 2020-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -187,8 +187,8 @@ extra_rdoc_files: []
 files:
 - Rakefile
 - app/assets/javascripts/administrate/application.js
+- app/assets/javascripts/administrate/components/associative.js
 - app/assets/javascripts/administrate/components/date_time_picker.js
-- app/assets/javascripts/administrate/components/has_many_form.js
 - app/assets/javascripts/administrate/components/table.js
 - app/assets/stylesheets/administrate/application.scss
 - app/assets/stylesheets/administrate/base/_forms.scss
@@ -275,7 +275,6 @@ files:
 - app/views/fields/url/_show.html.erb
 - app/views/layouts/administrate/application.html.erb
 - config/i18n-tasks.yml
-- config/locales/administrate.al.yml
 - config/locales/administrate.ar.yml
 - config/locales/administrate.bs.yml
 - config/locales/administrate.ca.yml
@@ -293,6 +292,7 @@ files:
 - config/locales/administrate.pt-BR.yml
 - config/locales/administrate.pt.yml
 - config/locales/administrate.ru.yml
+- config/locales/administrate.sq.yml
 - config/locales/administrate.sv.yml
 - config/locales/administrate.uk.yml
 - config/locales/administrate.vi.yml
@@ -300,6 +300,7 @@ files:
 - config/locales/administrate.zh-TW.yml
 - config/routes.rb
 - config/unicorn.rb
+- docs/adding_controllers_without_related_model.md
 - docs/adding_custom_field_types.md
 - docs/authentication.md
 - docs/authorization.md
@@ -312,6 +313,7 @@ files:
 - docs/rails_api.md
 - lib/administrate.rb
 - lib/administrate/base_dashboard.rb
+- lib/administrate/custom_dashboard.rb
 - lib/administrate/engine.rb
 - lib/administrate/field/associative.rb
 - lib/administrate/field/base.rb
@@ -374,7 +376,7 @@ homepage: https://administrate-prototype.herokuapp.com/
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -390,7 +392,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: A Rails engine for creating super-flexible admin dashboards
 test_files: []