active_scaffold 3.7.12 → 4.0.0.rc1

data/lib/active_scaffold/bridges/country_select/country_select_bridge_helper.rb

@@ -2,7 +2,7 @@ module ActiveScaffold::Bridges
   class CountrySelect
     module FormColumnHelpers
       def active_scaffold_input_country(column, options, ui_options: column.options)
-        select_options = {:prompt => as_(:_select_), :priority_countries => ui_options[:priority] || [:us]}
+        select_options = {prompt: as_(:_select_), priority_countries: ui_options[:priority] || [:us]}
         select_options[:format] = ui_options[:format] if ui_options[:format]
         select_options.merge!(options)
         options.reverse_merge!(ui_options).except!(:prompt, :priority, :format)
@@ -15,15 +15,17 @@ module ActiveScaffold::Bridges
       def active_scaffold_column_country(record, column, ui_options: column.options)
         country_code = record.send(column.name)
         return if country_code.blank?
+
         country = ISO3166::Country[country_code]
         return country_code unless country
+
         country.translations[I18n.locale.to_s] || country.name
       end
     end
 
     module SearchColumnHelpers
       def active_scaffold_search_country(column, options, ui_options: column.options)
-        active_scaffold_input_country(column, options.merge!(:selected => options.delete(:value)), ui_options: ui_options)
+        active_scaffold_input_country(column, options.merge!(selected: options.delete(:value)), ui_options: ui_options)
       end
     end
   end

data/lib/active_scaffold/bridges/date_picker/ext.rb

@@ -1,18 +1,11 @@
-class File #:nodoc:
-  unless File.respond_to?(:binread)
-    def self.binread(file)
-      File.open(file, 'rb', &:read)
-    end
-  end
-end
-
 class ActiveScaffold::Bridges::DatePicker
   module DatePickerBridge
     def initialize(model_id)
       super
       return unless ActiveScaffold::Bridges::DatePicker.default_ui
 
-      date_picker_fields = _columns.collect { |c| {:name => c.name.to_sym, :type => c.type} if %i[date datetime].include?(c.type) }.compact
+      types = %i[date datetime]
+      date_picker_fields = _columns.filter_map { |c| {name: c.name.to_sym, type: c.type} if types.include?(c.type) }
       # check to see if file column was used on the model
       return if date_picker_fields.empty?
 
@@ -41,8 +34,23 @@ class ActiveScaffold::Bridges::DatePicker
       end
     end
 
-    def format_for_date(column, value, format_name = column.options[:format])
-      super column, value, format_name || (:default if column.search_ui == :date_picker)
+    def format_for_date(column, value, ui_name, ui_options)
+      ui_options = ui_options.reverse_merge(format: :default) if ui_name == :date_picker
+      super
+    end
+
+    def format_for_datetime(column, value, ui_name, ui_options)
+      format = I18n.t "time.formats.#{ui_options[:format] || :picker}", default: '' if ui_name == :datetime_picker
+      return super if format.blank?
+
+      parts = Date._parse(value)
+      [[:hour, '%H'], [:min, ':%M'], [:sec, ':%S']].each do |part, f|
+        format.gsub!(f, '') if parts[part].blank?
+      end
+      format += ' %z' if parts[:offset].present? && format !~ /%z/i
+
+      format.gsub!(/.*(?=%H)/, '') if !parts[:year] && !parts[:month] && !parts[:mday]
+      [format, parts[:offset]]
     end
   end
 
@@ -57,7 +65,7 @@ class ActiveScaffold::Bridges::DatePicker
   end
 end
 
-ActiveScaffold::Config::Core.send :prepend, ActiveScaffold::Bridges::DatePicker::DatePickerBridge
+ActiveScaffold::Config::Core.prepend ActiveScaffold::Bridges::DatePicker::DatePickerBridge
 ActionView::Base.class_eval do
   alias_method :active_scaffold_search_date_picker, :active_scaffold_search_datetime
   alias_method :active_scaffold_search_datetime_picker, :active_scaffold_search_datetime

data/lib/active_scaffold/bridges/date_picker/helper.rb

@@ -24,32 +24,32 @@ module ActiveScaffold::Bridges
       }.freeze
 
       def self.date_options_for_locales
-        I18n.available_locales.collect do |locale|
+        I18n.available_locales.filter_map do |locale|
           locale_date_options = date_options(locale)
           "$.datepicker.regional['#{locale}'] = #{locale_date_options.to_json};" if locale_date_options
