active_scaffold 3.4.43 → 3.5.0

data/lib/active_scaffold/config/create.rb

@@ -13,13 +13,14 @@ module ActiveScaffold::Config
     def self.link
       @@link
     end
+
     def self.link=(val)
       @@link = val
     end
     @@link = ActiveScaffold::DataStructures::ActionLink.new('new', :label => :create_new, :type => :collection, :security_method => :create_authorized?, :ignore_method => :create_ignore?)
 
     # whether update form is opened after a create or not
-    cattr_accessor :action_after_create
+    cattr_accessor :action_after_create, instance_accessor: false
     @@action_after_create = nil
 
     # instance-level configuration

data/lib/active_scaffold/config/delete.rb

@@ -11,11 +11,11 @@ module ActiveScaffold::Config
     # --------------------------
 
     # the ActionLink for this action
-    cattr_accessor :link
+    cattr_accessor :link, instance_accessor: false
     @@link = ActiveScaffold::DataStructures::ActionLink.new('destroy', :label => :delete, :type => :member, :confirm => :are_you_sure_to_delete, :method => :delete, :crud_type => :delete, :position => false, :parameters => {:destroy_action => true}, :security_method => :delete_authorized?, :ignore_method => :delete_ignore?)
 
     # whether we should refresh list after destroy or not
-    cattr_accessor :refresh_list
+    cattr_accessor :refresh_list, instance_accessor: false
     @@refresh_list = false
 
     # instance-level configuration

data/lib/active_scaffold/config/field_search.rb

@@ -11,7 +11,7 @@ module ActiveScaffold::Config
     # global level configuration
     # --------------------------
     # the ActionLink for this action
-    cattr_reader :link
+    cattr_reader :link, instance_accessor: false
     @@link = ActiveScaffold::DataStructures::ActionLink.new('show_search', :label => :search, :type => :collection, :security_method => :search_authorized?, :ignore_method => :field_search_ignore?)
 
     # A flag for how the search should do full-text searching in the database:
@@ -20,12 +20,12 @@ module ActiveScaffold::Config
     # * :end: LIKE %?
     # * false: LIKE ?
     # Default is :full
-    cattr_accessor :text_search
+    cattr_accessor :text_search, instance_accessor: false
     @@text_search = :full
 
     # human conditions
     # instead of just filtered you may show the user a humanized search condition statment
-    cattr_accessor :human_conditions
+    cattr_accessor :human_conditions, instance_accessor: false
     @@human_conditions = false
 
     # instance-level configuration
@@ -55,6 +55,12 @@ module ActiveScaffold::Config
       @optional_columns ||= []
     end
 
+    # add array of columns as options for group by to get aggregated listings
+    attr_accessor :group_options
+
+    # columns to display on aggregated listing
+    attr_accessor :grouped_columns
+
     # default search params
     # default_params = {:title => {"from"=>"test", "to"=>"", "opt"=>"%?%"}}
     attr_accessor :default_params

data/lib/active_scaffold/config/form.rb

@@ -13,14 +13,14 @@ module ActiveScaffold::Config
     # global level configuration
     # --------------------------
     # show value of unauthorized columns instead of skip them
-    class_attribute :show_unauthorized_columns
+    class_attribute :show_unauthorized_columns, instance_accessor: false
 
     # whether the form stays open after an update or not
-    cattr_accessor :persistent
+    class_attribute :persistent, instance_accessor: false
     @@persistent = false
 
     # whether we should refresh list after update or not
-    cattr_accessor :refresh_list
+    class_attribute :refresh_list, instance_accessor: false
     @@refresh_list = false
 
     # instance-level configuration
@@ -43,7 +43,7 @@ module ActiveScaffold::Config
 
     columns_accessor :columns do
       columns.exclude :created_on, :created_at, :updated_on, :updated_at, :as_marked
-      columns.exclude *@core.columns.collect { |c| c.name if c.polymorphic_association? }.compact
+      columns.exclude(*@core.columns.collect { |c| c.name if c.association.try(:polymorphic?) }.compact)
     end
 
     # whether the form should be multipart

data/lib/active_scaffold/config/list.rb

@@ -11,8 +11,8 @@ module ActiveScaffold::Config
       @page_links_outer_window = self.class.page_links_outer_window
 
       # originates here
