trestle 0.8.4 → 0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4f02402474a2f77fc6f4af6582e9b68f59274d0
-  data.tar.gz: bb9815ae6b48b970443740c5b111aefef96dcea3
+  metadata.gz: f43ff0c051a7e29be0e0a815f1500753456f8aef
+  data.tar.gz: 75bc749e3cd64de9c5339e98dda6c921985d5c61
 SHA512:
-  metadata.gz: c1593ee4dafcde35f20c312441df49e1b0861b82d87e387b4ed407e60a29758fb24e9efe4274339a1e04c78aac60cb0e85b9c76a425863fc3176d6a1f3afb70a
-  data.tar.gz: 04e575f53c928a249a74aa4cc8ad3477c7cd16fad6ef26874e0d9adf9397bbfe070fd059f74b4c85c25cba599887d84dbf3f5da1fd0cd91d26704c85ef976a1b
+  metadata.gz: 86dbf71a36e6cfb0499e7ec5d6852103f9148acead9755775883fbb7011b019e435ccb7331866f19a6555c5d7fb9de049aed2139874a70bbe3417c88e79a806e
+  data.tar.gz: 10e8387dbb008465043180543be49f16a659372ce62f8d908b86595c91ebdb6b1b2950c7391c9ec7eb1041feb325f19c817e7c7f5c3e3fb5a078651d1518a0d2

data/.gitignore

@@ -1,6 +1,7 @@
 /.bundle/
 /.yardoc
 /Gemfile.lock
+/gemfiles/*.lock
 /_yardoc/
 /coverage/
 /doc/
@@ -11,4 +12,7 @@
 /sandbox/*.sqlite3-journal
 /sandbox/log/*.log
 /sandbox/tmp/
+/spec/dummy/db/*.sqlite3
+/spec/dummy/*.sqlite3-journal
 /spec/dummy/log/*.log
+/spec/dummy/tmp/*

data/.travis.yml

@@ -1,4 +1,13 @@
 language: ruby
+
+before_install:
+  - gem install bundler
+
 rvm:
   - 2.4.1
-before_install: gem install bundler
+
+gemfile:
+  - gemfiles/rails-4.2.gemfile
+  - gemfiles/rails-5.0.gemfile
+  - gemfiles/rails-5.1.gemfile
+  - gemfiles/rails-edge.gemfile

data/Gemfile

@@ -6,6 +6,10 @@ gemspec
 group :test do
   gem 'coveralls', require: false
   gem 'simplecov', require: false
+
+  gem 'capybara'
+  gem 'capybara-selenium'
+  gem 'selenium-webdriver'
 end
 
 gem 'haml'

data/README.md

@@ -92,6 +92,7 @@ The following plugins are currently available:
 | *trestle-auth* | User authentication plugin | https://github.com/TrestleAdmin/trestle-auth |
 | *trestle-search* | Search plugin | https://github.com/TrestleAdmin/trestle-search |
 | *trestle-tinymce* | TinyMCE (WYSIWYG editor) integration | https://github.com/TrestleAdmin/trestle-tinymce |
+| *trestle-simplemde* | SimpleMDE (Markdown editor) integration | https://github.com/TrestleAdmin/trestle-simplemde |
 
 
 ## License

data/app/assets/javascripts/trestle/_cookies.js

@@ -0,0 +1,23 @@
+Trestle.cookie = {
+  get: function(name) {
+    name += '=';
+
+    var cookies = document.cookie.split(/;\s*/)
+
+    for (i = cookies.length - 1; i >= 0; i--) {
+      if (!cookies[i].indexOf(name)) {
+        return cookies[i].replace(name, '');
+      }
+    }
+
+    return "";
+  },
+
+  set: function(name, value) {
+    document.cookie = name + "=" + encodeURIComponent(value) + "; path=/";
+  },
+
+  delete: function(name) {
+    document.cookie = name + "=; path=/; expires=Thu, 01 Jan 1970 00:00:00 GMT";
+  }
+};

data/app/assets/javascripts/trestle/_sidebar.js

@@ -40,13 +40,34 @@ Trestle.ready(function() {
 
     if (sidebar.hasClass('expanded') || sidebar.hasClass('collapsed')) {
       sidebar.removeClass('expanded').removeClass('collapsed');
-      document.cookie = "trestle:sidebar=; path=/; expires=Thu, 01 Jan 1970 00:00:00 GMT";
+      Trestle.cookie.delete("trestle:sidebar");
     } else if ($(document).width() >= 1200) {
       sidebar.addClass('collapsed');
-      document.cookie = "trestle:sidebar=collapsed; path=/";
+      Trestle.cookie.set("trestle:sidebar", "collapsed");
     } else if ($(document).width() >= 768) {
       sidebar.addClass('expanded');
-      document.cookie = "trestle:sidebar=expanded; path=/";
+      Trestle.cookie.set("trestle:sidebar", "expanded");
     }
   });
