active_scaffold 4.2.3 → 4.3.0

data/lib/active_scaffold/helpers/show_column_helpers.rb

@@ -22,6 +22,8 @@ module ActiveScaffold
         else
           get_column_value(value_record, column)
         end
+      rescue StandardError => e
+        handle_exception_on_column(e, column, record)
       end
 
       def active_scaffold_show_text(record, column, ui_options: column.options)
@@ -31,14 +33,14 @@ module ActiveScaffold
       def active_scaffold_show_horizontal(record, column, ui_options: column.options)
         raise ArgumentError, ':horizontal show_ui must be used on association column' unless column.association
 
-        vars = {column: column, parent_record: record, show_partial: :horizontal}
+        vars = {column: column, parent_record: record, show_partial: :horizontal, columns: ui_options[:subform_columns]}
         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)
         raise ArgumentError, ':vertical show_ui must be used on association column' unless column.association
 
-        render partial: 'show_association', locals: {column: column, parent_record: record, show_partial: :vertical}
+        render partial: 'show_association', locals: {column: column, parent_record: record, show_partial: :vertical, columns: ui_options[:subform_columns]}
       end
 
       def show_columns_for(record, parent_column = nil, hash = {})

data/lib/active_scaffold/helpers/view_helpers.rb

@@ -5,6 +5,7 @@ module ActiveScaffold
     # All extra helpers that should be included in the View.
     # Also a dumping ground for uncategorized helpers.
     module ViewHelpers
+      include ActiveScaffold::Helpers::AssetsHelpers
       include ActiveScaffold::Helpers::IdHelpers
       include ActiveScaffold::Helpers::ActionLinkHelpers
       include ActiveScaffold::Helpers::AssociationHelpers
@@ -12,6 +13,7 @@ module ActiveScaffold
       include ActiveScaffold::Helpers::ListColumnHelpers
       include ActiveScaffold::Helpers::ShowColumnHelpers
       include ActiveScaffold::Helpers::FormColumnHelpers
+      include ActiveScaffold::Helpers::FormUiHelpers
       include ActiveScaffold::Helpers::TabsHelpers
       include ActiveScaffold::Helpers::SearchColumnHelpers
       include ActiveScaffold::Helpers::HumanConditionHelpers
@@ -29,6 +31,16 @@ module ActiveScaffold
       ## Uncategorized
       ##
 
+      def handle_exception_on_column(exception, column, record = nil)
+        raise exception if exception.instance_variable_get(:@_active_scaffold_wrapped)
+
+        exception.instance_variable_set(:@_active_scaffold_wrapped, true)
+        message = "on the ActiveScaffold column = :#{column.name} in #{controller.class}"
+        message << ", record: #{record.inspect}" if record
+        ActiveScaffold.log_exception(exception, message)
+        raise exception, "#{exception.message} -- #{message}", exception.backtrace
+      end
+
       def controller_path_for_activerecord(klass)
         controller = active_scaffold_controller_for(klass)
         controller.controller_path

data/lib/active_scaffold/railties/tasks.rake

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+# This file is loaded by the Rails engine
+if defined?(Rails) && defined?(Propshaft) && Rails.application.config.assets.server
+  # Hook into assets:precompile to generate theme before compilation
+  Rake::Task['assets:precompile'].enhance do
+    ActiveScaffold::Assets::JqueryUiThemeGenerator.generate!(force: true)
+    ActiveScaffold::Assets::CssDepsGenerator.generate!
+  end
+end

data/lib/active_scaffold/testing/assert_embedded_load.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module ActiveScaffold
+  module Testing
+    module AssertEmbeddedLoad
+      def assert_embedded_load(selector = nil, **options)
+        elements = []
+        full_selector = [selector, '.active-scaffold-component a.load-embedded[href]'].compact.join(' ')
+
+        # Collect elements without failing if none found, unless user wanted with options
+        assert_select(full_selector, **options) do |matches|
+          elements = matches
+        end
+
+        # Run GET on each href
+        elements.each do |el|
+          get el['href']
+          assert_successful_response!
+        end
+      end
+
+      def assert_successful_response!
+        if respond_to?(:assert_response)
+          assert_response :success
+        elsif defined?(RSpec)
+          expect(response).to have_http_status(:ok)
+        else
+          raise 'No known assertion method for response'
+        end
+      end
+    end
+  end
+end

