active_scaffold 3.5.2 → 3.6.0.rc1

data/lib/active_scaffold/data_structures/action_link.rb

@@ -1,29 +1,37 @@
 module ActiveScaffold::DataStructures
   class ActionLink
+    NO_OPTIONS = {}.freeze
+
     # provides a quick way to set any property of the object from a hash
     def initialize(action, options = {})
       # set defaults
-      self.action = action
-      self.label = action
-      self.confirm = false
-      self.type = :collection
+      @action = action
+      @label = action
+      @confirm = false
+      @type = :collection
+      @method = :get
+      @crud_type =
+        case action&.to_sym
+        when :destroy then :delete
+        when :create, :new then :create
+        when :update, :edit then :update
+        else :read
+        end
+      @column = nil
+      @image = nil
+      @controller = nil
+      @parameters = nil
+      @dynamic_parameters = nil
+      @html_options = nil
+      @weight = 0
       self.inline = true
-      self.method = :get
-      self.crud_type = :delete if [:destroy].include?(action.try(:to_sym))
-      self.crud_type = :create if %i[create new].include?(action.try(:to_sym))
-      self.crud_type = :update if %i[edit update].include?(action.try(:to_sym))
-      self.crud_type ||= :read
-      self.column = nil
-      self.image = nil
-      self.dynamic_parameters = nil
-      self.weight = 0
 
       # apply quick properties
       options.each_pair do |k, v|
         setter = "#{k}="
         send(setter, v) if respond_to? setter
       end
-      self.toggle = self.action.try(:to_sym) == :index && (parameters.present? || dynamic_parameters) unless options.include? :toggle
+      self.toggle = self.action&.to_sym == :index && !position && (parameters.present? || dynamic_parameters) unless options.include? :toggle
     end
 
     def initialize_copy(action_link)
@@ -52,7 +60,8 @@ module ActiveScaffold::DataStructures
     # a hash of request parameters
     attr_writer :parameters
     def parameters
-      @parameters ||= {}
+      return @parameters || NO_OPTIONS if frozen?
+      @parameters ||= NO_OPTIONS.dup
     end
 
     # if active class is added to link when current request matches link
@@ -69,7 +78,7 @@ module ActiveScaffold::DataStructures
     # what string to use to represent this action
     attr_writer :label
     def label
-      @label.is_a?(Symbol) ? as_(@label) : @label
+      @label.is_a?(Symbol) ? ActiveScaffold::Registry.cache(:translations, @label) { as_(@label) } : @label
     end
 
     # image to use {:name => 'arrow.png', :size => '16x16'}
@@ -82,7 +91,8 @@ module ActiveScaffold::DataStructures
     end
 
     def confirm(label = '')
-      @confirm.is_a?(String) ? @confirm : as_(@confirm, :label => label)
+      return @confirm if !confirm? || @confirm.is_a?(String)
+      ActiveScaffold::Registry.cache(:translations, @confirm) { as_(@confirm) } % {label: label}
     end
 
     def confirm?
@@ -186,7 +196,8 @@ module ActiveScaffold::DataStructures
     # html options for the link
     attr_writer :html_options
     def html_options
-      @html_options ||= {}
+      return @html_options || NO_OPTIONS if frozen?
+      @html_options ||= NO_OPTIONS.dup
     end
 
     # nested action_links are referencing a column
@@ -198,13 +209,32 @@ module ActiveScaffold::DataStructures
       @keep_open
     end
 
+    # for links in singular associations, copied from
+    # column.actions_for_association_links, excluding
+    # actions not available in association's controller
+    attr_accessor :controller_actions
+
     # indicates that this a nested_link
     def nested_link?
-      @column || (parameters && parameters[:named_scope])
+      @column || parameters&.dig(:named_scope)
     end
 
     def name_to_cache