-        end.compact.join('')
+        end.join
       end
 
       def self.date_options(locale)
         date_picker_options = {
-          :closeText => as_(:close),
-          :prevText => as_(:previous),
-          :nextText => as_(:next),
-          :currentText => as_(:today),
-          :monthNames => I18n.translate!('date.month_names', :locale => locale)[1..-1],
-          :monthNamesShort => I18n.translate!('date.abbr_month_names', :locale => locale)[1..-1],
-          :dayNames => I18n.translate!('date.day_names', :locale => locale),
-          :dayNamesShort => I18n.translate!('date.abbr_day_names', :locale => locale),
-          :dayNamesMin => I18n.translate!('date.abbr_day_names', :locale => locale),
-          :changeYear => true,
-          :changeMonth => true
+          closeText:       as_(:close),
+          prevText:        as_(:previous),
+          nextText:        as_(:next),
+          currentText:     as_(:today),
+          monthNames:      I18n.translate!('date.month_names', locale: locale)[1..],
+          monthNamesShort: I18n.translate!('date.abbr_month_names', locale: locale)[1..],
+          dayNames:        I18n.translate!('date.day_names', locale: locale),
+          dayNamesShort:   I18n.translate!('date.abbr_day_names', locale: locale),
+          dayNamesMin:     I18n.translate!('date.abbr_day_names', locale: locale),
+          changeYear:      true,
+          changeMonth:     true
         }
 
-        as_date_picker_options = I18n.translate! :date_picker_options, :scope => :active_scaffold, :locale => locale, :default => ''
+        as_date_picker_options = I18n.translate! :date_picker_options, scope: :active_scaffold, locale: locale, default: ''
         date_picker_options.merge!(as_date_picker_options) if as_date_picker_options.is_a? Hash
         Rails.logger.warn "ActiveScaffold: Missing date picker localization for your locale: #{locale}" if as_date_picker_options.blank?
 
-        js_format = to_datepicker_format(I18n.translate!('date.formats.default', :locale => locale, :default => ''))
+        js_format = to_datepicker_format(I18n.translate!('date.formats.default', locale: locale, default: ''))
         date_picker_options[:dateFormat] = js_format if js_format.present?
         date_picker_options
       rescue StandardError
@@ -57,22 +57,22 @@ module ActiveScaffold::Bridges
       end
 
       def self.datetime_options_for_locales
-        I18n.available_locales.collect do |locale|
+        I18n.available_locales.filter_map do |locale|
           locale_datetime_options = datetime_options(locale)
           "$.timepicker.regional['#{locale}'] = #{locale_datetime_options.to_json};" if locale_datetime_options
-        end.compact.join('')
+        end.join
       end
 
       def self.datetime_options(locale)
-        rails_time_format = I18n.translate! 'time.formats.picker', :locale => locale, :default => '%a, %d %b %Y %H:%M:%S'
+        rails_time_format = I18n.translate! 'time.formats.picker', locale: locale, default: '%a, %d %b %Y %H:%M:%S'
         datetime_picker_options = {
-          :ampm => false,
-          :hourText => I18n.translate!('datetime.prompts.hour', :locale => locale),
-          :minuteText => I18n.translate!('datetime.prompts.minute', :locale => locale),
-          :secondText => I18n.translate!('datetime.prompts.second', :locale => locale)
+          ampm: false,
+          hourText: I18n.translate!('datetime.prompts.hour', locale: locale),
+          minuteText: I18n.translate!('datetime.prompts.minute', locale: locale),
+          secondText: I18n.translate!('datetime.prompts.second', locale: locale)
         }
 
-        as_datetime_picker_options = I18n.translate! :datetime_picker_options, :scope => :active_scaffold, :locale => locale, :default => ''
+        as_datetime_picker_options = I18n.translate! :datetime_picker_options, scope: :active_scaffold, locale: locale, default: ''
         datetime_picker_options.merge!(as_datetime_picker_options) if as_datetime_picker_options.is_a? Hash
         Rails.logger.warn "ActiveScaffold: Missing datetime picker localization for your locale: #{locale}" if as_datetime_picker_options.blank?
 
@@ -84,11 +84,12 @@ module ActiveScaffold::Bridges
 
       def self.to_datepicker_format(rails_format)
         return nil if rails_format.nil?