data/lib/active_scaffold/version.rb

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

data/lib/active_scaffold.rb

@@ -2,6 +2,7 @@
 
 module ActiveScaffold
   autoload :ActiveRecordPermissions, 'active_scaffold/active_record_permissions'
+  autoload :Assets, 'active_scaffold/assets'
   autoload :AttributeParams, 'active_scaffold/attribute_params'
   autoload :Bridges, 'active_scaffold/bridges'
   autoload :Configurable, 'active_scaffold/configurable'
@@ -42,6 +43,10 @@ module ActiveScaffold
     ActiveScaffold.autoload_subdir('helpers', self)
   end
 
+  module Testing
+    ActiveScaffold.autoload_subdir('testing', self)
+  end
+
   class ControllerNotFound < RuntimeError; end
   class MalformedConstraint < RuntimeError; end
   class RecordNotAllowed < RuntimeError; end
@@ -93,11 +98,11 @@ module ActiveScaffold
   def self.log_exception(exception, message)
     line = exception.backtrace.find { |l| l.start_with? Rails.root.to_s }
     line ||= exception.backtrace.find { |l| l.start_with? ActiveScaffold.root }
-    Rails.logger.error "#{exception.class.name}: #{exception.message} -- #{message}\n#{Rails.backtrace_cleaner.clean_frame(line) || line}"
+    line = Rails.backtrace_cleaner.clean_frame(line) || line
+    Rails.logger.error "#{exception.class.name}: #{exception.message} -- #{message}\n#{line}"
   end
 end
 require 'active_scaffold/engine'
 require 'ice_nine'
 require 'ice_nine/core_ext/object'
 require 'request_store'
-require 'dartsass-sprockets'

data/lib/tasks/active_scaffold/assets.rake

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+namespace :active_scaffold do
+  namespace :assets do
+    desc 'Generate jQuery UI theme css from jquery-ui-rails (if using the gem), and deps.css for Propshaft compatibility'
+    task generate: :environment do
+      if ActiveScaffold::Assets::JqueryUiThemeGenerator.generate!
+        puts '✅ jQuery UI theme generated'
+      else
+        puts '✅ No need to generate jQuery UI theme'
+      end
+      if ActiveScaffold::Assets::CssDepsGenerator.generate!
+        puts '✅ Deps.css generated'
+      else
+        puts '⚠️ Deps.css not generated'
+      end
+    end
+
+    desc 'Force regenerate jQuery UI theme css from jquery-ui-rails (if using the gem) and deps.css'
+    task force_generate: :environment do
+      if ActiveScaffold::Assets::JqueryUiThemeGenerator.generate!(force: true)
+        puts '✅ jQuery UI theme regenerated'
+      else
+        puts '⚠️ jQuery UI theme not generated'
+      end
+      if ActiveScaffold::Assets::CssDepsGenerator.generate!
+        puts '✅ Deps.css regenerated'
+      else
+        puts '⚠️ Deps.css not generated'
+      end
+    end
+
+    desc 'Check if jQuery UI theme needs regeneration'
+    task check: :environment do
+      if ActiveScaffold::Assets::JqueryUiThemeGenerator.needs_generation?
+        puts '⚠️  jQuery UI theme needs regeneration. Run: rake active_scaffold:assets:generate'
+      else
+        puts '✅ jQuery UI theme is up to date'
+      end
+    end
+  end
+end

data/lib/tasks/bundle.rake

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+namespace :bundle do
+  desc 'Run bundle lock for all Gemfiles in the gemfiles directory'
+  task :lock_all do
+    gemfiles_dir = File.join(Dir.pwd, 'gemfiles')
+
+    unless Dir.exist?(gemfiles_dir)
+      abort "Error: gemfiles directory not found at #{gemfiles_dir}"
+    end
+
+    gemfiles = Dir.glob(File.join(gemfiles_dir, 'Gemfile*')).reject do |file|
+      file.end_with?('.lock') || File.directory?(file)
+    end
+
+    gemfiles.each do |gemfile|
+      puts "Locking #{File.basename(gemfile)}..."
+      Bundler.with_unbundled_env do
+        system("bundle lock --gemfile='#{gemfile}'")
+      end
+    end
+
+    puts 'Done!'
+  end
+end

