Commit 03d14b2e by Luke Griffiths Committed by Tute Costa

refactor: rename variable

In other parts of the codebase, "filename" refers to the part after the
directory path it is contained in. e.g. `original_filename` in
attachment.rb.

This makes this file easier to read by conveying the range of arguments
ContentTypeDetector.new accepts.
parent 292f236d
...@@ -2,7 +2,7 @@ module Paperclip ...@@ -2,7 +2,7 @@ module Paperclip
class ContentTypeDetector class ContentTypeDetector
# The content-type detection strategy is as follows: # The content-type detection strategy is as follows:
# #
# 1. Blank/Empty files: If there's no filename or the file is empty, # 1. Blank/Empty files: If there's no filepath or the file is empty,
# provide a sensible default (application/octet-stream or inode/x-empty) # provide a sensible default (application/octet-stream or inode/x-empty)
# #
# 2. Calculated match: Return the first result that is found by both the # 2. Calculated match: Return the first result that is found by both the
...@@ -20,8 +20,8 @@ module Paperclip ...@@ -20,8 +20,8 @@ module Paperclip
EMPTY_TYPE = "inode/x-empty" EMPTY_TYPE = "inode/x-empty"
SENSIBLE_DEFAULT = "application/octet-stream" SENSIBLE_DEFAULT = "application/octet-stream"
def initialize(filename) def initialize(filepath)
@filename = filename @filepath = filepath
end end
# Returns a String describing the file's content type # Returns a String describing the file's content type
...@@ -40,17 +40,17 @@ module Paperclip ...@@ -40,17 +40,17 @@ module Paperclip
private private
def empty_file? def empty_file?
File.exist?(@filename) && File.size(@filename) == 0 File.exist?(@filepath) && File.size(@filepath) == 0
end end
alias :empty? :empty_file? alias :empty? :empty_file?
def blank_name? def blank_name?
@filename.nil? || @filename.empty? @filepath.nil? || @filepath.empty?
end end
def possible_types def possible_types
MIME::Types.type_for(@filename).collect(&:content_type) MIME::Types.type_for(@filepath).collect(&:content_type)
end end
def calculated_type_matches def calculated_type_matches
...@@ -68,12 +68,12 @@ module Paperclip ...@@ -68,12 +68,12 @@ module Paperclip
def type_from_file_command def type_from_file_command
@type_from_file_command ||= @type_from_file_command ||=
FileCommandContentTypeDetector.new(@filename).detect FileCommandContentTypeDetector.new(@filepath).detect
end end
def type_from_mime_magic def type_from_mime_magic
@type_from_mime_magic ||= @type_from_mime_magic ||=
MimeMagic.by_magic(File.open(@filename)).try(:type) MimeMagic.by_magic(File.open(@filepath)).try(:type)
end end
end end
end end
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment