Protect extension method against nil

Braulio Bhavamitra
1 parent 20c9a186
Showing 3 changed files with 14 additions and 2 deletions Show diff stats
app/models/uploaded_file.rb
app/views/search/_image.rhtml
test/unit/uploaded_file_test.rb
@@ -67,7 +67,7 @@ class UploadedFile &lt; Article
       'upload-file'
     end
   end
-  
+
   def mime_type
     content_type
   end
@@ -129,6 +129,12 @@ class UploadedFile &lt; Article
     end
   end
+  def extension
+    dotindex = self.filename.rindex('.')
+    return nil unless dotindex
+    self.filename[(dotindex+1)..-1].downcase
+  end
+
   def allow_children?
     false
   end
@@ -144,4 +150,5 @@ class UploadedFile &lt; Article
   def uploaded_file?
     true
   end
+
 end
 <div class="search-image-container">
   <% if image.is_a? UploadedFile and image.filename %>
-    <% extension = image.filename[(image.filename.rindex('.')+1)..-1].downcase %>
+    <% extension = image.extension %>
     <% if ['jpg', 'jpeg', 'gif', 'png', 'tiff', 'svg'].include? extension %>
       <%= link_to '', image.view_url, :class => "search-image-pic", :style => 'background-image: url(%s)'% image.public_filename(:thumb) %>
       <% if image.width && image.height %>
@@ -306,6 +306,11 @@ class UploadedFileTest &lt; ActiveSupport::TestCase
     uses_sqlite
   end
+  should 'return extension' do
+    file = UploadedFile.create!(:uploaded_data => fixture_file_upload('/files/rails.png', 'image/png'), :profile => @profile)
+    assert_equal 'png', file.extension
+  end
+
   should 'upload to path prefix folder if database is not postgresql' do
     uses_sqlite
     file = UploadedFile.create!(:uploaded_data => fixture_file_upload('/files/test.txt', 'text/plain'), :profile => @profile)
1	<div class="search-image-container">	1	<div class="search-image-container">
2		2
3	<% if image.is_a? UploadedFile and image.filename %>	3	<% if image.is_a? UploadedFile and image.filename %>
4	- <% extension = image.filename[(image.filename.rindex('.')+1)..-1].downcase %>	4	+ <% extension = image.extension %>
5	<% if ['jpg', 'jpeg', 'gif', 'png', 'tiff', 'svg'].include? extension %>	5	<% if ['jpg', 'jpeg', 'gif', 'png', 'tiff', 'svg'].include? extension %>
6	<%= link_to '', image.view_url, :class => "search-image-pic", :style => 'background-image: url(%s)'% image.public_filename(:thumb) %>	6	<%= link_to '', image.view_url, :class => "search-image-pic", :style => 'background-image: url(%s)'% image.public_filename(:thumb) %>
7	<% if image.width && image.height %>	7	<% if image.width && image.height %>