bmizerany-sinatra 0.8.10 → 0.9.0

data/CHANGES

@@ -1,42 +1,28 @@
 = 0.9.0 (unreleased)
 
- * Works with and requires Rack >= 0.9.1
-
- * Multiple Sinatra applications can now co-exist peacefully within a
-   single process. The new "Sinatra::Base" class can be subclassed to
-   establish a blank-slate Rack application or middleware component.
-   Documentation on using these features is forth-coming; the following
-   provides the basic gist: http://gist.github.com/38605
-
- * Parameters with subscripts are now parsed into a nested/recursive
-   Hash structure. e.g., "post[title]=Hello&post[body]=World" yields
-   params: {'post' => {'title' => 'Hello', 'body' => 'World'}}.
-
- * Regular expressions may now be used in route pattens; captures are
-   available at "params[:captures]".
-
  * New ":provides" route condition takes an array of mime types and
    matches only when an Accept request header is present with a
    corresponding type. [cypher]
 
- * New request-level "pass" method; immediately exits the current block
-   and passes control to the next matching route.
+ * Work with and require Rack >= 0.9
+
+ * Regular expressions may now be used in route pattens; captures are
+   available at "params[:captures]".
 
  * The request-level "body" method now takes a block; evaluation is
    deferred until an attempt is made to read the body. The block must
    return a String or Array.
 
- * New "route conditions" system for attaching rules for when a route
-   matches. The :agent and :host route options now use this system.
-
- * New "dump_errors" option controls whether the backtrace is dumped to
-   rack.errors when an exception is raised from a route. The option is
-   enabled by default for top-level apps.
-
  * Better default "app_file", "root", "public", and "views" location
    detection; changes to "root" and "app_file" automatically cascade to
    other options that depend on them.
 
+ * New "route conditions" system for attaching rules for when a route
+   matches. The :agent and :host route options now use this system.
+
+ * New request-level "pass" method; immediately exits the current block
+   and passes control to the next matching route.
+
  * Error mappings are now split into two distinct layers: exception
    mappings and custom error pages. Exception mappings are registered
    with "error(Exception)" and are run only when the app raises an
@@ -45,16 +31,6 @@
    has the status code specified. It's also possible to register an error
    page for a range of status codes: "error(500..599)".
 
- * Sinatra's testing support is no longer dependent on Test::Unit. Requiring
-   'sinatra/test' adds the Sinatra::Test module and Sinatra::TestHarness
-   class, which can be used with any test framework. The 'sinatra/test/unit',
-   'sinatra/test/spec', 'sinatra/test/rspec', or 'sinatra/test/bacon' files
-   can be required to setup a framework-specific testing environment. See the
-   README for more information.
-
- * Added support for Bacon (test framework). The 'sinatra/test/bacon' file
-   can be required to setup Sinatra test helpers on Bacon::Context.
-
  * Deprecated "set_option" and "set_options"; use "set" instead.
 
  * Deprecated the "env" option ("options.env"); use "environment" instead.
@@ -79,10 +55,6 @@
    treated as internal server errors and result in a 500 response
    status.
 
- * Deprecated the "get_it", "post_it", "put_it", "delete_it", and "head_it"
-   test helper methods. Use "get", "post", "put", "delete", and "head",
-   respectively, instead.
-
  * Removed Event and EventContext classes. Applications are defined in a
    subclass of Sinatra::Base; each request is processed within an
    instance.

data/README.rdoc

@@ -1,7 +1,9 @@
 = Sinatra
 
 Sinatra is a DSL for quickly creating web-applications in Ruby with minimal
-effort:
+effort.
+
+== Sample App
 
   # myapp.rb
   require 'rubygems'
@@ -30,6 +32,10 @@ Run with <tt>ruby myapp.rb</tt> and view at <tt>http://localhost:4567</tt>
     .. annihilate something ..
   end
 
+  head '/' do
+
+  end
+
 == Routes
 
 Routes are matched based on the order of declaration. The first route that
@@ -41,17 +47,14 @@ Basic routes:
     ...
   end
 
-Route patterns may include named parameters, accessible via the
-<tt>params</tt> hash:
+Named parameters:
 
   get '/:name' do
     # matches "GET /foo" and "GET /bar"
     # params[:name] is 'foo' or 'bar'
-    "Hello #{params[:name]}!"
   end
 
-Route patterns may also include splat (or wildcard) parameters, accessible
-via the <tt>params[:splat]</tt> array.
+Splat parameters:
 
   get '/say/*/to/*' do
     # matches /say/hello/to/world
@@ -63,13 +66,7 @@ via the <tt>params[:splat]</tt> array.
     params[:splat] # => ["path/to/file", "xml"]
   end
 
-Route matching with Regular Expressions:
-
-  get %r{/hello/([\w]+)} do
-    "Hello, #{params[:captures].first}!"
-  end
-
-Routes may include a variety of matching conditions, such as the user agent:
+User agent matching:
 
   get '/foo', :agent => /Songbird (\d\.\d)[\d\/]*?/ do
     "You're using Songbird version #{params[:agent][0]}"
@@ -81,29 +78,33 @@ Routes may include a variety of matching conditions, such as the user agent:
 
 == Static Files
 
-Static files are served from the <tt>./public</tt> directory. You can specify
-a different location by setting the <tt>:public</tt> option:
+Put all of your static content in the ./public directory
+
+  root
+    \ public
+
+To use a different static directory:
 
   set :public, File.dirname(__FILE__) + '/static'
 
-== Views / Templates
+== Views
+
+Views are searched for in a ./views directory in the same location as
+your main application.
 
-Templates are assumed to be located directly under a <tt>./views</tt>
-directory. To use a different views directory:
+To use a different views directory:
 
   set :views, File.dirname(__FILE__) + '/templates'
 
 === Haml Templates
 
-The haml gem/library is required to render HAML templates:
-
   get '/' do
     haml :index
   end
 
 Renders <tt>./views/index.haml</tt>.
 
-=== Erb Templates
+=== Erb
 
   get '/' do
     erb :index
@@ -111,20 +112,11 @@ Renders <tt>./views/index.haml</tt>.
 
 Renders <tt>./views/index.erb</tt>
 
-=== Builder Templates
+=== Builder
 
-The builder gem/library is required to render builder templates:
+See Sinatra::Builder
 
-  get '/' do
-    content_type 'application/xml', :charset => 'utf-8'
-    builder :index
-  end
-
-Renders <tt>./views/index.builder</tt>.
-
-=== Sass Templates
-
-The sass gem/library is required to render Sass templates:
+=== Sass
 
   get '/stylesheet.css' do
     content_type 'text/css', :charset => 'utf-8'
@@ -143,8 +135,9 @@ Renders the inlined template string.
 
 === Accessing Variables
 
-Templates are evaluated within the same context as the route blocks. Instance
-variables set in route blocks are available in templates:
+Templates are evaluated within the Sinatra::EventContext instance
+used to evaluate event blocks. Instance variables set in event
+blocks can be accessed direcly in views:
 
   get '/:id' do
     @foo = Foo.find(params[:id])
@@ -165,32 +158,27 @@ other templates.
 
 Templates may be defined at the end of the source file:
 
-  require 'rubygems'
-  require 'sinatra'
-
   get '/' do
     haml :index
   end
 
+  use_in_file_templates!
+
   __END__
 
   @@ layout
-  %html
-    = yield
+  X
+  = yield
+  X
 
   @@ index
   %div.title Hello world!!!!!
 
-NOTE:  Sinatra will automaticly load any in-file-templates in the
-source file that first required sinatra.  If you have in-file-templates
-in another source file you will need to explicitly call
-+use_in_file_templates! on main in that file.
-
 It's also possible to define named templates using the top-level template
 method:
 
   template :layout do
-    "%html\n  =yield\n"
+    "X\n=yield\nX"
   end
 
   template :index do
@@ -201,17 +189,9 @@ method:
     haml :index
   end
 
-If a template named "layout" exists, it will be used each time a template
-is rendered. You can disable layouts by passing <tt>:layout => false</tt>.
-
-  get '/' do
-    haml :index, :layout => !request.xhr?
-  end
-
 == Helpers
 
-Use the top-level <tt>helpers</tt> method to define helper methods for use in
-route blocks and templates:
+The top-level <tt>helpers</tt> method
 
   helpers do
     def bar(name)
@@ -225,9 +205,7 @@ route blocks and templates:
 
 == Filters
 
-Before filters are evaluated before each request within the context of the
-request and can modify the request and response. Instance variables set in
-filters are accessible by routes and templates.
+Before filters are evaluated in request context before routing is performed:
 
   before do
     @note = 'Hi!'
@@ -239,75 +217,64 @@ filters are accessible by routes and templates.
     params[:splat] #=> 'bar/baz'
   end
 
-== Halting
+Before filters can modify the request and response; instance variables are
+available to routes.
 
-To immediately stop a request during a before filter or route use:
+== Halt!
 
-  halt
+To immediately stop a request during a before filter or event use:
 
-You can also specify a body when halting ...
+  throw :halt
 
-  halt 'this will be the body'
+Set the body to a simple string
 
-Set the status and body ...
+  throw :halt, 'this will be the body'
 
-  halt 401, 'go away!'
+Set status then the body
 
-== Passing
+  throw :halt, [401, 'go away!']
 
