administrate 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b6aee79ccfd9cf4056bd3c531db50a181e4d9cc
-  data.tar.gz: 9a44fee6bbe7975e58509295d36a260cab4cc129
+  metadata.gz: 2ed47c9f36d7d10aba73c04f003cc35472305e63
+  data.tar.gz: 3e5642c6eaf135a0ff333f7e563c14a90458bf8c
 SHA512:
-  metadata.gz: ba14d87d4b00302aedbf6e24a195178591f16b59830d17036c2d1376f51b55cccd538d0425d1fc35e4fadb0bf6740b0b4faaade4c94f5eaefffe3c46dad00ef4
-  data.tar.gz: 1221ee23052b1331a345b9358aafffd5b14d9a9cb2c4344e58d0364df2568b8f3b92cd574c76708d0b2ccfeb6a4a5133bd25427aa60303cc58945f72f04055aa
+  metadata.gz: ea86641653105a36577715e4937d0a337aa4f4ddf143a2130a0f0e24c14da4eea92cc6ea642aa98c9bcf6b053256c6031d9cf326fc1f12ae5483cb6731f6a292
+  data.tar.gz: bf9a63397b90fbbe6e1a5bcb77f55c6eebadcc6d4fd67d4edfa4146bcce79c3b9e4b79d106cce98e1394d87e965be3ba4237ef2238e95f725d5fa2e8de761946

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

@@ -1,3 +1,6 @@
 $(function () {
-  $(".datetimepicker").datetimepicker({ format: "YYYY-MM-DD HH:mm:ss" });
+  $(".datetimepicker").datetimepicker({
+    debug: false,
+    format: "YYYY-MM-DD HH:mm:ss",
+  });
 });

data/app/assets/stylesheets/administrate/_sidebar.scss

@@ -11,6 +11,10 @@
     padding-top: $base-spacing;
     transition: color 0.05s linear;
 
+    &:last-child {
+      padding-bottom: $base-spacing;
+    }
+
     &--active {
       color: $blue;
       font-weight: $bold-font-weight;

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

@@ -3,10 +3,12 @@
   @include span-columns(2 of 12);
   margin-top: 0;
   text-align: right;
+  clear: left;
 }
 
 .preserve-whitespace {
   white-space: pre;
+  word-wrap: break-word;
 }
 
 .attribute-data {

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

@@ -36,5 +36,6 @@
   [type="checkbox"],
   [type="radio"] {
     margin: $small-spacing 0 ($base-spacing + $form-input-padding);
+    width: auto;
   }
 }

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

@@ -1,5 +1,5 @@
 .header {
-  align-items: flex-end;
+  align-items: baseline;
   display: flex;
   justify-content: space-between;
   margin-bottom: $base-spacing * 2;
@@ -7,4 +7,8 @@
   &-heading {
     margin-top: 0;
   }
+
+  &-actions {
+    margin-left: $base-spacing;
+  }
 }

data/app/controllers/administrate/application_controller.rb

@@ -8,7 +8,7 @@ module Administrate
       page = Administrate::Page::Collection.new(dashboard, order: order)
 
       render locals: {
-        resources: resources.page(params[:page]).per(records_per_page),
+        resources: resources,
         search_term: search_term,
         page: page,
       }

data/app/helpers/administrate/application_helper.rb

@@ -4,5 +4,17 @@ module Administrate
       locals.merge!(field: field)
       render locals: locals, partial: field.to_partial_path
     end
+
+    def display_resource_name(resource_name)
+      resource_name.
+        to_s.
+        classify.
+        constantize.
+        model_name.
+        human(
+          count: 0,
+          default: resource_name.to_s.pluralize.titleize,
+        )
+    end
   end
 end

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

@@ -11,7 +11,7 @@ as defined by the DashboardManifest.
   <% DashboardManifest::DASHBOARDS.each do |resource| %>
     <li>
       <%= link_to(
-        resource.to_s.titleize,
+        display_resource_name(resource),
         [Administrate::NAMESPACE, resource],
         class: "sidebar__link sidebar__link--#{nav_link_state(resource)}"
       ) %>

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

@@ -19,7 +19,13 @@ It displays a header, and renders the `_form` partial to do the heavy lifting.
 
 <header class="header">
   <h1 class="header-heading"><%= content_for(:title) %></h1>
-  <%= link_to "Show #{page.resource}", [Administrate::NAMESPACE, page.resource], class: "button" %>
+  <div class="header-actions">
+    <%= link_to(
+      "Show #{page.page_title}",
+      [Administrate::NAMESPACE, page.resource],
+      class: "button",
+    ) %>
+  </div>
 </header>
 
 <%= render "form", page: page %>

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

