active_scaffold 3.6.0.rc2 → 3.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 482104397cc4bcba59938371add5a7d584a23c3f42aa4b8f3f4ba44f0ffa6114
-  data.tar.gz: a140af6343b7a3002740fa8a5af20ddd5da09a0c7a3f384ef31c85a697918cb4
+  metadata.gz: a5f95a3c7624f3802f29e275341ce3184e9979d91644b48395126b4009fd103e
+  data.tar.gz: af61fae0cf8128ec58d90f4e40b6cbdb95400d5491e790a638bafb1dd8bb4909
 SHA512:
-  metadata.gz: 89556a2bbb6664fb22291e21bba6108d21c0195788cf5e3fdb6b5d471aab24e7bdef1d40d764f68bb9ecb6e94dfc5c728ac4742b3034a7e74d7e11688933d835
-  data.tar.gz: 2606b28e771d97eb6600fb380c34cace3adfbce11cc7baa470de3821dd2bd82e3acec4e66b1bcef14ff7fa17755e2255d7b977a43e85aea893d70d83c2d0f133
+  metadata.gz: 35795f0bf6eb16148401b4df273c93a02064a3c25d100e58aa17c9de97f48629be77ad4043e30e73e25e208f49318a4ffe877f1d0a2ffee61147fa2cfe8dcc0d
+  data.tar.gz: 8be4d03e807f6a621b7812854d062d472d51047399e435303be25ce85522a29486b8d4d48acf6b7d2e72f22def1960c8801e6409bc45651483d15ff2ec9c9a94

data/CHANGELOG.rdoc

@@ -1,3 +1,23 @@
+= 3.6.3
+- Fix search on nested or embedded lists with rails_ujs
+- Fix inplace edit when collection action link opens a view with table and th
+
+= 3.6.2
+- Fix count query when association's primary key is string
+- Fix unauthorized_columns and constraint_columns with threadsafe enabled
+- Fix changing list.sorting and column.sort_by per request when threadsafe is enabled
+
+= 3.6.1
+- Display group cols vertically when subform layout is vertical
+- Fix html attributes for input datetime on field search, when jquery ui is not used
+- Fix constraint columns for nested list on through assocaitions
+- Support rails 6.1
+
+= 3.6.0
+- Fix i18n at ruby 3.0.0
+- Add list helper for bitfield column, so it display labels of selected checkboxes in list
+- Support rails 6.0
+
 = 3.6.0.rc2
 - Fix subform crud in subform subgroup when controller is embedded
 - Fix sorting for mongoid models, broken in 3.6.0.rc1

data/README.md

@@ -1,6 +1,7 @@
+
 Overview
 ========
