active_scaffold 3.6.0.pre → 3.6.0.rc1

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

@@ -17,18 +17,14 @@ module ActiveScaffold::DataStructures::Association
       %i[belongs_to_record belongs_to_document].include?(@association.macro)
     end
 
-    def has_one?
+    def has_one? # rubocop:disable Naming/PredicateName
       %i[has_one_record has_one_document].include?(@association.macro)
     end
 
-    def has_many?
+    def has_many? # rubocop:disable Naming/PredicateName
       %i[has_many_records has_many_documents].include?(@association.macro)
     end
 
-    def collection?
-      %i[has_many_documents has_many_records].include?(@association.macro)
-    end
-
     def table_name
       @association.klass < ActiveRecord::Base ? @association.klass.table_name : super
     end

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

@@ -75,7 +75,11 @@ module ActiveScaffold::DataStructures::Association
 
     def scope_values
       return {} unless @association.scope
-      @scope_values ||= @association.klass.instance_exec(&@association.scope).values rescue {}
+      @scope_values ||= @association.klass.instance_exec(&@association.scope).values
+    rescue StandardError => e
+      message = "Error evaluating scope for #{@association.name} in #{@association.klass.name}:"
+      Rails.logger.warn "#{message}\n#{e.message}\n#{e.backtrace.join("\n")}"
+      {}
     end
 
     def reverse_through_match?(assoc)

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

@@ -1,9 +1,6 @@
 module ActiveScaffold::DataStructures::Association
   class Mongoid < Abstract
     delegate :inverse_klass, :as, :dependent, :inverse, to: :@association
-    def collection?
-      %i[has_many has_and_belongs_to_many].include?(@association.macro)
-    end
 
     # polymorphic belongs_to
     def polymorphic?

data/lib/active_scaffold/data_structures/column.rb

@@ -9,7 +9,7 @@ module ActiveScaffold::DataStructures
     alias model active_record_class
 
     # this is the name of the getter on the ActiveRecord model. it is the only absolutely required attribute ... all others will be inferred from this name.
-    attr_accessor :name
+    attr_reader :name
 
     # Whether to enable inplace editing for this column. Currently works for text columns, in the List.
     attr_reader :inplace_edit
@@ -114,16 +114,9 @@ module ActiveScaffold::DataStructures
     # supported options:
     #   * for association columns
     #     * :select - displays a simple <select> or a collection of checkboxes to (dis)associate records
-    def form_ui=(value)
-      self.list_method = nil if @list_ui.nil? && value != @form_ui
-      @form_ui = value
-    end
-    attr_reader :form_ui
+    attr_accessor :form_ui
 
-    def list_ui=(value)
-      self.list_method = nil if value != @list_ui
-      @list_ui = value
-    end
+    attr_writer :list_ui
 
     def list_ui
       @list_ui || form_ui
@@ -186,10 +179,11 @@ module ActiveScaffold::DataStructures
     # a collection of associations to pre-load when finding the records on a page
     attr_reader :includes
     def includes=(value)
-      @includes = case value
-                  when Array then value
-                  else value ? [value] : value # not convert nil to [nil]
-      end
+      @includes =
+        case value
+        when Array then value
+        else value ? [value] : value # not convert nil to [nil]
+        end
     end
 
     # a collection of associations to do left join when this column is included on search
@@ -198,10 +192,11 @@ module ActiveScaffold::DataStructures
     end
 
     def search_joins=(value)
-      @search_joins = case value
-                      when Array then value
-                      else [value] # automatically convert to an array
-      end
+      @search_joins =
+        case value
+        when Array then value
+        else [value] # automatically convert to an array
+        end
     end
 
     # a collection of columns to load when eager loading is disabled, if it's nil all columns will be loaded
@@ -245,6 +240,9 @@ module ActiveScaffold::DataStructures
       @associated_number
     end
 
+    # what string to use to join records from plural associations
+    attr_accessor :association_join_text
+
     # whether a blank row must be shown in the subform
     cattr_accessor :show_blank_record, instance_accessor: false
     @@show_blank_record = true
@@ -304,21 +302,26 @@ module ActiveScaffold::DataStructures
       end
     end
 
+    # cache key to cache column info
+    attr_reader :cache_key
+
     # instantiation is handled internally through the DataStructures::Columns object
     def initialize(name, active_record_class, delegated_association = nil) #:nodoc:
-      self.name = name.to_sym
+      @name = name.to_sym
       @active_record_class = active_record_class
       @column = _columns_hash[name.to_s]
       @delegated_association = delegated_association
