autoforme 1.14.0 → 1.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a736d797ecc713bf84bca96606007e8eb02c19e83b698365417afcc44fe20f6
-  data.tar.gz: bb6237775d2413f4d57e6d6c30e458f8b0037d65ea3b87db83bbfa63affae2e5
+  metadata.gz: 9b33c734d416c94f39143bda38c834ac0df5845b825427cac13f240649e888c4
+  data.tar.gz: 6c9e8a0f6d777e9d696c5aa2c4e4aba6eaa3fdde5dff9f457527b92e4d099c1a
 SHA512:
-  metadata.gz: 21db83b2b59a9b71679b21f5d1fffae43f7c73809e5ee3bfe7af70cb14faf768208c794b2adf27c20777f322ef2dfc15b352e88f34b32dc6ca91b036ad88d785
-  data.tar.gz: 8b0f1295ff5b59334658c34e4d90d80aff5c9778bf3717f7c43eabede1accc7cb95aafca9043ac2fb81eaf667b215bb7f40f45368cdf6c88ce44b8a15a98e202
+  metadata.gz: a3d207919ca2cb75e0084132c533262d5c02adbbb45302b607470125e305ce9d1a62de2e3ae054d2cc12089d939be054a496f92a20b34d9640e9dfd06b6ba108
+  data.tar.gz: 32ebe7a3aeb2e790facad1b877245b2091a59605af6ce72ff7e2d203193dcc9c1c9c247e9a4fc5d2b486f2c1abc392ab3dd0eb5d961c40946fc5c27ab14a0f5b

data/CHANGELOG

@@ -1,3 +1,7 @@
+=== 1.15.0 (2026-03-04)
+
+* Allow model configuration methods to fallback to framework confirmation methods by returning the framework (jeremyevans)
+
 === 1.14.0 (2025-10-02)
 
 * Support customizing the searching done for specific columns via column_search_filter (jeremyevans)

data/lib/autoforme/model.rb

@@ -67,7 +67,7 @@ module AutoForme
 
     # Whether the given type of action is supported for this model.
     def supported_action?(type, request)
-      v = (handle_proc(supported_actions || framework.supported_actions_for(model, request), request) || DEFAULT_SUPPORTED_ACTIONS).include?(type)
+      v = (handle_model_proc(supported_actions, :supported_actions_for, request) || DEFAULT_SUPPORTED_ACTIONS).include?(type)
       if v && type == :mtm_edit
         assocs = mtm_association_select_options(request)
         assocs && !assocs.empty?
@@ -78,7 +78,7 @@ module AutoForme
 
     # An array of many to many association symbols to handle via a separate mtm_edit page.
     def mtm_association_select_options(request)
-      normalize_mtm_associations(handle_proc(mtm_associations || framework.mtm_associations_for(model, request), request))
+      normalize_mtm_associations(handle_model_proc(mtm_associations, :mtm_associations_for, request))
     end
     
     # Whether an mtm_edit can be displayed for the given association
@@ -93,19 +93,19 @@ module AutoForme
 
     # An array of many to many association symbols to handle inline on the edit forms.
     def inline_mtm_assocs(request)
-      normalize_mtm_associations(handle_proc(inline_mtm_associations || framework.inline_mtm_associations_for(model, request), request))
+      normalize_mtm_associations(handle_model_proc(inline_mtm_associations, :inline_mtm_associations_for, request))
     end
 
     def columns_for(type, request)
-      handle_proc(columns || framework.columns_for(model, type, request), type, request) || default_columns
+      handle_model_proc(columns, :columns_for, type, request) || default_columns
     end
 
     def pagination_strategy_for(type, request)
-      handle_proc(pagination_strategy || framework.pagination_strategy_for(model, type, request), type, request) || DEFAULT_PAGINATION_STRATEGY
+      handle_model_proc(pagination_strategy, :pagination_strategy_for, type, request) || DEFAULT_PAGINATION_STRATEGY
     end
 
     def column_search_filter_for(dataset, column, value, request)
-      handle_proc(column_search_filter || framework.column_search_filter_for(model, dataset, column, value, request), dataset, column, value, request)
+      handle_model_proc(column_search_filter, :column_search_filter_for, dataset, column, value, request)
     end
 
     # The options to use for the given column and request.  Instead of the model options overriding the framework
@@ -159,23 +159,23 @@ module AutoForme
     end
 
     def show_html_for(obj, column, type, request)
-      handle_proc(show_html || framework.show_html_for(obj, column, type, request), obj, column, type, request)
+      handle_direct_proc(show_html, :show_html_for, obj, column, type, request)
     end
 
     def edit_html_for(obj, column, type, request)
-      handle_proc(edit_html || framework.edit_html_for(obj, column, type, request), obj, column, type, request)
+      handle_direct_proc(edit_html, :edit_html_for, obj, column, type, request)
     end
 
     def order_for(type, request)
