sinatra-xsendfile 0.1.2 → 0.2.0

data/Rakefile

@@ -8,7 +8,7 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gemspec|
     gemspec.name = "sinatra-xsendfile"
-    gemspec.version = "0.1.2"
+    gemspec.version = "0.2.0"
     gemspec.summary = gemspec.description = "X-SendFile helpers for Sinatra"
     gemspec.email = "vasily@polovnyov.ru"
     gemspec.homepage = "http://github.com/vast/sinatra-xsendfile"

data/lib/sinatra/x_send_file.rb

@@ -1,12 +1,9 @@
 require 'sinatra/base'
 module Sinatra
-
   module XSendFile
     def x_send_file(path, opts = {})
-      stat = File.stat(path)
-
-      content_type media_type(opts[:type]) ||
-              media_type(File.extname(path)) ||
+      content_type _mime_type(opts[:type]) ||
+              _mime_type(File.extname(path)) ||
               response['Content-Type'] ||
               'application/octet-stream'
 
@@ -27,6 +24,14 @@ module Sinatra
       not_found
     end
 
+    def _mime_type(type)
+      if respond_to?(:mime_type)
+	mime_type(type)
+      else
+	media_type(type)
+      end
+    end
+
     def self.replace_send_file!
       Sinatra::Helpers.send(:alias_method, :old_send_file, :send_file)
       Sinatra::Helpers.module_eval("def send_file(path, opts={}); x_send_file(path, opts); end;")
@@ -34,4 +39,4 @@ module Sinatra
   end
 
   helpers XSendFile
-end
+end

data/test/sinatra_x_send_file_test.rb

@@ -31,8 +31,4 @@ class SinatraXSendFileTest < Test::Unit::TestCase
     assert_not_nil last_response.headers['x-test-send-file']
   end
 
-  def test_sendfile_overriding
-    get '/sendfile'
-    assert_not_nil last_response.headers['x-test-send-file']
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra-xsendfile
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors: 
 - Vasily Polovnyov
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-18 00:00:00 +03:00
+date: 2010-03-12 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency