active_scaffold 4.0.0.rc1 → 4.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ecbb34d72c3f80ed59d3e2375baf713458478c1721a7cbbd869fc9f07969b3b
-  data.tar.gz: 5608a6c738c0c00906b693948666324ed69e3de0edd4484d46a74c9974dabe6d
+  metadata.gz: 4bccfcf8d4c225ac40c3065df81306ddd3dd481c730c8154ba9f3c739a5521c0
+  data.tar.gz: 52eeca24fb5823cb0be1c6e9996ea5cde658902956158177e9175623d018426e
 SHA512:
-  metadata.gz: 2197a3ce4b166d648d48afb8530f6bc9d34e3acc64b3a2eb05e09242888093d7298920dcd8ca890bb8c936495e0a743b5d4fc9bd0ccef263a4e02fe331aea770
-  data.tar.gz: 375ce3cda4d6d08ee694b7ccb529a02ddde1e4982e641f15eea47e283e38b435c95a93a48e075174c7cf13d9ac805935e9e270d54909c34e95d5a7c6bdccf50a
+  metadata.gz: 06a2c2bf3b3e7f1dc622ec0f7ddb678156d61e6ade22d60ba30bd33c1b9843e310b6e2424af1f016e8bb9b6099926986f7882ebec17190173e69f29372dcdbbc
+  data.tar.gz: 90641599e80840772a26f2249819474cca3153927c30d20c69980d95343ebfed3fca3c2c599ee935c67859440caf53d59b3c35a47d9cac43bae1156e01f3d8f6

data/CHANGELOG.rdoc

@@ -5,8 +5,13 @@
   - Action links can't be changed, added or removed, add all links and use ignore_method to control when they are displayed
   - Require using active_scaffold_config.override_columns to exclude or add columns
 - Thread safety enabled by default, can't be disabled, deprecate ActiveScaffold.threadsafe!
+- Support separators in action links
 
-= 3.7.9 (not released yet)
+= 3.7.10
+- Move code from on_create.js.erb to partials, so it's easier to change parts, e.g. how new record is rendered
+- Don't reload after deleting last record if pagination is disabled
+
+= 3.7.9
 - Add css_class to action links, to avoid changing name, it may result confusing, deprecate name setter.
 - Add buttons to check all and uncheck all on :select form ui for collection associations, and draggable lists (active_scaffold_checkbox_list).
 - Add hidden field with locking column in base_form partial for persisted records automatically, if model uses optimistic locking.

data/README.md

@@ -32,25 +32,17 @@ Added to Gemfile
 gem 'active_scaffold'
 ```
 
-For rails >= 5.1, add jquery-rails to Gemfile, and install generator will jquery to application.js before rails-ujs. Also it's possible to load jquery in your layout before application.js using CDN (e.g. jquery-rails-cdn). You can replace rails-ujs with jquery_ujs, although rails-ujs should work (never load both).
+Add jquery-rails to Gemfile, or handle jquery with other tools like webpack or importmap. Also it's possible to load jquery in your layout before application.js using CDN (e.g. jquery-rails-cdn). You can replace @rails/ujs with jquery_ujs, although @rails/ujs should work (never load both).
 
 ```ruby
 gem 'jquery-rails'
 ```
 
-For rails >= 6.0, installer generator will create app/assets/javascripts/application.js, add it to assets.precompile array and add javascript_include_tag in layout, as ActiveScaffold doesn't work with webpack yet. Jquery may be loaded by packs or assets pipeline.
+For rails 7.x, install generator will add active_scaffold to config/importmap.rb, app/javascript/application.js, and active_scaffold/manifest.js to app/assets/config/manifest.js. It will add jquery and jquery_ujs to all the 3 files if jquery-rails gem is available.
 
-Run the following commands, for rails 4.2
+For rails 6.1, install generator will create app/assets/javascripts/application.js, add it, and active_scaffold/manifest.js, to app/assets/config/manifest.js and add javascript_include_tag in layout, as ActiveScaffold doesn't work with webpack. It will add jquery to app/assets/javascripts/application.js too if query-rails gem is available, although Jquery may be loaded by packs too and it will work, it won't add jquery_ujs or @rails/ujs as it's added to app/javascript/packs/application.js by default.
 
-```console
-bundle install
-rails g active_scaffold:install
-bundle exec rake db:create
-rails g active_scaffold:resource Model [attrs]
-bundle exec rake db:migrate
-```
-
-Or run the following commands, for rails >= 5
+Run the following commands
 
 ```console
 bundle install
