sinatra 0.9.0.2 → 0.9.0.3

data/CHANGES

@@ -1,3 +1,17 @@
+= 0.9.0.3 / 2009-01-21
+
+ * Fall back on mongrel then webrick when thin not found. [#75]
+ * Use :environment instead of :env in test helpers to
+   fix deprecation warnings coming from framework.
+ * Make sinatra/test/rspec work again [#113]
+ * Fix app_file detection on windows [#118]
+ * Fix static files with Rack::Lint in pipeline [#121]
+
+= 0.9.0.2 / 2009-01-18
+
+ * Halting a before block should stop processing of routes [#85]
+ * Fix redirect/halt in before filters [#85]
+
 = 0.9.0 / 2009-01-18
 
  * Works with and requires Rack >= 0.9.1

data/lib/sinatra/base.rb

@@ -4,7 +4,7 @@ require 'rack'
 require 'rack/builder'
 
 module Sinatra
-  VERSION = '0.9.0.2'
+  VERSION = '0.9.0.3'
 
   class Request < Rack::Request
     def user_agent
@@ -142,6 +142,7 @@ module Sinatra
     class StaticFile < ::File #:nodoc:
       alias_method :to_path, :path
       def each
+        rewind
         while buf = read(8192)
           yield buf
         end
@@ -630,8 +631,8 @@ module Sinatra
       end
 
       def run!(options={})
-        set(options)
-        handler = Rack::Handler.get(server)
+        set options
+        handler = detect_rack_handler
         handler_name = handler.name.gsub(/.*::/, '')
         puts "== Sinatra/#{Sinatra::VERSION} has taken the stage " +
           "on #{port} for #{environment} with backup from #{handler_name}"
@@ -652,6 +653,17 @@ module Sinatra
       end
 
     private
+      def detect_rack_handler
+        servers = Array(self.server)
+        servers.each do |server_name|
+          begin
+            return Rack::Handler.get(server_name)
+          rescue LoadError
+          end
+        end
+        fail "Server handler (#{servers.join(',')}) not found."
+      end
+
       def construct_middleware(builder=Rack::Builder.new)
         builder.use Rack::Session::Cookie if sessions?
         builder.use Rack::CommonLogger if logging?
@@ -698,7 +710,7 @@ module Sinatra
     set :environment, (ENV['RACK_ENV'] || :development).to_sym
 
     set :run, false
-    set :server, (defined?(Rack::Handler::Thin) ? "thin" : "mongrel")
+    set :server, %w[thin mongrel webrick]
     set :host, '0.0.0.0'
     set :port, 4567
 

data/lib/sinatra/main.rb

@@ -9,7 +9,7 @@ module Sinatra
         /custom_require\.rb$/  # rubygems require hacks
       ]
       path =
-        caller.map{ |line| line.split(':', 2).first }.find do |file|
+        caller.map{ |line| line.split(/:\d/, 2).first }.find do |file|
           next if ignore.any? { |pattern| file =~ pattern }
           file
         end

data/lib/sinatra/test/bacon.rb

@@ -2,7 +2,7 @@ require 'bacon'
 require 'sinatra/test'
 
 Sinatra::Default.set(
-  :env => :test,
+  :environment => :test,
   :run => false,
   :raise_errors => true,
   :logging => false

data/lib/sinatra/test/rspec.rb

@@ -1,8 +1,10 @@
 require 'sinatra/test'
+require 'sinatra/test/unit'
+require 'spec'
 require 'spec/interop/test'
 
 Sinatra::Default.set(
-  :env => :test,
+  :environment => :test,
   :run => false,
   :raise_errors => true,
   :logging => false

data/lib/sinatra/test/unit.rb

@@ -4,7 +4,7 @@ require 'test/unit'
 Test::Unit::TestCase.send :include, Sinatra::Test
 
 Sinatra::Default.set(
-  :env => :test,
+  :environment => :test,
   :run => false,
   :raise_errors => true,
   :logging => false

data/sinatra.gemspec

@@ -3,8 +3,8 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
 
   s.name = 'sinatra'
-  s.version = '0.9.0.2'
-  s.date = '2009-01-18'
+  s.version = '0.9.0.3'
+  s.date = '2009-01-21'
 
   s.description = "Classy web-development dressed in a DSL"
   s.summary     = "Classy web-development dressed in a DSL"

data/test/static_test.rb

@@ -18,6 +18,16 @@ describe 'Static' do
     assert response.headers.include?('Last-Modified')
   end
 
+  it 'produces a body that can be iterated over multiple times' do
+    env = Rack::MockRequest.env_for("/#{F.basename(__FILE__)}")
+    status, headers, body = @app.call(env)
+    buf1, buf2 = [], []
+    body.each { |part| buf1 << part }
+    body.each { |part| buf2 << part }
+    assert_equal buf1.join, buf2.join
+    assert_equal File.read(__FILE__), buf1.join
+  end
+
   it 'serves HEAD requests for files in the public directory' do
     head "/#{F.basename(__FILE__)}"
     assert ok?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra
 version: !ruby/object:Gem::Version 
-  version: 0.9.0.2
+  version: 0.9.0.3
 platform: ruby
 authors: 
 - Blake Mizerany
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-18 00:00:00 -08:00
+date: 2009-01-21 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency