trestle 0.9.2 → 0.9.3

data/frontend/js/components/table.js

@@ -5,7 +5,7 @@ import visit from '../core/visit'
 // Allow clicking on any part of a table row to follow either the table's data-url
 // or the first link within the row (that is not in the actions column).
 $(document).on('click', 'tr[data-url]:not([data-behavior="dialog"])', function (e) {
-  let row = $(e.currentTarget)
+  const row = $(e.currentTarget)
 
   let url
 
@@ -25,6 +25,37 @@ $(document).on('click', 'tr[data-url]:not([data-behavior="dialog"])', function (
 })
 
 // Ignore the above event handler when clicking directly on a link or input element
-$(document).on('click', 'tr[data-url] a, tr[data-url] input', function (e) {
+$(document).on('click', 'tr[data-url] a, tr[data-url] input, .select-row', function (e) {
   e.stopPropagation()
 })
+
+// Handle clicking on select all checkbox in table header
+$(document).on('click', 'th.select-row input', function (e) {
+  const table = $(this).closest('table')
+  const checked = $(this).is(':checked')
+
+  table.find('td.select-row input').prop('checked', checked)
+})
+
+// Handle single row selection to update header row status
+$(document).on('click', 'td.select-row input', function (e) {
+  const table = $(this).closest('table')
+
+  const checkboxes = table.find('td.select-row input')
+  const selectedCheckboxes = checkboxes.filter(':checked')
+
+  const header = table.find('th.select-row input')
+
+  if (checkboxes.length === selectedCheckboxes.length) {
+    // All checked
+    header.prop('indeterminate', false)
+    header.prop('checked', true)
+  } else if (selectedCheckboxes.length === 0) {
+    // None checked
+    header.prop('indeterminate', false)
+    header.prop('checked', false)
+  } else {
+    // Some checked
+    header.prop('indeterminate', true)
+  }
+})

data/frontend/theme/trestle/theme/bootstrap/_buttons.scss

@@ -11,6 +11,9 @@
 
   &:focus,
   &.focus {
+    color: color-yiq($hover-background);
+    background-color: $hover-background;
+    border-color: $hover-border;
     box-shadow: 0 0 0 $btn-focus-width rgba(mix(color-yiq($background), $border, 15%), .5);
   }
 

data/lib/trestle.rb

@@ -1,45 +1,29 @@
-require "trestle/version"
+require_relative "trestle/version"
 
 require "active_support/all"
 require "kaminari"
 
 module Trestle
-  extend ActiveSupport::Autoload
-
-  autoload :Adapters
-  autoload :Admin
-  autoload :ApplicationController
-  autoload :Attribute
-  autoload :Breadcrumb
-  autoload :Builder
-  autoload :Configurable
-  autoload :Configuration
-  autoload :Display
-  autoload :EvaluationContext
-  autoload :Form
-  autoload :Hook
-  autoload :ModelName
-  autoload :Navigation
-  autoload :Options
-  autoload :Reloader
-  autoload :Resource
-  autoload :Scopes
-  autoload :Tab
-  autoload :Table
-  autoload :Toolbar
-
-  module Controller
-    extend ActiveSupport::Autoload
-
-    autoload :Breadcrumbs
-    autoload :Callbacks
-    autoload :Dialog
-    autoload :Helpers
-    autoload :Layout
-    autoload :Location
-    autoload :Title
-    autoload :Toolbars
-  end
+  require_relative "trestle/evaluation_context"
+  require_relative "trestle/builder"
+  require_relative "trestle/hook"
+  require_relative "trestle/toolbar"
+  require_relative "trestle/adapters"
+  require_relative "trestle/attribute"
+  require_relative "trestle/breadcrumb"
+  require_relative "trestle/configurable"
+  require_relative "trestle/configuration"
+  require_relative "trestle/display"
+  require_relative "trestle/form"
+  require_relative "trestle/model_name"
+  require_relative "trestle/navigation"
+  require_relative "trestle/options"
+  require_relative "trestle/reloader"
+  require_relative "trestle/scopes"
+  require_relative "trestle/tab"
+  require_relative "trestle/table"
+  require_relative "trestle/admin"
+  require_relative "trestle/resource"
 
   mattr_accessor :admins
   self.admins = {}
@@ -86,4 +70,4 @@ module Trestle
   end
 end
 
-require "trestle/engine" if defined?(Rails)
+require_relative "trestle/engine" if defined?(Rails)

data/lib/trestle/adapters.rb

@@ -2,7 +2,7 @@ module Trestle
   module Adapters
     extend ActiveSupport::Autoload
 
-    autoload :Adapter
+    require_relative "adapters/adapter"
 
     autoload :ActiveRecordAdapter
     autoload :DraperAdapter

data/lib/trestle/admin.rb

@@ -1,9 +1,6 @@
 module Trestle
   class Admin
-    extend ActiveSupport::Autoload
-
-    autoload :Builder
-    autoload :Controller
+    require_relative "admin/builder"
 
     delegate :to_param, to: :class
 

data/lib/trestle/admin/builder.rb

@@ -7,7 +7,7 @@ module Trestle
       self.admin_class = Admin
 
       class_attribute :controller
-      self.controller = Controller
+      self.controller = -> { AdminController }
 
       delegate :helper, :before_action, :after_action, :around_action, to: :@controller
 
@@ -27,7 +27,7 @@ module Trestle
         # Define admin controller class
         # This is done using class_eval rather than Class.new so that the full
         # class name and parent chain is set when Rails' inherited hooks are called.
-        admin.class_eval("class AdminController < #{controller.name}; end")
+        admin.class_eval("class AdminController < #{controller.call.name}; end")
 
         # Set a reference on the controller class to the admin class
         controller = admin.const_get(:AdminController)

data/lib/trestle/configurable.rb

@@ -62,6 +62,16 @@ module Trestle
 
         defaults[name] = default
       end
+
+      def deprecated_option(name, message=nil)
+        define_method("#{name}=") do |value|
+          ActiveSupport::Deprecation.warn(message)
+        end
+
+        define_method(name) do |*args|
+          ActiveSupport::Deprecation.warn(message)
+        end
+      end
     end
 
     module Open

data/lib/trestle/configuration.rb

@@ -105,8 +105,8 @@ module Trestle
       -> { ActiveSupport::Dependencies.autoload_paths.grep(/\/app\/admin\Z/) }
     ]
 
-    # When to reload Trestle admin within a to_prepare block (`:always` or `:on_update`)
-    option :reload, :on_update
+    # [DEPRECATED] When to reload Trestle admin within a to_prepare block
+    deprecated_option :reload, "The config.reload option is deprecated. Admins are now always reloaded when config.to_prepare is called."
 
 
     ## Debugging

data/lib/trestle/engine.rb

@@ -45,11 +45,7 @@ module Trestle
     end
 
     config.to_prepare do
-      if Trestle.config.reload == :always
-        Engine.reloader.execute
-      else
-        Engine.reloader.execute_if_updated
-      end
+      Engine.reloader.execute
     end
 
     def reloader

data/lib/trestle/form.rb

@@ -1,12 +1,10 @@
 module Trestle
   class Form
-    extend ActiveSupport::Autoload
-
-    autoload :Automatic
-    autoload :Builder
-    autoload :Field
-    autoload :Fields
-    autoload :Renderer
+    require_relative "form/automatic"
+    require_relative "form/builder"
+    require_relative "form/field"
+    require_relative "form/fields"
+    require_relative "form/renderer"
 
     attr_reader :options, :block
 

data/lib/trestle/form/builder.rb

@@ -1,3 +1,5 @@
+require "action_view/helpers"
+
 module Trestle
   class Form
     class Builder < ActionView::Helpers::FormBuilder
@@ -48,6 +50,3 @@ module Trestle
     end
   end
 end
-
-# Load all form fields
-Trestle::Form::Fields.eager_load!

data/lib/trestle/form/field.rb

@@ -13,9 +13,7 @@ module Trestle
       end
 
       def errors
-        errors = builder.errors(name)
-        errors += builder.errors(name.to_s.sub(/_id$/, '')) if name.to_s =~ /_id$/
-        errors
+        error_keys.map { |key| builder.errors(key) }.flatten
       end
 
       def form_group(opts={})
@@ -73,6 +71,18 @@ module Trestle
         "is-invalid"
       end
 
+      def error_keys
+        keys = [name]
+
+        # Singular associations (belongs_to)
+        keys << name.to_s.sub(/_id$/, '') if name.to_s =~ /_id$/
+
+         # Collection associations (has_many / has_and_belongs_to_many)
+        keys << name.to_s.sub(/_ids$/, 's') if name.to_s =~ /_ids$/
+
+        keys
+      end
+
       def extract_wrapper_options(*keys)
         wrapper = Trestle::Options.new
         keys.each { |k| wrapper[k] = options.delete(k) if options.key?(k) }

data/lib/trestle/form/fields.rb

@@ -1,47 +1,15 @@
 module Trestle
   class Form
     module Fields
-      extend ActiveSupport::Autoload
+      require_relative "fields/form_control"
+      require_relative "fields/form_group"
 
-      eager_autoload do
-        autoload :FormControl
-        autoload :FormGroup
+      require_relative "fields/date_picker"
 
-        autoload :DatePicker
+      require_relative "fields/check_box_helpers"
+      require_relative "fields/radio_button_helpers"
 
-        autoload :CheckBoxHelpers
-        autoload :RadioButtonHelpers
-
-        autoload :CheckBox
-        autoload :CollectionCheckBoxes
-        autoload :CollectionRadioButtons
-        autoload :CollectionSelect
-        autoload :ColorField
-        autoload :DateField
-        autoload :DateSelect
-        autoload :DatetimeField
-        autoload :DatetimeSelect
-        autoload :EmailField
-        autoload :FileField
-        autoload :GroupedCollectionSelect
-        autoload :MonthField
-        autoload :NumberField
-        autoload :RadioButton
-        autoload :RangeField
-        autoload :SearchField
-        autoload :Select
-        autoload :StaticField
-        autoload :TagSelect
-        autoload :TelephoneField
-        autoload :TextArea
-        autoload :TextField
-        autoload :TimeField
-        autoload :TimeSelect
-        autoload :TimeZoneSelect
-        autoload :UrlField
-        autoload :PasswordField
-        autoload :WeekField
-      end
+      Dir.glob("#{__dir__}/fields/*.rb") { |f| require_relative f }
     end
   end
 end

data/lib/trestle/form/fields/tag_select.rb

@@ -1,3 +1,5 @@
+require_relative "select"
+
 module Trestle
   class Form
     module Fields

data/lib/trestle/form/renderer.rb

@@ -1,12 +1,14 @@
+require "action_view/context"
+require "action_view/helpers"
+
 module Trestle
   class Form
     class Renderer
       include ::ActionView::Context
       include ::ActionView::Helpers::CaptureHelper
-      include HookHelper
 
       # Whitelisted helpers will concatenate their result to the output buffer when called.
-      WHITELISTED_HELPERS = [:row, :col, :render, :tab, :table, :divider, :h1, :h2, :h3, :h4, :h5, :h6, :card, :panel, :well]
+      WHITELISTED_HELPERS = [:row, :col, :hook, :render, :tab, :table, :divider, :h1, :h2, :h3, :h4, :h5, :h6, :card, :panel, :well]
 
       # Raw block helpers will pass their block argument directly to the method
       # without wrapping it in a new output buffer.

data/lib/trestle/hook.rb

@@ -20,8 +20,8 @@ module Trestle
       end
     end
 
-    def evaluate(context)
-      context.instance_exec(&block)
+    def evaluate(context, *args)
+      context.instance_exec(*args, &block)
     end
 
     class Set

data/lib/trestle/navigation.rb

@@ -1,11 +1,8 @@
 module Trestle
   class Navigation
-    extend ActiveSupport::Autoload
-
-    autoload :Block
-    autoload :Item
-    autoload :Group
-    autoload :NullGroup, "trestle/navigation/group"
+    require_relative "navigation/block"
+    require_relative "navigation/item"
+    require_relative "navigation/group"
 
     attr_reader :items
 

data/lib/trestle/reloader.rb

@@ -2,14 +2,6 @@ module Trestle
   class Reloader
     delegate :execute, :updated?, to: :updater
 
-    def execute_if_updated
-      if defined?(@updater)
-        updater.execute_if_updated
-      else
-        updater.execute
-      end
-    end
-
     def updater
       @updater ||= ActiveSupport::FileUpdateChecker.new([], compile_load_paths) do
         begin

data/lib/trestle/resource.rb

@@ -1,12 +1,9 @@
 module Trestle
   class Resource < Admin
-    extend ActiveSupport::Autoload
-
-    autoload :AdapterMethods
-    autoload :Builder
-    autoload :Collection
-    autoload :Controller
-    autoload :Toolbar
+    require_relative "resource/adapter_methods"
+    require_relative "resource/builder"
+    require_relative "resource/collection"
+    require_relative "resource/toolbar"
 
     include AdapterMethods
 

data/lib/trestle/resource/builder.rb

@@ -2,7 +2,7 @@ module Trestle
   class Resource
     class Builder < Admin::Builder
       self.admin_class = Resource
-      self.controller = Controller
+      self.controller = -> { ResourceController }
 
       def adapter(&block)
         klass = admin.adapter_class

data/lib/trestle/resource/toolbar.rb

@@ -6,7 +6,7 @@ module Trestle
         delegate :translate, :t, to: :admin
 
         def new
-          link(t("buttons.new", default: "New %{model_name}"), action: :new, style: :light, icon: "fa fa-plus", class: "btn-new-resource")
+          link(t("buttons.new", default: "New %{model_name}"), action: :new, style: :light, icon: "fa fa-plus", class: "btn-new-resource") if action?(:new)
         end
 
         def save
@@ -14,7 +14,7 @@ module Trestle
         end
 
         def delete
-          link(t("buttons.delete", default: "Delete %{model_name}"), instance, action: :destroy, method: :delete, style: :danger, icon: "fa fa-trash", data: { toggle: "confirm-delete", placement: "bottom" })
+          link(t("buttons.delete", default: "Delete %{model_name}"), instance, action: :destroy, method: :delete, style: :danger, icon: "fa fa-trash", data: { toggle: "confirm-delete", placement: "bottom" }) if action?(:destroy)
         end
 
         def dismiss
@@ -22,7 +22,20 @@ module Trestle
         end
         alias ok dismiss
 
-        builder_method :new, :save, :delete, :dismiss, :ok
+        def save_or_dismiss(action=:update)
+          if action?(action)
+            save
+          else
+            dismiss
+          end
+        end
+
+        builder_method :new, :save, :delete, :dismiss, :ok, :save_or_dismiss
+
+      protected
+        def action?(action)
+          admin.actions.include?(action)
+        end
       end
     end
   end