active_scaffold 3.5.5 → 3.6.0.pre

data/lib/active_scaffold/data_structures/action_link.rb

@@ -1,5 +1,7 @@
 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
@@ -9,9 +11,9 @@ module ActiveScaffold::DataStructures
       self.type = :collection
       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 = :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
@@ -23,7 +25,7 @@ module ActiveScaffold::DataStructures
         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 && (parameters.present? || dynamic_parameters) unless options.include? :toggle
     end
 
     def initialize_copy(action_link)
@@ -52,7 +54,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
@@ -186,7 +189,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
@@ -200,11 +204,19 @@ module ActiveScaffold::DataStructures
 
     # 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
   end
 end

data/lib/active_scaffold/data_structures/action_links.rb

@@ -90,7 +90,6 @@ module ActiveScaffold::DataStructures
           break
         else
           group.delete_group(name)
-          break
         end
       end
     end
@@ -147,8 +146,9 @@ module ActiveScaffold::DataStructures
     end
 
     def method_missing(name, *args, &block)
+      return super if name =~ /[!?]$/
       class_eval %{
-        def #{name}(label = nil)
+        def #{name}(label = nil) # rubocop:disable Style/CommentedKeyword
           @#{name} ||= subgroup('#{name}'.to_sym, label)
           yield @#{name} if block_given?
           @#{name}
@@ -157,6 +157,10 @@ module ActiveScaffold::DataStructures
       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,12 +4,16 @@ 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
+      @association.klass unless polymorphic?
+    end
+
     def belongs_to?
       @association.macro == :belongs_to
     end
@@ -66,13 +70,13 @@ 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
 
@@ -116,7 +120,7 @@ module ActiveScaffold::DataStructures::Association
 
     def reverse_match?(assoc)
       return false if assoc == @association
-      return false unless assoc.polymorphic? || assoc.class_name == inverse_klass.try(:name)
+      return false unless assoc.polymorphic? || assoc.class_name == inverse_klass&.name
 
       if through?
         reverse_through_match?(assoc)

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

data/lib/active_scaffold/data_structures/column.rb

@@ -2,6 +2,8 @@ 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
@@ -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.
@@ -140,10 +142,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
@@ -210,7 +214,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
@@ -304,17 +308,17 @@ module ActiveScaffold::DataStructures
     def initialize(name, active_record_class, delegated_association = nil) #:nodoc:
       self.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
       setup_association_info
 
-      @autolink = self.association.present?
+      @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.clone if association
       @select_columns = default_select_columns
 
       @text = @column.nil? || [:string, :text, String].include?(column_type)
@@ -337,7 +341,7 @@ module ActiveScaffold::DataStructures
       @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 +349,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
@@ -386,10 +390,27 @@ module ActiveScaffold::DataStructures
     end
 
     # to cache method to get value in list
-    attr_accessor :list_method
+    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)
-    attr_accessor :numerical_constraints
+    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('#')
+    end
 
     # the table.field name for this column, if applicable
     def field
@@ -407,16 +428,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 +461,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 +471,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,15 +497,10 @@ 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
+      if column && !tableless?
+        self.sort = {:sql => field}
       else
-        if column && !tableless?
-          self.sort = {:sql => field}
-        else
-          self.sort = false
-        end
+        self.sort = false
       end
     end
 
@@ -501,9 +519,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

data/lib/active_scaffold/data_structures/nested_info.rb

@@ -74,7 +74,7 @@ module ActiveScaffold::DataStructures
       column = parent_scaffold.active_scaffold_config.columns[params[:association].to_sym]
       @param_name = column.model.name.foreign_key.to_sym
       @parent_id = params[@param_name]
-      @association = column.try(:association)
+      @association = column&.association
       @child_association = association.reverse_association(model) if association
       setup_constrained_fields
     end

data/lib/active_scaffold/data_structures/set.rb

@@ -7,6 +7,10 @@ module ActiveScaffold::DataStructures
       set_values(*args)
     end
 
