active_scaffold 3.5.5 → 3.6.0.pre

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

@@ -1,5 +1,5 @@
 try {
-<% form_selector ||= "#{element_form_id(:action => :update, :id => @record.try(:id) || params[:id])}" %>
+<% form_selector ||= "#{element_form_id(:action => :update, :id => @record&.id || params[:id])}" %>
 var action_link = ActiveScaffold.find_action_link('<%= form_selector %>');
 if (action_link) action_link.update_flash_messages('<%= escape_javascript(render(:partial => 'messages')) %>');
 <% if successful? %>

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

@@ -1,2 +1,2 @@
-ActiveScaffold.update_row('<%= element_row_id(:action => :list, :id => @record.try(:id)) %>', '<%= escape_javascript render('list_record', :record => @record) %>');
+ActiveScaffold.update_row('<%= element_row_id(action: :list, id: @record&.id) %>', '<%= escape_javascript render('list_record', record: @record) %>');
 <%= render :partial => 'update_calculations', :formats => [:js] %>

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

@@ -15,7 +15,7 @@
        ActiveScaffold.update_inplace_edit('<%= @column_span_id %>','<%= escape_javascript(formatted_value) %>', <%= column_empty?(formatted_value).to_json %>);
     <% if ipe_update == :columns && @column.update_columns && !@column.update_columns.empty?
          @rendered = Set.new([@column.name]) -%>
-         <%= render :partial => 'update_column', :collection => @column.update_columns & active_scaffold_config.list.columns.names, :locals => {:row_id => element_row_id(:action => :list, :id => @record.id)} %>
+         <%= render :partial => 'update_column', :collection => @column.update_columns & active_scaffold_config.list.columns.visible_columns_names, :locals => {:row_id => element_row_id(:action => :list, :id => @record.id)} %>
     <% end %>
   <% end -%>
 <% else -%>

data/lib/active_scaffold.rb

@@ -9,6 +9,7 @@ module ActiveScaffold
   autoload :Finder, 'active_scaffold/finder'
   autoload :MarkedModel, 'active_scaffold/marked_model'
   autoload :OrmChecks, 'active_scaffold/orm_checks'
+  autoload :Registry, 'active_scaffold/registry'
   autoload :RespondsToParent, 'active_scaffold/responds_to_parent'
   autoload :Tableless, 'active_scaffold/tableless'
   autoload :Version, 'active_scaffold/version'
@@ -44,16 +45,18 @@ module ActiveScaffold
   class ActionNotAllowed < SecurityError; end
   class ReverseAssociationRequired < RuntimeError; end
 
-  mattr_accessor :delayed_setup
-  mattr_accessor :stylesheets
+  mattr_accessor :delayed_setup, instance_writer: false
+  mattr_accessor :stylesheets, instance_writer: false
   self.stylesheets = []
-  mattr_accessor :javascripts
+  mattr_accessor :javascripts, instance_writer: false
   self.javascripts = []
 
-  def self.js_framework=(framework)
-    @@js_framework = framework
+  mattr_reader :threadsafe
+  def self.threadsafe!
+    @@threadsafe = true
   end
 
+  mattr_writer :js_framework, instance_writer: false
   def self.js_framework
     @@js_framework ||=
       if defined? Jquery
@@ -63,10 +66,7 @@ module ActiveScaffold
       end
   end
 
-  def self.js_config=(config)
-    @@js_config = config
-  end
-
+  mattr_writer :js_config, instance_writer: false
   def self.js_config
     @@js_config ||= {:scroll_on_close => :checkInViewport}
   end
@@ -75,10 +75,7 @@ module ActiveScaffold
   # name of bridge subdir should be used to exclude it
   # eg
   #   ActiveScaffold.exclude_bridges = [:cancan, :ancestry]
-  def self.exclude_bridges=(bridges)
-    @@exclude_bridges = bridges
-  end
-
+  mattr_writer :exclude_bridges, instance_writer: false
   def self.exclude_bridges
     @@exclude_bridges ||= []
   end
@@ -94,5 +91,6 @@ end
 require 'active_scaffold/engine'
 require 'ice_nine'
 require 'ice_nine/core_ext/object'
+require 'request_store'
 # TODO: clean up extensions. some could be organized for autoloading, and others could be removed entirely.
 Dir["#{File.dirname __FILE__}/active_scaffold/extensions/*.rb"].each { |file| require file }

data/lib/active_scaffold/actions/core.rb

@@ -3,13 +3,13 @@ module ActiveScaffold::Actions
     def self.included(base)
       base.class_eval do
         before_action :set_vary_accept_header
-        before_action :handle_user_settings
         before_action :check_input_device
         before_action :register_constraints_with_action_columns, :unless => :nested?
         after_action :clear_flashes
         after_action :clear_storage
         rescue_from ActiveScaffold::RecordNotAllowed, ActiveScaffold::ActionNotAllowed, :with => :deny_access
       end
+      base.helper_method :active_scaffold_config
       base.helper_method :successful?
       base.helper_method :nested?
       base.helper_method :grouped_search?
@@ -104,7 +104,7 @@ module ActiveScaffold::Actions
     end
 
     def subform_child_association
-      params[:child_association].presence || (@scope.split(']').first.sub(/^\[/, '').presence if @scope)
+      params[:child_association].presence || @scope&.split(']')&.first&.sub(/^\[/, '').presence
     end
 
     def parent_controller_name
@@ -113,7 +113,7 @@ module ActiveScaffold::Actions
 
     def set_parent(record)
       cfg = main_form_controller.active_scaffold_config
-      association = cfg.columns[subform_child_association].try(:association).try(:reverse_association)
+      association = cfg.columns[subform_child_association]&.association&.reverse_association
       return if association.nil?
 
       parent_model = cfg.model
@@ -248,8 +248,10 @@ module ActiveScaffold::Actions
           conditions[key] =
             if value.is_a?(Array)
               value.map { |v| v == '' && not_string ? nil : ActiveScaffold::Core.column_type_cast(v, column) }
+            elsif value == '' && (not_string || column.null)
+              ActiveScaffold::Core.column_type_cast(column.default, column)
             else
-              value == '' && not_string ? nil : ActiveScaffold::Core.column_type_cast(value, column)
+              ActiveScaffold::Core.column_type_cast(value, column)
             end
           conditions[key] = Range.new(*conditions[key]) if range
         end
@@ -258,11 +260,16 @@ module ActiveScaffold::Actions
     end
 
     def new_model
+      # ignore nested unrelated to current controller, e.g. adding record in subform inside subform, would create wrong parent_record
+      if nested? && nested.association && nested.association.klass != active_scaffold_config.model
+        return active_scaffold_config.model.new
+      end
       relation = beginning_of_chain
       config = active_scaffold_config_for(relation.klass) if nested? && nested.plural_association?
-      if config && config._columns_hash[column = relation.klass.inheritance_column]
+      column = relation.klass.inheritance_column if config
+      if column && config._columns_hash[column]
         model_name = params.delete(column) # in new action inheritance_column must be in params
-        model_name ||= params[:record].delete(column) if params[:record].present? # in create action must be inside record key
+        model_name ||= params[:record]&.delete(column) # in create action must be inside record key
         model_name = model_name.camelize if model_name
         model_name ||= active_scaffold_config.model.name
         build_options = {column.to_sym => model_name} if model_name
@@ -276,17 +283,6 @@ module ActiveScaffold::Actions
       @record = find_if_allowed(params[:id], crud_type_or_security_options, klass)
     end
 
-    def active_scaffold_session_storage_key(id = nil)
-      id ||= params[:eid] || "#{params[:controller]}#{"_#{nested_parent_id}" if nested?}"
-      "as:#{id}"
-    end
-
-    def active_scaffold_session_storage(id = nil)
-      session_index = active_scaffold_session_storage_key(id)
-      session[session_index] ||= {}
-      session[session_index]
-    end
-
     def active_scaffold_embedded_params
       params[:embedded] || {}
     end
@@ -300,19 +296,9 @@ module ActiveScaffold::Actions
       response.headers['Vary'] = 'Accept'
     end
 
-    # at some point we need to pass the session and params into config. we'll just take care of that before any particular action occurs by passing those hashes off to the UserSettings class of each action.
-    def handle_user_settings
-      storage = active_scaffold_config.store_user_settings ? active_scaffold_session_storage : {}
-      active_scaffold_config.actions.each do |action_name|
-        conf_instance = active_scaffold_config.send(action_name) rescue next
-        next if conf_instance.class::UserSettings == ActiveScaffold::Config::Base::UserSettings # if it hasn't been extended, skip it
-        conf_instance.user = conf_instance.class::UserSettings.new(conf_instance, storage, params)
-      end
-    end
-
     def check_input_device
       if session[:input_device_type].nil?
-        if request.env['HTTP_USER_AGENT'] && request.env['HTTP_USER_AGENT'][/(iPhone|iPod|iPad)/i]
+        if request.env['HTTP_USER_AGENT'] =~ /(iPhone|iPod|iPad)/i
           session[:input_device_type] = 'TOUCH'
           session[:hover_supported] = false
         else
@@ -340,7 +326,7 @@ module ActiveScaffold::Actions
 
     def params_hash(value)
       if controller_params?(value)
-        Rails.version < '4.2' ? value.clone.permit! : value.to_unsafe_h.with_indifferent_access
+        value.to_unsafe_h.with_indifferent_access
       else
         value
       end
@@ -361,7 +347,7 @@ module ActiveScaffold::Actions
       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.post? || request.put? ? :update : :delete, :action => action_name}
           get_row(crud_type_or_security_options)
           if @record.nil?
             self.successful = false
@@ -382,11 +368,15 @@ module ActiveScaffold::Actions
     end
 
     def action_update_respond_to_html
-      redirect_to :action => 'index'
+      if params[:iframe] == 'true' # was this an iframe post ?
+        responds_to_parent { action_update_respond_to_js }
+      else
+        redirect_to :action => 'index'
+      end
     end
 
     def action_update_respond_to_js
-      render(:action => 'on_action_update')
+      render :action => 'on_action_update', :formats => [:js], :layout => false
     end
 
     def action_update_respond_to_xml
@@ -420,11 +410,11 @@ module ActiveScaffold::Actions
     end
 
     def virtual_columns(columns)
-      columns.reject { |col| active_scaffold_config.model.columns_hash[col.to_s] || active_scaffold_config.columns[col].try(:association) }
+      columns.reject { |col| active_scaffold_config.model.columns_hash[col.to_s] || active_scaffold_config.columns[col]&.association }
     end
 
     def association_columns(columns)
-      columns.select { |col| active_scaffold_config.columns[col].try(:association) }
+      columns.select { |col| active_scaffold_config.columns[col]&.association }
     end
 
     private
@@ -457,7 +447,7 @@ module ActiveScaffold::Actions
         klass = klass.superclass
         controller = self.class.active_scaffold_controller_for(klass)
         cfg = controller.active_scaffold_config if controller.uses_active_scaffold?
-        next unless cfg && cfg.add_sti_create_links?
+        next unless cfg&.add_sti_create_links?
         return controller if cfg.sti_children.map(&:to_s).include? self.class.active_scaffold_config.model.name.underscore
       end
     rescue ActiveScaffold::ControllerNotFound => ex

data/lib/active_scaffold/actions/create.rb

@@ -76,7 +76,7 @@ module ActiveScaffold::Actions
     end
 
     def create_columns_names
-      active_scaffold_config.create.columns.names
+      active_scaffold_config.create.columns.visible_columns_names
     end
 
     # A simple method to find and prepare an example new record for the form

data/lib/active_scaffold/actions/delete.rb

@@ -24,11 +24,11 @@ module ActiveScaffold::Actions
     end
 
     def destroy_respond_to_xml
-      render :xml => successful? ? '' : response_object, :only => active_scaffold_config.list.columns.names, :status => response_status
+      render :xml => successful? ? '' : response_object, :only => active_scaffold_config.list.columns.visible_columns_names, :status => response_status
     end
 
     def destroy_respond_to_json
-      render :json => successful? ? '' : response_object, :only => active_scaffold_config.list.columns.names, :status => response_status
+      render :json => successful? ? '' : response_object, :only => active_scaffold_config.list.columns.visible_columns_names, :status => response_status
     end
 
     def destroy_find_record

data/lib/active_scaffold/actions/field_search.rb

@@ -56,10 +56,10 @@ module ActiveScaffold::Actions
 
       def custom_finder_options
         if grouped_search?
-          group_sql = calculation_for_group_by(search_group_column.try(:field) || search_group_name)
+          group_sql = calculation_for_group_by(search_group_column&.field || search_group_name)
           group_by = group_sql.respond_to?(:to_sql) ? group_sql.to_sql : group_sql
 
-          select_query = quoted_select_columns(search_group_column.try(:select_columns))
+          select_query = quoted_select_columns(search_group_column&.select_columns)
           select_query << group_sql.as(search_group_column.name.to_s) if search_group_column && group_sql.respond_to?(:to_sql)
           if active_scaffold_config.model.columns_hash.include?(active_scaffold_config.model.inheritance_column)
             select_query << active_scaffold_config.columns[active_scaffold_config.model.inheritance_column].field

data/lib/active_scaffold/actions/list.rb

@@ -71,7 +71,7 @@ module ActiveScaffold::Actions
         if respond_to?(:"#{action}_columns", true)
           send(:"#{action}_columns")
         else
-          active_scaffold_config.send(action).columns.collect_visible(:flatten => true)
+          active_scaffold_config.send(action).columns.visible_columns(flatten: true)
         end
       joins_cols, preload_cols = columns.select { |c| c.includes.present? }.partition do |col|
         includes_need_join?(col, sorting) && !grouped_search?
@@ -82,7 +82,7 @@ module ActiveScaffold::Actions
     end
 
     def set_includes_for_sorting(columns, sorting)
-      sorting.each do |col, _|
+      sorting.each_key do |col|
         next unless col.includes.present? && !columns.include?(col)
         if active_scaffold_config.model.connection.needs_order_expressions_in_select?
           active_scaffold_references << col.includes
@@ -97,8 +97,8 @@ module ActiveScaffold::Actions
     end
 
     def scoped_habtm?(column)
-      assoc = column.association if column.association.try :collection?
-      assoc && assoc.habtm? && assoc.scope
+      assoc = column.association if column.association&.collection?
+      assoc&.habtm? && assoc.scope
     end
 
     def get_row(crud_type_or_security_options = :read)
@@ -132,11 +132,12 @@ module ActiveScaffold::Actions
         page = page.pager.last
         active_scaffold_config.list.user.page = page.number
       end
-      @page, @records = page, page.items
+      @page = page
+      @records = page.items
     end
 
     def quoted_select_columns(columns)
-      columns.map { |c| active_scaffold_config.columns[c].try(:field) || c } if columns
+      columns&.map { |c| active_scaffold_config.columns[c]&.field || c }
     end
 
     def do_refresh_list
@@ -216,7 +217,7 @@ module ActiveScaffold::Actions
     end
 
     def list_columns
-      @list_columns ||= active_scaffold_config.list.columns.collect_visible
+      @list_columns ||= active_scaffold_config.list.columns.visible_columns
     end
 
     def list_columns_names

data/lib/active_scaffold/actions/nested.rb

@@ -27,12 +27,12 @@ module ActiveScaffold::Actions
     def set_nested
       @nested = nil
       return unless params[:parent_scaffold] && (params[:association] || params[:named_scope])
-      @nested = ActiveScaffold::DataStructures::NestedInfo.get(active_scaffold_config.model, params)
-      register_constraints_with_action_columns(@nested.constrained_fields) unless @nested.nil?
+      @nested = ActiveScaffold::DataStructures::NestedInfo.get(self.class.active_scaffold_config.model, params)
     end
 
     def configure_nested
       return unless nested?
+      register_constraints_with_action_columns(nested.constrained_fields)
       active_scaffold_config.list.user.label = nested_label
       unless active_scaffold_config.nested.ignore_order_from_association
         chain = beginning_of_chain
@@ -84,13 +84,13 @@ module ActiveScaffold::Actions
         if nested.association.collection?
           nested_parent_record.send(nested.association.name)
         elsif nested.association.through? # has_one :through
-          active_scaffold_config.model.where(active_scaffold_config.model.primary_key => nested_parent_record.send(nested.association.name).try(:id))
+          active_scaffold_config.model.where(active_scaffold_config.model.primary_key => nested_parent_record.send(nested.association.name)&.id)
         elsif nested.association.has_one?
-          active_scaffold_config.model.where(nested.child_association.foreign_key => nested_parent_record.send(nested.association.association_primary_key))
+          active_scaffold_config.model.where(nested.child_association.name => nested_parent_record)
         elsif nested.association.belongs_to?
           nested_belongs_to_chain
         else # never should get here
-          active_scaffold_config.model
+          raise 'missing condition for nested beginning_of_chain'
         end
       elsif nested? && nested.scope
         nested_parent_record.send(nested.scope)
@@ -181,11 +181,11 @@ module ActiveScaffold::Actions::Nested
     end
 
     def add_existing_respond_to_xml
-      render :xml => response_object, :only => active_scaffold_config.list.columns.names, :status => response_status
+      render :xml => response_object, :only => active_scaffold_config.list.columns.visible_columns_names, :status => response_status
     end
 
     def add_existing_respond_to_json
-      render :json => response_object, :only => active_scaffold_config.list.columns.names, :status => response_status
+      render :json => response_object, :only => active_scaffold_config.list.columns.visible_columns_names, :status => response_status
     end
 
     def destroy_existing_respond_to_html
@@ -198,11 +198,11 @@ module ActiveScaffold::Actions::Nested
     end
 
     def destroy_existing_respond_to_xml
-      render :xml => successful? ? '' : response_object, :only => active_scaffold_config.list.columns.names, :status => response_status
+      render :xml => successful? ? '' : response_object, :only => active_scaffold_config.list.columns.visible_columns_names, :status => response_status
     end
 
     def destroy_existing_respond_to_json
-      render :json => successful? ? '' : response_object, :only => active_scaffold_config.list.columns.names, :status => response_status
+      render :json => successful? ? '' : response_object, :only => active_scaffold_config.list.columns.visible_columns_names, :status => response_status
     end
 
     def add_existing_authorized?(record = nil)

data/lib/active_scaffold/actions/search.rb

@@ -19,7 +19,7 @@ module ActiveScaffold::Actions
       def do_search
         if search_params.is_a?(String) && search_params.present?
           query = search_params.to_s.strip
-          columns = active_scaffold_config.search.columns
+          columns = active_scaffold_config.search.columns.visible_columns
           text_search = active_scaffold_config.search.text_search
           query = query.split(active_scaffold_config.search.split_terms) if active_scaffold_config.search.split_terms
           search_conditions = self.class.conditions_for_columns(query, columns, text_search)

data/lib/active_scaffold/actions/show.rb

@@ -35,7 +35,7 @@ module ActiveScaffold::Actions
     end
 
     def show_columns_names
-      active_scaffold_config.show.columns.names
+      active_scaffold_config.show.columns.visible_columns_names
     end
 
     # A simple method to retrieve and prepare a record for showing.

data/lib/active_scaffold/actions/subform.rb

@@ -2,7 +2,9 @@ module ActiveScaffold::Actions
   module Subform
     def edit_associated
       do_edit_associated
-      render :action => 'edit_associated', :formats => [:js], :readonly => @column.association.readonly?
+      respond_to do |format|
+        format.js { render :action => 'edit_associated', :formats => [:js], :readonly => @column.association.readonly? }
+      end
     end
 
     protected

data/lib/active_scaffold/actions/update.rb

@@ -65,7 +65,8 @@ module ActiveScaffold::Actions
           else
             @updated_record = @record
             # get_row so associations are cached like in list action
-            @record = get_row rescue nil # if record doesn't fullfil current conditions remove it from list
+            # if record doesn't fullfil current conditions remove it from list
+            @record = get_row rescue nil # rubocop:disable Style/RescueModifier
           end
         end
         flash.now[:info] = as_(:updated_model, :model => ERB::Util.h((@updated_record || @record).to_label)) if active_scaffold_config.update.persistent
@@ -82,7 +83,7 @@ module ActiveScaffold::Actions
     end
 
     def update_columns_names
-      active_scaffold_config.update.columns.names
+      active_scaffold_config.update.columns.visible_columns_names
     end
 
     # A simple method to find and prepare a record for editing
@@ -150,12 +151,12 @@ module ActiveScaffold::Actions
       value ||=
         unless @column.column.nil? || @column.column.null
           default_val = @column.column.default
-          default_val = ActiveScaffold::Core.column_type_cast default_val, @column.column if Rails.version >= '4.2.0'
+          default_val = ActiveScaffold::Core.column_type_cast default_val, @column.column
           default_val == true ? false : default_val
         end
       unless @column.nil?
         value = column_value_from_param_value(value_record, @column, value)
-        value = [] if value.nil? && @column.form_ui && @column.association.try(:collection?)
+        value = [] if value.nil? && @column.form_ui && @column.association&.collection?
       end
 
       value_record.send("#{@column.name}=", value)