active_scaffold 3.4.43 → 3.5.0

data/lib/active_scaffold/bridges/paperclip/list_ui.rb

@@ -2,7 +2,7 @@ module ActiveScaffold
   module Helpers
     module ListColumnHelpers
       def active_scaffold_column_paperclip(record, column)
-        paperclip = record.send("#{column.name}")
+        paperclip = record.send(column.name.to_s)
         return nil unless paperclip.file?
         content =
           if paperclip.styles.include?(ActiveScaffold::Bridges::Paperclip::PaperclipBridgeHelpers.thumbnail_style)

data/lib/active_scaffold/bridges/paperclip/paperclip_bridge.rb

@@ -2,8 +2,8 @@ module ActiveScaffold
   module Bridges
     class Paperclip
       module PaperclipBridge
-        def initialize_with_paperclip(model_id)
-          initialize_without_paperclip(model_id)
+        def initialize(model_id)
+          super
           return unless model.respond_to?(:attachment_definitions) && !model.attachment_definitions.nil?
 
           update.multipart = true
@@ -16,10 +16,6 @@ module ActiveScaffold
           end
         end
 
-        def self.included(base)
-          base.alias_method_chain :initialize, :paperclip
-        end
-
         private
 
         def configure_paperclip_field(field)
@@ -27,7 +23,7 @@ module ActiveScaffold
           columns[field].form_ui ||= :paperclip
           columns[field].params.add "delete_#{field}"
 
-          [:file_name, :content_type, :file_size, :updated_at].each do |f|
+          %i[file_name content_type file_size updated_at].each do |f|
             columns.exclude("#{field}_#{f}".to_sym)
           end
         end

data/lib/active_scaffold/bridges/record_select.rb

@@ -2,9 +2,11 @@ class ActiveScaffold::Bridges::RecordSelect < ActiveScaffold::DataStructures::Br
   def self.install
     require File.join(File.dirname(__FILE__), 'record_select/helpers.rb')
   end
+
   def self.stylesheets
     'record_select'
   end
+
   def self.javascripts
     'record_select'
   end

data/lib/active_scaffold/bridges/record_select/helpers.rb

@@ -11,13 +11,11 @@ class ActiveScaffold::Bridges::RecordSelect
       # requires RecordSelect plugin to be installed and configured.
       def active_scaffold_input_record_select(column, options)
         record = options.delete(:object)
-        ActiveSupport::Deprecation.warn 'Relying on @record is deprecated, include :object in html_options with record.', caller if record.nil? # TODO: Remove when relying on @record is removed
-        record ||= @record # TODO: Remove when relying on @record is removed
-        if column.singular_association?
+        if column.association.try(:singular?)
           multiple = false
-          multiple = column.options[:html_options][:multiple] if column.options[:html_options] &&  column.options[:html_options][:multiple]
+          multiple = column.options[:html_options][:multiple] if column.options[:html_options] && column.options[:html_options][:multiple]
           active_scaffold_record_select(record, column, options, record.send(column.name), multiple)
-        elsif column.plural_association?
+        elsif column.association.try(:collection?)
           active_scaffold_record_select(record, column, options, record.send(column.name), true)
         else
           active_scaffold_record_select_autocomplete(record, column, options)
@@ -29,7 +27,7 @@ class ActiveScaffold::Bridges::RecordSelect
           raise ArgumentError, "record_select can only work against associations (and #{column.name} is not).  A common mistake is to specify the foreign key field (like :user_id), instead of the association (:user)."
         end
         klass =
-          if column.polymorphic_association?
+          if column.association.polymorphic?
             record.send(column.association.foreign_type).constantize rescue nil
           else
             column.association.klass
@@ -40,8 +38,8 @@ class ActiveScaffold::Bridges::RecordSelect
 
         # if the opposite association is a :belongs_to (in that case association in this class must be has_one or has_many)
         # then only show records that have not been associated yet
-        if [:has_one, :has_many].include?(column.association.macro)
-          params.merge!(column.association.foreign_key => '')
+        if column.association.has_one? || column.association.has_many?
+          params[column.association.foreign_key] = ''
         end
 
         record_select_options = active_scaffold_input_text_options(options).merge(
@@ -51,7 +49,7 @@ class ActiveScaffold::Bridges::RecordSelect
 
         html =
           if multiple
-            record_multi_select_field(options[:name], value || [], record_select_options)
+            record_multi_select_field(options[:name], value || [], record_select_options.except(:required))
           else
             record_select_field(options[:name], value || klass.new, record_select_options)
           end
@@ -71,18 +69,16 @@ class ActiveScaffold::Bridges::RecordSelect
 
     module SearchColumnHelpers
       def active_scaffold_search_record_select(column, options)
-        value = field_search_record_select_value(column)
+        value = field_search_record_select_value(column, options[:value])
         active_scaffold_record_select(options[:object], column, options, value, column.options[:multiple])
       end
 
-      def field_search_record_select_value(column)
-        value = field_search_params[column.name]
-        unless value.blank?
-          if column.options[:multiple]
-            column.association.klass.find value.collect!(&:to_i)
-          else
-            column.association.klass.find(value.to_i)
-          end
+      def field_search_record_select_value(column, value)
+        return if value.blank?
+        if column.options[:multiple]
+          column.association.klass.find value.collect!(&:to_i)
+        else
+          column.association.klass.find(value.to_i)
         end
       rescue StandardError => e
         logger.error "#{e.class.name}: #{e.message} -- Sorry, we are not that smart yet. Attempted to restore search values to search fields :#{column.name} in #{controller.class}"

data/lib/active_scaffold/bridges/semantic_attributes/column.rb

@@ -1,20 +1,16 @@
 class ActiveScaffold::Bridges::SemanticAttributes
   module Column
-    def self.included(base)
-      base.class_eval { alias_method_chain :initialize, :semantic_attributes }
-    end
-
-    def initialize_with_semantic_attributes(name, active_record_class)
-      initialize_without_semantic_attributes(name, active_record_class)
+    def initialize(name, active_record_class)
+      super
       self.required = !active_record_class.semantic_attributes[self.name].predicates.find { |p| p.allow_empty? == false }.nil?
       active_record_class.semantic_attributes[self.name].predicates.find do |p|
         sem_type = p.class.to_s.split('::')[1].underscore.to_sym
-        next if [:required, :association].include?(sem_type)
+        next if %i[required association].include?(sem_type)
         @form_ui = sem_type
       end
     end
   end
 end
 ActiveScaffold::DataStructures::Column.class_eval do
-  include ActiveScaffold::Bridges::SemanticAttributes::Column
+  prepend ActiveScaffold::Bridges::SemanticAttributes::Column
 end

data/lib/active_scaffold/bridges/shared/date_bridge.rb

@@ -12,7 +12,7 @@ module ActiveScaffold
             tags << active_scaffold_search_date_bridge_trend_tag(column, options, current_search)
             tags << active_scaffold_search_date_bridge_numeric_tag(column, options, current_search)
             tags << active_scaffold_search_date_bridge_range_tag(column, options, current_search)
-            tags.join('&nbsp;').html_safe
+            safe_join tags, '&nbsp;'.html_safe
           end
 
           def active_scaffold_search_date_bridge_comparator_options(column)
@@ -70,7 +70,7 @@ module ActiveScaffold
           end
 
           def column_datetime?(column)
-            (!column.column.nil? && [:datetime, :time].include?(column.column.type))
+            (!column.column.nil? && %i[datetime time].include?(column.column.type))
           end
         end
 
@@ -141,7 +141,7 @@ module ActiveScaffold
                 values.collect!(&conversion) if conversion != :to_time
                 values
               else
-                %w(from to).collect { |field| condition_value_for_datetime(column, value[field], conversion) }
+                %w[from to].collect { |field| condition_value_for_datetime(column, value[field], conversion) }
               end
             end
 
@@ -152,41 +152,41 @@ module ActiveScaffold
             def date_bridge_from_to_for_trend(column, value)
               case value['opt']
               when 'PAST'
-                trend_number = [value['number'].to_i,  1].max
+                trend_number = [value['number'].to_i, 1].max
                 now = date_bridge_now
                 if date_bridge_column_date?(column)
-                  from = now.beginning_of_day.ago((trend_number).send(value['unit'].downcase.singularize.to_sym))
+                  from = now.beginning_of_day.ago(trend_number.send(value['unit'].downcase.singularize.to_sym))
                   to = now.end_of_day
                 else
-                  from = now.ago((trend_number).send(value['unit'].downcase.singularize.to_sym))
+                  from = now.ago(trend_number.send(value['unit'].downcase.singularize.to_sym))
                   to = now
                 end
-                return from, to
+                [from, to]
               when 'FUTURE'
-                trend_number = [value['number'].to_i,  1].max
+                trend_number = [value['number'].to_i, 1].max
                 now = date_bridge_now
                 if date_bridge_column_date?(column)
                   from = now.beginning_of_day
-                  to = now.end_of_day.in((trend_number).send(value['unit'].downcase.singularize.to_sym))
+                  to = now.end_of_day.in(trend_number.send(value['unit'].downcase.singularize.to_sym))
                 else
                   from = now
-                  to = now.in((trend_number).send(value['unit'].downcase.singularize.to_sym))
+                  to = now.in(trend_number.send(value['unit'].downcase.singularize.to_sym))
                 end
-                return from, to
+                [from, to]
               end
             end
 
             def date_bridge_from_to_for_range(column, value)
               case value['range']
               when 'TODAY'
-                return date_bridge_now.beginning_of_day, date_bridge_now.end_of_day
+                [date_bridge_now.beginning_of_day, date_bridge_now.end_of_day]
               when 'YESTERDAY'
-                return date_bridge_now.ago(1.day).beginning_of_day, date_bridge_now.ago(1.day).end_of_day
+                [date_bridge_now.ago(1.day).beginning_of_day, date_bridge_now.ago(1.day).end_of_day]
               when 'TOMORROW'
-                return date_bridge_now.in(1.day).beginning_of_day, date_bridge_now.in(1.day).end_of_day
+                [date_bridge_now.in(1.day).beginning_of_day, date_bridge_now.in(1.day).end_of_day]
               else
                 range_type, range = value['range'].downcase.split('_')
-                raise ArgumentError unless %w(week month year).include?(range)
+                raise ArgumentError unless %w[week month year].include?(range)
                 case range_type
                 when 'this'
                   return date_bridge_now.send("beginning_of_#{range}".to_sym), date_bridge_now.send("end_of_#{range}")
@@ -201,7 +201,7 @@ module ActiveScaffold
             end
 
             def date_bridge_column_date?(column)
-              if [:date_picker, :datetime_picker].include? column.form_ui
+              if %i[date_picker datetime_picker].include? column.form_ui
                 column.form_ui == :date_picker
               else
                 (!column.column.nil? && [:date].include?(column.column.type))
@@ -214,7 +214,7 @@ module ActiveScaffold
   end
 end
 
-ActiveScaffold::Finder.const_set('DATE_COMPARATORS', %w(PAST FUTURE RANGE))
-ActiveScaffold::Finder.const_set('DATE_UNITS', %w(DAYS WEEKS MONTHS YEARS))
-ActiveScaffold::Finder.const_set('TIME_UNITS', %w(SECONDS MINUTES HOURS))
-ActiveScaffold::Finder.const_set('DATE_RANGES', %w(TODAY YESTERDAY TOMORROW THIS_WEEK PREV_WEEK NEXT_WEEK THIS_MONTH PREV_MONTH NEXT_MONTH THIS_YEAR PREV_YEAR NEXT_YEAR))
+ActiveScaffold::Finder.const_set('DATE_COMPARATORS', %w[PAST FUTURE RANGE])
+ActiveScaffold::Finder.const_set('DATE_UNITS', %w[DAYS WEEKS MONTHS YEARS])
+ActiveScaffold::Finder.const_set('TIME_UNITS', %w[SECONDS MINUTES HOURS])
+ActiveScaffold::Finder.const_set('DATE_RANGES', %w[TODAY YESTERDAY TOMORROW THIS_WEEK PREV_WEEK NEXT_WEEK THIS_MONTH PREV_MONTH NEXT_MONTH THIS_YEAR PREV_YEAR NEXT_YEAR])

data/lib/active_scaffold/bridges/tiny_mce/helpers.rb

@@ -8,10 +8,6 @@ class ActiveScaffold::Bridges::TinyMce
     end
 
     module FormColumnHelpers
-      def self.included(base)
-        base.alias_method_chain :onsubmit, :tiny_mce
-      end
-
       # The two column options that can be set specifically for the text_editor input
       # is :tinymce, which overrides single values in the tinymce config.
       # E.g. column[:foo].options[:tinymce] = {theme: 'other'} will change the theme
@@ -21,31 +17,20 @@ class ActiveScaffold::Bridges::TinyMce
       def active_scaffold_input_text_editor(column, options)
         options[:class] = "#{options[:class]} mceEditor #{column.options[:class]}".strip
 
-        settings = tinymce_configuration(column.options[:tinymce_config] || :default).options.
-          reject{|k,v| k =='selector'}.
-          merge(column.options[:tinymce] || {})
-        settings = settings.to_json
-        settings = "tinyMCE.settings = #{settings};"
+        settings = tinymce_configuration(column.options[:tinymce_config] || :default).options
+                                                                                     .reject { |k, _v| k == 'selector' }
+                                                                                     .merge(column.options[:tinymce] || {})
+        options['data-tinymce'] = settings.to_json if ActiveScaffold.js_framework != :prototype
 
         html = []
         html << send(override_input(:textarea), column, options)
-        html << javascript_tag(settings + "tinyMCE.execCommand('mceAddEditor', false, '#{options[:id]}');") if request.xhr? || params[:iframe]
-        html.join "\n"
-      end
-
-      def onsubmit_with_tiny_mce
-        case ActiveScaffold.js_framework
-        when :jquery
-          submit_js = 'tinyMCE.triggerSave();jQuery(\'textarea.mceEditor\').each(function(index, elem) { tinyMCE.execCommand(\'mceRemoveEditor\', false, jQuery(elem).attr(\'id\')); });'
-        when :prototype
-          submit_js = 'tinyMCE.triggerSave();this.select(\'textarea.mceEditor\').each(function(elem) { tinyMCE.execCommand(\'mceRemoveEditor\', false, elem.id); });'
-        end
-        [onsubmit_without_tiny_mce, submit_js].compact.join ';'
+        html << javascript_tag("tinyMCE.settings = #{settings.to_json}; tinyMCE.execCommand('mceAddEditor', false, '#{options[:id]}');") if ActiveScaffold.js_framework == :prototype && (request.xhr? || params[:iframe])
+        safe_join html
       end
 
       # The implementation is very tinymce specific, so it makes sense allowing :form_ui
       # to be :tinymce as well
-      alias_method :active_scaffold_input_tinymce, :active_scaffold_input_text_editor
+      alias active_scaffold_input_tinymce active_scaffold_input_text_editor
     end
 
     module SearchColumnHelpers

data/lib/active_scaffold/bridges/usa_state_select/usa_state_select_helper.rb

@@ -2,7 +2,7 @@ module ActiveScaffold::Bridges
   class UsaStateSelect
     module UsaStateSelectHelpers
       def usa_state_select_options(options)
-        # TODO remove when rails 3.2 support is dropped
+        # TODO: remove when rails 3.2 support is dropped
         defined?(ActionView::Helpers::InstanceTag) ? options[:object] : options
       end
 
@@ -17,22 +17,22 @@ module ActiveScaffold::Bridges
       # in case you want to highligh a local area
       # NOTE: Only the option tags are returned from this method, wrap it in a <select>
       def usa_state_options_for_select(selected = nil, priority_states = nil)
-        if priority_states
-          state_options = options_for_select(priority_states + [['-------------', '']], :selected => selected, :disabled => '')
-        else
-          state_options = options_for_select([])
-        end
+        state_options = if priority_states
+                          options_for_select(priority_states + [['-------------', '']], :selected => selected, :disabled => '')
+                        else
+                          options_for_select([])
+                        end
 
-        if priority_states && priority_states.include?(selected)
-          state_options += options_for_select(USASTATES - priority_states, :selected => selected)
-        else
-          state_options += options_for_select(USASTATES, :selected => selected)
-        end
+        state_options += if priority_states && priority_states.include?(selected)
+                           options_for_select(USASTATES - priority_states, :selected => selected)
+                         else
+                           options_for_select(USASTATES, :selected => selected)
+                         end
 
         state_options
       end
 
-      USASTATES = [%w(Alabama AL), %w(Alaska AK), %w(Arizona AZ), %w(Arkansas AR), %w(California CA), %w(Colorado CO), %w(Connecticut CT), %w(Delaware DE), ['District of Columbia', 'DC'], %w(Florida FL), %w(Georgia GA), %w(Hawaii HI), %w(Idaho ID), %w(Illinois IL), %w(Indiana IN), %w(Iowa IA), %w(Kansas KS), %w(Kentucky KY), %w(Louisiana LA), %w(Maine ME), %w(Maryland MD), %w(Massachusetts MA), %w(Michigan MI), %w(Minnesota MN), %w(Mississippi MS), %w(Missouri MO), %w(Montana MT), %w(Nebraska NE), %w(Nevada NV), ['New Hampshire', 'NH'], ['New Jersey', 'NJ'], ['New Mexico', 'NM'], ['New York', 'NY'], ['North Carolina', 'NC'], ['North Dakota', 'ND'], %w(Ohio OH), %w(Oklahoma OK), %w(Oregon OR), %w(Pennsylvania PA), ['Rhode Island', 'RI'], ['South Carolina', 'SC'], ['South Dakota', 'SD'], %w(Tennessee TN), %w(Texas TX), %w(Utah UT), %w(Vermont VT), %w(Virginia VA), %w(Washington WA), %w(Wisconsin WI), ['West Virginia', 'WV'], %w(Wyoming WY)] unless const_defined?('USASTATES')
+      USASTATES = [%w[Alabama AL], %w[Alaska AK], %w[Arizona AZ], %w[Arkansas AR], %w[California CA], %w[Colorado CO], %w[Connecticut CT], %w[Delaware DE], ['District of Columbia', 'DC'], %w[Florida FL], %w[Georgia GA], %w[Hawaii HI], %w[Idaho ID], %w[Illinois IL], %w[Indiana IN], %w[Iowa IA], %w[Kansas KS], %w[Kentucky KY], %w[Louisiana LA], %w[Maine ME], %w[Maryland MD], %w[Massachusetts MA], %w[Michigan MI], %w[Minnesota MN], %w[Mississippi MS], %w[Missouri MO], %w[Montana MT], %w[Nebraska NE], %w[Nevada NV], ['New Hampshire', 'NH'], ['New Jersey', 'NJ'], ['New Mexico', 'NM'], ['New York', 'NY'], ['North Carolina', 'NC'], ['North Dakota', 'ND'], %w[Ohio OH], %w[Oklahoma OK], %w[Oregon OR], %w[Pennsylvania PA], ['Rhode Island', 'RI'], ['South Carolina', 'SC'], ['South Dakota', 'SD'], %w[Tennessee TN], %w[Texas TX], %w[Utah UT], %w[Vermont VT], %w[Virginia VA], %w[Washington WA], %w[Wisconsin WI], ['West Virginia', 'WV'], %w[Wyoming WY]].freeze unless const_defined?('USASTATES')
     end
 
     module InstanceTagMethods
@@ -50,7 +50,7 @@ module ActiveScaffold::Bridges
         select_options = {:prompt => as_(:_select_)}
         select_options.merge!(options)
         options.reverse_merge!(column.options).except!(:prompt, :priority)
-        options[:name] += '[]' if options[:multiple]
+        active_scaffold_select_name_with_multiple options
         usa_state_select(:record, column.name, column.options[:priority], select_options, options.except(:object))
       end
     end
@@ -69,7 +69,7 @@ ActionView::Base.class_eval do
   include ActiveScaffold::Bridges::UsaStateSelect::FormColumnHelpers
   include ActiveScaffold::Bridges::UsaStateSelect::SearchColumnHelpers
 end
-if defined? ActionView::Helpers::InstanceTag # TODO remove when rails 3.2 support is dropped
+if defined? ActionView::Helpers::InstanceTag # TODO: remove when rails 3.2 support is dropped
   module ActionView::Helpers::Tags
     class UsaStateSelect < ActionView::Helpers::InstanceTag
       include ActiveScaffold::Bridges::UsaStateSelect::UsaStateSelectOptionsHelpers

data/lib/active_scaffold/config/base.rb

@@ -21,7 +21,7 @@ module ActiveScaffold::Config
         protected
 
         def crud_type=(val)
-          raise ArgumentError, "unknown CRUD type #{val}" unless [:create, :read, :update, :delete].include?(val.to_sym)
+          raise ArgumentError, "unknown CRUD type #{val}" unless %i[create read update delete].include?(val.to_sym)
           @crud_type = val.to_sym
         end
       end
@@ -42,7 +42,7 @@ module ActiveScaffold::Config
 
     # define a default action_group for this action
     # e.g. 'members.crud'
-    class_attribute :action_group
+    class_attribute :action_group, instance_accessor: false
 
     # action_group this action should belong to
     attr_accessor :action_group
@@ -97,7 +97,7 @@ module ActiveScaffold::Config
       names.each do |name|
         var = "@#{name}"
         define_method "#{name}=" do |val|
-          if instance_variable_get(var)
+          if instance_variable_defined?(var)
             instance_variable_get(var).set_values(*val)
           else
             instance_variable_set(var, build_action_columns(val))
@@ -105,21 +105,24 @@ module ActiveScaffold::Config
           instance_variable_get(var)
         end
 
+        return if method_defined? name
         define_method name do
-          unless instance_variable_get(var) # lazy evaluation
+          unless instance_variable_defined?(var) # lazy evaluation
             action, columns = options[:copy] if options[:copy]
             if action && @core.actions.include?(action)
               action_columns = @core.send(action).send(columns || :columns).clone
               action_columns.action = self
               instance_variable_set(var, action_columns)
             else
-              self.send("#{name}=", @core.columns._inheritable)
+              send("#{name}=", @core.columns._inheritable)
             end
-            instance_exec &block if block
+            instance_exec(&block) if block
           end
           instance_variable_get(var)
         end
       end
     end
+
+    private_class_method :columns_accessor
   end
 end

data/lib/active_scaffold/config/core.rb

@@ -1,55 +1,55 @@
 module ActiveScaffold::Config
   # to fix the ckeditor bridge problem inherit from full class name
   class Core < ActiveScaffold::Config::Base
+    include ActiveScaffold::OrmChecks
     # global level configuration
     # --------------------------
 
     # provides read/write access to the global Actions DataStructure
-    cattr_reader :actions
+    cattr_reader :actions, instance_accessor: false
     def self.actions=(val)
       @@actions = ActiveScaffold::DataStructures::Actions.new(*val)
     end
-    self.actions = [:create, :list, :search, :update, :delete, :show, :nested, :subform]
+    self.actions = %i[create list search update delete show nested subform]
 
     # configures where the ActiveScaffold plugin itself is located. there is no instance version of this.
     cattr_accessor :plugin_directory
     @@plugin_directory = File.expand_path(__FILE__).match(%{(^.*)/lib/active_scaffold/config/core.rb})[1]
 
     # lets you specify a global ActiveScaffold frontend.
-    cattr_accessor :frontend
+    cattr_accessor :frontend, instance_accessor: false
     @@frontend = :default
 
     # lets you specify a global ActiveScaffold theme for your frontend.
-    cattr_accessor :theme
+    cattr_accessor :theme, instance_accessor: false
     @@theme = :default
 
     # enable caching of action link urls
-    cattr_accessor :cache_action_link_urls
+    cattr_accessor :cache_action_link_urls, instance_accessor: false
     @@cache_action_link_urls = true
 
     # enable caching of association options
-    cattr_accessor :cache_association_options
+    cattr_accessor :cache_association_options, instance_accessor: false
     @@cache_association_options = true
 
     # enable setting ETag and LastModified on responses and using fresh_when/stale? to respond with 304 and avoid rendering views
-    cattr_accessor :conditional_get_support
+    cattr_accessor :conditional_get_support, instance_accessor: false
     @@conditional_get_support = false
 
     # enable saving user settings in session (per_page, limit, page, sort, search params)
-    cattr_accessor :store_user_settings
+    cattr_accessor :store_user_settings, instance_accessor: false
     @@store_user_settings = true
 
     # lets you disable the DHTML history
-    def self.dhtml_history=(val)
-      @@dhtml_history = val
-    end
+    cattr_writer :dhtml_history, instance_accessor: false
+
     def self.dhtml_history?
       @@dhtml_history ? true : false
     end
     @@dhtml_history = true
 
     # action links are used by actions to tie together. you can use them, too! this is a collection of ActiveScaffold::DataStructures::ActionLink objects.
-    cattr_reader :action_links
+    cattr_reader :action_links, instance_reader: false
     @@action_links = ActiveScaffold::DataStructures::ActionLinks.new
 
     # access to the permissions configuration.
@@ -65,21 +65,22 @@ module ActiveScaffold::Config
     def self.ignore_columns
       @@ignore_columns
     end
+
     def self.ignore_columns=(val)
       @@ignore_columns = ActiveScaffold::DataStructures::Set.new(*val)
     end
     @@ignore_columns = ActiveScaffold::DataStructures::Set.new
 
     # lets you specify whether add a create link for each sti child
-    cattr_accessor :sti_create_links
+    cattr_accessor :sti_create_links, instance_accessor: false
     @@sti_create_links = true
 
     # prefix messages with current timestamp, set the format to display (you can use I18n keys) or true and :short will be used
-    cattr_accessor :timestamped_messages
+    cattr_accessor :timestamped_messages, instance_accessor: false
     @@timestamped_messages = false
 
     # a hash of string (or array of strings) and highlighter string to highlight words in messages. It will use highlight rails helper
-    cattr_accessor :highlight_messages
+    cattr_accessor :highlight_messages, instance_accessor: false
     @@highlight_messages = nil
 
     # instance-level configuration
@@ -153,12 +154,15 @@ module ActiveScaffold::Config
       @actions = self.class.actions.clone
 
       # create a new default columns datastructure, since it doesn't make sense before now
-      attribute_names = model.columns.collect { |c| c.name.to_sym }.sort_by(&:to_s)
-      association_column_names = model.reflect_on_all_associations.collect { |a| a.name.to_sym }.sort_by(&:to_s)
-      @columns = ActiveScaffold::DataStructures::Columns.new(model, attribute_names + association_column_names)
+      attribute_names = _columns.collect { |c| c.name.to_sym }.sort_by(&:to_s)
+      association_column_names = _reflect_on_all_associations.collect { |a| a.name.to_sym }
+      if defined?(ActiveMongoid) && model < ActiveMongoid::Associations
+        association_column_names.concat model.am_relations.keys.map(&:to_sym)
+      end
+      @columns = ActiveScaffold::DataStructures::Columns.new(model, attribute_names + association_column_names.sort_by(&:to_s))
 
       # and then, let's remove some columns from the inheritable set.
-      content_columns = Set.new(model.content_columns.map(&:name))
+      content_columns = Set.new(_content_columns.map(&:name))
       @columns.exclude(*self.class.ignore_columns)
       @columns.exclude(*@columns.find_all { |c| c.column && content_columns.exclude?(c.column.name) }.collect(&:name))
       @columns.exclude(*model.reflect_on_all_associations.collect { |a| a.foreign_type.to_sym if a.options[:polymorphic] }.compact)
@@ -232,6 +236,11 @@ module ActiveScaffold::Config
     def model
       @model ||= @model_id.to_s.camelize.constantize
     end
+    alias active_record_class model
+
+    def primary_key
+      mongoid? ? '_id' : model.primary_key
+    end
 
     # warning - this won't work as a per-request dynamic attribute in rails 2.0.  You'll need to interact with Controller#generic_view_paths
     def inherited_view_paths
@@ -248,11 +257,11 @@ module ActiveScaffold::Config
     # note that this is unaffected by per-controller frontend configuration.
     def self.javascripts(frontend = self.frontend)
       javascript_dir = File.join(Rails.public_path, 'javascripts', asset_path('', frontend))
-      Dir.entries(javascript_dir).reject { |e| !e.match(/\.js$/) || (!self.dhtml_history? && e.match('dhtml_history')) }
+      Dir.entries(javascript_dir).reject { |e| !e.match(/\.js$/) || (!dhtml_history? && e.match('dhtml_history')) }
     end
 
     def self.available_frontends
-      frontends_dir = File.join(Rails.root, 'vendor', 'plugins', ActiveScaffold::Config::Core.plugin_directory, 'frontends')
+      frontends_dir = Rails.root.join('vendor', 'plugins', ActiveScaffold::Config::Core.plugin_directory, 'frontends')
       Dir.entries(frontends_dir).reject { |e| e.match(/^\./) } # Get rid of files that start with .
     end
   end