active_scaffold 3.6.0.pre → 3.6.0.rc1

data/lib/active_scaffold/extensions/cow_proxy.rb

@@ -4,6 +4,20 @@ module CowProxy
   module ActiveScaffold
     module DataStructures
       class Column < ::CowProxy::WrapClass(::ActiveScaffold::DataStructures::Column)
+        # readonly and called many times in list action
+        delegate :name, :cache_key, :delegated_association, :association, to: :__getobj__
+
+        def link
+          return @link if defined?(@link)
+          if __getobj__.frozen?
+            link_var = __getobj__.instance_variable_get(:@link)
+            if link_var.is_a?(Proc)
+              @link = link_var.call self
+              return @link
+            end
+          end
+          super
+        end
       end
 
       class Set < ::CowProxy::WrapClass(::ActiveScaffold::DataStructures::Set)
@@ -20,15 +34,34 @@ module CowProxy
         end
       end
 
+      class ActionColumns < ::CowProxy::WrapClass(::ActiveScaffold::DataStructures::ActionColumns)
+        def each_column(options = {})
+          __getobj__.each_column(options.reverse_merge(core_columns: action.core.columns)) do |column|
+            if column.is_a?(::ActiveScaffold::DataStructures::ActionColumns)
+              yield ::CowProxy.wrap(column).tap { |group| group.action = action }
+            else
+              yield column
+            end
+          end
+        end
+      end
+
       class ActionLinks < ::CowProxy::WrapClass(::ActiveScaffold::DataStructures::ActionLinks)
         def method_missing(name, *args, &block)
+          CowProxy.debug { "method missing #{name} in #{__getobj__.name}" }
           return super if name =~ /[!?]$/
-          __copy_on_write__ if frozen?
           subgroup =
             if _instance_variable_defined?("@#{name}")
               _instance_variable_get("@#{name}")
             else
-              _instance_variable_set("@#{name}", __wrap__(__getobj__.subgroup(name, args.first)))
+              __copy_on_write__ if __getobj__.frozen?
+              group = __getobj__.subgroup(name, args.first)
+              if group.frozen?
+                group = __wrap__(group)
+              else
+                CowProxy.debug { "created subgroup #{group.name}" }
+              end
+              _instance_variable_set("@#{name}", group)
             end
           yield subgroup if block
           subgroup
@@ -37,6 +70,21 @@ module CowProxy
         def respond_to_missing?(name, *)
           name !~ /[!?]$/
         end
+
+        protected
+
+        # Copy wrapped values to duplicated wrapped object
+        # @see CowProxy::Base#__copy_on_write__
+        # @return duplicated wrapped object
+        def __copy_on_write__(*)
+          index = @parent_proxy.instance_variable_get(:@set).index(__getobj__) if @parent_proxy
+          super.tap do
+            CowProxy.debug { "replace #{index} with proxy obj in parent #{@parent_proxy.name}" } if index
+            @parent_proxy.instance_variable_get(:@set)[index] = self if index
+            new_set = __getobj__.instance_variable_get(:@set).dup
+            __getobj__.instance_variable_set(:@set, new_set)
+          end
+        end
       end
     end
   end

data/lib/active_scaffold/extensions/localize.rb

@@ -1,7 +1,9 @@
 class Object
   def as_(key, options = {})
     if key.present?
-      text = I18n.translate(key.to_s, {:scope => [:active_scaffold, *options.delete(:scope)], :default => key.is_a?(String) ? key : key.to_s.titleize}.merge(options)).html_safe
+      scope = [:active_scaffold, *options.delete(:scope)]
+      options = options.reverse_merge(:scope => scope, :default => key.is_a?(String) ? key : key.to_s.titleize)
+      text = I18n.translate(key.to_s, options).html_safe # rubocop:disable Rails/OutputSafety
       # text = nil if text.include?('translation missing:')
     end
     text || key

data/lib/active_scaffold/extensions/routing_mapper.rb

@@ -16,9 +16,9 @@ module ActiveScaffold
 
       def get_actions(actions_hash, options)
         default_actions = default_actions(actions_hash)
-        if only = options[:only]
+        if (only = options[:only])
           Array(only).map(&:to_sym)
-        elsif except = options[:except]
+        elsif (except = options[:except])
           default_actions - Array(except).map(&:to_sym)
         else
           default_actions

data/lib/active_scaffold/extensions/to_label.rb

@@ -1,8 +1,9 @@
 # the ever-useful to_label method
 class ActiveRecord::Base
   def to_label