+
         if rails_format.match?(UNSUPPORTED_FORMAT_OPTIONS)
           options = UNSUPPORTED_FORMAT_OPTIONS.to_s.scan(/\[(.*)\]/).dig(0, 0)&.each_char&.map { |c| "%#{c}" }
           Rails.logger.warn(
-            "AS DatePicker::Helper: rails date format #{rails_format} includes options "\
-            "which can't be converted to jquery datepicker format. "\
+            "AS DatePicker::Helper: rails date format #{rails_format} includes options " \
+            "which can't be converted to jquery datepicker format. " \
             "Options #{options.join(', ')} are not supported by datepicker and will be removed"
           )
         end
@@ -133,6 +134,7 @@ module ActiveScaffold::Bridges
 
         def datepicker_format_options(column, format)
           return {} if format == :default
+
           if column.form_ui == :date_picker
             js_format = to_datepicker_format(I18n.translate!("date.formats.#{format}"))
             js_format.nil? ? {} : {dateFormat: js_format}
@@ -142,8 +144,8 @@ module ActiveScaffold::Bridges
           end
         end
 
-        def datepicker_format(options, ui)
-          options.delete(:format) || (ui == :date_picker ? :default : :picker)
+        def datepicker_format(options, ui_name)
+          options.delete(:format) || (ui_name == :date_picker ? :default : :picker)
         end
       end
 
@@ -151,7 +153,8 @@ module ActiveScaffold::Bridges
         def active_scaffold_search_date_picker_field(column, options, current_search, name, ui_options: column.options)
           value =
             if current_search.is_a? Hash
-              controller.class.condition_value_for_datetime(column, current_search[name], column.search_ui == :date_picker ? :to_date : :to_time)
+              conversion = column.search_ui == :date_picker ? :to_date : :to_time
+              controller.class.condition_value_for_datetime(column, current_search[name], conversion, ui_method: :search_ui, ui_options: ui_options)
             else
               current_search
             end
@@ -161,8 +164,8 @@ module ActiveScaffold::Bridges
           options[:class] << " #{column.search_ui}"
           options[:style] = 'display: none' if options[:show] == false # hide only if asked to hide
           options[:data] = datepicker_format_options(column, format).reverse_merge!(options[:data] || {})
-          value = l(value, :format => format) if value
-          options = options.merge(:id => "#{options[:id]}_#{name}", :name => "#{options[:name]}[#{name}]", :object => nil)
+          value = l(value, format: format) if value
+          options = options.merge(id: "#{options[:id]}_#{name}", name: "#{options[:name]}[#{name}]", object: nil)
           text_field_tag("#{options[:name]}[#{name}]", value, options)
         end
       end
@@ -173,10 +176,11 @@ module ActiveScaffold::Bridges
           options = active_scaffold_input_text_options(options.merge(ui_options))
           options[:class] << " #{column.form_ui}"
 
-          format = datepicker_format(options, column.form_ui)
-          value = controller.class.condition_value_for_datetime(column, record.send(column.name), column.form_ui == :date_picker ? :to_date : :to_time)
+          format = datepicker_format(ui_options, column.form_ui)
+          conversion = column.form_ui == :date_picker ? :to_date : :to_time
+          value = controller.class.condition_value_for_datetime(column, record.send(column.name), conversion, ui_method: :form_ui, ui_options: ui_options)
           options[:data] = datepicker_format_options(column, format).reverse_merge!(options[:data] || {})
-          options[:value] = (value ? l(value, :format => format) : nil)
+          options[:value] = (value ? l(value, format: format) : nil)
           text_field(:record, column.name, options)
         end
       end

data/lib/active_scaffold/bridges/date_picker.rb

@@ -6,12 +6,9 @@ module ActiveScaffold::Bridges
     end
 
     def self.install?
-      ActiveScaffold.js_framework == :jquery && jquery_ui_included?
-    end
-
-    def self.jquery_ui_included?
       ActiveScaffold.jquery_ui_included?
     end
+
     mattr_accessor :default_ui
     @@default_ui = true
 

data/lib/active_scaffold/bridges/dragonfly/dragonfly_bridge.rb

@@ -22,7 +22,7 @@ module ActiveScaffold
           columns[field].params.add "remove_#{field}"
 
           %i[name uid].each do |f|
-            columns.exclude("#{field}_#{f}".to_sym)
+            columns.exclude(:"#{field}_#{f}")
           end
         end
       end

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

