Attachment model clean up: fixed some inconsistent indentation and an inaccurate comment (closes patch #903 by Rocco Stanzione).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1321 e93f8b46-1217-0410-a6f0-8f06a7374b81

app/models/attachment.rb

@@ -35,48 +35,48 @@ class Attachment < ActiveRecord::Base
     errors.add_to_base :too_long if self.filesize > Setting.attachment_max_size.to_i.kilobytes
   end
 
-	def file=(incomming_file)
+  def file=(incoming_file)
-		unless incomming_file.nil?
+    unless incoming_file.nil?
-			@temp_file = incomming_file
+      @temp_file = incoming_file
-			if @temp_file.size > 0
+      if @temp_file.size > 0
-				self.filename = sanitize_filename(@temp_file.original_filename)
+        self.filename = sanitize_filename(@temp_file.original_filename)
-				self.disk_filename = DateTime.now.strftime("%y%m%d%H%M%S") + "_" + self.filename
+        self.disk_filename = DateTime.now.strftime("%y%m%d%H%M%S") + "_" + self.filename
-				self.content_type = @temp_file.content_type.to_s.chomp
+        self.content_type = @temp_file.content_type.to_s.chomp
-				self.filesize = @temp_file.size
+        self.filesize = @temp_file.size
-			end
+      end
-		end
+    end
-	end
+  end
-	
+	
-	def file
+  def file
-	 nil
+    nil
-	end
+  end
-	
+
-	# Copy temp file to its final location
+  # Copy temp file to its final location
-	def before_save
+  def before_save
-		if @temp_file && (@temp_file.size > 0)
+    if @temp_file && (@temp_file.size > 0)
-			logger.debug("saving '#{self.diskfile}'")
+      logger.debug("saving '#{self.diskfile}'")
-			File.open(diskfile, "wb") do |f| 
+      File.open(diskfile, "wb") do |f| 
-				f.write(@temp_file.read)
+        f.write(@temp_file.read)
-			end
+      end
-			self.digest = Digest::MD5.hexdigest(File.read(diskfile))
+      self.digest = Digest::MD5.hexdigest(File.read(diskfile))
-		end
+    end
-		# Don't save the content type if it's longer than the authorized length
+    # Don't save the content type if it's longer than the authorized length
-		if self.content_type && self.content_type.length > 255
+    if self.content_type && self.content_type.length > 255
-		  self.content_type = nil
+      self.content_type = nil
-		end
+    end
-	end
+  end
-	
+
-	# Deletes file on the disk
+  # Deletes file on the disk
-	def after_destroy
+  def after_destroy
-		if self.filename?
+    if self.filename?
-			File.delete(diskfile) if File.exist?(diskfile)
+      File.delete(diskfile) if File.exist?(diskfile)
-		end
+    end
-	end
+  end
-	
+
-	# Returns file's location on disk
+  # Returns file's location on disk
-	def diskfile
+  def diskfile
-		"#{@@storage_path}/#{self.disk_filename}"
+    "#{@@storage_path}/#{self.disk_filename}"
-	end
+  end
   
   def increment_download
     increment!(:downloads)
@@ -87,18 +87,17 @@ class Attachment < ActiveRecord::Base
   end
   
   def image?
-    self.filename =~ /\.(jpeg|jpg|gif|png)$/i
+    self.filename =~ /\.(jpe?g|gif|png)$/i
   end
   
 private
   def sanitize_filename(value)
-      # get only the filename, not the whole path
+    # get only the filename, not the whole path
-      just_filename = value.gsub(/^.*(\\|\/)/, '')
+    just_filename = value.gsub(/^.*(\\|\/)/, '')
-      # NOTE: File.basename doesn't work right with Windows paths on Unix
+    # NOTE: File.basename doesn't work right with Windows paths on Unix
-      # INCORRECT: just_filename = File.basename(value.gsub('\\\\', '/')) 
+    # INCORRECT: just_filename = File.basename(value.gsub('\\\\', '/')) 
 
-      # Finally, replace all non alphanumeric, underscore or periods with underscore
+    # Finally, replace all non alphanumeric, hyphens or periods with underscore
-      @filename = just_filename.gsub(/[^\w\.\-]/,'_') 
+    @filename = just_filename.gsub(/[^\w\.\-]/,'_') 
   end
-    
 end