Merge pull request #787 from somu/static-send-file-fix

#send_file indifferent :status option

lib/sinatra/base.rb

@@ -366,6 +366,7 @@ module Sinatra
       result    = file.serving env
       result[1].each { |k,v| headers[k] ||= v }
       headers['Content-Length'] = result[1]['Content-Length']
+      opts[:status] &&= Integer(opts[:status])
       halt opts[:status] || result[0], result[2]
     rescue Errno::ENOENT
       not_found

test/helpers_test.rb

@@ -905,6 +905,17 @@ class HelpersTest < Test::Unit::TestCase
       get '/'
       assert_equal 'image/gif', response['Content-Type']
     end
+
+    it 'can have :status option as a string' do
+      path = @file
+      mock_app do
+        post '/' do
+          send_file path, :status => '422'
+        end
+      end
+      post '/'
+      assert_equal response.status, 422
+    end
   end
 
   describe 'cache_control' do