sinatra 1.2.0 → 1.2.1

data/README.rdoc

@@ -64,7 +64,7 @@ You can also access named parameters via block parameters:
   end
 
 Route patterns may also include splat (or wildcard) parameters, accessible
-via the <tt>params[:splat]</tt> array.
+via the <tt>params[:splat]</tt> array:
 
   get '/say/*/to/*' do
     # matches /say/hello/to/world
@@ -162,11 +162,11 @@ can easily define your own matchers:
 
     def initialize(except)
       @except   = except
-      @caputres = Match.new([])
+      @captures = Match.new([])
     end
 
     def match(str)
-      @caputres unless @except === str
+      @captures unless @except === str
     end
   end
 
@@ -673,7 +673,7 @@ Templates may also be defined using the top-level <tt>template</tt> method:
 
 If a template named "layout" exists, it will be used each time a template
 is rendered. You can individually disable layouts by passing <tt>:layout => false</tt>
-or disable them by default via <tt>set :haml, :layout => false</tt>.
+or disable them by default via <tt>set :haml, :layout => false</tt>:
 
   get '/' do
     haml :index, :layout => !request.xhr?
@@ -799,6 +799,13 @@ middleware of choice how you would any other middleware:
     session[:value] = params[:value]
   end
 
+To improve security, the session data in the cookie is signed with a session
+secret. A random secret is generate for you by Sinatra. However, since this
+secret will change with every start of your application, you might want to
+set the secret yourself, so all your application instances share it:
+
+  set :session_secret, 'super secret'
+
 === Halting
 
 To immediately stop a request within a filter or route use:
@@ -974,7 +981,7 @@ You can easily set the Cache-Control header with like this:
     "cache it!"
   end
 
-Pro tip: Set up caching in a before filter.
+Pro tip: Set up caching in a before filter:
 
   before do
     cache_control :public, :must_revalidate, :max_age => 60
@@ -990,7 +997,7 @@ If you are using the +expires+ helper to set the corresponding header,
 To properly use caches, you should consider using +etag+ and +last_modified+.
 It is recommended to call those helpers *before* doing heavy lifting, as they
 will immediately flush a response if the client already has the current
-version in its cache.
+version in its cache:
 
   get '/article/:id' do
     @article = Article.find params[:id]
@@ -1105,7 +1112,7 @@ The <tt>request.body</tt> is an IO or StringIO object:
 === Attachments
 
 You can use the +attachment+ helper to tell the browser the response should be
-stored on disk rather than displayed in the browser.
+stored on disk rather than displayed in the browser:
 
   get '/' do
     attachment
@@ -1546,7 +1553,7 @@ with a <tt>config.ru</tt>.</b>
 Not only is Sinatra able to use other Rack middleware, any Sinatra application
 can in turn be added in front of any Rack endpoint as middleware itself. This
 endpoint could be another Sinatra application, or any other Rack-based
-application (Rails/Ramaze/Camping/...).
+application (Rails/Ramaze/Camping/...):
 
   require 'sinatra/base'
   
@@ -1686,7 +1693,7 @@ The following Ruby versions are officially supported:
 
 [ Ruby 1.8.6 ]
   It is not recommended to use 1.8.6 for Sinatra. However, it will be
-  officially supported until Sinatra 1.3.0 is released. RDoc and CoffeScript
+  officially supported until Sinatra 1.3.0 is released. RDoc and CoffeeScript
   templates are not supported by this Ruby version. 1.8.6 includes a major
   memory leak in its Hash implementation, which is triggered by Sinatra
   versions prior to 1.1.1. The current version explicitly prevents this leak
@@ -1703,14 +1710,15 @@ The following Ruby versions are officially supported:
   segmentation faults when using Sinatra.
 
 [ Rubinius ]
-  Rubinius is officially supported (Rubinius >= 1.2.2), with the exception
-  of Textile templates.
+  Rubinius is officially supported (Rubinius >= 1.2.3), everything, including
+  all template languages, works.
 
 [ JRuby ]
-  JRuby is officially supported (JRuby >= 1.5.6). No issues with third party
+  JRuby is officially supported (JRuby >= 1.6.0). No issues with third party
   template libraries are known, however, if you choose to use JRuby, please
-  look into JRuby rack handlers, as the Thin web server is not (yet) supported
-  on JRuby.
+  look into JRuby rack handlers, as the Thin web server is not fully supported
+  on JRuby. JRuby's support for C extensions is still experimental, which only
+  affects RDiscount at the moment.
 
 We also keep an eye on upcoming Ruby versions.
 
