semantic-administrate 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9f5acea640f6f28faed41c71a9c0f08cf6dee72
-  data.tar.gz: 94c28f34c197ac05d1482b17ddd7b3bee39a5fb6
+  metadata.gz: 2123d47601bf83f82794fe639a592c0be68130e8
+  data.tar.gz: 4f57f44bea647c725247c42fb9f18e21825ff7bc
 SHA512:
-  metadata.gz: 9ececb0e5c2f750c26750c2ea01feac0519dfdefbfc24988480e5e821e92d5818cbdf7e1d527a63499eed709c422d58bddeca5bc072c9039d11c527f57230a2d
-  data.tar.gz: c624e8334a33ac55996d2a9ef1891c95734a49680b9f69acd590a2612ab128713a66b1c629715a15a8fed027c15355560b094b550c02a5563cba900ea798e364
+  metadata.gz: c52c71169aed4dad7ea08c9f1873bdefa22e0b14a9dd6940cac3aa56f42dd29472744c9ec82f23bc7c2d908d44ed7e95b262900a331384c2b38200d12c144c64
+  data.tar.gz: be36d780bdd94b43d132468d6498f68e40dcff40e3d8642744c8f77886083559fa0f05f570cbe4a19a0b008b3796e3e7e880f6bedba1d8d0040036f28ffe7028

data/app/controllers/administrate/application_controller.rb

@@ -27,8 +27,10 @@ module Administrate
     end
 
     def new
+      resource = resource_class.new
+      authorize_resource(resource)
       render locals: {
-        page: Administrate::Page::Form.new(dashboard, resource_class.new),
+        page: Administrate::Page::Form.new(dashboard, resource),
       }
     end
 
@@ -40,6 +42,7 @@ module Administrate
 
     def create
       resource = resource_class.new(resource_params)
+      authorize_resource(resource)
 
       if resource.save
         redirect_to(
@@ -103,7 +106,9 @@ module Administrate
     end
 
     def requested_resource
-      @_requested_resource ||= find_resource(params[:id])
+      @_requested_resource ||= find_resource(params[:id]).tap do |resource|
+        authorize_resource(resource)
+      end
     end
 
     def find_resource(param)
@@ -158,5 +163,19 @@ module Administrate
         dashboard.collection_attributes
       ).any? { |_name, attribute| attribute.searchable? }
     end
+
+    def show_action?(action, resource)
+      true
+    end
+    helper_method :show_action?
+
+    def new_resource
+      resource_class.new
+    end
+    helper_method :new_resource
+
+    def authorize_resource(resource)
+      resource
+    end
   end
 end

data/app/controllers/concerns/administrate/punditize.rb

@@ -0,0 +1,36 @@
+if Object.const_defined?("Pundit")
+  module Administrate
+    module Punditize
+      extend ActiveSupport::Concern
+      include Pundit
+
+      included do
+        def scoped_resource
+          policy_scope_admin super
+        end
+
+        def authorize_resource(resource)
+          authorize resource
+        end
+
+        def show_action?(action, resource)
+          Pundit.policy!(pundit_user, resource).send("#{action}?".to_sym)
+        end
+      end
+
+      private
+
+      # Like the policy_scope method in stock Pundit, but allows the 'resolve'
+      # to be overridden by 'resolve_admin' for a different index scope in Admin
+      # controllers.
+      def policy_scope_admin(scope)
+        ps = Pundit::PolicyFinder.new(scope).scope!.new(pundit_user, scope)
+        if ps.respond_to? :resolve_admin
+          ps.resolve_admin
+        else
+          ps.resolve
+        end
+      end
+    end
+  end
+end

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

@@ -63,11 +63,13 @@ to display a collection of resources in an HTML table.
           >
         <% collection_presenter.attributes_for(resource).each do |attribute| %>
           <td class="cell-data cell-data--<%= attribute.html_class %>">
-            <a href="<%= polymorphic_path([namespace, resource]) -%>"
-               class="action-show"
-               >
-              <%= render_field attribute %>
-            </a>
+            <% if show_action? :show, resource -%>
+              <a href="<%= polymorphic_path([namespace, resource]) -%>"
+                 class="action-show"
+                 >
+                <%= render_field attribute %>
+              </a>
+            <% end -%>
           </td>
         <% end %>
 
@@ -75,7 +77,8 @@ to display a collection of resources in an HTML table.
           <td><%= link_to(
             t("administrate.actions.edit"),
             [:edit, namespace, resource],
-          ) %></td>
+            class: "action-edit",
+          ) if show_action? :edit, resource%></td>
         <% end %>
 
         <% if valid_action? :destroy, collection_presenter.resource_name %>
