trestle 0.9.5 → 0.9.7

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

@@ -2,6 +2,6 @@
   <%= render "trestle/flash/alert", html_class: "alert-success", icon: icon("alert-icon far fa-check-circle"), alert: normalize_flash_alert(flash[:message]) %>
 <% elsif flash[:error] -%>
   <%= render layout: "trestle/flash/alert", locals: { html_class: "alert-danger", icon: icon("alert-icon far fa-times-circle"), alert: normalize_flash_alert(flash[:error]) } do %>
-    <%= render "trestle/flash/debug" if debug_form_errors? %>
+    <%= render "trestle/flash/debug", errors: instance.errors if debug_form_errors? %>
   <% end %>
 <% end -%>

data/config/routes.rb

@@ -1,5 +1,5 @@
 Trestle::Engine.routes.draw do
-  Trestle.admins.each do |name, admin|
+  Trestle.registry.each do |admin|
     instance_eval(&admin.routes)
   end
 

data/frontend/css/components/_alerts.scss

@@ -32,13 +32,18 @@
 
 .alert-icon {
   margin-right: $alert-padding-x;
+
   font-size: 40px;
+  width: 40px;
+
+  text-align: center;
 
   @include media-breakpoint-down(sm) {
     margin-left: $alert-padding-x * 0.25;
     margin-right: $alert-padding-x * 0.75;
 
     font-size: 32px;
+    width: 32px;
   }
 }
 
@@ -74,10 +79,16 @@
   border-color: $border;
 
   a {
+    color: $color;
+
     &:hover, &:focus {
       color: mix($color, $background, 80%);
     }
   }
+
+  code {
+    color: $color;
+  }
 }
 
 .alert-success {
@@ -88,6 +99,26 @@
   @include alert-variant($alert-danger-bg, $alert-danger-border, $alert-danger-color);
 }
 
+.alert-info {
+  @include alert-variant($alert-info-bg, $alert-info-border, $alert-info-color);
+}
+
+.alert-warning {
+  @include alert-variant($alert-warning-bg, $alert-warning-border, $alert-warning-color);
+}
+
+.alert-light {
+  @include alert-variant($alert-light-bg, $alert-light-border, $alert-light-color);
+}
+
+.alert-dark {
+  @include alert-variant($alert-dark-bg, $alert-dark-border, $alert-dark-color);
+}
+
+.alert-primary {
+  @include alert-variant($alert-primary-bg, $alert-primary-border, $alert-primary-color);
+}
+
 
 // Debug errors
 

data/frontend/css/components/_avatar.scss

@@ -41,3 +41,17 @@
     font-weight: 500;
   }
 }
+
+.avatar-sm {
+  width: 24px !important;
+  height: 24px !important;
+}
+
+.avatar-lg {
+  width: 64px !important;
+  height: 64px !important;
+
+  .avatar-fallback {
+    font-size: 1.5rem;
+  }
+}

data/frontend/css/components/_buttons.scss

