active_scaffold 3.6.0.pre → 3.6.0.rc1

data/lib/active_scaffold/config/mark.rb

@@ -11,7 +11,7 @@ module ActiveScaffold::Config
     attr_accessor :mark_all_mode
 
     def initialize(core_config)
-      @core = core_config
+      super
       @mark_all_mode = self.class.mark_all_mode
       @core.model.send(:include, ActiveScaffold::MarkedModel) unless @core.model < ActiveScaffold::MarkedModel
       add_mark_column

data/lib/active_scaffold/configurable.rb

@@ -1,5 +1,7 @@
 module ActiveScaffold
-  # Exposes a +configure+ method that accepts a block and runs all contents of the block in two contexts, as opposed to the normal one. First, everything gets evaluated as part of the object including Configurable. Then, as a failover, missing methods and variables are evaluated in the original binding of the block.
+  # Exposes a +configure+ method that accepts a block and runs all contents of the block in two contexts,
+  # as opposed to the normal one. First, everything gets evaluated as part of the object including Configurable.
+  # Then, as a failover, missing methods and variables are evaluated in the original binding of the block.
   #
   # Note that this only works with "barewords". Constants, instance variables, and class variables are not currently supported in both contexts.
   #
@@ -22,8 +24,8 @@ module ActiveScaffold
     end
 
     def respond_to_missing?(name, include_all = false)
-      if @configuration_binding
-        @configuration_binding.respond_to?(name, include_all)
+      if defined? @configuration_binding
+        @configuration_binding&.respond_to?(name, include_all)
       else
         super
       end

data/lib/active_scaffold/constraints.rb

@@ -61,15 +61,7 @@ module ActiveScaffold
 
           # association column constraint
           elsif column.association
-            if column.association.habtm?
-              active_scaffold_habtm_joins.concat column.includes
-            elsif !column.association.polymorphic?
-              if column.association.belongs_to?
-                active_scaffold_preload.concat column.includes
-              else
-                active_scaffold_references.concat column.includes
-              end
-            end
+            join_from_association_constraint(column)
             hash_conditions.deep_merge!(condition_from_association_constraint(column.association, v))
 
           # regular column constraints
@@ -78,7 +70,7 @@ module ActiveScaffold
             conditions << [column.search_sql.collect { |search_sql| "#{search_sql} = ?" }.join(' OR '), *([v] * column.search_sql.size)]
           end
         # unknown-to-activescaffold-but-real-database-column constraint
-        elsif active_scaffold_config.model.columns_hash[k.to_s] && params[column.name] != v
+        elsif active_scaffold_config._columns_hash[k.to_s] && params[column.name] != v
           hash_conditions.deep_merge!(k => v)
         else
           raise ActiveScaffold::MalformedConstraint, constraint_error(active_scaffold_config.model, k), caller
@@ -87,6 +79,18 @@ module ActiveScaffold
       conditions.reject(&:blank?)
     end
 
+    def join_from_association_constraint(column)
+      if column.association.habtm?
+        active_scaffold_habtm_joins.concat column.includes
+      elsif !column.association.polymorphic?
+        if column.association.belongs_to?
+          active_scaffold_preload.concat column.includes
+        else
+          active_scaffold_references.concat column.includes
+        end
+      end
+    end
+
     # We do NOT want to use .search_sql. If anything, search_sql will refer
     # to a human-searchable value on the associated record.
     def condition_from_association_constraint(association, value)
@@ -96,17 +100,15 @@ module ActiveScaffold
       #
       # please see the relevant tests for concrete examples.
 
-      field = if association.belongs_to?
-                association.foreign_key
-              else
-                association.klass.primary_key
+      field =
+        if association.belongs_to?
+          association.foreign_key
+        else
+          association.klass.primary_key
         end
 
       table = association.belongs_to? ? active_scaffold_config.model.table_name : association.table_name
-
-      if association.primary_key
-        value = association.klass.find(value).send(association.primary_key)
-      end
+      value = association.klass.find(value).send(association.primary_key) if association.primary_key
 
       if association.polymorphic?
         unless value.is_a?(Array) && value.size == 2
@@ -151,7 +153,7 @@ module ActiveScaffold
               raise ActiveScaffold::MalformedConstraint, polymorphic_constraint_error(column.association), caller
             end
             record.send("#{k}=", v[0].constantize.find(v[1]))
-          else # regular singular association
+          elsif !column.association.source_reflection&.options&.include?(:through) # regular singular association, or one-level through association
             record.send("#{k}=", column.association.klass.find(v))
 
             # setting the belongs_to side of a has_one isn't safe. if the has_one was already

data/lib/active_scaffold/core.rb

@@ -7,20 +7,21 @@ module ActiveScaffold
     def setup_user_settings
       config = self.class.active_scaffold_config
       config.new_user_settings(user_settings_storage, params)
-      unless ActiveScaffold.threadsafe
-        config.actions.each do |action_name|
-          conf_instance = config.send(action_name) rescue next # rubocop:disable Style/RescueModifier
-          config.user.action_user_settings(conf_instance)
-        end
+      return if ActiveScaffold.threadsafe
+      config.actions.each do |action_name|
+        conf_instance = config.send(action_name) rescue next # rubocop:disable Style/RescueModifier
+        config.user.action_user_settings(conf_instance)
       end
     end
 
     def active_scaffold_config
-      setup_user_settings unless self.class.active_scaffold_config.user
-      if ActiveScaffold.threadsafe
-        self.class.active_scaffold_config.user
-      else
-        self.class.active_scaffold_config
+      @active_scaffold_config ||= begin
+        setup_user_settings unless self.class.active_scaffold_config.user
+        if ActiveScaffold.threadsafe
+          self.class.active_scaffold_config.user
+        else
+          self.class.active_scaffold_config
+        end
       end
     end
 
@@ -60,7 +61,13 @@ module ActiveScaffold
         active_scaffold_superclasses_blocks.each { |superblock| active_scaffold_config.configure(&superblock) }
         active_scaffold_config.sti_children = nil # reset sti_children if set in parent block
         active_scaffold_config.configure(&block) if block_given?
-        active_scaffold_config._configure_sti unless active_scaffold_config.sti_children.nil?
+        active_scaffold_config.class.after_config_callbacks.each do |callback|
+          if callback.is_a?(Proc)
+            callback.call
+          elsif active_scaffold_config.respond_to?(callback)
+            active_scaffold_config.send(callback)
+          end
+        end
 
         # defines the attribute read methods on the model, so record.send() doesn't find protected/private methods instead
         # define_attribute_methods is safe to call multiple times since rails 4.0.4
@@ -90,10 +97,9 @@ module ActiveScaffold
           end
         end
         _add_sti_create_links if active_scaffold_config.add_sti_create_links?
-        if ActiveScaffold.threadsafe
-          active_scaffold_config._cache_lazy_values
-          active_scaffold_config.deep_freeze!
-        end
+        return unless ActiveScaffold.threadsafe
+        active_scaffold_config._cache_lazy_values
+        active_scaffold_config.deep_freeze!
       end
 
       module Prefixes
@@ -122,7 +128,8 @@ module ActiveScaffold
         end
       end
 
-      # Create the automatic column links. Note that this has to happen when configuration is *done*, because otherwise the Nested module could be disabled. Actually, it could still be disabled later, couldn't it?
+      # Create the automatic column links. Note that this has to happen when configuration is *done*,
+      # because otherwise the Nested module could be disabled. Actually, it could still be disabled later, couldn't it?
       def links_for_associations
         return unless active_scaffold_config.actions.include?(:list) && active_scaffold_config.actions.include?(:nested)
         active_scaffold_config.columns.each do |column|