@@ -4,13 +4,14 @@ module ActiveScaffold
       def active_scaffold_column_dragonfly(record, column, ui_options: column.options)
         attachment = record.send(column.name.to_s)
         return nil if attachment.blank?
+
         content =
           if attachment.image?
-            image_tag(attachment.thumb(ui_options[:thumb] || ActiveScaffold::Bridges::Dragonfly::DragonflyBridgeHelpers.thumbnail_style).url, :border => 0)
+            image_tag(attachment.thumb(ui_options[:thumb] || ActiveScaffold::Bridges::Dragonfly::DragonflyBridgeHelpers.thumbnail_style).url, border: 0)
           else
             attachment.name
           end
-        link_to(content, dragonfly_url_for_attachment(attachment, record, column, ui_options: ui_options), :target => '_blank', rel: 'noopener noreferrer')
+        link_to(content, dragonfly_url_for_attachment(attachment, record, column, ui_options: ui_options), target: '_blank', rel: 'noopener noreferrer')
       end
 
       def dragonfly_url_for_attachment(attachment, record, column, ui_options: column.options)

data/lib/active_scaffold/bridges/dragonfly.rb

@@ -4,6 +4,6 @@ class ActiveScaffold::Bridges::Dragonfly < ActiveScaffold::DataStructures::Bridg
     require File.join(File.dirname(__FILE__), 'dragonfly/list_ui')
     require File.join(File.dirname(__FILE__), 'dragonfly/dragonfly_bridge_helpers')
     require File.join(File.dirname(__FILE__), 'dragonfly/dragonfly_bridge')
-    ActiveScaffold::Config::Core.send :prepend, ActiveScaffold::Bridges::Dragonfly::DragonflyBridge
+    ActiveScaffold::Config::Core.prepend ActiveScaffold::Bridges::Dragonfly::DragonflyBridge
   end
 end

data/lib/active_scaffold/bridges/file_column/as_file_column_bridge.rb

@@ -5,6 +5,7 @@ end
 class ActiveScaffold::Bridges::FileColumn
   module FileColumnBridge
     attr_accessor :file_column_fields
+
     def initialize(model_id)
       super
 
@@ -32,10 +33,10 @@ class ActiveScaffold::Bridges::FileColumn
 
       # set null to false so active_scaffold wont set it to null
       # delete_file_column will take care of deleting a file or not.
-      _columns_hash[field.to_s].instance_variable_set('@null', false)
+      _columns_hash[field.to_s].instance_variable_set(:@null, false)
     rescue StandardError
       false
     end
   end
 end
-ActiveScaffold::Config::Core.send :prepend, ActiveScaffold::Bridges::FileColumn::FileColumnBridge
+ActiveScaffold::Config::Core.prepend ActiveScaffold::Bridges::FileColumn::FileColumnBridge

data/lib/active_scaffold/bridges/file_column/file_column_helpers.rb

@@ -33,13 +33,14 @@ module ActiveScaffold
         end
 
         def options_for_file_column_field(field)
-          allocate.send("#{field}_options")
+          allocate.send(:"#{field}_options")
         end
 
         def field_has_image_version?(field, version = 'thumb')
           options = options_for_file_column_field(field)
           versions = options[:magick][:versions]
           raise unless versions.stringify_keys[version]
+
           true
         rescue StandardError
           false

data/lib/active_scaffold/bridges/file_column/form_ui.rb

@@ -6,21 +6,16 @@ module ActiveScaffold
         record = options[:object]
         if record.send(column.name)
           # we already have a value? display the form for deletion.
-          case ActiveScaffold.js_framework
-          when :jquery
-            remove_file_js = "jQuery(this).prev().val('true'); jQuery(this).parent().hide().next().show(); return false;"
-          when :prototype
-            remove_file_js = "$(this).previous().value='true'; p=$(this).up(); p.hide(); p.next().show(); return false;"
-          end
+          remove_file_js = "jQuery(this).prev().val('true'); jQuery(this).parent().hide().next().show(); return false;"
 
