rtomayko-sinatra 0.3.2 → 0.3.3

data/ChangeLog

@@ -1,6 +1,34 @@
+= 0.3.3 / 2009-01-06
+
+  * Pin to Rack 0.4.0 (this is the last release on Rack 0.4)
+
+  * Log unhandled exception backtraces to rack.errors.
+
+  * Use RACK_ENV environment variable to establish Sinatra
+    environment when given. Thin sets this when started with
+    the -e argument.
+
+  * BUG: raising Sinatra::NotFound resulted in a 500 response
+    code instead of 404.
+
+  * BUG: use_in_file_templates! failes with CR/LF (#45)
+
+  * BUG: Sinatra detects the app file and root path when run under
+    thin/passenger.
+
+= 0.3.2
+
+  * BUG: Static and send_file read entire file into String before
+    sending. Updated to stream with 8K chunks instead.
+
+  * Rake tasks and assets for building basic documentation website.
+    See http://sinatra.rubyforge.org
+
+  * Various minor doc fixes.
+
 = 0.3.1
 
- * Unbreak optional path parameters [jeremyevans]
+  * Unbreak optional path parameters [jeremyevans]
 
 = 0.3.0
 

data/README.rdoc

@@ -140,14 +140,14 @@ blocks can be accessed direcly in views:
 
   get '/:id' do
     @foo = Foo.find(params[:id])
-    haml '%h1== @foo.name'
+    haml '%h1= @foo.name'
   end
 
 Or, specify an explicit Hash of local variables:
 
   get '/:id' do
     foo = Foo.find(params[:id])
-    haml '%h1== foo.name', :locals => { :foo => foo }
+    haml '%h1= foo.name', :locals => { :foo => foo }
   end
 
 This is typically used when rendering templates as partials from within

data/lib/sinatra.rb

@@ -11,6 +11,10 @@ elsif ENV['EVENT']
   puts "Using Evented Mongrel"
 end
 
+unless defined?(Rack::File::MIME_TYPES)
+  class Rack::File; MIME_TYPES = Rack::Mime::MIME_TYPES; end
+end
+
 module Rack #:nodoc:
 
   class Request #:nodoc:
@@ -55,7 +59,7 @@ end
 module Sinatra
   extend self
 
-  VERSION = '0.3.2'
+  VERSION = '0.3.3'
 
   class NotFound < RuntimeError
     def self.code ; 404 ; end
@@ -923,18 +927,19 @@ module Sinatra
     # file, before any DSL related functions are invoked.
     def self.default_options
       return @default_options unless @default_options.nil?
-      root = File.expand_path(File.dirname($0))
+      app_file = locate_app_file
+      root = File.expand_path(File.dirname(app_file))
       @default_options = {
         :run => true,
         :port => 4567,
         :host => '0.0.0.0',
-        :env => :development,
+        :env => (ENV['RACK_ENV'] || :development).to_sym,
         :root => root,
         :views => root + '/views',
         :public => root + '/public',
         :sessions => false,
         :logging => true,
-        :app_file => $0,
+        :app_file => app_file,
         :raise_errors => false
       }
       load_default_options_from_command_line!
@@ -957,6 +962,16 @@ module Sinatra
       end.parse!(ARGV.dup.select { |o| o !~ /--name/ })
     end
 
+    # Use heuristics to locate the application file.
+    def self.locate_app_file
+      caller[1..-1].reverse.each do |path|
+        path = path.split(':', 2)[0]
+        next if path =~ /sinatra\.rb$/ || path == '(__DSL__)'
+        return path
+      end
+      $0
+    end
+
     # Determine whether the application is in the process of being
     # reloaded.
     def reloading?
@@ -1255,8 +1270,13 @@ module Sinatra
           end
         body = returned.to_result(context)
       rescue => e
+        msg  = "#{e.class.name} - #{e.message}:"
+        msg << "\n  #{e.backtrace.join("\n  ")}"
+        request.env['rack.errors'] << msg
+
         request.env['sinatra.error'] = e
-        context.status(500)
+        status = e.class.code rescue 500
+        context.status(status)
         raise if options.raise_errors && e.class != NotFound
         result = (errors[e.class] || errors[ServerError]).invoke(request)
         returned =
@@ -1365,11 +1385,11 @@ def helpers(&b)
 end
 
 def use_in_file_templates!
-  require 'stringio'
-  templates = IO.read(caller.first.split(':').first).split('__FILE__').last
-  data = StringIO.new(templates)
+  file = caller.first.sub(/:\d+$/, '')
+  data = IO.read(file).split('__END__').last
+  data.gsub! /\r\n/, "\n"
   current_template = nil
-  data.each do |line|
+  data.each_line do |line|
     if line =~ /^@@\s?(.*)/
       current_template = $1.to_sym
       Sinatra.application.templates[current_template] = ''

data/sinatra.gemspec

@@ -3,7 +3,7 @@ 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.3.2'
+  s.version = '0.3.3'
   s.date = "2008-11-02"
 
   s.description = "Classy web-development dressed in a DSL"
@@ -66,7 +66,7 @@ Gem::Specification.new do |s|
   s.test_files = s.files.select {|path| path =~ /^test\/.*_test.rb/}
 
   s.extra_rdoc_files = %w[README.rdoc LICENSE]
-  s.add_dependency 'rack', '>= 0.4.0'
+  s.add_dependency 'rack', '~> 0.4.0'
 
   s.has_rdoc = true
   s.homepage = "http://sinatra.rubyforge.org"

data/test/application_test.rb

@@ -96,6 +96,17 @@ context "An app returns" do
 
   end
 
+  specify "404 if NotFound is raised" do
+
+    get '/' do
+      raise Sinatra::NotFound
+    end
+
+    get_it '/'
+    should.be.not_found
+
+  end
+
 end
 
 context "Application#configure blocks" do

data/test/helper.rb

@@ -1,6 +1,8 @@
 require 'rubygems'
 require 'mocha'
 
+gem 'rack', '~> 0.4.0'
+
 $:.unshift File.dirname(File.dirname(__FILE__)) + "/lib"
 
 require 'sinatra'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rtomayko-sinatra
 version: !ruby/object:Gem::Version 
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors: 
 - Blake Mizerany
@@ -17,7 +17,7 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         version: 0.4.0
     version: