trestle 0.10.0 → 0.10.1

data/lib/trestle/registry.rb

@@ -15,27 +15,24 @@ module Trestle
 
     def reset!
       @admins = {}
-      @models = {}
+      @models = nil
     end
 
     def empty?
       none?
     end
 
-    def register(admin, register_model: true)
+    def register(admin)
       @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
 
+      # Given object is already an admin instance
+      return admin if admin.is_a?(Trestle::Admin)
+
       @admins[admin.to_s]
     end
     alias lookup lookup_admin
@@ -43,7 +40,7 @@ module Trestle
     def lookup_model(model)
       # Lookup each class in the model's ancestor chain
       while model
-        admin = @models[model.name]
+        admin = models[model.name]
         return admin if admin
 
         model = model.superclass
@@ -54,8 +51,14 @@ module Trestle
     end
 
   private
-    def register_admin_for_model_loookup?(admin)
-      admin.respond_to?(:model) && !(admin.respond_to?(:singular?) && admin.singular?)
+    def models
+      @models ||= @admins.values.inject({}) { |result, admin|
+        if admin.respond_to?(:register_model?) && admin.register_model?
+          result[admin.model.name] ||= admin
+        end
+
+        result
+      }
     end
   end
 end

data/lib/trestle/resource/builder.rb

@@ -43,9 +43,10 @@ module Trestle
         admin.define_adapter_method(:to_param, &block)
       end
 
-      def params(&block)
+      def permitted_params(&block)
         admin.define_adapter_method(:permitted_params, &block)
       end
+      alias params permitted_params
 
       def decorator(decorator)
         admin.decorator = decorator
@@ -76,14 +77,16 @@ module Trestle
         admin.define_adapter_method(:count, &block)
       end
 
-      def scopes(options={}, &block)
-        admin.scopes.options.merge!(options)
-        admin.scopes.append(options, &block) if block_given?
+      def scopes(defaults: {}, **options, &block)
+        defaults = defaults.merge(options.slice(:count))
+
+        admin.scopes.apply_options!(options)
+        admin.scopes.append(**defaults, &block) if block_given?
       end
 
-      def scope(name, scope=nil, options={}, &block)
+      def scope(name, scope=nil, **options, &block)
         scopes do
-          scope(name, scope, options, &block)
+          scope(name, scope, **options, &block)
         end
       end
 

data/lib/trestle/resource/toolbar.rb

@@ -9,26 +9,26 @@ module Trestle
           return unless action?(:new)
 
           defaults = { action: :new, style: :light, icon: "fa fa-plus", class: "btn-new-resource" }
-          link(label, defaults.merge(attrs))
+          link(label, **defaults.merge(attrs))
         end
 
         def save(label: t("buttons.save", default: "Save %{model_name}"), **attrs)
           defaults = { style: :success }
-          button(label, defaults.merge(attrs))
+          button(label, **defaults.merge(attrs))
         end
 
         def delete(label: t("buttons.delete", default: "Delete %{model_name}"), **attrs)
           return unless action?(:destroy)
 
           defaults = Trestle::Options.new(action: :destroy, style: :danger, icon: "fa fa-trash", data: { turbo_method: "delete", turbo_frame: "_top", controller: "confirm-delete", confirm_delete_placement_value: "bottom" })
-          link(label, instance, defaults.merge(attrs))
+          link(label, instance, **defaults.merge(attrs))
         end
 
         def dismiss(label: t("buttons.ok", default: "OK"), **attrs)
           return unless @template.modal_request?
 
           defaults = Trestle::Options.new(type: :button, style: :light, data: { bs_dismiss: "modal" })
-          button(label, defaults.merge(attrs))
+          button(label, **defaults.merge(attrs))
         end
         alias ok dismiss
 

data/lib/trestle/resource.rb

@@ -104,6 +104,10 @@ module Trestle
         options[:singular]
       end
 