+
+
+  // Toggle navigation groups
+
+  sidebar.find('.nav-header a').on('click', function(e) {
+    e.preventDefault();
+
+    $(this).closest('ul').toggleClass('collapsed');
+
+    var collapsed = sidebar.find('.collapsed .nav-header a').map(function() {
+      return $(this).attr('href').replace(/^#/, '');
+    }).toArray();
+
+    Trestle.cookie.set("trestle:navigation:collapsed", collapsed.join(","))
+  });
+
+
+  // Scroll sidebar to active item
+
+  var active = sidebar.find('.active');
+  sidebar.find('.app-sidebar-inner').scrollTop(active.offset().top - 100);
 });

data/app/assets/stylesheets/trestle/components/_alerts.scss

@@ -22,6 +22,10 @@
     margin-bottom: 0;
   }
 
+  a {
+    color: white;
+  }
+
   @include mobile {
     padding: 5px 10px;
 
@@ -57,3 +61,27 @@
     }
   }
 }
+
+.toggle-debug-errors {
+  &:hover, &:focus {
+    text-decoration: none;
+  }
+
+  &:after {
+    @extend .ion;
+    content: $ionicon-var-chevron-down;
+    font-size: 10px;
+    margin-left: 5px;
+  }
+}
+
+.debug-errors {
+  overflow: hidden;
+
+  ul {
+    list-style: none;
+    margin: 5px 0 0 0;
+    padding: 0 0 0 5px;
+    border-left: 4px solid rgba(white, 0.25);
+  }
+}

data/app/assets/stylesheets/trestle/components/_navigation.scss

@@ -38,7 +38,8 @@
     vertical-align: 0;
   }
 
-  .nav-header {
+  .nav-header a {
+    position: relative;
     color: rgba(white, 0.25);
 
     text-transform: uppercase;
@@ -46,6 +47,24 @@
     font-size: 11px;
 
     padding: 5px 20px;
+
+    &:after {
+      @extend .ion;
+      content: $ionicon-var-arrow-down-b;
+
+      float: right;
+      margin-top: 2px;
+
+      opacity: 0.75;
+    }
+
+    &:hover, &:focus {
+      background: none;
+
+      &:after {
+        opacity: 1.0;
+      }
+    }
   }
 
   .active a {
@@ -62,14 +81,30 @@
     position: relative;
     top: 1px;
   }
+
+  .collapsed {
+    li {
+      display: none;
+
+      &.nav-header {
+        display: block;
+      }
+    }
+  }
 }
 
 @mixin collapsed-nav-header {
-  border-bottom: 1px solid rgba(white, 0.1);
   height: 0;
-  margin: 0 15px 14px;
-  padding: 5px 0;
+  padding: 10px 15px 15px;
   text-indent: -99999px;
+
+  &:after {
+    display: block;
+    float: none;
+    margin-top: -12px;
+    content: '';
+    border-bottom: 1px solid rgba(white, 0.1);
+  }
 }
 
 @include tablet {
@@ -78,7 +113,7 @@
       display: none;
     }
 
-    .nav-header {
+    .nav-header a {
       @include collapsed-nav-header;
     }
 
@@ -104,7 +139,7 @@
       display: none;
     }
 
-    .nav-header {
+    .nav-header a {
       @include collapsed-nav-header;
     }
   }

data/app/helpers/trestle/hook_helper.rb

@@ -1,13 +1,18 @@
 module Trestle
   module HookHelper
     def hook(name)
-      safe_join(Trestle.config.hooks[name.to_s].map { |hook|
+      safe_join(hooks[name.to_s].map { |hook|
         instance_exec(&hook)
-      }, "\n")
+      }, "\n") if hook?(name)
     end
 
     def hook?(name)
-      Trestle.config.hooks[name.to_s].any?
+      hooks.key?(name.to_s) && hooks[name.to_s].any?
+    end
+
+  protected
+    def hooks
+      Trestle.config.hooks
     end
   end
 end

data/app/views/trestle/application/_alert.html.erb

@@ -6,5 +6,7 @@
   <div class="alert-content">
     <h3><%= title %></h3>
     <p><%= message %></p>
+
+    <%= yield if block_given? %>
   </div>
 </div>

data/app/views/trestle/application/_flash.html.erb

@@ -4,8 +4,22 @@
                       title: t("trestle.flash.success.title", default: "Success!"),
                       message: flash[:message] %>
 <% elsif flash[:error] -%>