+    def initialize_dup(other)
+      @set = other.set.dup
+    end
+
     def set_values(*args)
       @set = []
       add(*args)
@@ -56,5 +60,9 @@ module ActiveScaffold::DataStructures
     def empty?
       @set.empty?
     end
+
+    protected
+
+    attr_reader :set
   end
 end

data/lib/active_scaffold/data_structures/sorting.rb

@@ -55,6 +55,9 @@ module ActiveScaffold::DataStructures
     # set({column => direction}, {column => direction})
     # set([column, direction], [column, direction])
     def set(*args)
+      # TODO: add deprecation unless args.size == 1 && args[0].is_a? Hash
+      # when deprecation is removed:
+      # * change list#sorting= to sorting.set(val)
       clear
       if args.first.is_a?(Enumerable)
         args.each do |h|
@@ -120,7 +123,7 @@ module ActiveScaffold::DataStructures
       order = []
       each do |sort_column, sort_direction|
         next if constraint_columns.include? sort_column.name
-        sql = grouped_columns_calculations.try(:dig, sort_column.name) || sort_column.sort[:sql]
+        sql = grouped_columns_calculations&.dig(sort_column.name) || sort_column.sort[:sql]
         next if sql.blank?
         sql = sql.to_sql if sql.respond_to?(:to_sql)
 
@@ -200,7 +203,7 @@ module ActiveScaffold::DataStructures
     end
 
     def postgres?
-      model.connection.try(:adapter_name) == 'PostgreSQL'
+      model.connection&.adapter_name == 'PostgreSQL'
     end
 
     def setup_primary_key_order_clause

data/lib/active_scaffold/delayed_setup.rb

@@ -17,7 +17,8 @@ module ActiveScaffold
       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 = @active_scaffold_delayed
+        @active_scaffold_delayed = nil
         block.call
       end
 

data/lib/active_scaffold/extensions/action_controller_rendering.rb

@@ -5,7 +5,8 @@ module ActiveScaffold
       if self.class.uses_active_scaffold? && params[:adapter] && @rendering_adapter.nil? && request.xhr?
         @rendering_adapter = true # recursion control
         # if we need an adapter, then we render the actual stuff to a string and insert it into the adapter template
-        opts = args.blank? ? {} : args.first
+        opts = args.any? ? args.first : {}
+
         render :partial => params[:adapter][1..-1],
                :locals => {:payload => render_to_string(opts.merge(:layout => false), &block).html_safe},
                :use_full_path => true, :layout => false, :content_type => :html

data/lib/active_scaffold/extensions/action_view_rendering.rb

@@ -114,7 +114,7 @@ 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(/.*\//, '').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')
           end

data/lib/active_scaffold/extensions/cow_proxy.rb

@@ -0,0 +1,43 @@
+require 'cow_proxy'
+
+module CowProxy
+  module ActiveScaffold
+    module DataStructures
+      class Column < ::CowProxy::WrapClass(::ActiveScaffold::DataStructures::Column)
+      end
+
+      class Set < ::CowProxy::WrapClass(::ActiveScaffold::DataStructures::Set)
+        protected
+
+        # Copy wrapped values to duplicated wrapped object
+        # @see CowProxy::Base#__copy_on_write__
+        # @return duplicated wrapped object
+        def __copy_on_write__(*)
+          super.tap do
+            new_set = __getobj__.instance_variable_get(:@set).dup
+            __getobj__.instance_variable_set(:@set, new_set)
+          end
+        end
+      end
+
+      class ActionLinks < ::CowProxy::WrapClass(::ActiveScaffold::DataStructures::ActionLinks)
+        def method_missing(name, *args, &block)
+          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)))
+            end
+          yield subgroup if block
+          subgroup
+        end
+
+        def respond_to_missing?(name, *)
+          name !~ /[!?]$/
+        end
+      end
+    end
+  end
+end