semantic-administrate 0.1.1 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2123d47601bf83f82794fe639a592c0be68130e8
-  data.tar.gz: 4f57f44bea647c725247c42fb9f18e21825ff7bc
+  metadata.gz: b0ef87476dd9f2165cc5bb4bc0fc2fbf48f21600
+  data.tar.gz: 882284666a8830d2483fd92dbb9a2e1d31571dd7
 SHA512:
-  metadata.gz: c52c71169aed4dad7ea08c9f1873bdefa22e0b14a9dd6940cac3aa56f42dd29472744c9ec82f23bc7c2d908d44ed7e95b262900a331384c2b38200d12c144c64
-  data.tar.gz: be36d780bdd94b43d132468d6498f68e40dcff40e3d8642744c8f77886083559fa0f05f570cbe4a19a0b008b3796e3e7e880f6bedba1d8d0040036f28ffe7028
+  metadata.gz: f2007d097c22eaf8609641345735db8bac5b2ca475efe7fbe5aa862e7410d3ccf0f9c9ad5babf12e1eadf0397ad9868f98a219ef1ba84e7778316e5f049a8868
+  data.tar.gz: 3c915b462dac24879e61935eedc02bd0672f3d1db3d54c0e04b42b6a83a006d7541a3f5319ed26cc34f6f50d436abbd4cfb87fc6f230665f6999e639e0874a48

data/app/assets/javascripts/administrate/components/date_time_picker.js

