active_scaffold 3.4.43 → 3.5.0

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

@@ -1,43 +1,63 @@
 class File #:nodoc:
   unless File.respond_to?(:binread)
     def self.binread(file)
-      File.open(file, 'rb') { |f| f.read }
+      File.open(file, 'rb', &:read)
     end
   end
 end
 
-ActiveScaffold::Config::Core.class_eval do
-  def initialize_with_date_picker(model_id)
-    initialize_without_date_picker(model_id)
+class ActiveScaffold::Bridges::DatePicker
+  module DatePickerBridge
+    def initialize(model_id)
+      super
 
-    date_picker_fields = model.columns.collect { |c| {:name => c.name.to_sym, :type => c.type} if [:date, :datetime].include?(c.type) }.compact
-    # check to see if file column was used on the model
-    return if date_picker_fields.empty?
+      date_picker_fields = _columns.collect { |c| {:name => c.name.to_sym, :type => c.type} if %i[date datetime].include?(c.type) }.compact
+      # check to see if file column was used on the model
+      return if date_picker_fields.empty?
 
-    # automatically set the forum_ui to a date_picker or datetime_picker
-    date_picker_fields.each do |field|
-      col_config = columns[field[:name]]
-      col_config.form_ui = (field[:type] == :date ? :date_picker : :datetime_picker)
+      # automatically set the forum_ui to a date_picker or datetime_picker
+      date_picker_fields.each do |field|
+        col_config = columns[field[:name]]
+        col_config.form_ui = (field[:type] == :date ? :date_picker : :datetime_picker)
+      end
     end
   end
 
-  alias_method_chain :initialize, :date_picker
-end
+  module Finder
+    def datetime_conversion_for_condition(column)
+      if column.search_ui == :date_picker
+        :to_date
+      else
+        super
+      end
+    end
+  end
 
-module ActiveScaffold::Bridges::DatePicker::CastExtension
-  def fallback_string_to_date_with_date_picker(string)
-    Date.strptime(string, I18n.t('date.formats.default')) rescue fallback_string_to_date_without_date_picker(string)
+  module AttributeParams
+    def datetime_conversion_for_value(column)
+      if column.form_ui == :date_picker
+        :to_date
+      else
+        super
+      end
+    end
   end
-  def self.included(base)
-    base.alias_method_chain :fallback_string_to_date, :date_picker
+
+  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)
-  ActiveRecord::ConnectionAdapters::Type::Date.send(:include, ActiveScaffold::Bridges::DatePicker::CastExtension)
+if defined?(ActiveRecord::ConnectionAdapters::Type) # rails >= 4.2
+  ActiveRecord::ConnectionAdapters::Type::Date.send(:prepend, ActiveScaffold::Bridges::DatePicker::CastExtension)
 else
-  ActiveRecord::ConnectionAdapters::Column.extend ActiveScaffold::Bridges::DatePicker::CastExtension
+  class << ActiveRecord::ConnectionAdapters::Column
+    prepend ActiveScaffold::Bridges::DatePicker::CastExtension
+  end
 end
 
+ActiveScaffold::Config::Core.send :prepend, ActiveScaffold::Bridges::DatePicker::DatePickerBridge
 ActionView::Base.class_eval do
   include ActiveScaffold::Bridges::Shared::DateBridge::SearchColumnHelpers
   alias_method :active_scaffold_search_date_picker, :active_scaffold_search_date_bridge
@@ -51,28 +71,13 @@ ActionView::Base.class_eval do
   include ActiveScaffold::Bridges::DatePicker::Helper::DatepickerColumnHelpers
 end
 ActiveScaffold::Finder::ClassMethods.module_eval do
+  prepend ActiveScaffold::Bridges::DatePicker::Finder
   include ActiveScaffold::Bridges::Shared::DateBridge::Finder::ClassMethods
-  def datetime_conversion_for_condition_with_datepicker(column)
-    if column.search_ui == :date_picker
-      :to_date
-    else
-      datetime_conversion_for_condition_without_datepicker(column)
-    end
-  end
-  alias_method_chain :datetime_conversion_for_condition, :datepicker
-
   alias_method :condition_for_date_picker_type, :condition_for_date_bridge_type
   alias_method :condition_for_datetime_picker_type, :condition_for_date_picker_type
 end
 ActiveScaffold::AttributeParams.module_eval do