data/vendor/assets/stylesheets/{jquery-ui-theme.css.erb → jquery-ui-theme.css}

@@ -1,25 +1,25 @@
 /* Component containers
 ----------------------------------*/
-.ui-widget-content { border: 1px solid #dddddd; background: #eeeeee url(<%= image_path('jquery-ui/ui-bg_highlight-soft_100_eeeeee_1x100.png') %>) 50% top repeat-x; color: #333333; }
+.ui-widget-content { border: 1px solid #dddddd; background: #eeeeee url('jquery-ui/ui-bg_highlight-soft_100_eeeeee_1x100.png') 50% top repeat-x; color: #333333; }
 .ui-widget-content a { color: #333333; }
-.ui-widget-header { border: 1px solid #e78f08; background: #f6a828 url(<%= image_path('jquery-ui/ui-bg_gloss-wave_35_f6a828_500x100.png') %>) 50% 50% repeat-x; color: #ffffff; font-weight: bold; }
+.ui-widget-header { border: 1px solid #e78f08; background: #f6a828 url('jquery-ui/ui-bg_gloss-wave_35_f6a828_500x100.png') 50% 50% repeat-x; color: #ffffff; font-weight: bold; }
 .ui-widget-header a { color: #ffffff; }
 
 /* Interaction states
 ----------------------------------*/
-.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #cccccc; background: #f6f6f6 url(<%= image_path('jquery-ui/ui-bg_glass_100_f6f6f6_1x400.png') %>) 50% 50% repeat-x; font-weight: bold; color: #1c94c4; }
+.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #cccccc; background: #f6f6f6 url('jquery-ui/ui-bg_glass_100_f6f6f6_1x400.png') 50% 50% repeat-x; font-weight: bold; color: #1c94c4; }
 .ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #1c94c4; text-decoration: none; }
-.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #fbcb09; background: #fdf5ce url(<%= image_path('jquery-ui/ui-bg_glass_100_fdf5ce_1x400.png') %>) 50% 50% repeat-x; font-weight: bold; color: #c77405; }
+.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #fbcb09; background: #fdf5ce url('jquery-ui/ui-bg_glass_100_fdf5ce_1x400.png') 50% 50% repeat-x; font-weight: bold; color: #c77405; }
 .ui-state-hover a, .ui-state-hover a:hover { color: #c77405; text-decoration: none; }
-.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #fbd850; background: #ffffff url(<%= image_path('jquery-ui/ui-bg_glass_65_ffffff_1x400.png') %>) 50% 50% repeat-x; font-weight: bold; color: #eb8f00; }
+.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #fbd850; background: #ffffff url('jquery-ui/ui-bg_glass_65_ffffff_1x400.png') 50% 50% repeat-x; font-weight: bold; color: #eb8f00; }
 .ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #eb8f00; text-decoration: none; }
 .ui-widget :active { outline: none; }
 
 /* Interaction Cues
 ----------------------------------*/
-.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight  {border: 1px solid #fed22f; background: #ffe45c url(<%= image_path('jquery-ui/ui-bg_highlight-soft_75_ffe45c_1x100.png') %>) 50% top repeat-x; color: #363636; }
+.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight  {border: 1px solid #fed22f; background: #ffe45c url('jquery-ui/ui-bg_highlight-soft_75_ffe45c_1x100.png') 50% top repeat-x; color: #363636; }
 .ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #363636; }
-.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a; background: #b81900 url(<%= image_path('jquery-ui/ui-bg_diagonals-thick_18_b81900_40x40.png') %>) 50% 50% repeat; color: #ffffff; }
+.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a; background: #b81900 url('jquery-ui/ui-bg_diagonals-thick_18_b81900_40x40.png') 50% 50% repeat; color: #ffffff; }
 .ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #ffffff; }
 .ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #ffffff; }
 .ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; }
@@ -30,18 +30,18 @@
 ----------------------------------*/
 
 /* states and images */
-.ui-icon { background-image: url(<%= image_path('jquery-ui/ui-icons_222222_256x240.png') %>); }
-.ui-widget-content .ui-icon {background-image: url(<%= image_path('jquery-ui/ui-icons_222222_256x240.png') %>); }
-.ui-widget-header .ui-icon {background-image: url(<%= image_path('jquery-ui/ui-icons_ffffff_256x240.png') %>); }
-.ui-state-default .ui-icon { background-image: url(<%= image_path('jquery-ui/ui-icons_ef8c08_256x240.png') %>); }
-.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(<%= image_path('jquery-ui/ui-icons_ef8c08_256x240.png') %>); }
-.ui-state-active .ui-icon {background-image: url(<%= image_path('jquery-ui/ui-icons_ef8c08_256x240.png') %>); }
-.ui-state-highlight .ui-icon {background-image: url(<%= image_path('jquery-ui/ui-icons_228ef1_256x240.png') %>); }
-.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(<%= image_path('jquery-ui/ui-icons_ffd27a_256x240.png') %>); }
+.ui-icon { background-image: url('jquery-ui/ui-icons_222222_256x240.png'); }
+.ui-widget-content .ui-icon {background-image: url('jquery-ui/ui-icons_222222_256x240.png'); }
+.ui-widget-header .ui-icon {background-image: url('jquery-ui/ui-icons_ffffff_256x240.png'); }
+.ui-state-default .ui-icon { background-image: url('jquery-ui/ui-icons_ef8c08_256x240.png'); }
+.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url('jquery-ui/ui-icons_ef8c08_256x240.png'); }
+.ui-state-active .ui-icon {background-image: url('jquery-ui/ui-icons_ef8c08_256x240.png'); }
+.ui-state-highlight .ui-icon {background-image: url('jquery-ui/ui-icons_228ef1_256x240.png'); }
+.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url('jquery-ui/ui-icons_ffd27a_256x240.png'); }
 
 /* Misc visuals
 ----------------------------------*/
 
 /* Overlays */
-.ui-widget-overlay { background: #666666 url(<%= image_path('jquery-ui/ui-bg_diagonals-thick_20_666666_40x40.png') %>) 50% 50% repeat; opacity: .50;filter:Alpha(Opacity=50); }
-.ui-widget-shadow { margin: -5px 0 0 -5px; padding: 5px; background: #000000 url(<%= image_path('jquery-ui/ui-bg_flat_10_000000_40x100.png') %>) 50% 50% repeat-x; opacity: .20;filter:Alpha(Opacity=20); -moz-border-radius: 5px; -khtml-border-radius: 5px; -webkit-border-radius: 5px; border-radius: 5px; }
+.ui-widget-overlay { background: #666666 url('jquery-ui/ui-bg_diagonals-thick_20_666666_40x40.png') 50% 50% repeat; opacity: .50;filter:Alpha(Opacity=50); }
+.ui-widget-shadow { margin: -5px 0 0 -5px; padding: 5px; background: #000000 url('jquery-ui/ui-bg_flat_10_000000_40x100.png') 50% 50% repeat-x; opacity: .20;filter:Alpha(Opacity=20); -moz-border-radius: 5px; -khtml-border-radius: 5px; -webkit-border-radius: 5px; border-radius: 5px; }

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold
 version: !ruby/object:Gem::Version
-  version: 4.2.3
+  version: 4.3.0
 platform: ruby
 authors:
 - Many, see README
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-02-26 00:00:00.000000000 Z
+date: 2026-03-30 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: dartsass-sprockets
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: ice_nine
   requirement: !ruby/object:Gem::Requirement
@@ -109,18 +95,20 @@ files:
 - app/assets/images/active_scaffold/magnifier.png
 - app/assets/images/active_scaffold/refresh.png
 - app/assets/javascripts/active_scaffold.js.erb
-- app/assets/javascripts/jquery/active_scaffold.js
-- app/assets/javascripts/jquery/active_scaffold_chosen.js
-- app/assets/javascripts/jquery/date_picker_bridge.js.erb
-- app/assets/javascripts/jquery/draggable_lists.js
-- app/assets/javascripts/jquery/jquery.editinplace.js
-- app/assets/javascripts/jquery/tiny_mce_bridge.js
+- app/assets/javascripts/active_scaffold/active_scaffold.js
+- app/assets/javascripts/active_scaffold/active_scaffold_chosen.js
+- app/assets/javascripts/active_scaffold/date_picker_bridge.js
+- app/assets/javascripts/active_scaffold/draggable_lists.js
+- app/assets/javascripts/active_scaffold/jquery.editinplace.js
+- app/assets/javascripts/active_scaffold/load.js
+- app/assets/javascripts/active_scaffold/tiny_mce_bridge.js
 - app/assets/stylesheets/active_scaffold-ie.scss
-- app/assets/stylesheets/active_scaffold.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
-- app/assets/stylesheets/active_scaffold_layout.scss
+- app/assets/stylesheets/active_scaffold.scss.erb
+- app/assets/stylesheets/active_scaffold/_colours.scss
+- app/assets/stylesheets/active_scaffold/_images.scss
+- app/assets/stylesheets/active_scaffold/_layout.scss
+- app/assets/stylesheets/active_scaffold/_variables.scss
+- app/assets/stylesheets/active_scaffold/core.scss
 - app/assets/stylesheets/blue-theme.css
 - app/assets/stylesheets/tiny_mce_bridge.scss
 - app/views/active_scaffold_overrides/_add_existing_form.html.erb
@@ -217,6 +205,10 @@ files:
 - lib/active_scaffold/actions/subform.rb
 - lib/active_scaffold/actions/update.rb
 - lib/active_scaffold/active_record_permissions.rb
+- lib/active_scaffold/assets.rb
+- lib/active_scaffold/assets/css_deps_generator.rb
+- lib/active_scaffold/assets/jquery_ui_manifest.rb
+- lib/active_scaffold/assets/jquery_ui_theme_generator.rb
 - lib/active_scaffold/attribute_params.rb
 - lib/active_scaffold/bridges.rb
 - lib/active_scaffold/bridges/active_storage.rb
@@ -328,10 +320,12 @@ files:
 - lib/active_scaffold/extensions/unsaved_record.rb
 - lib/active_scaffold/finder.rb
 - lib/active_scaffold/helpers/action_link_helpers.rb
+- lib/active_scaffold/helpers/assets_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/form_ui_helpers.rb
 - lib/active_scaffold/helpers/human_condition_helpers.rb
 - lib/active_scaffold/helpers/id_helpers.rb
 - lib/active_scaffold/helpers/list_column_helpers.rb
@@ -343,9 +337,11 @@ files:
 - lib/active_scaffold/marked_model.rb
 - lib/active_scaffold/orm_checks.rb
 - lib/active_scaffold/paginator.rb
+- lib/active_scaffold/railties/tasks.rake
 - lib/active_scaffold/registry.rb
 - lib/active_scaffold/responds_to_parent.rb
 - lib/active_scaffold/tableless.rb
+- lib/active_scaffold/testing/assert_embedded_load.rb
 - lib/active_scaffold/version.rb
 - lib/generators/active_scaffold/controller/USAGE
 - lib/generators/active_scaffold/controller/controller_generator.rb
@@ -355,7 +351,9 @@ files:
 - lib/generators/active_scaffold/install/install_generator.rb
 - lib/generators/active_scaffold/resource/USAGE
 - lib/generators/active_scaffold/resource/resource_generator.rb
+- lib/tasks/active_scaffold/assets.rake
 - lib/tasks/brakeman.rake
+- lib/tasks/bundle.rake
 - public/blank.html
 - shoulda_macros/macros.rb
 - vendor/assets/images/jquery-ui/ui-bg_diagonals-thick_18_b81900_40x40.png
@@ -375,7 +373,7 @@ files:
 - vendor/assets/javascripts/jquery-ui-timepicker-addon.js
 - vendor/assets/javascripts/jquery.ba-throttle-debounce.js
 - vendor/assets/javascripts/jquery.visible.min.js
-- vendor/assets/stylesheets/jquery-ui-theme.css.erb
+- vendor/assets/stylesheets/jquery-ui-theme.css
 - vendor/assets/stylesheets/jquery-ui-timepicker-addon.css
 - vendor/assets/stylesheets/jquery-ui.css
 homepage: https://github.com/activescaffold/active_scaffold