active_scaffold 3.5.5 → 3.6.1

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

@@ -0,0 +1,22 @@
+module ActiveScaffold
+  module Helpers
+    # Helpers that assist with the rendering of a Form Column
+    module FormColumnHelpers
+      def active_scaffold_input_active_storage_has_one(column, options)
+        record = options[:object]
+        active_storage = record.send(column.name.to_s)
+        content = active_scaffold_column_active_storage_has_one(record, column) if active_storage.attached?
+        active_scaffold_file_with_remove_link(column, options, content, 'delete_', 'active_storage_controls')
+      end
+
+      def active_scaffold_input_active_storage_has_many(column, options)
+        record = options[:object]
+        options[:multiple] = 'multiple'
+        options[:name] += '[]'
+        active_storage = record.send(column.name.to_s)
+        content = active_scaffold_column_active_storage_has_many(record, column) if active_storage.attached?
+        active_scaffold_file_with_remove_link(column, options, content, 'delete_', 'active_storage_controls')
+      end
+    end
+  end
+end

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

@@ -0,0 +1,36 @@
+module ActiveScaffold
+  module Helpers
+    module ListColumnHelpers
+      def active_scaffold_column_active_storage_has_one(record, column)
+        attachment = record.send(column.name.to_s)
+        attachment.attached? ? link_for_attachment(attachment, column) : nil
+      end
+
+      def active_scaffold_column_active_storage_has_many(record, column)
+        active_storage_files = record.send(column.name.to_s)
+        return nil unless active_storage_files.attached?
+
+        attachments = active_storage_files.attachments
+        if attachments.size <= 3 # Lets display up to three links, otherwise just show the count.
+          links = attachments.map { |attachment| link_for_attachment(attachment, column) }
+          safe_join links, association_join_text(column)
+        else
+          pluralize attachments.size, column.name.to_s
+        end
+      end
+
+      private
+
+      def link_for_attachment(attachment, column)
+        variant = column.options[:thumb] || ActiveScaffold::Bridges::ActiveStorage::ActiveStorageBridgeHelpers.thumbnail_variant
+        content =
+          if variant && attachment.variable? && column.options[:thumb] != false
+            image_tag(attachment.variant(variant))
+          else
+            attachment.filename
+          end
+        link_to(content, rails_blob_url(attachment, disposition: 'attachment'), target: '_blank', rel: 'noopener noreferrer')
+      end
+    end
+  end
+end

data/lib/active_scaffold/bridges/bitfields.rb

@@ -1,6 +1,7 @@
 class ActiveScaffold::Bridges::Bitfields < ActiveScaffold::DataStructures::Bridge
   def self.install
-    require File.join(File.dirname(__FILE__), 'bitfields/bitfields_bridge')
+    Dir[File.join(__dir__, 'bitfields', '*.rb')].each { |file| require file }
     ActiveScaffold::Config::Core.send :prepend, ActiveScaffold::Bridges::Bitfields::BitfieldsBridge
+    ActiveScaffold::Config::Core.after_config_callbacks << :_setup_bitfields
   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
@@ -15,23 +15,20 @@ module ActiveScaffold
           end
         end
 
-        def _load_action_columns
-          if model.respond_to?(:bitfields) && model.bitfields.present?
-            model.bitfields.each do |column_name, options|
-              columns = options.keys.sort_by { |column| self.columns[column].weight }
-              %i[create update show subform].each do |action|
-                next unless actions.include? action
-                if send(action).columns.include? column_name
-                  send(action).columns.exclude column_name
-                  send(action).columns.add_subgroup(column_name) { |group| group.add *columns }
-                else
-                  send(action).columns.exclude *columns
-                end
+        def _setup_bitfields
+          return unless model.respond_to?(:bitfields) && model.bitfields.present?
+          model.bitfields.each do |column_name, options|
+            columns = options.keys.sort_by { |column| self.columns[column].weight }
+            %i[create update show subform].each do |action|
+              next unless actions.include? action
+              if send(action).columns.include? column_name
+                send(action).columns.exclude column_name
+                send(action).columns.add_subgroup(column_name) { |group| group.add(*columns) }
+              else
+                send(action).columns.exclude(*columns)
               end
             end
           end
