active_scaffold 3.4.17 → 3.4.18

data/lib/active_scaffold/bridges/date_picker.rb

@@ -2,7 +2,7 @@ module ActiveScaffold::Bridges
   class DatePicker < ActiveScaffold::DataStructures::Bridge
     autoload :Helper, 'active_scaffold/bridges/date_picker/helper'
     def self.install
-      require File.join(File.dirname(__FILE__), "date_picker/ext.rb")
+      require File.join(File.dirname(__FILE__), 'date_picker/ext.rb')
     end
     def self.install?
       ActiveScaffold.js_framework == :jquery && jquery_ui_included?
@@ -20,7 +20,7 @@ module ActiveScaffold::Bridges
     #{Helper.datetime_options_for_locales}
     $.timepicker.setDefaults($.timepicker.regional['#{::I18n.locale}']);
   }
-});\n"        
+});\n"
     end
   end
 end

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

@@ -1,28 +1,26 @@
 class File #:nodoc:
-
   unless File.respond_to?(:binread)
     def self.binread(file)
       File.open(file, 'rb') { |f| f.read }
     end
   end
-
-end 
+end
 
 ActiveScaffold::Config::Core.class_eval do
   def initialize_with_date_picker(model_id)
     initialize_without_date_picker(model_id)
-    
-    date_picker_fields = self.model.columns.collect{|c| {:name => c.name.to_sym, :type => c.type} if [:date, :datetime].include?(c.type) }.compact
+
+    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?
-    
+
     # automatically set the forum_ui to a date_picker or datetime_picker
-    date_picker_fields.each{|field|
-      col_config = self.columns[field[:name]] 
+    date_picker_fields.each do |field|
+      col_config = columns[field[:name]]
       col_config.form_ui = (field[:type] == :date ? :date_picker : :datetime_picker)
-    }
+    end
   end
-  
+
   alias_method_chain :initialize, :date_picker
 end
 
@@ -62,7 +60,7 @@ ActiveScaffold::Finder::ClassMethods.module_eval do
     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

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

@@ -19,43 +19,40 @@ module ActiveScaffold::Bridges
         /%S/ => 'ss',
         /%[cUWwxXZz]/ => ''
       }
-      
+
       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};"
-          else
-            nil
           end
         end.compact.join('')
       end
-      
+
       def self.date_options(locale)
-        begin
-          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,
-          }
-
-          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 = self.to_datepicker_format(I18n.translate!('date.formats.default', :locale => locale, :default => ''))
-          date_picker_options[:dateFormat] = js_format unless js_format.blank?
-          date_picker_options
-        rescue
-          raise if locale == I18n.locale
-        end
+        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
+        }
+
+        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 => ''))
+        date_picker_options[:dateFormat] = js_format unless js_format.blank?
+        date_picker_options
+      rescue
+        raise if locale == I18n.locale
       end
 
       def self.datetime_options_for_locales
@@ -63,37 +60,34 @@ module ActiveScaffold::Bridges
           locale_datetime_options = datetime_options(locale)
           if locale_datetime_options
             "$.timepicker.regional['#{locale}'] = #{locale_datetime_options.to_json};"
-          else
-            nil
           end
         end.compact.join('')
       end
-      
+
       def self.datetime_options(locale)
-        begin
-          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)
-          }
-
-          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?
-
-          date_format, time_format = self.split_datetime_format(self.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
-        rescue
-          raise if locale == I18n.locale
+        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)
+        }
+
+        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?
+
+        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
+      rescue
+        raise if locale == I18n.locale
       end
-      
+
       def self.to_datepicker_format(rails_format)
         return nil if rails_format.nil?
         if rails_format =~ /%[cUWwxXZz]/
@@ -107,27 +101,27 @@ module ActiveScaffold::Bridges
         end
         js_format
       end
-      
+
       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)}
+          start_indicator = time_start_indicators.detect { |indicator| datetime_format.include?(indicator) }
           unless start_indicator.nil?
             pos_time_format = datetime_format.index(start_indicator)
             date_format = datetime_format.to(pos_time_format - 1).strip
             time_format = datetime_format.from(pos_time_format).strip
           end
         end
-        return date_format, time_format
+        [date_format, time_format]
       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
@@ -138,7 +132,7 @@ module ActiveScaffold::Bridges
             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(self.to_datepicker_format(rails_time_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
@@ -147,7 +141,7 @@ module ActiveScaffold::Bridges
           end unless format == :default
         end
       end
-      
+
       module SearchColumnHelpers
         def active_scaffold_search_date_bridge_calendar_control(column, options, current_search, name)
           if current_search.is_a? Hash
@@ -157,21 +151,21 @@ module ActiveScaffold::Bridges
           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.to_s}"
-          options[:style] = (options[:show].nil? || options[:show]) ? nil : "display: none"
+          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))
         end
       end
-      
+
       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
+          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.to_s}"
+          options[:class] << " #{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)

data/lib/active_scaffold/bridges/dragonfly.rb

@@ -1,9 +1,9 @@
 class ActiveScaffold::Bridges::Dragonfly < ActiveScaffold::DataStructures::Bridge
   def self.install
-    require File.join(File.dirname(__FILE__), "dragonfly/form_ui")
-    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")
+    require File.join(File.dirname(__FILE__), 'dragonfly/form_ui')
+    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
   end
 end

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

