active_scaffold 3.4.43 → 3.5.0

data/lib/active_scaffold/bridges.rb

@@ -29,7 +29,7 @@ module ActiveScaffold
       bridge
     end
     class << self
-      alias_method :[], :load
+      alias [] load
     end
 
     def self.run_all

data/lib/active_scaffold/bridges/ancestry/ancestry_bridge.rb

@@ -1,32 +1,27 @@
-ActiveScaffold::Config::Core.class_eval do
-  def initialize_with_ancestry(model_id)
-    initialize_without_ancestry(model_id)
+module ActiveScaffold::Bridges
+  class Ancestry
+    module AncestryBridge
+      def initialize(model_id)
+        super(model_id)
 
-    return unless model.respond_to? :ancestry_column
+        return unless model.respond_to? :ancestry_column
 
-    columns << :parent_id
-    columns[:parent_id].form_ui = :ancestry
-    update.columns.exclude :ancestry
-    create.columns.exclude :ancestry, :parent_id
-    list.columns.exclude :ancestry, :parent_id
-  end
-
-  alias_method_chain :initialize, :ancestry
-end
+        columns << :parent_id
+        columns[:parent_id].form_ui = :ancestry
+        update.columns.exclude :ancestry
+        create.columns.exclude :ancestry, :parent_id
+        list.columns.exclude :ancestry, :parent_id
+      end
+    end
 
-module ActiveScaffold::Bridges
-  class Ancestry
     module FormColumnHelpers
       def active_scaffold_input_ancestry(column, options)
         record = options[: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
-
         select_options = []
         select_control_options = {:selected => record.parent_id}
         select_control_options[:include_blank] = as_(:_select_) if record.parent_id.nil?
         method = column.options[:label_method] || :to_label
-        traverse_ancestry = proc do|key, value|
+        traverse_ancestry = proc do |key, value|
           unless key == record
             select_options << ["#{'__' * key.depth}#{key.send(method)}", key.id]
             value.each(&traverse_ancestry) if value.is_a?(Hash) && !value.empty?
@@ -42,3 +37,4 @@ end
 ActionView::Base.class_eval do
   include ActiveScaffold::Bridges::Ancestry::FormColumnHelpers
 end
+ActiveScaffold::Config::Core.send :prepend, ActiveScaffold::Bridges::Ancestry::AncestryBridge

data/lib/active_scaffold/bridges/bitfields.rb

@@ -1,6 +1,6 @@
 class ActiveScaffold::Bridges::Bitfields < ActiveScaffold::DataStructures::Bridge
   def self.install
     require File.join(File.dirname(__FILE__), 'bitfields/bitfields_bridge')
-    ActiveScaffold::Config::Core.send :include, ActiveScaffold::Bridges::Bitfields::BitfieldsBridge
+    ActiveScaffold::Config::Core.send :prepend, ActiveScaffold::Bridges::Bitfields::BitfieldsBridge
   end
 end

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

@@ -2,8 +2,8 @@ module ActiveScaffold
   module Bridges
     class Bitfields
       module BitfieldsBridge
-        def initialize_with_bitfields(model_id)
-          initialize_without_bitfields(model_id)
+        def initialize(model_id)
+          super
           return unless model.respond_to?(:bitfields) && model.bitfields.present?
 
           model.bitfields.each do |_, options|
@@ -15,11 +15,12 @@ module ActiveScaffold
           end
         end
 
-        def _load_action_columns_with_bitfields
-          model.bitfields.each do |column_name, options|
-            columns = options.keys.sort_by { |column| self.columns[column].weight }
-            [:create, :update, :show, :subform].each do |action|
-              if actions.include? action
+        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 }
@@ -28,14 +29,9 @@ module ActiveScaffold
                 end
               end
             end
-          end if model.respond_to?(:bitfields) && model.bitfields.present?
-
-          _load_action_columns_without_bitfields
-        end
+          end
 
-        def self.included(base)
-          base.alias_method_chain :initialize, :bitfields
-          base.alias_method_chain :_load_action_columns, :bitfields
+          super
         end
       end
     end