-A route can punt processing to the next matching route using the <tt>pass</tt>
-statement:
+Run a proc inside the Sinatra::EventContext instance and set the body to the
+result
 
-  get '/guess/:who' do
-    pass unless params[:who] == 'Frank'
-    "You got me!"
-  end
-
-  get '/guess/*' do
-    "You missed!"
-  end
-
-The route block is immediately exited and control continues with the next
-matching route. If no matching route is found, a 404 is returned.
+  throw :halt, lambda { puts 'In a proc!'; 'I just wrote to $stdout!' }
 
 == Configuration and Reloading
 
 Sinatra supports multiple environments and reloading. Reloading happens
-before each request when running under the <tt>:development</tt>
-environment. Wrap your configurations (e.g., database connections, constants,
-etc.) in <tt>configure</tt> blocks to protect them from reloading or to
-target specific environments.
+before every request when running under the :development environment. Wrap
+your configurations in <tt>configure</tt> (i.e. Database connections, Constants,
+etc.) to protect them from reloading or to target specific environments.
 
-Run once, at startup, in any environment:
+All environments:
 
   configure do
     ...
   end
 
-Run only when the environment (RACK_ENV environment variable) is set to
-<tt>:production</tt>.
+Production:
 
   configure :production do
     ...
   end
 
-Run when the environment (RACK_ENV environment variable) is set to
-either <tt>:production</tt> or <tt>:test</tt>.
+Two at a time:
 
   configure :production, :test do
     ...
   end
 
+This is also really nifty for error handling.
+
 == Error handling
 
-Error handlers run within the same context as routes and before filters, which
-means you get all the goodies it has to offer, like <tt>haml</tt>, <tt>erb</tt>,
-<tt>halt</tt>, etc.
+Error handlers run inside the current Sinatra::EventContext instance, which
+means you get all the goodies it has to offer (i.e. haml, erb, throw :halt,
+etc.)
 
 === Not Found
 
-When a <tt>Sinatra::NotFound</tt> exception is raised, or the response's status
-code is 404, the <tt>not_found</tt> handler is invoked:
+When Sinatra::NotFound is raised, the not_found handler is invoked:
 
   not_found do
     'This is nowhere to be found'
@@ -315,12 +282,14 @@ code is 404, the <tt>not_found</tt> handler is invoked:
 
 === Error
 
-The +error+ handler is invoked any time an exception is raised from a route
-block or before filter. The exception object can be obtained from the
-'sinatra.error' Rack variable:
+By default, the +error+ handler is invoked on Sinatra::ServerError or when
+an unknown error occurs.
+
+The exception can be obtained from the 'sinatra.error' variable in
+request.env.
 
   error do
-    'Sorry there was a nasty error - ' + env['sinatra.error'].name
+    'Sorry there was a nasty error - ' + request.env['sinatra.error'].name
   end
 
 Custom errors:
@@ -340,12 +309,12 @@ You get this:
   So what happened was... something bad
 
 Sinatra installs special not_found and error handlers when running under
-the development environment.
+the development.
 
 == Mime types
 
-When using <tt>send_file</tt> or static files you may have mime types Sinatra
-doesn't understand. Use +mime+ to register them by file extension:
+When using send_file or static files you may have mime types Sinatra doesn't
+understand.  Use +mime+ in those cases.
 
   mime :foo, 'text/foo'
 
@@ -386,61 +355,59 @@ typically don't have to +use+ them explicitly.
 
 == Testing
 
-The Sinatra::Test module includes a variety of helper methods for testing
-your Sinatra app. Sinatra includes support for Test::Unit, test-spec, RSpec,
-and Bacon through separate source files.
-
-=== Test::Unit
+=== Test/Unit
 
+  require 'rubygems'
   require 'sinatra'
   require 'sinatra/test/unit'
   require 'my_sinatra_app'
 
   class MyAppTest < Test::Unit::TestCase
+
     def test_my_default
-      get '/'
+      get_it '/'
       assert_equal 'My Default Page!', @response.body
     end
 
     def test_with_agent
-      get '/', :agent => 'Songbird'
+      get_it '/', :agent => 'Songbird'
       assert_equal 'You're in Songbird!', @response.body
     end
 
     ...
-  end
 
-=== Test::Spec
+  end
 
-Install the test-spec gem and require <tt>'sinatra/test/spec'</tt> before
-your app:
+=== Test/Spec
 
+  require 'rubygems'
   require 'sinatra'
   require 'sinatra/test/spec'
   require 'my_sinatra_app'
 
   describe 'My app' do
+
     it "should show a default page" do
-      get '/'
+      get_it '/'
       should.be.ok
       body.should.equal 'My Default Page!'
     end
 
     ...
+
   end
 
 === RSpec
 
