active_scaffold 3.4.17 → 3.4.18

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

@@ -4,50 +4,47 @@ module ActiveScaffold
       module FileColumnHelpers
         class << self
           def file_column_fields(klass)
-            klass.instance_methods.select{|m| m.to_s =~ /_just_uploaded\?$/}.collect{|m| m[0..-16].to_sym }
+            klass.instance_methods.select { |m| m.to_s =~ /_just_uploaded\?$/ }.collect { |m| m[0..-16].to_sym }
           end
-          
+
           def generate_delete_helpers(klass)
-            file_column_fields(klass).each { |field|
+            file_column_fields(klass).each do |field|
               klass.send :class_eval, <<-EOF, __FILE__, __LINE__ + 1  unless klass.method_defined?(:"#{field}_with_delete=")
                 attr_reader :delete_#{field}
-                
+
                 def delete_#{field}=(value)
                   value = (value=="true") if String===value
                   return unless value
-                  
+
                   # 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
-          
+
           def klass_has_file_column_fields?(klass)
             true unless file_column_fields(klass).empty?
           end
         end
-        
+
         def file_column_fields
-          @file_column_fields||=FileColumnHelpers.file_column_fields(self)
+          @file_column_fields ||= FileColumnHelpers.file_column_fields(self)
         end
-        
+
         def options_for_file_column_field(field)
-          self.allocate.send("#{field}_options")
+          allocate.send("#{field}_options")
         end
-        
-        def field_has_image_version?(field, version="thumb")
-          begin
-            # the only way to get to the options of a particular field is to use the instance method
-            options = options_for_file_column_field(field)
-            versions = options[:magick][:versions]
-            raise unless versions.stringify_keys[version]
-            true
-          rescue
-            false
-          end
+
+        def field_has_image_version?(field, version = 'thumb')
+          options = options_for_file_column_field(field)
+          versions = options[:magick][:versions]
+          raise unless versions.stringify_keys[version]
+          true
+        rescue
+          false
         end
-        
+
         def generate_delete_helpers
           FileColumnHelpers.generate_delete_helpers(self)
         end

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

@@ -4,32 +4,31 @@ 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) 
+        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
           when :jquery
-            remove_file_js = "jQuery(this).prev().val('true'); jQuery(this).parent().hide().next().show(); return false;";
+            remove_file_js = "jQuery(this).prev().val('true'); jQuery(this).parent().hide().next().show(); return false;"
           when :prototype
-            remove_file_js = "$(this).previous().value='true'; p=$(this).up(); p.hide(); p.next().show(); return false;";
-          end            
-          
+            remove_file_js = "$(this).previous().value='true'; p=$(this).up(); p.hide(); p.next().show(); return false;"
+          end
+
           hidden_options = options.merge(:id => options[:id] + '_delete', :name => options[:name].sub("[#{column.name}]", "[delete_#{column.name}]"), :value => 'false')
           custom_hidden_field_tag = hidden_field(:record, column.name, hidden_options)
 
           content_tag(:div) do
             content_tag(:div) do
-              content = get_column_value(record, column) + " #{custom_hidden_field_tag} | ".html_safe
-              content += content_tag(:a, as_(:remove_file), {:href => '#', :onclick => remove_file_js})
-              content += content_tag(:div, file_column_field("record", column.name, options), :style => "display: none")
-            end           
+              get_column_value(record, column) + " #{custom_hidden_field_tag} | ".html_safe <<
+                content_tag(:a, as_(:remove_file), :href => '#', :onclick => remove_file_js) <<
+                content_tag(:div, file_column_field('record', column.name, options), :style => 'display: none')
+            end
           end
         else
-          file_column_field("record", column.name, options)          
-        end        
+          file_column_field('record', column.name, options)
+        end
       end
-      
     end
   end
 end

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

@@ -6,21 +6,20 @@ module ActiveScaffold
         return nil if record.send(column.name).nil?
         active_scaffold_column_download_link(record, column, File.basename(record.send(column.name)))
       end
-      
+
       def active_scaffold_column_download_link(record, column, label = nil)
         return nil if record.send(column.name).nil?