-  def datetime_conversion_for_value_with_datepicker(column)
-    if column.form_ui == :date_picker
-      :to_date
-    else
-      datetime_conversion_for_value_without_datepicker(column)
-    end
-  end
-  alias_method_chain :datetime_conversion_for_value, :datepicker
+  prepend ActiveScaffold::Bridges::DatePicker::AttributeParams
   alias_method :column_value_for_date_picker_type, :column_value_for_datetime_type
   alias_method :column_value_for_datetime_picker_type, :column_value_for_datetime_type
 end

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

@@ -7,9 +7,10 @@ module ActiveScaffold::Bridges
         /%b/ => 'M',
         /%B/ => 'MM',
         /%d/ => 'dd',
-        /%e/ => 'd',
+        /%e|%-d/ => 'd',
         /%j/ => 'oo',
         /%m/ => 'mm',
+        /%-m|%-m/ => 'm',
         /%y/ => 'y',
         /%Y/ => 'yy',
         /%H/ => 'HH', # options ampm => false
@@ -18,7 +19,7 @@ module ActiveScaffold::Bridges
         /%p/ => 'tt',
         /%S/ => 'ss',
         /%[cUWwxXZz]/ => ''
-      }
+      }.freeze
 
       def self.date_options_for_locales
         I18n.available_locales.collect do |locale|
@@ -49,7 +50,7 @@ module ActiveScaffold::Bridges
         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 => ''))
-        date_picker_options[:dateFormat] = js_format unless js_format.blank?
+        date_picker_options[:dateFormat] = js_format if js_format.present?
         date_picker_options
       rescue
         raise if locale == I18n.locale
@@ -95,7 +96,7 @@ module ActiveScaffold::Bridges
           nil
         end
         js_format = rails_format.dup
-        js_format.gsub! /([ ]|^)([^% ]\S*)/, " '\\2'"
+        js_format.gsub!(/([ ]|^)([^% ]\S*)/, " '\\2'")
         DATE_FORMAT_CONVERSION.each do |key, value|
           js_format.gsub!(key, value)
         end
@@ -105,7 +106,7 @@ module ActiveScaffold::Bridges
       def self.split_datetime_format(datetime_format)
         date_format = datetime_format
         time_format = nil
-        time_start_indicators = %w(HH hh mm tt ss)
+        time_start_indicators = %w[HH hh mm tt ss]
         unless datetime_format.nil?
           start_indicator = time_start_indicators.detect { |indicator| datetime_format.include?(indicator) }
           unless start_indicator.nil?
@@ -127,28 +128,30 @@ module ActiveScaffold::Bridges
         end
 
         def datepicker_format_options(column, format, options)
-          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')
+          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
-          end unless format == :default
+          end
         end
       end
 
       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.search_ui == :date_picker ? :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.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))
           options[:class] << " #{column.search_ui}"
@@ -162,8 +165,6 @@ module ActiveScaffold::Bridges
       module FormColumnHelpers
         def active_scaffold_input_date_picker(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))
           options[:class] << " #{column.form_ui}"
 

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 :include, ActiveScaffold::Bridges::Dragonfly::DragonflyBridge
+    ActiveScaffold::Config::Core.send :prepend, ActiveScaffold::Bridges::Dragonfly::DragonflyBridge
   end
 end

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

@@ -2,8 +2,8 @@ module ActiveScaffold
   module Bridges
     class Dragonfly
       module DragonflyBridge
-        def initialize_with_dragonfly(model_id)
-          initialize_without_dragonfly(model_id)
+        def initialize(model_id)
+          super
           return unless model.respond_to?(:dragonfly_attachment_classes) && model.dragonfly_attachment_classes.present?
 
           update.multipart = true
@@ -14,10 +14,6 @@ module ActiveScaffold
           end
         end
 
-        def self.included(base)
-          base.alias_method_chain :initialize, :dragonfly
-        end
-
         private
 
         def configure_dragonfly_field(field)
@@ -25,7 +21,7 @@ module ActiveScaffold
           columns[field].form_ui ||= :dragonfly
           columns[field].params.add "remove_#{field}"
 