@@ -67,9 +59,7 @@ It's recommended to call `clear_helpers` in ApplicationController, as some helpe
 Threadsafe
 ----------
 
-Threadsafe can be enabled calling ActiveScaffold.threadsafe! in an initializer.
- It should be enabled on app start and it can't be disabled. Threadsafety is a
- new feature and not well tested yet.  
+Threadsafe is enabled always since 4.0, and it can't be disabled.  
 
 Configuration
 -------------

data/app/assets/config/active_scaffold/manifest.js

@@ -0,0 +1,3 @@
+//= link_tree ../../images
+//= link_directory ../../javascripts .js
+//= link_directory ../../stylesheets .css

data/app/assets/javascripts/jquery/active_scaffold.js

@@ -647,6 +647,11 @@
           jQuery(tbody).parent().find('tbody.messages p.empty-message').hide();
         }
       },
+      show_empty_message: function(tbody) {
+        if (this.records_for(tbody).length != 0) {
+          jQuery(tbody).parent().find('tbody.messages p.empty-message').hide();
+        }
+      },
       reload_if_empty: function(tbody, url) {
         if (this.records_for(tbody).length == 0) {
           this.reload(url);
@@ -849,6 +854,7 @@
           ActiveScaffold.stripe(tbody);
           ActiveScaffold.decrement_record_count(tbody.closest('div.active-scaffold'));
           if (page_reload_url) ActiveScaffold.reload_if_empty(tbody, page_reload_url);
+          else ActiveScaffold.show_empty_message(tbody);
         });
       },
 

data/app/assets/stylesheets/active_scaffold.scss

@@ -6,9 +6,9 @@
 
  For details, see the ActiveScaffold web site: https://github.com/activescaffold/active_scaffold
 */
+//= require "active_scaffold_jquery_ui"
+//= require "active_scaffold_extensions"
 
 @import 'active_scaffold_layout';
 @import 'active_scaffold_images';
-@import 'active_scaffold_jquery_ui';
-@import 'active_scaffold_extensions';
 @import 'active_scaffold_colors';

data/app/assets/stylesheets/active_scaffold_colors.scss

@@ -110,6 +110,9 @@ color: $column_color;
 color: $header_color;
 }
 
+.active-scaffold div.actions a.separator {
+border-color: $action_group_border_color;
+}
 .active-scaffold-header div.actions a.disabled {
 color: $actions_disabled_color;
 }
@@ -191,6 +194,10 @@ color: $column_empty_color;
 border-color: $column_actions_border_color;
 }
 
+.active-scaffold tr.record td.actions table td.separator {
+border-color: $column_actions_border_color;
+}
+
 .active-scaffold tr.record td.actions a.disabled {
 color: $actions_disabled_color;
 }

data/app/assets/stylesheets/active_scaffold_layout.css

@@ -110,6 +110,12 @@ top: 14px;
 top: -3px;
 }
 
+.active-scaffold div.actions a.separator {
+  border-right: 1px solid;
+  padding-right: 0;
+  padding-left: 0;
+}
+
 .active-scaffold div.actions a.disabled {
 opacity: 0.5;
 }
@@ -251,6 +257,11 @@ text-align: right;
 padding: 0 2px;
 }
 
+.active-scaffold tr.record td.actions table td.separator {
+  border-right: solid 1px;
+  padding: 0;
+}
+
 .active-scaffold tr.record td.actions a,
 .active-scaffold tr.record td.actions div {
 font-weight: bold;
@@ -304,6 +315,16 @@ width: auto;
 text-align: left;
 }
 