@@ -21,7 +21,9 @@ It renders the `_table` partial to display details about the resources.
 [1]: http://www.rubydoc.info/gems/administrate/Administrate/Page/Table
 %>
 
-<% content_for(:title) { page.resource_name.pluralize.titleize } %>
+<% content_for(:title) do %>
+  <%= display_resource_name(page.resource_name) %>
+<% end %>
 
 <% content_for(:search) do %>
   <form class="search">
@@ -43,11 +45,13 @@ It renders the `_table` partial to display details about the resources.
 
 <header class="header">
   <h1 class="header-heading"><%= content_for(:title) %></h1>
-  <%= link_to(
-    "New #{page.resource_name.titleize.downcase}",
-    [:new, Administrate::NAMESPACE, page.resource_name],
-    class: "button",
-  ) %>
+  <div class="header-actions">
+    <%= link_to(
+      "New #{page.resource_name.titleize.downcase}",
+      [:new, Administrate::NAMESPACE, page.resource_name],
+      class: "button",
+    ) %>
+  </div>
 </header>
 
 <%= render "collection", collection_presenter: page, resources: resources %>

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

@@ -19,7 +19,9 @@ to do the heavy lifting.
 
 <header class="header">
   <h1 class="header-heading"><%= content_for(:title) %></h1>
-  <%= link_to 'Back', :back, class: "button" %>
+  <div class="header-actions">
+    <%= link_to 'Back', :back, class: "button" %>
+  </div>
 </header>
 
 <%= render 'form', page: page %>

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

@@ -20,11 +20,13 @@ as well as a link to its edit page.
 
 <header class="header">
   <h1 class="header-heading"><%= content_for(:title) %></h1>
-  <%= link_to(
-    "Edit",
-    [:edit, Administrate::NAMESPACE, page.resource],
-    class: "button",
-  ) %>
+  <div class="header-actions">
+    <%= link_to(
+      "Edit",
+      [:edit, Administrate::NAMESPACE, page.resource],
+      class: "button",
+    ) %>
+  </div>
 </header>
 
 <dl>

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

@@ -18,5 +18,5 @@ that displays all possible records to associate with.
 
 <%= f.label field.permitted_attribute %>
 <%= f.select(field.permitted_attribute) do %>
-  <%= options_for_select(field.associated_resource_options) %>
+  <%= options_for_select(field.associated_resource_options, field.selected_option) %>
 <% end %>

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

@@ -19,8 +19,8 @@ and is augmented with [Selectize].
 [Selectize]: http://brianreavis.github.io/selectize.js
 %>
 
-<%= f.label field.attribute_key %>
+<%= f.label field.attribute_key, field.attribute %>
 
 <%= f.select(field.attribute_key, nil, {}, multiple: true) do %>
-  <%= options_for_select(field.associated_resource_options) %>
+  <%= options_for_select(field.associated_resource_options, field.selected_options) %>
 <% end %>

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.count, field.attribute.to_s.humanize.downcase) %>
+<%= pluralize(field.data.size, field.attribute.to_s.humanize.downcase) %>

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

@@ -19,6 +19,6 @@ By default, the relationship is rendered as a link to the associated object.
 <% if field.data %>
   <%= link_to(
     field.display_associated_resource,
-    polymorphic_path([:admin, field.data])
+    [Administrate::NAMESPACE, field.data]
   ) %>
 <% end %>

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

@@ -19,6 +19,6 @@ By default, the relationship is rendered as a link to the associated object.
 <% if field.data %>
   <%= link_to(
     field.display_associated_resource,
-    [:admin, field.data],
+    [Administrate::NAMESPACE, field.data],
   ) %>
 <% end %>

data/config/locales/administrate.da.yml

@@ -0,0 +1,23 @@
+---
+da:
+  administrate:
+    actions:
+      confirm: Er du sikker?
+      destroy: Slet
+      edit: Rediger
+      show: Vis
+    controller:
+      create:
+        success: "%{resource} blev oprettet."
+      destroy:
+        success: "%{resource} er nu slettet."
+      update:
+        success: "%{resource} blev opdateret."
+    fields:
+      has_many:
+        more: "Viser %{count} af %{total_count}"
+        none: Ingen
+      polymorphic:
+        not_supported: "Formularer med polymorphic relationships er ikke understøttede."
+      has_one:
+        not_supported: "Formularer med has_one associationer er ikke understøttede."

data/config/locales/administrate.de.yml

