active_scaffold 3.6.20 → 3.7.0

data/lib/active_scaffold/actions/core.rb

@@ -6,6 +6,7 @@ module ActiveScaffold::Actions
         before_action :check_input_device
         before_action :register_constraints_with_action_columns, :unless => :nested?
         after_action :clear_flashes
+        after_action :dl_cookie
         around_action :clear_storage
         rescue_from ActiveScaffold::RecordNotAllowed, ActiveScaffold::ActionNotAllowed, :with => :deny_access
       end
@@ -22,7 +23,7 @@ module ActiveScaffold::Actions
     end
 
     def render_field
-      if request.get?
+      if request.get? || request.head?
         render_field_for_inplace_editing
         respond_to do |format|
           format.js { render :action => 'render_field_inplace', :layout => false }
@@ -61,14 +62,18 @@ module ActiveScaffold::Actions
       @source_id = params.delete(:source_id)
       @columns = @column.update_columns || []
       @scope = params.delete(:scope)
-      action = :subform if @scope
-      action ||= params[:id] ? :update : :create
-      @main_columns = active_scaffold_config.send(action).columns
+      if @scope
+        @form_action = :subform
+      elsif active_scaffold_config.actions.include? params[:form_action]&.to_sym
+        @form_action = params.delete(:form_action).to_sym
+      end
+      @form_action ||= params[:id] ? :update : :create
+      @main_columns = active_scaffold_config.send(@form_action).columns
       @columns << @column.name if @column.options[:refresh_link] && @columns.exclude?(@column.name)
 
       @record =
         if @column.send_form_on_update_column
-          updated_record_with_form(@main_columns, params[:record], @scope)
+          updated_record_with_form(@main_columns, params[:record] || params[:search], @scope)
         else
           updated_record_with_column(@column, params.delete(:value), @scope)
         end
@@ -100,7 +105,14 @@ module ActiveScaffold::Actions
       record = params[:id] ? copy_attributes(find_if_allowed(params[:id], :read)) : new_model
       apply_constraints_to_record(record) unless scope || params[:id]
       create_association_with_parent record, true if nested?
-      update_column_from_params(record, column, value, true)
+      if @form_action == :field_search && value.is_a?(Array) && column.association&.singular?
+        # don't assign value if it's an array and column is singular association,
+        # e.g. value came from multi-select on search form
+        # use instance variable so it's available in the view and helpers
+        @value = value
+      else
+        update_column_from_params(record, column, value, true)
+      end
       record.id = params[:id]
       record
     end
@@ -165,6 +177,10 @@ module ActiveScaffold::Actions
       flash.clear if request.xhr?
     end
 
+    def dl_cookie
+      cookies[params[:_dl_cookie]] = {value: Time.now.to_i, expires: 1.day.since} if params[:_dl_cookie]
+    end
+
     def each_marked_record(&block)
       active_scaffold_config.model.as_marked.each(&block)
     end
@@ -248,7 +264,7 @@ module ActiveScaffold::Actions
       @conditions_from_params ||= begin
         conditions = [{}]
         params.except(:controller, :action, :page, :sort, :sort_direction, :format, :id).each do |key, value|
-          distinct = true if key =~ /!$/
+          distinct = true if key.match?(/!$/)
           column = active_scaffold_config._columns_hash[key.to_s[0..(distinct ? -2 : -1)]]
           next unless column
           key = column.name.to_sym
@@ -321,7 +337,8 @@ module ActiveScaffold::Actions
 
     def check_input_device
       return unless session[:input_device_type].nil?
-      if request.env['HTTP_USER_AGENT'] =~ /(iPhone|iPod|iPad)/i
+      return if request.env['HTTP_USER_AGENT'].nil?
+      if request.env['HTTP_USER_AGENT'].match?(/(iPhone|iPod|iPad)/i)
         session[:input_device_type] = 'TOUCH'
         session[:hover_supported] = false
       else
@@ -362,14 +379,14 @@ module ActiveScaffold::Actions
     #   flash[:info] = 'Player fired'
     # end
     def process_action_link_action(render_action = :action_update, crud_type_or_security_options = nil)