+.active-scaffold .actions .action_group ul li.separator {
+  border-top-width: 1px;
+  border-top-style: solid;
+  height: 0;
+}
+
+.active-scaffold .actions .action_group ul li.separator + li {
+  border-top: none;
+}
+
 .active-scaffold .actions .action_group ul li div {
   margin: 0;
   padding: 5px 5px 5px 25px;

data/app/views/active_scaffold_overrides/_list.html.erb

@@ -3,14 +3,7 @@
   <tbody>
     <tr>
       <td class="messages-container">
-        <p class="error-message message server-error" style="display:none;">
-          <%= as_(:internal_error).html_safe %>
-          <span class="error-500"><%= as_(:error_500).html_safe %></span>
-          <a href="#" class="close" title="<%= as_(:close).html_safe %>"><%= as_(:close).html_safe %></a>
-        </p>
-        <div id="<%= active_scaffold_messages_id -%>" class="action-messages">
-          <%= render 'messages' %>
-        </div>
+        <%= render 'list_messages_content' %>
       </td>
     </tr>
   </tbody>

data/app/views/active_scaffold_overrides/_list_messages.html.erb

@@ -2,16 +2,7 @@
 <tbody class="messages">
   <tr class="record even-record">
     <td colspan="<%= column_count -%>" class="messages-container">
-<% unless active_scaffold_config.list.messages_above_header %>
-      <p class="error-message message server-error" style="display:none;">
-        <%= as_(:internal_error).html_safe %>
-        <span class="error-500"><%= as_(:error_500).html_safe %></span>
-        <a href="#" class="close" title="<%= as_(:close).html_safe %>"><%= as_(:close).html_safe %></a>
-      </p>
-      <div id="<%= active_scaffold_messages_id -%>" class="action-messages">
-        <%= render 'messages' %>
-      </div>
-<% end %>
+      <%= render 'list_messages_content' unless active_scaffold_config.list.messages_above_header %>
       <%= content_tag :div, class: 'filtered-message',
                       style: ('display:none;' unless @filtered),
                       data: ({search: search_params || ''} if active_scaffold_config.store_user_settings && respond_to?(:search_params)) do %>

data/app/views/active_scaffold_overrides/_list_messages_content.html.erb

@@ -0,0 +1,8 @@
+<p class="error-message message server-error" style="display:none;">
+  <%= as_(:internal_error).html_safe %>
+  <span class="error-500"><%= as_(:error_500).html_safe %></span>
+  <a href="#" class="close" title="<%= as_(:close).html_safe %>"><%= as_(:close).html_safe %></a>
+</p>
+<div id="<%= active_scaffold_messages_id -%>" class="action-messages">
+  <%= render 'messages' %>
+</div>

data/app/views/active_scaffold_overrides/_new_record.js.erb

@@ -0,0 +1,15 @@
+<% if render_parent? %>
+  <% if nested_singular_association? %>
+  if (action_link) action_link.close(true);
+  <% elsif params[:parent_sti] && render_parent_action == :row %>
+    ActiveScaffold.create_record_row_from_url(action_link, '<%= url_for(render_parent_options) %>', <%= {insert_at: insert_at}.to_json.html_safe %>);
+  <% else %>
+    ActiveScaffold.reload('<%= url_for render_parent_options %>');
+  <% end %>
+<% elsif active_scaffold_config.create.refresh_list %>
+  <%= render 'refresh_list', no_history: true %>
+<% elsif params[:parent_controller].nil? %>
+  <% new_row = render 'list_record', record: @saved_record || @record %>
+  ActiveScaffold.create_record_row(action_link ? action_link.scaffold() : '<%= active_scaffold_id %>', '<%= escape_javascript(new_row) %>', <%= {insert_at: insert_at}.to_json.html_safe %>);
+  <%= render 'update_calculations' %>
+<% end %>

data/app/views/active_scaffold_overrides/_refresh_create_form.js.erb

@@ -0,0 +1,12 @@
+<% if always_show_create %>
+  ActiveScaffold.reset_form('<%= form_selector %>');
+<% elsif params[:dont_close] %>
+  ActiveScaffold.replace('<%= form_selector %>','<%= escape_javascript(render('create_form', xhr: true)) %>');
+  ActiveScaffold.focus_first_element_of_form('<%= form_selector %>');
+<% else %>
+  if (action_link) action_link.close();
+<% end %>
+<% if active_scaffold_config.create.action_after_create %>
+  var link = ActiveScaffold.find_action_link('<%= action_link_id active_scaffold_config.create.action_after_create, @record.id || @saved_record.id %>');
+  if (link) link.open();
+<% end %>

data/app/views/active_scaffold_overrides/destroy.js.erb

@@ -17,10 +17,13 @@
     <%= render 'refresh_list', no_history: true %>
   <% else %>
     <%
-      url = main_path_to_return
-      url[:page] = [active_scaffold_config.list.user.page.to_i - 1, 1].max if url.is_a?(Hash) && active_scaffold_config.actions.include?(:list)
+      if active_scaffold_config.actions.exclude?(:list) || active_scaffold_config.list.pagination
+        url = main_path_to_return
+        url[:page] = [active_scaffold_config.list.user.page.to_i - 1, 1].max if url.is_a?(Hash) && active_scaffold_config.actions.include?(:list)
+        url = url_for(url)
+      end
     %>
-    ActiveScaffold.delete_record_row('<%= element_row_id(action: 'list', id: params[:id]) %>', '<%= url_for(url) %>');
+    ActiveScaffold.delete_record_row('<%= element_row_id(action: 'list', id: params[:id]) %>', '<%= url %>');
     <%= render 'update_calculations' %>
   <% end %>
 <% else %>

data/app/views/active_scaffold_overrides/on_create.js.erb

@@ -12,36 +12,8 @@ action_link = ActiveScaffold.find_action_link('<%= form_selector %>');
 if (action_link) action_link.update_flash_messages('<%= escape_javascript(render('messages')) %>');
 <% end -%>
 <% if successful? -%>
-  <% if render_parent? %>
-    <% if nested_singular_association? %>
-    if (action_link) action_link.close(true);
-    <% elsif params[:parent_sti] && render_parent_action == :row %>
-      ActiveScaffold.create_record_row_from_url(action_link,'<%= url_for(render_parent_options) %>', <%= {insert_at: insert_at}.to_json.html_safe %>);
-    <% else %>
-      ActiveScaffold.reload('<%= url_for render_parent_options %>');
-    <% end %>
-  <% elsif active_scaffold_config.create.refresh_list %>
-    <%= render 'refresh_list', no_history: true %>
-  <% elsif params[:parent_controller].nil? %>
-    <% new_row = render 'list_record', record: @saved_record || @record %>
-    ActiveScaffold.create_record_row(action_link ? action_link.scaffold() : '<%= active_scaffold_id %>', '<%= escape_javascript(new_row) %>', <%= {insert_at: insert_at}.to_json.html_safe %>);
-    <%= render 'update_calculations' %>
-  <% end %>
-
-  <% unless render_parent? %>
-    <% if always_show_create %>
-      ActiveScaffold.reset_form('<%= form_selector %>');
-    <% elsif params[:dont_close] %>
-      ActiveScaffold.replace('<%= form_selector %>','<%= escape_javascript(render('create_form', xhr: true)) %>');
-      ActiveScaffold.focus_first_element_of_form('<%= form_selector %>');
-    <% else %>
-      if (action_link) action_link.close();
-    <% end %>
-    <% if active_scaffold_config.create.action_after_create %>
-      var link = ActiveScaffold.find_action_link('<%= action_link_id active_scaffold_config.create.action_after_create, @record.id || @saved_record.id %>');
-      if (link) link.open();
-    <% end %>
-  <% end %>
+  <%= render 'new_record', insert_at: insert_at %>
+  <%= render 'refresh_create_form', always_show_create: always_show_create, form_selector: form_selector unless render_parent? %>
 <% else %>
   ActiveScaffold.replace('<%= form_selector %>','<%= escape_javascript(render('create_form', xhr: true)) %>');
   ActiveScaffold.scroll_to('<%= form_selector %>', true);

data/lib/active_scaffold/bridges/date_picker/ext.rb

@@ -4,7 +4,7 @@ class ActiveScaffold::Bridges::DatePicker
       super
       return unless ActiveScaffold::Bridges::DatePicker.default_ui
 
-      types = %i[date datetime]
+      types = %i[date datetime timestamp timestamptz]
       date_picker_fields = _columns.filter_map { |c| {name: c.name.to_sym, type: c.type} if types.include?(c.type) }
       # check to see if file column was used on the model
       return if date_picker_fields.empty?

data/lib/active_scaffold/config/core.rb

@@ -305,6 +305,11 @@ module ActiveScaffold::Config
       include ActiveScaffold::Configurable
       user_attr :cache_action_link_urls, :cache_association_options, :conditional_get_support,
                 :timestamped_messages, :highlight_messages
+      attr_writer :label
+
+      def label(options = {})
+        @label ? as_(@label, options) : @conf.label(options)
+      end
 
       def method_missing(name, *args)
         value = @conf.actions.include?(name) ? @conf.send(name) : super

data/lib/active_scaffold/data_structures/action_link_separator.rb

@@ -0,0 +1,13 @@
+class ActionLinkSeparator
+  def initialize(weight)
+    @weight = weight
+  end
+
+  attr_reader :weight
+
+  def ==(other)
+    other == :separator
+  end
+
+  def name_to_cache; end # :nodoc:
+end

data/lib/active_scaffold/data_structures/action_links.rb

@@ -34,6 +34,12 @@ module ActiveScaffold::DataStructures
     end
     alias << add
 
+    def add_separator(weight = 0)
+      raise 'Call add_separator on a group' if name == :root
+
+      add_to_set ActionLinkSeparator.new(weight)
+    end
+
     def add_to_set(link)
       @set << link
     end
@@ -51,6 +57,8 @@ module ActiveScaffold::DataStructures
     def [](val)
       links = []
       @set.each do |item|
+        next if item == :separator
+
         if item.is_a?(ActiveScaffold::DataStructures::ActionLinks)
           collected = item[val]
           links << collected unless collected.nil?
@@ -64,6 +72,8 @@ module ActiveScaffold::DataStructures
     def find_duplicate(link)
       links = []
       @set.each do |item|
+        next if item == :separator
+
         if item.is_a?(ActiveScaffold::DataStructures::ActionLinks)
           collected = item.find_duplicate(link)
           links << collected unless collected.nil?
@@ -76,6 +86,8 @@ module ActiveScaffold::DataStructures
 
     def delete(val)
       each(include_set: true) do |link, set|
+        next if link == :separator
+
         if link.action.to_s == val.to_s
           set.delete link
           break
@@ -110,12 +122,6 @@ module ActiveScaffold::DataStructures
       end
     end
 
-    def collect_by_type(type = nil)
-      links = []
-      subgroup(type).each(type) { |link| links << link }
-      links
-    end
-
     def collect
       @set
     end

data/lib/active_scaffold/helpers/action_link_helpers.rb

@@ -35,33 +35,49 @@ module ActiveScaffold
         options[:level] ||= 0
         options[:first_action] = true
         output = ActiveSupport::SafeBuffer.new
+        prev_link = separator = nil
 
         action_links.each(reverse: options.delete(:reverse), groups: true) do |link|
+          if link == :separator
+            separator = true if prev_link
+            next
+          end
+          content = nil
           if link.is_a? ActiveScaffold::DataStructures::ActionLinks
-            unless link.empty?
-              options[:level] += 1
-              content = display_action_links(link, record, options, &block)
-              options[:level] -= 1
-              if content.present?
-                output << display_action_link(link, content, record, options)
-                options[:first_action] = false
-              end
-            end
+            content = display_action_link_group(link, record, options, &block) unless link.empty?
           elsif !skip_action_link?(link, *Array(options[:for]))
             authorized, reason = action_link_authorized?(link, *Array(options[:for]))
             next if !authorized && options[:skip_unauthorized]
 
-            output << display_action_link(link, nil, record, options.merge(authorized: authorized, not_authorized_reason: reason))
+            content = display_action_link(link, nil, record, options.merge(authorized: authorized, not_authorized_reason: reason))
             options[:first_action] = false
           end
+          next if content.blank?
+
+          prev_link = true
+          output << display_action_link_separator(options) if separator
+          output << content
+          separator = false
         end
         output
       end
 
+      def display_action_link_group(link, record, options, &block)
+        options[:level] += 1
+        content = display_action_links(link, record, options, &block)
+        options[:level] -= 1
+        display_action_link(link, content, record, options).tap { options[:first_action] = false } if content.present?
+      end
+
+      def display_action_link_separator(options)
+        tag = options[:level_0_tag] || :a if options[:level].zero?
+        content_tag(tag || :li, '&nbsp;'.html_safe, class: 'separator')
+      end
+
       def display_action_link(link, content, record, options)
         if content
           html_classes = hover_via_click? ? 'hover_click ' : ''
-          if (options[:level]).zero?
+          if options[:level].zero?
             html_classes << 'action_group'
             group_tag = :div
           else
@@ -73,9 +89,9 @@ module ActiveScaffold
           end
         else
           content = render_action_link(link, record, options)
-          content = content_tag(:li, content, class: ('top' if options[:first_action])) unless (options[:level]).zero?
+          content = content_tag(:li, content, class: ('top' if options[:first_action])) unless options[:level].zero?
         end
-        content = content_tag(options[:level_0_tag], content, options[:options_level_0_tag]) if (options[:level]).zero? && options[:level_0_tag]
+        content = content_tag(options[:level_0_tag], content, options[:options_level_0_tag]) if options[:level].zero? && options[:level_0_tag]
         content
       end
 

data/lib/active_scaffold/version.rb

@@ -3,7 +3,7 @@ module ActiveScaffold
     MAJOR = 4
     MINOR = 0
     PATCH = 0
-    FIX = 'rc1'
+    FIX = 'rc2'.freeze
 
     STRING = [MAJOR, MINOR, PATCH, FIX].compact.join('.')
   end

data/lib/generators/active_scaffold/install_generator.rb

@@ -11,21 +11,29 @@ module ActiveScaffold
         route 'concern :active_scaffold_association, ActiveScaffold::Routing::Association.new'
       end
 
-      def add_to_javascript_manifest
-        file = 'app/assets/javascripts/application.js'
-        unless File.exist?(file)
-          create_javascript_manifest file
-          return
-        end
-        original_js = File.binread(file)
-        if original_js.include?('require active_scaffold')
-          say_status('skipped', "insert into #{file}", :yellow)
-        else
-          insert_into_file file, after: %r{//= require +.*ujs['"]?\n} do
-            "//= require active_scaffold\n"
+      IMPORTMAP = 'config/importmap.rb'.freeze
+      JS_ASSET = 'app/assets/javascripts/application.js'.freeze
+      JS_APP = 'app/javascript/application.js'.freeze
+      MANIFEST = 'app/assets/config/manifest.js'.freeze
+
+      def add_javascript
+        if File.exist?(IMPORTMAP)
+          add_to_importmap
+          add_to_js_app
+        elsif File.exist?(JS_ASSET) # rails 6.1
+          original_js = File.binread(JS_ASSET)
+          if original_js.include?('require active_scaffold')
+            say_status('skipped', "insert into #{JS_ASSET}", :yellow)
+          else
+            insert_into_file JS_ASSET, after: %r{//= require +.*ujs['"]?\n} do
+              "//= require active_scaffold\n"
+            end
+            add_to_manifest 'active_scaffold/manifest.js'
           end
+          setup_jquery JS_ASSET, original_js
+        else
+          create_javascript_manifest JS_ASSET
         end
-        setup_jquery file, original_js
       end
 
       def add_to_stylesheet_manifest
@@ -44,10 +52,70 @@ module ActiveScaffold
 
       protected
 
+      def add_to_importmap
+        original_js = File.binread(IMPORTMAP)
+        if original_js.match?(/^pin +['"]active_scaffold['"](?=,|$)/)
+          say_status('skipped', "append active_scaffold to #{IMPORTMAP}", :yellow)
+        else
+          append_to_file IMPORTMAP do
+            "pin 'active_scaffold'\n"
+          end
+        end
+        if Object.const_defined?(:Jquery)
+          if original_js.match?(/^pin +['"]jquery['"](?=,|$)/)
+            say_status('skipped', "append jquery to #{IMPORTMAP}", :yellow)
+          else
+            append_to_file IMPORTMAP do
+              "pin 'jquery'\n"
+            end
+          end
+          if original_js.match?(%r{^pin +['"](jquery_ujs|@rails/ujs)['"](?=,|$)})
+            say_status('skipped', "append jquery_ujs to #{IMPORTMAP}", :yellow)
+          else
+            append_to_file IMPORTMAP do
+              "pin 'jquery_ujs'\n"
+            end
+          end
+        else
+          say_status('missing', 'no jquery-rails gem, load jquery, and jquery_ujs or @rails/ujs, in your layout, or add jquery-rails ' \
+                                "to Gemfile and add pin \"jquery\" and pin \"jquery_ujs\" or pin \"@rails/ujs\", to #{IMPORTMAP}", :red)
+        end
+      end
+
+      def add_to_js_app
+        original_js = File.binread(JS_APP)
+        if original_js.match?(/^import +['"]active_scaffold['"]/)
+          say_status('skipped', "append active_scaffold to #{JS_APP}", :yellow)
+        else
+          append_to_file JS_APP do
+            "import 'active_scaffold'\n"
+          end
+        end
+        manifest = ['active_scaffold/manifest.js']
+        if Object.const_defined?(:Jquery)
+          if original_js.match?(/^import +['"]jquery['"]/)
+            say_status('skipped', "append jquery to #{JS_APP}", :yellow)
+          else
+            manifest << 'jquery.js'
+            insert_into_file JS_APP, before: /import +['"]active_scaffold['"]\n/ do
+              "import 'jquery'\n"
+            end
+          end
+          if original_js.match?(%r{^import +(['"]jquery_ujs['"]|Rails from ['"]@rails/ujs['"])})
+            say_status('skipped', "append jquery_ujs to #{JS_APP}", :yellow)
+          else
+            manifest << 'jquery_ujs.js'
+            insert_into_file JS_APP, before: /import +['"]active_scaffold['"]\n/ do
+              "import 'jquery_ujs'\n"
+            end
+          end
+        end
+        add_to_manifest(*manifest)
+      end
+
       def create_javascript_manifest(file)
         FileUtils.mkdir_p File.dirname(file)
-        File.open(file, 'w') do |f|
-          f << "// This is a manifest file that'll be compiled into application.js, which will include all the files
+        js_content = "// This is a manifest file that'll be compiled into application.js, which will include all the files
 // listed below.
 //
 // Any JavaScript/Coffee file within this directory, lib/assets/javascripts, or any plugin's
@@ -61,20 +129,24 @@ module ActiveScaffold
 //
 //= require active_scaffold
 "
-          say_status('create', file)
-        end
+        File.open(file, 'w') { |f| f << js_content } unless options[:pretend]
+        say_status('create', file)
         insert_into_file 'app/views/layouts/application.html.erb', after: /javascript_pack_tag 'application'.*\n/ do
           "    <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload', 'data-turbo-track': 'reload' %>\n"
         end
-        append_to_file 'config/initializers/assets.rb' do
-          "Rails.application.config.assets.precompile += %w( application.js )\n"
+        add_to_manifest 'application.js', 'active_scaffold/manifest.js'
+        setup_jquery file, js_content, where: 'active_scaffold'
+      end
+
+      def add_to_manifest(*files)
+        append_to_file MANIFEST do
+          files.map { |file| "//= link #{file}\n" }.join
         end
-        setup_jquery file, where: 'active_scaffold'
       end
 
       def setup_jquery(file, original_js = nil, where: 'ujs')
         original_js ||= File.binread(file)
-        if defined? Jquery
+        if Object.const_defined?(:Jquery)
           unless original_js.include?('require jquery')
             insert_into_file file, before: %r{//= require +.*#{where}['"]?\n} do
               "//= require jquery\n"

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

@@ -1,20 +1,3 @@
-/*
- *= depend_on_asset "jquery-ui/ui-bg_diagonals-thick_18_b81900_40x40.png"
- *= depend_on_asset "jquery-ui/ui-bg_diagonals-thick_20_666666_40x40.png"
- *= depend_on_asset "jquery-ui/ui-bg_flat_10_000000_40x100.png"
- *= depend_on_asset "jquery-ui/ui-bg_glass_100_f6f6f6_1x400.png"
- *= depend_on_asset "jquery-ui/ui-bg_glass_100_fdf5ce_1x400.png"
- *= depend_on_asset "jquery-ui/ui-bg_glass_65_ffffff_1x400.png"
- *= depend_on_asset "jquery-ui/ui-bg_gloss-wave_35_f6a828_500x100.png"
- *= depend_on_asset "jquery-ui/ui-bg_highlight-soft_100_eeeeee_1x100.png"
- *= depend_on_asset "jquery-ui/ui-bg_highlight-soft_75_ffe45c_1x100.png"
- *= depend_on_asset "jquery-ui/ui-icons_222222_256x240.png"
- *= depend_on_asset "jquery-ui/ui-icons_228ef1_256x240.png"
- *= depend_on_asset "jquery-ui/ui-icons_ef8c08_256x240.png"
- *= depend_on_asset "jquery-ui/ui-icons_ffd27a_256x240.png"
- *= depend_on_asset "jquery-ui/ui-icons_ffffff_256x240.png"
- */
-
 /* 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; }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold
 version: !ruby/object:Gem::Version
-  version: 4.0.0.rc1
+  version: 4.0.0.rc2
 platform: ruby
 authors:
 - Many, see README
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-03 00:00:00.000000000 Z
+date: 2024-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: sassc-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 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
@@ -65,7 +79,7 @@ files:
 - CHANGELOG.rdoc
 - LICENSE.md
 - README.md
-- app/assets/config/active_scaffold_manifest.js
+- app/assets/config/active_scaffold/manifest.js
 - app/assets/images/active_scaffold/add.png
 - app/assets/images/active_scaffold/arrow_down.png
 - app/assets/images/active_scaffold/arrow_up.png
@@ -80,20 +94,6 @@ files:
 - app/assets/images/active_scaffold/indicator.gif
 - app/assets/images/active_scaffold/magnifier.png
 - app/assets/images/active_scaffold/refresh.png
-- app/assets/images/jquery-ui/ui-bg_diagonals-thick_18_b81900_40x40.png
-- app/assets/images/jquery-ui/ui-bg_diagonals-thick_20_666666_40x40.png
-- app/assets/images/jquery-ui/ui-bg_flat_10_000000_40x100.png
-- app/assets/images/jquery-ui/ui-bg_glass_100_f6f6f6_1x400.png
-- app/assets/images/jquery-ui/ui-bg_glass_100_fdf5ce_1x400.png
-- app/assets/images/jquery-ui/ui-bg_glass_65_ffffff_1x400.png
-- app/assets/images/jquery-ui/ui-bg_gloss-wave_35_f6a828_500x100.png
-- app/assets/images/jquery-ui/ui-bg_highlight-soft_100_eeeeee_1x100.png
-- app/assets/images/jquery-ui/ui-bg_highlight-soft_75_ffe45c_1x100.png
-- app/assets/images/jquery-ui/ui-icons_222222_256x240.png
-- app/assets/images/jquery-ui/ui-icons_228ef1_256x240.png
-- app/assets/images/jquery-ui/ui-icons_ef8c08_256x240.png
-- app/assets/images/jquery-ui/ui-icons_ffd27a_256x240.png
-- app/assets/images/jquery-ui/ui-icons_ffffff_256x240.png
 - app/assets/javascripts/active_scaffold.js.erb
 - app/assets/javascripts/jquery/active_scaffold.js
 - app/assets/javascripts/jquery/active_scaffold_chosen.js
@@ -129,11 +129,14 @@ files:
 - app/views/active_scaffold_overrides/_list_header.html.erb
 - app/views/active_scaffold_overrides/_list_inline_adapter.html.erb
 - app/views/active_scaffold_overrides/_list_messages.html.erb
+- app/views/active_scaffold_overrides/_list_messages_content.html.erb
 - app/views/active_scaffold_overrides/_list_pagination.html.erb
 - app/views/active_scaffold_overrides/_list_pagination_links.html.erb
 - app/views/active_scaffold_overrides/_list_record.html.erb
 - app/views/active_scaffold_overrides/_list_with_header.html.erb
 - app/views/active_scaffold_overrides/_messages.html.erb
+- app/views/active_scaffold_overrides/_new_record.js.erb
+- app/views/active_scaffold_overrides/_refresh_create_form.js.erb
 - app/views/active_scaffold_overrides/_refresh_list.js.erb
 - app/views/active_scaffold_overrides/_render_field.js.erb
 - app/views/active_scaffold_overrides/_row.html.erb
@@ -269,6 +272,7 @@ files:
 - lib/active_scaffold/core.rb
 - lib/active_scaffold/data_structures/action_columns.rb
 - lib/active_scaffold/data_structures/action_link.rb
+- lib/active_scaffold/data_structures/action_link_separator.rb
 - lib/active_scaffold/data_structures/action_links.rb
 - lib/active_scaffold/data_structures/actions.rb
 - lib/active_scaffold/data_structures/association.rb
@@ -324,6 +328,20 @@ files:
 - lib/tasks/brakeman.rake
 - public/blank.html
 - shoulda_macros/macros.rb
+- vendor/assets/images/jquery-ui/ui-bg_diagonals-thick_18_b81900_40x40.png
+- vendor/assets/images/jquery-ui/ui-bg_diagonals-thick_20_666666_40x40.png
+- vendor/assets/images/jquery-ui/ui-bg_flat_10_000000_40x100.png
+- vendor/assets/images/jquery-ui/ui-bg_glass_100_f6f6f6_1x400.png
+- vendor/assets/images/jquery-ui/ui-bg_glass_100_fdf5ce_1x400.png
+- vendor/assets/images/jquery-ui/ui-bg_glass_65_ffffff_1x400.png
+- vendor/assets/images/jquery-ui/ui-bg_gloss-wave_35_f6a828_500x100.png
+- vendor/assets/images/jquery-ui/ui-bg_highlight-soft_100_eeeeee_1x100.png
+- vendor/assets/images/jquery-ui/ui-bg_highlight-soft_75_ffe45c_1x100.png
+- vendor/assets/images/jquery-ui/ui-icons_222222_256x240.png
+- vendor/assets/images/jquery-ui/ui-icons_228ef1_256x240.png
+- vendor/assets/images/jquery-ui/ui-icons_ef8c08_256x240.png
+- vendor/assets/images/jquery-ui/ui-icons_ffd27a_256x240.png
+- vendor/assets/images/jquery-ui/ui-icons_ffffff_256x240.png
 - vendor/assets/javascripts/jquery-ui-timepicker-addon.js
 - vendor/assets/javascripts/jquery.ba-throttle-debounce.js
 - vendor/assets/javascripts/jquery.visible.min.js

data/app/assets/config/active_scaffold_manifest.js

@@ -1,3 +0,0 @@
-//= link_tree ../images
-//= link_directory ../javascripts .js
-//= link active_scaffold.scss