@@ -84,7 +87,7 @@ to display a collection of resources in an HTML table.
             [namespace, resource],
             method: :delete,
             data: { confirm: t("administrate.actions.confirm") }
-          ) %></td>
+          ) if show_action? :destroy, resource %></td>
         <% end %>
       </tr>
     <% end %>

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

@@ -18,8 +18,11 @@ and renders all form fields for a resource's editable attributes.
   <% if page.resource.errors.any? %>
     <div id="error_explanation">
       <h2>
-        <%= pluralize(page.resource.errors.count, "error") %>
-        prohibited this <%= page.resource_name %> from being saved:
+        <%= t(
+          "administrate.form.errors",
+          pluralized_errors: pluralize(page.resource.errors.count, t("administrate.form.error")),
+          resource_name: display_resource_name(page.resource_name)
+        ) %>
       </h2>
 
       <ul>

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

@@ -15,7 +15,7 @@ It displays a header, and renders the `_form` partial to do the heavy lifting.
 [1]: http://www.rubydoc.info/gems/administrate/Administrate/Page/Form
 %>
 
-<% content_for(:title) { "#{t("administrate.actions.edit")} #{page.page_title}" } %>
+<% content_for(:title) { t("administrate.actions.edit_resource", name: page.page_title) } %>
 
 <header class="main-content__header" role="banner">
   <h1 class="main-content__page-title">
@@ -24,10 +24,10 @@ It displays a header, and renders the `_form` partial to do the heavy lifting.
 
   <div>
     <%= link_to(
-      "#{t("administrate.actions.show")} #{page.page_title}",
+      t("administrate.actions.show_resource", name: page.page_title),
       [namespace, page.resource],
       class: "button",
-    ) if valid_action? :show %>
+    ) if valid_action?(:show) && show_action?(:show, page.resource) %>
   </div>
 </header>
 

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

@@ -44,10 +44,13 @@ It renders the `_table` partial to display details about the resources.
 
   <div class="main-content__navs">
     <%= link_to(
-      "#{t("administrate.actions.new")} #{page.resource_name.titleize.downcase}",
+      t(
+        "administrate.actions.new_resource",
+        name: page.resource_name.titleize.downcase
+      ),
       [:new, namespace, page.resource_path],
       class: "button",
-    ) if valid_action? :new %>
+    ) if valid_action?(:new) && show_action?(:new, new_resource) %>
   </div>
 </header>
 

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

@@ -15,7 +15,12 @@ to do the heavy lifting.
 [1]: http://www.rubydoc.info/gems/administrate/Administrate/Page/Form
 %>
 
-<% content_for(:title) { "#{t("administrate.actions.new")} #{page.resource_name.titleize}" } %>
+<% content_for(:title) do %>
+  <%= t(
+    "administrate.actions.new_resource",
+    name: display_resource_name(page.resource_name).titleize
+  ) %>
+<% end %>
 
 <header class="main-content__header" role="banner">
   <h1 class="main-content__page-title">

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

@@ -16,7 +16,7 @@ as well as a link to its edit page.
 [1]: http://www.rubydoc.info/gems/administrate/Administrate/Page/Show
 %>
 
-<% content_for(:title) { "#{t("administrate.actions.show")} #{page.page_title}" } %>
+<% content_for(:title) { t("administrate.actions.show_resource", name: page.page_title) } %>
 
 <header class="main-content__header" role="banner">
   <h1 class="main-content__page-title">
@@ -25,10 +25,10 @@ as well as a link to its edit page.
 
   <div>
     <%= link_to(
-      "#{t("administrate.actions.edit")} #{page.page_title}",
+      t("administrate.actions.edit_resource", name: page.page_title),
       [:edit, namespace, page.resource],
       class: "button",
-    ) if valid_action? :edit %>
+    ) if valid_action?(:edit) && show_action?(:edit, page.resource) %>
   </div>
 </header>
 

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

@@ -16,4 +16,4 @@ as a count of how many objects are associated through the relationship.
 [1]: http://www.rubydoc.info/gems/administrate/Administrate/Field/HasMany
 %>
 
-<%= pluralize(field.data.size, field.attribute.to_s.humanize.downcase) %>
+<%= pluralize(field.data.size, field.attribute.to_s.humanize.downcase.singularize) %>

data/config/locales/administrate.ar.yml

@@ -5,8 +5,9 @@ ar:
       confirm: "هل أنت متأكد ؟"
       destroy: "حذف"
       edit: "تعديل"
-      show: "إظهار"
-      new: "جديد"
+      edit_resource: "تعديل %{name}"
+      show_resource: "إظهار %{name}"
+      new_resource: "جديد  %{name}"
       back: "الى الخلف"
     controller:
       create:
