trestle 0.9.7 → 0.9.9

data/app/controllers/concerns/trestle/controller/toolbars.rb

@@ -18,7 +18,7 @@ module Trestle
 
         toolbar = (toolbars[name.to_s] ||= Toolbar.new(builder))
         toolbar.clear! if options[:clear]
-        toolbar.prepend(&block) if block_given?
+        toolbar.append(&block) if block_given?
         toolbar
       end
 

data/app/controllers/concerns/trestle/resource/controller/actions.rb

@@ -25,7 +25,7 @@ module Trestle
             respond_to do |format|
               format.html do
                 flash[:message] = flash_message("create.success", title: "Success!", message: "The %{lowercase_model_name} was successfully created.")
-                redirect_to_return_location(:create, instance, default: admin.instance_path(instance))
+                redirect_to_return_location(:create, instance) { admin.instance_path(instance) }
               end
               format.json { render json: instance, status: :created, location: admin.instance_path(instance) }
 
@@ -85,7 +85,7 @@ module Trestle
             respond_to do |format|
               format.html do
                 flash[:message] = flash_message("update.success", title: "Success!", message: "The %{lowercase_model_name} was successfully updated.")
-                redirect_to_return_location(:update, instance, default: admin.instance_path(instance))
+                redirect_to_return_location(:update, instance) { admin.instance_path(instance) }
               end
               format.json { render json: instance, status: :ok }
 
@@ -111,14 +111,14 @@ module Trestle
             format.html do
               if success
                 flash[:message] = flash_message("destroy.success", title: "Success!", message: "The %{lowercase_model_name} was successfully deleted.")
-                redirect_to_return_location(:destroy, instance, default: admin.path(:index))
+                redirect_to_return_location(:destroy, instance) { admin.path(:index) }
               else
                 flash[:error] = flash_message("destroy.failure", title: "Warning!", message: "Could not delete %{lowercase_model_name}.")
 
                 if load_instance
-                  redirect_to_return_location(:update, instance, default: admin.instance_path(instance))
+                  redirect_to_return_location(:update, instance) { admin.instance_path(instance) }
                 else
-                  redirect_to_return_location(:destroy, instance, default: admin.path(:index))
+                  redirect_to_return_location(:destroy, instance) { admin.path(:index) }
                 end
               end
             end

data/app/controllers/concerns/trestle/resource/controller/redirection.rb

@@ -3,18 +3,20 @@ module Trestle
     module Controller
       module Redirection
       protected
-        def redirect_to_return_location(action, instance, default:)
+        def redirect_to_return_location(action, instance, default: nil, &block)
+          fallback_location = block_given? ? block : default
+
           if admin.return_locations[action] && !dialog_request?
             location = instance_exec(instance, &admin.return_locations[action])
 
             case location
             when :back
-              redirect_back fallback_location: default, turbolinks: false
+              redirect_back fallback_location: fallback_location, turbolinks: false
             else
               redirect_to location, turbolinks: false
             end
           else
-            redirect_to default, turbolinks: false
+            redirect_to fallback_location, turbolinks: false
           end
         end
       end

data/app/controllers/trestle/admin_controller.rb

@@ -1,4 +1,8 @@
 class Trestle::AdminController < Trestle::ApplicationController
+  if respond_to?(:raise_on_missing_callback_actions=)
+    self.raise_on_missing_callback_actions = false
+  end
+
   def index
   end
 

data/app/helpers/trestle/card_helper.rb

@@ -11,12 +11,12 @@ module Trestle
     end
 
     def panel(options={}, &block)
-      ActiveSupport::Deprecation.warn("The panel helper is deprecated and will be removed in future versions of Trestle. Please use the card helper instead.")
+      Trestle.deprecator.warn("The panel helper is deprecated and will be removed in future versions of Trestle. Please use the card helper instead.")
       card(options.merge(header: options[:title]), &block)
     end
 
     def well(options={}, &block)