-        label||=as_(:download)
-        link_to( label, url_for_file_column(record, column.name.to_s), :popup => true)
+        label ||= as_(:download)
+        link_to(label, url_for_file_column(record, column.name.to_s), :popup => true)
       end
-      
+
       def active_scaffold_column_thumbnail(record, column)
         return nil if record.send(column.name).nil?
-        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), 
+        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)
       end
-      
     end
   end
 end

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

@@ -1,43 +1,39 @@
-require File.join(File.dirname(__FILE__), "../test_helper.rb")
+require File.join(File.dirname(__FILE__), '../test_helper.rb')
 
 class DeleteFileColumnTest < Test::Unit::TestCase
   def setup
     DeleteFileColumn.generate_delete_helpers(MockModel)
     @model = MockModel.new
-    @model.band_image = "coolio.jpg"
+    @model.band_image = 'coolio.jpg'
   end
-  
+
   def test__file_column_fields
     assert_equal(1, @model.file_column_fields.length)
   end
-  
-	def test__delete_band_image__boolean__should_delete
-		@model.delete_band_image = true
+
+  def test__delete_band_image__boolean__should_delete
+    @model.delete_band_image = true
     assert_nil @model.band_image
   end
-  
-	def test__delete_band_image__string__should_delete
-		@model.delete_band_image = "true"
+
+  def test__delete_band_image__string__should_delete
+    @model.delete_band_image = 'true'
     assert_nil @model.band_image
   end
-  
-  
-	def test__delete_band_image__boolean_false__shouldnt_delete
-		@model.delete_band_image = false
+
+  def test__delete_band_image__boolean_false__shouldnt_delete
+    @model.delete_band_image = false
     assert_not_nil @model.band_image
   end
-  
-	def test__delete_band_image__string_false__shouldnt_delete
-		@model.delete_band_image = "false"
+
+  def test__delete_band_image__string_false__shouldnt_delete
+    @model.delete_band_image = 'false'
     assert_not_nil @model.band_image
   end
-  
-  
+
   def test__just_uploaded__shouldnt_delete
     @model.band_image_just_uploaded = true
-    @model.delete_band_image = "true"
+    @model.delete_band_image = 'true'
     assert_not_nil(@model.band_image)
   end
-  
-  
-end
+end

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

@@ -1,9 +1,10 @@
 class MockModel
   attr_accessor :name
   attr_accessor :bio
-  
+
   attr_accessor :band_image
   attr_accessor :band_image_just_uploaded
-  def band_image_just_uploaded?; self.band_image_just_uploaded ? true : false; end
-  
-end
+  def band_image_just_uploaded?
+    band_image_just_uploaded
+  end
+end

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

@@ -1,15 +1,7 @@
 require 'test/unit'
-require "rubygems"
+require 'rubygems'
 require 'active_support'
 
-for file in ["../lib/delete_file_column.rb", "mock_model.rb"]
+%w(../lib/delete_file_column.rb mock_model.rb).each do |file|
   require File.expand_path(File.join(File.dirname(__FILE__), file))
 end
-
-
-
-def dbg
-  require 'ruby-debug'
-  Debugger.start
-  debugger
-end

data/lib/active_scaffold/bridges/paper_trail.rb

@@ -1,10 +1,12 @@
 class ActiveScaffold::Bridges::PaperTrail < ActiveScaffold::DataStructures::Bridge
   def self.install
-    require File.join(File.dirname(__FILE__), "paper_trail/paper_trail_bridge")
-    require File.join(File.dirname(__FILE__), "paper_trail/actions")
-    require File.join(File.dirname(__FILE__), "paper_trail/config")
-    require File.join(File.dirname(__FILE__), "paper_trail/helper")
-    ActiveScaffold::Config::Core.send :include, ActiveScaffold::Bridges::PaperTrail::PaperTrailBridge
+    require File.join(File.dirname(__FILE__), 'paper_trail/paper_trail_bridge')
+    require File.join(File.dirname(__FILE__), 'paper_trail/actions')
+    require File.join(File.dirname(__FILE__), 'paper_trail/config')
+    require File.join(File.dirname(__FILE__), 'paper_trail/helper')
+  end
+
+  def self.prepare
     ActionDispatch::Routing::ACTIVE_SCAFFOLD_CORE_ROUTING[:collection][:deleted] = :get
   end
 end

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