-      if request.get?
+      if request.get? || request.head?
         # someone has disabled javascript, we have to show confirmation form first
         @record = find_if_allowed(params[:id], :read) if params[:id]
         respond_to_action(:action_confirmation)
       else
         @action_link = active_scaffold_config.action_links[action_name]
         if params[:id]
-          crud_type_or_security_options ||= {:crud_type => request.post? || request.put? ? :update : :delete, :action => action_name}
+          crud_type_or_security_options ||= {:crud_type => request.delete? ? :delete : :update, :action => action_name}
           get_row(crud_type_or_security_options)
           if @record.nil?
             self.successful = false
@@ -378,6 +395,9 @@ module ActiveScaffold::Actions
             yield @record
           end
         else
+          if @action_link && respond_to?(@action_link.security_method, true) && !send(@action_link.security_method)
+            raise ActiveScaffold::ActionNotAllowed
+          end
           yield
         end
         respond_to_action(render_action)

data/lib/active_scaffold/actions/field_search.rb

@@ -154,7 +154,6 @@ module ActiveScaffold::Actions
         filtered_columns = []
         text_search = active_scaffold_config.field_search.text_search
         columns = active_scaffold_config.field_search.columns
-        count_includes = active_scaffold_config.list.user.count_includes
         search_params.each do |key, value|
           next unless columns.include? key
           column = active_scaffold_config.columns[key]
@@ -164,11 +163,7 @@ module ActiveScaffold::Actions
           active_scaffold_conditions << search_condition
           filtered_columns << column
         end
-        if grouped_search? || active_scaffold_config.list.user.count_includes.present?
-          active_scaffold_outer_joins.concat filtered_columns.map(&:search_joins).flatten.uniq.compact
-        else
-          set_outer_joins_for_search filtered_columns
-        end
+        setup_joins_for_filtered_columns(filtered_columns)
         if filtered_columns.present? || grouped_search?
           @filtered = active_scaffold_config.field_search.human_conditions ? filtered_columns : true
         end
@@ -182,6 +177,14 @@ module ActiveScaffold::Actions
 
       private
 
+      def setup_joins_for_filtered_columns(filtered_columns)
+        if grouped_search? || active_scaffold_config.list.user.count_includes.present?
+          active_scaffold_outer_joins.concat filtered_columns.map(&:search_joins).flatten.uniq.compact
+        else
+          set_outer_joins_for_search filtered_columns
+        end
+      end
+
       def field_search_formats
         (default_formats + active_scaffold_config.formats + active_scaffold_config.field_search.formats).uniq
       end

data/lib/active_scaffold/actions/nested.rb

@@ -8,7 +8,7 @@ module ActiveScaffold::Actions
       base.module_eval do
         before_action :set_nested
         before_action :configure_nested
-        include ActiveScaffold::Actions::Nested::ChildMethods if active_scaffold_config.model.reflect_on_all_associations.any? { |a| a.macro == :has_and_belongs_to_many }
+        include ActiveScaffold::Actions::Nested::ChildMethods if active_scaffold_config.columns.map(&:association).compact.any?(&:habtm?)
       end
       base.before_action :include_habtm_actions
       base.helper_method :nested
@@ -120,9 +120,9 @@ module ActiveScaffold::Actions
 
     def create_association_with_parent?(check_match = false)
       # has_many is done by beginning_of_chain and rails if direct association, not in through associations
-      return false if nested.has_many? && !nested.association.through?
+      return false unless nested.create_with_parent?
       return false if check_match && !nested.match_model?(active_scaffold_config.model)
-      (nested.child_association || nested.create_through_singular?) && nested_parent_record
+      nested_parent_record.present?
     end
 
     def create_association_with_parent(record, check_match = false)
@@ -131,7 +131,7 @@ module ActiveScaffold::Actions
         record.send("#{nested.child_association.name}=", nested_parent_record)
       elsif nested.create_through_singular?
         through = nested_parent_record.send(nested.association.through_reflection.name) ||
-          nested_parent_record.send("build_#{nested.association.through_reflection.name}")
+                  nested_parent_record.send("build_#{nested.association.through_reflection.name}")
         if nested.source_reflection.reverse_association.collection?
           record.send(nested.source_reflection.reverse) << through
         else