@@ -19,8 +20,9 @@ ar:
       has_many:
         more: إظهار %{count} من %{total_count}
         none: "لا يوجد"
-      has_one:
-        not_supported: "غير مدعمه \"HasOne\" هذه العلاقه"
+    form:
+      error: error
+      errors: "%{pluralized_errors} prohibited this %{resource_name} from being saved:"
     search:
       clear: مسح البحث
       label: بحث %{resource}

data/config/locales/administrate.bs.yml

@@ -4,8 +4,9 @@ bs:
       confirm: Jeste li sigurni?
       destroy: Izbrisati
       edit: Izmjena
-      show: Pregled
-      new: Novi
+      edit_resource: Izmjena %{name}
+      show_resource: Pregled %{name}
+      new_resource: Novi %{name}
       back: Nazad
     controller:
       create:
@@ -18,8 +19,9 @@ bs:
       has_many:
         more: Prikazuje %{count} od %{total_count}
         none: Niko
-      has_one:
-        not_supported: Asocijacije HasOne još nije podržana. Žao nam je!
+    form:
+      error: error
+      errors: "%{pluralized_errors} prohibited this %{resource_name} from being saved:"
     search:
       clear: Izbriši pretraživanje
       label: Pretraga %{resource}

data/config/locales/administrate.ca.yml

@@ -5,8 +5,9 @@ ca:
       confirm: Estàs segur?
       destroy: Destruir
       edit: Editar
-      show: Mostrar
-      new: Nou
+      edit_resource: Edita %{name}
+      show_resource: Mostra %{name}
+      new_resource: Nou %{name}
       back: Tornar
     controller:
       create:
@@ -19,8 +20,9 @@ ca:
       has_many:
         more: Mostrant %{count} de %{total_count}
         none: Cap
-      has_one:
-        not_supported: Els formularis amb relacions "HasOne" no estàn suportats.
+    form:
+      error: error
+      errors: "%{pluralized_errors} han impedit que %{resource_name} es guardés amb èxit:"
     search:
       clear: Esborrar la cerca
       label: Cerca %{resource}

data/config/locales/administrate.da.yml

@@ -5,8 +5,9 @@ da:
       confirm: Er du sikker?
       destroy: Slet
       edit: Rediger
-      show: Vis
-      new: Ny
+      edit_resource: Rediger %{name}
+      show_resource: Vis %{name}
+      new_resource: Ny %{name}
       back: Tilbage
     controller:
       create:
@@ -19,8 +20,9 @@ da:
       has_many:
         more: "Viser %{count} af %{total_count}"
         none: Ingen
-      has_one:
-        not_supported: "Formularer med has_one associationer er ikke understøttede."
+    form:
+      error: error
+      errors: "%{pluralized_errors} prohibited this %{resource_name} from being saved:"
     search:
       clear: Ryd søgning
       label: Søg %{resource}

data/config/locales/administrate.de.yml

@@ -5,8 +5,9 @@ de:
       confirm: Sind Sie sicher?
       destroy: Löschen
       edit: Editieren
-      show: Anzeigen
-      new: Neu
+      edit_resource: "%{name} editieren"
+      show_resource: "%{name} anzeigen"
+      new_resource: "%{name} erstellen"
       back: Zurück
     controller:
       create:
@@ -19,8 +20,9 @@ de:
       has_many:
         more: "%{count} von %{total_count}"
         none: Keine
-      has_one:
-        not_supported: HasOne Beziehungen werden nicht unterstützt.
+    form:
+      error: error
+      errors: "%{pluralized_errors} haben das Speichern dieses %{resource_name} verhindert:"
     search:
-      clear: Saubere Suche
-      label: Suche %{resource}
+      clear: Suche zurücksetzen
+      label: "%{resource} durchsuchen"

data/config/locales/administrate.en.yml

@@ -5,8 +5,9 @@ en:
       confirm: Are you sure?
       destroy: Destroy
       edit: Edit
-      show: Show
-      new: New
+      edit_resource: Edit %{name}
+      show_resource: Show %{name}
+      new_resource: New %{name}
       back: Back
     controller:
       create:
@@ -19,8 +20,9 @@ en:
       has_many:
         more: Showing %{count} of %{total_count}
         none: None
-      has_one:
-        not_supported: HasOne relationship forms are not supported.
+    form:
+      error: error
+      errors: "%{pluralized_errors} prohibited this %{resource_name} from being saved:"
     search:
       clear: Clear search
       label: Search %{resource}

data/config/locales/administrate.es.yml

@@ -5,8 +5,9 @@ es:
       confirm: ¿Estás seguro?
       destroy: Destruir
       edit: Editar
