active_scaffold 3.5.5 → 3.6.0.pre

data/lib/active_scaffold/active_record_permissions.rb

@@ -37,7 +37,7 @@ module ActiveScaffold
         # because the object may change (someone may log in or out). So we give ActiveRecord a proc that ties to the
         # current_user_method on this ApplicationController.
         def assign_current_user_to_models
-          ActiveRecord::Base.current_user_proc = proc { send(ActiveRecordPermissions.current_user_method) }
+          ActiveScaffold::Registry.current_user_proc = proc { send(ActiveRecordPermissions.current_user_method) }
         end
       end
 
@@ -48,18 +48,9 @@ module ActiveScaffold
         end
 
         module ClassMethods
-          # The proc to call that retrieves the current_user from the ApplicationController.
-          def current_user_proc
-            Thread.current[:current_user_proc]
-          end
-
-          def current_user_proc=(proc_value)
-            Thread.current[:current_user_proc] = proc_value
-          end
-
           # Class-level access to the current user
           def current_user
-            ActiveRecord::Base.current_user_proc.call if ActiveRecord::Base.current_user_proc
+            ActiveScaffold::Registry.current_user_proc&.call
           end
         end
 

data/lib/active_scaffold/attribute_params.rb

@@ -41,13 +41,8 @@ module ActiveScaffold
       difference = value.select(&:persisted?).size - parent_record.send(counter_attr)
 
       if parent_record.new_record?
-        if Rails.version >= '4.2.0'
-          parent_record.send "#{column.name}=", value
-          parent_record.send "#{counter_attr}_will_change!"
-        else # < 4.2
-          parent_record.send "#{counter_attr}=", difference
-          parent_record.send "#{column.name}=", value
-        end
+        parent_record.send "#{column.name}=", value
+        parent_record.send "#{counter_attr}_will_change!"
       else
         # don't decrement counter for deleted records, on destroy they will update counter
         difference += (parent_record.send(column.name) - value).size
@@ -57,7 +52,7 @@ module ActiveScaffold
       # update counters on old parents if belongs_to is changed
       value.select(&:persisted?).each do |record|
         key = record.send(column.association.foreign_key)
-        parent_record.class.decrement_counter counter_attr, key if key && key != parent_record.id
+        parent_record.class.decrement_counter counter_attr, key if key && key != parent_record.id # rubocop:disable Rails/SkipsModelValidations
       end
       parent_record.send "#{column.name}=", value if parent_record.persisted?
     end
@@ -93,7 +88,7 @@ module ActiveScaffold
         multi_parameter_attributes[column_name] << [k, v]
       end
 
-      columns.each :for => parent_record, :crud_type => crud_type, :flatten => true do |column|
+      columns.each_column(for: parent_record, crud_type: crud_type, flatten: true) do |column|
         begin
           # Set any passthrough parameters that may be associated with this column (ie, file column "keep" and "temp" attributes)
           unless column.params.empty?
@@ -105,7 +100,7 @@ module ActiveScaffold
           elsif attributes.key? column.name
             value = update_column_from_params(parent_record, column, attributes[column.name], avoid_changes)
           end
-        rescue => e
+        rescue StandardError => e
           Rails.logger.error "#{e.class.name}: #{e.message} -- on the ActiveScaffold column = :#{column.name} for #{parent_record.inspect}#{" with value #{value}" if value}"
           raise
         end
@@ -118,11 +113,11 @@ module ActiveScaffold
       value = column_value_from_param_value(parent_record, column, attribute, avoid_changes)
       if avoid_changes && column.association
         parent_record.association(column.name).target = value
-        parent_record.send("#{column.association.foreign_key}=", value.try(:id)) if column.association.belongs_to?
+        parent_record.send("#{column.association.foreign_key}=", value&.id) if column.association.belongs_to?
       elsif column.association && counter_cache_hack?(column.association, attribute)
-        parent_record.send "#{column.association.foreign_key}=", value.try(:id)
+        parent_record.send "#{column.association.foreign_key}=", value&.id
         parent_record.association(column.name).target = value
-      elsif column.association.try(:collection?) && column.association.through? && !column.association.through_reflection.collection?
+      elsif column.association&.collection? && column.association.through? && !column.association.through_reflection.collection?
         through = column.association.through_reflection.name
         through_record = parent_record.send(through)
         through_record ||= parent_record.send "build_#{through}"
@@ -139,7 +134,7 @@ module ActiveScaffold
           parent_record.association(column.name).target = value if column.association
         end
       end
-      if column.association.try(:reverse_association).try(:belongs_to?)
+      if column.association&.reverse_association&.belongs_to?
         Array(value).each { |v| v.send("#{column.association.reverse}=", parent_record) if v.new_record? }
       end
       value