@@ -167,7 +167,7 @@ module ActiveScaffold::Actions::Nested
     end
 
     def destroy_existing
-      return redirect_to(params.merge(:action => :delete, :only_path => true)) if request.get?
+      return redirect_to(params.merge(:action => :delete, :only_path => true)) if request.get? || request.head?
       do_destroy_existing
       respond_to_action(:destroy_existing)
     end
@@ -247,8 +247,8 @@ module ActiveScaffold::Actions::Nested
       parent_record = nested_parent_record(:update)
       @record = active_scaffold_config.model.find(params[:associated_id])
       if parent_record && @record
-        parent_record.send(nested.association.name) << @record
-        parent_record.save
+        self.successful = false unless parent_record.send(nested.association.name) << @record
+        parent_record.save if successful?
       else
         false
       end

data/lib/active_scaffold/attribute_params.rb

@@ -33,41 +33,10 @@ module ActiveScaffold
   module AttributeParams
     protected
 
-    # workaround to update counters when polymorphic has_many changes on persisted record
-    # TODO: remove when rails4 support is removed or counter cache for polymorphic has_many association works on rails4
-    def hack_for_has_many_counter_cache(parent_record, column, value)
-      association = parent_record.association(column.name)
-      counter_attr = association.send(:cached_counter_attribute_name)
-      difference = value.select(&:persisted?).size - parent_record.send(counter_attr)
-
-      if parent_record.new_record?
-        parent_record.send "#{column.name}=", value
-        parent_record.send "#{counter_attr}_will_change!"
-      else
-        # don't decrement counter for deleted records, on destroy they will update counter
-        difference += (parent_record.send(column.name) - value).size
-        association.send :update_counter, difference unless difference.zero?
-      end
-
-      # update counters on old parents if belongs_to is changed
-      value.select(&:persisted?).each do |record|
-        key = record.send(column.association.foreign_key)
-        parent_record.class.decrement_counter counter_attr, key if key && key != parent_record.id # rubocop:disable Rails/SkipsModelValidations
-      end
-      parent_record.send "#{column.name}=", value if parent_record.persisted?
-    end
-
-    # rails 4 needs this hack for polymorphic has_many
-    # TODO: remove when hack_for_has_many_counter_cache is not needed
-    def hack_for_has_many_counter_cache?(parent_record, column)
-      column.association.counter_cache_hack? && parent_record.association(column.name).send(:has_cached_counter?)
-    end
-
     # workaround for updating counters twice bug on rails4 (https://github.com/rails/rails/pull/14849)
-    # rails 4 needs this hack for non-polymorphic belongs_to, when selecting record, not creating new one (value is Hash)
     # rails 5 needs this hack for belongs_to, when selecting record, not creating new one (value is Hash)
-    # TODO: remove when pull request is merged and no version with bug is supported
-    def counter_cache_hack?(association, value)
+    # TODO: remove when rails5 support is removed
+    def belongs_to_counter_cache_hack?(association, value)
       !params_hash?(value) && association.belongs_to? && association.counter_cache_hack?
     end
 
@@ -92,21 +61,19 @@ module ActiveScaffold
       multi_parameter_attrs = multi_parameter_attributes(attributes)
 
       columns.each_column(for: parent_record, crud_type: crud_type, flatten: true) do |column|
-        begin
-          # Set any passthrough parameters that may be associated with this column (ie, file column "keep" and "temp" attributes)
-          column.params.select { |p| attributes.key? p }.each { |p| parent_record.send("#{p}=", attributes[p]) }
+        # Set any passthrough parameters that may be associated with this column (ie, file column "keep" and "temp" attributes)
+        column.params.select { |p| attributes.key? p }.each { |p| parent_record.send("#{p}=", attributes[p]) }
 
-          if multi_parameter_attrs.key? column.name.to_s
-            parent_record.send(:assign_multiparameter_attributes, multi_parameter_attrs[column.name.to_s])
-          elsif attributes.key? column.name
-            update_column_from_params(parent_record, column, attributes[column.name], avoid_changes)
-          end
-        rescue StandardError => e
-          message = "on the ActiveScaffold column = :#{column.name} for #{parent_record.inspect} "\
-                    "(value from params #{attributes[column.name].inspect})"
-          Rails.logger.error "#{e.class.name}: #{e.message} -- #{message}"
-          raise
+        if multi_parameter_attrs.key? column.name.to_s
+          parent_record.send(:assign_multiparameter_attributes, multi_parameter_attrs[column.name.to_s])
+        elsif attributes.key? column.name
+          update_column_from_params(parent_record, column, attributes[column.name], avoid_changes)
         end