-      show: Mostrar
-      new: Nuevo
+      edit_resource: Editar %{name}
+      show_resource: Mostrar %{name}
+      new_resource: Nuevo %{name}
       back: Volver
     controller:
       create:
@@ -19,8 +20,9 @@ es:
       has_many:
         more: Mostrando %{count} de %{total_count}
         none: Ninguno
-      has_one:
-        not_supported: Los formularios con relaciones HasOne no están soportados.
+    form:
+      error: error
+      errors: "%{pluralized_errors} prohibited this %{resource_name} from being saved:"
     search:
       clear: Borrar búsqueda
       label: Buscar %{resource}

data/config/locales/administrate.fr.yml

@@ -5,8 +5,9 @@ fr:
       confirm: Êtes-vous sûr ?
       destroy: Supprimer
       edit: Modifier
-      show: Détails
-      new: Création
+      edit_resource: Modifier %{name}
+      show_resource: Détails %{name}
+      new_resource: Création %{name}
       back: Précédent
     controller:
       create:
@@ -19,8 +20,9 @@ fr:
       has_many:
         more: "%{count} sur %{total_count}"
         none: Aucun
-      has_one:
-        not_supported: Les relations HasOne dans les formulaires ne sont pas supportées.
+    form:
+      error: erreur
+      errors: "%{pluralized_errors} ont empêchés %{resource_name} d'être sauvergardé :"
     search:
       clear: Effacer la recherche
       label: Chercher %{resource}

data/config/locales/administrate.it.yml

@@ -5,8 +5,9 @@ it:
       confirm: Sei sicuro?
       destroy: Elimina
       edit: Modifica
-      show: Visualizza
-      new: Nuovo
+      edit_resource: Modifica %{name}
+      show_resource: Visualizza %{name}
+      new_resource: Nuovo %{name}
       back: Indietro
     controller:
       create:
@@ -19,8 +20,9 @@ it:
       has_many:
         more: Visualizzo %{count} di %{total_count}
         none: Nessuno
-      has_one:
-        not_supported: Associazioni HasOne non ancora supportate. Spiacenti!
+    form:
+      error: error
+      errors: "%{pluralized_errors} prohibited this %{resource_name} from being saved:"
     search:
       clear: Cancella ricerca
       label: Ricerca %{resource}

data/config/locales/administrate.ja.yml

@@ -5,8 +5,9 @@ ja:
       confirm: 本当によろしいですか？
       destroy: 削除
       edit: 編集
-      show: 参照
-      new: 新規
+      edit_resource: 編集 %{name}
+      show_resource: 参照 %{name}
+      new_resource: 新規 %{name}
       back: 戻る
     controller:
       create:
@@ -19,8 +20,9 @@ ja:
       has_many:
         more: "%{total_count} 件中 %{count} 件表示"
         none: データがありません
-      has_one:
-        not_supported: フォームでは「１：１」の関連をサポートしていません。
+    form:
+      error: error
+      errors: "%{pluralized_errors} prohibited this %{resource_name} from being saved:"
     search:
       clear: 検索をクリアする
       label: サーチ %{resource}

data/config/locales/administrate.ko.yml

@@ -5,8 +5,9 @@ ko:
       confirm: 괜찮습니까?
       destroy: 삭제
       edit: 편집
-      show: 보여주기
-      new: 새로운
+      edit_resource: 편집 %{name}
+      show_resource: 보여주기 %{name}
+      new_resource: 새로운 %{name}
       back: 뒤로
     controller:
       create:
@@ -19,8 +20,9 @@ ko:
       has_many:
         more: "%{total_count} 개 중에서 %{count} 개"
         none: 없음
-      has_one:
-        not_supported: 일대일 관계에 대한 양식은 제공되지 않습니다.
+    form:
+      error: error
+      errors: "%{pluralized_errors} prohibited this %{resource_name} from being saved:"
     search:
       clear: 검색 초기화
       label: "%{resource} 검색"

data/config/locales/administrate.nl.yml

@@ -5,8 +5,9 @@ nl:
       confirm: Weet u het zeker?
       destroy: Verwijder
       edit: Bewerk
-      show: Toon
-      new: Nieuw
+      edit_resource: Bewerk %{name}
+      show_resource: Toon %{name}
+      new_resource: Nieuw %{name}
       back: Terug
     controller:
       create:
@@ -19,8 +20,9 @@ nl:
       has_many:
         more: Resultaat %{count} van %{total_count}
         none: Geen
-      has_one:
-        not_supported: HasOne relaties formulieren worden niet ondersteund.
+    form:
+      error: error
+      errors: "%{pluralized_errors} prohibited this %{resource_name} from being saved:"
     search:
       clear: CDuidelijke zoek
       label: Zoeken %{resource}

