active_scaffold 3.7.12 → 4.0.0.rc1

data/lib/active_scaffold/config/search.rb

@@ -14,7 +14,7 @@ module ActiveScaffold::Config
     # --------------------------
     # the ActionLink for this action
     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?)
+    @@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:
     # * :full: LIKE %?%
@@ -43,7 +43,7 @@ module ActiveScaffold::Config
     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 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
+        self.columns = @core.columns.filter_map { |c| c.name if @core.columns._inheritable.include?(c.name) && c.searchable? && c.association.nil? && c.text? }
       end
       @columns
     end
@@ -57,21 +57,21 @@ module ActiveScaffold::Config
     # Default is :full
     attr_accessor :text_search
 
-    attr_accessor :split_terms
-
-    attr_accessor :reset_form
+    attr_accessor :split_terms, :reset_form
 
     # the ActionLink for this action
     attr_accessor :link
 
     # whether submits the search as you type
     attr_writer :live
+
     def live?
       @live
     end
 
     UserSettings.class_eval do
       attr_writer :live
+
       def live?
         defined?(@live) ? @live : @conf.live?
       end

data/lib/active_scaffold/config/show.rb

@@ -9,7 +9,7 @@ module ActiveScaffold::Config
     # global level configuration
     # --------------------------
     cattr_accessor :link, instance_accessor: false
-    @@link = ActiveScaffold::DataStructures::ActionLink.new('show', :label => :show, :type => :member, :security_method => :show_authorized?, :ignore_method => :show_ignore?)
+    @@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

data/lib/active_scaffold/config/subform.rb

@@ -16,6 +16,6 @@ module ActiveScaffold::Config
 
     attr_accessor :layout
 
-    columns_accessor :columns, :copy => :update
+    columns_accessor :columns, copy: :update
   end
 end

data/lib/active_scaffold/config/update.rb

@@ -17,7 +17,7 @@ module ActiveScaffold::Config
     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?)
+    @@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
@@ -25,16 +25,15 @@ module ActiveScaffold::Config
     cattr_accessor :add_locking_column, instance_accessor: false
     @@add_locking_column = true
 
-    columns_accessor :columns, :copy => :create
+    columns_accessor :columns, copy: :create
 
     # instance-level configuration
     # ----------------------------
 
-    attr_accessor :nested_links
-
-    attr_accessor :add_locking_column
+    attr_accessor :nested_links, :add_locking_column
 
     attr_writer :hide_nested_column
+
     def hide_nested_column
       @hide_nested_column.nil? ? true : @hide_nested_column
     end

data/lib/active_scaffold/configurable.rb

@@ -9,6 +9,7 @@ module ActiveScaffold
   module Configurable
     def configure(&configuration_block)
       return unless configuration_block
+
       @configuration_binding = configuration_block.binding.eval('self')
       ret = instance_exec(self, &configuration_block)
       @configuration_binding = nil
@@ -16,7 +17,7 @@ module ActiveScaffold
     end
 
     def method_missing(name, *args)
-      if @configuration_binding&.respond_to?(name, true)
+      if @configuration_binding&.respond_to?(name, true) # rubocop:disable Lint/RedundantSafeNavigation
         @configuration_binding.send(name, *args)
       else
         super

data/lib/active_scaffold/constraints.rb

@@ -13,6 +13,7 @@ module ActiveScaffold
 
     def columns_from_constraint(column_name, value)
       return if params_hash?(value)
+
       if value.is_a?(Array)
         column = active_scaffold_config.columns[column_name]
         if column&.association&.polymorphic?
@@ -37,16 +38,18 @@ module ActiveScaffold
       constrained_fields |= active_scaffold_constraints.flat_map { |k, v| columns_from_constraint(k, v) }.compact
       exclude_actions = []
       %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
+        if active_scaffold_config.actions.include?(action_name) && !active_scaffold_config.send(action_name).hide_nested_column
+          exclude_actions << action_name
         end
       end
 
       # we actually want to do this whether constrained_fields exist or not, so that we can reset the array when they don't
       active_scaffold_config.actions.each do |action_name|
         next if exclude_actions.include?(action_name)