@@ -1718,14 +1726,16 @@ The following Ruby implementations are not officially supported but still are
 known to run Sinatra:
 
 * Older versions of JRuby and Rubinius
-* MacRuby
-* Maglev
-* IronRuby
+* MacRuby, Maglev, IronRuby
 * Ruby 1.9.0 and 1.9.1
 
 Not being officially supported means if things only break there and not on a
 supported platform, we assume it's not our issue but theirs.
 
+We also run our CI against ruby-head (the upcoming 1.9.3), but we can't
+guarantee anything, since it is constantly moving. Expect 1.9.3p0 to be
+supported.
+
 Sinatra should work on any operating system supported by the chosen Ruby
 implementation.
 
@@ -1790,6 +1800,11 @@ If you install gems as root, the last step should be
 
   sudo rake install
 
+== Versioning
+
+Sinatra follows {Semantic Versioning}[http://semver.org/], both SemVer and
+SemVerTag.
+
 == Further Reading
 
 * {Project Website}[http://www.sinatrarb.com/] - Additional documentation,
@@ -1800,3 +1815,4 @@ If you install gems as root, the last step should be
 * {Twitter}[http://twitter.com/sinatra]
 * {Mailing List}[http://groups.google.com/group/sinatrarb/topics]
 * {IRC: #sinatra}[irc://chat.freenode.net/#sinatra] on http://freenode.net
+

data/README.zh.rdoc

@@ -162,11 +162,11 @@ Rack body对象或者HTTP状态码：
 
     def initialize(except)
       @except   = except
-      @caputres = Match.new([])
+      @captures = Match.new([])
     end
 
     def match(str)
-      @caputres unless @except === str
+      @captures unless @except === str
     end
   end
 

data/Rakefile

@@ -80,6 +80,21 @@ task :thanks, [:release,:backports] do |t, a|
     "(based on commits included in #{a.release}, but not in #{a.backports})"
 end
 
+task :authors, [:format, :sep] do |t, a|
+  a.with_defaults :format => "%s (%d)", :sep => ', '
+  authors = Hash.new { |h,k| h[k] = 0 }
+  blake   = "Blake Mizerany"
+  mapping = {
+    "blake.mizerany@gmail.com" => blake, "bmizerany" => blake,
+    "a_user@mac.com" => blake, "ichverstehe" => "Harry Vangberg",
+    "Wu Jiang (nouse)" => "Wu Jiang" }
+  `git shortlog -s`.lines.map do |line|
+    num, name = line.split("\t", 2).map(&:strip)
+    authors[mapping[name] || name] += num.to_i
+  end
+  puts authors.sort_by { |n,c| -c }.map { |e| a.format % e }.join(a.sep)
+end
+
 # PACKAGING ============================================================
 
 if defined?(Gem)
@@ -144,8 +159,8 @@ if defined?(Gem)
     sh <<-SH
       gem install #{package('.gem')} --local &&
       gem push #{package('.gem')}  &&
-      git add sinatra.gemspec &&
-      git commit --allow-empty -m '#{source_version} release'  &&
+      git commit --allow-empty -a -m '#{source_version} release'  &&
+      git tag -s v#{source_version} -m '#{source_version} release'  &&
       git tag -s #{source_version} -m '#{source_version} release'  &&
       git push && (git push sinatra || true) &&
       git push --tags && (git push sinatra --tags || true)

data/lib/sinatra/base.rb

@@ -7,7 +7,7 @@ require 'sinatra/showexceptions'
 require 'tilt'
 
 module Sinatra
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 
   # The request object. See Rack::Request for more info:
   # http://rack.rubyforge.org/doc/classes/Rack/Request.html
@@ -542,7 +542,7 @@ module Sinatra
       # render layout
       if layout
         options = options.merge(:views => views, :layout => false, :eat_errors => eat_errors, :scope => scope)
-        catch(:layout_missing) { output = render(layout_engine, layout, options, locals) { output }}
+        catch(:layout_missing) { return render(layout_engine, layout, options, locals) { output } }
       end
 
       output.extend(ContentTyped).content_type = content_type if content_type
@@ -1192,7 +1192,7 @@ module Sinatra
       end
 
       def quit!(server, handler_name)
-        ## Use thins' hard #stop! if available, otherwise just #stop
+        # Use Thin's hard #stop! if available, otherwise just #stop.
         server.respond_to?(:stop!) ? server.stop! : server.stop
         puts "\n== Sinatra has ended his set (crowd applauds)" unless handler_name =~/cgi/i
       end
@@ -1218,19 +1218,27 @@ module Sinatra
         @prototype ||= new
       end
 
+      # Create a new instance without middleware in front of it.
+      alias new! new unless method_defined? :new!
+
       # Create a new instance of the class fronted by its middleware
       # pipeline. The object is guaranteed to respond to #call but may not be
       # an instance of the class new was called on.
       def new(*args, &bk)
+        build(*args, &bk).to_app
+      end
+
+      # Creates a Rack::Builder instance with all the middleware set up and
+      # an instance of this class as end point.
+      def build(*args, &bk)
         builder = Rack::Builder.new
-        builder.use Rack::Session::Cookie if sessions?
+        setup_sessions builder
         builder.use Rack::CommonLogger    if logging?
         builder.use Rack::MethodOverride  if method_override?
         builder.use ShowExceptions        if show_exceptions?
         middleware.each { |c,a,b| builder.use(c, *a, &b) }
-
-        builder.run super
-        builder.to_app
+        builder.run new!(*args, &bk)
+        builder
       end
 
       def call(env)
@@ -1238,6 +1246,11 @@ module Sinatra
       end
 
     private
+      def setup_sessions(builder)
+        return unless sessions?
+        builder.use Rack::Session::Cookie, :secret => session_secret
+      end
+
       def detect_rack_handler
         servers = Array(server)
         servers.each do |server_name|
@@ -1334,6 +1347,9 @@ module Sinatra
     set :default_encoding, "utf-8"
     set :add_charset, [/^text\//, 'application/javascript', 'application/xml', 'application/xhtml+xml']
 
+    # explicitly generating this eagerly to play nice with preforking
+    set :session_secret, '%x' % rand(2**255)
+
     class << self
       alias_method :methodoverride?, :method_override?
       alias_method :methodoverride=, :method_override=

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 = '1.2.0'
-  s.date = '2011-03-03'
+  s.version = '1.2.1'
+  s.date = '2011-03-17'
 
   s.description = "Classy web-development dressed in a DSL"
   s.summary     = "Classy web-development dressed in a DSL"

data/test/base_test.rb

@@ -71,7 +71,7 @@ class BaseTest < Test::Unit::TestCase
     end
 
     it 'exposes the downstream app' do
-      middleware = TestMiddleware.new(app)
+      middleware = TestMiddleware.new!(app)
       assert_same app, middleware.app
     end
 

data/test/helper.rb

@@ -25,6 +25,12 @@ class Sinatra::Base
   include Test::Unit::Assertions
 end
 
+class Rack::Builder
+  def include?(middleware)
+    @ins.any? { |m| p m ; middleware === m }
+  end
+end
+
 Sinatra::Base.set :environment, :test
 
 class Test::Unit::TestCase

data/test/helpers_test.rb

@@ -255,6 +255,35 @@ class HelpersTest < Test::Unit::TestCase
       follow_redirect!
       assert_equal 'hi bar', body
     end
+
+    it 'inserts session middleware' do
+      mock_app do
+        enable :sessions
+        get '/' do
+          assert env['rack.session']
+          assert env['rack.session.options']
+          'ok'
+        end
+      end
+
+      get '/'
+      assert_body 'ok'
+    end
+
+    it 'sets a default session secret' do
+      mock_app do
+        enable :sessions
+        get '/' do
+          secret = env['rack.session.options'][:secret]
+          assert secret
+          assert_equal secret, settings.session_secret
+          'ok'
+        end
+      end
+
+      get '/'
+      assert_body 'ok'
+    end
   end
 
   describe 'mime_type' do

data/test/request_test.rb

@@ -38,7 +38,7 @@ class RequestTest < Test::Unit::TestCase
       'CONTENT_TYPE' => 'application/x-www-form-urlencoded',
       'rack.input' => StringIO.new('foo=bar')
     )
-    params = Sinatra::Base.new.send(:indifferent_hash).replace(request.params)
+    params = Sinatra::Base.new!.send(:indifferent_hash).replace(request.params)
     dumped = Marshal.dump(request.params)
     assert_equal 'bar', Marshal.load(dumped)['foo']
   end

data/test/routing_test.rb

@@ -778,16 +778,11 @@ class RoutingTest < Test::Unit::TestCase
   end
 
   it 'raises an ArgumentError with block arity > 1 and too many values' do
-    if RUBY_ENGINE == "rbx"
-      $stderr.puts "\npending test: #{__method__}, #{__FILE__}:#{__LINE__} "
-      next
-    end
-
-    mock_app {
+    mock_app do
       get '/:foo/:bar/:baz' do |foo, bar|
         'quux'
       end
-    }
+    end
 
     assert_raise(ArgumentError) { get '/a/b/c' }
   end
@@ -949,4 +944,15 @@ class RoutingTest < Test::Unit::TestCase
     assert ok?
     assert_equal 'bar in baseclass', body
   end
+
+  it "adds hostname condition when it is in options" do
+    mock_app {
+      get '/foo', :host => 'host' do
+        'foo'
+      end
+    }
+
+    get '/foo'
+    assert not_found?
+  end
 end

data/test/settings_test.rb

@@ -112,7 +112,7 @@ class SettingsTest < Test::Unit::TestCase
   end
 
   it 'is accessible from instances via #settings' do
-    assert_equal :foo, @base.new.settings.environment
+    assert_equal :foo, @base.new!.settings.environment
   end
 
   it 'is accessible from class via #settings' do

data/test/sinatra_test.rb

@@ -12,6 +12,6 @@ class SinatraTest < Test::Unit::TestCase
   end
   
   it "responds to #template_cache" do
-    assert_kind_of Tilt::Cache, Sinatra::Base.new.template_cache
+    assert_kind_of Tilt::Cache, Sinatra::Base.new!.template_cache
   end
 end

data/test/templates_test.rb

@@ -224,6 +224,14 @@ class TemplatesTest < Test::Unit::TestCase
     assert_equal "Hello <%= 'World' %>!", body
   end
 
+  it "does not leak the content type to the template" do
+    render_app :str => { :layout_engine => :erb } do
+      settings.template(:layout) { 'Hello <%= yield %>!' }
+      render :str, "<%= 'World' %>", :content_type => :txt
+    end
+    assert_equal "text/html;charset=utf-8", headers['Content-Type']
+  end
+
   it "is possible to register another template" do
     Tilt.register "html.erb", Tilt[:erb]
     render_app { render :erb, :calc }

metadata

@@ -1,79 +1,57 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra
 version: !ruby/object:Gem::Version 
-  hash: 31
   prerelease: 
-  segments: 
-  - 1
-  - 2
-  - 0
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors: 
-- Blake Mizerany
-- Ryan Tomayko
-- Simon Rozet
-- Konstantin Haase
+  - Blake Mizerany
+  - Ryan Tomayko
+  - Simon Rozet
+  - Konstantin Haase
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-03-03 00:00:00 +01:00
+date: 2011-03-17 00:00:00 +01:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rack
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 1
-        version: "1.1"
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: tilt
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 1
-        - 2
-        - 2
-        version: 1.2.2
-    - - <
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 0
-        version: "2.0"
-  type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: shotgun
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 6
-        version: "0.6"
-  type: :development
-  version_requirements: *id003
+  - !ruby/object:Gem::Dependency 
+    name: rack
+    prerelease: false
+    requirement: &id001 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            version: "1.1"
+    type: :runtime
+    version_requirements: *id001
+  - !ruby/object:Gem::Dependency 
+    name: tilt
+    prerelease: false
+    requirement: &id002 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 1.2.2
+        - - <
+          - !ruby/object:Gem::Version 
+            version: "2.0"
+    type: :runtime
+    version_requirements: *id002
+  - !ruby/object:Gem::Dependency 
+    name: shotgun
+    prerelease: false
+    requirement: &id003 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            version: "0.6"
+    type: :development
+    version_requirements: *id003
 description: Classy web-development dressed in a DSL
 email: sinatrarb@googlegroups.com
 executables: []
@@ -81,185 +59,179 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README.rdoc
-- README.de.rdoc
-- README.jp.rdoc
-- README.fr.rdoc
-- README.es.rdoc
-- README.hu.rdoc
-- README.zh.rdoc
-- LICENSE
+  - README.rdoc
+  - README.de.rdoc
+  - README.jp.rdoc
+  - README.fr.rdoc
+  - README.es.rdoc
+  - README.hu.rdoc
+  - README.zh.rdoc
+  - LICENSE
 files: 
-- AUTHORS
-- CHANGES
-- Gemfile
-- LICENSE
-- README.de.rdoc
-- README.es.rdoc
-- README.fr.rdoc
-- README.hu.rdoc
-- README.jp.rdoc
-- README.pt-br.rdoc
-- README.rdoc
-- README.ru.rdoc
-- README.zh.rdoc
-- Rakefile
-- lib/sinatra.rb
-- lib/sinatra/base.rb
-- lib/sinatra/images/404.png
-- lib/sinatra/images/500.png
-- lib/sinatra/main.rb
-- lib/sinatra/showexceptions.rb
-- sinatra.gemspec
-- test/base_test.rb
-- test/builder_test.rb
-- test/coffee_test.rb
-- test/contest.rb
-- test/encoding_test.rb
-- test/erb_test.rb
-- test/erubis_test.rb
-- test/extensions_test.rb
-- test/filter_test.rb
-- test/haml_test.rb
-- test/hello.mab
-- test/helper.rb
-- test/helpers_test.rb
-- test/less_test.rb
-- test/liquid_test.rb
-- test/mapped_error_test.rb
-- test/markaby_test.rb
-- test/markdown_test.rb
-- test/middleware_test.rb
-- test/nokogiri_test.rb
-- test/public/favicon.ico
-- test/radius_test.rb
-- test/rdoc_test.rb
-- test/request_test.rb
-- test/response_test.rb
-- test/result_test.rb
-- test/route_added_hook_test.rb
-- test/routing_test.rb
-- test/sass_test.rb
-- test/scss_test.rb
-- test/server_test.rb
-- test/settings_test.rb
-- test/sinatra_test.rb
-- test/slim_test.rb
-- test/static_test.rb
-- test/templates_test.rb
-- test/textile_test.rb
-- test/views/a/in_a.str
-- test/views/ascii.erb
-- test/views/b/in_b.str
-- test/views/calc.html.erb
-- test/views/error.builder
-- test/views/error.erb
-- test/views/error.erubis
-- test/views/error.haml
-- test/views/error.sass
-- test/views/explicitly_nested.str
-- test/views/foo/hello.test
-- test/views/hello.builder
-- test/views/hello.coffee
-- test/views/hello.erb
-- test/views/hello.erubis
-- test/views/hello.haml
-- test/views/hello.less
-- test/views/hello.liquid
-- test/views/hello.mab
-- test/views/hello.md
-- test/views/hello.nokogiri
-- test/views/hello.radius
-- test/views/hello.rdoc
-- test/views/hello.sass
-- test/views/hello.scss
-- test/views/hello.slim
-- test/views/hello.str
-- test/views/hello.test
-- test/views/hello.textile
-- test/views/layout2.builder
-- test/views/layout2.erb
-- test/views/layout2.erubis
-- test/views/layout2.haml
-- test/views/layout2.liquid
-- test/views/layout2.mab
-- test/views/layout2.nokogiri
-- test/views/layout2.radius
-- test/views/layout2.slim
-- test/views/layout2.str
-- test/views/layout2.test
-- test/views/nested.str
-- test/views/utf8.erb
+  - AUTHORS
+  - CHANGES
+  - Gemfile
+  - LICENSE
+  - README.de.rdoc
+  - README.es.rdoc
+  - README.fr.rdoc
+  - README.hu.rdoc
+  - README.jp.rdoc
+  - README.pt-br.rdoc
+  - README.rdoc
+  - README.ru.rdoc
+  - README.zh.rdoc
+  - Rakefile
+  - lib/sinatra.rb
+  - lib/sinatra/base.rb
+  - lib/sinatra/images/404.png
+  - lib/sinatra/images/500.png
+  - lib/sinatra/main.rb
+  - lib/sinatra/showexceptions.rb
+  - sinatra.gemspec
+  - test/base_test.rb
+  - test/builder_test.rb
+  - test/coffee_test.rb
+  - test/contest.rb
+  - test/encoding_test.rb
+  - test/erb_test.rb
+  - test/erubis_test.rb
+  - test/extensions_test.rb
+  - test/filter_test.rb
+  - test/haml_test.rb
+  - test/hello.mab
+  - test/helper.rb
+  - test/helpers_test.rb
+  - test/less_test.rb
+  - test/liquid_test.rb
+  - test/mapped_error_test.rb
+  - test/markaby_test.rb
+  - test/markdown_test.rb
+  - test/middleware_test.rb
+  - test/nokogiri_test.rb
+  - test/public/favicon.ico
+  - test/radius_test.rb
+  - test/rdoc_test.rb
+  - test/request_test.rb
+  - test/response_test.rb
+  - test/result_test.rb
+  - test/route_added_hook_test.rb
+  - test/routing_test.rb
+  - test/sass_test.rb
+  - test/scss_test.rb
+  - test/server_test.rb
+  - test/settings_test.rb
+  - test/sinatra_test.rb
+  - test/slim_test.rb
+  - test/static_test.rb
+  - test/templates_test.rb
+  - test/textile_test.rb
+  - test/views/a/in_a.str
+  - test/views/ascii.erb
+  - test/views/b/in_b.str
+  - test/views/calc.html.erb
+  - test/views/error.builder
+  - test/views/error.erb
+  - test/views/error.erubis
+  - test/views/error.haml
+  - test/views/error.sass
+  - test/views/explicitly_nested.str
+  - test/views/foo/hello.test
+  - test/views/hello.builder
+  - test/views/hello.coffee
+  - test/views/hello.erb
+  - test/views/hello.erubis
+  - test/views/hello.haml
+  - test/views/hello.less
+  - test/views/hello.liquid
+  - test/views/hello.mab
+  - test/views/hello.md
+  - test/views/hello.nokogiri
+  - test/views/hello.radius
+  - test/views/hello.rdoc
+  - test/views/hello.sass
+  - test/views/hello.scss
+  - test/views/hello.slim
+  - test/views/hello.str
+  - test/views/hello.test
+  - test/views/hello.textile
+  - test/views/layout2.builder
+  - test/views/layout2.erb
+  - test/views/layout2.erubis
+  - test/views/layout2.haml
+  - test/views/layout2.liquid
+  - test/views/layout2.mab
+  - test/views/layout2.nokogiri
+  - test/views/layout2.radius
+  - test/views/layout2.slim
+  - test/views/layout2.str
+  - test/views/layout2.test
+  - test/views/nested.str
+  - test/views/utf8.erb
 has_rdoc: true
 homepage: http://sinatra.rubyforge.org
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --line-numbers
-- --inline-source
-- --title
-- Sinatra
-- --main
-- README.rdoc
+  - --line-numbers
+  - --inline-source
+  - --title
+  - Sinatra
+  - --main
+  - README.rdoc
 require_paths: 
-- lib
+  - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
 requirements: []
 
 rubyforge_project: sinatra
-rubygems_version: 1.5.2
+rubygems_version: 1.5.1
 signing_key: 
 specification_version: 2
 summary: Classy web-development dressed in a DSL
 test_files: 
-- test/base_test.rb
-- test/builder_test.rb
-- test/coffee_test.rb
-- test/encoding_test.rb
-- test/erb_test.rb
-- test/erubis_test.rb
-- test/extensions_test.rb
-- test/filter_test.rb
-- test/haml_test.rb
-- test/helpers_test.rb
-- test/less_test.rb
-- test/liquid_test.rb
-- test/mapped_error_test.rb
-- test/markaby_test.rb
-- test/markdown_test.rb
-- test/middleware_test.rb
-- test/nokogiri_test.rb
-- test/radius_test.rb
-- test/rdoc_test.rb
-- test/request_test.rb
-- test/response_test.rb
-- test/result_test.rb
-- test/route_added_hook_test.rb
-- test/routing_test.rb
-- test/sass_test.rb
-- test/scss_test.rb
-- test/server_test.rb
-- test/settings_test.rb
-- test/sinatra_test.rb
-- test/slim_test.rb
-- test/static_test.rb
-- test/templates_test.rb
-- test/textile_test.rb
+  - test/base_test.rb
+  - test/builder_test.rb
+  - test/coffee_test.rb
+  - test/encoding_test.rb
+  - test/erb_test.rb
+  - test/erubis_test.rb
+  - test/extensions_test.rb
+  - test/filter_test.rb
+  - test/haml_test.rb
+  - test/helpers_test.rb
+  - test/less_test.rb
+  - test/liquid_test.rb
+  - test/mapped_error_test.rb
+  - test/markaby_test.rb
+  - test/markdown_test.rb
+  - test/middleware_test.rb
+  - test/nokogiri_test.rb
+  - test/radius_test.rb
+  - test/rdoc_test.rb
+  - test/request_test.rb
+  - test/response_test.rb
+  - test/result_test.rb
+  - test/route_added_hook_test.rb
+  - test/routing_test.rb
+  - test/sass_test.rb
+  - test/scss_test.rb
+  - test/server_test.rb
+  - test/settings_test.rb
+  - test/sinatra_test.rb
+  - test/slim_test.rb
+  - test/static_test.rb
+  - test/templates_test.rb
+  - test/textile_test.rb