active_scaffold 4.0.13 → 4.1.0

data/lib/active_scaffold/helpers/list_column_helpers.rb

@@ -164,21 +164,34 @@ module ActiveScaffold
       ##
       ## Formatting
       ##
+
+      def read_value_from_record(record, column, join_text = ' - ')
+        if grouped_search? && column == search_group_column
+          value =
+            if search_group_function
+              record[column.name]
+            elsif search_group_column.group_by
+              safe_join column.group_by.map.with_index { |_, index| record["#{column.name}_#{index}"] }, join_text
+            end
+        end
+        value || record.send(column.name)
+      end
+
       FORM_UI_WITH_OPTIONS = %i[select radio].freeze
       def format_column_value(record, column, value = nil)
-        value ||= record.send(column.name) unless record.nil?
-        if column.association.nil?
+        value ||= read_value_from_record(record, column) unless record.nil?
+        if grouped_search? && column == search_group_column && (search_group_function || search_group_column.group_by)
+          format_grouped_search_column(value, column.options)
+        elsif column.association.nil?
           form_ui_options = column.form_ui_options || column.options if FORM_UI_WITH_OPTIONS.include?(column.form_ui)
           if form_ui_options&.dig(:options)
             text, val = form_ui_options[:options].find { |t, v| (v.nil? ? t : v).to_s == value.to_s }
             value = active_scaffold_translated_option(column, text, val).first if text
           end
-          if grouped_search? && column == search_group_column && search_group_function
-            format_grouped_search_column(value, column.options)
-          elsif value.is_a? Numeric
+          if value.is_a? Numeric
             format_number_value(value, column.options)
           else
-            format_value(value, column.options)
+            format_value(value, column.options, column)
           end
         else
           if column.association.collection?
@@ -280,15 +293,16 @@ module ActiveScaffold
           elsif value
             format_singular_association_value(value, column, method)
           end
-        format_value value
+        format_value value, nil, column
       end
 
-      def format_value(column_value, options = {})
+      def format_value(column_value, options = {}, column = nil)
+        options ||= column&.options
         value =
           if column_empty?(column_value)
-            empty_field_text
+            empty_field_text(column)
           elsif column_value.is_a?(Time) || column_value.is_a?(Date)
-            l(column_value, format: options[:format] || :default)
+            l(column_value, format: options&.dig(:format) || :default)
           elsif !!column_value == column_value # rubocop:disable Style/DoubleNegation fast check for boolean
             as_(column_value.to_s.to_sym)
           else
@@ -459,8 +473,8 @@ module ActiveScaffold
       def column_calculation(column, id_condition: true)
         if column.calculate.instance_of? Proc
           column.calculate.call(@records)
-        else
-          calculate_query(id_condition: id_condition).calculate(column.calculate, column.name)
+        elsif column.calculate.in? %i[count sum average minimum maximum]
+          calculate_query(id_condition: id_condition).calculate(column.calculate, column.grouped_select)
         end
       end
 

data/lib/active_scaffold/helpers/search_column_helpers.rb

@@ -76,7 +76,8 @@ module ActiveScaffold
         if column.association
           associated.collect!(&:to_i)
           method = ui_options[:label_method] || :to_label
-          select_options = sorted_association_options_find(column.association, nil, record).collect do |r|
+          helper_method = association_helper_method(column.association, :sorted_association_options_find)
+          select_options = send(helper_method, column.association, nil, record).collect do |r|
             [r.send(method), r.id]
           end
         else
@@ -103,7 +104,8 @@ module ActiveScaffold
         if column.association
           associated = associated.is_a?(Array) ? associated.map(&:to_i) : associated.to_i unless associated.nil?
           method = column.association.belongs_to? ? column.association.foreign_key : column.name
-          select_options = sorted_association_options_find(column.association, false, record)
+          helper_method = association_helper_method(column.association, :sorted_association_options_find)
+          select_options = send(helper_method, column.association, false, record)
         else
           method = column.name
           enum_options_method = override_helper_per_model(:active_scaffold_enum_options, record.class)

data/lib/active_scaffold/helpers/show_column_helpers.rb

@@ -2,7 +2,7 @@ module ActiveScaffold
   module Helpers
     # Helpers that assist with the rendering of a List Column
     module ShowColumnHelpers
-      def show_column_value(record, column)
+      def show_column_value(record, column, **tab_options)
         value_record = column.delegated_association ? record.send(column.delegated_association.name) : record
         return get_column_value(record, column) unless value_record
 
@@ -14,7 +14,7 @@ module ActiveScaffold
           send(method, value_record, column)
         # second, check if the dev has specified a valid list_ui for this column
         elsif column.show_ui && (method = override_show_column_ui(column.show_ui))
-          send(method, value_record, column, ui_options: column.show_ui_options || column.options)
+          send(method, value_record, column, ui_options: tab_options.merge(column.show_ui_options || column.options))
         elsif column.column && (method = override_show_column_ui(column.column_type)) # rubocop:disable Lint/DuplicateBranch
           send(method, value_record, column)
         else