@@ -147,7 +142,7 @@ module ActiveScaffold
 
     def column_value_from_param_value(parent_record, column, value, avoid_changes = false)
       # convert the value, possibly by instantiating associated objects
-      form_ui = column.form_ui || column.column.try(:type)
+      form_ui = column.form_ui || column.column&.type
       if form_ui && respond_to?("column_value_for_#{form_ui}_type", true)
         send("column_value_for_#{form_ui}_type", parent_record, column, value)
       elsif params_hash? value
@@ -178,7 +173,7 @@ module ActiveScaffold
     end
 
     def column_value_from_param_simple_value(parent_record, column, value)
-      if column.association.try :singular?
+      if column.association&.singular?
         if value.present?
           if column.association.polymorphic?
             class_name = parent_record.send(column.association.foreign_type)
@@ -188,7 +183,7 @@ module ActiveScaffold
             column.association.klass.find(value)
           end
         end
-      elsif column.association.try :collection?
+      elsif column.association&.collection?
         column_plural_assocation_value_from_value(column, Array(value))
       elsif column.number? && column.options[:format] && column.form_ui != :number
         column.number_to_native(value)
@@ -213,9 +208,9 @@ module ActiveScaffold
     end
 
     def column_value_from_param_hash_value(parent_record, column, value, avoid_changes = false)
-      if column.association.try :singular?
+      if column.association&.singular?
         manage_nested_record_from_params(parent_record, column, value, avoid_changes)
-      elsif column.association.try :collection?
+      elsif column.association&.collection?
         # HACK: to be able to delete all associated records, hash will include "0" => ""
         values = value.values.reject(&:blank?)
         values.collect { |val| manage_nested_record_from_params(parent_record, column, val, avoid_changes) }.compact
@@ -272,7 +267,7 @@ module ActiveScaffold
     end
 
     def save_record_to_association(record, association, value)
-      if association.try(:collection?)
+      if association&.collection?
         record.send(association.name) << value
       elsif association
         record.send("#{association.name}=", value)
@@ -317,9 +312,7 @@ module ActiveScaffold
       if ActiveScaffold::OrmChecks.mongoid? klass
         column.default_val
       elsif ActiveScaffold::OrmChecks.active_record? klass
-        if Rails.version < '4.2'
-          column.default
-        elsif Rails.version < '5.0'
+        if Rails.version < '5.0'
           column.type_cast_from_database(column.default)
         else
           column_type = ActiveScaffold::OrmChecks.column_type(klass, column_name)

data/lib/active_scaffold/bridges.rb

@@ -11,7 +11,7 @@ module ActiveScaffold
     self.bridges = {}
 
     def self.register(file)
-      match = file.match(/(active_scaffold\/bridges\/(.*))\.rb\Z/)
+      match = file.match(%r{(active_scaffold/bridges/(.*))\.rb\Z})
       bridges[match[2].to_sym] = match[1] if match
     end
 
@@ -34,18 +34,18 @@ module ActiveScaffold
 
     def self.run_all
       return false if bridges_run
-      bridges.keys.each do |bridge_name|
-        bridge = self[bridge_name]
-        bridge.run if bridge
+      bridges.each_key do |bridge_name|
+        self[bridge_name]&.run
       end
+      ActiveScaffold::Config::Core.freeze if ActiveScaffold.threadsafe
       self.bridges_run = true
     end
 
     def self.prepare_all
       return false if bridges_prepared
-      bridges.keys.each do |bridge_name|
+      bridges.each_key do |bridge_name|
         bridge = self[bridge_name]
-        bridge.prepare if bridge && bridge.install?
+        bridge.prepare if bridge&.install?
       end
       self.bridges_prepared = true
     end
@@ -53,14 +53,14 @@ module ActiveScaffold
     def self.all_stylesheets
       bridges.keys.collect do |bridge_name|
         bridge = self[bridge_name]
-        bridge.stylesheets if bridge && bridge.install?
+        bridge.stylesheets if bridge&.install?
       end.compact.flatten
     end
 
     def self.all_javascripts
       bridges.keys.collect do |bridge_name|
         bridge = self[bridge_name]
-        bridge.javascripts if bridge && bridge.install?
+        bridge.javascripts if bridge&.install?
       end.compact.flatten
     end
   end

data/lib/active_scaffold/bridges/bitfields/bitfields_bridge.rb

@@ -6,7 +6,7 @@ module ActiveScaffold
           super
           return unless model.respond_to?(:bitfields) && model.bitfields.present?
 
-          model.bitfields.each do |_, options|
+          model.bitfields.each_value do |_, options|
             columns << options.keys
             options.each do |column, value|
               columns[column].form_ui = :checkbox