-          hidden_options = options.merge(:id => options[:id] + '_delete', :name => options[:name].sub("[#{column.name}]", "[delete_#{column.name}]"), :value => 'false')
+          hidden_options = options.merge(id: "#{options[:id]}_delete", name: options[:name].sub("[#{column.name}]", "[delete_#{column.name}]"), value: 'false')
           custom_hidden_field_tag = hidden_field(:record, column.name, hidden_options)
 
           content_tag(:div) do
             content_tag(:div) do
               safe_join [get_column_value(record, column), custom_hidden_field_tag, '|',
-                         content_tag(:a, as_(:remove_file), :href => '#', :onclick => remove_file_js),
-                         content_tag(:div, 'test', :style => 'display: none')], ' '
+                         content_tag(:a, as_(:remove_file), href: '#', onclick: remove_file_js),
+                         content_tag(:div, 'test', style: 'display: none')], ' '
             end
           end
         else

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

@@ -4,21 +4,24 @@ module ActiveScaffold
     module ListColumnHelpers
       def active_scaffold_column_download_link_with_filename(record, column, ui_options: column.options)
         return nil if record.send(column.name).nil?
+
         active_scaffold_column_download_link(record, column, File.basename(record.send(column.name)))
       end
 
       def active_scaffold_column_download_link(record, column, label = nil, ui_options: column.options)
         return nil if record.send(column.name).nil?
+
         label ||= as_(:download)
-        link_to(label, url_for_file_column(record, column.name.to_s), :popup => true)
+        link_to(label, url_for_file_column(record, column.name.to_s), popup: true)
       end
 
       def active_scaffold_column_thumbnail(record, column, ui_options: column.options)
         return nil if record.send(column.name).nil?
+
         link_to(
-          image_tag(url_for_file_column(record, column.name.to_s, 'thumb'), :border => 0),
+          image_tag(url_for_file_column(record, column.name.to_s, 'thumb'), border: 0),
           url_for_file_column(record, column.name.to_s),
-          :popup => true
+          popup: true
         )
       end
     end

data/lib/active_scaffold/bridges/file_column/test/functional/file_column_keep_test.rb

@@ -26,17 +26,17 @@ class DeleteFileColumnTest < Minitest::Test
 
   def test__delete_band_image__boolean_false__shouldnt_delete
     @model.delete_band_image = false
-    refute_nil @model.band_image
+    assert_not_nil @model.band_image
   end
 
   def test__delete_band_image__string_false__shouldnt_delete
     @model.delete_band_image = 'false'
-    refute_nil @model.band_image
+    assert_not_nil @model.band_image
   end
 
   def test__just_uploaded__shouldnt_delete
     @model.band_image_just_uploaded = true
     @model.delete_band_image = 'true'
-    refute_nil(@model.band_image)
+    assert_not_nil(@model.band_image)
   end
 end

data/lib/active_scaffold/bridges/file_column/test/mock_model.rb

@@ -1,9 +1,6 @@
 class MockModel
-  attr_accessor :name
-  attr_accessor :bio
+  attr_accessor :name, :bio, :band_image, :band_image_just_uploaded
 
-  attr_accessor :band_image
-  attr_accessor :band_image_just_uploaded
   def band_image_just_uploaded?
     band_image_just_uploaded
   end

data/lib/active_scaffold/bridges/file_column.rb

@@ -3,6 +3,7 @@ class ActiveScaffold::Bridges::FileColumn < ActiveScaffold::DataStructures::Brid
     if ActiveScaffold::Config::Core.method_defined?(:initialize_with_file_column)
       raise "We've detected that you have active_scaffold_file_column_bridge installed.  This plugin has been moved to core.  Please remove active_scaffold_file_column_bridge to prevent any conflicts"
     end
+
     require File.join(File.dirname(__FILE__), 'file_column/as_file_column_bridge')
     require File.join(File.dirname(__FILE__), 'file_column/form_ui')
     require File.join(File.dirname(__FILE__), 'file_column/list_ui')

data/lib/active_scaffold/bridges/paper_trail/actions.rb

@@ -4,13 +4,15 @@ module ActiveScaffold::Actions
       base.class_eval do
         config = active_scaffold_config
         if config.actions.include?(:nested) && config.deleted_records.nested_link_group
-          config.configure { nested.add_link :versions, :label => config.deleted_records.nested_link_label, :action_group => config.deleted_records.nested_link_group }
+          config.configure do
+            nested.add_link :versions, label: config.deleted_records.nested_link_label, action_group: config.deleted_records.nested_link_group
+          end
         end
       end
     end
 
     def deleted
-      query = PaperTrail::Version.destroys.where(:item_type => active_scaffold_config.model.name)
+      query = PaperTrail::Version.destroys.where(item_type: active_scaffold_config.model.name)
       if nested? && nested.child_association&.belongs_to? && PaperTrail::Version.respond_to?(:where_object)
         foreign_key = nested.child_association.foreign_key
         parent_id = nested.parent_id