+      @cache_key = [@active_record_class.name, name].compact.map(&:to_s).join('#')
       setup_association_info
 
+      @link = nil
       @autolink = association.present?
       @table = _table_name
       @associated_limit = self.class.associated_limit
       @associated_number = self.class.associated_number
       @show_blank_record = self.class.show_blank_record
       @send_form_on_update_column = self.class.send_form_on_update_column
-      @actions_for_association_links = self.class.actions_for_association_links.clone if association
+      @actions_for_association_links = self.class.actions_for_association_links.dup if association
       @select_columns = default_select_columns
 
       @text = @column.nil? || [:string, :text, String].include?(column_type)
@@ -332,10 +335,11 @@ module ActiveScaffold::DataStructures
           @form_ui = :number
           @options = {:format => :i18n_number}
         else
-          @form_ui = case @column.type
-                     when :boolean then :checkbox
-                     when :text then :textarea
-          end
+          @form_ui =
+            case @column.type
+            when :boolean then :checkbox
+            when :text then :textarea
+            end
         end
       end
       @allow_add_existing = true
@@ -369,18 +373,23 @@ module ActiveScaffold::DataStructures
       order_weight.nonzero? ? order_weight : name.to_s <=> other.name.to_s
     end
 
+    def convert_to_native?
+      number? && options[:format] && form_ui != :number
+    end
+
     def number_to_native(value)
       return value if value.blank? || !value.is_a?(String)
       native = '.' # native ruby separator
       format = {:separator => '', :delimiter => ''}.merge! I18n.t('number.format', :default => {})
-      specific = case options[:format]
-                 when :currency
-                   I18n.t('number.currency.format', :default => nil)
-                 when :size
-                   I18n.t('number.human.format', :default => nil)
-                 when :percentage
-                   I18n.t('number.percentage.format', :default => nil)
-      end
+      specific =
+        case options[:format]
+        when :currency
+          I18n.t('number.currency.format', :default => nil)
+        when :size
+          I18n.t('number.human.format', :default => nil)
+        when :percentage
+          I18n.t('number.percentage.format', :default => nil)
+        end
       format.merge! specific unless specific.nil?
       if format[:separator].blank? || !value.include?(format[:separator]) && value.include?(native) && (format[:delimiter] != native || value !~ /\.\d{3}$/)
         value
@@ -389,27 +398,8 @@ module ActiveScaffold::DataStructures
       end
     end
 
-    # to cache method to get value in list
-    def list_method
-      Rails.cache.fetch(cache_key(:list_method))
-    end
-
-    def list_method=(value)
-      Rails.cache.write(cache_key(:list_method), value)
-    end
-
-    # cache constraints for numeric columns (get in ActiveScaffold::Helpers::FormColumnHelpers::numerical_constraints_for_column)
-    def numerical_constraints
-      Rails.cache.fetch(cache_key(:numerical_constraints))
-    end
-
-    def numerical_constraints=(value)
-      Rails.cache.write(cache_key(:numerical_constraints), value)
-    end
-
-    # cache key to cache column info
-    def cache_key(attr)
-      [@active_record_class.name, name, attr].compact.map(&:to_s).join('#')
+    def default_for_empty_value
+      (column.null ? nil : column.default) if column
     end
 
     # the table.field name for this column, if applicable
@@ -497,11 +487,12 @@ module ActiveScaffold::DataStructures
     end
 
     def initialize_sort
-      if column && !tableless?
-        self.sort = {:sql => field}
-      else
-        self.sort = false
-      end
+      self.sort =
+        if column && !tableless?
+          {:sql => field}
+        else
+          false
+        end
     end
 
     def initialize_search_sql

data/lib/active_scaffold/data_structures/columns.rb

@@ -23,6 +23,7 @@ module ActiveScaffold::DataStructures
       @active_record_class = active_record_class
       @_inheritable = []
       @set = []
+      @sorted = nil
 
       add(*args)
     end
@@ -48,8 +49,8 @@ module ActiveScaffold::DataStructures
       column = self[association]
       raise ArgumentError, "unknown column #{association}" if column.nil?
       raise ArgumentError, "column #{association} is not an association" if column.association.nil?
-      raise ArugmentError, "column #{association} is not singular association" unless column.association.singular?
-      raise ArugmentError, "column #{association} is polymorphic association" if column.association.polymorphic?
+      raise ArgumentError, "column #{association} is not singular association" unless column.association.singular?
+      raise ArgumentError, "column #{association} is polymorphic association" if column.association.polymorphic?
 
       klass = column.association.klass
       columns.each do |col|