-      @name_to_cache ||= "#{controller || 'self'}_#{type}_#{action}#{'_' if parameters.present?}#{parameters.map { |k, v| "#{k}=#{v.is_a?(Array) ? v.join(',') : v}" }.join('_')}"
+      return @name_to_cache if defined? @name_to_cache
+      [
+        controller || 'self',
+        type,
+        action,
+        *parameters.map { |k, v| "#{k}=#{v.is_a?(Array) ? v.join(',') : v}" }
+      ].compact.join('_').tap do |name_to_cache|
+        @name_to_cache = name_to_cache unless frozen?
+      end
+    end
+
+    def freeze
+      # force generating cache_key, except for column's link without action, or polymorphic associations
+      name_to_cache if action && !column&.association&.polymorphic?
+      super
     end
   end
 end

data/lib/active_scaffold/data_structures/action_links.rb

@@ -53,8 +53,8 @@ module ActiveScaffold::DataStructures
         if item.is_a?(ActiveScaffold::DataStructures::ActionLinks)
           collected = item[val]
           links << collected unless collected.nil?
-        else
-          links << item if item.action.to_s == val.to_s
+        elsif item.action.to_s == val.to_s
+          links << item
         end
       end
       links.first
@@ -66,8 +66,8 @@ module ActiveScaffold::DataStructures
         if item.is_a?(ActiveScaffold::DataStructures::ActionLinks)
           collected = item.find_duplicate(link)
           links << collected unless collected.nil?
-        else
-          links << item if item.action == link.action && item.static_controller? && item.controller == link.controller && item.parameters == link.parameters
+        elsif item.action == link.action && item.static_controller? && item.controller == link.controller && item.parameters == link.parameters
+          links << item
         end
       end
       links.first
@@ -90,7 +90,6 @@ module ActiveScaffold::DataStructures
           break
         else
           group.delete_group(name)
-          break
         end
       end
     end
@@ -101,12 +100,10 @@ module ActiveScaffold::DataStructures
       @set.sort_by(&:weight).send(method) do |item|
         if item.is_a?(ActiveScaffold::DataStructures::ActionLinks) && !options[:groups]
           item.each(options, &block)
+        elsif options[:include_set]
+          yield item, @set
         else
-          if options[:include_set]
-            yield item, @set
-          else
-            yield item
-          end
+          yield item
         end
       end
     end
@@ -147,16 +144,21 @@ module ActiveScaffold::DataStructures
     end
 
     def method_missing(name, *args, &block)
-      class_eval %{
-        def #{name}(label = nil)
+      return super if name =~ /[!?]$/
+      class_eval <<-METHOD, __FILE__, __LINE__ + 1
+        def #{name}(label = nil) # rubocop:disable Style/CommentedKeyword
           @#{name} ||= subgroup('#{name}'.to_sym, label)
           yield @#{name} if block_given?
           @#{name}
         end
-      }
+      METHOD
       send(name, args.first, &block)
     end
 
+    def respond_to_missing?(name, *)
+      name !~ /[!?]$/
+    end
+
     attr_accessor :name
     attr_accessor :weight
 

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

@@ -4,21 +4,32 @@ module ActiveScaffold::DataStructures::Association
       @association = association
     end
     attr_writer :reverse
-    delegate :name, :klass, :foreign_key, :==, to: :@association
+    delegate :name, :foreign_key, :==, to: :@association
 
     def allow_join?
       !polymorphic?
     end
 
+    def klass(record = nil)
+      if polymorphic?
+        record&.send(foreign_type)&.constantize
+      else
+        @association.klass
+      end
+    rescue NameError => e
+      Rails.logger.warn "#{e.message}\n#{e.backtrace.join("\n")}"
+      nil
+    end
+
     def belongs_to?
       @association.macro == :belongs_to
     end
 
-    def has_one?
+    def has_one? # rubocop:disable Naming/PredicateName
       @association.macro == :has_one
     end
 
-    def has_many?
+    def has_many? # rubocop:disable Naming/PredicateName
       @association.macro == :has_many
     end
 
@@ -30,10 +41,22 @@ module ActiveScaffold::DataStructures::Association
       !collection?
     end
 
+    def collection?
+      has_many? || habtm?
+    end
+
     def through?
       false
     end
 