data/lib/active_scaffold/bridges/calendar_date_select/as_cds_bridge.rb

@@ -36,7 +36,7 @@ module ActiveScaffold
             :class => 'text-input',
             :id => "#{options[:id]}_#{name}",
             :time => column_datetime?(column) ? true : false,
-            :style => (options[:show].nil? || options[:show]) ? nil : 'display: none'
+            :style => ('display: none' if options[:show] == false) # hide only if asked to hide
           )
         end
       end

data/lib/active_scaffold/bridges/cancan/cancan_bridge.rb

@@ -45,12 +45,6 @@ module ActiveScaffold::Bridges
         def beginning_of_chain
           super.accessible_by(current_ability)
         end
-
-        # fix when ability allow access base on id
-        # can [:manage], Client, id: Client.of_employee(user).pluck(:id)
-        def new_model
-          super.tap { |record| record.id = nil }
-        end
       end
     end
 
@@ -66,7 +60,7 @@ module ActiveScaffold::Bridges
         # because the object may change (someone may log in or out). So we give ActiveRecord a proc that ties to the
         # current_ability_method on this ApplicationController.
         def assign_current_ability_to_models
-          ::ActiveRecord::Base.current_ability_proc = proc { send(:current_ability) }
+          ::ActiveScaffold::Registry.current_ability_proc = proc { send(:current_ability) }
         end
       end
 
@@ -74,18 +68,9 @@ module ActiveScaffold::Bridges
         extend ActiveSupport::Concern
 
         module ClassMethods
-          # The proc to call that retrieves the current_ability from the ApplicationController.
-          def current_ability_proc
-            Thread.current[:current_ability_proc]
-          end
-
-          def current_ability_proc=(value)
-            Thread.current[:current_ability_proc] = value
-          end
-
           # Class-level access to the current ability
           def current_ability
-            ::ActiveRecord::Base.current_ability_proc.call if ::ActiveRecord::Base.current_ability_proc
+            ::ActiveScaffold::Registry.current_ability_proc&.call
           end
         end
 
@@ -120,7 +105,7 @@ module ActiveScaffold::Bridges
             crud_type_result = options[:crud_type].nil? ? true : current_ability.can?(options[:crud_type], self)
             action_result = options[:action].nil? ? true : current_ability.can?(options[:action].to_sym, self)
           else
-            crud_type_result, action_result = false, false
+            crud_type_result = action_result = false
           end
           result = (crud_type_result && action_result) || super(options.merge(:reason => nil))
           # return array with nil reason if requested with options[:reason], we don't have reason but caller expects array

data/lib/active_scaffold/bridges/carrierwave/carrierwave_bridge.rb

@@ -9,7 +9,7 @@ module ActiveScaffold
           update.multipart = true
           create.multipart = true
 
-          model.uploaders.keys.each do |field|
+          model.uploaders.each_key do |field|
             configure_carrierwave_field(field.to_sym)
           end
         end

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

@@ -1,17 +1,18 @@
+require 'active_support/concern'
+
 class ActiveScaffold::Bridges::Chosen
   module Helpers
-    def self.included(base)
-      base.class_eval do
-        include FormColumnHelpers
-        include SearchColumnHelpers
-      end
+    extend ActiveSupport::Concern
+    included do
+      include FormColumnHelpers
+      include SearchColumnHelpers
     end
 
     module FormColumnHelpers
       # requires RecordSelect plugin to be installed and configured.
       def active_scaffold_input_chosen(column, html_options)
         html_options[:class] << ' chosen'
-        if column.association.try(:collection?)
+        if column.association&.collection?
           record = html_options.delete(:object)
           associated_options, select_options = active_scaffold_plural_association_options(column, record)
           options = {selected: associated_options.collect(&:id), include_blank: as_(:_select_), object: record}

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

@@ -42,19 +42,6 @@ class ActiveScaffold::Bridges::DatePicker
       end
     end
   end
-
-  module CastExtension
-    def fallback_string_to_date(string)
-      Date.strptime(string, I18n.t('date.formats.default')) rescue super
-    end
-  end
-end
-if defined?(ActiveRecord::ConnectionAdapters::Type) # rails >= 4.2
-  ActiveRecord::ConnectionAdapters::Type::Date.send(:prepend, ActiveScaffold::Bridges::DatePicker::CastExtension)
-else
-  class << ActiveRecord::ConnectionAdapters::Column
-    prepend ActiveScaffold::Bridges::DatePicker::CastExtension
-  end
 end
 
 ActiveScaffold::Config::Core.send :prepend, ActiveScaffold::Bridges::DatePicker::DatePickerBridge

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

@@ -52,7 +52,7 @@ module ActiveScaffold::Bridges
         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