+      rescue StandardError => e
+        message = "on the ActiveScaffold column = :#{column.name} for #{parent_record.inspect} "\
+                  "(value from params #{attributes[column.name].inspect})"
+        Rails.logger.error "#{e.class.name}: #{e.message} -- #{message}"
+        raise
       end
 
       parent_record
@@ -132,7 +99,7 @@ module ActiveScaffold
     end
 
     def update_column_association(parent_record, column, attribute, value)
-      if counter_cache_hack?(column.association, attribute)
+      if belongs_to_counter_cache_hack?(column.association, attribute)
         parent_record.send "#{column.association.foreign_key}=", value&.id
         parent_record.association(column.name).target = value
       elsif column.association.collection? && column.association.through_singular?
@@ -140,8 +107,6 @@ module ActiveScaffold
         through_record = parent_record.send(through)
         through_record ||= parent_record.send "build_#{through}"
         through_record.send "#{column.association.source_reflection.name}=", value
-      elsif hack_for_has_many_counter_cache?(parent_record, column)
-        hack_for_has_many_counter_cache(parent_record, column, value)
       else
         parent_record.send "#{column.name}=", value
       end
@@ -184,7 +149,8 @@ module ActiveScaffold
 
     def association_value_from_param_simple_value(parent_record, column, value)
       if column.association.singular?
-        column.association.klass(parent_record)&.find(value) if value.present?
+        # value may be Array if using update_columns in field_search with multi-select
+        column.association.klass(parent_record)&.find(value) if value.present? && !value.is_a?(Array)
       else # column.association.collection?
         column_plural_assocation_value_from_value(column, Array(value))
       end
@@ -327,13 +293,9 @@ module ActiveScaffold
       if ActiveScaffold::OrmChecks.mongoid? klass
         column.default_val
       elsif ActiveScaffold::OrmChecks.active_record? klass
-        if Rails.version < '5.0'
-          column.type_cast_from_database(column.default)
-        else
-          column_type = ActiveScaffold::OrmChecks.column_type(klass, column_name)
-          cast_type = ActiveRecord::Type.lookup column_type
-          cast_type ? cast_type.deserialize(column.default) : column.default
-        end
+        column_type = ActiveScaffold::OrmChecks.column_type(klass, column_name)
+        cast_type = ActiveRecord::Type.lookup column_type
+        cast_type ? cast_type.deserialize(column.default) : column.default
       end
     end
   end

data/lib/active_scaffold/bridges/active_storage/active_storage_helpers.rb

@@ -2,9 +2,6 @@ module ActiveScaffold
   module Bridges
     class ActiveStorage
       module ActiveStorageBridgeHelpers
-        mattr_accessor :thumbnail_variant
-        self.thumbnail_variant = {resize_to_limit: [nil, 30]}
-
         class << self
           # has_one :"#{name}_attachment", -> { where(name: name) }, class_name: "ActiveStorage::Attachment", as: :record, inverse_of: :record, dependent: false
           def active_storage_has_one_fields(klass)

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

@@ -22,7 +22,7 @@ module ActiveScaffold
       private
 
       def link_for_attachment(attachment, column)
-        variant = column.options[:thumb] || ActiveScaffold::Bridges::ActiveStorage::ActiveStorageBridgeHelpers.thumbnail_variant
+        variant = column.options[:thumb] || ActiveScaffold::Bridges::ActiveStorage.thumbnail_variant
         content =
           if variant && attachment.variable? && column.options[:thumb] != false
             image_tag(attachment.variant(variant))

data/lib/active_scaffold/bridges/active_storage.rb

@@ -1,4 +1,7 @@
 class ActiveScaffold::Bridges::ActiveStorage < ActiveScaffold::DataStructures::Bridge
