sinatra-xsendfile 0.2.2 → 0.3.0

data/README.md

@@ -11,10 +11,10 @@
 ##Example
     require 'rubygems'
     require 'sinatra'
-    require 'sinatra/x_send_file'
+    require 'sinatra-xsendfile'
 
     configure :production do
-      Sinatra::XSendFile.replace_send_file! #replaces sinatra's send_file with x_send_file
+      Sinatra::Xsendfile.replace_send_file! #replaces sinatra's send_file with x_send_file
       set :xsf_header, 'X-Accel-Redirect' #setting default(X-SendFile) header (nginx)
     end
 

data/Rakefile

@@ -4,28 +4,6 @@ require 'rake/gempackagetask'
 
 task :default => :test
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gemspec|
-    gemspec.name = "sinatra-xsendfile"
-    gemspec.version = "0.2.2"
-    gemspec.summary = gemspec.description = "X-SendFile helpers for Sinatra"
-    gemspec.email = "vasily@polovnyov.ru"
-    gemspec.homepage = "http://github.com/vast/sinatra-xsendfile"
-    gemspec.authors = ["Vasily Polovnyov"]
-
-    gemspec.add_dependency 'sinatra', '>=0.9.1'
-
-    gemspec.add_development_dependency 'rack-test', '>=0.3.0'
-
-    gemspec.test_files = Dir.glob('test/*')
-    gemspec.files = ["LICENSE", "README.md", "Rakefile"] + Dir.glob('lib/**/*') + gemspec.test_files
-
-  end
-rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install jeweler"
-end
-
 Rake::TestTask.new do |t|
   t.libs << "test"
   t.test_files = FileList['test/*_test.rb']

data/lib/sinatra-xsendfile/version.rb

@@ -0,0 +1,5 @@
+module Sinatra
+  module Xsendfile
+    VERSION = "0.3.0"
+  end
+end

data/lib/{sinatra/x_send_file.rb → sinatra-xsendfile.rb}

@@ -1,11 +1,9 @@
-require 'sinatra/base'
 module Sinatra
-  module XSendFile
+  module Xsendfile
     def x_send_file(path, opts = {})
-      content_type _mime_type(opts[:type]) ||
-              _mime_type(File.extname(path)) ||
-              response['Content-Type'] ||
-              'application/octet-stream'
+      if opts[:type] or not response['Content-Type']
+        content_type(opts[:type] || File.extname(path) || 'application/octet-stream')
+      end
 
       if opts[:disposition] == 'attachment' || opts[:filename]
         attachment opts[:filename] || path
@@ -24,19 +22,11 @@ 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;")
     end
   end
 
-  helpers XSendFile
-end
+  helpers Xsendfile
+end

data/test/sinatra_app.rb

@@ -1,11 +1,11 @@
 require 'rubygems'
 require 'sinatra'
-require 'lib/sinatra/x_send_file'
+require 'lib/sinatra-xsendfile'
 
 
 set :xsf_header, 'x-test-send-file'
 
-Sinatra::XSendFile.replace_send_file!
+Sinatra::Xsendfile.replace_send_file!
 
 get '/' do
   x_send_file(__FILE__)

data/test/{sinatra_x_send_file_test.rb → sinatra_xsendfile_test.rb}

@@ -4,7 +4,7 @@ require 'rack/test'
 
 set :environment, :test
 
-class SinatraXSendFileTest < Test::Unit::TestCase
+class SinatraXsendfileTest < Test::Unit::TestCase
   include Rack::Test::Methods
 
   def app

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra-xsendfile
 version: !ruby/object:Gem::Version 
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 2
-  version: 0.2.2
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Vasily Polovnyov
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-19 00:00:00 +04:00
+date: 2010-12-18 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sinatra
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 57
         segments: 
         - 0
         - 9
@@ -35,9 +38,11 @@ dependencies:
   name: rack-test
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
         - 0
         - 3
@@ -45,7 +50,7 @@ dependencies:
         version: 0.3.0
   type: :development
   version_requirements: *id002
-description: X-SendFile helpers for Sinatra
+description: X-SendFile helper for Sinatra
 email: vasily@polovnyov.ru
 executables: []
 
@@ -58,39 +63,44 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- lib/sinatra/x_send_file.rb
+- lib/sinatra-xsendfile/version.rb
+- lib/sinatra-xsendfile.rb
 - test/sinatra_app.rb
-- test/sinatra_x_send_file_test.rb
+- test/sinatra_xsendfile_test.rb
 has_rdoc: true
 homepage: http://github.com/vast/sinatra-xsendfile
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: X-SendFile helpers for Sinatra
+summary: X-SendFile helper for Sinatra
 test_files: 
-- test/sinatra_x_send_file_test.rb
+- test/sinatra_xsendfile_test.rb
 - test/sinatra_app.rb