Merge pull request #2367 from nagatea/refactor_sanitized_file_path

Small refactor
carrierwaveuploader · Jan 26, 2019 · a91ab69 · a91ab69
2 parents 677e1d6 + be47c82
commit a91ab69
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/lib/carrierwave/sanitized_file.rb b/lib/carrierwave/sanitized_file.rb
@@ -114,12 +114,11 @@ def size
     # [String, nil] the path where the file is located.
     #
     def path
-      unless @file.blank?
-        if is_path?
-          File.expand_path(@file)
-        elsif @file.respond_to?(:path) and not @file.path.blank?
-          File.expand_path(@file.path)
-        end
+      return if @file.blank?
+      if is_path?
+        File.expand_path(@file)
+      elsif @file.respond_to?(:path) && !@file.path.blank?
+        File.expand_path(@file.path)
       end
     end