@@ -4,12 +4,12 @@ module ActiveScaffold
       module DragonflyBridge
         def initialize_with_dragonfly(model_id)
           initialize_without_dragonfly(model_id)
-          return unless self.model.respond_to?(:dragonfly_attachment_classes) && self.model.dragonfly_attachment_classes.present?
+          return unless model.respond_to?(:dragonfly_attachment_classes) && model.dragonfly_attachment_classes.present?
 
-          self.update.multipart = true
-          self.create.multipart = true
+          update.multipart = true
+          create.multipart = true
 
-          self.model.dragonfly_attachment_classes.each do |attachment|
+          model.dragonfly_attachment_classes.each do |attachment|
             configure_dragonfly_field(attachment.attribute)
           end
         end
@@ -19,13 +19,14 @@ module ActiveScaffold
         end
 
         private
+
         def configure_dragonfly_field(field)
-          self.columns << field
-          self.columns[field].form_ui ||= :dragonfly
-          self.columns[field].params.add "remove_#{field}"
+          columns << field
+          columns[field].form_ui ||= :dragonfly
+          columns[field].params.add "remove_#{field}"
 
           [:name, :uid].each do |f|
-            self.columns.exclude("#{field}_#{f}".to_sym)
+            columns.exclude("#{field}_#{f}".to_sym)
           end
         end
       end

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

@@ -3,8 +3,8 @@ 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
+        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))
 
         input = file_field(:record, column.name, options)
@@ -12,17 +12,18 @@ module ActiveScaffold
         if dragonfly.present?
           case ActiveScaffold.js_framework
           when :jquery
-            js_remove_file_code = "jQuery(this).prev().val('true'); jQuery(this).parent().hide().next().show(); return false;";
+            js_remove_file_code = "jQuery(this).prev().val('true'); jQuery(this).parent().hide().next().show(); return false;"
           when :prototype
-            js_remove_file_code = "$(this).previous().value='true'; $(this).up().hide().next().show(); return false;";
+            js_remove_file_code = "$(this).previous().value='true'; $(this).up().hide().next().show(); 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")
+          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

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

@@ -4,11 +4,12 @@ module ActiveScaffold
       def active_scaffold_column_dragonfly(record, column)
         attachment = record.send("#{column.name}")
         return nil unless attachment.present?
-        content = if attachment.image?
-          image_tag(attachment.thumb(column.options[:thumb] || ActiveScaffold::Bridges::Dragonfly::DragonflyBridgeHelpers.thumbnail_style).url, :border => 0)
-        else
-          attachment.name
-        end
+        content =
+          if attachment.image?
+            image_tag(attachment.thumb(column.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), :target => '_blank')
       end
 

data/lib/active_scaffold/bridges/file_column.rb

@@ -1,11 +1,11 @@
 class ActiveScaffold::Bridges::FileColumn < ActiveScaffold::DataStructures::Bridge
   def self.install
     if ActiveScaffold::Config::Core.method_defined?(:initialize_with_file_column)
-      raise RuntimeError, "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"
+      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")
-    require File.join(File.dirname(__FILE__), "file_column/file_column_helpers")
+    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')
+    require File.join(File.dirname(__FILE__), 'file_column/file_column_helpers')
   end
 end

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

@@ -7,40 +7,37 @@ module ActiveScaffold::Config
     attr_accessor :file_column_fields
     def initialize_with_file_column(model_id)
       initialize_without_file_column(model_id)
-      
-      return unless ActiveScaffold::Bridges::FileColumn::FileColumnHelpers.klass_has_file_column_fields?(self.model)
-      
-      self.model.send :extend, ActiveScaffold::Bridges::FileColumn::FileColumnHelpers
-      
+
+      return unless ActiveScaffold::Bridges::FileColumn::FileColumnHelpers.klass_has_file_column_fields?(model)
+
+      model.send :extend, ActiveScaffold::Bridges::FileColumn::FileColumnHelpers
+
       # include the "delete" helpers for use with active scaffold, unless they are already included
-      self.model.generate_delete_helpers
-      
+      model.generate_delete_helpers
+
       # switch on multipart
-      self.update.multipart = true
-      self.create.multipart = true
-      
-      self.model.file_column_fields.each{ |field|
-        configure_file_column_field(field)
-      }
+      update.multipart = true
+      create.multipart = true
+
+      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
-      self.columns[field].list_ui ||= self.model.field_has_image_version?(field, "thumb") ? :thumbnail : :download_link_with_filename
-      self.columns[field].form_ui ||= :file_column
-      
+      columns[field].list_ui ||= model.field_has_image_version?(field, 'thumb') ? :thumbnail : :download_link_with_filename
+      columns[field].form_ui ||= :file_column
+
       # these 2 parameters are necessary helper attributes for the file column that must be allowed to be set to the model by active scaffold.
-      self.columns[field].params.add "#{field}_temp", "delete_#{field}"
-      
+      columns[field].params.add "#{field}_temp", "delete_#{field}"
+
       # set null to false so active_scaffold wont set it to null
       # delete_file_column will take care of deleting a file or not.
-      self.model.columns_hash[field.to_s].instance_variable_set("@null", false)
-      
+      model.columns_hash[field.to_s].instance_variable_set('@null', false)
+
     rescue
       false
     end
-    
   end
 end