-    %i[name label title to_s].each do |attribute|
-      return send(attribute).to_s if respond_to?(attribute)
+    to_label_method = ActiveScaffold::Registry.cache :to_label, self.class.name do
+      %i[name label title to_s].find { |attribute| respond_to?(attribute) }
     end
+    send(to_label_method).to_s if to_label_method
   end
 end

data/lib/active_scaffold/finder.rb

@@ -1,7 +1,7 @@
 module ActiveScaffold
   module Finder
     def self.like_operator
-      @@like_operator ||= ::ActiveRecord::Base.connection.adapter_name == 'PostgreSQL' ? 'ILIKE' : 'LIKE'
+      @@like_operator ||= ::ActiveRecord::Base.connection.adapter_name.in?(%w[PostgreSQL PostGIS]) ? 'ILIKE' : 'LIKE'
     end
 
     module ClassMethods
@@ -68,7 +68,9 @@ module ActiveScaffold
               value = columns_token[column.name]
               value = /#{value}/ if column.text?
               column.search_sql.map do |search_sql|
-                {search_sql => value}
+                # call .to_s so String is returned from CowProxy::String in threadsafe mode
+                # in other case, or method from Mongoid would fail
+                {search_sql.to_s => value}
               end
             end.flatten
             active_scaffold_config.model.or(token_conditions).selector
@@ -101,12 +103,10 @@ module ActiveScaffold
           sql, *values =
             if search_ui && respond_to?("condition_for_#{search_ui}_type")
               send("condition_for_#{search_ui}_type", column, value, like_pattern)
+            elsif column.search_sql.instance_of? Proc
+              column.search_sql.call(value)
             else
-              if column.search_sql.instance_of? Proc
-                column.search_sql.call(value)
-              else
-                condition_for_search_ui(column, value, like_pattern, search_ui)
-              end
+              condition_for_search_ui(column, value, like_pattern, search_ui)
             end
           return nil unless sql
 
@@ -176,12 +176,14 @@ module ActiveScaffold
       end
 
       def tables_for_translating_days_and_months(format)
+        # rubocop:disable Style/FormatStringToken
         keys = {
           '%A' => 'date.day_names',
           '%a' => 'date.abbr_day_names',
           '%B' => 'date.month_names',
           '%b' => 'date.abbr_month_names'
         }
+        # rubocop:enable Style/FormatStringToken
         key_index = keys.keys.map { |key| [key, format.index(key)] }.to_h
         keys.select! { |k, _| key_index[k] }
         keys.sort_by { |k, _| key_index[k] }.map do |_, k|
@@ -226,37 +228,60 @@ module ActiveScaffold
         [format, parts[:offset]]
       end
 
+      def local_time_from_hash(value, conversion = :to_time)
+        time = Time.zone.local(*%i[year month day hour minute second].collect { |part| value[part].to_i })
+        time.send(conversion)
+      rescue StandardError => e
+        message = "Error creating time from #{value.inspect}:"
+        Rails.logger.warn "#{message}\n#{e.message}\n#{e.backtrace.join("\n")}"
+        nil
+      end
+
+      def parse_date_with_format(value, format_name)
+        format = I18n.t("date.formats.#{format_name || :default}")
+        format.gsub!(/%-d|%-m|%_m/) { |s| s.gsub(/[-_]/, '') } # strptime fails with %-d, %-m, %_m
+        en_value = I18n.locale == :en ? value : translate_days_and_months(value, format)
+        Date.strptime(en_value, format)
+      rescue StandardError => e
+        message = "Error parsing date from #{en_value}"
+        message << " (#{value})" if en_value != value
+        message << ", with format #{format}" if format
+        Rails.logger.warn "#{message}:\n#{e.message}\n#{e.backtrace.join("\n")}"
+        nil
+      end
+
+      def parse_time_with_format(value, format, offset)
+        format.gsub!(/%-d|%-m|%_m/) { |s| s.gsub(/[-_]/, '') } # strptime fails with %-d, %-m, %_m
+        en_value = I18n.locale == :en ? value : translate_days_and_months(value, format)
+        time = Time.strptime(en_value, format)
+        offset ? time : Time.zone.local_to_utc(time).in_time_zone
+      rescue StandardError => e
+        message = "Error parsing time from #{en_value}"
+        message << " (#{value})" if en_value != value
+        message << ", with format #{format}" if format
+        Rails.logger.warn "#{message}:\n#{e.message}\n#{e.backtrace.join("\n")}"
+        nil
+      end
+
       def condition_value_for_datetime(column, value, conversion = :to_time)