+
         action = active_scaffold_config.send(action_name)
         next unless action.respond_to? :columns
+
         action.columns.constraint_columns = constrained_fields
       end
     end
@@ -67,13 +70,13 @@ module ActiveScaffold
           # Assume this is a multi-level association constraint.
           # example:
           #   data model: Park -> Den -> Bear
-          #   constraint: :den => {:park => 5}
+          #   constraint: den: {park: 5}
           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}
+            active_scaffold_references.push({k => far_association.name}) # e.g. {den: :park}
             hash_conditions.deep_merge!(table => {field => v.values.first})
 
           # association column constraint
@@ -93,7 +96,7 @@ module ActiveScaffold
           raise ActiveScaffold::MalformedConstraint, constraint_error(active_scaffold_config.model, k), caller
         end
       end
-      conditions.reject(&:blank?)
+      conditions.compact_blank
     end
 
     def join_from_association_constraint(column)
@@ -131,7 +134,8 @@ module ActiveScaffold
         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.size == 2 ? value[1] : value[1..-1]}}
+
+        condition = {table => {association.foreign_type => value[0], field => value.size == 2 ? value[1] : value[1..]}}
       else
         condition = {table => {field.to_s => value}}
       end
@@ -169,14 +173,15 @@ module ActiveScaffold
             unless v.is_a?(Array) && v.size >= 2
               raise ActiveScaffold::MalformedConstraint, polymorphic_constraint_error(column.association), caller
             end
+
             if v.size == 2
-              record.send("#{k}=", v[0].constantize.find(v[1]))
+              record.send(:"#{k}=", v[0].constantize.find(v[1]))
             else
-              record.send("#{column.association.foreign_type}=", v[0])
+              record.send(:"#{column.association.foreign_type}=", v[0])
             end
           elsif !column.association.source_reflection&.options&.include?(:through) && # regular singular association, or one-level through association
                 !v.is_a?(Array)
-            record.send("#{k}=", column.association.klass.find(v))
+            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
             # specified, rails won't automatically clear out the previous associated record.
@@ -185,11 +190,11 @@ module ActiveScaffold
             # run operations where activerecord auto-saves the object.
             reverse = column.association.reverse_association
             if reverse&.singular? && !reverse.belongs_to? && options[:allow_autosave]
-              record.send(k).send("#{reverse.name}=", record)
+              record.send(k).send(:"#{reverse.name}=", record)
             end
           end
         else
-          record.send("#{k}=", v)
+          record.send(:"#{k}=", v)
         end
       end
     end

data/lib/active_scaffold/core.rb

@@ -7,21 +7,12 @@ module ActiveScaffold
     def setup_user_settings
       config = self.class.active_scaffold_config
       config.new_user_settings(user_settings_storage, params)
-      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
       @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
+        self.class.active_scaffold_config.user
       end
     end
 
@@ -33,7 +24,6 @@ module ActiveScaffold
     def active_scaffold_session_storage(id = nil)
       session_index = active_scaffold_session_storage_key(id)
       session[session_index] ||= {}
-      session[session_index]
     end
 
     def user_settings_storage
@@ -83,7 +73,7 @@ module ActiveScaffold
           active_scaffold_config.actions.each do |mod|
             include "ActiveScaffold::Actions::#{mod.to_s.camelize}".constantize
             mod_conf = active_scaffold_config.send(mod)
-            active_scaffold_config._setup_action(mod) if ActiveScaffold.threadsafe
+            active_scaffold_config._setup_action(mod)
             next unless mod_conf.respond_to?(:link) && (link = mod_conf.link)
 
             # sneak the action links from the actions into the main set
@@ -97,13 +87,12 @@ module ActiveScaffold
           end
         end
         _add_sti_create_links if active_scaffold_config.add_sti_create_links?
-        return unless ActiveScaffold.threadsafe
         active_scaffold_config._cache_lazy_values
         active_scaffold_config.deep_freeze!
       end
 
       module Prefixes