-      @sorting = ActiveScaffold::DataStructures::Sorting.new(@core.columns)
-      @sorting.set_default_sorting(@core.model)
+      @sorting = ActiveScaffold::DataStructures::Sorting.new(@core.columns, @core.model)
+      @sorting.set_default_sorting
 
       # inherit from global scope
       @empty_field_text = self.class.empty_field_text
@@ -33,74 +33,74 @@ module ActiveScaffold::Config
     # global level configuration
     # --------------------------
     # include list header on refresh
-    cattr_accessor :refresh_with_header
+    cattr_accessor :refresh_with_header, instance_accessor: false
     @@refresh_with_header = false
 
     # how many records to show per page
-    cattr_accessor :per_page
+    cattr_accessor :per_page, instance_accessor: false
     @@per_page = 15
 
     # how many page links around current page to show
-    cattr_accessor :page_links_inner_window
+    cattr_accessor :page_links_inner_window, instance_accessor: false
     @@page_links_inner_window = 2
 
     # how many page links around first and last page to show
-    cattr_accessor :page_links_outer_window
+    cattr_accessor :page_links_outer_window, instance_accessor: false
     @@page_links_outer_window = 0
 
     # what string to use when a field is empty
-    cattr_accessor :empty_field_text
+    cattr_accessor :empty_field_text, instance_accessor: false
     @@empty_field_text = '-'
 
     # display messages above table header
-    cattr_accessor :messages_above_header
+    cattr_accessor :messages_above_header, instance_accessor: false
     @@messages_above_header = false
 
     # what string to use to join records from plural associations
-    cattr_accessor :association_join_text
+    cattr_accessor :association_join_text, instance_accessor: false
     @@association_join_text = ', '
 
     # What kind of pagination to use:
     # * true: The usual pagination
     # * :infinite: Treat the source as having an infinite number of pages (i.e. don't count the records; useful for large tables where counting is slow and we don't really care anyway)
     # * false: Disable pagination
-    cattr_accessor :pagination
+    cattr_accessor :pagination, instance_accessor: false
     @@pagination = true
 
     # Auto paginate, only can be used with pagination enabled
     # * true: First page will be loaded on first request, next pages will be requested by AJAX until all items are loaded
     # * false: Disable auto pagination
-    cattr_accessor :auto_pagination
+    cattr_accessor :auto_pagination, instance_accessor: false
     @@auto_pagination = false
 
     # show a link to reset the search next to filtered message
-    cattr_accessor :show_search_reset
+    cattr_accessor :show_search_reset, instance_accessor: false
     @@show_search_reset = true
 
     # the ActionLink to reset search
-    cattr_reader :reset_link
+    cattr_reader :reset_link, instance_reader: false
     @@reset_link = ActiveScaffold::DataStructures::ActionLink.new('index', :label => :click_to_reset, :type => :collection, :position => false, :parameters => {:search => ''})
 
     # wrap normal cells (not inplace editable columns or with link) with a tag
     # it allows for more css styling
-    cattr_accessor :wrap_tag
+    cattr_accessor :wrap_tag, instance_accessor: false
     @@wrap_tag = nil
 
     # Show search form in the list header instead of display the link
-    cattr_accessor :always_show_search
+    cattr_accessor :always_show_search, instance_accessor: false
     @@always_show_search = false
 
     # Show create form in the list header instead of display the link
-    cattr_accessor :always_show_create
+    cattr_accessor :always_show_create, instance_accessor: false
     @@always_show_create = false
 
     # Enable auto select columns on list, so only columns needed for list columns are selected
-    cattr_accessor :auto_select_columns
+    cattr_accessor :auto_select_columns, instance_accessor: false
     @@auto_select_columns = false
 
     # Enable ETag calculation (when conditional_get_support is enabled), it requires to load records for page, when is disabled query can be avoided when page is cached in browser
     # order clause will be used for ETag when calculate_etag is disabled, so query for records can be avoided
-    cattr_accessor :calculate_etag
+    cattr_accessor :calculate_etag, instance_accessor: false
     @@calculate_etag = false
 
     # instance-level configuration
@@ -152,11 +152,11 @@ module ActiveScaffold::Config
     # to just sort on one column, you can simply provide a hash, e.g. {:a => 'desc'}.
     def sorting=(val)
       val = [val] if val.is_a? Hash
-      sorting.set *val
+      sorting.set(*val)
     end
 
     def sorting