@@ -1,5 +1,4 @@
 .btn {
-  border-width: 0;
   box-shadow: none;
 
   &.loading {

data/frontend/css/components/_datepicker.scss

@@ -13,6 +13,7 @@
 
   &:hover, &:focus {
     color: #aaa;
+    text-decoration: none;
   }
 
   &::before {

data/frontend/css/components/_modal.scss

@@ -24,6 +24,8 @@
   }
 
   &.background {
+    overflow-y: hidden;
+
     .modal-dialog {
       transform: scale(0.9);
       opacity: 0.75;

data/frontend/css/components/_tags.scss

@@ -16,6 +16,8 @@
 }
 
 a.tag {
+  font-weight: inherit;
+
   &:hover, &:focus {
     text-decoration: none;
     color: $tag-hover-color;

data/frontend/css/components/_timestamp.scss

@@ -4,7 +4,7 @@
 
   small {
     display: block;
-    color: #666;
+    opacity: 0.75;
   }
 
   &.timestamp-inline,

data/frontend/css/layout/_sidebar.scss

@@ -16,11 +16,13 @@
   height: $header-height;
 
   display: flex;
-  align-items: center;
+  align-items: stretch;
 
   .navbar-toggler {
     outline: none;
 
+    align-self: center;
+
     margin-left: $grid-gutter-width / 2;
     margin-right: $grid-gutter-width / 2;
 
@@ -44,7 +46,6 @@
   display: flex;
   align-items: center;
 
-  height: 100%;
   padding: 10px 15px;
 
   font-size: 1.4rem;

data/frontend/css/variables/_bootstrap.scss

@@ -7,6 +7,7 @@ $theme-colors: (
   "warning": #f3bd71,
   "danger":  #e17572,
   "light":   #bbbbbb,
+  "dark":    #444444,
 
   // Backwards compatibility
   "default": #bbbbbb

data/frontend/css/variables/_trestle.scss

@@ -101,6 +101,26 @@ $alert-danger-bg:      #de7471;
 $alert-danger-color:   white;
 $alert-danger-border:  #d85956;
 
+$alert-info-bg:        darken(theme-color("info"), 10%);
+$alert-info-color:     white;
+$alert-info-border:    darken($alert-info-bg, 10%);
+
+$alert-warning-bg:     darken(theme-color("warning"), 5%);
+$alert-warning-color:  white;
+$alert-warning-border: darken($alert-warning-bg, 5%);
+
+$alert-light-bg:       theme-color("light");
+$alert-light-color:    $body-color;
+$alert-light-border:   darken($alert-light-bg, 5%);
+
+$alert-dark-bg:        theme-color("dark");
+$alert-dark-color:     white;
+$alert-dark-border:    darken($alert-dark-bg, 10%);
+
+$alert-primary-bg:     darken(theme-color("primary"), 5%);
+$alert-primary-color:  white;
+$alert-primary-border: darken($alert-primary-bg, 10%);
+
 
 // Modals
 

data/frontend/js/components/dialog.js

@@ -20,14 +20,19 @@ function createElement () {
     focus: false
   })
 
-  // Remove dialog elements once hidden
   $el.on('hidden.bs.modal', function () {
+    // Restore modal-open class on body if background modals still visible
+    if ($el.prevAll('.modal.show').length) {
+      $(document.body).addClass('modal-open')
+    }
+
+    // Remove dialog elements once hidden
     $el.remove()
   })
 
   // Restore the next visible modal to the foreground
   $el.on('hide.bs.modal', function () {
-    $el.prevAll('.modal.in').last().removeClass('background')
+    $el.prevAll('.modal.show').last().removeClass('background')
   })
 
   // Set X-Trestle-Dialog header on AJAX requests initiated from the dialog
@@ -120,7 +125,7 @@ export default class Dialog {
     this.$el.modal('show')
 
     // Background any existing visible modals
-    this.$el.prevAll('.modal.in').addClass('background')
+    this.$el.prevAll('.modal.show').addClass('background')
   }
 
   hide () {

data/frontend/theme/trestle/theme/_defaults.scss

@@ -8,7 +8,7 @@ $theme-colors: (
 $theme-color-interval: 8% !default;
 
 // The yiq lightness value that determines when the lightness of color changes from "dark" to "light". Acceptable values are between 0 and 255.
-$yiq-contrasted-threshold: 150 !default;
+$yiq-contrasted-threshold: 175 !default;
 
 // Customize the light and dark text colors for use in our YIQ color contrast function.
 $yiq-text-dark:  #212529 !default;
@@ -115,9 +115,9 @@ $badge-focus-width: $input-btn-focus-width !default;
 
 // Alerts
 
-$alert-bg-level:     -10 !default;
-$alert-border-level: -9 !default;
-$alert-color-level:  6 !default;
+$alert-bg-level:     2 !default;
+$alert-border-level: 3 !default;
+$alert-color-level:  -12 !default;
 
 
 // Progress bars

data/lib/generators/trestle/install/templates/_theme.scss

@@ -9,5 +9,5 @@
 //
 //   $theme-colors: (
 //     "primary":   #337ab7,
-//     "secondary": #b3b53d
+//     "secondary": #719dc3
 //   );

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

@@ -15,7 +15,7 @@ Trestle.configure do |config|
   #
   # config.site_logo_small = "logo-small.png"
 
-  # Speficy a favicon to be used within the admin.
+  # Specify a favicon to be used within the admin.
   #
   # config.favicon = "favicon.ico"
 
@@ -70,6 +70,7 @@ Trestle.configure do |config|
   # Specify helper modules to expose to the admin.
   #
   # config.helper :all
+  # config.helper -> { CustomHelper }
 
   # Register callbacks to run before, after or around all Trestle actions.
   #
@@ -103,6 +104,11 @@ Trestle.configure do |config|
   #
   # config.persistent_params << :query
 
+  # List of methods to try calling on an instance when displayed by the `display` helper.
+  # Defaults to [:display_name, :full_name, :name, :title, :username, :login, :email].
+  #
+  # config.display_methods.unshift(:admin_label)
+
   # Customize the default adapter class used by all admin resources.
   # See the documentation on Trestle::Adapters::Adapter for details on
   # the adapter methods that can be customized.
@@ -118,7 +124,7 @@ Trestle.configure do |config|
   #   def render; end
   # end
   #
-  # config.form_field :custom, CustomFormField
+  # config.form_field :custom, -> { CustomFormField }
 
   # == Debugging Options
   #

data/lib/trestle/adapters/active_record_adapter.rb

@@ -60,6 +60,8 @@ module Trestle
             Attribute::Association.new(column.name, class: -> { reflection.klass }, name: name, polymorphic: reflection.polymorphic?, type_column: reflection.foreign_type)
           elsif column.name.end_with?("_type") && (name = column.name.sub(/_type$/, '')) && (reflection = model.reflections[name])
             # Ignore type columns for polymorphic associations
+          elsif enum_column?(column)
+            Attribute.new(column.name, :enum, values: enum_values(column))
           else
             Attribute.new(column.name, column.type, array_column?(column) ? { array: true } : {})
           end
@@ -81,6 +83,20 @@ module Trestle
       def array_column?(column)
         column.respond_to?(:array?) && column.array?
       end
+
+      def enum_column?(column)
+        model.defined_enums.key?(column.name)
+      end
+
+      def enum_values(column)
+        model.defined_enums[column.name].map { |key, value|
+          [value, enum_human_name(column, key)]
+        }
+      end
+
+      def enum_human_name(column, value)
+        human_attribute_name([column.name.pluralize, value].join("."), default: value.humanize)
+      end
     end
   end
 end

data/lib/trestle/configurable.rb

@@ -15,6 +15,12 @@ module Trestle
       options.fetch(name) {
         if defaults.key?(name)
           value = defaults[name]
+
+          # Avoid references to the same instance of a default value
+          if value.respond_to?(:dup) && !value.is_a?(Proc)
+            value = value.dup
+          end
+
           assign(name, value)
         end
       }

data/lib/trestle/configuration.rb

@@ -54,18 +54,17 @@ module Trestle
       menus << Navigation::Block.new(&block)
     end
 
-
     ## Extension Options
 
     # [Internal] List of helper modules to include in all Trestle controllers
-    option :helpers, []
+    option :helpers, Lazy::List.new
 
     # [Internal] Container module for block-defined helpers
     option :helper_module, Module.new
 
     # Register global helpers available to all Trestle admins
     def helper(*helpers, &block)
-      self.helpers += helpers
+      self.helpers << helpers
       self.helper_module.module_eval(&block) if block_given?
     end
 
@@ -82,8 +81,8 @@ module Trestle
     option :default_adapter, Adapters.compose(Adapters::ActiveRecordAdapter, Adapters::DraperAdapter)
 
     # Register a custom form field class
-    def form_field(name, klass)
-      Form::Builder.register(name, klass)
+    def form_field(name, field)
+      Form::Builder.register(name, field)
     end
 
     # [Internal] List of registered hooks

data/lib/trestle/form/automatic.rb

@@ -32,6 +32,8 @@ module Trestle
                 datetime_field attribute.name
               when :boolean
                 check_box attribute.name
+              when :enum
+                collection_radio_buttons attribute.name, attribute.options[:values] || [], :first, :last
               when :json, :jsonb
                 value = instance.public_send(attribute.name)
                 text_area attribute.name, value: value.try(:to_json)

data/lib/trestle/form/builder.rb

@@ -9,7 +9,7 @@ module Trestle
       undef_method :display
 
       cattr_accessor :fields
-      self.fields = {}
+      self.fields = Lazy::Hash.new
 
       def errors(name)
         if object.respond_to?(:errors) && object.errors.respond_to?(:[])
@@ -19,14 +19,14 @@ module Trestle
         end
       end
 
-      def self.register(name, klass)
+      def self.register(name, field)
         rename_existing_helper_method(name)
-        self.fields[name] = klass
+        self.fields[name] = field
       end
 
     protected
       def respond_to_missing?(name, include_all=false)
-        self.class.fields.has_key?(name) || super
+        self.class.fields.key?(name) || super
       end
 
       def method_missing(name, *args, &block)

data/lib/trestle/form/field.rb

@@ -45,7 +45,7 @@ module Trestle
       end
 
       def readonly?
-        options[:readonly] || admin.readonly?
+        options[:readonly] || admin.try(:readonly?)
       end
 
       def normalize_options!

data/lib/trestle/form/renderer.rb

@@ -4,6 +4,9 @@ require "action_view/helpers"
 module Trestle
   class Form
     class Renderer
+      def self.ruby2_keywords(*)
+      end unless respond_to?(:ruby2_keywords, true)
+
       include ::ActionView::Context
       include ::ActionView::Helpers::CaptureHelper
 
@@ -40,7 +43,7 @@ module Trestle
         concat(result)
       end
 
-      def method_missing(name, *args, &block)
+      ruby2_keywords def method_missing(name, *args, &block)
         target = @form.respond_to?(name) ? @form : @template
 
         if block_given? && !RAW_BLOCK_HELPERS.include?(name)

data/lib/trestle/lazy.rb

@@ -0,0 +1,56 @@
+module Trestle
+  module Lazy
+    module Constantize
+      def constantize(value)
+        case value
+        when String
+          value.safe_constantize
+        when Proc
+          value.call
+        else
+          value
+        end
+      end
+    end
+
+    class List
+      include Enumerable
+      include Constantize
+
+      def initialize(*items)
+        @list = items
+      end
+
+      def each(&block)
+        @list.each do |item|
+          yield constantize(item)
+        end
+      end
+
+      def <<(items)
+        @list += Array(items)
+      end
+    end
+
+    class Hash
+      include Enumerable
+      include Constantize
+
+      delegate :[]=, :key?, to: :@hash
+
+      def initialize
+        @hash = {}
+      end
+
+      def each(&block)
+        @hash.each do |key, value|
+          yield key, constantize(value)
+        end
+      end
+
+      def [](key)
+        constantize(@hash[key])
+      end
+    end
+  end
+end

data/lib/trestle/navigation/item.rb

@@ -17,7 +17,7 @@ module Trestle
       end
 
       def <=>(other)
-        priority <=> other.priority
+        [priority, name] <=> [other.priority, other.name]
       end
 
       def priority

data/lib/trestle/registry.rb

@@ -0,0 +1,61 @@
+module Trestle
+  class Registry
+    include Enumerable
+
+    # The admins hash is left exposed for backwards compatibility
+    attr_reader :admins
+
+    def initialize
+      reset!
+    end
+
+    def each(&block)
+      @admins.values.sort_by(&:admin_name).each(&block)
+    end
+
+    def reset!
+      @admins = {}
+      @models = {}
+    end
+
+    def empty?
+      none?
+    end
+
+    def register(admin, register_model: true)
+      @admins[admin.admin_name] = admin
+
+      if register_model && register_admin_for_model_loookup?(admin)
+        @models[admin.model.name] ||= admin
+      end
+
+      admin
+    end
+
+    def lookup_admin(admin)
+      # Given object is already an admin class
+      return admin if admin.is_a?(Class) && admin < Trestle::Admin
+
+      @admins[admin.to_s]
+    end
+    alias lookup lookup_admin
+
+    def lookup_model(model)
+      # Lookup each class in the model's ancestor chain
+      while model
+        admin = @models[model.name]
+        return admin if admin
+
+        model = model.superclass
+      end
+
+      # No admin found
+      nil
+    end
+
+  private
+    def register_admin_for_model_loookup?(admin)
+      admin.respond_to?(:model) && !(admin.respond_to?(:singular?) && admin.singular?)
+    end
+  end
+end

data/lib/trestle/reloader.rb

@@ -26,7 +26,7 @@ module Trestle
     end
 
     def clear
-      Trestle.admins = {}
+      Trestle.registry.reset!
     end
 
     def load_paths

data/lib/trestle/table/automatic.rb

@@ -14,6 +14,13 @@ module Trestle
           case attribute.type
           when :association
             Column.new(attribute.association_name, sort: false)
+          when :enum
+            Column.new(attribute.name, align: :center, sort: attribute.name) do |instance|
+              if value = instance.public_send(attribute.name)
+                full_attribute_name = [attribute.name.to_s.pluralize, value].join(".")
+                status_tag(admin.human_attribute_name(full_attribute_name, default: value.humanize))
+              end
+            end
           else
             Column.new(attribute.name, link: index.zero?, align: (:center if [:datetime, :boolean].include?(attribute.type)))
           end

data/lib/trestle/table/column.rb

@@ -108,7 +108,7 @@ module Trestle
 
         def column_value(instance)
           if @column.block
-            if defined?(Haml) && Haml::Helpers.block_is_haml?(@column.block)
+            if block_is_legacy_haml?
               # In order for table column blocks to work properly within Haml templates,
               # the _hamlout local variable needs to be defined in the scope of the block,
               # so that the Haml version of the capture method is used. Because we
@@ -131,6 +131,10 @@ module Trestle
             instance.send(@column.field)
           end
         end
+
+        def block_is_legacy_haml?
+          defined?(Haml) && Haml::Helpers.respond_to?(:block_is_haml?) && Haml::Helpers.block_is_haml?(@column.block)
+        end
       end
     end
   end

data/lib/trestle/version.rb

@@ -1,3 +1,3 @@
 module Trestle
-  VERSION = "0.9.5"
+  VERSION = "0.9.7"
 end