Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
P
paperclip
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ikcrm_common
paperclip
Commits
b4385bd4
Commit
b4385bd4
authored
Mar 01, 2013
by
Jon Yurek
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removes some confusion from ContenTypeDetector methods
parent
126dab11
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
lib/paperclip/content_type_detector.rb
+4
-4
No files found.
lib/paperclip/content_type_detector.rb
View file @
b4385bd4
...
@@ -8,9 +8,9 @@ module Paperclip
...
@@ -8,9 +8,9 @@ module Paperclip
end
end
def
detect
def
detect
if
blank?
if
blank
_name
?
SENSIBLE_DEFAULT
SENSIBLE_DEFAULT
elsif
empty?
elsif
empty
_file
?
EMPTY_TYPE
EMPTY_TYPE
elsif
!
match?
elsif
!
match?
type_from_file_command
type_from_file_command
...
@@ -23,11 +23,11 @@ module Paperclip
...
@@ -23,11 +23,11 @@ module Paperclip
private
private
def
empty?
def
empty
_file
?
File
.
exists?
(
@filename
)
&&
File
.
size
(
@filename
)
==
0
File
.
exists?
(
@filename
)
&&
File
.
size
(
@filename
)
==
0
end
end
def
blank?
def
blank
_name
?
@filename
.
nil?
||
@filename
.
empty?
@filename
.
nil?
||
@filename
.
empty?
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment