active_scaffold 3.5.5 → 3.6.1

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
 
@@ -66,6 +66,10 @@ module ActiveScaffold::DataStructures
     def sorted?(*)
       false
     end
+
+    def match_model?(model)
+      false
+    end
   end
 
   class NestedInfoAssociation < NestedInfo
@@ -74,7 +78,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
@@ -83,46 +87,56 @@ 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?
       association.through?
     end
 
+    def match_model?(model)
+      if association.polymorphic?
+        child_association&.inverse_klass == model
+      else
+        association.klass == model
+      end
+    end
+
     def sorted?(chain)
       default_sorting(chain).present?
     end
 
     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 = [] if association.belongs_to? || association.through?
+      @constrained_fields ||= Array(association.foreign_key).map(&:to_sym)
+      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/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

@@ -14,6 +14,7 @@ module ActiveScaffold::DataStructures
       @clauses = []
       @constraint_columns = []
       @model = model
+      @sorting_by_primary_key = false
     end
 
     def set_default_sorting
@@ -55,6 +56,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|
@@ -103,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
@@ -120,7 +128,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 +208,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

@@ -11,14 +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

@@ -5,9 +5,10 @@ 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},
+               :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,41 +39,33 @@ 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
-        parts = @virtual_path.split('/')
-        template = parts.pop
-        prefix = parts.join('/')
-
-        options = args[1] || {}
-        options[:locals] ||= {}
-        if view_stack.last
-          options[:locals] = view_stack.last[:locals].merge!(options[:locals]) if view_stack.last[:locals]
-          options[:object] ||= view_stack.last[:object] if view_stack.last[:object]
-        end
-        options[:template] = template
-        # if prefix is active_scaffold_overrides we must try to render with this prefix in following paths
-        if prefix != 'active_scaffold_overrides'
-          options[:prefixes] = lookup_context.prefixes.drop((lookup_context.prefixes.find_index(prefix) || -1) + 1)
-        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)
+        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
-        result = super options
-        lookup_context.view_paths = @_view_paths if @_view_paths
-        lookup_context.last_template = @_last_template if @_last_template
+        result = super options_for_render_super(args[1])
+        @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
@@ -87,6 +79,46 @@ module ActiveScaffold #:nodoc:
 
     private
 
+    def options_for_render_super(options)
+      options ||= {}
+      options[:locals] ||= {}
+      if view_stack.last
+        options[:locals] = view_stack.last[:locals].merge!(options[:locals]) if view_stack.last[:locals]
+        options[:object] ||= view_stack.last[:object] if view_stack.last[:object]
+      end
+
+      parts = @virtual_path.split('/')
+      options[:template] = parts.pop
+      prefix = parts.join('/')
+      # if prefix is active_scaffold_overrides we must try to render with this prefix in following paths
+      if prefix != 'active_scaffold_overrides'
+        options[:prefixes] = lookup_context.prefixes.drop((lookup_context.prefixes.find_index(prefix) || -1) + 1)
+      else
+        options[:prefixes] = ['active_scaffold_overrides']
+        update_view_paths
+      end
+      options
+    end
+
+    def update_view_paths
+      last_view_path =
+        if @lookup_context # rails 6
+          File.expand_path(File.dirname(File.dirname(@lookup_context.last_template.short_identifier.to_s)), Rails.root)
+        else
+          File.expand_path(File.dirname(File.dirname(lookup_context.last_template.inspect)), Rails.root)
+        end
+      new_view_paths = view_paths.drop(view_paths.find_index { |path| path.to_s == last_view_path } + 1)
+      if @lookup_context # rails 6
+        if respond_to? :build_lookup_context # rails 6.0
+          build_lookup_context(new_view_paths)
+        else # rails 6.1
+          @lookup_context = ActionView::LookupContext.new(new_view_paths)
+        end
+      else
+        lookup_context.view_paths = new_view_paths
+      end
+    end
+
     def render_embedded(options)
       require 'digest/md5'
 
@@ -114,9 +146,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(/.*\//, '').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
@@ -133,5 +169,30 @@ module ActionView
     Base.class_eval do
       include ActiveScaffold::RenderingHelper
     end
+
+    if Gem.loaded_specs['rails'].version.segments.first >= 6
+      RenderingHelper.class_eval do
+        # override the render method to use our @lookup_context instead of the
+        # memoized @_lookup_context
+        def render(options = {}, locals = {}, &block)
+          case options
+          when Hash
+            in_rendering_context(options) do |_|
+              # previously set view paths and lookup context are lost here
+              # if you use view_renderer, so instead create a new renderer
+              # with our context
+              temp_renderer = ActionView::Renderer.new(@lookup_context)
+              if block_given?
+                temp_renderer.render_partial(self, options.merge(partial: options[:layout]), &block)
+              else
+                temp_renderer.render(self, options)
+              end
+            end
+          else
+            view_renderer.render_partial(self, partial: options, locals: locals, &block)
+          end
+        end
+      end
+    end
   end
 end

data/lib/active_scaffold/extensions/cow_proxy.rb

@@ -0,0 +1,95 @@
+require 'cow_proxy'
+
+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
+
+        def sort_by(options)
+          @sort = options
+        end
+      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 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 =~ /[!?]$/
+          subgroup =
+            if _instance_variable_defined?("@#{name}")
+              _instance_variable_get("@#{name}")
+            else
+              __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
+        end
+
+        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
+end