-      @sorting ||= ActiveScaffold::DataStructures::Sorting.new(@core.columns)
+      @sorting ||= ActiveScaffold::DataStructures::Sorting.new(@core.columns, @core.model)
     end
 
     # overwrite the includes used for the count sql query
@@ -180,7 +180,7 @@ module ActiveScaffold::Config
 
     attr_writer :always_show_search
     def always_show_search
-      @always_show_search && !search_partial.blank?
+      @always_show_search && search_partial.present?
     end
 
     def search_partial
@@ -228,7 +228,11 @@ module ActiveScaffold::Config
       attr_writer :label
       # This label has already been localized.
       def label
-        self['label'] || @label || @conf.label
+        self['label'] || embedded_label || @label || @conf.label
+      end
+
+      def embedded_label
+        @params[:embedded][:label] if @params[:embedded]
       end
 
       def per_page
@@ -266,7 +270,7 @@ module ActiveScaffold::Config
           self['sort'] = [@params['sort'], @params['sort_direction']] if @params['sort'] && @params['sort_direction']
           self['sort'] = nil if @params['sort_direction'] == 'reset'
 
-          if self['sort']
+          if self['sort'] && @conf.core.columns[self['sort'][0]]
             sorting = @conf.sorting.clone
             sorting.set(*self['sort'])
             @sorting = sorting

data/lib/active_scaffold/config/nested.rb

@@ -11,10 +11,10 @@ module ActiveScaffold::Config
 
     # global level configuration
     # --------------------------
-    cattr_accessor :shallow_delete
+    cattr_accessor :shallow_delete, instance_accessor: false
     @@shallow_delete = true
 
-    cattr_accessor :ignore_order_from_association
+    cattr_accessor :ignore_order_from_association, instance_accessor: false
 
     # instance-level configuration
     # ----------------------------
@@ -27,10 +27,10 @@ module ActiveScaffold::Config
       column = @core.columns[attribute.to_sym]
       if column && column.association
         label =
-          if column.polymorphic_association?
+          if column.association.polymorphic?
             column.label
           else
-            column.association.klass.model_name.human(:count => column.singular_association? ? 1 : 2, :default => column.association.klass.name.pluralize)
+            column.association.klass.model_name.human(:count => column.association.singular? ? 1 : 2, :default => column.association.klass.name.pluralize)
           end
         options.reverse_merge! :security_method => :nested_authorized?, :label => label
         action_group = options.delete(:action_group) || self.action_group

data/lib/active_scaffold/config/search.rb

@@ -12,7 +12,7 @@ module ActiveScaffold::Config
     # global level configuration
     # --------------------------
     # the ActionLink for this action
-    cattr_accessor :link
+    cattr_accessor :link, instance_accessor: false
     @@link = ActiveScaffold::DataStructures::ActionLink.new('show_search', :label => :search, :type => :collection, :security_method => :search_authorized?, :ignore_method => :search_ignore?)
 
     # A flag for how the search should do full-text searching in the database:
@@ -21,30 +21,30 @@ module ActiveScaffold::Config
     # * :end: LIKE %?
     # * false: LIKE ?
     # Default is :full
-    cattr_accessor :text_search
+    cattr_accessor :text_search, instance_accessor: false
     @@text_search = :full
 
     # whether submits the search as you type
-    cattr_writer :live
+    cattr_writer :live, instance_writer: false
     def self.live?
       @@live
     end
 
-    cattr_accessor :split_terms
+    cattr_accessor :split_terms, instance_accessor: false
     @@split_terms = ' '
 
     # instance-level configuration
     # ----------------------------
 
-    columns_accessor :columns
     # provides access to the list of columns specifically meant for the Search to use
     def columns
       # we want to delay initializing to the @core.columns set for as long as possible. Too soon and .search_sql will not be available to .searchable?
-      unless @columns
+      unless defined? @columns
         self.columns = @core.columns.collect { |c| c.name if @core.columns._inheritable.include?(c.name) && c.searchable? && c.association.nil? && c.text? }.compact
       end
       @columns
     end
+    columns_accessor :columns
 
     # A flag for how the search should do full-text searching in the database:
     # * :full: LIKE %?%

data/lib/active_scaffold/config/show.rb

@@ -1,14 +1,24 @@
 module ActiveScaffold::Config
   class Show < Base
     self.crud_type = :read