-        define_method 'local_prefixes' do
+        define_method :local_prefixes do
           @local_prefixes ||= begin
             prefixes = super()
             unless superclass.uses_active_scaffold? || prefixes.include?('active_scaffold_overrides')
@@ -118,11 +107,12 @@ module ActiveScaffold
       def _add_sti_create_links
         new_action_link = active_scaffold_config.action_links.collection['new']
         return if new_action_link.nil? || active_scaffold_config.sti_children.empty?
+
         active_scaffold_config.action_links.collection.delete('new')
         active_scaffold_config.sti_children.each do |child|
           new_sti_link = Marshal.load(Marshal.dump(new_action_link)) # deep clone
-          new_sti_link.label = as_(:create_model, :model => child.to_s.camelize.constantize.model_name.human)
-          new_sti_link.parameters = {:parent_sti => controller_path}
+          new_sti_link.label = as_(:create_model, model: child.to_s.camelize.constantize.model_name.human)
+          new_sti_link.parameters = {parent_sti: controller_path}
           new_sti_link.controller = proc { active_scaffold_controller_for(child.to_s.camelize.constantize).controller_path }
           active_scaffold_config.action_links.collection.create.add(new_sti_link)
         end
@@ -132,8 +122,10 @@ module ActiveScaffold
       # 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|
           next unless column.link.nil? && column.autolink?
+
           # lazy load of action_link, cause it was really slowing down app in dev mode
           # and might lead to trouble cause of cyclic constantization of controllers
           # and might be unnecessary cause it is done before columns are configured
@@ -155,12 +147,13 @@ module ActiveScaffold
 
       def link_for_association(column, options = {})
         return if (controller = active_scaffold_controller_for_column(column, options)).nil?
-        options.reverse_merge! :position => :after, :type => :member, :column => column,
-                               :controller => (controller == :polymorph ? controller : "/#{controller.controller_path}")
+
+        options.reverse_merge! position: :after, type: :member, column: column,
+                               controller: (controller == :polymorph ? controller : "/#{controller.controller_path}")
         options[:parameters] ||= {}
-        options[:parameters].reverse_merge! :association => column.association.name
+        options[:parameters].reverse_merge! association: column.association.name
         if column.association.collection?
-          ActiveScaffold::DataStructures::ActionLink.new('index', options.merge(:refresh_on_close => true))
+          ActiveScaffold::DataStructures::ActionLink.new('index', options.merge(refresh_on_close: true))
         else
           actions = controller.active_scaffold_config.actions unless controller == :polymorph
           actions ||= %i[create update show]
@@ -175,9 +168,9 @@ module ActiveScaffold
       end
 
       def link_for_association_as_scope(scope, options = {})
-        options.reverse_merge! :label => scope, :position => :after, :type => :member, :controller => controller_path
+        options.reverse_merge! label: scope, position: :after, type: :member, controller: controller_path
         options[:parameters] ||= {}
-        options[:parameters].reverse_merge! :named_scope => scope
+        options[:parameters].reverse_merge! named_scope: scope
         ActiveScaffold::DataStructures::ActionLink.new('index', options)
       end
 
@@ -185,7 +178,7 @@ module ActiveScaffold
         as_path = File.realpath File.join(ActiveScaffold::Config::Core.plugin_directory, 'app', 'views')
         index = view_paths.find_index { |p| p.to_s == as_path }
         if index
-          self.view_paths = view_paths[0..index - 1] + Array(path) + view_paths[index..-1]
+          self.view_paths = view_paths[0..index - 1] + Array(path) + view_paths[index..]
         else
           append_view_path path
         end
@@ -219,8 +212,9 @@ module ActiveScaffold
 
       def active_scaffold_controller_for(klass)
         return self if uses_active_scaffold? && klass == active_scaffold_config.model
+
         # noinspection RubyArgCount