@@ -29,7 +29,8 @@ module ActiveScaffold
       def active_scaffold_show_horizontal(record, column, ui_options: column.options)
         raise ':horizontal show_ui must be used on association column' unless column.association
 
-        render partial: 'show_association', locals: {column: column, parent_record: record, show_partial: :horizontal}
+        vars = {column: column, parent_record: record, show_partial: :horizontal}
+        render partial: 'show_association', locals: vars.merge(ui_options.slice(:tabbed_by, :tab_value, :tab_id))
       end
 
       def active_scaffold_show_vertical(record, column, ui_options: column.options)

data/lib/active_scaffold/helpers/tabs_helpers.rb

@@ -2,7 +2,7 @@ module ActiveScaffold
   module Helpers
     # Helpers that assist with rendering of tabs in forms
     module TabsHelpers
-      def active_scaffold_tabbed_by(column, record, scope, subsection_id, &block)
+      def active_scaffold_tabbed_by(column, record, scope, subsection_id, &)
         add_tab_url = params_for(action: 'render_field', tabbed_by: column.tabbed_by, id: record.to_param, column: column.label)
         refresh_opts = {refresh_link: {text: 'Add tab', class: 'refresh-link add-tab'}}
         tab_options = send(override_helper_per_model(:active_scaffold_tab_options, record.class), column, record)
@@ -10,7 +10,7 @@ module ActiveScaffold
         input_helper = override_helper_per_model(:active_scaffold_input_for_tabbed, record.class)
         send(input_helper, column, record, subsection_id, tab_options, used_tabs.map(&:first)) <<
           active_scaffold_refresh_link(nil, {'data-update_url' => url_for(add_tab_url)}, record, refresh_opts) <<
-          active_scaffold_tabs_for(column, record, subsection_id, tab_options, used_tabs, &block)
+          active_scaffold_tabs_for(column, record, subsection_id, tab_options, used_tabs, &)
       end
 
       def active_scaffold_input_for_tabbed(column, record, subsection_id, tab_options, used_tabs)
@@ -49,7 +49,8 @@ module ActiveScaffold
         end
         if tab_column
           label_method = (tab_column.form_ui_options || tab_column.options)[:label_method] || :to_label
-          sorted_association_options_find(tab_column.association, nil, subform_record).map do |opt_record|
+          helper_method = association_helper_method(column.association, :sorted_association_options_find)
+          send(helper_method, tab_column.association, nil, subform_record).map do |opt_record|
             [opt_record.send(label_method), opt_record.id, opt_record]
           end
         else

data/lib/active_scaffold/helpers/view_helpers.rb

@@ -13,6 +13,7 @@ module ActiveScaffold
       include ActiveScaffold::Helpers::TabsHelpers
       include ActiveScaffold::Helpers::SearchColumnHelpers
       include ActiveScaffold::Helpers::HumanConditionHelpers
+      include ActiveScaffold::Helpers::FilterHelpers
 
       ##
       ## Delegates
@@ -137,7 +138,8 @@ module ActiveScaffold
         empty
       end
 
-      def empty_field_text
+      def empty_field_text(column = nil)
+        return column.empty_field_text if column&.empty_field_text
         return @_empty_field_text if defined? @_empty_field_text
 
         @_empty_field_text = (active_scaffold_config.list.empty_field_text if active_scaffold_config.actions.include?(:list))
@@ -264,6 +266,10 @@ module ActiveScaffold
           options[:container_tag] ? content_tag(options[:container_tag], contents, html) : contents
         end
       end
+
+      def new_option_from_record(record)
+        [record.to_label, record.id]
+      end
     end
   end
 end

data/lib/active_scaffold/registry.rb

@@ -18,7 +18,7 @@ module ActiveScaffold
       RequestStore.store[:column_links] ||= {}
     end
 
-    def self.cache(kind, key = nil, &block)
+    def self.cache(kind, key = nil, &)
       unless key
         key = kind
         kind = :cache

data/lib/active_scaffold/responds_to_parent.rb

@@ -4,14 +4,14 @@ module ActiveScaffold
     # Executes the response body as JavaScript in the context of the parent window.
     # Use this method of you are posting a form to a hidden IFRAME or if you would like
     # to use IFRAME base RPC.
-    def responds_to_parent(&block)
+    def responds_to_parent(&)
       yield
       return unless performed?
 
       # Either pull out a redirect or the request body
       script =
-        if response.headers['Location']
-          "document.location.href = '#{self.class.helpers.escape_javascript response.headers.delete('Location').to_s}'"
+        if response.has_header? 'location'
+          "document.location.href = '#{self.class.helpers.escape_javascript response.delete_header('location').to_s}'"
         else
           response.body || ''
         end

data/lib/active_scaffold/tableless.rb

@@ -162,8 +162,8 @@ class ActiveScaffold::Tableless < ActiveRecord::Base # rubocop:disable Rails/App
       ActiveScaffold::Tableless::Relation.new(self)
     end
 