-        unless value.nil? || value.blank?
-          if value.is_a? Hash
-            time = Time.zone.local(*%i[year month day hour minute second].collect { |part| value[part].to_i }) rescue nil
-            time&.send(conversion)
-          elsif value.respond_to?(:strftime)
-            if conversion == :to_time
-              # Explicitly get the current zone, because TimeWithZone#to_time in rails 3.2.3 returns UTC.
-              # https://github.com/rails/rails/pull/2453
-              value.to_time.in_time_zone
-            else
-              value.send(conversion)
-            end
-          elsif conversion == :to_date
-            format = I18n.t("date.formats.#{column.options[:format] || :default}")
-            format.gsub!(/%-d|%-m|%_m/) { |s| s.gsub(/[-_]/, '') } # strptime fails with %-d, %-m, %_m
-            value = translate_days_and_months(value, format) if I18n.locale != :en
-            Date.strptime(value, format) rescue nil
-          elsif value.include?('T')
-            Time.zone.parse(value)
-          else # datetime
-            format, offset = format_for_datetime(column, value)
-            format.gsub!(/%-d|%-m|%_m/) { |s| s.gsub(/[-_]/, '') } # strptime fails with %-d, %-m, %_m
-            value = translate_days_and_months(value, format) if I18n.locale != :en
-            time = Time.strptime(value, format) rescue nil
-            if time
-              time = Time.zone.local_to_utc(time).in_time_zone unless offset
-              time = time.send(conversion) unless conversion == :to_time
-            end
-            time
+        return if value.nil? || value.blank?
+        if value.is_a? Hash
+          local_time_from_hash(value, conversion)
+        elsif value.respond_to?(:strftime)
+          if conversion == :to_time
+            # Explicitly get the current zone, because TimeWithZone#to_time in rails 3.2.3 returns UTC.
+            # https://github.com/rails/rails/pull/2453
+            value.to_time.in_time_zone
+          else
+            value.send(conversion)
           end
+        elsif conversion == :to_date
+          parse_date_with_format(value, column.options[:format])
+        elsif value.include?('T')
+          Time.zone.parse(value)
+        else # datetime
+          time = parse_time_with_format(value, *format_for_datetime(column, value))
+          conversion == :to_time ? time : time.send(conversion)
         end
       end
 
@@ -264,7 +289,12 @@ module ActiveScaffold
         return value if value.nil?
         value = column.number_to_native(value) if column.options[:format] && column.search_ui != :number
         case (column.search_ui || column.column.type)
-        when :integer   then value.to_i rescue value ? 1 : 0
+        when :integer   then
+          if value.is_a?(TrueClass) || value.is_a?(FalseClass)
+            value ? 1 : 0
+          else
+            value.to_i
+          end
         when :float     then value.to_f
         when :decimal
           ::ActiveRecord::Type::Decimal.new.type_cast_from_user(value)
@@ -362,10 +392,12 @@ module ActiveScaffold
       @active_scaffold_references ||= []
     end
 
-    # Override this method on your controller to define conditions to be used when querying a recordset (e.g. for List). The return of this method should be any format compatible with the :conditions clause of ActiveRecord::Base's find.
+    # Override this method on your controller to define conditions to be used when querying a recordset (e.g. for List).
+    # The return of this method should be any format compatible with the :conditions clause of ActiveRecord::Base's find.
     def conditions_for_collection; end
 
-    # Override this method on your controller to define joins to be used when querying a recordset (e.g. for List).  The return of this method should be any format compatible with the :joins clause of ActiveRecord::Base's find.
+    # Override this method on your controller to define joins to be used when querying a recordset (e.g. for List).
+    # The return of this method should be any format compatible with the :joins clause of ActiveRecord::Base's find.
     def joins_for_collection; end
 
     # Override this method on your controller to provide custom finder options to the find() call. The return of this method should be a hash.
@@ -403,7 +435,10 @@ module ActiveScaffold
     end
 
     # valid options may include:
-    # * :sorting - a Sorting DataStructure (basically an array of hashes of field => direction, e.g. [{:field1 => 'asc'}, {:field2 => 'desc'}]). please note that multi-column sorting has some limitations: if any column in a multi-field sort uses method-based sorting, it will be ignored. method sorting only works for single-column sorting.
+    # * :sorting - a Sorting DataStructure (basically an array of hashes of field => direction,
+    #     e.g. [{:field1 => 'asc'}, {:field2 => 'desc'}]).
+    #     please note that multi-column sorting has some limitations: if any column in a multi-field
+    #     sort uses method-based sorting, it will be ignored. method sorting only works for single-column sorting.
     # * :per_page
     # * :page
     def finder_options(options = {})
@@ -411,7 +446,7 @@ module ActiveScaffold
 
       # create a general-use options array that's compatible with Rails finders
       finder_options = {
-        :reorder => options[:sorting]&.clause((grouped_columns_calculations if grouped_search?)),
+        :reorder => options[:sorting]&.clause((grouped_columns_calculations if grouped_search?)).map(&Arel.method(:sql)),
         :conditions => search_conditions
       }
       if active_scaffold_config.mongoid?
@@ -480,7 +515,7 @@ module ActiveScaffold
     end
 
     def calculate_last_modified(query)
-      return unless conditional_get_support? && query.klass.columns_hash['updated_at']
+      return unless conditional_get_support? && ActiveScaffold::OrmChecks.columns_hash(query.klass)['updated_at']
       @last_modified = query.maximum(:updated_at)
     end
 
@@ -497,13 +532,13 @@ module ActiveScaffold
     end
 
     def append_to_query(relation, options)
-      options.assert_valid_keys :where, :select, :having, :group, :reorder, :order, :limit, :offset, :joins, :left_joins, :left_outer_joins, :includes, :lock, :readonly, :from, :conditions, :preload, :references
+      options.assert_valid_keys :where, :select, :having, :group, :reorder, :order, :limit, :offset,
+                                :joins, :left_joins, :left_outer_joins, :includes, :lock, :readonly,
+                                :from, :conditions, :preload, :references
       relation = options.reject { |_, v| v.blank? }.inject(relation) do |rel, (k, v)|
         k == :conditions ? apply_conditions(rel, *v) : rel.send(k, v)
       end
-      if options[:left_outer_joins].present? || options[:left_joins].present?
-        relation.distinct_value = true
-      end
+      relation.distinct_value = true if options[:left_outer_joins].present? || options[:left_joins].present?
       relation
     end
 

data/lib/active_scaffold/helpers/action_link_helpers.rb

@@ -24,9 +24,9 @@ module ActiveScaffold
         ul_options = record_or_ul_options if ul_options.nil? && record_or_ul_options.is_a?(Hash)
         record = record_or_ul_options unless record_or_ul_options.is_a?(Hash)
         html = content_tag :ul, ul_options do
-          safe_join links.map { |link| content_tag :li, link }
+          safe_join(links.map { |link| content_tag :li, link })
         end
-        raw "ActiveScaffold.display_dynamic_action_group('#{get_action_link_id action_link, record}', '#{escape_javascript html}');"
+        raw "ActiveScaffold.display_dynamic_action_group('#{get_action_link_id action_link, record}', '#{escape_javascript html}');" # rubocop:disable Rails/OutputSafety
       end
 
       def display_action_links(action_links, record, options, &block)
@@ -67,7 +67,7 @@ module ActiveScaffold
             html_classes << 'top' if options[:first_action]
             group_tag = :li
           end
-          content = content_tag(group_tag, :class => (html_classes if html_classes.present?), :onclick => ('' if hover_via_click?)) do
+          content = content_tag(group_tag, :class => html_classes.presence, :onclick => ('' if hover_via_click?)) do
             content_tag(:div, as_(link.label), :class => link.name.to_s.downcase) << content_tag(:ul, content)
           end
         else
@@ -85,7 +85,9 @@ module ActiveScaffold
           options.delete :link if link.crud_type == :create
         end
         if link.action.nil? || (link.type == :member && options.key?(:authorized) && !options[:authorized])