+    def through_singular?
+      through? && !through_reflection.collection?
+    end
+
+    def through_collection?
+      through? && through_reflection.collection?
+    end
+
     def polymorphic?
       false
     end
@@ -48,6 +71,8 @@ module ActiveScaffold::DataStructures::Association
 
     def scope; end
 
+    def as; end
+
     def respond_to_target?
       false
     end
@@ -66,23 +91,24 @@ module ActiveScaffold::DataStructures::Association
 
     def reverse(klass = nil)
       unless polymorphic? || defined?(@reverse)
-        @reverse ||= inverse || get_reverse.try(:name)
+        @reverse ||= inverse || get_reverse&.name
       end
-      @reverse || (get_reverse(klass).try(:name) unless klass.nil?)
+      @reverse || (get_reverse(klass)&.name unless klass.nil?)
     end
 
     def inverse_for?(klass)
-      inverse_class = reverse_association(klass).try(:inverse_klass)
+      inverse_class = reverse_association(klass)&.inverse_klass
       inverse_class.present? && (inverse_class == klass || klass < inverse_class)
     end
 
     def reverse_association(klass = nil)
-      assoc = if polymorphic?
-                get_reverse(klass) unless klass.nil?
-              else
-                return unless reverse_name = reverse(klass)
-                reflect_on_association(reverse_name)
-      end
+      assoc =
+        if polymorphic?
+          get_reverse(klass) unless klass.nil?
+        else
+          reverse_name = reverse(klass)
+          reflect_on_association(reverse_name) if reverse_name
+        end
       self.class.new(assoc) if assoc
     end
 
@@ -110,13 +136,13 @@ module ActiveScaffold::DataStructures::Association
       associations = self.class.reflect_on_all_associations(klass)
       # collect associations that point back to this model and use the same foreign_key
       associations.each_with_object([]) do |assoc, reverse_matches|
-        reverse_matches << assoc if reverse_match? assoc
+        reverse_matches << assoc if assoc != @association && reverse_match?(assoc)
       end
     end
 
     def reverse_match?(assoc)
-      return false if assoc == @association
-      return false unless assoc.polymorphic? || assoc.class_name == inverse_klass.try(:name)
+      return assoc.name == as if as || assoc.polymorphic?
+      return false if assoc.class_name != inverse_klass&.name
 
       if through?
         reverse_through_match?(assoc)

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

@@ -48,7 +48,7 @@ module ActiveScaffold::DataStructures::Association
 
     # name of inverse
     def inverse
-      @association.inverse_of.try(:name)
+      @association.inverse_of&.name
     end
 
     def quoted_table_name
@@ -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

@@ -2,12 +2,14 @@ module ActiveScaffold::DataStructures
   class Column
     include ActiveScaffold::Configurable
     include ActiveScaffold::OrmChecks
+    NO_PARAMS = Set.new.freeze
+    NO_OPTIONS = {}.freeze
 
     attr_reader :active_record_class
     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
@@ -31,8 +33,8 @@ module ActiveScaffold::DataStructures
 
     # Any extra parameters this particular column uses.  This is for create/update purposes.
     def params
-      # lazy initialize
-      @params ||= Set.new
+      return @params || NO_PARAMS if frozen?
+      @params ||= NO_PARAMS.dup
     end
 
     # the display-name of the column. this will be used, for instance, as the column title in the table and as the field name in the form.
@@ -112,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
@@ -140,10 +135,12 @@ module ActiveScaffold::DataStructures
     # a place to store dev's column specific options
     attr_writer :options
     def options
-      @options ||= {}
+      return @options || NO_OPTIONS if frozen?
+      @options ||= NO_OPTIONS.dup
     end
 
     def link
+      return @link.call(self) if frozen? && @link.is_a?(Proc)
       @link = @link.call(self) if @link.is_a? Proc
       @link
     end
@@ -182,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
@@ -194,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
@@ -210,7 +209,7 @@ module ActiveScaffold::DataStructures
     def search_sql=(value)
       @search_sql =
         if value
-          (value == true || value.is_a?(Proc)) ? value : Array(value)
+          value == true || value.is_a?(Proc) ? value : Array(value)
         else
           value
         end