+      def register_model?
+        options[:register_model] != false && !singular?
+      end
+
       def translate(key, options={})
         super(key, options.merge({
           model_name:            model_name.titleize,
@@ -113,10 +117,8 @@ module Trestle
       end
       alias t translate
 
-      def instance_path(instance, options={})
-        action = options.fetch(:action) { :show }
-        options = options.merge(id: to_param(instance)) unless singular?
-
+      def instance_path(instance, action: :show, **options)
+        options.merge!(id: to_param(instance)) unless singular?
         path(action, options)
       end
 
@@ -133,7 +135,7 @@ module Trestle
         }
 
         Proc.new do
-          public_send(resource_method, resource_name, resource_options) do
+          public_send(resource_method, resource_name, **resource_options) do
             admin.additional_routes.each do |block|
               instance_exec(&block)
             end

data/lib/trestle/scopes/block.rb

@@ -1,37 +1,33 @@
 module Trestle
   class Scopes
     class Block
-      attr_reader :block, :options
+      attr_reader :block, :defaults
 
-      def initialize(options={}, &block)
-        @options, @block = options, block
+      def initialize(**defaults, &block)
+        @defaults, @block = defaults, 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, options)
+        context = Evaluator.new(context, **defaults)
         context.instance_exec(context, &block)
         context.scopes
       end
 
+    protected
       class Evaluator
         include EvaluationContext
 
         attr_reader :scopes
 
-        def initialize(context=nil, defaults={})
+        def initialize(context=nil, **defaults)
           @context, @defaults = context, defaults
           @scopes = []
         end
 
-        def scope(name, scope=nil, options={}, &block)
-          if scope.is_a?(Hash)
-            options = scope
-            scope = nil
-          end
-
-          scopes << Scope.new(@context, name, @defaults.merge(options), &(scope || block))
+        def scope(name, scope=nil, **options, &block)
+          scopes << Scope.new(@context, name, **@defaults.merge(options), &(scope || block))
         end
       end
     end

data/lib/trestle/scopes/definition.rb

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

data/lib/trestle/scopes/scope.rb

@@ -1,10 +1,11 @@
 module Trestle
   class Scopes
     class Scope
-      attr_reader :name, :options, :block
+      attr_reader :name, :group, :block
 
-      def initialize(admin, name, options={}, &block)
-        @admin, @name, @options, @block = admin, name, options, block
+      def initialize(admin, name, label: nil, group: nil, default: false, count: true, &block)
+        @admin, @name, @block = admin, name, block
+        @label, @group, @default, @count = label, group, default, count
       end
 
       def to_param
@@ -12,19 +13,15 @@ module Trestle
       end
 
       def label
-        @options[:label] || @admin.t("scopes.#{name}", default: name.to_s.humanize.titleize)
-      end
-
-      def group
-        @options[:group]
+        @label || default_label
       end
 
       def default?
-        @options[:default] == true
+        @default
       end
 
       def count?
-        @options[:count] != false
+        @count
       end
 
       def apply(collection)
@@ -40,6 +37,7 @@ module Trestle
       end
 
       def count(collection)
+        return unless count?
         @admin.count(@admin.merge_scopes(collection, apply(collection)))
       end
 
@@ -52,6 +50,11 @@ module Trestle
           default?
         end
       end
+
+    protected
+      def default_label
+        @admin.t("scopes.#{name}", default: name.to_s.humanize.titleize)
+      end
     end
   end
 end

data/lib/trestle/tab.rb

@@ -6,7 +6,7 @@ module Trestle
 
     attr_reader :name, :options
 
-    def initialize(name, options={})
+    def initialize(name, **options)
       @name, @options = name, options
     end
 
@@ -19,7 +19,7 @@ module Trestle
     end
 
     def badge
-      content_tag(:span, options[:badge], class: "badge") if options[:badge]
+      tag.span(options[:badge], class: "badge") if options[:badge]
     end
   end
 end

data/lib/trestle/table/column.rb

@@ -36,7 +36,7 @@ module Trestle
         end
 
         def render(instance)
-          @template.content_tag(:td, content(instance), class: classes, data: data)
+          @template.tag.td(content(instance), class: classes, data: data)
         end
 
         def render?
@@ -61,7 +61,8 @@ module Trestle
           return if options.key?(:header) && options[:header].in?([nil, false])
 
           if @table.sortable? && @column.sortable?
-            @template.sort_link(header_text, @column.sort_field, @column.sort_options)
+            link_options = @column.sort_options.slice(:default, :default_order)
+            @template.sort_link(header_text, @column.sort_field, **link_options)
           else
             header_text
           end
@@ -69,7 +70,7 @@ module Trestle
 
         def content(instance)
           value = column_value(instance)
-          content = @template.format_value(value, options)
+          content = @template.format_value(value, **options)
 
           if value.respond_to?(:id) && options[:link] != false
             # Column value was a model instance (e.g. from an association).

data/lib/trestle/table/row.rb

@@ -24,7 +24,7 @@ module Trestle
         end
 
         def render(instance)
-          @template.content_tag(:tr, options(instance)) do
+          @template.tag.tr(**options(instance)) do
             @template.safe_join(columns.map { |column| column.render(instance) }, "\n")
           end
         end

data/lib/trestle/toolbar/builder.rb

@@ -5,16 +5,16 @@ module Trestle
         @template = template
       end
 
-      def button(label, options={}, &block)
-        Button.new(@template, label, options, &block)
+      def button(label, **options, &block)
+        Button.new(@template, label, **options, &block)
       end
 
-      def link(label, instance_or_url={}, options={}, &block)
-        Link.new(@template, label, instance_or_url, options, &block)
+      def link(label, instance_or_url=nil, **options, &block)
+        Link.new(@template, label, instance_or_url, **options, &block)
       end
 
-      def dropdown(label=nil, options={}, &block)
-        Dropdown.new(@template, label, options, &block)
+      def dropdown(label=nil, **options, &block)
+        Dropdown.new(@template, label, **options, &block)
       end
 
       # Only methods explicitly tagged as builder methods will be automatically

data/lib/trestle/toolbar/context.rb

@@ -21,10 +21,7 @@ module Trestle
       end
 
     private
-      def self.ruby2_keywords(*)
-      end unless respond_to?(:ruby2_keywords, true)
-
-      ruby2_keywords def method_missing(name, *args, &block)
+      def method_missing(name, *args, &block)
         result = builder.send(name, *args, &block)
 
         if builder.builder_methods.include?(name)
@@ -33,6 +30,7 @@ module Trestle
           result
         end
       end
+      ruby2_keywords :method_missing if respond_to?(:ruby2_keywords, true)
 
       def respond_to_missing?(name, include_all=false)
         builder.respond_to?(name) || super

data/lib/trestle/toolbar/item.rb

@@ -3,17 +3,16 @@ module Trestle
     class Item
       attr_reader :label, :menu
 
-      delegate :admin_link_to, :button_tag, :content_tag, :safe_join, :icon, to: :@template
+      delegate :admin_link_to, :button_tag, :tag, :safe_join, :icon, to: :@template
 
-      def initialize(template, label, options={}, &block)
+      def initialize(template, label, icon: nil, style: nil, **options, &block)
         @template = template
         @label, @options, @block = label, options
 
         @menu = Menu.new(template)
         @menu.build(&block) if block_given?
 
-        @icon = options.delete(:icon)
-        @style = options.delete(:style)
+        @icon, @style = icon, style
       end
 
       def ==(other)
@@ -22,7 +21,7 @@ module Trestle
 
       def to_s
         if menu.items.any?
-          content_tag(:div, class: "btn-group", role: "group") do
+          tag.div(class: "btn-group", role: "group") do
             safe_join([render, render_menu], "\n")
           end
         else
@@ -54,7 +53,7 @@ module Trestle
 
       def button_label(content, options)
         icon = icon(@icon) if @icon
-        label = content_tag(:span, content, class: "btn-label")
+        label = tag.span(content, class: "btn-label")
 
         safe_join([icon, label].compact, " ")
       end
@@ -77,21 +76,13 @@ module Trestle
     class Link < Item
       attr_reader :instance_or_url
 
-      def initialize(template, label, instance_or_url={}, options={}, &block)
-        if instance_or_url.is_a?(Hash)
-          super(template, label, instance_or_url, &block)
-        else
-          super(template, label, options, &block)
-          @instance_or_url = instance_or_url
-        end
+      def initialize(template, label, instance_or_url=nil, **options, &block)
+        super(template, label, **options, &block)
+        @instance_or_url = instance_or_url
       end
 
       def render
-        if @instance_or_url
-          admin_link_to(button_label(label, options), instance_or_url, options)
-        else
-          admin_link_to(button_label(label, options), options)
-        end
+        admin_link_to(button_label(label, options), instance_or_url, **options)
       end
     end
 
@@ -102,7 +93,7 @@ module Trestle
 
       def label
         safe_join([
-          super, content_tag(:span, "", class: "caret")
+          super, tag.span("", class: "caret")
         ], " ")
       end
 

data/lib/trestle/toolbar/menu.rb

@@ -1,7 +1,7 @@
 module Trestle
   class Toolbar
     class Menu
-      delegate :content_tag, :safe_join, to: :@template
+      delegate :tag, :safe_join, to: :@template
 
       attr_reader :items
 
@@ -18,17 +18,17 @@ module Trestle
       end
 
       def render_toggle(options={})
-        content_tag(:button, type: "button", class: Array(options[:class]) + ["dropdown-toggle dropdown-toggle-split"], data: { bs_toggle: "dropdown" }, aria: { expanded: false }) do
-          content_tag(:span, I18n.t("trestle.ui.toggle_dropdown", default: "Toggle dropdown"), class: "visually-hidden")
+        tag.button(type: "button", class: Array(options[:class]) + ["dropdown-toggle dropdown-toggle-split"], data: { bs_toggle: "dropdown" }, aria: { expanded: false }) do
+          tag.span(I18n.t("trestle.ui.toggle_dropdown", default: "Toggle dropdown"), class: "visually-hidden")
         end
       end
 
       def render_items
-        content_tag(:ul, safe_join(items, "\n"), class: "dropdown-menu dropdown-menu-end", role: "menu")
+        tag.ul(safe_join(items, "\n"), class: "dropdown-menu dropdown-menu-end", role: "menu")
       end
 
       class Builder
-        delegate :admin_link_to, :content_tag, :tag, to: :@template
+        delegate :admin_link_to, :tag, to: :@template
 
         def initialize(menu, template)
           @menu, @template = menu, template
@@ -42,19 +42,19 @@ module Trestle
           options[:class] = Array(options[:class])
           options[:class] << "dropdown-item"
 
-          item { admin_link_to(content, instance_or_url, options, &block) }
+          item { admin_link_to(content, instance_or_url, **options, &block) }
         end
 
         def header(text)
-          item { content_tag(:h6, text, class: "dropdown-header") }
+          item { tag.h6(text, class: "dropdown-header") }
         end
 
         def divider
-          item { tag(:hr, class: "dropdown-divider") }
+          item { tag.hr(class: "dropdown-divider") }
         end
 
         def item(options={}, &block)
-          item = block_given? ? content_tag(:li, options, &block) : content_tag(:li, "", options)
+          item = block_given? ? tag.li(**options, &block) : tag.li("", **options)
 
           @menu.items << item
 

data/lib/trestle/version.rb

@@ -1,3 +1,3 @@
 module Trestle
-  VERSION = "0.10.0"
+  VERSION = "0.10.1"
 end

data/lib/trestle.rb

@@ -44,8 +44,8 @@ module Trestle
   end
 
   # Builds and registers a new admin resource
-  def self.resource(name, register_model: true, **options, &block)
-    register(Resource::Builder.create(name, options, &block), register_model: register_model)
+  def self.resource(name, **options, &block)
+    register(Resource::Builder.create(name, options, &block))
   end
 
   # Configuration methods

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trestle",
-  "version": "0.10.0",
+  "version": "0.10.1",
   "description": "A modern, responsive admin framework for Ruby on Rails",
   "homepage": "https://trestle.io",
   "repository": "https://github.com/TrestleAdmin/trestle.git",
@@ -18,15 +18,15 @@
     "@babel/preset-env": "^7.20.2",
     "autoprefixer": "^10.4.13",
     "babel-loader": "^9.1.2",
-    "copy-webpack-plugin": "^11.0.0",
-    "css-loader": "^6.7.3",
-    "css-minimizer-webpack-plugin": "^5.0.0",
-    "expose-loader": "^4.0.0",
+    "copy-webpack-plugin": "^12.0.2",
+    "css-loader": "^7.1.2",
+    "css-minimizer-webpack-plugin": "^7.0.0",
+    "expose-loader": "^5.0.0",
     "mini-css-extract-plugin": "^2.7.2",
     "postcss": "^8.4.21",
-    "postcss-loader": "^7.0.2",
+    "postcss-loader": "^8.1.1",
     "sass": "^1.57.1",
-    "sass-loader": "^13.2.0",
+    "sass-loader": "^16.0.2",
     "webpack": "^5.75.0",
     "webpack-bundle-analyzer": "^4.7.0",
     "webpack-cli": "^5.0.1"