@@ -0,0 +1,23 @@
+---
+de:
+  administrate:
+    actions:
+      confirm: Sind sie sicher?
+      destroy: Löschen
+      edit: Editieren
+      show: Anzeigen
+    controller:
+      create:
+        success: "%{resource} wurde erfolgreich erstellt."
+      destroy:
+        success: "%{resource} wurde erfolgreich gelöscht."
+      update:
+        success: "%{resource} wurde erfolgreich aktualisiert."
+    fields:
+      has_many:
+        more: "%{count} von %{total_count}"
+        none: Keine
+      polymorphic:
+        not_supported: Polymorphe Beziehungen werden nicht unterstützt.
+      has_one:
+        not_supported: HasOne-beziehungen werden nicht unterstützt.

data/config/locales/administrate.en.yml

@@ -18,6 +18,6 @@ en:
         more: Showing %{count} of %{total_count}
         none: None
       polymorphic:
-        not_supported: Polymorphic relationship forms are not supported yet. Sorry!
+        not_supported: Polymorphic relationship forms are not supported.
       has_one:
-        not_supported: HasOne relationship forms are not supported yet. Sorry!
+        not_supported: HasOne relationship forms are not supported.

data/config/locales/administrate.es.yml

@@ -0,0 +1,23 @@
+---
+es:
+  administrate:
+    actions:
+      confirm: ¿Estás seguro?
+      destroy: Destruir
+      edit: Editar
+      show: Mostrar
+    controller:
+      create:
+        success: "%{resource} fue creado exitosamente."
+      destroy:
+        success: "%{resource} fue destruido exitosamente."
+      update:
+        success: "%{resource} fue actualizado exitosamente."
+    fields:
+      has_many:
+        more: Mostrando %{count} de %{total_count}
+        none: Ninguno
+      polymorphic:
+        not_supported: Los formularios con relaciones polimórficas no están soportados.
+      has_one:
+        not_supported: Los formularios con relaciones HasOne no están soportados.

data/config/locales/administrate.fr.yml

@@ -0,0 +1,23 @@
+---
+fr:
+  administrate:
+    actions:
+      confirm: Êtes-vous sûr ?
+      destroy: Supprimer
+      edit: Modifier
+      show: Détails
+    controller:
+      create:
+        success: "%{resource} a été correctement créé(e)."
+      destroy:
+        success: "%{resource} a été correctement supprimé(e)."
+      update:
+        success: "%{resource} a été correctement modifié(e)."
+    fields:
+      has_many:
+        more: "%{count} sur %{total_count}"
+        none: Aucun
+      polymorphic:
+        not_supported: Les relations polymorphiques dans les formulaires ne sont pas supportées.
+      has_one:
+        not_supported: Les relations HasOne dans les formulaires ne sont pas supportées.

data/config/locales/administrate.nl.yml

@@ -0,0 +1,23 @@
+---
+nl:
+  administrate:
+    actions:
+      confirm: Weet u het zeker?
+      destroy: Verwijder
+      edit: Bewerk
+      show: Toon
+    controller:
+      create:
+        success: "%{resource} was succesvol aangemaakt."
+      destroy:
+        success: "%{resource} was succesvol verwijderd."
+      update:
+        success: "%{resource} was succesvol geupdated."
+    fields:
+      has_many:
+        more: Resultaat %{count} van %{total_count}
+        none: Geen
+      polymorphic:
+        not_supported: Polymorphische relaties formulieren worden niet ondersteund.
+      has_one:
+        not_supported: HasOne relaties formulieren worden niet ondersteund.

data/config/locales/administrate.pl.yml

@@ -18,6 +18,6 @@ pl:
         more: Wyświetlanie %{count} z %{total_count}
         none: Brak
       polymorphic:
-        not_supported: Relacje polimorficzne nie są jeszcze obsługiwane. Przepraszamy!
+        not_supported: Relacje polimorficzne nie są obsługiwane.
       has_one:
-        not_supported: Relacje jeden-do-jednego nie są jeszcze obsługiwane. Przepraszamy!
+        not_supported: Relacje jeden-do-jednego nie są obsługiwane.

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

@@ -0,0 +1,24 @@
+# encoding: UTF-8
+---
+pt-BR:
+  administrate:
+    actions:
+      confirm: Você tem certeza?
+      destroy: Deletar
+      edit: Editar
+      show: Visualizar
+    controller:
+      create:
+        success: "%{resource} foi criado com sucesso."
+      destroy:
+        success: "%{resource} foi deletado com sucesso."
+      update:
+        success: "%{resource} foi atualizado com sucesso."
+    fields:
+      has_many:
+        more: "Exibindo %{count} de %{total_count}"
+        none: Nenhum
+      polymorphic:
+        not_supported: Relações polimórmficas nos formulários não são suportadas.
+      has_one:
+        not_supported: Relações um para muitos nos formulários não são suportadas.