+  cattr_accessor :thumbnail_variant
+  self.thumbnail_variant = {resize_to_limit: [nil, 30]}
+
   def self.install
     Dir[File.join(__dir__, 'active_storage', '*.rb')].each { |file| require file }
     ActiveScaffold::Config::Core.send :prepend, ActiveScaffold::Bridges::ActiveStorage::ActiveStorageBridge

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

@@ -8,9 +8,9 @@ module ActiveScaffold
 
           model.bitfields.each_value do |options|
             columns << options.keys
-            options.each do |column, value|
+            options.each_key.with_index(1) do |column, i|
               columns[column].form_ui = :checkbox
-              columns[column].weight = 1000 + value.to_s(2).size
+              columns[column].weight = 1000 + i
             end
           end
         end

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

@@ -1,6 +1,7 @@
 module ActiveScaffold::Bridges
   class DatePicker
     module Helper
+      UNSUPPORTED_FORMAT_OPTIONS = /%[cUWwxXZ]/
       DATE_FORMAT_CONVERSION = {
         /%a/ => 'D',
         /%A/ => 'DD',
@@ -19,7 +20,7 @@ module ActiveScaffold::Bridges
         /%p/ => 'tt',
         /%S/ => 'ss',
         /%z/ => 'z',
-        /%[cUWwxXZ]/ => ''
+        UNSUPPORTED_FORMAT_OPTIONS => ''
       }.freeze
 
       def self.date_options_for_locales
@@ -83,9 +84,8 @@ module ActiveScaffold::Bridges
 
       def self.to_datepicker_format(rails_format)
         return nil if rails_format.nil?
-        unsupported = DATE_FORMAT_CONVERSION.index ''
-        if rails_format =~ unsupported
-          options = unsupported.to_s.scan(/\[(.*)\]/).dig(0, 0)&.each_char&.map { |c| "%#{c}" }
+        if rails_format.match?(UNSUPPORTED_FORMAT_OPTIONS)
+          options = UNSUPPORTED_FORMAT_OPTIONS.to_s.scan(/\[(.*)\]/).dig(0, 0)&.each_char&.map { |c| "%#{c}" }
           Rails.logger.warn(
             "AS DatePicker::Helper: rails date format #{rails_format} includes options "\
             "which can't be converted to jquery datepicker format. "\

data/lib/active_scaffold/bridges/paper_trail/actions.rb

@@ -12,7 +12,10 @@ module ActiveScaffold::Actions
     def deleted
       query = PaperTrail::Version.destroys.where(:item_type => active_scaffold_config.model.name)
       if nested? && nested.child_association&.belongs_to? && PaperTrail::Version.respond_to?(:where_object)
-        query = query.where_object(nested.child_association.foreign_key => nested.parent_id)
+        foreign_key = nested.child_association.foreign_key
+        parent_id = nested.parent_id
+        parent_id = parent_id&.to_i if self.class.active_scaffold_config.columns[foreign_key]&.number?
+        query = query.where_object(foreign_key => parent_id)
       end
       pager = Paginator.new(query.count, active_scaffold_config.list.per_page) do |offset, per_page|
         query.offset(offset).limit(per_page).map(&:reify)

data/lib/active_scaffold/bridges/record_select/helpers.rb

@@ -51,7 +51,7 @@ class ActiveScaffold::Bridges::RecordSelect
           else
             record_select_field(options[:name], value || klass.new, record_select_options)
           end
-        html = self.class.field_error_proc.call(html, self) if record.errors[column.name].any?
+        html = instance_exec(html, self, &self.class.field_error_proc) if record.errors[column.name].any?
         html
       end
 
@@ -60,7 +60,7 @@ class ActiveScaffold::Bridges::RecordSelect
           :controller => active_scaffold_controller_for(record.class).controller_path
         ).merge(column.options)
         html = record_select_autocomplete(options[:name], record, record_select_options)
-        html = self.class.field_error_proc.call(html, self) if record.errors[column.name].any?
+        html = instance_exec(html, self, &self.class.field_error_proc) if record.errors[column.name].any?
         html
       end
     end

data/lib/active_scaffold/bridges/tiny_mce.rb

@@ -11,7 +11,7 @@ class ActiveScaffold::Bridges::TinyMce < ActiveScaffold::DataStructures::Bridge
   def self.javascripts
     case ActiveScaffold.js_framework
     when :jquery