-
-          super
         end
       end
     end

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

@@ -0,0 +1,19 @@
+module ActiveScaffold
+  module Bridges
+    class Bitfields
+      module ListColumnHelpers
+        def format_column_value(record, column, value = nil)
+          if record.class.respond_to?(:bitfields) && record.class.bitfields&.include?(column.name)
+            value = record.bitfield_values(column.name).select { |_, v| v }.keys
+            safe_join active_scaffold_config.columns.select { |c| c.name.in? value }.map(&:label), ', '
+          else
+            super
+          end
+        end
+      end
+    end
+  end
+end
+ActionView::Base.class_eval do
+  include ActiveScaffold::Bridges::Bitfields::ListColumnHelpers
+end

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

@@ -66,7 +66,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 +74,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 +111,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/carrierwave/list_ui.rb

@@ -7,11 +7,11 @@ module ActiveScaffold
         thumbnail_style = ActiveScaffold::Bridges::Carrierwave::CarrierwaveBridgeHelpers.thumbnail_style
         content =
           if carrierwave.versions.keys.include?(thumbnail_style)
-            image_tag(carrierwave.url(thumbnail_style), :border => 0).html_safe
+            image_tag(carrierwave.url(thumbnail_style), :border => 0)
           else
             record.send(record.send(:_mounter, column.name).send(:serialization_column))
           end
-        link_to(content, carrierwave.url, :target => '_blank')
+        link_to(content, carrierwave.url, :target => '_blank', rel: 'noopener noreferrer')
       end
     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

@@ -24,9 +24,7 @@ module ActiveScaffold::Bridges
       def self.date_options_for_locales
         I18n.available_locales.collect do |locale|
           locale_date_options = date_options(locale)
-          if locale_date_options
-            "$.datepicker.regional['#{locale}'] = #{locale_date_options.to_json};"
-          end
+          "$.datepicker.regional['#{locale}'] = #{locale_date_options.to_json};" if locale_date_options
         end.compact.join('')
       end
 
@@ -52,16 +50,14 @@ 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
 
       def self.datetime_options_for_locales
         I18n.available_locales.collect do |locale|
           locale_datetime_options = datetime_options(locale)
-          if locale_datetime_options
-            "$.timepicker.regional['#{locale}'] = #{locale_datetime_options.to_json};"
-          end
+          "$.timepicker.regional['#{locale}'] = #{locale_datetime_options.to_json};" if locale_datetime_options
         end.compact.join('')
       end
 
@@ -78,21 +74,20 @@ module ActiveScaffold::Bridges
         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?
 
-        date_format, time_format = split_datetime_format(to_datepicker_format(rails_time_format))
-        datetime_picker_options[:dateFormat] = date_format unless date_format.nil?
-        unless time_format.nil?
-          datetime_picker_options[:timeFormat] = time_format
-          datetime_picker_options[:ampm] = true if rails_time_format.include?('%I')
-        end
+        datetime_picker_options.merge! format_to_datetime_picker(rails_time_format)
         datetime_picker_options
-      rescue
+      rescue StandardError
         raise if locale == I18n.locale
       end
 
       def self.to_datepicker_format(rails_format)
         return nil if rails_format.nil?
         if rails_format =~ /%[cUWwxXZz]/
-          Rails.logger.warn("AS DatePicker::Helper: rails date format #{rails_format} includes options which can't be converted to jquery datepicker format. Options %c, %U, %W, %w, %x %X, %z, %Z are not supported by datepicker and will be removed")
+          Rails.logger.warn(
+            "AS DatePicker::Helper: rails date format #{rails_format} includes options "\
+            "which can't be converted to jquery datepicker format. "\
+            'Options %c, %U, %W, %w, %x %X, %z, %Z are not supported by datepicker and will be removed'
+          )
           nil
         end
         js_format = rails_format.dup
@@ -103,6 +98,17 @@ module ActiveScaffold::Bridges
         js_format
       end
 