@@ -241,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
@@ -300,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[self.name.to_s]
+      @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
 
-      @autolink = self.association.present?
+      @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 self.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)
@@ -328,16 +335,17 @@ 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
       @form_ui = self.class.association_form_ui if @association && self.class.association_form_ui
 
-      self.includes = [association.name] if association && association.allow_join?
+      self.includes = [association.name] if association&.allow_join?
       if delegated_association
         self.includes = includes ? [delegated_association.name => includes] : [delegated_association.name]
       end
@@ -345,7 +353,7 @@ module ActiveScaffold::DataStructures
 
       # default all the configurable variables
       self.css_class = ''
-      self.required = active_record_class.validators_on(self.name).any? do |val|
+      self.required = active_record_class.validators_on(name).any? do |val|
         validator_force_required?(val)
       end
       self.sort = true
@@ -365,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
@@ -385,11 +398,9 @@ module ActiveScaffold::DataStructures
       end
     end
 
-    # to cache method to get value in list
-    attr_accessor :list_method
-
-    # cache constraints for numeric columns (get in ActiveScaffold::Helpers::FormColumnHelpers::numerical_constraints_for_column)
-    attr_accessor :numerical_constraints
+    def default_for_empty_value
+      (column.null ? nil : column.default) if column
+    end
 
     # the table.field name for this column, if applicable
     def field
@@ -407,16 +418,18 @@ module ActiveScaffold::DataStructures
     protected
 
     def setup_association_info
-      assoc = active_record_class.reflect_on_association(self.name)
-      @association = if assoc
-                       case
-                       when active_record? then Association::ActiveRecord.new(assoc)
-                       when mongoid? then Association::Mongoid.new(assoc)
-                       end
-                     elsif defined?(ActiveMongoid) && model < ActiveMongoid::Associations
-                       assoc = active_record_class.reflect_on_am_association(name)
-                       Association::ActiveMongoid.new(assoc) if assoc
-      end
+      assoc = active_record_class.reflect_on_association(name)
+      @association =
+        if assoc
+          if active_record?
+            Association::ActiveRecord.new(assoc)
+          elsif mongoid?
+            Association::Mongoid.new(assoc)
+          end
+        elsif defined?(ActiveMongoid) && model < ActiveMongoid::Associations
+          assoc = active_record_class.reflect_on_am_association(name)
+          Association::ActiveMongoid.new(assoc) if assoc
+        end
     end
 
     def validator_force_required?(val)
@@ -438,7 +451,7 @@ module ActiveScaffold::DataStructures
     def default_select_columns
       if association.nil? && column
         [field]
-      elsif association.try(:polymorphic?)
+      elsif association&.polymorphic?
         [field, quoted_field(quoted_field_name(association.foreign_type))]
       elsif association
         if association.belongs_to?
@@ -448,7 +461,7 @@ module ActiveScaffold::DataStructures
           if _columns_hash[count_column = "#{association.name}_count"]
             columns << quoted_field(quoted_field_name(count_column))
           end
-          if association.through_reflection.try(:belongs_to?)
+          if association.through_reflection&.belongs_to?
             columns << quoted_field(quoted_field_name(association.through_reflection.foreign_key))
           end
           columns
@@ -474,16 +487,12 @@ module ActiveScaffold::DataStructures
     end
 
     def initialize_sort
-      if virtual?
-        # we don't automatically enable method sorting for virtual columns because it's slow, and we expect fewer complaints this way.
-        self.sort = false
-      else
+      self.sort =
         if column && !tableless?
-          self.sort = {:sql => field}
+          {:sql => field}
         else
-          self.sort = false
+          false
         end
-      end
     end
 
     def initialize_search_sql
@@ -501,9 +510,9 @@ module ActiveScaffold::DataStructures
     attr_reader :table
 
     def estimate_weight
-      if association.try(:singular?)
+      if association&.singular?
         400
-      elsif association.try(:collection?)
+      elsif association&.collection?
         500
       elsif %i[created_at updated_at].include?(name)
         600