-          action_link_html(link, nil, {:link => action_link_text(link, options), :class => "disabled #{link.action}#{" #{link.html_options[:class]}" if link.html_options[:class].present?}", :title => options[:not_authorized_reason]}, record)
+          html_class = "disabled #{link.action}#{" #{link.html_options[:class]}" if link.html_options[:class].present?}"
+          html_options = {:link => action_link_text(link, options), :class => html_class, :title => options[:not_authorized_reason]}
+          action_link_html(link, nil, html_options, record)
         else
           url = action_link_url(link, record)
           html_options = action_link_html_options(link, record, options)
@@ -106,12 +108,12 @@ module ActiveScaffold
       end
 
       def configure_column_link(link, record, associated, actions = nil)
-        actions ||= link.column.actions_for_association_links
+        actions ||= link.controller_actions || []
         if column_empty?(associated) # if association is empty, we only can link to create form
           if actions.include?(:new)
             link.action = 'new'
             link.crud_type = :create
-            link.label ||= as_(:create_new)
+            link.label ||= :create_new
           end
         elsif actions.include?(:edit)
           link.action = 'edit'
@@ -137,7 +139,7 @@ module ActiveScaffold
       def column_link_authorized?(link, column, record, associated)
         if column.association
           associated_for_authorized =
-            if column.association.collection? || (associated.respond_to?(:blank?) && associated.blank?)
+            if column.association.collection? || associated.nil?
               column.association.klass
             else
               associated
@@ -209,6 +211,18 @@ module ActiveScaffold
         url
       end
 
+      def column_in_params_conditions?(key)
+        if key =~ /!$/
+          conditions_from_params[1..-1].any? { |node| node.left.name.to_s == key[0..-2] }
+        else
+          conditions_from_params[0].include?(key)
+        end
+      end
+
+      def ignore_param_for_nested?(key)
+        NESTED_PARAMS.include?(key) || column_in_params_conditions?(key) || (nested? && nested.param_name == key)
+      end
+
       def query_string_for_action_links(link)
         if defined?(@query_string) && link.parameters.none? { |k, _| @query_string_params.include? k }
           return [@query_string, @non_nested_query_string]
@@ -224,12 +238,17 @@ module ActiveScaffold
             keep = false
             next
           end
-          if NESTED_PARAMS.include?(key) || conditions_from_params.include?(key) || (nested? && nested.param_name == key)
+          if ignore_param_for_nested?(key)
             non_nested_query_string_options[key] = value
           else
             query_string_options[key] = value
           end
         end
+        if nested_singular_association? && action_name == 'index'
+          # pass current path as return_to, for nested listing on singular association, so forms doesn't return to parent listing
+          @query_string_params << :return_to
+          non_nested_query_string_options[:return_to] = request.fullpath
+        end
 
         query_string = query_string_options.to_query if query_string_options.present?
         if non_nested_query_string_options.present?
@@ -331,7 +350,10 @@ module ActiveScaffold
           html_options[:class] << ' active' if action_link_selected?(link, record)
         end
 
-        html_options[:target] = '_blank' if !options[:page] && !options[:inline] && (options[:popup] || link.popup?)
+        if !options[:page] && !options[:inline] && (options[:popup] || link.popup?)
+          html_options[:target] = '_blank'
+          html_options[:rel] = [html_options[:rel], 'noopener noreferrer'].compact.join(' ')
+        end
         html_options[:id] = link_id
         if link.dhtml_confirm?
           unless link.inline?
@@ -344,20 +366,23 @@ module ActiveScaffold
         html_options
       end
 
-      def get_action_link_id(link, record = nil, column = nil)
-        column ||= link.column
+      def get_action_link_id(link, record = nil)
+        column = link.column
         if column&.association && record
-          id = if column.association.collection?
-                 "#{column.association.name}-#{record.id}"
-               elsif record.send(column.association.name).present?
-                 "#{column.association.name}-#{record.send(column.association.name).id}-#{record.id}"
-               else
-                 "#{column.association.name}-#{record.id}"
-               end
+          associated = record.send(column.association.name) unless column.association.collection?
+          id =
+            if associated
+              "#{column.association.name}-#{associated.id}-#{record.id}"
+            else
+              "#{column.association.name}-#{record.id}"
+            end
+        end
+        id ||= record&.id&.to_s || (nested? ? nested_parent_id.to_s : '')
+        action_link_id = ActiveScaffold::Registry.cache :action_link_id, link.name_to_cache do
+          action_id = "#{id_from_controller("#{link.controller}-") if params[:parent_controller] || (link.controller && link.controller != controller.controller_path)}#{link.action}"
+          action_link_id(action_id, '--ID--')
         end
-        id ||= record&.id || (nested? ? nested_parent_id : '')
-        action_id = "#{id_from_controller("#{link.controller}-") if params[:parent_controller] || (link.controller && link.controller != controller.controller_path)}#{link.action}"
-        action_link_id(action_id, id)
+        action_link_id.sub('--ID--', id)
       end
 
       def action_link_html(link, url, html_options, record)
@@ -380,6 +405,7 @@ module ActiveScaffold
         elsif link.parameters&.dig(:named_scope)
           url_options[:parent_scaffold] = controller_path
           url_options[active_scaffold_config.model.name.foreign_key.to_sym] = url_options.delete(:id)
+          url_options[:id] = nil
         end
       end