+      def self.format_to_datetime_picker(rails_time_format)
+        date_format, time_format = split_datetime_format(to_datepicker_format(rails_time_format))
+        datetime_picker_options = {}
+        datetime_picker_options[:dateFormat] = date_format unless date_format.nil?
+        unless time_format.nil?
+          datetime_picker_options[:timeFormat] = time_format
+          datetime_picker_options[:ampm] = true if rails_time_format.include?('%I')
+        end
+        datetime_picker_options
+      end
+
       def self.split_datetime_format(datetime_format)
         date_format = datetime_format
         time_format = nil
@@ -119,46 +125,44 @@ module ActiveScaffold::Bridges
       end
 
       module DatepickerColumnHelpers
-        def datepicker_split_datetime_format(datetime_format)
-          ActiveScaffold::Bridges::DatePicker::Helper.split_datetime_format(datetime_format)
-        end
-
         def to_datepicker_format(rails_format)
           ActiveScaffold::Bridges::DatePicker::Helper.to_datepicker_format(rails_format)
         end
 
-        def datepicker_format_options(column, format, options)
-          unless format == :default
-            if column.form_ui == :date_picker
-              js_format = to_datepicker_format(I18n.translate!("date.formats.#{format}"))
-              options['data-dateFormat'] = js_format unless js_format.nil?
-            else
-              rails_time_format = I18n.translate!("time.formats.#{format}")
-              date_format, time_format = datepicker_split_datetime_format(to_datepicker_format(rails_time_format))
-              options['data-dateFormat'] = date_format unless date_format.nil?
-              unless time_format.nil?
-                options['data-timeFormat'] = time_format
-                options['data-ampm'] = true if rails_time_format.include?('%I')
-              end
-            end
+        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}
+          else
+            rails_time_format = I18n.translate!("time.formats.#{format}")
+            ActiveScaffold::Bridges::DatePicker::Helper.format_to_datetime_picker(rails_time_format)
           end
         end
+
+        def datepicker_format(options, ui)
+          options.delete(:format) || (ui == :date_picker ? :default : :picker)
+        end
       end
 
       module SearchColumnHelpers
         def active_scaffold_search_date_bridge_calendar_control(column, options, current_search, name)
-          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)
-                  else
-                    current_search
-                  end
+          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)
+            else
+              current_search
+            end
           options = column.options.merge(options).except!(:include_blank, :discard_time, :discard_date, :value)
           options = active_scaffold_input_text_options(options.merge(column.options))
+          format = datepicker_format(options, column.search_ui)
           options[:class] << " #{column.search_ui}"
-          options[:style] = (options[:show].nil? || options[:show]) ? nil : 'display: none'
-          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))
+          options[:style] = 'display: none' if options[:show] == false # hide only if asked to hide
+          options[:data] ||= {}
+          options[:data].merge! datepicker_format_options(column, format)
+          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
 
@@ -168,9 +172,10 @@ module ActiveScaffold::Bridges
           options = active_scaffold_input_text_options(options.merge(column.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 = options.delete(:format) || (column.form_ui == :date_picker ? :default : :picker)
-          datepicker_format_options(column, format, options)
+          options[:data] ||= {}
+          options[:data].merge! datepicker_format_options(column, format)
           options[:value] = (value ? l(value, :format => format) : nil)
           text_field(:record, column.name, options)
         end

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

@@ -10,7 +10,7 @@ module ActiveScaffold
           else
             attachment.name
           end
-        link_to(content, dragonfly_url_for_attachment(attachment, record, column), :target => '_blank')
+        link_to(content, dragonfly_url_for_attachment(attachment, record, column), :target => '_blank', rel: 'noopener noreferrer')
       end
 
       def dragonfly_url_for_attachment(attachment, record, column)

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, <<-CODE, __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
+              CODE
             end
           end
 
@@ -41,7 +41,7 @@ module ActiveScaffold
           versions = options[:magick][:versions]
           raise unless versions.stringify_keys[version]
           true
-        rescue
+        rescue StandardError
           false
         end