-        ActiveScaffold::Core.active_scaffold_controller_for(klass, to_s.deconstantize + '::')
+        ActiveScaffold::Core.active_scaffold_controller_for(klass, "#{to_s.deconstantize}::")
       end
 
       def uses_active_scaffold?
@@ -238,9 +232,10 @@ module ActiveScaffold
         class_names.each do |controller_name|
           begin
             controller = "#{namespace}#{controller_name.camelize}Controller".constantize
-          rescue NameError => error
+          rescue NameError => e
             # Only rescue NameError associated with the controller constant not existing - not other compile errors
-            raise unless error.message["uninitialized constant #{controller}"]
+            raise unless e.message["uninitialized constant #{controller}"]
+
             error_message << "#{namespace}#{controller_name.camelize}Controller"
             next
           end
@@ -248,10 +243,11 @@ module ActiveScaffold
           unless controller.active_scaffold_config.model.to_s == klass.to_s
             raise ActiveScaffold::ControllerNotFound, "ActiveScaffold on #{controller} is not for #{klass} model.", caller
           end
+
           return controller
         end
       end
-      raise ActiveScaffold::ControllerNotFound, 'Could not find ' + error_message.join(' or '), caller
+      raise ActiveScaffold::ControllerNotFound, "Could not find #{error_message.join(' or ')}", caller
     end
 
     def self.column_type_cast(value, column)
@@ -268,11 +264,13 @@ module ActiveScaffold
 
     def self.mongoid_column_type_cast(value, column)
       return Time.zone.at(value.to_i) if [Time, DateTime].include?(column.type) && value =~ /\A\d+\z/
+
       column.type.evolve value
     end
 
     def self.active_record_column_type_cast(value, column_or_type)
       return Time.zone.at(value.to_i) if %i[time datetime].include?(column_or_type.type) && value =~ /\A\d+\z/
+
       cast_type = column_or_type.is_a?(ActiveRecord::ConnectionAdapters::Column) ? ActiveRecord::Type.lookup(column_or_type.type) : column_or_type
       cast_type ? cast_type.cast(value) : value
     end

data/lib/active_scaffold/data_structures/action_columns.rb

@@ -9,6 +9,11 @@ module ActiveScaffold::DataStructures
 
     # labels are useful for the Create/Update forms, when we display columns in a grouped fashion and want to name them separately
     attr_writer :label
+
+    # a common column in the association columns included in the group, used to group the records from the
+    # association columns and split them in tabs
+    attr_accessor :tabbed_by
+
     def label
       as_(@label) if @label
     end
@@ -22,7 +27,7 @@ module ActiveScaffold::DataStructures
     end
 
     # this is so that array.delete and array.include?, etc., will work by column name
-    def ==(other) #:nodoc:
+    def ==(other) # :nodoc:
       # another ActionColumns
       if other.class == self.class
         label == other.label
@@ -59,6 +64,7 @@ module ActiveScaffold::DataStructures
     def skip_column?(column_name, options)
       # skip if this matches a constrained column
       return true if constraint_columns.include?(column_name.to_sym)
+
       # skip this field if it's not authorized
       unless options[:for].authorized_for?(action: options[:action], crud_type: options[:crud_type] || action&.crud_type || :read, column: column_name)
         unauthorized_columns << column_name.to_sym
@@ -68,7 +74,7 @@ module ActiveScaffold::DataStructures
     end
 
     def each_column(options = {}, &proc)
-      columns = options[:core_columns] || action.core.columns
+      columns = options[:core_columns] || (action.core.user || action.core).columns
       self.unauthorized_columns = []
       options[:for] ||= columns.active_record_class
 
@@ -81,6 +87,7 @@ module ActiveScaffold::DataStructures
           end
         else
           next if skip_column?(item, options)
+
           yield columns[item] || ActiveScaffold::DataStructures::Column.new(item.to_sym, columns.active_record_class)
         end
       end
@@ -134,7 +141,7 @@ module ActiveScaffold::DataStructures
 
     # called during clone or dup. makes the clone/dup deeper.
     def initialize_copy(from)