-      ['tinymce-jquery', 'jquery/tiny_mce_bridge']
+      ['tinymce', 'jquery/tiny_mce_bridge']
     when :prototype
       ['tinymce', 'prototype/tiny_mce_bridge']
     end

data/lib/active_scaffold/bridges/usa_state_select/usa_state_select_helper.rb

@@ -1,13 +1,8 @@
 module ActiveScaffold::Bridges
   class UsaStateSelect
     module UsaStateSelectHelpers
-      def usa_state_select_options(options)
-        # TODO: remove when rails 3.2 support is dropped
-        defined?(ActionView::Helpers::InstanceTag) ? options[:object] : options
-      end
-
       def usa_state_select(object, method, priority_states = nil, options = {}, html_options = {})
-        ActionView::Helpers::Tags::UsaStateSelect.new(object, method, self, usa_state_select_options(options)).to_usa_state_select_tag(priority_states, options, html_options)
+        ActionView::Helpers::Tags::UsaStateSelect.new(object, method, self, options).to_usa_state_select_tag(priority_states, options, html_options)
       end
     end
 

data/lib/active_scaffold/config/core.rb

@@ -112,7 +112,7 @@ module ActiveScaffold::Config
     def columns=(val)
       @columns._inheritable = val.collect(&:to_sym)
       # Add virtual columns
-      @columns << val.collect { |c| c.to_sym unless @columns[c.to_sym] }.compact
+      @columns.add(*val)
     end
 
     # lets you override the global ActiveScaffold frontend for a specific controller

data/lib/active_scaffold/config/field_search.rb

@@ -7,6 +7,7 @@ module ActiveScaffold::Config
       super
       @text_search = self.class.text_search
       @human_conditions = self.class.human_conditions
+      @floating_footer = self.class.floating_footer
     end
 
     # global level configuration
@@ -29,6 +30,10 @@ module ActiveScaffold::Config
     cattr_accessor :human_conditions, instance_accessor: false
     @@human_conditions = false
 
+    # whether footer should float when form is too long to fit in the screen, so footer is always available while scrolling
+    class_attribute :floating_footer, instance_accessor: false
+    @@floating_footer = false
+
     # instance-level configuration
     # ----------------------------
 
@@ -71,8 +76,11 @@ module ActiveScaffold::Config
     # instead of just filtered you may show the user a humanized search condition statment
     attr_accessor :human_conditions
 
+    # whether footer should float when form is too long to fit in the screen, so footer is always available while scrolling
+    attr_accessor :floating_footer
+
     UserSettings.class_eval do
-      user_attr :optional_columns, :group_options, :grouped_columns, :human_conditions
+      user_attr :optional_columns, :group_options, :grouped_columns, :human_conditions, :floating_footer
     end
   end
 end

data/lib/active_scaffold/config/form.rb

@@ -5,6 +5,7 @@ module ActiveScaffold::Config
       @show_unauthorized_columns = self.class.show_unauthorized_columns
       @refresh_list = self.class.refresh_list
       @persistent = self.class.persistent
+      @floating_footer = self.class.floating_footer
 
       # no global setting here because multipart should only be set for specific forms
       @multipart = false
@@ -23,6 +24,10 @@ module ActiveScaffold::Config
     class_attribute :refresh_list, instance_accessor: false
     @@refresh_list = false
 
+    # whether footer should float when form is too long to fit in the screen, so footer is always available while scrolling
+    class_attribute :floating_footer, instance_accessor: false
+    @@floating_footer = false
+
     # instance-level configuration
     # ----------------------------
 
@@ -41,6 +46,9 @@ module ActiveScaffold::Config
     # whether we should refresh list after create or not
     attr_accessor :refresh_list
 
+    # whether footer should float when form is too long to fit in the screen, so footer is always available while scrolling
+    attr_accessor :floating_footer
+
     columns_accessor :columns do
       columns.exclude :created_on, :created_at, :updated_on, :updated_at, :as_marked
       columns.exclude(*@core.columns.collect { |c| c.name if c.association&.polymorphic? }.compact)