-          [:name, :uid].each do |f|
+          %i[name uid].each do |f|
             columns.exclude("#{field}_#{f}".to_sym)
           end
         end

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

@@ -3,31 +3,9 @@ module ActiveScaffold
     module FormColumnHelpers
       def active_scaffold_input_dragonfly(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))
-        dragonfly = record.send("#{column.name}")
-
-        required = options.delete(:required) if dragonfly.present?
-        input = file_field(:record, column.name, options)
-        if dragonfly.present?
-          case ActiveScaffold.js_framework
-          when :jquery
-            js_remove_file_code = "jQuery(this).prev().val('true'); jQuery(this).parent().hide().next().show()#{".find('input').attr('required', 'required')" if required}; return false;"
-          when :prototype
-            js_remove_file_code = "$(this).previous().value='true'; $(this).up().hide().next().show()#{".down().writeAttribute('required', 'required')" if required}; return false;"
-          end
-
-          content = active_scaffold_column_dragonfly(record, column)
-          content_tag(
-            :div,
-            content + ' | ' +
-              hidden_field(:record, "remove_#{column.name}", :value => 'false') +
-              content_tag(:a, as_(:remove_file), :href => '#', :onclick => js_remove_file_code)
-          ) + content_tag(:div, input, :style => 'display: none')
-        else
-          input
-        end
+        dragonfly = record.send(column.name.to_s)
+        content = active_scaffold_column_dragonfly(record, column) if dragonfly.present?
+        active_scaffold_file_with_remove_link(column, options, content, 'remove_', 'dragonfly_controls')
       end
     end
   end

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

@@ -2,8 +2,8 @@ module ActiveScaffold
   module Helpers
     module ListColumnHelpers
       def active_scaffold_column_dragonfly(record, column)
-        attachment = record.send("#{column.name}")
-        return nil unless attachment.present?
+        attachment = record.send(column.name.to_s)
+        return nil if attachment.blank?
         content =
           if attachment.image?
             image_tag(attachment.thumb(column.options[:thumb] || ActiveScaffold::Bridges::Dragonfly::DragonflyBridgeHelpers.thumbnail_style).url, :border => 0)

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

@@ -2,11 +2,11 @@ ActiveScaffold::DataStructures::Column.class_eval do
   attr_accessor :file_column_display
 end
 
-module ActiveScaffold::Config
-  class Core < Base
+class ActiveScaffold::Bridges::FileColumn
+  module FileColumnBridge
     attr_accessor :file_column_fields
-    def initialize_with_file_column(model_id)
-      initialize_without_file_column(model_id)
+    def initialize(model_id)
+      super
 
       return unless ActiveScaffold::Bridges::FileColumn::FileColumnHelpers.klass_has_file_column_fields?(model)
 
@@ -22,8 +22,6 @@ module ActiveScaffold::Config
       model.file_column_fields.each { |field| configure_file_column_field(field) }
     end
 
-    alias_method_chain :initialize, :file_column unless self.method_defined?(:initialize_without_file_column)
-
     def configure_file_column_field(field)
       # set list_ui first because it gets its default value from form_ui
       columns[field].list_ui ||= model.field_has_image_version?(field, 'thumb') ? :thumbnail : :download_link_with_filename
@@ -34,10 +32,10 @@ module ActiveScaffold::Config
 
       # set null to false so active_scaffold wont set it to null
       # delete_file_column will take care of deleting a file or not.
-      model.columns_hash[field.to_s].instance_variable_set('@null', false)
-
+      _columns_hash[field.to_s].instance_variable_set('@null', false)
     rescue
       false
     end
   end
 end
+ActiveScaffold::Config::Core.send :prepend, ActiveScaffold::Bridges::FileColumn::FileColumnBridge

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, <<-EOF, __FILE__, __LINE__ + 1 unless klass.method_defined?(:"#{field}_with_delete=")
                 attr_reader :delete_#{field}
 
                 def delete_#{field}=(value)

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