-      @set = from.instance_variable_get('@set').clone
+      @set = from.instance_variable_get(:@set).clone
     end
   end
 end

data/lib/active_scaffold/data_structures/action_link.rb

@@ -59,8 +59,10 @@ module ActiveScaffold::DataStructures
 
     # a hash of request parameters
     attr_writer :parameters
+
     def parameters
       return @parameters || NO_OPTIONS if frozen?
+
       @parameters ||= NO_OPTIONS.dup
     end
 
@@ -77,6 +79,7 @@ module ActiveScaffold::DataStructures
 
     # what string to use to represent this action
     attr_writer :label
+
     def label(record = nil)
       case @label
       when Symbol
@@ -88,7 +91,7 @@ module ActiveScaffold::DataStructures
       end
     end
 
-    # image to use {:name => 'arrow.png', :size => '16x16'}
+    # image to use {name: 'arrow.png', size: '16x16'}
     attr_accessor :image
 
     # if the action requires confirmation
@@ -99,6 +102,7 @@ module ActiveScaffold::DataStructures
 
     def confirm(label = '')
       return @confirm if !confirm? || @confirm.is_a?(String)
+
       ActiveScaffold::Registry.cache(:translations, @confirm) { as_(@confirm) } % {label: label}
     end
 
@@ -108,6 +112,7 @@ module ActiveScaffold::DataStructures
 
     # if the action uses a DHTML based (i.e. 2-phase) confirmation
     attr_reader :dhtml_confirm
+
     def dhtml_confirm=(value)
       @confirm = nil if value
       @dhtml_confirm = value
@@ -121,6 +126,7 @@ module ActiveScaffold::DataStructures
     # if method return false, link will be disabled
     # note that this is only the UI part of the security. to prevent URL hax0rz, you also need security on requests (e.g. don't execute update method unless authorized).
     attr_writer :security_method
+
     def security_method
       @security_method || "#{action}_authorized?"
     end
@@ -137,7 +143,7 @@ module ActiveScaffold::DataStructures
     attr_accessor :ignore_method
 
     # the crud type of the (eventual?) action. different than :method, because this crud action may not be imminent.
-    # this is used to determine record-level authorization (e.g. record.authorized_for?(:crud_type => link.crud_type).
+    # this is used to determine record-level authorization (e.g. record.authorized_for?(crud_type: link.crud_type).
     # options are :create, :read, :update, and :delete
     attr_accessor :crud_type
 
@@ -157,6 +163,7 @@ module ActiveScaffold::DataStructures
     def popup=(val)
       @popup = (val == true)
       return unless @popup
+
       self.inline = self.page = false
 
       # the :method parameter doesn't mix with the :popup parameter
@@ -180,23 +187,22 @@ module ActiveScaffold::DataStructures
     end
 
     # where the result of this action should insert in the display.
-    # for :type => :collection, supported values are:
+    # for type: :collection, supported values are:
     #   :top
-    #   :replace (to hide the entire table)
-    #   :popup (popup with JS library)
+    #   :replace (for updating the entire table)
     #   false (no attempt at positioning)
-    # for :type => :member, supported values are:
+    # for type: :member, supported values are:
     #   :before
-    #   :replace (to hide the record row)
+    #   :replace
     #   :after
-    #   :table (to hide the entire table)
-    #   :popup (popup with JS library)
     #   false (no attempt at positioning)
     attr_writer :position
+
     def position
       return @position unless @position.nil? || @position == true
       return :replace if type == :member
       return :top if type == :collection
+
       raise "what should the default position be for #{type}?"
     end
 
@@ -205,8 +211,10 @@ module ActiveScaffold::DataStructures
 
     # html options for the link
     attr_writer :html_options
+
     def html_options
       return @html_options || NO_OPTIONS if frozen?
+
       @html_options ||= NO_OPTIONS.dup
     end
 
@@ -215,6 +223,7 @@ module ActiveScaffold::DataStructures
 
     # don't close the panel when another action link is open
     attr_writer :keep_open