-    def cached_find_by_statement(key, &block)
-      StatementCache.new(key, self, &block)
+    def cached_find_by_statement(key, &)
+      StatementCache.new(key, self, &)
     end
   end
 

data/lib/active_scaffold/version.rb

@@ -1,8 +1,8 @@
 module ActiveScaffold
   module Version
     MAJOR = 4
-    MINOR = 0
-    PATCH = 13
+    MINOR = 1
+    PATCH = 0
     FIX = nil
 
     STRING = [MAJOR, MINOR, PATCH, FIX].compact.join('.')

data/lib/active_scaffold.rb

@@ -80,16 +80,12 @@ module ActiveScaffold
     "#{File.dirname(__FILE__)}/.."
   end
 
-  def self.defaults(&block)
-    ActiveScaffold::Config::Core.configure(&block)
+  def self.defaults(&)
+    ActiveScaffold::Config::Core.configure(&)
   end
 
   def self.deprecator
-    @deprecator ||= ActiveSupport::Deprecation.new('4.1', 'ActiveScaffold')
-  end
-
-  class << self
-    ActiveScaffold.deprecator.deprecate_methods self, :nested_subforms= => 'is enabled always', threadsafe!: 'is enabled always'
+    @deprecator ||= ActiveSupport::Deprecation.new('4.2', 'ActiveScaffold')
   end
 end
 require 'active_scaffold/engine'

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold
 version: !ruby/object:Gem::Version
-  version: 4.0.13
+  version: 4.1.0
 platform: ruby
 authors:
 - Many, see README
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-17 00:00:00.000000000 Z
+date: 2025-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: dartsass-sprockets
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: ice_nine
   requirement: !ruby/object:Gem::Requirement
@@ -39,33 +39,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.11'
 - !ruby/object:Gem::Dependency
-  name: request_store
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 5.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 5.2.0
 - !ruby/object:Gem::Dependency
-  name: sassc-rails
+  name: request_store
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.3'
 description: Save time and headaches, and create a more easily maintainable set of
   pages, with ActiveScaffold. ActiveScaffold handles all your CRUD (create, read,
   update, delete) user interface needs, leaving you more time to focus on more challenging
@@ -103,7 +103,6 @@ files:
 - app/assets/javascripts/jquery/tiny_mce_bridge.js
 - app/assets/stylesheets/active_scaffold-ie.scss
 - app/assets/stylesheets/active_scaffold.scss
-- app/assets/stylesheets/active_scaffold_colors.scss
 - app/assets/stylesheets/active_scaffold_extensions.css.erb
 - app/assets/stylesheets/active_scaffold_images.scss
 - app/assets/stylesheets/active_scaffold_jquery_ui.css.erb
@@ -124,6 +123,7 @@ files:
 - app/views/active_scaffold_overrides/_horizontal_subform_footer.html.erb
 - app/views/active_scaffold_overrides/_horizontal_subform_header.html.erb
 - app/views/active_scaffold_overrides/_human_conditions.html.erb
+- app/views/active_scaffold_overrides/_human_filters.html.erb
 - app/views/active_scaffold_overrides/_list.html.erb
 - app/views/active_scaffold_overrides/_list_calculations.html.erb
 - app/views/active_scaffold_overrides/_list_column_headings.html.erb
@@ -153,6 +153,7 @@ files:
 - app/views/active_scaffold_overrides/_update_actions.html.erb
 - app/views/active_scaffold_overrides/_update_calculations.js.erb
 - app/views/active_scaffold_overrides/_update_column.js.erb
+- app/views/active_scaffold_overrides/_update_field_on_create.js.erb
 - app/views/active_scaffold_overrides/_update_form.html.erb
 - app/views/active_scaffold_overrides/_update_messages.js.erb
 - app/views/active_scaffold_overrides/_vertical_subform.html.erb
@@ -285,6 +286,9 @@ files:
 - lib/active_scaffold/data_structures/bridge.rb
 - lib/active_scaffold/data_structures/column.rb
 - lib/active_scaffold/data_structures/columns.rb
+- lib/active_scaffold/data_structures/filter.rb
+- lib/active_scaffold/data_structures/filter_option.rb
+- lib/active_scaffold/data_structures/filters.rb
 - lib/active_scaffold/data_structures/nested_info.rb
 - lib/active_scaffold/data_structures/proxy_column.rb
 - lib/active_scaffold/data_structures/set.rb
@@ -306,6 +310,7 @@ files:
 - lib/active_scaffold/helpers/action_link_helpers.rb
 - lib/active_scaffold/helpers/association_helpers.rb
 - lib/active_scaffold/helpers/controller_helpers.rb
+- lib/active_scaffold/helpers/filter_helpers.rb
 - lib/active_scaffold/helpers/form_column_helpers.rb
 - lib/active_scaffold/helpers/human_condition_helpers.rb
 - lib/active_scaffold/helpers/id_helpers.rb
@@ -363,7 +368,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="