-Install the rspec gem and require <tt>'sinatra/test/rspec'</tt> before
-your app:
-
+  require 'rubygems'
+  require 'spec'
   require 'sinatra'
   require 'sinatra/test/rspec'
   require 'my_sinatra_app'
 
   describe 'My app' do
     it 'should show a default page' do
-      get '/'
+      get_it '/'
       @response.should be_ok
       @response.body.should == 'My Default Page!'
     end
@@ -449,35 +416,20 @@ your app:
 
   end
 
-=== Bacon
-
-  require 'sinatra'
-  require 'sinatra/test/bacon'
-  require 'my_sinatra_app'
-
-  describe 'My app' do
-    it 'should be ok' do
-      get '/'
-      should.be.ok
-      body.should == 'Im OK'
-    end
-  end
-
-See Sinatra::Test for more information on +get+, +post+, +put+, and
-friends.
+See Sinatra::Test::Methods for more information on +get_it+, +post_it+,
++put_it+, and friends.
 
 == Command line
 
 Sinatra applications can be run directly:
 
-  ruby myapp.rb [-h] [-x] [-e ENVIRONMENT] [-p PORT] [-s HANDLER]
+  ruby myapp.rb [-h] [-x] [-p PORT] [-e ENVIRONMENT]
 
 Options are:
 
   -h # help
   -p # set the port (default is 4567)
   -e # set the environment (default is development)
-  -s # specify rack server/handler (default is thin)
   -x # turn on the mutex lock (default is off)
 
 == Contributing
@@ -510,7 +462,7 @@ screencasts about Git, which you can find here: http://www.gitcasts.com/
 
 at the top of your sinatra_app.rb file:
 
-  $LOAD_PATH.unshift File.dirname(__FILE__) + '/sinatra/lib'
+  $:.unshift File.dirname(__FILE__) + '/sinatra/lib'
   require 'sinatra'
 
   get '/about' do

data/compat/events_test.rb

@@ -1,6 +1,7 @@
 require File.dirname(__FILE__) + '/helper'
 
 context "Simple Events" do
+
   def simple_request_hash(method, path)
     Rack::Request.new({
       'REQUEST_METHOD' => method.to_s.upcase,
@@ -13,16 +14,16 @@ context "Simple Events" do
 
   def invoke_simple(path, request_path, &b)
     params = nil
-    get path do
-      params = self.params
-      b.call if b
-    end
+    mock_app {
+      get path do
+        params = self.params
+        b.call if b
+      end
+    }
     get_it request_path
     MockResult.new(b, params)
   end
 
-  setup { Sinatra.application = nil }
-
   specify "return last value" do
     block = Proc.new { 'Simple' }
     result = invoke_simple('/', '/', &block)
@@ -37,7 +38,6 @@ context "Simple Events" do
     result.params.should.equal "foo" => 'a', "bar" => 'b'
 
     # unscapes
-    Sinatra.application = nil
     result = invoke_simple('/:foo/:bar', '/a/blake%20mizerany')
     result.should.not.be.nil
     result.params.should.equal "foo" => 'a', "bar" => 'blake mizerany'
@@ -48,17 +48,14 @@ context "Simple Events" do
     result.should.not.be.nil
     result.params.should.equal "foo" => 'a', "bar" => 'b'
 
-    Sinatra.application = nil
     result = invoke_simple('/?:foo?/?:bar?', '/a/')
     result.should.not.be.nil
     result.params.should.equal "foo" => 'a', "bar" => nil
 
-    Sinatra.application = nil
     result = invoke_simple('/?:foo?/?:bar?', '/a')
     result.should.not.be.nil
     result.params.should.equal "foo" => 'a', "bar" => nil
 
-    Sinatra.application = nil
     result = invoke_simple('/:foo?/?:bar?', '/')
     result.should.not.be.nil
     result.params.should.equal "foo" => nil, "bar" => nil

data/compat/helper.rb

@@ -1,9 +1,6 @@
 require 'rubygems'
 require 'mocha'
 
-# disable warnings in compat specs.
-$VERBOSE = nil
-
 $:.unshift File.dirname(File.dirname(__FILE__)) + "/lib"
 
 ENV['RACK_ENV'] ||= 'test'
@@ -13,18 +10,9 @@ require 'sinatra/test'
 require 'sinatra/test/unit'
 require 'sinatra/test/spec'
 
-module Sinatra::Test
-  # we need to remove the new test helper methods since they conflict with
-  # the top-level methods of the same name.
-  %w(get head post put delete).each do |verb|
-    remove_method verb
-  end
-  include Sinatra::Delegator
-end
-
 class Test::Unit::TestCase
-  include Sinatra::Test
   def setup
     @app = lambda { |env| Sinatra::Application.call(env) }
   end
+  include Sinatra::Test
 end