data/config/locales/administrate.pl.yml

@@ -5,8 +5,9 @@ pl:
       confirm: Czy jesteś pewien?
       destroy: Usuń
       edit: Edytuj
-      show: Wyświetl
-      new: Nowy
+      edit_resource: Edytuj %{name}
+      show_resource: Wyświetl %{name}
+      new_resource: Nowy %{name}
       back: Wstecz
     controller:
       create:
@@ -19,8 +20,9 @@ pl:
       has_many:
         more: Wyświetlanie %{count} z %{total_count}
         none: Brak
-      has_one:
-        not_supported: Relacje jeden-do-jednego nie są obsługiwane.
+    form:
+      error: error
+      errors: "%{pluralized_errors} prohibited this %{resource_name} from being saved:"
     search:
       clear: Wyczyść wyszukiwanie
       label: Szukanie %{resource}

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

@@ -6,8 +6,9 @@ pt-BR:
       confirm: Você tem certeza?
       destroy: Deletar
       edit: Editar
-      show: Visualizar
-      new: Criar
+      edit_resource: Editar %{name}
+      show_resource: Visualizar %{name}
+      new_resource: Criar %{name}
       back: Voltar
     controller:
       create:
@@ -20,8 +21,9 @@ pt-BR:
       has_many:
         more: "Exibindo %{count} de %{total_count}"
         none: Nenhum
-      has_one:
-        not_supported: Relações um para muitos nos formulários não são suportadas.
+    form:
+      error: error
+      errors: "%{pluralized_errors} prohibited this %{resource_name} from being saved:"
     search:
       clear: Limpar pesquisa
       label: Pesquisa %{resource}

data/config/locales/administrate.pt.yml

@@ -6,8 +6,9 @@ pt:
       confirm: Tem certeza?
       destroy: Remover
       edit: Editar
-      show: Visualizar
-      new: Novo
+      edit_resource: Editar %{name}
+      show_resource: Visualizar %{name}
+      new_resource: Novo %{name}
       back: Voltar atrás
     controller:
       create:
@@ -20,8 +21,9 @@ pt:
       has_many:
         more: "Mostrando %{count} de %{total_count}"
         none: Nenhum
-      has_one:
-        not_supported: Relações um para muitos nos formulários não são suportadas.
+    form:
+      error: error
+      errors: "%{pluralized_errors} prohibited this %{resource_name} from being saved:"
     search:
       clear: Limpar pesquisa
       label: Pesquisa %{resource}

data/config/locales/administrate.ru.yml

@@ -5,8 +5,9 @@ ru:
       confirm: Вы уверены?
       destroy: Удалить
       edit: Редактировать
-      show: Показать
-      new: Новый
+      edit_resource: Редактировать %{name}
+      show_resource: Показать %{name}
+      new_resource: Новый %{name}
       back: Вернуться назад
     controller:
       create:
@@ -19,8 +20,9 @@ ru:
       has_many:
         more: "%{count} из %{total_count}"
         none: Нет
-      has_one:
-        not_supported: HasOne отношения в формах не поддерживаются.
+    form:
+      error: error
+      errors: "%{pluralized_errors} prohibited this %{resource_name} from being saved:"
     search:
       clear: Очистить поиск
       label: Поиск %{resource}

data/config/locales/administrate.sv.yml

@@ -5,8 +5,9 @@ sv:
       confirm: Är du säker?
       destroy: Ta bort
       edit: Ändra
-      show: Visa
-      new: Ny
+      edit_resource: Ändra %{name}
+      show_resource: Visa %{name}
+      new_resource: Ny %{name}
       back: Tillbaka
     controller:
       create:
@@ -19,8 +20,9 @@ sv:
       has_many:
         more: "%{count} av %{total_count}"
         none: Inga
-      has_one:
-        not_supported: Formulär med HasOne relationer stöds inte.
+    form:
+      error: error
+      errors: "%{pluralized_errors} prohibited this %{resource_name} from being saved:"
     search:
       clear: Rensa sökningen
       label: Sök %{resource}

data/config/locales/administrate.uk.yml

@@ -5,8 +5,9 @@ uk:
       confirm: Ви впевнені?
       destroy: Видалити
       edit: Редагувати
-      show: Показати
-      new: Новий
+      edit_resource: Редагувати %{name}
+      show_resource: Показати %{name}
+      new_resource: Новий %{name}
       back: Назад
     controller:
       create:
@@ -19,8 +20,9 @@ uk:
       has_many:
         more: "%{count} із %{total_count}"
         none: Немає
-      has_one:
-        not_supported: HasOne відношення у формах не підтримуються.
+    form:
+      error: error
+      errors: "%{pluralized_errors} prohibited this %{resource_name} from being saved:"
     search:
       clear: Очистити пошук
       label: пошук %{resource}