data/lib/active_scaffold/data_structures/nested_info.rb

@@ -31,7 +31,7 @@ module ActiveScaffold::DataStructures
       false
     end
 
-    def has_many?
+    def has_many? # rubocop:disable Naming/PredicateName
       false
     end
 
@@ -39,7 +39,7 @@ module ActiveScaffold::DataStructures
       false
     end
 
-    def has_one?
+    def has_one? # rubocop:disable Naming/PredicateName
       false
     end
 
@@ -83,15 +83,17 @@ module ActiveScaffold::DataStructures
 
     # A through association with has_one or has_many as source association
     # create cannot be called in nested through associations, and not-nested through associations
-    # unless create columns include through reflection of reverse association
+    # unless is through singular or create columns include through reflection of reverse association
     # e.g. customer -> networks -> firewall, reverse is firewall -> network -> customer,
     # firewall can be created if create columns include network
     def readonly_through_association?(columns)
       return false unless through_association?
-      return true if association.through_reflection.options[:through]
-      !association.source_reflection.belongs_to? && (
-        !child_association || !columns.include?(child_association.through_reflection.name)
-      )
+      return true if association.through_reflection.options[:through] # create not possible, too many levels
+      return true if association.source_reflection.options[:through] # create not possible, too many levels
+      return false if association.through_singular? # create allowed, AS has code for this
+
+      # create allowed only if through reflection in record to be created is included in create columns
+      !child_association || !columns.include?(child_association.through_reflection.name)
     end
 
     def through_association?
@@ -104,25 +106,25 @@ module ActiveScaffold::DataStructures
 
     def default_sorting(chain)
       return @default_sorting if defined? @default_sorting
-      if association.scope.is_a?(Proc) && chain.respond_to?(:values) && chain.values[:order]
-        @default_sorting = chain.values[:order]
-        @default_sorting = @default_sorting.map(&:to_sql) if @default_sorting[0].is_a? Arel::Nodes::Node
-        @default_sorting = @default_sorting.join(', ')
-      end
+      return unless association.scope.is_a?(Proc) && chain.respond_to?(:values) && chain.values[:order]
+      @default_sorting = chain.values[:order]
+      @default_sorting = @default_sorting.map(&:to_sql) if @default_sorting[0].is_a? Arel::Nodes::Node
+      @default_sorting = @default_sorting.join(', ')
     end
 
     def to_params
-      super.merge(:association => @association.name, :assoc_id => parent_id)
+      super.merge(:association => @association.name, @param_name => parent_id)
     end
 
     protected
 
     def setup_constrained_fields
-      @constrained_fields = []
-      @constrained_fields << Array(association.foreign_key).map(&:to_sym) unless association.belongs_to?
-      if child_association && child_association != association
-        @constrained_fields << child_association.name
-      end
+      @constrained_fields = Array(association.foreign_key).map(&:to_sym) unless association.belongs_to?
+      @constrained_fields ||= []
+      return unless child_association && child_association != association
+
+      @constrained_fields << child_association.name
+      @constrained_fields << child_association.foreign_type.to_sym if child_association.polymorphic?
     end
   end
 

data/lib/active_scaffold/data_structures/sorting.rb

@@ -14,6 +14,7 @@ module ActiveScaffold::DataStructures
       @clauses = []
       @constraint_columns = []
       @model = model
+      @sorting_by_primary_key = false
     end
 
     def set_default_sorting
@@ -106,6 +107,10 @@ module ActiveScaffold::DataStructures
       @clauses.each { |clause| yield clause }
     end
 
+    def each_column
+      @clauses.each { |clause| yield clause[0] }
+    end
+
     # provides quick access to the first (and sometimes only) clause
     def first
       @clauses.first

data/lib/active_scaffold/delayed_setup.rb

@@ -11,15 +11,25 @@ module ActiveScaffold
 
     module ClassMethods
       def active_scaffold(model_id = nil, &block)
-        @active_scaffold_delayed = proc { super(model_id, &block) }
+        @delayed_monitor ||= Monitor.new
+        @active_scaffold_delayed = proc do
+          begin
+            @_prefixes = nil # clean prefixes in case is already cached, so our local_prefixes override is picked up
+            super(model_id, &block)
+            @active_scaffold_delayed = @delayed_monitor = nil # after configuring, no need to keep proc or monitor
+          rescue StandardError
+            # clear config variable if failed, so next request tries again
+            @active_scaffold_config = nil
+            raise
+          end
+        end
       end
 
       def config_active_scaffold_delayed