@@ -53,7 +61,7 @@ module ActiveScaffold::Config
     end
 
     UserSettings.class_eval do
-      user_attr :persistent, :refresh_list, :show_unauthorized_columns
+      user_attr :persistent, :refresh_list, :show_unauthorized_columns, :floating_footer
 
       attr_writer :multipart
       def multipart?

data/lib/active_scaffold/core.rb

@@ -271,14 +271,8 @@ module ActiveScaffold
 
     def self.active_record_column_type_cast(value, column)
       return Time.zone.at(value.to_i) if value =~ /\A\d+\z/ && %i[time datetime].include?(column.type)
-      if Rails.version < '5.0'
-        column.type_cast_from_user value
-      elsif column.type.respond_to? :cast # jruby-jdbc and rails 5
-        column.type.cast value
-      else
-        cast_type = ActiveRecord::Type.lookup column.type
-        cast_type ? cast_type.cast(value) : value
-      end
+      cast_type = ActiveRecord::Type.lookup column.type
+      cast_type ? cast_type.cast(value) : value
     end
   end
 end

data/lib/active_scaffold/data_structures/action_columns.rb

@@ -98,31 +98,6 @@ module ActiveScaffold::DataStructures
       visible_columns(options.reverse_merge(flatten: true)).map(&:name)
     end
 
-    def each(options = nil, &proc)
-      if options
-        ActiveSupport::Deprecation.warn 'use each_column'
-        each_column(options, &proc)
-      else
-        super(&proc)
-      end
-    end
-
-    def collect_visible(options = {}, &proc)
-      ActiveSupport::Deprecation.warn "use visible_columns#{"(#{options.inspect})" if options.present?}#{'.map(&proc)' if proc}"
-      columns = visible_columns(options)
-      proc ? columns.map(&proc) : columns
-    end
-
-    def names
-      ActiveSupport::Deprecation.warn 'use visible_columns.map(&:name)'
-      visible_columns(flatten: true).map(&:name)
-    end
-
-    def names_without_auth_check
-      ActiveSupport::Deprecation.warn 'use to_a'
-      to_a
-    end
-
     def action_name
       @action.user_settings_key
     end

data/lib/active_scaffold/data_structures/action_links.rb

@@ -144,7 +144,7 @@ module ActiveScaffold::DataStructures
     end
 
     def method_missing(name, *args, &block)
-      return super if name =~ /[!?]$/
+      return super if name.match?(/[!?]$/)
       class_eval <<-METHOD, __FILE__, __LINE__ + 1
         def #{name}(label = nil) # rubocop:disable Style/CommentedKeyword
           @#{name} ||= subgroup('#{name}'.to_sym, label)

data/lib/active_scaffold/data_structures/association/abstract.rb

@@ -54,6 +54,14 @@ module ActiveScaffold::DataStructures::Association
       through? && through_reflection.collection?
     end
 
+    def primary_key
+      @association.options[:primary_key]
+    end
+
+    def counter_cache
+      @association.options[:counter_cache]
+    end
+
     def polymorphic?
       false
     end

data/lib/active_scaffold/data_structures/association/active_mongoid.rb

@@ -5,6 +5,14 @@ module ActiveScaffold::DataStructures::Association
       klass.am_relations.values
     end
 
+    def primary_key
+      @association[:primary_key]
+    end
+
+    def counter_cache
+      @association[:counter_cache]
+    end
+
     def inverse_klass
       as ? @association[:inverse_class_name].constantize : super
     end

data/lib/active_scaffold/data_structures/association/active_record.rb

@@ -30,14 +30,6 @@ module ActiveScaffold::DataStructures::Association
       @association.active_record
     end
 
-    def primary_key
-      @association.options[:primary_key]
-    end
-
-    def counter_cache
-      @association.options[:counter_cache]
-    end
-
     def as
       @association.options[:as]
     end
@@ -64,11 +56,7 @@ module ActiveScaffold::DataStructures::Association
     end
 
     def counter_cache_hack?
-      if has_many?
-        Rails.version < '5.0' && as
-      elsif belongs_to?
-        counter_cache && (Rails.version >= '5.0' || !polymorphic?)
-      end
+      belongs_to? && counter_cache && Rails.version < '6.0'
     end
 
     protected