-      handle_proc(order || framework.order_for(model, type, request), type, request)
+      handle_model_proc(order, :order_for, type, request)
     end
 
     def eager_for(type, request)
-      handle_proc(eager, type, request)
+      handle_local_proc(eager, type, request)
     end
 
     def eager_graph_for(type, request)
-      handle_proc(eager_graph, type, request)
+      handle_local_proc(eager_graph, type, request)
     end
 
     def filter_for
@@ -187,27 +187,27 @@ module AutoForme
     end
 
     def form_attributes_for(type, request)
-      framework.form_attributes_for(model, type, request).merge(handle_proc(form_attributes, type, request) || {})
+      framework.form_attributes_for(model, type, request).merge(handle_local_proc(form_attributes, type, request) || {})
     end
 
     def form_options_for(type, request)
-      framework.form_options_for(model, type, request).merge(handle_proc(form_options, type, request) || {})
+      framework.form_options_for(model, type, request).merge(handle_local_proc(form_options, type, request) || {})
     end
 
     def page_footer_for(type, request)
-      handle_proc(page_footer || framework.page_footer_for(model, type, request), type, request)
+      handle_model_proc(page_footer, :page_footer_for, type, request)
     end
 
     def page_header_for(type, request)
-      handle_proc(page_header || framework.page_header_for(model, type, request), type, request)
+      handle_model_proc(page_header, :page_header_for, type, request)
     end
 
     def table_class_for(type, request)
-      handle_proc(table_class || framework.table_class_for(model, type, request), type, request) || DEFAULT_TABLE_CLASS
+      handle_model_proc(table_class, :table_class_for, type, request) || DEFAULT_TABLE_CLASS
     end
 
     def limit_for(type, request)
-      handle_proc(per_page || framework.limit_for(model, type, request), type, request) || DEFAULT_LIMIT
+      handle_model_proc(per_page, :limit_for, type, request) || DEFAULT_LIMIT
     end
 
     def display_name_for
@@ -215,7 +215,7 @@ module AutoForme
     end
 
     def association_links_for(type, request)
-      case v = handle_proc(association_links || framework.association_links_for(model, type, request), type, request)
+      case v = handle_model_proc(association_links, :association_links_for, type, request)
       when nil
         []
       when Array
@@ -231,7 +231,7 @@ module AutoForme
 
     # Whether to lazy load association links for this model.
     def lazy_load_association_links?(type, request)
-      v = handle_proc(lazy_load_association_links, type, request)
+      v = handle_local_proc(lazy_load_association_links, type, request)
       v = framework.lazy_load_association_links?(model, type, request) if v.nil?
       v || false
     end
@@ -239,7 +239,7 @@ module AutoForme
     def autocomplete_options_for(type, request)
       return unless AUTOCOMPLETE_TYPES.include?(type)
       framework_opts = framework.autocomplete_options_for(model, type, request)
-      model_opts = handle_proc(autocomplete_options, type, request)
+      model_opts = handle_local_proc(autocomplete_options, type, request)
       if model_opts
         (framework_opts || {}).merge(model_opts)
       end
@@ -391,14 +391,42 @@ module AutoForme
       end
     end
 
-    def handle_proc(v, *a)
+    # Handle a proc without a fallback to a framework method.
+    def handle_local_proc(v, *a)
+      handle_proc(v, nil, nil, *a)
+    end
+
+    def handle_model_proc(v, framework_meth, *a)
+      handle_proc(v, framework_meth, true, *a)
+    end
+
+    def handle_direct_proc(v, framework_meth, *a)
+      handle_proc(v, framework_meth, false, *a)
+    end
+
+    # Handle a proc, falling back to the framework if the
+    # is a nil or is a proc or method that returns the framework.
+    def handle_proc(v, framework_meth, add_model, *a)
       case v
+      when nil
+        framework_send(framework_meth, add_model, a)
       when Proc, Method
-        v.call(*a)
+        ret = v.call(*a)
+        if framework.equal?(ret)
+          framework_send(framework_meth, add_model, a)
+        else
+          ret
+        end
       else
         v
       end
     end
+
+    def framework_send(meth, add_model, a)
+      return unless meth
+      a.unshift(model) if add_model
+      framework.public_send(meth, *a)
+    end
     
     def normalize_mtm_associations(assocs)
       if assocs == :all

data/lib/autoforme/version.rb

@@ -6,7 +6,7 @@ module AutoForme
   MAJOR = 1
 
   # The minor version of AutoForme, updated for new feature releases of AutoForme.
-  MINOR = 14
+  MINOR = 15
 
   # The patch version of AutoForme, updated only for bug fixes from the last
   # feature release.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: autoforme
 version: !ruby/object:Gem::Version
-  version: 1.14.0
+  version: 1.15.0
 platform: ruby
 authors:
 - Jeremy Evans
@@ -271,7 +271,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Web Administrative Console for Roda/Sinatra/Rails and Sequel::Model
 test_files: []