-      ActiveSupport::Deprecation.warn("The well helper is deprecated and will be removed in future versions of Trestle. Please use the card helper instead.")
+      Trestle.deprecator.warn("The well helper is deprecated and will be removed in future versions of Trestle. Please use the card helper instead.")
       card(options, &block)
     end
   end

data/app/helpers/trestle/navigation_helper.rb

@@ -5,7 +5,9 @@ module Trestle
     end
 
     def current_admin?(admin)
-      respond_to?(:admin) && self.admin && self.admin.name == admin.name
+      respond_to?(:admin) &&
+        self.admin.respond_to?(:name) &&
+        self.admin.name == admin.name
     end
 
     def navigation_group_collapsed?(group)

data/app/helpers/trestle/toolbars_helper.rb

@@ -16,7 +16,7 @@ module Trestle
 
     def deprecated_toolbar(name)
       if content_for?(:"#{name}_toolbar")
-        ActiveSupport::Deprecation.warn("Using content_for(:#{name}_toolbar) is deprecated. Please use toolbar(:#{name}) instead.")
+        Trestle.deprecator.warn("Using content_for(:#{name}_toolbar) is deprecated. Please use toolbar(:#{name}) instead.")
         content_for(:"#{name}_toolbar")
       end
     end

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", errors: instance.errors if debug_form_errors? %>
+    <%= render "trestle/flash/debug", errors: Trestle::DebugErrors.new(instance.errors) if debug_form_errors? %>
   <% end %>
 <% end -%>

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

@@ -8,7 +8,7 @@
           <li>
             <%= link_to persistent_params.merge(scope: (scope unless scope.active?(params))), class: ["scope", ("active" if scope.active?(params))] do %>
               <strong><%= scope.label %></strong>
-              (<%= number_with_delimiter(scope.count(admin.collection(params))) %>)
+              <% if scope.count? %>(<%= number_with_delimiter(scope.count(admin.collection(params))) %>)<% end %>
             <% end %>
           </li>
         <% end %>

data/config/locales/vi.yml

@@ -42,7 +42,7 @@ vi:
     titles:
       index: "Danh sách %{pluralized_model_name}"
       new: "Tạo mới %{model_name}"
-      edit: Chỉnh sửa %{model_name}"
+      edit: "Chỉnh sửa %{model_name}"
 
     buttons:
       new: "Tạo mới %{model_name}"

data/frontend/css/components/_fields.scss

@@ -14,6 +14,7 @@
 
 ul.invalid-feedback {
   list-style: none;
+  margin-bottom: 0;
   padding-left: 0;
 }
 

data/frontend/css/components/_toolbars.scss

@@ -1,23 +1,5 @@
 .btn-toolbar {
-  .btn,
-  .btn-group,
-  .input-group {
-    + .btn,
-    + .btn-group,
-    + .input-group {
-      margin-left: 5px;
-    }
-  }
-
-  .btn-group {
-    .btn,
-    .btn-group {
-      + .btn,
-      + .btn-group {
-        margin-left: 0;
-      }
-    }
-  }
+  gap: 5px;
 }
 
 .primary-toolbar {

data/frontend/css/core/_mixins.scss

@@ -26,13 +26,10 @@
   height: 100%;
 }
 