data/lib/active_scaffold/bridges/paper_trail/config.rb

@@ -10,7 +10,7 @@ module ActiveScaffold::Config
 
     # the ActionLink for this action
     cattr_accessor :link
-    @@link = ActiveScaffold::DataStructures::ActionLink.new(:deleted, :label => :deleted_records, :type => :collection)
+    @@link = ActiveScaffold::DataStructures::ActionLink.new(:deleted, label: :deleted_records, type: :collection)
 
     # label for versions nested link
     cattr_accessor :nested_link_label

data/lib/active_scaffold/bridges/paper_trail/helper.rb

@@ -8,7 +8,7 @@ module ActiveScaffold::Bridges
           action_links = filter_action_links_for_deleted(action_links, record, options)
           return unless action_links
         end
-        super(action_links, record, options, &block)
+        super
       end
     end
   end

data/lib/active_scaffold/bridges/paper_trail/paper_trail_bridge.rb

@@ -5,10 +5,11 @@ module ActiveScaffold
         def initialize(model_id)
           super
           return unless model < ::PaperTrail::Model::InstanceMethods
+
           actions << :deleted_records
         end
       end
     end
   end
 end
-ActiveScaffold::Config::Core.send :prepend, ActiveScaffold::Bridges::PaperTrail::PaperTrailBridge
+ActiveScaffold::Config::Core.prepend ActiveScaffold::Bridges::PaperTrail::PaperTrailBridge

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

@@ -4,13 +4,14 @@ module ActiveScaffold
       def active_scaffold_column_paperclip(record, column, ui_options: column.options)
         paperclip = record.send(column.name.to_s)
         return nil unless paperclip.file?
+
         content =
           if paperclip.styles.include?(ActiveScaffold::Bridges::Paperclip::PaperclipBridgeHelpers.thumbnail_style)
-            image_tag(paperclip.url(ActiveScaffold::Bridges::Paperclip::PaperclipBridgeHelpers.thumbnail_style), :border => 0, :alt => nil)
+            image_tag(paperclip.url(ActiveScaffold::Bridges::Paperclip::PaperclipBridgeHelpers.thumbnail_style), border: 0, alt: nil)
           else
             paperclip.original_filename
           end
-        link_to(content, paperclip.url, :target => '_blank')
+        link_to(content, paperclip.url, target: '_blank', rel: 'noopener')
       end
     end
   end

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

@@ -24,7 +24,7 @@ module ActiveScaffold
           columns[field].params.add "delete_#{field}"
 
           %i[file_name content_type file_size updated_at].each do |f|
-            columns.exclude("#{field}_#{f}".to_sym)
+            columns.exclude(:"#{field}_#{f}")
           end
         end
       end

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

@@ -7,15 +7,16 @@ module ActiveScaffold
 
         def self.generate_delete_helper(klass, field)
           klass.class_eval <<-CODE, __FILE__, __LINE__ + 1 unless klass.method_defined?(:"delete_#{field}=")
-            attr_reader :delete_#{field}
-
-            def delete_#{field}=(value)
-              value = (value == "true") if String === value
-              return unless value
-
-              # passing nil to the file column causes the file to be deleted. Don't delete if we just uploaded a file!
-              self.#{field} = nil unless self.#{field}.dirty?
-            end
+            attr_reader :delete_#{field}                                   # attr_reader :delete_file
+                                                                           #
+            def delete_#{field}=(value)                                    # def delete_file=(value)
+              value = (value == "true") if String === value                #   value = (value == "true") if String === value
+              return unless value                                          #   return unless value
+                                                                           #
+              # passing nil to the file column causes the file             #   # passing nil to the file column causes the file
+              # to be deleted. Don't delete if we just uploaded a file!    #   # to be deleted. Don't delete if we just uploaded a file!
+              self.#{field} = nil unless self.#{field}.dirty?              #   self.file = nil unless self.file.dirty?
+            end                                                            # end
           CODE
         end
       end

data/lib/active_scaffold/bridges/paperclip.rb

@@ -3,10 +3,11 @@ class ActiveScaffold::Bridges::Paperclip < ActiveScaffold::DataStructures::Bridg
     if ActiveScaffold::Config::Core.method_defined?(:initialize_with_paperclip)
       raise "We've detected that you have active_scaffold_paperclip_bridge installed. This plugin has been moved to core. Please remove active_scaffold_paperclip_bridge to prevent any conflicts"
     end