-  <%= render "alert", html_class: "alert-danger",
-                      icon: icon("alert-icon ion-ios-close-outline"),
-                      title: t("trestle.flash.failure.title", default: "Warning!"),
-                      message: flash[:error] %>
+  <%= render layout: "alert",
+             locals: {
+               html_class: "alert-danger",
+               icon: icon("alert-icon ion-ios-close-outline"),
+               title: t("trestle.flash.failure.title", default: "Warning!"),
+               message: flash[:error]
+             } do %>
+    <%- if Trestle.config.debug_form_errors && instance && instance.errors.any? -%>
+      <%= link_to "Debug errors", "#debug-errors", class: "toggle-debug-errors small", data: { toggle: "collapse" } %>
+      <div id="debug-errors" class="debug-errors collapse">
+        <ul>
+          <% instance.errors.each do |key, message| %>
+            <li class="small"><tt><%= key %>:</tt> <%= message %></li>
+          <% end %>
+        </ul>
+      </div>
+    <%- end -%>
+  <% end %>
 <% end -%>

data/app/views/trestle/resource/edit.html.erb

@@ -1,4 +1,4 @@
-<% title = t("admin.titles.edit", default: "Editing %{model_name}", model_name: admin.model_name, pluralized_model_name: admin.model_name.pluralize) %>
+<% title = t("admin.titles.edit", default: "Editing %{model_name}", model_name: admin.model_name.titleize, pluralized_model_name: admin.model_name.plural.titleize) %>
 
 <% content_for(:title, title) %>
 <% breadcrumb title %>

data/app/views/trestle/resource/index.html.erb

@@ -1,7 +1,10 @@
-<% content_for(:title, t("admin.titles.index", default: "Listing %{pluralized_model_name}", model_name: admin.model_name, pluralized_model_name: admin.model_name.pluralize)) %>
+<% content_for(:title, t("admin.titles.index", default: "Listing %{pluralized_model_name}", model_name: admin.model_name.titleize, pluralized_model_name: admin.model_name.plural.titleize)) %>
 
 <% content_for(:primary_toolbar) do %>
-  <%= link_to icon("fa fa-plus"), admin.path(:new), class: "btn btn-default btn-lg" unless admin.readonly? %>
+  <%= link_to admin.path(:new), class: "btn btn-default btn-lg" do %>
+    <%= icon("fa fa-plus") %>
+    <span class="sr-only"><%= t("admin.buttons.new", default: "New %{model_name}", model_name: admin.model_name) %></span>
+  <% end unless admin.readonly? %>
 <% end %>
 
 <% content_for(:utilities) do %>

data/app/views/trestle/resource/new.html.erb

@@ -1,4 +1,4 @@
-<% title = t("admin.titles.new", default: "New %{model_name}", model_name: admin.model_name, pluralized_model_name: admin.model_name.pluralize) %>
+<% title = t("admin.titles.new", default: "New %{model_name}", model_name: admin.model_name.titleize, pluralized_model_name: admin.model_name.plural.titleize) %>
 
 <% content_for(:title, title) %>
 <% breadcrumb title %>

data/app/views/trestle/resource/show.html.erb

@@ -1,4 +1,4 @@
-<% title = t("admin.titles.edit", default: "Editing %{model_name}", model_name: admin.model_name, pluralized_model_name: admin.model_name.pluralize) %>
+<% title = t("admin.titles.edit", default: "Editing %{model_name}", model_name: admin.model_name.titleize, pluralized_model_name: admin.model_name.plural.titleize) %>
 
 <% content_for(:title, title) %>
 <% breadcrumb title %>

data/app/views/trestle/shared/_sidebar.html.erb

@@ -12,10 +12,11 @@
 
   <div class="app-sidebar-inner">
     <nav class="app-nav">
+      <% collapsed = cookies["trestle:navigation:collapsed"].try(:split, ",") || [] %>
       <% Trestle.navigation.each do |group, items| %>
-        <ul>
+        <ul<% if group.present? && collapsed.include?(group.id) %> class="collapsed"<% end %>>
           <% if group.present? %>
-            <li class="nav-header"><%= group.label %></li>
+            <li class="nav-header"><%= link_to group.label, "##{group.id}" %></li>
           <% end %>
 
           <% items.each do |item| %>

data/config/locales/en.yml

@@ -7,15 +7,15 @@ en:
     flash:
       success:
         title: "Success!"
-        create: "The %{model_name} was successfully created."
-        update: "The %{model_name} was successfully updated."
-        destroy: "The %{model_name} was successfully deleted."
+        create: "The %{lowercase_model_name} was successfully created."
+        update: "The %{lowercase_model_name} was successfully updated."
+        destroy: "The %{lowercase_model_name} was successfully deleted."
 
       failure:
         title: "Warning!"
         create: "Please correct the errors below."
         update: "Please correct the errors below."