data/config/locales/administrate.vi.yml

@@ -5,8 +5,9 @@ vi:
       confirm: Bạn có chắc không?
       destroy: Xóa
       edit: Sửa
-      show: Xem
-      new: Mới
+      edit_resource: Sửa %{name}
+      show_resource: Xem %{name}
+      new_resource: Mới %{name}
       back: Trở lại
     controller:
       create:
@@ -19,8 +20,9 @@ vi:
       has_many:
         more: "%{count} trên %{total_count}"
         none: Không
-      has_one:
-        not_supported: Quan hệ HasOne chưa được hỗ trợ.
+    form:
+      error: error
+      errors: "%{pluralized_errors} prohibited this %{resource_name} from being saved:"
     search:
       clear: Tìm kiếm rõ ràng
       label: Tìm kiếm %{resource}

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

@@ -5,8 +5,9 @@ zh-CN:
       confirm: 确定?
       destroy: 删除
       edit: 编辑
-      show: 查看
-      new: 新建
+      edit_resource: 编辑 %{name}
+      show_resource: 查看 %{name}
+      new_resource: 新建 %{name}
       back: 返回
     controller:
       create:
@@ -19,8 +20,9 @@ zh-CN:
       has_many:
         more: 显示所有 %{total_count} 中 %{count} 条
         none: 无
-      has_one:
-        not_supported: HasOne 关系暂不支持.
+    form:
+      error: error
+      errors: "%{pluralized_errors} prohibited this %{resource_name} from being saved:"
     search:
       clear: 清除搜索
       label: 搜索 %{resource}

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

@@ -5,8 +5,9 @@ zh-TW:
       confirm: 確定？
       destroy: 刪除
       edit: 編輯
-      show: 檢視
-      new: 新增
+      edit_resource: 編輯 %{name}
+      show_resource: 檢視 %{name}
+      new_resource: 新增 %{name}
       back: 返回
     controller:
       create:
@@ -19,8 +20,9 @@ zh-TW:
       has_many:
         more: 顯示 %{total_count} 筆中的 %{count} 筆資料
         none: 無
-      has_one:
-        not_supported: 表單尚未支援 HasOne 關聯。
+    form:
+      error: error
+      errors: "%{pluralized_errors} prohibited this %{resource_name} from being saved:"
     search:
       clear: 清除搜索
       label: 搜索 %{resource}

data/docs/authorization.md