+    def initialize(core_config)
+      super
+      self.inline_links = self.class.inline_links
+    end
 
     # global level configuration
     # --------------------------
-    cattr_accessor :link
+    cattr_accessor :link, instance_accessor: false
     @@link = ActiveScaffold::DataStructures::ActionLink.new('show', :label => :show, :type => :member, :security_method => :show_authorized?, :ignore_method => :show_ignore?)
+
+    cattr_accessor :inline_links, instance_accessor: false
+    @@inline_links = false
+
     # instance-level configuration
     # ----------------------------
 
+    attr_accessor :inline_links
+
     # the ActionLink for this action
     attr_accessor :link
     # the label for this action. used for the header.

data/lib/active_scaffold/config/subform.rb

@@ -8,7 +8,7 @@ module ActiveScaffold::Config
     # global level configuration
     # --------------------------
 
-    cattr_accessor :layout
+    cattr_accessor :layout, instance_accessor: false
     @@layout = :horizontal
 
     # instance-level configuration

data/lib/active_scaffold/config/update.rb

@@ -12,19 +12,21 @@ module ActiveScaffold::Config
     def self.link
       @@link
     end
+
     def self.link=(val)
       @@link = val
     end
     @@link = ActiveScaffold::DataStructures::ActionLink.new('edit', :label => :edit, :type => :member, :security_method => :update_authorized?, :ignore_method => :update_ignore?)
 
+    cattr_accessor :nested_links, instance_accessor: false
+    @@nested_links = false
+
     columns_accessor :columns, :copy => :create
 
     # instance-level configuration
     # ----------------------------
 
     attr_accessor :nested_links
-    cattr_accessor :nested_links
-    @@nested_links = false
 
     attr_writer :hide_nested_column
     def hide_nested_column

data/lib/active_scaffold/constraints.rb

@@ -8,7 +8,7 @@ module ActiveScaffold
 
     # Returns the current constraints
     def active_scaffold_constraints
-      @active_scaffold_constraints ||= active_scaffold_session_storage['constraints'] || {}
+      @active_scaffold_constraints ||= active_scaffold_embedded_params[:constraints] || {}
     end
 
     # For each enabled action, adds the constrained columns to the ActionColumns object (if it exists).
@@ -17,9 +17,9 @@ module ActiveScaffold
     # If the constraint value is a Hash, then we assume the constraint is a multi-level association constraint (the reverse of a has_many :through) and we do NOT register the constraint column.
     def register_constraints_with_action_columns(constrained_fields = nil)
       constrained_fields ||= []
-      constrained_fields |= active_scaffold_constraints.reject { |_, v| v.is_a? Hash }.keys.collect(&:to_sym)
+      constrained_fields |= active_scaffold_constraints.reject { |_, v| params_hash?(v) }.keys.collect(&:to_sym)
       exclude_actions = []
-      [:list, :update].each do |action_name|
+      %i[list update].each do |action_name|
         if active_scaffold_config.actions.include? action_name
           exclude_actions << action_name unless active_scaffold_config.send(action_name).hide_nested_column
         end
@@ -51,26 +51,26 @@ module ActiveScaffold
           # example:
           #   data model: Park -> Den -> Bear
           #   constraint: :den => {:park => 5}
-          if v.is_a? Hash
+          if params_hash? v
             far_association = column.association.klass.reflect_on_association(v.keys.first)
             field = far_association.klass.primary_key
             table = far_association.table_name
 
             active_scaffold_references.concat([{k => far_association.name}]) # e.g. {:den => :park}
-            hash_conditions.merge!("#{table}.#{field}" => v.values.first)
+            hash_conditions.deep_merge!(table => {field => v.values.first})
 
           # association column constraint
           elsif column.association
-            if column.association.macro == :has_and_belongs_to_many
+            if column.association.habtm?
               active_scaffold_habtm_joins.concat column.includes
-            elsif !column.association.options[:polymorphic]
-              if column.association.macro == :belongs_to
+            elsif !column.association.polymorphic?
+              if column.association.belongs_to?
                 active_scaffold_preload.concat column.includes
               else
                 active_scaffold_references.concat column.includes
               end
             end
-            hash_conditions.merge!(condition_from_association_constraint(column.association, v))
+            hash_conditions.deep_merge!(condition_from_association_constraint(column.association, v))
 
           # regular column constraints
           elsif column.searchable? && params[column.name] != v