-        destroy: "Could not delete %{model_name}."
+        destroy: "Could not delete %{lowercase_model_name}."
 
     helpers:
       page_entries_info:
@@ -37,9 +37,11 @@ en:
   admin:
     titles:
       index: Listing %{pluralized_model_name}
+      new: New %{model_name}
       edit: Editing %{model_name}
 
     buttons:
+      new: New %{model_name}
       save: Save %{model_name}
       delete: Delete %{model_name}
 

data/config/locales/nl.rb

@@ -0,0 +1,18 @@
+{
+  nl: {
+    date: {
+      formats: {
+        trestle_date: proc { |date| "#{date.day} %b %Y" },
+        trestle_calendar: "%-d-%-m-%Y"
+      }
+    },
+
+    time: {
+      formats: {
+        trestle_date: proc { |time| "#{time.day} %b %Y" },
+        trestle_time: "%R %p",
+        trestle_time_with_seconds: "%T %p"
+      }
+    }
+  }
+}

data/config/locales/nl.yml

@@ -0,0 +1,67 @@
+nl:
+  trestle:
+    title: Trestle Admin
+    footer: Powered by Trestle
+    version: Versie
+
+    flash:
+      success:
+        title: "Gelukt!"
+        create: "De %{model_name} succesvol toegevoegd."
+        update: "De %{model_name} is succesvol gewijzigd."
+        destroy: "De %{model_name} is succesvol verwijderd."
+
+      failure:
+        title: "Waarschuwing!"
+        create: "Kon niet toevoegen om de volgende redenen."
+        update: "Kon niet aanpassen om de volgende redenen."
+        destroy: "Kon %{model_name} niet verwijderen."
+
+    helpers:
+      page_entries_info:
+        one_page:
+          display_entries:
+            zero: "Geen %{entry_name} gevonden"
+            one: "<strong>1</strong> %{entry_name} wordt weergeven"
+            other: "<strong>Alle %{count}</strong> %{entry_name} worden weergeven"
+
+        more_pages:
+          display_entries: "%{entry_name} <strong>%{first}&nbsp;-&nbsp;%{last}</strong> van de <b>%{total}</b> worden weergeven"
+
+    onboarding:
+      welcome: Welkom bij Trestle
+      no_admins: Voeg een admin toe in <code>app/admin</code> om te beginnen.
+      no_template: Maak <code>%{path}</code> aan om dit template aan te passen.
+      no_form: Definieer een form block of maak een <code>_form.html</code> partial.
+
+  admin:
+    titles:
+      index: Lijst van %{pluralized_model_name}
+      edit: "%{model_name} aanpassen"
+
+    buttons:
+      save: "%{model_name} opslaan"
+      delete: "%{model_name} verwijderen"
+
+    breadcrumbs:
+      home: Home
+
+    table:
+      headers:
+        id: ID
+
+    form:
+      select:
+        prompt: "- Selecteer %{attribute_name} -"
+
+    confirmation:
+      title: Weer je het zeker?
+      delete: Verwijderen
+      cancel: Annuleren
+
+    ui:
+      toggle_navigation: "Navigation tonen/verbergen"
+      toggle_sidebar: "Sidebar tonen/verbergen"
+
+    format:
+      blank: Geen

data/config/locales/pt-BR.rb

@@ -0,0 +1,18 @@
+{
+  'pt-BR': {
+    date: {
+      formats: {
+        trestle_date: proc { |date| "#{date.day}º %b %Y" },
+        trestle_calendar: "%-m/%-d/%Y"
+      }
+    },
+
+    time: {
+      formats: {
+        trestle_date: proc { |time| "#{time.day}º %b %Y" },
+        trestle_time: "%-l:%M %p",
+        trestle_time_with_seconds: "%l:%M:%S %p"
+      }
+    }
+  }
+}

data/config/locales/pt-BR.yml