@@ -4,10 +4,10 @@ module ActiveScaffold
       module PaperTrailBridge
         def initialize_with_paper_trail(model_id)
           initialize_without_paper_trail(model_id)
-          return unless self.model < ::PaperTrail::Model::InstanceMethods
-          self.actions << :deleted_records
+          return unless model < ::PaperTrail::Model::InstanceMethods
+          actions << :deleted_records
         end
-        
+
         def self.included(base)
           base.alias_method_chain :initialize, :paper_trail
         end
@@ -15,3 +15,4 @@ module ActiveScaffold
     end
   end
 end
+ActiveScaffold::Config::Core.send :include, ActiveScaffold::Bridges::PaperTrail::PaperTrailBridge

data/lib/active_scaffold/bridges/paperclip.rb

@@ -1,12 +1,12 @@
 class ActiveScaffold::Bridges::Paperclip < ActiveScaffold::DataStructures::Bridge
   def self.install
     if ActiveScaffold::Config::Core.method_defined?(:initialize_with_paperclip)
-      raise RuntimeError, "We've detected that you have active_scaffold_paperclip_bridge installed. This plugin has been moved to core. Please remove active_scaffold_paperclip_bridge to prevent any conflicts"
+      raise "We've detected that you have active_scaffold_paperclip_bridge installed. This plugin has been moved to core. Please remove active_scaffold_paperclip_bridge to prevent any conflicts"
     end
-    require File.join(File.dirname(__FILE__), "paperclip/form_ui")
-    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")
+    require File.join(File.dirname(__FILE__), 'paperclip/form_ui')
+    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
   end
 end

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

@@ -3,8 +3,8 @@ 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
+        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,20 +12,21 @@ module ActiveScaffold
         if paperclip.file?
           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
-          
+
           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")
+          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

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

@@ -4,11 +4,12 @@ module ActiveScaffold
       def active_scaffold_column_paperclip(record, column)
         paperclip = record.send("#{column.name}")
         return nil unless paperclip.file?
-        content = if paperclip.styles.include?(ActiveScaffold::Bridges::Paperclip::PaperclipBridgeHelpers.thumbnail_style)
-          image_tag(paperclip.url(ActiveScaffold::Bridges::Paperclip::PaperclipBridgeHelpers.thumbnail_style), :border => 0)
-        else
-          paperclip.original_filename
-        end
+        content =
+          if paperclip.styles.include?(ActiveScaffold::Bridges::Paperclip::PaperclipBridgeHelpers.thumbnail_style)
+            image_tag(paperclip.url(ActiveScaffold::Bridges::Paperclip::PaperclipBridgeHelpers.thumbnail_style), :border => 0)
+          else
+            paperclip.original_filename
+          end
         link_to(content, paperclip.url, :target => '_blank')
       end
     end

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

@@ -4,15 +4,15 @@ module ActiveScaffold
       module PaperclipBridge
         def initialize_with_paperclip(model_id)
           initialize_without_paperclip(model_id)
-          return unless self.model.respond_to?(:attachment_definitions) && !self.model.attachment_definitions.nil? 
+          return unless model.respond_to?(:attachment_definitions) && !model.attachment_definitions.nil?
 
-          self.update.multipart = true
-          self.create.multipart = true
+          update.multipart = true
+          create.multipart = true
 
-          self.model.attachment_definitions.keys.each do |field|
+          model.attachment_definitions.keys.each do |field|
             configure_paperclip_field(field.to_sym)
             # define the "delete" helper for use with active scaffold, unless it's already defined
-            ActiveScaffold::Bridges::Paperclip::PaperclipBridgeHelpers.generate_delete_helper(self.model, field)
+            ActiveScaffold::Bridges::Paperclip::PaperclipBridgeHelpers.generate_delete_helper(model, field)
           end
         end
 
@@ -21,13 +21,14 @@ module ActiveScaffold
         end
 
         private
+
         def configure_paperclip_field(field)
-          self.columns << field
-          self.columns[field].form_ui ||= :paperclip
-          self.columns[field].params.add "delete_#{field}"
+          columns << field
+          columns[field].form_ui ||= :paperclip
+          columns[field].params.add "delete_#{field}"
 
           [:file_name, :content_type, :file_size, :updated_at].each do |f|