data/config/locales/administrate.ru.yml

@@ -18,6 +18,6 @@ ru:
         more: "%{count} из %{total_count}"
         none: Нет
       polymorphic:
-        not_supported: Полиморфные отношения в формах не поддерживаются. Извините!
+        not_supported: Полиморфные отношения в формах не поддерживаются.
       has_one:
-        not_supported: HasOne отношения в формах не поддерживаются. Извините!
+        not_supported: HasOne отношения в формах не поддерживаются.

data/config/locales/administrate.sv.yml

@@ -0,0 +1,23 @@
+---
+sv:
+  administrate:
+    actions:
+      confirm: Är du säker?
+      destroy: Ta bort
+      edit: Ändra
+      show: Visa
+    controller:
+      create:
+        success: "%{resource} har skapats."
+      destroy:
+        success: "%{resource} har tagits bort."
+      update:
+        success: "%{resource} har uppdaterats."
+    fields:
+      has_many:
+        more: "%{count} av %{total_count}"
+        none: Inga
+      polymorphic:
+        not_supported: Formulär med polymorfiska relationer stöds inte.
+      has_one:
+        not_supported: Formulär med HasOne relationer stöds inte.

data/config/locales/administrate.vi.yml

@@ -0,0 +1,23 @@
+---
+vi:
+  administrate:
+    actions:
+      confirm: Bạn có chắc không?
+      destroy: Xóa
+      edit: Sửa
+      show: Xem
+    controller:
+      create:
+        success: "%{resource} đã được tạo thành công."
+      destroy:
+        success: "%{resource} đã được xóa thành công."
+      update:
+        success: "%{resource} đã được cập nhật thành công."
+    fields:
+      has_many:
+        more: "%{count} trên %{total_count}"
+        none: Không
+      polymorphic:
+        not_supported: Quan hệ Polymorphic chưa được hỗ trợ.
+      has_one:
+        not_supported: Quan hệ HasOne chưa được hỗ trợ.

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

@@ -18,6 +18,6 @@ zh-CN:
         more: 显示所有 %{total_count} 中 %{count} 条
         none: 无
       polymorphic:
-        not_supported: 对不起，Polymorphic 关系暂不支持!
+        not_supported: Polymorphic 关系暂不支持
       has_one:
-        not_supported: 对不起，HasOne 关系暂不支持!
+        not_supported: HasOne 关系暂不支持.

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

@@ -18,6 +18,6 @@ zh-TW:
         more: 顯示 %{total_count} 筆中的 %{count} 筆資料
         none: 無
       polymorphic:
-        not_supported: 很抱歉，表單尚未支援 Polymorphic 關聯。
+        not_supported: 表單尚未支援 Polymorphic 關聯。
       has_one:
-        not_supported: 很抱歉，表單尚未支援 HasOne 關聯。
+        not_supported: 表單尚未支援 HasOne 關聯。

data/lib/administrate/base_dashboard.rb

@@ -18,6 +18,18 @@ module Administrate
       self.class::ATTRIBUTE_TYPES
     end
 
+    def attribute_type_for(attribute_name)
+      attribute_types.fetch(attribute_name) do
+        fail attribute_not_found_message(attribute_name)
+      end
+    end
+
+    def attribute_types_for(attribute_names)
+      attribute_names.each_with_object({}) do |name, attributes|
+        attributes[name] = attribute_type_for(name)
+      end
+    end
+
     def form_attributes
       self.class::FORM_ATTRIBUTES
     end
@@ -39,5 +51,11 @@ module Administrate
     def display_resource(resource)
       "#{resource.class} ##{resource.id}"
     end
+
+    private
+
+    def attribute_not_found_message(attr)
+      "Attribute #{attr} could not be found in #{self.class}::ATTRIBUTE_TYPES"
+    end
   end
 end

data/lib/administrate/fields/belongs_to.rb

@@ -12,11 +12,15 @@ module Administrate
       end
 
       def associated_resource_options
-        candidate_resources.map do |resource|
+        [nil] + candidate_resources.map do |resource|
           [display_candidate_resource(resource), resource.id]
         end
       end
 
+      def selected_option
+        data && data.id
+      end
+
       private
 
       def candidate_resources

data/lib/administrate/fields/has_many.rb

@@ -24,6 +24,10 @@ module Administrate
         end
       end
 
+      def selected_options
+        data && data.map(&:id)
+      end
+
       def limit
         options.fetch(:limit, DEFAULT_LIMIT)
       end

data/lib/administrate/fields/polymorphic.rb