@@ -0,0 +1,69 @@
+pt-BR:
+  trestle:
+    title: Trestle Admin
+    footer: Powered by Trestle
+    version: Versão
+
+    flash:
+      success:
+        title: "Sucesso!"
+        create: "O %{model_name} foi criado com sucesso."
+        update: "O %{model_name} foi atualizado com sucesso."
+        destroy: "O %{model_name} foi deletado com sucesso."
+
+      failure:
+        title: "Atenção!"
+        create: "Por favor corrija os erros abaixo."
+        update: "Por favor corrija os erros abaixo."
+        destroy: "Falha ao excluir %{model_name}."
+
+    helpers:
+      page_entries_info:
+        one_page:
+          display_entries:
+            zero: "Nenhum %{entry_name} encontrado"
+            one: "Mostrando <strong>1</strong> %{entry_name}"
+            other: "Mostrando <strong>all %{count}</strong> %{entry_name}"
+
+        more_pages:
+          display_entries: "Mostrando %{entry_name} <strong>%{first}&nbsp;-&nbsp;%{last}</strong> de <b>%{total}</b>"
+
+    onboarding:
+      welcome: Bem-vindo ao Trestle
+      no_admins: Para começar, crie um admin dentro de <code>app/admin</code>.
+      no_template: Para personalizar este template, crie <code>%{path}</code>.
+      no_form: Defina um bloco de formulário ou crie um <code>_form.html</code> parcial.
+  
+  admin:
+    titles:
+      index: Listando %{pluralized_model_name}
+      new: Novo %{model_name}
+      edit: Editando %{model_name}
+
+    buttons:
+      new: Novo %{model_name}
+      save: Salvar %{model_name}
+      delete: Excluir %{model_name}
+
+    breadcrumbs:
+      home: Home
+
+    table:
+      headers:
+        id: ID
+
+    form:
+      select:
+        prompt: "- Selecione %{attribute_name} -"
+
+    confirmation:
+      title: Você tem certeza?
+      delete: Excluir
+      cancel: Cancelar
+
+    ui:
+      toggle_navigation: Alternar naveção
+      toggle_sidebar: Alternar barra lateral
+
+    format:
+      blank: Nenhum

data/gemfiles/rails-4.2.gemfile

@@ -0,0 +1,14 @@
+source 'https://rubygems.org'
+
+group :test do
+  gem 'coveralls', require: false
+  gem 'simplecov', require: false
+
+  gem 'capybara'
+  gem 'capybara-selenium'
+  gem 'selenium-webdriver'
+end
+
+gem 'rails', '~> 4.2.0'
+
+gemspec :path => "../"

data/gemfiles/rails-5.0.gemfile

@@ -0,0 +1,14 @@
+source 'https://rubygems.org'
+
+group :test do
+  gem 'coveralls', require: false
+  gem 'simplecov', require: false
+
+  gem 'capybara'
+  gem 'capybara-selenium'
+  gem 'selenium-webdriver'
+end
+
+gem 'rails', '~> 5.0.0'
+
+gemspec :path => "../"

data/gemfiles/rails-5.1.gemfile

@@ -0,0 +1,14 @@
+source 'https://rubygems.org'
+
+group :test do
+  gem 'coveralls', require: false
+  gem 'simplecov', require: false
+
+  gem 'capybara'
+  gem 'capybara-selenium'
+  gem 'selenium-webdriver'
+end
+
+gem 'rails', '~> 5.1.0'
+
+gemspec :path => "../"

data/gemfiles/rails-edge.gemfile

@@ -0,0 +1,15 @@
+source 'https://rubygems.org'
+
+group :test do
+  gem 'coveralls', require: false
+  gem 'simplecov', require: false
+
+  gem 'capybara'
+  gem 'capybara-selenium'
+  gem 'selenium-webdriver'
+end
+
+gem 'rails', github: 'rails/rails'
+gem 'arel', github: 'rails/arel'
+
+gemspec :path => "../"

data/lib/generators/trestle/install/templates/trestle.rb.erb

@@ -105,4 +105,10 @@ Trestle.configure do |config|
   # end
   #
   # config.form_field :custom, CustomFormField
+
+  # == Debugging Options
+  #
+  # Enable debugging of form errors. Defaults to true in development mode.
+  #
+  # config.debug_form_errors = true
 end

data/lib/trestle.rb

@@ -18,6 +18,7 @@ module Trestle
   autoload :Configuration
   autoload :Display
   autoload :Form
+  autoload :ModelName
   autoload :Navigation
   autoload :Options
   autoload :Reloader

data/lib/trestle/configuration.rb

@@ -64,7 +64,7 @@ module Trestle
     option :persistent_params, [:sort, :order, :scope]
 
     # List of methods to try calling on an instance when displayed by the `display` helper
-    option :display_methods, [:display_name, :full_name, :name, :title, :username, :login, :email, :to_s]
+    option :display_methods, [:display_name, :full_name, :name, :title, :username, :login, :email]
 
     # Default adapter class used by all admin resources
     option :default_adapter, Adapters.compose(Adapters::ActiveRecordAdapter, Adapters::DraperAdapter)
@@ -86,6 +86,12 @@ module Trestle
     option :javascript_i18n_keys, ["admin.confirmation.title", "admin.confirmation.delete", "admin.confirmation.cancel"]
 
 
+    ## Debugging
+
+    # Enable debugging of form errors
+    option :debug_form_errors, Rails.env.development?
+
+
     ## Callbacks
 
     Action = Struct.new(:options, :block)