-        return unless @active_scaffold_delayed
-        @_prefixes = nil # clean prefixes in case is already cached, so our local_prefixes override is picked up
-        block = @active_scaffold_delayed
-        @active_scaffold_delayed = nil
-        block.call
+        @delayed_monitor&.synchronize do
+          # if called in same thread while running config, do nothing
+          @active_scaffold_delayed&.call unless @active_scaffold_config
+        end
       end
 
       def active_scaffold_config

data/lib/active_scaffold/extensions/action_controller_rendering.rb

@@ -8,7 +8,7 @@ module ActiveScaffold
         opts = args.any? ? args.first : {}
 
         render :partial => params[:adapter][1..-1],
-               :locals => {:payload => render_to_string(opts.merge(:layout => false), &block).html_safe},
+               :locals => {:payload => render_to_string(opts.merge(:layout => false), &block).html_safe}, # rubocop:disable Rails/OutputSafety
                :use_full_path => true, :layout => false, :content_type => :html
         @rendering_adapter = nil # recursion control
       else

data/lib/active_scaffold/extensions/action_view_rendering.rb

@@ -39,8 +39,12 @@ module ActiveScaffold #:nodoc:
       if args.first.is_a?(Hash) && args.first[:active_scaffold]
         render_embedded args.first
       elsif args.first == :super
-        @_view_paths ||= lookup_context.view_paths.clone
-        @_last_template ||= lookup_context.last_template
+        if @lookup_context # rails 6
+          @_lookup_context ||= lookup_context
+        else # rails < 6
+          @_view_paths ||= lookup_context.view_paths.clone
+          @_last_template ||= lookup_context.last_template
+        end
         parts = @virtual_path.split('/')
         template = parts.pop
         prefix = parts.join('/')
@@ -58,22 +62,34 @@ module ActiveScaffold #:nodoc:
         else
           options[:prefixes] = ['active_scaffold_overrides']
           last_view_path = File.expand_path(File.dirname(File.dirname(lookup_context.last_template.inspect)), Rails.root)
-          lookup_context.view_paths = view_paths.drop(view_paths.find_index { |path| path.to_s == last_view_path } + 1)
+          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
-        lookup_context.view_paths = @_view_paths if @_view_paths
-        lookup_context.last_template = @_last_template if @_last_template
+        @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
         result
       else
-        @_view_paths ||= lookup_context.view_paths.clone
+        if @lookup_context # rails 6
+          @_lookup_context ||= lookup_context
+        else # rails < 6
+          @_view_paths ||= lookup_context.view_paths.clone
+        end
         last_template = lookup_context.last_template
-        current_view = if args[0].is_a?(Hash)
-                         {:locals => args[0][:locals], :object => args[0][:object]}
-                       else # call is render 'partial', locals_hash
-                         {:locals => args[1]}
-                       end
+        current_view =
+          if args[0].is_a?(Hash)
+            {locals: args[0][:locals], object: args[0][:object]}
+          else # call is render 'partial', locals_hash
+            {locals: args[1]}
+          end
         view_stack << current_view if current_view
-        lookup_context.view_paths = @_view_paths # reset view_paths in case a view render :super, and then render :partial
+        @lookup_context = @_lookup_context if @_lookup_context # rails 6, reset lookup_context in case a view render :super, and then render :partial
+        lookup_context.view_paths = @_view_paths if @_view_paths # rails < 6, reset view_paths in case a view render :super, and then render :partial
         result = super
         view_stack.pop if current_view.present?
         lookup_context.last_template = last_template
@@ -114,9 +130,13 @@ module ActiveScaffold #:nodoc:
         content_tag(:div, :id => id, :class => 'active-scaffold-component', :data => {:refresh => url}) do
           # parse the ActiveRecord model name from the controller path, which
           # might be a namespaced controller (e.g., 'admin/admins')
-          model = remote_controller.to_s.sub(%r{/.*//}, '').singularize
+          model = remote_controller.to_s.sub(%r{.*/}, '').singularize
           content_tag(:div, :class => 'active-scaffold-header') do
-            content_tag :h2, link_to(options[:label] || active_scaffold_config_for(model).list.label, url, :remote => true, :class => 'load-embedded')
+            content_tag(:h2) do
+              link_label = options[:label] || active_scaffold_config_for(model).list.label
+              link_to(link_label, url, remote: true, class: 'load-embedded', data: {error_msg: as_(:error_500)}) <<
+                loading_indicator_tag(url_options)
+            end
           end
         end
       end