data/lib/active_scaffold/bridges/calendar_date_select.rb

@@ -1,12 +1,5 @@
 class ActiveScaffold::Bridges::CalendarDateSelect < ActiveScaffold::DataStructures::Bridge
   def self.install
-    # check to see if the old bridge was installed.  If so, warn them
-    # we can detect this by checking to see if the bridge was installed before calling this code
-
-    if ActiveScaffold::Config::Core.method_defined?(:initialize_with_calendar_date_select)
-      raise "We've detected that you have active_scaffold_calendar_date_select_bridge installed.  This plugin has been moved to core.  Please remove active_scaffold_calendar_date_select_bridge to prevent any conflicts"
-    end
-
     require File.join(File.dirname(__FILE__), 'calendar_date_select/as_cds_bridge.rb')
   end
 

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

@@ -1,23 +1,19 @@
-module ActiveScaffold::Config
-  class Core < Base
-    def initialize_with_calendar_date_select(model_id)
-      initialize_without_calendar_date_select(model_id)
-
-      calendar_date_select_fields = model.columns.collect { |c| c.name.to_sym if [:date, :datetime].include?(c.type) }.compact
-      # check to see if file column was used on the model
-      return if calendar_date_select_fields.empty?
-
-      # automatically set the forum_ui to a file column
-      calendar_date_select_fields.each { |field| columns[field].form_ui = :calendar_date_select }
-    end
-
-    alias_method_chain :initialize, :calendar_date_select
-  end
-end
-
 module ActiveScaffold
   module Bridges
     class CalendarDateSelect
+      module CalendarDateSelectBridge
+        def initialize(model_id)
+          initialize_without_calendar_date_select(model_id)
+
+          calendar_date_select_fields = _columns.collect { |c| c.name.to_sym if %i[date datetime].include?(c.type) }.compact
+          # check to see if file column was used on the model
+          return if calendar_date_select_fields.empty?
+
+          # automatically set the forum_ui to a file column
+          calendar_date_select_fields.each { |field| columns[field].form_ui = :calendar_date_select }
+        end
+      end
+
       # Helpers that assist with the rendering of a Form Column
       module FormColumnHelpers
         def active_scaffold_input_calendar_date_select(column, options)
@@ -28,11 +24,11 @@ module ActiveScaffold
 
       module SearchColumnHelpers
         def active_scaffold_search_date_bridge_calendar_control(column, options, current_search, name)