data/lib/trestle/display.rb

@@ -14,7 +14,7 @@ module Trestle
 
   private
     def display_method
-      @display_method ||= Trestle.config.display_methods.find { |m| @instance.respond_to?(m) }
+      @display_method ||= Trestle.config.display_methods.find { |m| @instance.respond_to?(m) } || :to_s
     end
   end
 end

data/lib/trestle/model_name.rb

@@ -0,0 +1,64 @@
+require "active_model/naming"
+
+module Trestle
+  class ModelName
+    attr_reader :klass
+
+    delegate :downcase, :upcase, :titleize, :titlecase, to: :to_s
+
+    def initialize(klass)
+      @klass = klass
+      @name = klass.respond_to?(:model_name) ? klass.model_name : ActiveModel::Name.new(klass)
+    end
+
+    def ==(other)
+      other.is_a?(self.class) && klass == other.klass
+    end
+
+    def to_s
+      singular
+    end
+
+    def singular(options={})
+      human(default_singular, options)
+    end
+    alias_method :singularize, :singular
+
+    def plural(options={})
+      if i18n_supported? && i18n_pluralizations_available?
+        human(default_plural, { count: :many }.merge(options))
+      else
+        default_plural
+      end
+    end
+    alias_method :pluralize, :plural
+
+  protected
+    # Default singular version if it cannot be determined from i18n
+    def default_singular
+      @name.name.demodulize.titleize
+    end
+
+    # Default plural version if it cannot be determined from i18n
+    def default_plural
+      singular.pluralize(I18n.locale)
+    end
+
+    # Safely delegates to ActiveModel::Name#human, catching exceptions caused by missing pluralizations
+    def human(default, options={})
+      @name.human(options.merge(default: default))
+    rescue I18n::InvalidPluralizationData
+      default
+    end
+
+    # Checks if the model can be translated by ActiveModel
+    def i18n_supported?
+      klass.respond_to?(:lookup_ancestors) && klass.respond_to?(:i18n_scope)
+    end
+
+    # Checks if multiple pluralization forms (e.g. zero/one/few/many/other) are available from i18n
+    def i18n_pluralizations_available?
+      @name.human(count: nil).is_a?(Hash)
+    end
+  end
+end

data/lib/trestle/navigation/group.rb

@@ -40,6 +40,10 @@ module Trestle
       def label
         I18n.t("admin.navigation.groups.#{name}", default: name.to_s.titlecase)
       end
+
+      def id
+        name.to_s.parameterize
+      end
     end
 
     class NullGroup
@@ -59,6 +63,10 @@ module Trestle
         NullGroup.hash
       end
 
+      def id
+        nil
+      end
+
       def <=>(other)
         -1
       end

data/lib/trestle/navigation/item.rb

@@ -40,7 +40,7 @@ module Trestle
       end
 
       def label
-        I18n.t("admin.navigation.items.#{name}", default: name.to_s.titlecase)
+        options[:label] || I18n.t("admin.navigation.items.#{name}", default: name.to_s.titlecase)
       end
 
       def icon

data/lib/trestle/options.rb

@@ -4,13 +4,15 @@ module Trestle
       self[hash]
     end
 
-    def merge(other)
-      dup.merge!(other)
+    def merge(other, &block)
+      dup.merge!(other, &block)
     end
 
-    def merge!(other)
-      deep_merge!(other || {}) do |key, v1, v2|
-        if v1.is_a?(Array)
+    def merge!(other, &block)
+      super(other || {}) do |key, v1, v2|
+        if v1.is_a?(Hash) && v2.is_a?(Hash)
+          v1.merge(v2, &block)
+        elsif v1.is_a?(Array)
           v1 + Array(v2)
         else
           v2

data/lib/trestle/resource.rb

@@ -119,7 +119,7 @@ module Trestle
       end
 
       def model_name
-        options[:as] || default_model_name
+        @model_name ||= Trestle::ModelName.new(model)
       end
 
       def readonly?
@@ -127,7 +127,7 @@ module Trestle
       end
 
       def breadcrumb
-        Breadcrumb.new(model_name.pluralize, path)
+        Breadcrumb.new(model_name.plural.titleize, path)
       end
 
       def routes
@@ -150,15 +150,6 @@ module Trestle
       rescue NameError
         raise NameError, "Unable to find model #{admin_name.classify}. Specify a different model using Trestle.resource(:#{admin_name}, model: MyModel)"
       end
-
-      def default_model_name
-        if model.respond_to?(:model_name)
-          model_name = model.model_name
-          model_name.respond_to?(:human) ? model_name.human : model_name.to_s.titleize
-        else
-          model.name.titleize
-        end
-      end
     end
   end
 end