@@ -1,5 +1,9 @@
 $(function () {
-  $(".datetimepicker").datetimepicker({
+  $('[data-type="time"]').datetimepicker({
+    debug: false,
+    format: "HH:mm:ss",
+  });
+  $('[data-type="datetime"]').datetimepicker({
     debug: false,
     format: "YYYY-MM-DD HH:mm:ss",
   });

data/app/controllers/administrate/application_controller.rb

@@ -7,7 +7,7 @@ module Administrate
       resources = Administrate::Search.new(scoped_resource,
                                            dashboard_class,
                                            search_term).run
-      resources = resources.includes(*resource_includes) if resource_includes.any?
+      resources = apply_resource_includes(resources)
       resources = order.apply(resources)
       resources = resources.page(params[:page]).per(records_per_page)
       page = Administrate::Page::Collection.new(dashboard, order: order)
@@ -16,7 +16,7 @@ module Administrate
         resources: resources,
         search_term: search_term,
         page: page,
-        show_search_bar: show_search_bar?
+        show_search_bar: show_search_bar?,
       }
     end
 
@@ -70,8 +70,11 @@ module Administrate
     end
 
     def destroy
-      requested_resource.destroy
-      flash[:notice] = translate_with_resource("destroy.success")
+      if requested_resource.destroy
+        flash[:notice] = translate_with_resource("destroy.success")
+      else
+        flash[:error] = requested_resource.errors.full_messages.join("<br/>")
+      end
       redirect_to action: :index
     end
 
@@ -98,15 +101,18 @@ module Administrate
     end
 
     def order
-      @_order ||= Administrate::Order.new(params[:order], params[:direction])
+      @order ||= Administrate::Order.new(
+        params.fetch(resource_name, {}).fetch(:order, nil),
+        params.fetch(resource_name, {}).fetch(:direction, nil),
+      )
     end
 
     def dashboard
-      @_dashboard ||= dashboard_class.new
+      @dashboard ||= dashboard_class.new
     end
 
     def requested_resource
-      @_requested_resource ||= find_resource(params[:id]).tap do |resource|
+      @requested_resource ||= find_resource(params[:id]).tap do |resource|
         authorize_resource(resource)
       end
     end
@@ -119,8 +125,10 @@ module Administrate
       resource_class.default_scoped
     end
 
-    def resource_includes
-      dashboard.association_includes
+    def apply_resource_includes(relation)
+      resource_includes = dashboard.association_includes
+      return relation if resource_includes.empty?
+      relation.includes(*resource_includes)
     end
 
     def resource_params
@@ -147,7 +155,7 @@ module Administrate
     helper_method :resource_name
 
     def resource_resolver
-      @_resource_resolver ||=
+      @resource_resolver ||=
         Administrate::ResourceResolver.new(controller_path)
     end
 
@@ -160,11 +168,11 @@ module Administrate
 
     def show_search_bar?
       dashboard.attribute_types_for(
-        dashboard.collection_attributes
+        dashboard.all_attributes,
       ).any? { |_name, attribute| attribute.searchable? }
     end
 
-    def show_action?(action, resource)
+    def show_action?(_action, _resource)
       true
     end
     helper_method :show_action?

data/app/helpers/administrate/application_helper.rb

@@ -40,12 +40,18 @@ module Administrate
       ActiveModel::Naming.route_key(class_from_resource(resource_name))
     end
 
-    def sanitized_order_params
-      params.permit(:search, :id, :order, :page, :per_page, :direction, :orders)
+    def sanitized_order_params(page, current_field_name)
+      collection_names = page.association_includes + [current_field_name]
+      association_params = collection_names.map do |assoc_name|
+        { assoc_name => %i[order direction page per_page] }
+      end
+      params.permit(:search, :id, :page, :per_page, association_params)
     end
 
     def clear_search_params
-      params.except(:search, :page).permit(:order, :direction, :per_page)
+      params.except(:search, :page).permit(
+        :per_page, resource_name => %i[order direction]
+      )
     end
   end
 end

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

@@ -28,14 +28,13 @@ to display a collection of resources in an HTML table.
         scope="col"
         role="columnheader"
         aria-sort="<%= sort_order(collection_presenter.ordered_html_class(attr_name)) %>">
-        <%= link_to(sanitized_order_params.merge(
-          collection_presenter.order_params_for(attr_name)
+        <%= link_to(sanitized_order_params(page, collection_field_name).merge(
+          collection_presenter.order_params_for(attr_name, key: collection_field_name)
         )) do %>
         <%= t(
           "helpers.label.#{collection_presenter.resource_name}.#{attr_name}",
           default: attr_name.to_s,
         ).titleize %>
-
             <% if collection_presenter.ordered_by?(attr_name) %>
               <span class="cell-label__sort-indicator cell-label__sort-indicator--<%= collection_presenter.ordered_html_class(attr_name) %>">
                 <svg aria-hidden="true">

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

@@ -14,7 +14,7 @@ This partial renders flash messages on every page.
 <% if flash.any? %>
   <div class="flashes">
     <% flash.each do |key, value| -%>
-      <div class="flash flash-<%= key %>"><%= value %></div>
+      <div class="flash flash-<%= key %>"><%= value.html_safe %></div>
     <% end -%>
   </div>
 <% end %>

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

@@ -58,6 +58,8 @@ It renders the `_table` partial to display details about the resources.
   <%= render(
     "collection",
     collection_presenter: page,
+    collection_field_name: resource_name,
+    page: page,
     resources: resources,
     table_title: "page-title"
   ) %>

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

@@ -43,7 +43,7 @@ as well as a link to its edit page.
       </dt>
 
       <dd class="attribute-data attribute-data--<%=attribute.html_class%>"
-          ><%= render_field attribute %></dd>
+          ><%= render_field attribute, page: page %></dd>
     <% end %>
   </dl>
 </section>

data/app/views/fields/belongs_to/_index.html.erb

@@ -16,7 +16,7 @@ By default, the relationship is rendered as a link to the associated object.
 %>
 
 <% if field.data %>
-  <% if valid_action?(:show, field.attribute) %>
+  <% if valid_action?(:show, field.associated_class) %>
     <%= link_to(
       field.display_associated_resource,
       [namespace, field.data],

data/app/views/fields/belongs_to/_show.html.erb

@@ -16,7 +16,7 @@ By default, the relationship is rendered as a link to the associated object.
 %>
 
 <% if field.data %>
-  <% if valid_action?(:show, field.attribute) %>
+  <% if valid_action?(:show, field.associated_class) %>
     <%= link_to(
       field.display_associated_resource,
       [namespace, field.data],

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

@@ -20,5 +20,5 @@ By default, the input is a text field that is augmented with [DateTimePicker].
   <%= f.label field.attribute %>
 </div>
 <div class="field-unit__field">
-  <%= f.text_field field.attribute, class: "datetimepicker" %>
+  <%= f.text_field field.attribute, data: { type: 'datetime' }  %>
 </div>

data/app/views/fields/date_time/_index.html.erb

@@ -17,5 +17,5 @@ as a localized date & time string.
 %>
 
 <% if field.data %>
-  <%= field.date %>
+  <%= field.datetime %>
 <% end %>

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

@@ -1,7 +1,7 @@
 <%#
 # HasMany Form Partial
 
-This partial renders an input element for belongs_to relationships.
+This partial renders an input element for has_many relationships.
 By default, the input is a collection select box
 that displays all possible records to associate with.
 The collection select box supports multiple inputs,
@@ -20,7 +20,7 @@ and is augmented with [Selectize].
 %>
 
 <div class="field-unit__label">
-  <%= f.label field.attribute_key, field.attribute %>
+  <%= f.label field.attribute, for: "#{f.object_name}_#{field.attribute_key}" %>
 </div>
 <div class="field-unit__field">
   <%= f.select(field.attribute_key, nil, {}, multiple: true) do %>

data/app/views/fields/has_many/_show.html.erb

@@ -19,15 +19,18 @@ from the associated resource class's dashboard.
 %>
 
 <% if field.resources.any? %>
+  <% order = field.order_from_params(params.fetch(field.name, {})) %>
+  <% page_number = params.fetch(field.name, {}).fetch(:page, nil) %>
   <%= render(
     "collection",
-    collection_presenter: field.associated_collection,
-    resources: field.resources(params[field.name]),
-    table_title: field.name
+    collection_presenter: field.associated_collection(order),
+    collection_field_name: field.name,
+    page: page,
+    resources: field.resources(page_number, order),
+    table_title: field.name,
   ) %>
-
   <% if field.more_than_limit? %>
-    <%= paginate field.resources(params[field.name]), param_name: "#{field.name}" %>
+    <%= paginate field.resources(page_number), param_name: "#{field.name}[page]" %>
   <% end %>
 
 <% else %>

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

@@ -18,7 +18,7 @@ The form will be rendered as nested_from to parent relationship.
 
 <%= f.fields_for field.attribute, field.data || field.nested_form.resource.class.new do |has_one_f| %>
   <fieldset class="field-unit--nested">
-    <legend><%= field.nested_form.resource_name.titleize %></legend>
+    <legend><%= t "helpers.label.#{f.object_name}.#{field.nested_form.resource_name}", default: field.nested_form.resource_name.titleize %></legend>
     <% field.nested_form.attributes.each do |attribute| -%>
       <div class="field-unit field-unit--<%= attribute.html_class %>">
         <%= render_field attribute, f: has_one_f %>

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

@@ -0,0 +1,23 @@
+<%#
+# Password Form Partial
+
+This partial renders an input element for a password attribute.
+By default, the input is a password field.
+
+## Local variables:
+
+- `f`:
+  A Rails form generator, used to help create the appropriate input fields.
+- `field`:
+  An instance of [Administrate::Field::Password][1].
+  A wrapper around the Password.
+
+[1]: http://www.rubydoc.info/gems/administrate/Administrate/Field/Password
+%>
+
+<div class="field-unit__label">
+  <%= f.label field.attribute %>
+</div>
+<div class="field-unit__field">
+  <%= f.password_field field.attribute, value: field.data %>
+</div>

data/app/views/fields/password/_index.html.erb

@@ -0,0 +1,18 @@
+<%#
+# Password Index Partial
+
+This partial renders a password attribute
+to be displayed on a resource's index page.
+
+By default, the attribute is rendered as a truncated string.
+
+## Local variables:
+
+- `field`:
+  An instance of [Administrate::Field::Password][1].
+  A wrapper around the Password.
+
+[1]: http://www.rubydoc.info/gems/administrate/Administrate/Field/Password
+%>
+
+<%= field.truncate %>

data/app/views/fields/password/_show.html.erb

@@ -0,0 +1,18 @@
+<%#
+# Password Show Partial
+
+This partial renders a password attribute,
+to be displayed on a resource's show page.
+
+By default, the attribute is rendered as an truncate string.
+
+## Local variables:
+
+- `field`:
+  An instance of [Administrate::Field::Password][1].
+  A wrapper around the Password.
+
+[1]: http://www.rubydoc.info/gems/administrate/Administrate/Field/Password
+%>
+
+<%= field.truncate %>

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

@@ -3,9 +3,6 @@
 
 This partial renders an input element for polymorphic relationships.
 
-At the moment, polymorphic form fields are not supported,
-so this partial renders a message to that effect.
-
 ## Local variables:
 
 - `f`:

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

@@ -0,0 +1,22 @@
+<%#
+# Time Form Partial
+
+This partial renders an input element for time attributes.
+By default, the input is a select field for the time attributes.
+
+## Local variables:
+
+- `f`:
+  A Rails form generator, used to help create the appropriate input fields.
+- `field`:
+  An instance of [Administrate::Field::Time][1].
+  A wrapper around the tmie attributes pulled from the model.
+
+%>
+
+<div class="field-unit__label">
+  <%= f.label field.attribute %>
+</div>
+<div class="field-unit__field">
+  <%= f.text_field field.attribute, data: { type: 'time' } %>
+</div>

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

@@ -0,0 +1,17 @@
+<%#
+# Time Index Partial
+
+This partial renders an time attribute
+to be displayed on a resource's index page.
+
+By default, the attribute is rendered as a text tag.
+
+## Local variables:
+
+- `field`:
+  An instance of [Administrate::Field::Time][1].
+  A wrapper around the time attributes pulled from the model.
+
+%>
+
+<%= field.data.strftime("%I:%M%p").to_s %>

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

@@ -0,0 +1,17 @@
+<%#
+# Time Show Partial
+
+This partial renders an time attribute,
+to be displayed on a resource's show page.
+
+By default, the attribute is rendered as a text tag.
+
+## Local variables:
+
+- `field`:
+  An instance of [Administrate::Field::Time][1].
+  A wrapper around the time attributes pulled from the model.
+
+%>
+
+<%= field.data.strftime("%I:%M%p").to_s %>

data/config/locales/administrate.al.yml

@@ -0,0 +1,28 @@
+---
+al:
+  administrate:
+    actions:
+      confirm: A jeni te sigurtë?
+      destroy: Fshij
+      edit: Ndrysho
+      edit_resource: Ndrysho %{name}
+      show_resource: Trego %{name}
+      new_resource: Të re %{name}
+      back: Prapa
+    controller:
+      create:
+        success: "%{resource} është krijuar me sukses."
+      destroy:
+        success: "%{resource} është fshirë me sukses."
+      update:
+        success: "%{resource} është azhurnuar me sukses."
+    fields:
+      has_many:
+        more: Duke treguar %{count} nga %{total_count}
+        none: Asnjë
+    form:
+      error: gabim
+      errors: "%{pluralized_errors} nuk e lejoj %{resource_name} të ruhet:"
+    search:
+      clear: Pastro kërkimin
+      label: Kërko %{resource}

data/config/locales/administrate.id.yml

@@ -0,0 +1,28 @@
+---
+id:
+  administrate:
+    actions:
+      confirm: Anda yakin?
+      destroy: Hapus
+      edit: Perbarui
+      edit_resource: Perbarui %{name}
+      show_resource: Tampilkan %{name}
+      new_resource: "%{name} baru"
+      back: Kembali
+    controller:
+      create:
+        success: "%{resource} telah berhasil dibuat."
+      destroy:
+        success: "%{resource} telah berhasil dihapus."
+      update:
+        success: "%{resource} telah berhasil diperbarui."
+    fields:
+      has_many:
+        more: Menampilkan %{count} dari %{total_count}
+        none: Kosong
+    form:
+      error: error
+      errors: "%{pluralized_errors} membuat %{resource_name} tidak bisa tersimpan:"
+    search:
+      clear: Kosongkan pencarian
+      label: Cari %{resource}

data/config/locales/administrate.ja.yml

@@ -21,8 +21,8 @@ ja:
         more: "%{total_count} 件中 %{count} 件表示"
         none: データがありません
     form:
-      error: error
-      errors: "%{pluralized_errors} prohibited this %{resource_name} from being saved:"
+      error: エラー
+      errors: "%{pluralized_errors}のため%{resource_name}を保存できません。"
     search:
       clear: 検索をクリアする
       label: サーチ %{resource}

data/config/locales/administrate.ru.yml

@@ -21,8 +21,8 @@ ru:
         more: "%{count} из %{total_count}"
         none: Нет
     form:
-      error: error
-      errors: "%{pluralized_errors} prohibited this %{resource_name} from being saved:"
+      error: Ошибка
+      errors: "При сохранении %{resource_name} произошли ошибки:"
     search:
       clear: Очистить поиск
       label: Поиск %{resource}

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

@@ -21,8 +21,8 @@ zh-TW:
         more: 顯示 %{total_count} 筆中的 %{count} 筆資料
         none: 無
     form:
-      error: error
-      errors: "%{pluralized_errors} prohibited this %{resource_name} from being saved:"
+      error: 錯誤
+      errors: "%{pluralized_errors} 導致此 %{resource_name} 不能被儲存："
     search:
-      clear: 清除搜索
-      label: 搜索 %{resource}
+      clear: 清除搜尋
+      label: 搜尋 %{resource}

data/docs/customizing_dashboards.md

@@ -10,7 +10,7 @@ require "administrate/dashboard/base"
 
 class CustomerDashboard < Administrate::Dashboard::Base
   ATTRIBUTE_TYPES = {
-    id: Field::Integer,
+    id: Field::Number,
     name: Field::String,
     email: Field::String,
     created_at: Field::DateTime,
@@ -62,6 +62,7 @@ specify, including:
 - `Field::Select`
 - `Field::String`
 - `Field::Text`
+- `Field::Password`
 
 ## Customizing Fields
 
@@ -80,6 +81,30 @@ than one column. e.g.: `"name, email DESC"`.
 `:foreign_key` - Specifies the name of the foreign key directly.
 Defaults to `:#{attribute}_id`.
 
+`:scope` - Specifies a custom scope inside a callable. Useful for preloading.
+Example: `.with_options(scope: -> { MyModel.includes(:rel).limit(5) })`
+
+`:class_name` - Specifies the name of the associated class.
+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` is `true`
+
+For example:
+
+```ruby
+  country: Field::BelongsTo.with_options(
+    searchable: true,
+    seachable_field: 'name',
+  )
+```
+
+with this, you will be able to search through the column `name` from the
+association `belongs_to :country`, from your model.
+
 **Field::HasMany**
 
 `:limit` - Set the number of resources to display in the show view. Default is
@@ -93,8 +118,38 @@ Defaults to `:#{attribute}_id`.
 
 `:foreign_key` - Specifies the name of the foreign key directly. Defaults to `:#{attribute}_id`
 
+`:class_name` - Specifies the name of the associated class.
+Defaults to `:#{attribute}.to_s.singularize.camelcase`.
+
+**Field::HasOne**
+
+`:class_name` - Specifies the name of the associated class.
+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` is `true`
+
+For example:
+
+```ruby
+  cities: Field::HasMany.with_options(
+    searchable: true,
+    searchable_field: 'name',
+  )
+```
+
+with this, you will be able to search through the column `name` from the
+association `has_many :cities`, from your model.
+
 **Field::Number**
 
+`:searchable` - Specify if the attribute should be considered when searching.
+Note that currently number fields are searched like text, which may yield
+more results than expected. Default is `false`.
+
 `:decimals` - Set the number of decimals to display. Defaults to `0`.
 
 `:prefix` - Prefixes the number with a string. Defaults to `""`.
@@ -137,7 +192,7 @@ in.
 
 **Field::Select**
 
-`:collection` - Specify the array or range to select from.  Defaults to `[]`.
+`:collection` - Specify the array or range to select from. Defaults to `[]`.
 
 `:searchable` - Specify if the attribute should be considered when searching.
 Default is `true`.
@@ -158,6 +213,17 @@ Default is `false`.
 `:truncate` - Set the number of characters to display in the index view.
 Defaults to `50`.
 
+**Field::Password**
+
+`:searchable` - Specify if the attribute should be considered when searching.
+Default is `false`.
+
+`:truncate` - Set the number of characters to display in the views.
+Defaults to `50`.
+
+`:character` - Set the replace character.
+Defaults to `•`.
+
 ### Defining Labels
 
 To change the user-facing label for an attribute,
@@ -180,11 +246,11 @@ Add this method to the dashboard for Users.
 Use whatever attribute or method you like.
 Example for *user*:
 
-````ruby
+```ruby
 def display_resource(user)
   user.name
 end
-````
+```
 
 [define your own]: /adding_custom_field_types
 
@@ -196,7 +262,7 @@ en:
     models:
       customer:
         one: Happy Customer
-        others: Happy Customers
+        other: Happy Customers
 ```
 
 ## Customizing Actions

data/docs/customizing_page_views.md

@@ -67,7 +67,7 @@ and will leave the show pages for other resources unchanged.
 ## Customizing layouts
 
 Many developers need to customize the layouts of their admin dashboard.
-It's so easy that pass in the "layout" key word to the view generators.
+It's as easy as passing in the "layout" keyword to the view generators.
 
 ```bash
 rails generate administrate:views:layout
@@ -75,4 +75,8 @@ rails generate administrate:views:layout
  # -> app/views/admin/application/_navigation.html.erb
  # -> app/views/admin/application/_javascript.html.erb
  # -> app/views/admin/application/_flashes.html.erb
+
+ rails generate administrate:views:navigation
+ # It only generates the sidebar partial
+ # -> app/views/admin/application/_navigation.html.erb
 ```

data/lib/administrate/base_dashboard.rb

@@ -9,6 +9,8 @@ require "administrate/field/polymorphic"
 require "administrate/field/select"
 require "administrate/field/string"
 require "administrate/field/text"
+require "administrate/field/time"
+require "administrate/field/password"
 
 module Administrate
   class BaseDashboard
@@ -30,6 +32,10 @@ module Administrate
       end
     end
 
+    def all_attributes
+      attribute_types.keys
+    end
+
     def form_attributes
       self.class::FORM_ATTRIBUTES
     end
@@ -59,7 +65,7 @@ module Administrate
         field = self.class::ATTRIBUTE_TYPES[key]
 
         next key if association_classes.include?(field)
-        key if association_classes.include?(field.try :deferred_class)
+        key if association_classes.include?(field.try(:deferred_class))
       end.compact
     end
 

data/lib/administrate/field/associative.rb

@@ -7,16 +7,16 @@ module Administrate
         associated_dashboard.display_resource(data)
       end
 
+      def associated_class
+        associated_class_name.constantize
+      end
+
       protected
 
       def associated_dashboard
         "#{associated_class_name}Dashboard".constantize.new
       end
 
-      def associated_class
-        associated_class_name.constantize
-      end
-
       def associated_class_name
         options.fetch(:class_name, attribute.to_s.singularize.camelcase)
       end

data/lib/administrate/field/belongs_to.rb

@@ -24,8 +24,10 @@ module Administrate
       private
 
       def candidate_resources
+        scope = options[:scope] ? options[:scope].call : associated_class.all
+
         order = options.delete(:order)
-        order ? associated_class.order(order) : associated_class.all
+        order ? scope.reorder(order) : scope
       end
 
       def display_candidate_resource(resource)

data/lib/administrate/field/date_time.rb

@@ -25,7 +25,7 @@ module Administrate
       end
 
       def timezone
-        options.fetch(:timezone, "UTC")
+        options.fetch(:timezone, ::Time.zone.name || "UTC")
       end
     end
   end

data/lib/administrate/field/deferred.rb

@@ -25,6 +25,10 @@ module Administrate
         options.fetch(:searchable, deferred_class.searchable?)
       end
 
+      def searchable_field
+        options.fetch(:searchable_field)
+      end
+
       def permitted_attribute(attr, _options = nil)
         options.fetch(:foreign_key,
           deferred_class.permitted_attribute(attr, options))

data/lib/administrate/field/has_many.rb

@@ -11,8 +11,8 @@ module Administrate
         { "#{attr.to_s.singularize}_ids".to_sym => [] }
       end
 
-      def associated_collection
-        Administrate::Page::Collection.new(associated_dashboard)
+      def associated_collection(order = self.order)
+        Administrate::Page::Collection.new(associated_dashboard, order: order)
       end
 
       def attribute_key
@@ -39,7 +39,7 @@ module Administrate
         self.class.permitted_attribute(attribute)
       end
 
-      def resources(page = 1)
+      def resources(page = 1, order = self.order)
         resources = order.apply(data).page(page).per(limit)
         includes.any? ? resources.includes(*includes) : resources
       end
@@ -49,7 +49,18 @@ module Administrate
       end
 
       def data
-        @data ||= associated_class.none 
+        @data ||= associated_class.none
+      end
+
+      def order_from_params(params)
+        Administrate::Order.new(
+          params.fetch(:order, sort_by),
+          params.fetch(:direction, direction),
+        )
+      end
+
+      def order
+        @order ||= Administrate::Order.new(sort_by, direction)
       end
 
       private
@@ -71,10 +82,6 @@ module Administrate
         associated_dashboard.display_resource(resource)
       end
 
-      def order
-        @_order ||= Administrate::Order.new(sort_by, direction)
-      end
-
       def sort_by
         options[:sort_by]
       end

data/lib/administrate/field/password.rb

@@ -0,0 +1,25 @@
+require_relative "base"
+
+module Administrate
+  module Field
+    class Password < Field::Base
+      def self.searchable?
+        false
+      end
+
+      def truncate
+        data.to_s.gsub(/./, character)[0...truncation_length]
+      end
+
+      private
+
+      def truncation_length
+        options.fetch(:truncate, 50)
+      end
+
+      def character
+        options.fetch(:character, "•")
+      end
+    end
+  end
+end

data/lib/administrate/field/polymorphic.rb

@@ -30,7 +30,7 @@ module Administrate
       end
 
       def classes
-        options.fetch(:classes) || []
+        options.fetch(:classes, [])
       end
 
       private

data/lib/administrate/field/time.rb

@@ -0,0 +1,8 @@
+require_relative "base"
+
+module Administrate
+  module Field
+    class Time < Base
+    end
+  end
+end

data/lib/administrate/namespace.rb

@@ -12,7 +12,7 @@ module Administrate
 
     def routes
       @routes ||= all_routes.select do |controller, _action|
-        controller.starts_with?(namespace.to_s)
+        controller.starts_with?("#{namespace}/")
       end.map do |controller, action|
         [controller.gsub(/^#{namespace}\//, ""), action]
       end

data/lib/administrate/order.rb

@@ -9,7 +9,9 @@ module Administrate
       return order_by_association(relation) unless
         reflect_association(relation).nil?
 
-      return relation.reorder("#{attribute} #{direction}") if
+      order = "#{relation.table_name}.#{attribute} #{direction}"
+
+      return relation.reorder(order) if
         relation.columns_hash.keys.include?(attribute.to_s)
 
       relation

data/lib/administrate/page/base.rb

@@ -15,6 +15,10 @@ module Administrate
         @resource_path ||= resource_name.gsub("/", "_")
       end
 
+      def association_includes
+        dashboard.try(:association_includes) || []
+      end
+
       protected
 
       def attribute_field(dashboard, resource, attribute_name, page)

data/lib/administrate/page/collection.rb

@@ -21,7 +21,11 @@ module Administrate
         ordered_by?(attr) && order.direction
       end
 
-      delegate :ordered_by?, :order_params_for, to: :order
+      delegate :ordered_by?, to: :order
+
+      def order_params_for(attr, key: resource_name)
+        { key => order.order_params_for(attr) }
+      end
 
       private
 

data/lib/administrate/search.rb

@@ -13,7 +13,7 @@ module Administrate
       if @term.blank?
         @scoped_resource.all
       else
-        @scoped_resource.where(query, *search_terms)
+        @scoped_resource.joins(tables_to_join).where(query, *search_terms)
       end
     end
 
@@ -21,10 +21,10 @@ module Administrate
 
     def query
       search_attributes.map do |attr|
-        table_name = ActiveRecord::Base.connection.
-          quote_table_name(@scoped_resource.table_name)
-        attr_name = ActiveRecord::Base.connection.quote_column_name(attr)
-        "LOWER(TEXT(#{table_name}.#{attr_name})) LIKE ?"
+        table_name = query_table_name(attr)
+        attr_name = column_to_query(attr)
+
+        "LOWER(CAST(#{table_name}.#{attr_name} AS CHAR(256))) LIKE ?"
       end.join(" OR ")
     end
 
@@ -42,6 +42,40 @@ module Administrate
       @dashboard_class::ATTRIBUTE_TYPES
     end
 
+    def query_table_name(attr)
+      if association_search?(attr)
+        ActiveRecord::Base.connection.quote_table_name(attr.to_s.pluralize)
+      else
+        ActiveRecord::Base.connection.
+          quote_table_name(@scoped_resource.table_name)
+      end
+    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
+    end
+
+    def tables_to_join
+      attribute_types.keys.select do |attribute|
+        attribute_types[attribute].searchable? && association_search?(attribute)
+      end
+    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)
+    end
+
     attr_reader :resolver, :term
   end
 end

data/lib/administrate/version.rb

@@ -1,3 +1,3 @@
 module Administrate
-  VERSION = "0.1.1".freeze
+  VERSION = "0.10.0".freeze
 end

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

@@ -10,7 +10,7 @@ module Administrate
         enum: "Field::String",
         float: "Field::Number",
         integer: "Field::Number",
-        time: "Field::DateTime",
+        time: "Field::Time",
         text: "Field::Text",
         string: "Field::String",
       }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: semantic-administrate
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.10.0
 platform: ruby
 authors:
 - Nick Charlton
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-27 00:00:00.000000000 Z
+date: 2018-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -20,7 +20,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -30,7 +30,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: actionview
   requirement: !ruby/object:Gem::Requirement
@@ -40,7 +40,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -60,7 +60,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -70,7 +70,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: autoprefixer-rails
   requirement: !ruby/object:Gem::Requirement
@@ -262,6 +262,9 @@ files:
 - app/views/fields/number/_form.html.erb
 - app/views/fields/number/_index.html.erb
 - app/views/fields/number/_show.html.erb
+- app/views/fields/password/_form.html.erb
+- app/views/fields/password/_index.html.erb
+- app/views/fields/password/_show.html.erb
 - app/views/fields/polymorphic/_form.html.erb
 - app/views/fields/polymorphic/_index.html.erb
 - app/views/fields/polymorphic/_show.html.erb
@@ -274,8 +277,12 @@ files:
 - app/views/fields/text/_form.html.erb
 - app/views/fields/text/_index.html.erb
 - app/views/fields/text/_show.html.erb
+- app/views/fields/time/_form.html.erb
+- app/views/fields/time/_index.html.erb
+- app/views/fields/time/_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
@@ -284,6 +291,7 @@ files:
 - config/locales/administrate.en.yml
 - config/locales/administrate.es.yml
 - config/locales/administrate.fr.yml
+- config/locales/administrate.id.yml
 - config/locales/administrate.it.yml
 - config/locales/administrate.ja.yml
 - config/locales/administrate.ko.yml
@@ -320,10 +328,12 @@ files:
 - lib/administrate/field/has_many.rb
 - lib/administrate/field/has_one.rb
 - lib/administrate/field/number.rb
+- lib/administrate/field/password.rb
 - lib/administrate/field/polymorphic.rb
 - lib/administrate/field/select.rb
 - lib/administrate/field/string.rb
 - lib/administrate/field/text.rb
+- lib/administrate/field/time.rb
 - lib/administrate/generator_helpers.rb
 - lib/administrate/namespace.rb
 - lib/administrate/namespace/resource.rb