-            self.columns.exclude("#{field}_#{f}".to_sym)
+            columns.exclude("#{field}_#{f}".to_sym)
           end
         end
       end

data/lib/active_scaffold/bridges/record_select.rb

@@ -1,6 +1,6 @@
 class ActiveScaffold::Bridges::RecordSelect < ActiveScaffold::DataStructures::Bridge
   def self.install
-    require File.join(File.dirname(__FILE__), "record_select/helpers.rb")
+    require File.join(File.dirname(__FILE__), 'record_select/helpers.rb')
   end
   def self.stylesheets
     'record_select'

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

@@ -11,8 +11,8 @@ class ActiveScaffold::Bridges::RecordSelect
       # requires RecordSelect plugin to be installed and configured.
       def active_scaffold_input_record_select(column, options)
         record = options.delete(: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
         if column.singular_association?
           multiple = false
           multiple = column.options[:html_options][:multiple] if column.options[:html_options] &&  column.options[:html_options][:multiple]
@@ -28,11 +28,12 @@ class ActiveScaffold::Bridges::RecordSelect
         unless column.association
           raise ArgumentError, "record_select can only work against associations (and #{column.name} is not).  A common mistake is to specify the foreign key field (like :user_id), instead of the association (:user)."
         end
-        klass = if column.polymorphic_association?
-          record.send(column.association.foreign_type).constantize rescue nil
-        else
-          column.association.klass
-        end
+        klass =
+          if column.polymorphic_association?
+            record.send(column.association.foreign_type).constantize rescue nil
+          else
+            column.association.klass
+          end
         return content_tag :span, '', :class => options[:class] unless klass
 
         remote_controller = active_scaffold_controller_for(klass).controller_path
@@ -40,23 +41,24 @@ class ActiveScaffold::Bridges::RecordSelect
         # if the opposite association is a :belongs_to (in that case association in this class must be has_one or has_many)
         # then only show records that have not been associated yet
         if [:has_one, :has_many].include?(column.association.macro)
-          params.merge!({column.association.foreign_key => ''})
+          params.merge!(column.association.foreign_key => '')
         end
- 
+
         record_select_options = active_scaffold_input_text_options(options).merge(
           :controller => remote_controller
         )
         record_select_options.merge!(column.options)
- 
-        html = if multiple
-          record_multi_select_field(options[:name], value || [], record_select_options)
-        else
-          record_select_field(options[:name], value || klass.new, record_select_options)
-        end
+
+        html =
+          if multiple
+            record_multi_select_field(options[:name], value || [], record_select_options)
+          else
+            record_select_field(options[:name], value || klass.new, record_select_options)
+          end
         html = self.class.field_error_proc.call(html, self) if record.errors[column.name].any?
         html
       end
-      
+
       def active_scaffold_record_select_autocomplete(record, column, options)
         record_select_options = active_scaffold_input_text_options(options).merge(
           :controller => active_scaffold_controller_for(record.class).controller_path
@@ -72,21 +74,19 @@ class ActiveScaffold::Bridges::RecordSelect
         value = field_search_record_select_value(column)
         active_scaffold_record_select(options[:object], column, options, value, column.options[:multiple])
       end
-      
+
       def field_search_record_select_value(column)
-        begin
-          value = field_search_params[column.name]
-          unless value.blank?
-            if column.options[:multiple]
-              column.association.klass.find value.collect!(&:to_i)
-            else
-              column.association.klass.find(value.to_i)
-            end
+        value = field_search_params[column.name]
+        unless value.blank?
+          if column.options[:multiple]
+            column.association.klass.find value.collect!(&:to_i)
+          else
+            column.association.klass.find(value.to_i)
           end
-        rescue Exception => e
-          logger.error "#{e.class.name}: #{e.message} -- Sorry, we are not that smart yet. Attempted to restore search values to search fields :#{column.name} in #{controller.class}"
-          raise e
         end
+      rescue StandardError => e
+        logger.error "#{e.class.name}: #{e.message} -- Sorry, we are not that smart yet. Attempted to restore search values to search fields :#{column.name} in #{controller.class}"
+        raise e
       end
     end
   end