@@ -4,8 +4,6 @@ module ActiveScaffold
     module FormColumnHelpers
       def active_scaffold_input_file_column(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
         if record.send(column.name)
           # we already have a value? display the form for deletion.
           case ActiveScaffold.js_framework

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

@@ -18,7 +18,8 @@ module ActiveScaffold
         link_to(
           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
   end

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

@@ -2,6 +2,6 @@ require 'test/unit'
 require 'rubygems'
 require 'active_support'
 
-%w(../lib/delete_file_column.rb mock_model.rb).each do |file|
+%w[../lib/delete_file_column.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/actions.rb

@@ -11,7 +11,7 @@ module ActiveScaffold::Actions
 
     def deleted
       query = PaperTrail::Version.destroys.where(:item_type => active_scaffold_config.model)
-      query = query.where_object(nested.child_association.foreign_key => nested.parent_id) if nested? && nested.child_association.macro == :belongs_to && PaperTrail::Version.respond_to?(:where_object)
+      query = query.where_object(nested.child_association.foreign_key => nested.parent_id) if nested? && nested.child_association.belongs_to? && PaperTrail::Version.respond_to?(:where_object)
       pager = Paginator.new(query.count, active_scaffold_config.list.per_page) do |offset, per_page|
         query.offset(offset).limit(per_page).map(&:reify)
       end

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

@@ -1,8 +1,7 @@
 module ActiveScaffold::Bridges
   class PaperTrail
     module Helper
-      def filter_action_links_for_deleted(action_links, record, options)
-      end
+      def filter_action_links_for_deleted(action_links, record, options); end
 
       def display_action_links(action_links, record, options, &block)
         if action_name == 'deleted'

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

@@ -2,17 +2,13 @@ module ActiveScaffold
   module Bridges
     class PaperTrail
       module PaperTrailBridge
-        def initialize_with_paper_trail(model_id)
-          initialize_without_paper_trail(model_id)
+        def initialize(model_id)
+          super
           return unless model < ::PaperTrail::Model::InstanceMethods
           actions << :deleted_records
         end
-
-        def self.included(base)
-          base.alias_method_chain :initialize, :paper_trail
-        end
       end
     end
   end
 end
-ActiveScaffold::Config::Core.send :include, ActiveScaffold::Bridges::PaperTrail::PaperTrailBridge
+ActiveScaffold::Config::Core.send :prepend, ActiveScaffold::Bridges::PaperTrail::PaperTrailBridge

data/lib/active_scaffold/bridges/paperclip.rb

@@ -7,6 +7,6 @@ class ActiveScaffold::Bridges::Paperclip < ActiveScaffold::DataStructures::Bridg
     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 :include, ActiveScaffold::Bridges::Paperclip::PaperclipBridge
+    ActiveScaffold::Config::Core.send :prepend, ActiveScaffold::Bridges::Paperclip::PaperclipBridge
   end
 end

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

@@ -3,34 +3,9 @@ module ActiveScaffold
     module FormColumnHelpers
       def active_scaffold_input_paperclip(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))
-        paperclip = record.send("#{column.name}")
-
-        required = options.delete(:required) if paperclip.file?
-        input = file_field(:record, column.name, options)
-        if paperclip.file?
-          case ActiveScaffold.js_framework
-          when :jquery
-            js_remove_file_code = "jQuery(this).prev().val('true'); jQuery(this).parent().hide().next().show()#{".find('input').attr('required', 'required')" if required}; return false;"
-          when :prototype
-            js_remove_file_code = "$(this).previous().value='true'; $(this).up().hide().next().show()#{".down().writeAttribute('required', 'required')" if required}; return false;"
-          end
-
-          object_name, method = options[:name].split(/\[(#{column.name})\]/)
-          method.sub!(/#{column.name}/, 'delete_\0')
-
-          content = active_scaffold_column_paperclip(record, column)
-          content_tag(
-            :div,
-            content + ' | ' +
-              hidden_field(object_name, method, :value => 'false') +
-              content_tag(:a, as_(:remove_file), :href => '#', :onclick => js_remove_file_code)
-          ) + content_tag(:div, input, :style => 'display: none')
-        else
-          input
-        end
+        paperclip = record.send(column.name.to_s)
+        content = active_scaffold_column_paperclip(record, column) if paperclip.file?
+        active_scaffold_file_with_remove_link(column, options, content, 'delete_', 'paperclip_controls')
       end
     end
   end