-          if current_search.is_a? Hash
-            value = controller.class.condition_value_for_datetime(column, current_search[name], column.column.type == :date ? :to_date : :to_time)
-          else
-            value = current_search
-          end
+          value = if current_search.is_a? Hash
+                    controller.class.condition_value_for_datetime(column, current_search[name], column.column.type == :date ? :to_date : :to_time)
+                  else
+                    current_search
+                  end
           calendar_date_select(
             'record', column.name,
             :name => "#{options[:name]}[#{name}]",
@@ -61,3 +57,4 @@ ActiveScaffold::Finder::ClassMethods.module_eval do
   include ActiveScaffold::Bridges::Shared::DateBridge::Finder::ClassMethods
   alias_method :condition_for_calendar_date_select_type, :condition_for_date_bridge_type
 end
+ActiveScaffold::Config::Core.send :prepend, ActiveScaffold::Bridges::CalendarDateSelect::CalendarDateSelectBridge

data/lib/active_scaffold/bridges/cancan.rb

@@ -2,14 +2,15 @@ class ActiveScaffold::Bridges::Cancan < ActiveScaffold::DataStructures::Bridge
   def self.install
     require File.join(File.dirname(__FILE__), 'cancan', 'cancan_bridge.rb')
 
-    ActiveScaffold::Core::ClassMethods.send :include, ActiveScaffold::Bridges::Cancan::ClassMethods
-    ActiveScaffold::Actions::Core.send :include, ActiveScaffold::Bridges::Cancan::Actions::Core
-    ActiveScaffold::Actions::Nested.send :include, ActiveScaffold::Bridges::Cancan::Actions::Core
+    ActiveScaffold::Core::ClassMethods.send :prepend, ActiveScaffold::Bridges::Cancan::ClassMethods
+    ActiveScaffold::Actions::Core.send :prepend, ActiveScaffold::Bridges::Cancan::Actions::Core
+    ActiveScaffold::Actions::Nested.send :prepend, ActiveScaffold::Bridges::Cancan::Actions::Core
     ActionController::Base.send :include, ActiveScaffold::Bridges::Cancan::ModelUserAccess::Controller
     ActionView::Base.send :include, ActiveScaffold::Bridges::Cancan::AssociationHelpers
     ::ActiveRecord::Base.send :include, ActiveScaffold::Bridges::Cancan::ModelUserAccess::Model
     ::ActiveRecord::Base.send :include, ActiveScaffold::Bridges::Cancan::ActiveRecord
   end
+
   def self.install?
     Object.const_defined? 'CanCan'
   end

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

@@ -23,13 +23,8 @@ module ActiveScaffold::Bridges
     # As already has callbacks to ensure authorization at controller method via "authorization_method"
     # but let's include this too, just in case, no sure how performance is affected tough :TODO benchmark
     module ClassMethods
-      extend ActiveSupport::Concern
-      included do
-        alias_method_chain :active_scaffold, :cancan
-      end
-
-      def active_scaffold_with_cancan(model_id = nil, &block)
-        active_scaffold_without_cancan(model_id, &block)
+      def active_scaffold(model_id = nil, &block)
+        super
         authorize_resource(
           :class => active_scaffold_config.model,
           :instance => :record
@@ -46,13 +41,9 @@ module ActiveScaffold::Bridges
     # beginning of chain integration
     module Actions
       module Core
-        extend ActiveSupport::Concern
-        included do
-          alias_method_chain :beginning_of_chain, :cancan
-        end
         # :TODO can this be expanded more ?
-        def beginning_of_chain_with_cancan
-          beginning_of_chain_without_cancan.accessible_by(current_ability)
+        def beginning_of_chain
+          super.accessible_by(current_ability)
         end
       end
     end
@@ -62,7 +53,7 @@ module ActiveScaffold::Bridges
       module Controller
         extend ActiveSupport::Concern
         included do
-          prepend_before_filter :assign_current_ability_to_models
+          prepend_before_action :assign_current_ability_to_models
         end
 
         # We need to give the ActiveRecord classes a handle to the current ability. We don't want to just pass the object,
@@ -103,11 +94,9 @@ module ActiveScaffold::Bridges
     module ActiveRecord
       extend ActiveSupport::Concern
       included do
-        extend SecurityMethods
-        include SecurityMethods
-        alias_method_chain :authorized_for?, :cancan
+        prepend SecurityMethods
         class << self
-          alias_method_chain :authorized_for?, :cancan
+          prepend SecurityMethods
         end
       end
 
@@ -119,7 +108,7 @@ module ActiveScaffold::Bridges
         #     {:action=>"edit"}
         # to allow access cancan must allow both :crud_type and :action
         # if cancan says "no", it delegates to default AS behavior
-        def authorized_for_with_cancan?(options = {})
+        def authorized_for?(options = {})
           raise InvalidArgument if options[:crud_type].blank? && options[:action].blank?
           if current_ability.present?
             crud_type_result = options[:crud_type].nil? ? true : current_ability.can?(options[:crud_type], self)
@@ -127,8 +116,9 @@ module ActiveScaffold::Bridges
           else
             crud_type_result, action_result = false, false
           end
-          default_result = authorized_for_without_cancan?(options)
-          (crud_type_result && action_result) || default_result
+          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
+          options[:reason] ? [result, nil] : result
         end
       end
     end

data/lib/active_scaffold/bridges/carrierwave.rb

@@ -4,8 +4,9 @@ class ActiveScaffold::Bridges::Carrierwave < ActiveScaffold::DataStructures::Bri
     require File.join(File.dirname(__FILE__), 'carrierwave/list_ui')
     require File.join(File.dirname(__FILE__), 'carrierwave/carrierwave_bridge_helpers')
     require File.join(File.dirname(__FILE__), 'carrierwave/carrierwave_bridge')
-    ActiveScaffold::Config::Core.send :include, ActiveScaffold::Bridges::Carrierwave::CarrierwaveBridge
+    ActiveScaffold::Config::Core.send :prepend, ActiveScaffold::Bridges::Carrierwave::CarrierwaveBridge
   end
+
   def self.install?
     Object.const_defined? 'CarrierWave'
   end

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

@@ -2,8 +2,8 @@ module ActiveScaffold
   module Bridges
     class Carrierwave
       module CarrierwaveBridge
-        def initialize_with_carrierwave(model_id)
-          initialize_without_carrierwave(model_id)
+        def initialize(model_id)
+          super
           return unless model.respond_to?(:uploaders) && model.uploaders.present?
 
           update.multipart = true
@@ -14,10 +14,6 @@ module ActiveScaffold
           end
         end
 
-        def self.included(base)
-          base.alias_method_chain :initialize, :carrierwave
-        end
-
         private
 
         def configure_carrierwave_field(field)

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

@@ -3,47 +3,14 @@ module ActiveScaffold
     module FormColumnHelpers
       def active_scaffold_input_carrierwave(column, options)
         record = options[: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
-        options = active_scaffold_input_text_options(options.merge(column.options))
-
-        carrierwave = record.send("#{column.name}")
-        if !carrierwave.file.blank?
-          required = options.delete(:required)
-          remove_field_options = {
-            :name => options[:name].gsub(/\[#{column.name}\]$/, "[remove_#{column.name}]"),
-            :id => 'remove_' + options[:id],
-            :value => false
-          }
-
+        carrierwave = record.send(column.name.to_s)
+        content = get_column_value(record, column) if carrierwave.file.present?
+        active_scaffold_file_with_remove_link(column, options, content, 'remove_', 'carrierwave_controls') do
           cache_field_options = {
-            :name => options[:name].gsub(/\[#{column.name}\]$/, "[#{column.name}_cache]"),
-            :id => options[:id] + '_cache'
+            name: options[:name].gsub(/\[#{column.name}\]$/, "[#{column.name}_cache]"),
+            id: options[:id] + '_cache'
           }
-
-          case ActiveScaffold.js_framework
-          when :jquery
-            js_remove_file_code = "jQuery(this).prev('input#remove_#{options[:id]}').val('true'); jQuery(this).parent().hide().next().show()#{".find('input').attr('required', 'required')" if required}; return false;"
-            js_dont_remove_file_code = "jQuery(this).parents('div.carrierwave_controls').find('input#remove_#{options[:id]}').val('false'); return false;"
-          when :prototype
-            js_remove_file_code = "$(this).previous('input#remove_#{options[:id]}').value='true'; $(this).up().hide().next().show()#{".down().writeAttribute('required', 'required')" if required}; return false;"
-            js_dont_remove_file_code = "$(this).up('div.carrierwave_controls').down('input#remove_#{options[:id]}').value='false'; return false;"
-          end
-
-          input = file_field(:record, column.name, options.merge(:onchange => js_dont_remove_file_code))
-          content_tag(
-            :div,
-            content_tag(:div, (
-                get_column_value(record, column) + ' | ' +
-                  hidden_field(:record, "#{column.name}_cache", cache_field_options) +
-                  hidden_field(:record, "remove_#{column.name}", remove_field_options) +
-                  content_tag(:a, as_(:remove_file), :href => '#', :onclick => js_remove_file_code)
-              ).html_safe
-            ) + content_tag(:div, input, :style => 'display: none'),
-            :class => 'carrierwave_controls'
-          )
-        else
-          file_field(:record, column.name, options)
+          hidden_field(:record, "#{column.name}_cache", cache_field_options)
         end
       end
     end

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

@@ -2,7 +2,7 @@ module ActiveScaffold
   module Helpers
     module ListColumnHelpers
       def active_scaffold_column_carrierwave(record, column)
-        carrierwave = record.send("#{column.name}")
+        carrierwave = record.send(column.name.to_s)
         return nil if carrierwave.file.blank?
         thumbnail_style = ActiveScaffold::Bridges::Carrierwave::CarrierwaveBridgeHelpers.thumbnail_style
         content =

data/lib/active_scaffold/bridges/chosen.rb

@@ -2,12 +2,15 @@ class ActiveScaffold::Bridges::Chosen < ActiveScaffold::DataStructures::Bridge
   def self.install
     require File.join(File.dirname(__FILE__), 'chosen/helpers.rb')
   end
+
   def self.install?
-    super && [:jquery, :prototype].include?(ActiveScaffold.js_framework)
+    super && %i[jquery prototype].include?(ActiveScaffold.js_framework)
   end
+
   def self.stylesheets
     'chosen'
   end
+
   def self.javascripts
     ["chosen-#{ActiveScaffold.js_framework}", "#{ActiveScaffold.js_framework}/active_scaffold_chosen"]
   end

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

@@ -11,13 +11,13 @@ class ActiveScaffold::Bridges::Chosen
       # requires RecordSelect plugin to be installed and configured.
       def active_scaffold_input_chosen(column, html_options)
         html_options[:class] << ' chosen'
-        if column.plural_association?
+        if column.association.try(:collection?)
           associated_options, select_options = active_scaffold_plural_association_options(column)
           options = {:selected => associated_options.collect(&:id), :include_blank => as_(:_select_)}
 
           html_options.update(:multiple => true).update(column.options[:html_options] || {})
           options.update(column.options)
-          html_options[:name] = "#{html_options[:name]}[]" if html_options[:multiple] == true && !html_options[:name].to_s.ends_with?('[]')
+          active_scaffold_select_name_with_multiple html_options
 
           if (optgroup = options.delete(:optgroup))
             select(:record, column.name, active_scaffold_grouped_options(column, select_options, optgroup), options, html_options)
@@ -39,6 +39,7 @@ class ActiveScaffold::Bridges::Chosen
       def active_scaffold_search_multi_chosen(column, options)
         options[:class] << ' chosen'
         options[:multiple] = true
+        options[:'data-placeholder'] = column.options[:placeholder] || as_(:_select_)
         active_scaffold_search_select(column, options)
       end
     end

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

@@ -5,7 +5,7 @@ module ActiveScaffold::Bridges
         select_options = {:prompt => as_(:_select_), :priority_countries => column.options[:priority] || [:us], :format => column.options[:format]}
         select_options.merge!(options)
         options.reverse_merge!(column.options).except!(:prompt, :priority, :format)
-        options[:name] += '[]' if options[:multiple]
+        active_scaffold_select_name_with_multiple options
         country_select(:record, column.name, select_options, options.except(:object))
       end
     end
@@ -29,7 +29,7 @@ module ActiveScaffold::Bridges
 end
 
 # To use old way, saving country name instead of CountrySelect default of country code
-CountrySelect::FORMATS[:old] = lambda { |country| [country.translations[I18n.locale.to_s] || country.name, country.name] }
+CountrySelect::FORMATS[:old] = ->(country) { [country.translations[I18n.locale.to_s] || country.name, country.name] }
 
 ActionView::Base.class_eval do
   include ActiveScaffold::Bridges::CountrySelect::FormColumnHelpers

data/lib/active_scaffold/bridges/date_picker.rb

@@ -4,12 +4,15 @@ module ActiveScaffold::Bridges
     def self.install
       require File.join(File.dirname(__FILE__), 'date_picker/ext.rb')
     end
+
     def self.install?
       ActiveScaffold.js_framework == :jquery && jquery_ui_included?
     end
+
     def self.jquery_ui_included?
       Jquery::Rails.const_defined?('JQUERY_UI_VERSION') || Jquery.const_defined?('Ui') if Object.const_defined?('Jquery')
     end
+
     def self.localization
       "jQuery(function($){
   if (typeof($.datepicker) === 'object') {