@@ -157,10 +164,13 @@ module ActiveScaffold
         else
           actions = controller.active_scaffold_config.actions unless controller == :polymorph
           actions ||= %i[create update show]
-          column.actions_for_association_links.delete :new unless actions.include? :create
-          column.actions_for_association_links.delete :edit unless actions.include? :update
-          column.actions_for_association_links.delete :show unless actions.include? :show
-          ActiveScaffold::DataStructures::ActionLink.new(nil, options.merge(:html_options => {:class => column.name}))
+          controller_actions = column.actions_for_association_links
+          controller_actions = controller_actions.dup if controller_actions.frozen?
+          controller_actions.delete :new unless actions.include? :create
+          controller_actions.delete :edit unless actions.include? :update
+          controller_actions.delete :show unless actions.include? :show
+          options.merge!(html_options: {class: column.name}, controller_actions: Set.new(controller_actions))
+          ActiveScaffold::DataStructures::ActionLink.new(nil, options)
         end
       end
 
@@ -230,12 +240,9 @@ module ActiveScaffold
             controller = "#{namespace}#{controller_name.camelize}Controller".constantize
           rescue NameError => error
             # Only rescue NameError associated with the controller constant not existing - not other compile errors
-            if error.message["uninitialized constant #{controller}"]
-              error_message << "#{namespace}#{controller_name.camelize}Controller"
-              next
-            else
-              raise
-            end
+            raise unless error.message["uninitialized constant #{controller}"]
+            error_message << "#{namespace}#{controller_name.camelize}Controller"
+            next
           end
           raise ActiveScaffold::ControllerNotFound, "#{controller} missing ActiveScaffold", caller unless controller.uses_active_scaffold?
           unless controller.active_scaffold_config.model.to_s == klass.to_s
@@ -258,10 +265,12 @@ module ActiveScaffold
     end
 
     def self.mongoid_column_type_cast(value, column)
+      return Time.zone.at(value.to_i) if value =~ /\A\d+\z/ && [Time, DateTime].include?(column.type)
       column.type.evolve value
     end
 
     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

data/lib/active_scaffold/data_structures/action_columns.rb

@@ -68,7 +68,7 @@ module ActiveScaffold::DataStructures
     end
 
     def each_column(options = {}, &proc)
-      columns = action.core.columns
+      columns = options[:core_columns] || action.core.columns
       self.unauthorized_columns = []
       options[:for] ||= columns.active_record_class
 

data/lib/active_scaffold/data_structures/action_link.rb

@@ -5,27 +5,33 @@ module ActiveScaffold::DataStructures
     # 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&.to_sym)
-      self.crud_type = :create if %i[create new].include?(action&.to_sym)
-      self.crud_type = :update if %i[edit update].include?(action&.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&.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)
@@ -72,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'}
@@ -85,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?
@@ -202,6 +209,11 @@ 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&.dig(:named_scope)
@@ -218,5 +230,11 @@ module ActiveScaffold::DataStructures
         @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
@@ -100,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,13 +145,13 @@ module ActiveScaffold::DataStructures
 
     def method_missing(name, *args, &block)
       return super if name =~ /[!?]$/
-      class_eval %{
+      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
 

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

@@ -10,19 +10,26 @@ module ActiveScaffold::DataStructures::Association
       !polymorphic?
     end
 
-    def klass
-      @association.klass unless polymorphic?
+    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
 
@@ -34,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
@@ -52,6 +71,8 @@ module ActiveScaffold::DataStructures::Association
 
     def scope; end
 
+    def as; end
+
     def respond_to_target?
       false
     end
@@ -81,12 +102,13 @@ module ActiveScaffold::DataStructures::Association
     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
 
@@ -114,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&.name
+      return assoc.name == as if as || assoc.polymorphic?
+      return false if assoc.class_name != inverse_klass&.name
 
       if through?
         reverse_through_match?(assoc)