+      rescue StandardError
         raise if locale == I18n.locale
       end
 
@@ -85,7 +85,7 @@ module ActiveScaffold::Bridges
           datetime_picker_options[:ampm] = true if rails_time_format.include?('%I')
         end
         datetime_picker_options
-      rescue
+      rescue StandardError
         raise if locale == I18n.locale
       end
 
@@ -155,7 +155,7 @@ module ActiveScaffold::Bridges
           options = column.options.merge(options).except!(:include_blank, :discard_time, :discard_date, :value)
           options = active_scaffold_input_text_options(options.merge(column.options))
           options[:class] << " #{column.search_ui}"
-          options[:style] = (options[:show].nil? || options[:show]) ? nil : 'display: none'
+          options[:style] = 'display: none' if options[:show] == false # hide only if asked to hide
           format = options.delete(:format) || (column.search_ui == :date_picker ? :default : :picker)
           datepicker_format_options(column, format, options)
           text_field_tag("#{options[:name]}[#{name}]", value ? l(value, :format => format) : nil, options.merge(:id => "#{options[:id]}_#{name}", :name => "#{options[:name]}[#{name}]", :object => nil))

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

@@ -33,7 +33,7 @@ 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)
-    rescue
+    rescue StandardError
       false
     end
   end

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

@@ -9,7 +9,7 @@ module ActiveScaffold
 
           def generate_delete_helpers(klass)
             file_column_fields(klass).each do |field|
-              klass.send :class_eval, <<-EOF, __FILE__, __LINE__ + 1 unless klass.method_defined?(:"#{field}_with_delete=")
+              klass.send :class_eval, <<-END, __FILE__, __LINE__ + 1 unless klass.method_defined?(:"#{field}_with_delete=")
                 attr_reader :delete_#{field}
 
                 def delete_#{field}=(value)
@@ -19,7 +19,7 @@ module ActiveScaffold
                   # 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}_just_uploaded?
                 end
-              EOF
+              END
             end
           end
 
@@ -41,7 +41,7 @@ module ActiveScaffold
           versions = options[:magick][:versions]
           raise unless versions.stringify_keys[version]
           true
-        rescue
+        rescue StandardError
           false
         end
 

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

@@ -1,14 +1,15 @@
-require File.join(File.dirname(__FILE__), '../test_helper.rb')
+require File.expand_path('../test_helper.rb', __dir__)
 
-class DeleteFileColumnTest < Test::Unit::TestCase
+class DeleteFileColumnTest < MiniTest::Test
   def setup
-    DeleteFileColumn.generate_delete_helpers(MockModel)
+    MockModel.extend ActiveScaffold::Bridges::FileColumn::FileColumnHelpers
+    ActiveScaffold::Bridges::FileColumn::FileColumnHelpers.generate_delete_helpers(MockModel)
     @model = MockModel.new
     @model.band_image = 'coolio.jpg'
   end
 
   def test__file_column_fields
-    assert_equal(1, @model.file_column_fields.length)
+    assert_equal(1, @model.class.file_column_fields.length)
   end
 
   def test__delete_band_image__boolean__should_delete
@@ -23,17 +24,17 @@ class DeleteFileColumnTest < Test::Unit::TestCase
 
   def test__delete_band_image__boolean_false__shouldnt_delete
     @model.delete_band_image = false
-    assert_not_nil @model.band_image
+    refute_nil @model.band_image
   end
 
   def test__delete_band_image__string_false__shouldnt_delete
     @model.delete_band_image = 'false'
-    assert_not_nil @model.band_image
+    refute_nil @model.band_image
   end
 
   def test__just_uploaded__shouldnt_delete
     @model.band_image_just_uploaded = true
     @model.delete_band_image = 'true'
-    assert_not_nil(@model.band_image)
+    refute_nil(@model.band_image)
   end
 end

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

@@ -1,7 +1,5 @@
-require 'test/unit'
-require 'rubygems'
-require 'active_support'
+require 'minitest/autorun'
 
-%w[../lib/delete_file_column.rb mock_model.rb].each do |file|
+%w[../file_column_helpers.rb mock_model.rb].each do |file|
   require File.expand_path(File.join(File.dirname(__FILE__), file))
 end

data/lib/active_scaffold/bridges/paper_trail.rb

@@ -7,6 +7,6 @@ class ActiveScaffold::Bridges::PaperTrail < ActiveScaffold::DataStructures::Brid
   end
 
   def self.prepare
-    ActionDispatch::Routing::ACTIVE_SCAFFOLD_CORE_ROUTING[:collection][:deleted] = :get
+    ActiveScaffold::Routing::ACTIVE_SCAFFOLD_CORE_ROUTING[:collection][:deleted] = :get
   end
 end