sinatra 0.9.2 → 0.9.4

data/CHANGES

@@ -1,4 +1,21 @@
-= 0.9.2 / unreleased
+= 0.9.4 / 2009-07-26
+
+ * The app_file and run options should be properly detected
+   on Debian when installed from apt package.
+
+ * The :show_exceptions option now defaults to false in all
+   cases for subclasses of Sinatra::Base.
+
+ * Fix webrick server handler not found errors when starting
+   from the command line without mongrel or thin [#231].
+
+ * Fix locals not being passed to layouts.
+
+ * Fix 'Illegal Seek' errors running under Apache/CGI.
+
+= 0.9.3 / unreleased
+
+= 0.9.2 / 2009-05-18
 
  * This version is compatible with Rack 1.0. [Rein Henrichs]
 

data/README.rdoc

@@ -45,7 +45,7 @@ Route patterns may include named parameters, accessible via the
 <tt>params</tt> hash:
 
   get '/hello/:name' do
-    # matches "GET /foo" and "GET /bar"
+    # matches "GET /hello/foo" and "GET /hello/bar"
     # params[:name] is 'foo' or 'bar'
     "Hello #{params[:name]}!"
   end
@@ -470,6 +470,56 @@ recommended:
 NOTE: The built-in Sinatra::Test module and Sinatra::TestHarness class
 are deprecated as of the 0.9.2 release.
 
+== Sinatra::Base - Middleware, Libraries, and Modular Apps
+
+Defining your app at the top-level works well for micro-apps but has
+considerable drawbacks when building reuseable components such as Rack
+middleware, Rails metal, simple libraries with a server component, or
+even Sinatra extensions. The top-level DSL pollutes the Object namespace
+and assumes a micro-app style configuration (e.g., a single application
+file, ./public and ./views directories, logging, exception detail page,
+etc.). That's where Sinatra::Base comes into play:
+
+  require 'sinatra/base'
+
+  class MyApp < Sinatra::Base
+    set :sessions, true
+    set :foo, 'bar'
+
+    get '/' do
+      'Hello world!'
+    end
+  end
+
+The MyApp class is an independent Rack component that can act as
+Rack middleware, a Rack application, or Rails metal. You can +use+ or
++run+ this class from a rackup +config.ru+ file; or, control a server
+component shipped as a library:
+
+   MyApp.run! :host => 'localhost', :port => 9090
+
+The methods available to Sinatra::Base subclasses are exactly as those
+available via the top-level DSL. Most top-level apps can be converted to
+Sinatra::Base components with two modifications:
+
+* Your file should require +sinatra/base+  instead of +sinatra+;
+  otherwise, all of Sinatra's DSL methods are imported into the main
+  namespace.
+* Put your app's routes, error handlers, filters, and options in a subclass
+  of Sinatra::Base.
+
++Sinatra::Base+ is a blank slate. Most options are disabled by default,
+including the built-in server. See {Options and Configuration}[http://sinatra.github.com/configuration.html]
+for details on available options and their behavior.
+
+SIDEBAR: Sinatra's top-level DSL is implemented using a simple delegation
+system. The +Sinatra::Application+ class -- a special subclass of
+Sinatra::Base -- receives all :get, :put, :post, :delete, :before,
+:error, :not_found, :configure, and :set messages sent to the
+top-level. Have a look at the code for yourself: here's the
+{Sinatra::Delegator mixin}[http://github.com/sinatra/sinatra/blob/master/lib/sinatra/base.rb#L1064]
+being {included into the main namespace}[http://github.com/sinatra/sinatra/blob/master/lib/sinatra/main.rb#L25].
+
 == Command line
 
 Sinatra applications can be run directly:

data/lib/sinatra/base.rb

@@ -6,7 +6,7 @@ require 'rack/builder'
 require 'sinatra/showexceptions'
 
 module Sinatra
-  VERSION = '0.9.2'
+  VERSION = '0.9.4'
 
   # The request object. See Rack::Request for more info:
   # http://rack.rubyforge.org/doc/classes/Rack/Request.html
@@ -23,7 +23,7 @@ module Sinatra
     # Override Rack 0.9.x's #params implementation (see #72 in lighthouse)
     def params
       self.GET.update(self.POST)
-    rescue EOFError => boom
+    rescue EOFError, Errno::ESPIPE
       self.GET
     end
   end
@@ -268,7 +268,7 @@ module Sinatra
       if layout
         data, options[:filename], options[:line] = lookup_layout(engine, layout, views)
         if data
-          output = __send__("render_#{engine}", layout, data, options, {}) { output }
+          output = __send__("render_#{engine}", layout, data, options, locals) { output }
         end
       end
 
@@ -922,7 +922,7 @@ module Sinatra
         servers = Array(self.server)
         servers.each do |server_name|
           begin
-            return Rack::Handler.get(server_name.capitalize)
+            return Rack::Handler.get(server_name.downcase)
           rescue LoadError
           rescue NameError
           end
@@ -951,7 +951,7 @@ module Sinatra
 
     public
       CALLERS_TO_IGNORE = [
-        /lib\/sinatra.*\.rb$/, # all sinatra code
+        /\/sinatra(\/(base|main|showexceptions|compat))?\.rb$/, # all sinatra code
         /\(.*\)/,              # generated code
         /custom_require\.rb$/, # rubygems require hacks
         /active_support/,      # active_support require hacks
@@ -977,7 +977,7 @@ module Sinatra
     set :raise_errors, true
     set :dump_errors, false
     set :clean_trace, true
-    set :show_exceptions, Proc.new { development? }
+    set :show_exceptions, false
     set :sessions, false
     set :logging, false
     set :methodoverride, false
@@ -1048,6 +1048,7 @@ module Sinatra
   # Base class for classic style (top-level) applications.
   class Default < Base
     set :raise_errors, Proc.new { test? }
+    set :show_exceptions, Proc.new { development? }
     set :dump_errors, true
     set :sessions, false
     set :logging, Proc.new { ! test? }

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.2'
-  s.date = '2009-05-18'
+  s.version = '0.9.4'
+  s.date = '2009-07-26'
 
   s.description = "Classy web-development dressed in a DSL"
   s.summary     = "Classy web-development dressed in a DSL"
@@ -96,6 +96,7 @@ Gem::Specification.new do |s|
     test/views/error.erb
     test/views/error.haml
     test/views/error.sass
+    test/views/foo/hello.test
     test/views/hello.builder
     test/views/hello.erb
     test/views/hello.haml

data/test/options_test.rb

@@ -183,10 +183,15 @@ class OptionsTest < Test::Unit::TestCase
   end
 
   describe 'show_exceptions' do
+    %w[development test production none].each do |environment|
+      it "is disabled on Base in #{environment} environments" do
+        @base.set(:environment, environment)
+        assert ! @base.show_exceptions?
+      end
+    end
+
     it 'is enabled on Default only in development' do
       @base.set(:environment, :development)
-      assert @base.show_exceptions?
-
       assert @default.development?
       assert @default.show_exceptions?
 

data/test/server_test.rb

@@ -1,17 +1,21 @@
 require File.dirname(__FILE__) + '/helper'
 
-class Rack::Handler::Mock
-  extend Test::Unit::Assertions
-
-  def self.run(app, options={})
-    assert(app < Sinatra::Base)
-    assert_equal 9001, options[:Port]
-    assert_equal 'foo.local', options[:Host]
-    yield new
+module Rack::Handler
+  class Mock
+    extend Test::Unit::Assertions
+
+    def self.run(app, options={})
+      assert(app < Sinatra::Base)
+      assert_equal 9001, options[:Port]
+      assert_equal 'foo.local', options[:Host]
+      yield new
+    end
+
+    def stop
+    end
   end
 
-  def stop
-  end
+  register 'mock', 'Rack::Handler::Mock'
 end
 
 class ServerTest < Test::Unit::TestCase

data/test/templates_test.rb

@@ -76,6 +76,12 @@ class TemplatesTest < Test::Unit::TestCase
     assert_equal "X\n= yield\nX\n", @app.templates[:layout][:template]
   end
 
+  it 'loads templates from specified views directory' do
+    render_app { render :test, :hello, :views => options.views + '/foo' }
+
+    assert_equal "from another views directory\n", body
+  end
+
   test 'use_in_file_templates simply ignores IO errors' do
     assert_nothing_raised {
       mock_app {
@@ -85,6 +91,22 @@ class TemplatesTest < Test::Unit::TestCase
 
     assert @app.templates.empty?
   end
+
+  it 'passes locals to the layout' do
+    mock_app {
+      template :my_layout do
+        'Hello <%= name %>!<%= yield %>'
+      end
+
+      get '/' do
+        erb '<p>content</p>', { :layout => :my_layout }, { :name => 'Mike'}
+      end
+    }
+
+    get '/'
+    assert ok?
+    assert_equal 'Hello Mike!<p>content</p>', body
+  end
 end
 
 # __END__ : this is not the real end of the script.

data/test/views/foo/hello.test

@@ -0,0 +1 @@
+from another views directory

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra
 version: !ruby/object:Gem::Version 
-  version: 0.9.2
+  version: 0.9.4
 platform: ruby
 authors: 
 - Blake Mizerany
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-18 00:00:00 -07:00
+date: 2009-07-26 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -137,6 +137,7 @@ files:
 - test/views/error.erb
 - test/views/error.haml
 - test/views/error.sass
+- test/views/foo/hello.test
 - test/views/hello.builder
 - test/views/hello.erb
 - test/views/hello.haml
@@ -148,6 +149,8 @@ files:
 - test/views/layout2.test
 has_rdoc: true
 homepage: http://sinatra.rubyforge.org
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --line-numbers
@@ -173,7 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: sinatra
-rubygems_version: 1.3.1
+rubygems_version: 1.3.4
 signing_key: 
 specification_version: 2
 summary: Classy web-development dressed in a DSL