+
     require File.join(File.dirname(__FILE__), 'paperclip/form_ui')
     require File.join(File.dirname(__FILE__), 'paperclip/list_ui')
     require File.join(File.dirname(__FILE__), 'paperclip/paperclip_bridge_helpers')
     require File.join(File.dirname(__FILE__), 'paperclip/paperclip_bridge')
-    ActiveScaffold::Config::Core.send :prepend, ActiveScaffold::Bridges::Paperclip::PaperclipBridge
+    ActiveScaffold::Config::Core.prepend ActiveScaffold::Bridges::Paperclip::PaperclipBridge
   end
 end

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

@@ -26,22 +26,20 @@ class ActiveScaffold::Bridges::RecordSelect
 
       def active_scaffold_record_select(record, column, options, value, multiple, ui_options: column.options)
         unless column.association
-          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).'
+          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 = column.association.klass(record)
-        return content_tag :span, '', :class => options[:class] unless klass
+        return content_tag :span, '', class: options[:class] unless klass
 
         remote_controller = active_scaffold_controller_for(klass).controller_path
 
-        # 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 column.association.has_one? || column.association.has_many?
-          params[column.association.foreign_key] = ''
-        end
+        # 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
+        params[column.association.foreign_key] = '' if column.association.has_one? || column.association.has_many?
 
         record_select_options = active_scaffold_input_text_options(options).merge(
-          :controller => remote_controller
+          controller: remote_controller
         )
         record_select_options.merge!(ui_options)
 
@@ -57,7 +55,7 @@ class ActiveScaffold::Bridges::RecordSelect
 
       def active_scaffold_record_select_autocomplete(record, column, options, ui_options: column.options)
         record_select_options = active_scaffold_input_text_options(options).reverse_merge(
-          :controller => active_scaffold_controller_for(record.class).controller_path
+          controller: active_scaffold_controller_for(record.class).controller_path
         ).merge(ui_options)
         html = record_select_autocomplete(options[:name], record, record_select_options)
         html = instance_exec(html, self, &self.class.field_error_proc) if record.errors[column.name].any?
@@ -73,8 +71,9 @@ class ActiveScaffold::Bridges::RecordSelect
 
       def field_search_record_select_value(column, value, ui_options: column.options)
         return if value.blank?
+
         if ui_options[:multiple]
-          column.association.klass.find value.select(&:present?).collect!(&:to_i)
+          column.association.klass.find value.compact_blank.collect!(&:to_i)
         else
           column.association.klass.find(value.to_i)
         end

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

@@ -3,9 +3,11 @@ class ActiveScaffold::Bridges::SemanticAttributes
     def initialize(name, active_record_class)
       super
       self.required = !active_record_class.semantic_attributes[self.name].predicates.find { |p| p.allow_empty? == false }.nil?
+      ignored_types = %i[required association]
       active_record_class.semantic_attributes[self.name].predicates.find do |p|
         sem_type = p.class.to_s.split('::')[1].underscore.to_sym
-        next if %i[required association].include?(sem_type)
+        next if ignored_types.include?(sem_type)
+
         @form_ui = sem_type
       end
     end

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

@@ -17,16 +17,12 @@ class ActiveScaffold::Bridges::TinyMce
       def active_scaffold_input_text_editor(column, options, ui_options: column.options)
         options[:class] = "#{options[:class]} mceEditor #{ui_options[:class]}".strip
 
-        settings = tinymce_configuration(ui_options[:tinymce_config] || :default).options
-                                                                                 .reject { |k, _v| k == 'selector' }
-                                                                                 .merge(ui_options[:tinymce] || {})
-        options['data-tinymce'] = settings.to_json if ActiveScaffold.js_framework != :prototype
+        settings = tinymce_configuration(ui_options[:tinymce_config] || :default)
+                     .options.except('selector').merge(ui_options[:tinymce] || {})
+        options['data-tinymce'] = settings.to_json
 
         html = []
         html << send(override_input(:textarea), column, options, ui_options: ui_options)
-        if ActiveScaffold.js_framework == :prototype && (request.xhr? || params[:iframe])
-          html << javascript_tag("tinyMCE.settings = #{settings.to_json}; tinyMCE.execCommand('mceAddEditor', false, '#{options[:id]}');")
-        end
         safe_join html
       end