@@ -79,7 +79,7 @@ module ActiveScaffold
           end
         # unknown-to-activescaffold-but-real-database-column constraint
         elsif active_scaffold_config.model.columns_hash[k.to_s] && params[column.name] != v
-          hash_conditions.merge!(k => v)
+          hash_conditions.deep_merge!(k => v)
         else
           raise ActiveScaffold::MalformedConstraint, constraint_error(active_scaffold_config.model, k), caller
         end
@@ -96,33 +96,32 @@ module ActiveScaffold
       #
       # please see the relevant tests for concrete examples.
 
-      field =
-        if [:has_one, :has_many, :has_and_belongs_to_many].include?(association.macro)
-          association.klass.primary_key
-        else
-          association.options[:foreign_key] || association.name.to_s.foreign_key
+      field = if association.belongs_to?
+                association.foreign_key
+              else
+                association.klass.primary_key
         end
 
-      table = case association.macro
-        when :belongs_to then active_scaffold_config.model.table_name
-        else association.table_name
-      end
+      table = association.belongs_to? ? active_scaffold_config.model.table_name : association.table_name
 
-      if association.options[:primary_key]
-        value = association.klass.find(value).send(association.options[:primary_key])
+      if association.primary_key
+        value = association.klass.find(value).send(association.primary_key)
       end
 
-      condition = {"#{table}.#{field}" => value}
-      if association.options[:polymorphic]
-        raise ActiveScaffold::MalformedConstraint, polymorphic_constraint_error(association), caller unless params[:parent_model]
-        condition["#{table}.#{association.name}_type"] = params[:parent_model].constantize.to_s
+      if association.polymorphic?
+        unless value.is_a?(Array) && value.size == 2
+          raise ActiveScaffold::MalformedConstraint, polymorphic_constraint_error(association), caller
+        end
+        condition = {table => {association.foreign_type => value[0], field => value[1]}}
+      else
+        condition = {table => {field.to_s => value}}
       end
 
       condition
     end
 
     def polymorphic_constraint_error(association)
-      "Malformed constraint. You have added a constraint for #{association.name} polymorphic association but parent_model is not set."
+      "Malformed constraint. You have added a constraint for #{association.name} polymorphic association but value is not an array of class name and id."
     end
 
     def constraint_error(klass, column_name)
@@ -139,15 +138,19 @@ module ActiveScaffold
     # If it *is* ok (e.g. you're in a transaction), then set :allow_autosave to true.
     def apply_constraints_to_record(record, options = {})
       options[:allow_autosave] = false if options[:allow_autosave].nil?
+      constraints = options[:constraints] || active_scaffold_constraints
 
-      active_scaffold_constraints.each do |k, v|
-        column = active_scaffold_config.columns[k]
+      config = record.is_a?(active_scaffold_config.model) ? active_scaffold_config : active_scaffold_config_for(record.class)
+      constraints.each do |k, v|
+        column = config.columns[k]
         if column && column.association
-          if column.plural_association?
-            record.send("#{k}").send(:<<, column.association.klass.find(v))
-          elsif column.association.options[:polymorphic]
-            raise ActiveScaffold::MalformedConstraint, polymorphic_constraint_error(column.association), caller unless params[:parent_model]
-            record.send("#{k}=", params[:parent_model].constantize.find(v))
+          if column.association.collection?
+            record.send(k.to_s).send(:<<, column.association.klass.find(v))
+          elsif column.association.polymorphic?
+            unless v.is_a?(Array) && v.size == 2
+              raise ActiveScaffold::MalformedConstraint, polymorphic_constraint_error(column.association), caller
+            end
+            record.send("#{k}=", v[0].constantize.find(v[1]))
           else # regular singular association
             record.send("#{k}=", column.association.klass.find(v))
 
@@ -156,9 +159,9 @@ module ActiveScaffold
             #
             # note that we can't take the extra step to correct this unless we're permitted to
             # run operations where activerecord auto-saves the object.
-            reverse = column.association.klass.reflect_on_association(column.association.reverse)
-            if reverse.macro == :has_one && options[:allow_autosave]
-              record.send(k).send("#{column.association.reverse}=", record)
+            reverse = column.association.reverse_association
+            if reverse.singular? && !reverse.belongs_to? && options[:allow_autosave]
+              record.send(k).send("#{reverse.name}=", record)
             end
           end
         else