-[![Build status](https://travis-ci.org/activescaffold/active_scaffold.svg?branch=master)](https://travis-ci.org/activescaffold/active_scaffold)
+[![Build status](https://travis-ci.com/activescaffold/active_scaffold.svg?branch=master)](https://travis-ci.com/activescaffold/active_scaffold)
 [![Code Climate](https://codeclimate.com/github/activescaffold/active_scaffold/badges/gpa.svg)](https://codeclimate.com/github/activescaffold/active_scaffold)
 [![Test Coverage](https://codeclimate.com/github/activescaffold/active_scaffold/badges/coverage.svg)](https://codeclimate.com/github/activescaffold/active_scaffold)
 [![Dependency Status](https://gemnasium.com/activescaffold/active_scaffold.svg)](https://gemnasium.com/activescaffold/active_scaffold)
@@ -8,13 +9,13 @@ Overview
 [![Inline docs](https://inch-ci.org/github/activescaffold/active_scaffold.svg?branch=master)](https://inch-ci.org/github/activescaffold/active_scaffold)
 [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT)
 
-ActiveScaffold provides a quick and powerful user interfaces for CRUD (create, read, update, delete) operations for Rails applications. It offers additonal features including searching, pagination & layout control.  Rails >= 4.2.0 is supported, ruby >= 2.3 required.
+ActiveScaffold provides a quick and powerful user interfaces for CRUD (create, read, update, delete) operations for Rails applications. It offers additonal features including searching, pagination & layout control.  Rails >= 4.2.0 and Rails <= 6.1 is supported, ruby >= 2.3 required.
 
 Branch Details
 --------------
-3-5-stable supports rails >= 4.0.x and ruby >= 2.0.0  
-3-4-stable supports rails >= 3.2.x and ruby >= 1.9.3  
-3-3-stable supports rails >= 3.2.x and ruby >= 1.8  
+3-5-stable supports rails >= 4.0.x and <= 5.1.x, and ruby >= 2.0.0  
+3-4-stable supports rails >= 3.2.x and <= 4.2.x, and ruby >= 1.9.3  
+3-3-stable supports rails 3.2.x and ruby >= 1.8  
 rails-3.2 supports Rails 3.1 & 3.2, and is the current source of the 3.2.x line of gems.
 
 Quick Start
@@ -25,12 +26,12 @@ Added to Gemfile
 
     gem 'active_scaffold'
 
-For rails >= 5.1, add jquery to application.js before rails-ujs (with jquery-rails), or 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).
-
-    //= require jquery
+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).
 
     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.
+
 Run the following commands, for rails 4.2
 
     bundle install
@@ -39,7 +40,7 @@ Run the following commands, for rails 4.2
     rails g active_scaffold:resource Model [attrs]
     bundle exec rake db:migrate
     
-Or run the following commands, for rails 5
+Or run the following commands, for rails >= 5
 
     bundle install
     rails g active_scaffold:install

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

@@ -1024,7 +1024,7 @@ var ActiveScaffold = {
 
       if (my_parent.is('td')) {
         var column_no = my_parent.prevAll('td').length;
-        column_heading = my_parent.closest('.active-scaffold').find('th:eq(' + column_no + ')');
+        column_heading = my_parent.closest('table').find('th:eq(' + column_no + ')');
       } else if (my_parent.is('th')) {
         column_heading = my_parent;
       }
@@ -1464,7 +1464,7 @@ ActiveScaffold.ActionLink.Table = ActiveScaffold.ActionLink.Abstract.extend({
     else {
       throw 'Unknown position "' + this.position + '"'
     }
-    ActiveScaffold.highlight(this.adapter.find('td').first().children());
+    ActiveScaffold.highlight(this.adapter.find('td').first().children().not('script'));
     ActiveScaffold.focus_first_element_of_form(this.adapter);
   }
 });

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

@@ -9,8 +9,16 @@
     data: {loading: true},
     method: :get
   }
+  
+  hidden_params = url_options.except(:controller, :action, :id, :search).to_query.split(Rack::Utils::DEFAULT_SEP)
 -%>
+
 <%= form_tag url_options, options %>
+  <% hidden_params.each do |pair| -%>
+    <% key, value = pair.split('=', 2).map { |str| Rack::Utils.unescape(str) } -%>
+    <%= hidden_field_tag(key, value) %>
+  <% end -%>
+  
   <ol class="form">
     <% visibles, hiddens = visibles_and_hiddens(active_scaffold_config.field_search) %>
     <% visibles.each do |column| -%>

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

@@ -84,10 +84,24 @@
 
   <% columns_groups.each do |columns_group| %>
   <%= content_tag row_tag, :class => 'associated-record' do %>
-    <%= content_tag column_tag, :colspan => (columns_length if column_tag == :td) do %>
-    <% columns_group.each_column(for: record.class, crud_type: :read, flatten: true) do |col| %>
-      <%= active_scaffold_render_subform_column(col, scope, crud_type, readonly, true, record) %>
-    <% end %>
+    <% if layout == :vertical %>
+      <% columns_group.each_column(for: record.class, crud_type: :read, flatten: true) do |col| %>
+        <%
+          col_class = default_col_class.clone
+          col_class << 'required' if col.required?
+          col_class << col.css_class unless col.css_class.nil? || col.css_class.is_a?(Proc)
+          col_class << 'hidden' if column_renders_as(col) == :hidden
+        %>
+        <%= content_tag column_tag, :class => col_class, :colspan => (columns_length if column_tag == :td) do %>
+          <%= active_scaffold_render_subform_column(col, scope, crud_type, readonly, false, record) %>
+        <% end %>
+      <% end %>
+    <% else %>
+      <%= content_tag column_tag, :colspan => (columns_length if column_tag == :td) do %>
+      <% columns_group.each_column(for: record.class, crud_type: :read, flatten: true) do |col| %>
+        <%= active_scaffold_render_subform_column(col, scope, crud_type, readonly, true, record) %>
+      <% end %>
+      <% end %>
     <% end %>
   <% end %>
   <% end %>

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

@@ -10,8 +10,15 @@
     data: {loading: true},
     method: :get
   }
+  
+  hidden_params = url_options.except(:controller, :action, :id, :search).to_query.split(Rack::Utils::DEFAULT_SEP)
 -%>
+
 <%= form_tag url_options, options do %>
+  <% hidden_params.each do |pair| -%>
+    <% key, value = pair.split('=', 2).map { |str| Rack::Utils.unescape(str) } -%>
+    <%= hidden_field_tag(key, value) %>
+  <% end -%>
   <%= search_field_tag :search, (search_params if search_params.is_a? String), :class => 'text-input', :id => search_input_id, :size => 50, :autocomplete => :off, :placeholder => as_(live_search ? :live_search : :search_terms) %>
   <%= submit_tag as_(submit_text), :class => "submit", :style => ('display:none;' if live_search) %>
   <%= link_to as_(:reset), url_for(url_options.merge(:search => '')), :class => 'as_cancel reset', :remote => true, :data => {:refresh => true} unless local_assigns[:skip_reset] %>

data/lib/active_scaffold/actions/list.rb

@@ -161,7 +161,7 @@ module ActiveScaffold::Actions
 
     def count_query_on_association_class(column)
       key = column.association.primary_key || :id
-      query = column.association.klass.where(column.association.foreign_key => @records.map(&key))
+      query = column.association.klass.where(column.association.foreign_key => @records.map(&key.to_sym))
       if column.association.as
         query.where!(column.association.reverse_association.foreign_type => active_scaffold_config.model.name)
       end

data/lib/active_scaffold/bridges/bitfields/list_ui.rb

@@ -0,0 +1,19 @@
+module ActiveScaffold
+  module Bridges
+    class Bitfields
+      module ListColumnHelpers
+        def format_column_value(record, column, value = nil)
+          if record.class.respond_to?(:bitfields) && record.class.bitfields&.include?(column.name)
+            value = record.bitfield_values(column.name).select { |_, v| v }.keys
+            safe_join active_scaffold_config.columns.select { |c| c.name.in? value }.map(&:label), ', '
+          else
+            super
+          end
+        end
+      end
+    end
+  end
+end
+ActionView::Base.class_eval do
+  include ActiveScaffold::Bridges::Bitfields::ListColumnHelpers
+end

data/lib/active_scaffold/bridges/bitfields.rb

@@ -1,6 +1,6 @@
 class ActiveScaffold::Bridges::Bitfields < ActiveScaffold::DataStructures::Bridge
   def self.install
-    require File.join(File.dirname(__FILE__), 'bitfields/bitfields_bridge')
+    Dir[File.join(__dir__, 'bitfields', '*.rb')].each { |file| require file }
     ActiveScaffold::Config::Core.send :prepend, ActiveScaffold::Bridges::Bitfields::BitfieldsBridge
     ActiveScaffold::Config::Core.after_config_callbacks << :_setup_bitfields
   end

data/lib/active_scaffold/config/list.rb

@@ -292,7 +292,7 @@ module ActiveScaffold::Config
             @_sorting = sorting
           else
             @_sorting = default_sorting
-            @_sorting.set(@sorting) if @sorting
+            @_sorting.set(*@sorting) if @sorting
             if @conf.columns.constraint_columns.present?
               @_sorting.constraint_columns = @conf.columns.constraint_columns
             end

data/lib/active_scaffold/data_structures/action_columns.rb

@@ -124,7 +124,7 @@ module ActiveScaffold::DataStructures
     end
 
     def action_name
-      @action.class.name.demodulize.underscore
+      @action.user_settings_key
     end
 
     def columns_key

data/lib/active_scaffold/data_structures/nested_info.rb

@@ -131,8 +131,8 @@ module ActiveScaffold::DataStructures
     protected
 
     def setup_constrained_fields
-      @constrained_fields = Array(association.foreign_key).map(&:to_sym) unless association.belongs_to?
-      @constrained_fields ||= []
+      @constrained_fields = [] if association.belongs_to? || association.through?
+      @constrained_fields ||= Array(association.foreign_key).map(&:to_sym)
       return unless child_association && child_association != association
 
       @constrained_fields << child_association.name

data/lib/active_scaffold/extensions/action_view_rendering.rb

@@ -45,31 +45,7 @@ module ActiveScaffold #:nodoc:
           @_view_paths ||= lookup_context.view_paths.clone
           @_last_template ||= lookup_context.last_template
         end
-        parts = @virtual_path.split('/')
-        template = parts.pop
-        prefix = parts.join('/')
-
-        options = args[1] || {}
-        options[:locals] ||= {}
-        if view_stack.last
-          options[:locals] = view_stack.last[:locals].merge!(options[:locals]) if view_stack.last[:locals]
-          options[:object] ||= view_stack.last[:object] if view_stack.last[:object]
-        end
-        options[:template] = template
-        # if prefix is active_scaffold_overrides we must try to render with this prefix in following paths
-        if prefix != 'active_scaffold_overrides'
-          options[:prefixes] = lookup_context.prefixes.drop((lookup_context.prefixes.find_index(prefix) || -1) + 1)
-        else
-          options[:prefixes] = ['active_scaffold_overrides']
-          last_view_path = File.expand_path(File.dirname(File.dirname(lookup_context.last_template.inspect)), Rails.root)
-          new_view_paths = view_paths.drop(view_paths.find_index { |path| path.to_s == last_view_path } + 1)
-          if @lookup_context
-            @lookup_context = build_lookup_context(new_view_paths)
-          else
-            lookup_context.view_paths = new_view_paths
-          end
-        end
-        result = super options
+        result = super options_for_render_super(args[1])
         @lookup_context = @_lookup_context if @_lookup_context # rails 6
         lookup_context.view_paths = @_view_paths if @_view_paths # rails < 6
         lookup_context.last_template = @_last_template if @_last_template # rails < 6
@@ -103,6 +79,46 @@ module ActiveScaffold #:nodoc:
 
     private
 
+    def options_for_render_super(options)
+      options ||= {}
+      options[:locals] ||= {}
+      if view_stack.last
+        options[:locals] = view_stack.last[:locals].merge!(options[:locals]) if view_stack.last[:locals]
+        options[:object] ||= view_stack.last[:object] if view_stack.last[:object]
+      end
+
+      parts = @virtual_path.split('/')
+      options[:template] = parts.pop
+      prefix = parts.join('/')
+      # if prefix is active_scaffold_overrides we must try to render with this prefix in following paths
+      if prefix != 'active_scaffold_overrides'
+        options[:prefixes] = lookup_context.prefixes.drop((lookup_context.prefixes.find_index(prefix) || -1) + 1)
+      else
+        options[:prefixes] = ['active_scaffold_overrides']
+        update_view_paths
+      end
+      options
+    end
+
+    def update_view_paths
+      last_view_path =
+        if @lookup_context # rails 6
+          File.expand_path(File.dirname(File.dirname(@lookup_context.last_template.short_identifier.to_s)), Rails.root)
+        else
+          File.expand_path(File.dirname(File.dirname(lookup_context.last_template.inspect)), Rails.root)
+        end
+      new_view_paths = view_paths.drop(view_paths.find_index { |path| path.to_s == last_view_path } + 1)
+      if @lookup_context # rails 6
+        if respond_to? :build_lookup_context # rails 6.0
+          build_lookup_context(new_view_paths)
+        else # rails 6.1
+          @lookup_context = ActionView::LookupContext.new(new_view_paths)
+        end
+      else
+        lookup_context.view_paths = new_view_paths
+      end
+    end
+
     def render_embedded(options)
       require 'digest/md5'
 
@@ -153,5 +169,30 @@ module ActionView
     Base.class_eval do
       include ActiveScaffold::RenderingHelper
     end
+
+    if Gem.loaded_specs['rails'].version.segments.first >= 6
+      RenderingHelper.class_eval do
+        # override the render method to use our @lookup_context instead of the
+        # memoized @_lookup_context
+        def render(options = {}, locals = {}, &block)
+          case options
+          when Hash
+            in_rendering_context(options) do |_|
+              # previously set view paths and lookup context are lost here
+              # if you use view_renderer, so instead create a new renderer
+              # with our context
+              temp_renderer = ActionView::Renderer.new(@lookup_context)
+              if block_given?
+                temp_renderer.render_partial(self, options.merge(partial: options[:layout]), &block)
+              else
+                temp_renderer.render(self, options)
+              end
+            end
+          else
+            view_renderer.render_partial(self, partial: options, locals: locals, &block)
+          end
+        end
+      end
+    end
   end
 end

data/lib/active_scaffold/extensions/cow_proxy.rb

@@ -18,10 +18,6 @@ module CowProxy
           end
           super
         end
-
-        def sort_by(options)
-          @sort = options
-        end
       end
 
       class Set < ::CowProxy::WrapClass(::ActiveScaffold::DataStructures::Set)

data/lib/active_scaffold/extensions/localize.rb

@@ -3,7 +3,7 @@ class Object
     if key.present?
       scope = [:active_scaffold, *options.delete(:scope)]
       options = options.reverse_merge(:scope => scope, :default => key.is_a?(String) ? key : key.to_s.titleize)
-      text = I18n.translate(key.to_s, options).html_safe # rubocop:disable Rails/OutputSafety
+      text = I18n.translate(key.to_s, **options).html_safe # rubocop:disable Rails/OutputSafety
       # text = nil if text.include?('translation missing:')
     end
     text || key

data/lib/active_scaffold/helpers/form_column_helpers.rb

@@ -740,14 +740,14 @@ module ActiveScaffold
 
         # Minimum
         unless options[:min]
-          min = validators.map { |v| v.options[:greater_than_or_equal] }.compact.max
+          min = validators.map { |v| v.options[:greater_than_or_equal_to] }.compact.max
           greater_than = validators.map { |v| v.options[:greater_than] }.compact.max
           numerical_constraints[:min] = [min, (greater_than + margin if greater_than)].compact.max
         end
 
         # Maximum
         unless options[:max]
-          max = validators.map { |v| v.options[:less_than_or_equal] }.compact.min
+          max = validators.map { |v| v.options[:less_than_or_equal_to] }.compact.min
           less_than = validators.map { |v| v.options[:less_than] }.compact.min
           numerical_constraints[:max] = [max, (less_than - margin if less_than)].compact.min
         end

data/lib/active_scaffold/helpers/list_column_helpers.rb

@@ -170,8 +170,12 @@ module ActiveScaffold
 
       def column_association_size(record, column, value)
         cached_counts = @counts&.dig(column.name)
-        key = column.association.primary_key if count_on_association_class?(column)
-        cached_counts ? cached_counts[record.send(key || :id)] || 0 : value.size
+        if cached_counts
+          key = column.association.primary_key if count_on_association_class?(column)
+          cached_counts[record.send(key || :id)] || 0
+        else
+          value.size
+        end
       end
 
       def format_number_value(value, options = {})

data/lib/active_scaffold/helpers/search_column_helpers.rb

@@ -245,16 +245,23 @@ module ActiveScaffold
         options = column.options.merge(options)
         type = "#{'date' unless options[:discard_date]}#{'time' unless options[:discard_time]}"
         use_select = options.delete(:use_select)
-        helper = use_select ? "select_#{type}" : "#{type}#{'_local' if type == 'datetime'}_field"
+        from_name = "#{options[:name]}[from]"
+        to_name = "#{options[:name]}[to]"
         if use_select
-          default_from_options = {include_blank: true, prefix: "#{options[:name]}[from]"}
-          default_to_options = {include_blank: true, prefix: "#{options[:name]}[to]"}
+          helper = "select_#{type}"
+          fields = [
+            send(helper, field_search_datetime_value(from_value), options.reverse_merge(include_blank: true, prefix: from_name)),
+            send(helper, field_search_datetime_value(to_value), options.reverse_merge(include_blank: true, prefix: to_name))
+          ]
+        else
+          helper = "#{type}#{'_local' if type == 'datetime'}_field_tag"
+          fields = [
+            send(helper, from_name, field_search_datetime_value(from_value), options.except(:name, :object).merge(id: "#{options[:id]}_from")),
+            send(helper, to_name, field_search_datetime_value(to_value), options.except(:name, :object).merge(id: "#{options[:id]}_to"))
+          ]
         end
 
-        safe_join [
-          send(helper, field_search_datetime_value(from_value), options.reverse_merge(default_from_options || {})),
-          send(helper, field_search_datetime_value(to_value), options.reverse_merge(default_to_options || {}))
-        ], ' - '
+        safe_join fields, ' - '
       end
 
       def active_scaffold_search_date(column, options)

data/lib/active_scaffold/helpers/view_helpers.rb

@@ -41,7 +41,7 @@ module ActiveScaffold
           restore_view_paths = lookup_context.view_paths
           lookup_context.view_paths = @_view_paths
         end
-        lookup_context.exists?(template_name, '', partial).tap do
+        (@_lookup_context || lookup_context).exists?(template_name, '', partial).tap do
           lookup_context.view_paths = restore_view_paths if @_view_paths
         end
       end

data/lib/active_scaffold/tableless.rb

@@ -34,11 +34,17 @@ class ActiveScaffold::Tableless < ActiveRecord::Base # rubocop:disable Rails/App
     def columns(table_name)
       klass.columns
     end
+
+    if Rails.version >= '6.0.0'
+      def data_sources
+        klass ? [klass.table_name] : []
+      end
+    end
   end
 
   class Column < ActiveRecord::ConnectionAdapters::Column
     if Rails.version >= '5.0.0'
-      def initialize(name, default, sql_type = nil, null = true)
+      def initialize(name, default, sql_type = nil, null = true, **)
         metadata = ActiveRecord::Base.connection.send :fetch_type_metadata, sql_type
         super(name, default, metadata, null)
       end
@@ -149,9 +155,17 @@ class ActiveScaffold::Tableless < ActiveRecord::Base # rubocop:disable Rails/App
     def execute_simple_calculation(operation, column_name, distinct)
       @klass.execute_simple_calculation(self, operation, column_name, distinct)
     end
+
+    def implicit_order_column
+      @klass.implicit_order_column
+    end
+
+    def exists?
+      limit(1).to_a.present?
+    end
   end
 
-  class Relation < ActiveRecord::Relation
+  class Relation < ::ActiveRecord::Relation
     include RelationExtension
   end
   class << self

data/lib/active_scaffold/version.rb

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

data/lib/generators/active_scaffold/install_generator.rb

@@ -14,18 +14,23 @@ module ActiveScaffold
       def add_to_javascript_manifest
         file = 'app/assets/javascripts/application.js'
         unless File.exist?(file)
+          if Rails.version >= '6.0'
+            create_javascript_manifest file
+            return
+          end
           say_status :missing, file, :red
           return if options[:pretend]
           raise Thor::Error, "JS file #{file} is required for ActiveScaffold"
         end
         original_js = File.binread(file)
         if original_js.include?('require active_scaffold')
-          say_status('skipped', 'insert into app/assets/javascripts/application.js', :yellow)
+          say_status('skipped', "insert into #{file}", :yellow)
         else
-          insert_into_file 'app/assets/javascripts/application.js', :after => %r{//= require +.*ujs['"]?\n} do
+          insert_into_file file, after: %r{//= require +.*ujs['"]?\n} do
             "//= require active_scaffold\n"
           end
         end
+        setup_jquery file, original_js
       end
 
       def add_to_stylesheet_manifest
@@ -35,11 +40,54 @@ module ActiveScaffold
         if original_css =~ /require active_scaffold$/
           say_status('skipped', 'insert into app/assets/stylesheets/application.css', :yellow)
         else
-          insert_into_file 'app/assets/stylesheets/application.css', :before => %r{[ ]*\*/} do
+          insert_into_file 'app/assets/stylesheets/application.css', before: %r{[ ]*\*/} do
             " *= require active_scaffold\n"
           end
         end
       end
+
+      protected
+
+      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
+// listed below.
+//
+// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, or any plugin's
+// vendor/assets/javascripts directory can be referenced here using a relative path.
+//
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// compiled file. JavaScript code in this file should be added after the last require_* statement.
+//
+// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
+// about supported directives.
+//
+//= require active_scaffold
+"
+          say_status('create', file)
+        end
+        insert_into_file 'app/views/layouts/application.html.erb', after: /javascript_pack_tag 'application'.*\n/ do
+          "    <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>\n"
+        end
+        append_to_file 'config/initializers/assets.rb' do
+          "Rails.application.config.assets.precompile += %w( application.js )\n"
+        end
+        setup_jquery file, where: 'active_scaffold'
+      end
+
+      def setup_jquery(file, original_js = nil, where: 'ujs')
+        original_js ||= File.binread(file)
+        if ActiveScaffold.js_framework == :jquery
+          unless original_js.include?('require jquery')
+            insert_into_file file, before: %r{//= require +.*#{where}['"]?\n} do
+              "//= require jquery\n"
+            end
+          end
+        else
+          say_status('missing', 'no jquery-rails gem, load jquery in your layout, or add jquery-rails to Gemfile and add //= require jquery to application.js', :red)
+        end
+      end
     end
   end
 end

data/test/data_structures/action_columns_test.rb

@@ -5,7 +5,7 @@ require 'test_helper'
 class ActionColumnsTest < MiniTest::Test
   def setup
     @columns = ActiveScaffold::DataStructures::ActionColumns.new(%i[a b])
-    @columns.action = stub(:core => stub(:model_id => 'model_stub'))
+    @columns.action = stub(core: stub(model_id: 'model_stub'), user_settings_key: :"model_stub_active_scaffold/config/test")
   end
 
   def test_label

data/test/extensions/action_view_rendering_test.rb

@@ -0,0 +1,20 @@
+require 'test_helper'
+
+class ActionViewRenderingTest < ActionController::TestCase
+  setup do
+    @controller = PeopleController.new
+  end
+
+  test 'render :super twice' do
+    get :index
+    assert_select '#controller', 1
+    assert_select '#app', 1
+  end
+
+  test 'render partial override with render :super twice' do
+    get :new
+    assert_select '#first_name_field', 1
+    assert_select '#controller_form', 1
+    assert_select '#app_form', 1
+  end
+end

data/test/misc/constraints_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 module ModelStubs
   class ModelStub < ActiveRecord::Base
     self.abstract_class = true
-    def self.columns; @columns ||= [ColumnMock.new('foo', '')] end
+    def self.columns; @columns ||= [ColumnMock.new('foo', '', 'string')] end
 
     def self.columns_hash; @hash ||= Hash[@columns.map { |c| [c.name, c] }] end
 

data/test/misc/tableless_test.rb

@@ -25,6 +25,10 @@ class TablelessTest < MiniTest::Test
 
   def test_find_with_association
     assert Person.new.files.empty?
+    @person = Person.new
+    @person.save(validate: false)
+    assert @person.files.empty?
+    assert_equal [], @person.files.to_a
   end
 
   def test_tableless_assoc_with_dependent
@@ -35,6 +39,10 @@ class TablelessTest < MiniTest::Test
 
   def test_find_with_through_association
     assert Building.new.files.empty?
+    @building = Building.new
+    @building.save(validate: false)
+    assert @building.files.empty?
+    assert_equal [], @building.files.to_a
   end
 
   def test_new

data/test/mock_app/app/controllers/people_controller.rb

@@ -1,6 +1,8 @@
 class PeopleController < ApplicationController
   active_scaffold do |conf|
+    conf.columns.exclude :files
     conf.columns[:buildings].includes = nil
     conf.columns[:buildings].associated_limit = 0
+    conf.create.columns.exclude :address
   end
 end

data/test/mock_app/app/controllers/roles_controller.rb

@@ -0,0 +1,4 @@
+class RolesController < ApplicationController
+  active_scaffold do
+  end
+end

data/test/mock_app/app/views/active_scaffold_overrides/_form.html.erb

@@ -0,0 +1,2 @@
+<div id="app_form"></div>
+<%= render :super %>

data/test/mock_app/app/views/active_scaffold_overrides/list.html.erb

@@ -0,0 +1,2 @@
+<div id="app"></div>
+<%= render :super %>

data/test/mock_app/app/views/people/_first_name_form_column.html.erb

@@ -0,0 +1,2 @@
+<span id="first_name_field"></span>
+<%= form_attribute(column, record, scope, only_value, col_class) %>

data/test/mock_app/app/views/people/_form.html.erb

@@ -0,0 +1,2 @@
+<div id="controller_form"></div>
+<%= render :super %>

data/test/mock_app/app/views/people/list.html.erb

@@ -0,0 +1,2 @@
+<div id="controller"></div>
+<%= render :super %>

data/test/test_helper.rb

@@ -1,10 +1,10 @@
-require 'simplecov' if RUBY_ENGINE == 'ruby'
+require 'simplecov' if ENV['COVERAGE']
 
 ENV['RAILS_ENV'] = 'test'
 require 'mock_app/config/environment'
 require 'rails/test_help'
 require 'minitest/autorun'
-require 'mocha/setup'
+require 'mocha/minitest'
 require 'cow_proxy'
 
 require 'minitest/reporters'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold
 version: !ruby/object:Gem::Version
-  version: 3.6.0.rc2
+  version: 3.6.3
 platform: ruby
 authors:
 - Many, see README
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-27 00:00:00.000000000 Z
+date: 2021-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -17,6 +17,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +27,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: cow_proxy
   requirement: !ruby/object:Gem::Requirement
@@ -224,6 +230,7 @@ files:
 - lib/active_scaffold/bridges/ancestry/ancestry_bridge.rb
 - lib/active_scaffold/bridges/bitfields.rb
 - lib/active_scaffold/bridges/bitfields/bitfields_bridge.rb
+- lib/active_scaffold/bridges/bitfields/list_ui.rb
 - lib/active_scaffold/bridges/calendar_date_select.rb
 - lib/active_scaffold/bridges/calendar_date_select/as_cds_bridge.rb
 - lib/active_scaffold/bridges/cancan.rb
@@ -377,6 +384,7 @@ files:
 - test/data_structures/standard_column_test.rb
 - test/data_structures/validation_reflection_test.rb
 - test/data_structures/virtual_column_test.rb
+- test/extensions/action_view_rendering_test.rb
 - test/extensions/active_record_test.rb
 - test/extensions/routing_mapper_test.rb
 - test/helpers/form_column_helpers_test.rb
@@ -404,6 +412,7 @@ files:
 - test/mock_app/app/controllers/contacts_controller.rb
 - test/mock_app/app/controllers/floors_controller.rb
 - test/mock_app/app/controllers/people_controller.rb
+- test/mock_app/app/controllers/roles_controller.rb
 - test/mock_app/app/helpers/application_helper.rb
 - test/mock_app/app/models/address.rb
 - test/mock_app/app/models/building.rb
@@ -413,6 +422,11 @@ files:
 - test/mock_app/app/models/floor.rb
 - test/mock_app/app/models/person.rb
 - test/mock_app/app/models/role.rb
+- test/mock_app/app/views/active_scaffold_overrides/_form.html.erb
+- test/mock_app/app/views/active_scaffold_overrides/list.html.erb
+- test/mock_app/app/views/people/_first_name_form_column.html.erb
+- test/mock_app/app/views/people/_form.html.erb
+- test/mock_app/app/views/people/list.html.erb
 - test/mock_app/config.ru
 - test/mock_app/config/application.rb
 - test/mock_app/config/boot.rb
@@ -457,11 +471,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.0.9
 signing_key:
 specification_version: 4
 summary: Rails 4.x and 5.x versions of ActiveScaffold supporting prototype and jquery
@@ -498,6 +512,7 @@ test_files:
 - test/data_structures/standard_column_test.rb
 - test/data_structures/validation_reflection_test.rb
 - test/data_structures/virtual_column_test.rb
+- test/extensions/action_view_rendering_test.rb
 - test/extensions/active_record_test.rb
 - test/extensions/routing_mapper_test.rb
 - test/helpers/form_column_helpers_test.rb
@@ -525,6 +540,7 @@ test_files:
 - test/mock_app/app/controllers/contacts_controller.rb
 - test/mock_app/app/controllers/floors_controller.rb
 - test/mock_app/app/controllers/people_controller.rb
+- test/mock_app/app/controllers/roles_controller.rb
 - test/mock_app/app/helpers/application_helper.rb
 - test/mock_app/app/models/address.rb
 - test/mock_app/app/models/building.rb
@@ -534,6 +550,11 @@ test_files:
 - test/mock_app/app/models/floor.rb
 - test/mock_app/app/models/person.rb
 - test/mock_app/app/models/role.rb
+- test/mock_app/app/views/active_scaffold_overrides/_form.html.erb
+- test/mock_app/app/views/active_scaffold_overrides/list.html.erb
+- test/mock_app/app/views/people/_first_name_form_column.html.erb
+- test/mock_app/app/views/people/_form.html.erb
+- test/mock_app/app/views/people/list.html.erb
 - test/mock_app/config.ru
 - test/mock_app/config/application.rb
 - test/mock_app/config/boot.rb