+
     def keep_open?
       @keep_open
     end
@@ -231,6 +240,7 @@ module ActiveScaffold::DataStructures
 
     def name_to_cache
       return @name_to_cache if defined? @name_to_cache
+
       [
         controller || 'self',
         type,

data/lib/active_scaffold/data_structures/action_links.rb

@@ -34,12 +34,6 @@ module ActiveScaffold::DataStructures
     end
     alias << add
 
-    def add_separator(weight = 0)
-      raise 'Call add_separator on a group' if name == :root
-
-      add_to_set ActionLinkSeparator.new(weight)
-    end
-
     def add_to_set(link)
       @set << link
     end
@@ -57,8 +51,6 @@ module ActiveScaffold::DataStructures
     def [](val)
       links = []
       @set.each do |item|
-        next if item == :separator
-
         if item.is_a?(ActiveScaffold::DataStructures::ActionLinks)
           collected = item[val]
           links << collected unless collected.nil?
@@ -72,8 +64,6 @@ module ActiveScaffold::DataStructures
     def find_duplicate(link)
       links = []
       @set.each do |item|
-        next if item == :separator
-
         if item.is_a?(ActiveScaffold::DataStructures::ActionLinks)
           collected = item.find_duplicate(link)
           links << collected unless collected.nil?
@@ -86,8 +76,6 @@ module ActiveScaffold::DataStructures
 
     def delete(val)
       each(include_set: true) do |link, set|
-        next if link == :separator
-
         if link.action.to_s == val.to_s
           set.delete link
           break
@@ -98,6 +86,7 @@ module ActiveScaffold::DataStructures
     def delete_group(name)
       @set.each do |group|
         next unless group.is_a?(ActiveScaffold::DataStructures::ActionLinks)
+
         if group.name == name
           @set.delete group
           break
@@ -121,6 +110,12 @@ module ActiveScaffold::DataStructures
       end
     end
 
+    def collect_by_type(type = nil)
+      links = []
+      subgroup(type).each(type) { |link| links << link }
+      links
+    end
+
     def collect
       @set
     end
@@ -136,6 +131,8 @@ module ActiveScaffold::DataStructures
       end
 
       if group.nil?
+        raise "Can't add new subgroup '#{name}', links are frozen" if frozen?
+
         group = ActiveScaffold::DataStructures::ActionLinks.new(name)
         group.label = label || name
         group.default_type = self.name == :root ? (name.to_sym if %w[member collection].include?(name.to_s)) : default_type
@@ -145,6 +142,7 @@ module ActiveScaffold::DataStructures
     end
 
     attr_writer :label
+
     def label(record)
       case @label
       when Symbol
@@ -157,13 +155,15 @@ module ActiveScaffold::DataStructures
     end
 
     def method_missing(name, *args, &block)
-      return super if name.match?(/[!?]$/)
+      return super if name.match?(/[=!?]$/)
+      return subgroup(name.to_sym, args.first, &block) if frozen?
+
       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
+        def #{name}(label = nil)                     # def group_name(label = nil)
+          @#{name} ||= subgroup(:'#{name}', label)   #   @group_name ||= subgroup(:'group_name', label)
+          yield @#{name} if block_given?             #   yield @group_name if block_given?
+          @#{name}                                   #   @group_name
+        end                                          # end
       METHOD
       send(name, args.first, &block)
     end
@@ -173,20 +173,14 @@ module ActiveScaffold::DataStructures
     end
 
     attr_reader :name
-    attr_accessor :weight
-    attr_accessor :css_class
-
-    def name=(value)
-      self.css_class = value
-    end
-    ActiveScaffold.deprecator.deprecate_methods(self, :name= => :css_class=)
+    attr_accessor :weight, :css_class
 
     protected
 
     # called during clone or dup. makes the clone/dup deeper.
     def initialize_copy(from)
       @set = []
-      from.instance_variable_get('@set').each { |link| @set << link.clone }
+      from.instance_variable_get(:@set).each { |link| @set << link.clone }
     end
   end
 end