data/lib/trestle/resource/controller.rb

@@ -25,7 +25,7 @@ module Trestle
         if admin.save_instance(instance)
           respond_to do |format|
             format.html do
-              flash[:message] = flash_message("success.create", default: "The %{model_name} was successfully created.")
+              flash[:message] = flash_message("success.create", default: "The %{lowercase_model_name} was successfully created.")
               redirect_to action: :show, id: admin.to_param(instance)
             end
             format.json { render json: instance, status: :created, location: { action: :show, id: admin.to_param(instance) } }
@@ -62,7 +62,7 @@ module Trestle
         if admin.save_instance(instance)
           respond_to do |format|
             format.html do
-              flash[:message] = flash_message("success.update", default: "The %{model_name} was successfully updated.")
+              flash[:message] = flash_message("success.update", default: "The %{lowercase_model_name} was successfully updated.")
               redirect_to action: :show, id: admin.to_param(instance)
             end
             format.json { render json: instance, status: :ok }
@@ -86,12 +86,17 @@ module Trestle
         respond_to do |format|
           format.html do
             if success
-              flash[:message] = flash_message("success.destroy", default: "The %{model_name} was successfully deleted.")
+              flash[:message] = flash_message("success.destroy", default: "The %{lowercase_model_name} was successfully deleted.")
+              redirect_to action: :index
             else
-              flash[:message] = flash_message("failure.destroy", default: "Could not delete %{model_name}.")
-            end
+              flash[:error] = flash_message("failure.destroy", default: "Could not delete %{lowercase_model_name}.")
 
-            redirect_to action: :index
+              if self.instance = admin.find_instance(params)
+                redirect_to action: :show, id: admin.to_param(instance)
+              else
+                redirect_to action: :index
+              end
+            end
           end
           format.json { head :no_content }
           format.js
@@ -106,7 +111,7 @@ module Trestle
       helper_method :instance
 
       def flash_message(type, options={})
-        t("trestle.flash.#{type}", options.merge(model_name: admin.model_name.underscore.humanize(capitalize: false)))
+        t("trestle.flash.#{type}", options.merge(model_name: admin.model_name, lowercase_model_name: admin.model_name.downcase))
       end
     end
   end

data/lib/trestle/table.rb

@@ -9,11 +9,13 @@ module Trestle
     autoload :SelectColumn
     autoload :Row
 
-    attr_reader :columns, :options
+    attr_reader :columns, :options, :admin
     attr_writer :row
 
     def initialize(options={})
       @options = options
+      @admin = Trestle.lookup(options[:admin]) if options.key?(:admin)
+
       @columns = []
     end
 

data/lib/trestle/table/actions_column.rb

@@ -1,10 +1,10 @@
 module Trestle
   class Table
     class ActionsColumn
-      attr_reader :table, :block
+      attr_reader :table, :options, :block
 
-      def initialize(table, &block)
-        @table = table
+      def initialize(table, options={}, &block)
+        @table, @options = table, options
         @block = block_given? ? block : default_actions
       end
 
@@ -23,37 +23,40 @@ module Trestle
 
         delegate :table, to: :@column
 
+        delegate :icon, :admin_url_for, :concat, :link_to, to: :@template
+
         def initialize(column, template, instance)
           @column, @template, @instance = column, template, instance
         end
 
+        def show
+          button(icon("fa fa-info"), admin_url_for(instance, admin: table.admin, action: :show), class: "btn-info")
+        end
+
+        def edit
+          button(icon("fa fa-pencil"), admin_url_for(instance, admin: table.admin, action: :edit), class: "btn-warning")
+        end
+
         def delete
-          button(@template.icon("fa fa-trash"), @template.admin_url_for(instance, admin: table.options[:admin], action: :destroy), method: :delete, class: "btn-danger", data: { toggle: "confirm-delete", placement: "left" })
+          button(icon("fa fa-trash"), admin_url_for(instance, admin: table.admin, action: :destroy), method: :delete, class: "btn-danger", data: { toggle: "confirm-delete", placement: "left" })
         end
 
         def button(content, url, options={})
           options[:class] = Array(options[:class])
           options[:class] << "btn" unless options[:class].include?("btn")
 
-          @template.concat @template.link_to(content, url, options)
+          concat link_to(content, url, options)
         end
         alias_method :link, :button
       end
 
       class Renderer < Column::Renderer
         def header
+          options[:header]
         end
 
         def classes
-          "actions"
-        end
-
-        def options
-          {}
-        end
-
-        def data
-          {}
+          super + ["actions"]
         end
 
         def content(instance)

data/lib/trestle/table/automatic.rb