@@ -0,0 +1,69 @@
+# Authorization
+
+The default configuration of Administrate is "authenticate-only" - once a
+user is authenticated, that user has access to every action of every object.
+
+You can add more fine-grained authorization by overriding methods in the
+controller.
+
+## Using Pundit
+
+If your app already uses [Pundit](https://github.com/elabs/pundit) for
+authorization, you just need to add one line to your
+`Admin::ApplicationController`:
+
+```ruby
+include Administrate::Punditize
+```
+
+This will use all the policies from your main app to determine if the
+current user is able to view a given record or perform a given action.
+
+### Further limiting scope
+
+You may want to limit the scope for a given user beyond what they
+technically have access to see in the main app. For example, a user may
+have all public records in their scope, but you want to only show *their*
+records in the admin interface to reduce confusion.
+
+In this case, you can add an additional `resolve_admin` to your policy's
+scope and Administrate will use this instead of the `resolve` method.
+
+For example:
+
+```ruby
+class PostPolicy < ApplicationPolicy
+  class Scope < Scope
+    def resolve
+      scope.all
+    end
+    
+    def resolve_admin
+      scope.where(owner: user)
+    end
+  end
+end
+```
+
+## Authorization without Pundit
+
+If you use a different authorization library, or you want to roll your own,
+you just need to override a few methods in your controllers or
+`Admin::ApplicationController`. For example:
+
+```ruby
+# Limit the scope of the given resource
+def scoped_resource
+  super.where(user: current_user)
+end
+
+# Raise an exception if the user is not permitted to access this resource
+def authorize_resource(resource)
+  raise "Erg!" unless show_action?(params[:action], resource)
+end
+
+# Hide links to actions if the user is not allowed to do them      
+def show_action?(action, resource)
+  current_user.can? action, resource
+end
+```

data/docs/customizing_dashboards.md

@@ -72,7 +72,13 @@ which are specified through the `.with_options` class method:
 
 **Field::BelongsTo**
 
-`:order` - order of the dropdown menu, can be ordered by more than one column `"name, email DESC"`
+`:order` - Specifies the order of the dropdown menu, can be ordered by more
+than one column. e.g.: `"name, email DESC"`.
+
+`:primary_key` - Specifies object's primary_key. Defaults to `:id`.
+
+`:foreign_key` - Specifies the name of the foreign key directly.
+Defaults to `:#{attribute}_id`.
 
 **Field::HasMany**
 
@@ -87,12 +93,6 @@ which are specified through the `.with_options` class method:
 
 `:foreign_key` - Specifies the name of the foreign key directly. Defaults to `:#{attribute}_id`
 
-**Field::BelongsTo**
-
-`:primary_key` - Specifies object's primary_key. Defaults to `:id`.
-
-`:foreign_key` - Specifies the name of the foreign key directly. Defaults to `:#{attribute}_id`
-
 **Field::Number**
 
 `:decimals` - Set the number of decimals to display. Defaults to `0`.
@@ -124,6 +124,17 @@ Or, to display a distance in kilometers:
 `:classes` - Specify a list of classes whose objects will be used to populate select boxes for editing this polymorphic field.
 Default is `[]`.
 
+`:order` - What to sort the association by in the form select.
+Default is `nil`.
+
+**Field::DateTime**
+
+`:format` - Specify what format, using `strftime` you would like `DateTime`
+objects to display as.
+
+`:timezone` - Specify which timezone `Date` and `DateTime` objects are based
+in.
+
 **Field::Select**
 
 `:collection` - Specify the array or range to select from.  Defaults to `[]`.

data/docs/getting_started.md

@@ -73,6 +73,48 @@ namespace :admin do
 end
 ```
 
+## Keep Dashboards Updated as Model Attributes Change
+
+If you've installed Administrate and generated dashboards and _then_ 
+subsequently added attributes to your models you'll need to manually add 
+these additions (or removals) to your dashboards.
+
+Example:
+
+```ruby
+# app/dashboards/your_model_dashboard.rb
+
+  ATTRIBUTE_TYPES = {
+    # ...
+    the_new_attribute: Field::String,
+    # ...
+  }.freeze
+  
+  SHOW_PAGE_ATTRIBUTES = [
+    # ...
+    :the_new_attribute,
+    # ...
+  ].freeze
+
+  FORM_ATTRIBUTES = [
+    # ...
+    :the_new_attribute,
+    # ...
+  ].freeze
+  
+  COLLECTION_ATTRIBUTES = [
+    # ...
+    :the_new_attribute, # if you want it on the index, also.
+    # ...
+  ].freeze
+```
+
+It's recommended that you make this change at the same time as you add the 
+attribute to the model.
+
+The alternative way to handle this is to re-run `rails g administrate:install` and 
+carefully pick through the diffs. This latter method is probably more cumbersome.
+
 ## Rails API
 
 Since Rails 5.0, we've been able to have API only applications. Yet, sometimes

data/lib/administrate/field/base.rb

@@ -24,7 +24,7 @@ module Administrate
         @options = options
       end
 
-      def self.permitted_attribute(attr)
+      def self.permitted_attribute(attr, _options = nil)
         attr
       end
 

data/lib/administrate/field/belongs_to.rb

@@ -3,7 +3,7 @@ require_relative "associative"
 module Administrate
   module Field
     class BelongsTo < Associative
-      def self.permitted_attribute(attr)
+      def self.permitted_attribute(attr, _options = nil)
         :"#{attr}_id"
       end
 

data/lib/administrate/field/date_time.rb

@@ -4,11 +4,18 @@ module Administrate
   module Field
     class DateTime < Base
       def date
-        I18n.localize(data.to_date, format: format)
+        I18n.localize(
+          data.in_time_zone(timezone).to_date,
+          format: format,
+        )
       end
 
       def datetime
-        I18n.localize(data, format: format, default: data)
+        I18n.localize(
+          data.in_time_zone(timezone),
+          format: format,
+          default: data,
+        )
       end
 
       private
@@ -16,6 +23,10 @@ module Administrate
       def format
         options.fetch(:format, :default)
       end
+
+      def timezone
+        options.fetch(:timezone, "UTC")
+      end
     end
   end
 end

data/lib/administrate/field/deferred.rb

@@ -25,8 +25,9 @@ module Administrate
         options.fetch(:searchable, deferred_class.searchable?)
       end
 
-      def permitted_attribute(attr)
-        options.fetch(:foreign_key, deferred_class.permitted_attribute(attr))
+      def permitted_attribute(attr, _options = nil)
+        options.fetch(:foreign_key,
+          deferred_class.permitted_attribute(attr, options))
       end
 
       delegate :html_class, to: :deferred_class

data/lib/administrate/field/has_many.rb

@@ -7,8 +7,8 @@ module Administrate
     class HasMany < Associative
       DEFAULT_LIMIT = 5
 
-      def self.permitted_attribute(attribute)
-        { "#{attribute.to_s.singularize}_ids".to_sym => [] }
+      def self.permitted_attribute(attr, _options = nil)
+        { "#{attr.to_s.singularize}_ids".to_sym => [] }
       end
 
       def associated_collection

data/lib/administrate/field/has_one.rb

@@ -3,25 +3,33 @@ require_relative "associative"
 module Administrate
   module Field
     class HasOne < Associative
-      def initialize(attribute, data, page, options = {})
-        resolver = Administrate::ResourceResolver.new("admin/#{attribute}")
-        @nested_form = Administrate::Page::Form.new(
+      def nested_form
+        @nested_form ||= Administrate::Page::Form.new(
           resolver.dashboard_class.new,
           data || resolver.resource_class.new,
         )
-
-        super
       end
 
-      def self.permitted_attribute(attr)
+      def self.permitted_attribute(attr, options = nil)
+        associated_class_name =
+          if options
+            options.fetch(:class_name, attr.to_s.singularize.camelcase)
+          else
+            attr
+          end
         related_dashboard_attributes =
-          Administrate::ResourceResolver.new("admin/#{attr}").
+          Administrate::ResourceResolver.new("admin/#{associated_class_name}").
             dashboard_class.new.permitted_attributes + [:id]
 
         { "#{attr}_attributes": related_dashboard_attributes }
       end
 
-      attr_reader :nested_form
+      private
+
+      def resolver
+        @resolver ||=
+          Administrate::ResourceResolver.new("admin/#{associated_class_name}")
+      end
     end
   end
 end

data/lib/administrate/field/polymorphic.rb

@@ -11,7 +11,7 @@ module Administrate
         end
       end
 
-      def self.permitted_attribute(attr)
+      def self.permitted_attribute(attr, _options = nil)
         { attr => %i{type value} }
       end
 

data/lib/administrate/order.rb

@@ -6,11 +6,13 @@ module Administrate
     end
 
     def apply(relation)
-      if relation.columns_hash.keys.include?(attribute.to_s)
-        relation.order("#{attribute} #{direction}")
-      else
-        relation
-      end
+      return order_by_association(relation) unless
+        reflect_association(relation).nil?
+
+      return relation.reorder("#{attribute} #{direction}") if
+        relation.columns_hash.keys.include?(attribute.to_s)
+
+      relation
     end
 
     def ordered_by?(attr)
@@ -41,5 +43,36 @@ module Administrate
     def opposite_direction
       direction.to_sym == :asc ? :desc : :asc
     end
+
+    def order_by_association(relation)
+      return order_by_count(relation) if has_many_attribute?(relation)
+
+      return order_by_id(relation) if belongs_to_attribute?(relation)
+
+      relation
+    end
+
+    def order_by_count(relation)
+      relation.
+      left_joins(attribute.to_sym).
+      group(:id).
+      reorder("COUNT(#{attribute}.id) #{direction}")
+    end
+
+    def order_by_id(relation)
+      relation.reorder("#{attribute}_id #{direction}")
+    end
+
+    def has_many_attribute?(relation)
+      reflect_association(relation).macro == :has_many
+    end
+
+    def belongs_to_attribute?(relation)
+      reflect_association(relation).macro == :belongs_to
+    end
+
+    def reflect_association(relation)
+      relation.klass.reflect_on_association(attribute.to_s)
+    end
   end
 end

data/lib/administrate/search.rb

@@ -24,7 +24,7 @@ module Administrate
         table_name = ActiveRecord::Base.connection.
           quote_table_name(@scoped_resource.table_name)
         attr_name = ActiveRecord::Base.connection.quote_column_name(attr)
-        "lower(#{table_name}.#{attr_name}) LIKE ?"
+        "LOWER(TEXT(#{table_name}.#{attr_name})) LIKE ?"
       end.join(" OR ")
     end
 

data/lib/administrate/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: semantic-administrate
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Nick Charlton
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-22 00:00:00.000000000 Z
+date: 2018-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -224,6 +224,7 @@ files:
 - app/assets/stylesheets/administrate/vendor/semantic-ui.scss
 - app/assets/stylesheets/docs.scss
 - app/controllers/administrate/application_controller.rb
+- app/controllers/concerns/administrate/punditize.rb
 - app/helpers/administrate/application_helper.rb
 - app/views/administrate/application/_collection.html.erb
 - app/views/administrate/application/_flashes.html.erb
@@ -300,6 +301,7 @@ files:
 - config/unicorn.rb
 - docs/adding_custom_field_types.md
 - docs/authentication.md
+- docs/authorization.md
 - docs/customizing_attribute_partials.md
 - docs/customizing_controller_actions.md
 - docs/customizing_dashboards.md