@@ -3,6 +3,11 @@ require_relative "associative"
 module Administrate
   module Field
     class Polymorphic < Associative
+      protected
+
+      def associated_dashboard
+        "#{data.class.name}Dashboard".constantize.new
+      end
     end
   end
 end

data/lib/administrate/page/base.rb

@@ -15,10 +15,8 @@ module Administrate
 
       def attribute_field(dashboard, resource, attribute_name, page)
         value = get_attribute_value(resource, attribute_name)
-
-        dashboard.
-          attribute_types[attribute_name].
-          new(attribute_name, value, page)
+        field = dashboard.attribute_type_for(attribute_name)
+        field.new(attribute_name, value, page)
       end
 
       def get_attribute_value(resource, attribute_name)

data/lib/administrate/page/collection.rb

@@ -14,7 +14,7 @@ module Administrate
       end
 
       def attribute_types
-        dashboard.attribute_types.slice(*attribute_names)
+        dashboard.attribute_types_for(attribute_names)
       end
 
       def ordered_html_class(attr)

data/lib/administrate/search.rb

@@ -26,9 +26,13 @@ module Administrate
     end
 
     def search_attributes
-      resolver.dashboard_class::ATTRIBUTE_TYPES.select do |_, type|
-        type.searchable?
-      end.keys
+      attribute_types.keys.select do |attribute|
+        attribute_types[attribute].searchable?
+      end
+    end
+
+    def attribute_types
+      resolver.dashboard_class::ATTRIBUTE_TYPES
     end
 
     attr_reader :resolver, :term

data/lib/administrate/version.rb

@@ -1,3 +1,3 @@
 module Administrate
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/generators/administrate/install/install_generator.rb

@@ -40,6 +40,10 @@ module Administrate
           puts "WARNING: Unable to generate a dashboard for #{invalid_model}."
           puts "         It is not connected to a database table."
         end
+
+        unnamed_constants.each do |invalid_model|
+          puts "NOTICE: Skipping dynamically generated model #{invalid_model}."
+        end
       end
 
       private
@@ -63,7 +67,7 @@ module Administrate
       end
 
       def invalid_database_models
-        models_without_tables + namespaced_models
+        models_without_tables + namespaced_models + unnamed_constants
       end
 
       def models_without_tables
@@ -74,6 +78,10 @@ module Administrate
         database_models.select { |model| model.to_s.include?("::") }
       end
 
+      def unnamed_constants
+        ActiveRecord::Base.descendants.reject { |d| d.name == d.to_s }
+      end
+
       def dashboard_routes
         File.read(routes_file_path)
       end

data/lib/generators/administrate/install/templates/application_controller.rb

@@ -4,16 +4,18 @@
 #
 # If you want to add pagination or other controller-level concerns,
 # you're free to overwrite the RESTful controller actions.
-class Admin::ApplicationController < Administrate::ApplicationController
-  before_filter :authenticate_admin
+module Admin
+  class ApplicationController < Administrate::ApplicationController
+    before_filter :authenticate_admin
 
-  def authenticate_admin
-    # TODO Add authentication logic here.
-  end
+    def authenticate_admin
+      # TODO Add authentication logic here.
+    end
 
-  # Override this value to specify the number of elements to display at a time
-  # on index pages. Defaults to 20.
-  # def records_per_page
-  #   params[:per_page] || 20
-  # end
+    # Override this value to specify the number of elements to display at a time
+    # on index pages. Defaults to 20.
+    # def records_per_page
+    #   params[:per_page] || 20
+    # end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: administrate
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Grayson Wright
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-12 00:00:00.000000000 Z
+date: 2015-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autoprefixer-rails
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.6
 - !ruby/object:Gem::Dependency
   name: inline_svg
   requirement: !ruby/object:Gem::Requirement
@@ -266,9 +266,17 @@ files:
 - app/views/fields/text/_show.html.erb
 - app/views/layouts/administrate/application.html.erb
 - config/i18n-tasks.yml
+- config/locales/administrate.da.yml
+- config/locales/administrate.de.yml
 - config/locales/administrate.en.yml
+- config/locales/administrate.es.yml
+- config/locales/administrate.fr.yml
+- config/locales/administrate.nl.yml
 - config/locales/administrate.pl.yml
+- config/locales/administrate.pt-BR.yml
 - config/locales/administrate.ru.yml
+- config/locales/administrate.sv.yml
+- config/locales/administrate.vi.yml
 - config/locales/administrate.zh-CN.yml
 - config/locales/administrate.zh-TW.yml
 - config/routes.rb
@@ -342,7 +350,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A Rails engine for creating super-flexible admin dashboards