@@ -3,7 +3,6 @@ module Trestle
     class Automatic < Table
       def initialize(admin)
         super(sortable: true, admin: admin)
-        @admin = admin
       end
 
       def columns
@@ -11,7 +10,7 @@ module Trestle
       end
 
       def content_columns
-        @admin.default_table_attributes.map.with_index do |attribute, index|
+        admin.default_table_attributes.map.with_index do |attribute, index|
           case attribute.type
           when :association
             Column.new(self, attribute.association_name, sort: false)

data/lib/trestle/table/builder.rb

@@ -25,8 +25,8 @@ module Trestle
         table.columns << Column.new(table, field, options, &(proc || block))
       end
 
-      def actions(&block)
-        table.columns << ActionsColumn.new(table, &block)
+      def actions(options={}, &block)
+        table.columns << ActionsColumn.new(table, options, &block)
       end
     end
   end

data/lib/trestle/table/column.rb

@@ -31,8 +31,8 @@ module Trestle
       def header
         if options[:header]
           options[:header]
-        elsif admin = table.options[:admin]
-          admin.human_attribute_name(field)
+        elsif table.admin
+          table.admin.human_attribute_name(field)
         else
           field.to_s.humanize.titleize
         end
@@ -62,7 +62,7 @@ module Trestle
             content = @template.admin_link_to(content, value)
           elsif options[:link]
             # Explicitly link to the specified admin, or the table's admin
-            content = @template.admin_link_to(content, instance, admin: options[:admin] || @column.table.options[:admin])
+            content = @template.admin_link_to(content, instance, admin: options[:admin] || @column.table.admin)
           end
 
           content

data/lib/trestle/table/row.rb

@@ -21,7 +21,7 @@ module Trestle
 
         def options(instance)
           options = Trestle::Options.new
-          options.merge!(data: { url: admin_url_for(instance) }) if table.options[:admin]
+          options.merge!(data: { url: admin_url_for(instance) }) if table.admin
           options.merge!(@row.options)
           options.merge!(@template.instance_exec(instance, &@row.block)) if @row.block
           options
@@ -29,7 +29,7 @@ module Trestle
 
       protected
         def admin_url_for(instance)
-          @template.admin_url_for(instance, admin: table.options[:admin])
+          @template.admin_url_for(instance, admin: table.admin)
         end
       end
     end

data/lib/trestle/version.rb

@@ -1,3 +1,3 @@
 module Trestle
-  VERSION = "0.8.4"
+  VERSION = "0.8.5"
 end

data/trestle.gemspec

@@ -34,6 +34,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = ">= 2.2.2"
 
   spec.add_dependency "railties",           ">= 4.2.0"
+  spec.add_dependency "activemodel",        ">= 4.2.0"
   spec.add_dependency "sass-rails",         "~> 5.0.6"
   spec.add_dependency "autoprefixer-rails", "~> 7.1.2"
   spec.add_dependency "kaminari",           "~> 1.0.1"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trestle
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.5
 platform: ruby
 authors:
 - Sam Pohlenz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-24 00:00:00.000000000 Z
+date: 2017-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.0
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
@@ -168,6 +182,7 @@ files:
 - app/assets/images/trestle/textures/billie-holiday.png
 - app/assets/images/trestle/textures/bright-squares.png
 - app/assets/javascripts/trestle/_confirmation.js
+- app/assets/javascripts/trestle/_cookies.js
 - app/assets/javascripts/trestle/_datepicker.js
 - app/assets/javascripts/trestle/_errors.js
 - app/assets/javascripts/trestle/_form.js
@@ -264,7 +279,15 @@ files:
 - bower.json
 - config/locales/en.rb
 - config/locales/en.yml
+- config/locales/nl.rb
+- config/locales/nl.yml
+- config/locales/pt-BR.rb
+- config/locales/pt-BR.yml
 - config/routes.rb
+- gemfiles/rails-4.2.gemfile
+- gemfiles/rails-5.0.gemfile
+- gemfiles/rails-5.1.gemfile
+- gemfiles/rails-edge.gemfile
 - lib/generators/trestle/admin/admin_generator.rb
 - lib/generators/trestle/admin/templates/admin.rb.erb
 - lib/generators/trestle/admin/templates/index.html.erb
@@ -329,6 +352,7 @@ files:
 - lib/trestle/form/fields/url_field.rb
 - lib/trestle/form/fields/week_field.rb
 - lib/trestle/form/renderer.rb
+- lib/trestle/model_name.rb
 - lib/trestle/navigation.rb
 - lib/trestle/navigation/block.rb
 - lib/trestle/navigation/group.rb
@@ -560,7 +584,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: A modern, responsive admin framework for Ruby on Rails