-%fa {
+@mixin icon-fa($content) {
   font-family: 'Font Awesome 5 Free';
   font-weight: 900;
-}
 
-@mixin icon-fa($content) {
-  @extend %fa;
   content: fa-content($content);
 }
 

data/frontend/css/layout/_content.scss

@@ -34,7 +34,7 @@
   }
 
   .btn-toolbar {
-    justify-content: flex-end;
+    flex-direction: row-reverse;
   }
 
   .secondary-toolbar {

data/frontend/js/components/tabs.js

@@ -6,7 +6,7 @@ import { init } from '../core/events'
 
 const TAB_SELECTOR = 'a[data-toggle="tab"]'
 const TAB_PANE_SELECTOR = '.tab-pane'
-const ERROR_SELECTOR = '.is-invalid:not([type="hidden"])'
+const ERROR_SELECTOR = '.has-error'
 
 // Save active tab to URL hash
 init(function (root) {

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

@@ -10,8 +10,12 @@ module Trestle
       end
 
       def create_assets
-        template "_theme.scss",  "app/assets/stylesheets/trestle/_theme.scss"
-        template "_custom.scss", "app/assets/stylesheets/trestle/_custom.scss"
+        if defined?(Sass) || defined?(SassC)
+          template "_custom.scss", "app/assets/stylesheets/trestle/_custom.scss"
+          template "_theme.scss",  "app/assets/stylesheets/trestle/_theme.scss"
+        else
+          template "_custom.css", "app/assets/stylesheets/trestle/_custom.css"
+        end
 
         template "custom.js",    "app/assets/javascripts/trestle/custom.js"
       end

data/lib/generators/trestle/install/templates/_custom.css

@@ -0,0 +1,8 @@
+/* This file may be used for providing additional customizations to the Trestle
+ * admin. It will be automatically included within all admin pages.
+ *
+ * For organizational purposes, you may wish to define your customizations
+ * within individual partials in this folder and they'll be required below.
+ *
+ *= require_tree .
+*/

data/lib/trestle/adapters/active_record_adapter.rb

@@ -90,7 +90,7 @@ module Trestle
 
       def enum_values(column)
         model.defined_enums[column.name].map { |key, value|
-          [value, enum_human_name(column, key)]
+          [key, enum_human_name(column, key)]
         }
       end
 

data/lib/trestle/admin/builder.rb

@@ -88,6 +88,13 @@ module Trestle
         end
       end
 
+      def remove_action(*actions)
+        actions.each do |action|
+          controller.remove_possible_method(action.to_sym)
+          @admin.actions.delete(action.to_sym)
+        end
+      end
+
     protected
       def normalize_table_options(name, options)
         if name.is_a?(Hash)

data/lib/trestle/admin.rb

@@ -2,8 +2,6 @@ module Trestle
   class Admin
     require_relative "admin/builder"
 
-    delegate :to_param, to: :class
-
     def initialize(context=nil)
       @context = context
     end
@@ -52,13 +50,13 @@ module Trestle
       end
 
       def breadcrumbs
-        Breadcrumb::Trail.new(Array(Trestle.config.root_breadcrumbs) + [breadcrumb])
+        Breadcrumb::Trail.new(Array(Trestle.config.root_breadcrumbs) + [breadcrumb].compact)
       end
 
       def breadcrumb
         if @breadcrumb
           Breadcrumb.cast(@breadcrumb.call)
-        else
+        elsif actions.include?(:index)
           default_breadcrumb
         end
       end
@@ -128,10 +126,14 @@ module Trestle
         raise NoMethodError, "#to_param called on non-resourceful admin. You may need to explicitly specify the admin."
       end
 
-      def actions
+      def default_actions
         [:index]
       end
 
+      def actions
+        @actions ||= default_actions.dup
+      end
+
       def root_action
         :index
       end
@@ -145,7 +147,7 @@ module Trestle
 
         Proc.new do
           scope controller: admin.controller_namespace, path: admin.options[:path] || admin.admin_name do
-            get "", action: "index", as: admin.route_name
+            get "", action: "index", as: admin.route_name if admin.actions.include?(:index)
 
             admin.additional_routes.each do |block|
               instance_exec(&block)
@@ -176,5 +178,9 @@ module Trestle
         end
       end
     end
+
+    # This delegate call is deferred until the class method is defined,
+    # since the method signature is different from Object#to_param.
+    delegate :to_param, to: :class
   end
 end

data/lib/trestle/configurable.rb

@@ -71,11 +71,11 @@ module Trestle
 
       def deprecated_option(name, message=nil)
         define_method("#{name}=") do |value|
-          ActiveSupport::Deprecation.warn(message)
+          Trestle.deprecator.warn(message)
         end
 
         define_method(name) do |*args|
-          ActiveSupport::Deprecation.warn(message)
+          Trestle.deprecator.warn(message)
         end
       end
     end

data/lib/trestle/debug_errors.rb

@@ -0,0 +1,24 @@
+module Trestle
+  class DebugErrors
+    def initialize(errors)
+      @errors = errors
+    end
+
+    def any?
+      @errors.any?
+    end
+
+    def each
+      if defined?(ActiveModel::Error)
+        # Rails 6.1 introduces a unified Error class
+        @errors.each do |error|
+          yield error.attribute, error.message
+        end
+      else
+        @errors.each do |error, message|
+          yield error, message
+        end
+      end
+    end
+  end
+end

data/lib/trestle/form/automatic.rb

@@ -31,7 +31,9 @@ module Trestle
               when :datetime
                 datetime_field attribute.name
               when :boolean
-                check_box attribute.name
+                form_group label: false do
+                  check_box attribute.name
+                end
               when :enum
                 collection_radio_buttons attribute.name, attribute.options[:values] || [], :first, :last
               when :json, :jsonb

data/lib/trestle/hook/helpers.rb

@@ -24,7 +24,7 @@ module Trestle
 
       def hook_sets
         @_hook_sets ||= [
-          (admin.hooks if defined?(admin) && admin),
+          (admin.hooks if defined?(admin) && admin.respond_to?(:hooks)),
           Trestle.config.hooks
         ].compact
       end

data/lib/trestle/navigation/group.rb

@@ -4,8 +4,7 @@ module Trestle
       attr_reader :name, :options
 
       def initialize(name, options={})
-        @name = name
-        @options = options
+        @name, @options = name.to_s, options
       end
 
       def ==(other)

data/lib/trestle/navigation/item.rb

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

data/lib/trestle/reloader.rb

@@ -38,17 +38,8 @@ module Trestle
 
       app.reloaders << reloader
 
-      if app.respond_to?(:reloader)
-        # Rails >= 5.0
-        app.reloader.to_run do
-          reloader.execute_if_updated
-          true # Rails <= 5.1
-        end
-      else
-        # Rails 4.2
-        ActionDispatch::Reloader.to_prepare do
-          reloader.execute_if_updated
-        end
+      app.reloader.to_run do
+        reloader.execute_if_updated
       end
 
       reloader.execute

data/lib/trestle/resource/builder.rb

@@ -14,13 +14,6 @@ module Trestle
         admin.adapter_class = adapter
       end
 
-      def remove_action(*actions)
-        actions.each do |action|
-          controller.remove_possible_method(action.to_sym)
-          admin.actions.delete(action.to_sym)
-        end
-      end
-
       def collection(&block)
         admin.define_adapter_method(:collection, &block)
       end
@@ -85,7 +78,7 @@ module Trestle
 
       def scopes(options={}, &block)
         admin.scopes.options.merge!(options)
-        admin.scopes.append(&block) if block_given?
+        admin.scopes.append(options, &block) if block_given?
       end
 
       def scope(name, scope=nil, options={}, &block)

data/lib/trestle/resource.rb

@@ -88,8 +88,8 @@ module Trestle
         model_name.plural
       end
 
-      def actions
-        @actions ||= (readonly? ? READONLY_ACTIONS : RESOURCE_ACTIONS).dup
+      def default_actions
+        readonly? ? READONLY_ACTIONS : RESOURCE_ACTIONS
       end
 
       def root_action

data/lib/trestle/scopes/block.rb

@@ -1,16 +1,16 @@
 module Trestle
   class Scopes
     class Block
-      attr_reader :block
+      attr_reader :block, :options
 
-      def initialize(&block)
-        @block = block
+      def initialize(options={}, &block)
+        @options, @block = options, block
       end
 
       # Evaluates the scope block within the given admin context
       # and returns an array of the scopes that were defined.
       def scopes(context)
-        context = Evaluator.new(context)
+        context = Evaluator.new(context, options)
         context.instance_exec(context, &block)
         context.scopes
       end
@@ -20,8 +20,8 @@ module Trestle
 
         attr_reader :scopes
 
-        def initialize(context=nil)
-          @context = context
+        def initialize(context=nil, defaults={})
+          @context, @defaults = context, defaults
           @scopes = []
         end
 
@@ -31,7 +31,7 @@ module Trestle
             scope = nil
           end
 
-          scopes << Scope.new(@context, name, options, &(scope || block))
+          scopes << Scope.new(@context, name, @defaults.merge(options), &(scope || block))
         end
       end
     end

data/lib/trestle/scopes/definition.rb

@@ -8,8 +8,8 @@ module Trestle
         @options = {}
       end
 
-      def append(&block)
-        @blocks << Block.new(&block)
+      def append(options={}, &block)
+        @blocks << Block.new(options, &block)
       end
 
       # Evaluates each of the scope blocks within the given admin context

data/lib/trestle/scopes/scope.rb

@@ -23,6 +23,10 @@ module Trestle
         @options[:default] == true
       end
 
+      def count?
+        @options[:count] != false
+      end
+
       def apply(collection)
         if @block
           if @block.arity == 1

data/lib/trestle/version.rb

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

data/lib/trestle.rb

@@ -11,6 +11,7 @@ module Trestle
   require_relative "trestle/adapters"
   require_relative "trestle/attribute"
   require_relative "trestle/breadcrumb"
+  require_relative "trestle/debug_errors"
   require_relative "trestle/lazy"
   require_relative "trestle/configurable"
   require_relative "trestle/configuration"
@@ -84,6 +85,10 @@ module Trestle
       [locale]
     end
   end
+
+  def self.deprecator
+    @deprecator ||= ActiveSupport::Deprecation.new
+  end
 end
 
 require_relative "trestle/engine" if defined?(Rails)

data/package.json

@@ -22,9 +22,9 @@
     "css-minimizer-webpack-plugin": "^3.0.2",
     "expose-loader": "^3.0.0",
     "mini-css-extract-plugin": "^2.0.0",
-    "node-sass": "^7.0.1",
     "postcss": "^8.3.5",
     "postcss-loader": "^6.1.1",
+    "sass": "^1.76.0",
     "sass-loader": "^12.1.0",
     "webpack": "^5.42.0",
     "webpack-cli": "^4.7.2"

data/trestle.gemspec

@@ -20,18 +20,18 @@ 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 "railties",        ">= 5.2.0"
+  spec.add_dependency "activemodel",     ">= 5.2.0"
   spec.add_dependency "sprockets-rails", ">= 2.0.0"
   spec.add_dependency "kaminari",        ">= 1.1.0"
 
-  spec.add_development_dependency "rspec-rails",         "~> 3.5"
-  spec.add_development_dependency "rspec-html-matchers", "~> 0.9.2"
-  spec.add_development_dependency "database_cleaner",    "~> 1.8.3"
-  spec.add_development_dependency "ammeter",             "~> 1.1.4"
+  spec.add_development_dependency "rspec-rails",         ">= 5.1.2"
+  spec.add_development_dependency "rspec-html-matchers", "~> 0.10.0"
+  spec.add_development_dependency "database_cleaner",    "~> 2.0.2"
+  spec.add_development_dependency "ammeter",             "~> 1.1.5"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "sqlite3", "~> 1.3.6"
+  spec.add_development_dependency "sqlite3"
   spec.add_development_dependency "turbolinks"
 end

data/webpack.config.js

@@ -54,7 +54,14 @@ module.exports = {
               }
             }
           },
-          { loader: 'sass-loader' }
+          {
+            loader: 'sass-loader',
+            options: {
+              sassOptions: {
+                quietDeps: true
+              }
+            }
+          }
         ]
       },
       {