sinatra 1.3.6 → 1.4.0.a

data/lib/sinatra/main.rb

@@ -14,7 +14,7 @@ module Sinatra
       require 'optparse'
       OptionParser.new { |op|
         op.on('-p port',   'set the port (default is 4567)')                { |val| set :port, Integer(val) }
-        op.on('-o addr',   'set the host (default is 0.0.0.0)')             { |val| set :bind, val }
+        op.on('-o addr',   "set the host (default is #{bind})")             { |val| set :bind, val }
         op.on('-e env',    'set the environment (default is development)')  { |val| set :environment, val.to_sym }
         op.on('-s server', 'specify rack server/handler (default is thin)') { |val| set :server, val }
         op.on('-x',        'turn on the mutex lock (default is off)')       {       set :lock, true }
@@ -25,4 +25,6 @@ module Sinatra
   at_exit { Application.run! if $!.nil? && Application.run? }
 end
 
-include Sinatra::Delegator
+# include would include the module in Object
+# extend only extends the `main` object
+extend Sinatra::Delegator

data/lib/sinatra/showexceptions.rb

@@ -22,7 +22,7 @@ module Sinatra
     rescue Exception => e
       errors, env["rack.errors"] = env["rack.errors"], @@eats_errors
 
-      if respond_to?(:prefers_plain_text?) and prefers_plain_text?(env)
+      if prefers_plain_text?(env)
         content_type = "text/plain"
         body = [dump_exception(e)]
       else
@@ -40,6 +40,11 @@ module Sinatra
 
     private
 
+    def prefers_plain_text?(env)
+      !(Request.new(env).preferred_type("text/plain","text/html") == "text/html") &&
+      [/curl/].index{|item| item =~ env["HTTP_USER_AGENT"]}
+    end
+
     def frame_class(frame)
       if frame.filename =~ /lib\/sinatra.*\.rb/
         "framework"

data/lib/sinatra/version.rb

@@ -1,3 +1,3 @@
 module Sinatra
-  VERSION = '1.3.6'
+  VERSION = '1.4.0.a'
 end

data/test/base_test.rb

@@ -7,9 +7,7 @@ class BaseTest < Test::Unit::TestCase
 
   describe 'Sinatra::Base subclasses' do
     class TestApp < Sinatra::Base
-      get '/' do
-        'Hello World'
-      end
+      get('/') { 'Hello World' }
     end
 
     it 'include Rack::Utils' do
@@ -56,6 +54,24 @@ class BaseTest < Test::Unit::TestCase
     end
   end
 
+  describe "Sinatra::Base#new" do
+    it 'returns a wrapper' do
+      assert_equal Sinatra::Wrapper, Sinatra::Base.new.class
+    end
+
+    it 'implements a nice inspect' do
+      assert_equal '#<Sinatra::Base app_file=nil>', Sinatra::Base.new.inspect
+    end
+
+    it 'exposes settings' do
+      assert_equal Sinatra::Base.settings, Sinatra::Base.new.settings
+    end
+
+    it 'expses helpers' do
+      assert_equal 'image/jpeg', Sinatra::Base.new.helpers.mime_type(:jpg)
+    end
+  end
+
   describe "Sinatra::Base as Rack middleware" do
     app = lambda { |env|
       headers = {'X-Downstream' => 'true'}
@@ -81,9 +97,7 @@ class BaseTest < Test::Unit::TestCase
         super
       end
 
-      get '/' do
-        'Hello from middleware'
-      end
+      get('/') { 'Hello from middleware' }
     end
 
     middleware = TestMiddleware.new(app)
@@ -107,9 +121,7 @@ class BaseTest < Test::Unit::TestCase
     end
 
     class TestMiddleware < Sinatra::Base
-      get '/low-level-forward' do
-        app.call(env)
-      end
+      get('/low-level-forward') { app.call(env) }
     end
 
     it 'can call the downstream app directly and return result' do

data/test/builder_test.rb

@@ -5,11 +5,11 @@ require 'builder'
 
 class BuilderTest < Test::Unit::TestCase
   def builder_app(options = {}, &block)
-    mock_app {
+    mock_app do
       set :views, File.dirname(__FILE__) + '/views'
       set options
-      get '/', &block
-    }
+      get('/', &block)
+    end
     get '/'
   end
 
@@ -43,49 +43,45 @@ class BuilderTest < Test::Unit::TestCase
   end
 
   it 'renders inline blocks' do
-    builder_app {
+    builder_app do
       @name = "Frank & Mary"
-      builder do |xml|
-        xml.couple @name
-      end
-    }
+      builder { |xml| xml.couple @name }
+    end
     assert ok?
     assert_equal "<couple>Frank &amp; Mary</couple>\n", body
   end
 
   it 'renders .builder files in views path' do
-    builder_app {
+    builder_app do
       @name = "Blue"
       builder :hello
-    }
+    end
     assert ok?
     assert_equal %(<exclaim>You're my boy, Blue!</exclaim>\n), body
   end
 
   it "renders with inline layouts" do
-    mock_app {
-      layout do
-        %(xml.layout { xml << yield })
-      end
+    mock_app do
+      layout { %(xml.layout { xml << yield }) }
       get('/') { builder %(xml.em 'Hello World') }
-    }
+    end
     get '/'
     assert ok?
     assert_equal "<layout>\n<em>Hello World</em>\n</layout>\n", body
   end
 
   it "renders with file layouts" do
-    builder_app {
+    builder_app do
       builder %(xml.em 'Hello World'), :layout => :layout2
-    }
+    end
     assert ok?
     assert_equal "<layout>\n<em>Hello World</em>\n</layout>\n", body
   end
 
   it "raises error if template not found" do
-    mock_app {
+    mock_app do
       get('/') { builder :no_such_template }
-    }
+    end
     assert_raise(Errno::ENOENT) { get('/') }
   end
 end

data/test/coffee_test.rb

@@ -12,11 +12,11 @@ end
 
 class CoffeeTest < Test::Unit::TestCase
   def coffee_app(options = {}, &block)
-    mock_app {
+    mock_app do
       set :views, File.dirname(__FILE__) + '/views'
       set(options)
-      get '/', &block
-    }
+      get('/', &block)
+    end
     get '/'
   end
 
@@ -77,9 +77,7 @@ class CoffeeTest < Test::Unit::TestCase
   it "passes default coffee options to the coffee engine" do
     mock_app do
       set :coffee, :no_wrap => true # default coffee style is :nested
-      get '/' do
-        coffee "alert 'Aye!'\n"
-      end
+      get('/') { coffee "alert 'Aye!'\n" }
     end
     get '/'
     assert ok?

data/test/compile_test.rb

@@ -0,0 +1,154 @@
+# I like coding: UTF-8
+require File.expand_path('../helper', __FILE__)
+
+class CompileTest < Test::Unit::TestCase
+
+  def self.converts pattern, expected_regexp
+    it "generates #{expected_regexp.source} from #{pattern}" do
+      compiled, _ = compiled pattern
+      assert_equal expected_regexp, compiled
+    end
+  end
+  def self.parses pattern, example, expected_params
+    it "parses #{example} with #{pattern} into params #{expected_params}" do
+      compiled, keys = compiled pattern
+      match = compiled.match(example)
+      fail %Q{"#{example}" does not parse on pattern "#{pattern}".} unless match
+
+      # Aggregate e.g. multiple splat values into one array.
+      #
+      params = keys.zip(match.captures).reduce({}) do |hash, mapping|
+        key, value = mapping
+        hash[key] = if existing = hash[key]
+          existing.respond_to?(:to_ary) ? existing << value : [existing, value]
+        else
+          value
+        end
+        hash
+      end
+
+      assert_equal(expected_params, params)
+    end
+  end
+  def self.fails pattern, example
+    it "does not parse #{example} with #{pattern}" do
+      compiled, _ = compiled pattern
+      match = compiled.match(example)
+      fail %Q{"#{pattern}" does parse "#{example}" but it should fail} if match
+    end
+  end
+  def compiled pattern
+    app ||= mock_app {}
+    compiled, keys = app.send(:compile, pattern)
+    [compiled, keys]
+  end
+
+  converts "/", %r{\A/\z}
+  parses "/", "/", {}
+
+  converts "/foo", %r{\A/foo\z}
+  parses "/foo", "/foo", {}
+
+  converts "/:foo", %r{\A/([^/?#]+)\z}
+  parses "/:foo", "/foo",       "foo" => "foo"
+  parses "/:foo", "/foo.bar",   "foo" => "foo.bar"
+  parses "/:foo", "/foo%2Fbar", "foo" => "foo%2Fbar"
+  parses "/:foo", "/%0Afoo",    "foo" => "%0Afoo"
+  fails  "/:foo", "/foo?"
+  fails  "/:foo", "/foo/bar"
+  fails  "/:foo", "/"
+  fails  "/:foo", "/foo/"
+
+  converts "/föö", %r{\A/f%[Cc]3%[Bb]6%[Cc]3%[Bb]6\z}
+  parses "/föö", "/f%C3%B6%C3%B6", {}
+
+  converts "/:foo/:bar", %r{\A/([^/?#]+)/([^/?#]+)\z}
+  parses "/:foo/:bar", "/foo/bar", "foo" => "foo", "bar" => "bar"
+
+  converts "/hello/:person", %r{\A/hello/([^/?#]+)\z}
+  parses "/hello/:person", "/hello/Frank", "person" => "Frank"
+
+  converts "/?:foo?/?:bar?", %r{\A/?([^/?#]+)?/?([^/?#]+)?\z}
+  parses "/?:foo?/?:bar?", "/hello/world", "foo" => "hello", "bar" => "world"
+  parses "/?:foo?/?:bar?", "/hello",       "foo" => "hello", "bar" => nil
+  parses "/?:foo?/?:bar?", "/",            "foo" => nil, "bar" => nil
+  parses "/?:foo?/?:bar?", "",             "foo" => nil, "bar" => nil
+
+  converts "/*", %r{\A/(.*?)\z}
+  parses "/*", "/",       "splat" => ""
+  parses "/*", "/foo",    "splat" => "foo"
+  parses "/*", "/foo/bar", "splat" => "foo/bar"
+
+  converts "/:foo/*", %r{\A/([^/?#]+)/(.*?)\z}
+  parses "/:foo/*", "/foo/bar/baz", "foo" => "foo", "splat" => "bar/baz"
+
+  converts "/:foo/:bar", %r{\A/([^/?#]+)/([^/?#]+)\z}
+  parses "/:foo/:bar", "/user@example.com/name", "foo" => "user@example.com", "bar" => "name"
+
+  converts "/test$/", %r{\A/test(?:\$|%24)/\z}
+  parses "/test$/", "/test$/", {}
+
+  converts "/te+st/", %r{\A/te(?:\+|%2[Bb])st/\z}
+  parses "/te+st/", "/te+st/", {}
+  fails  "/te+st/", "/test/"
+  fails  "/te+st/", "/teeest/"
+
+  converts "/test(bar)/", %r{\A/test(?:\(|%28)bar(?:\)|%29)/\z}
+  parses "/test(bar)/", "/test(bar)/", {}
+
+  converts "/path with spaces", %r{\A/path(?:%20|(?:\+|%2[Bb]))with(?:%20|(?:\+|%2[Bb]))spaces\z}
+  parses "/path with spaces", "/path%20with%20spaces", {}
+  parses "/path with spaces", "/path%2Bwith%2Bspaces", {}
+  parses "/path with spaces", "/path+with+spaces",     {}
+
+  converts "/foo&bar", %r{\A/foo(?:&|%26)bar\z}
+  parses "/foo&bar", "/foo&bar", {}
+
+  converts "/:foo/*", %r{\A/([^/?#]+)/(.*?)\z}
+  parses "/:foo/*", "/hello%20world/how%20are%20you", "foo" => "hello%20world", "splat" => "how%20are%20you"
+
+  converts "/*/foo/*/*", %r{\A/(.*?)/foo/(.*?)/(.*?)\z}
+  parses "/*/foo/*/*", "/bar/foo/bling/baz/boom", "splat" => ["bar", "bling", "baz/boom"]
+  fails  "/*/foo/*/*", "/bar/foo/baz"
+
+  converts "/test.bar", %r{\A/test(?:\.|%2[Ee])bar\z}
+  parses "/test.bar", "/test.bar", {}
+  fails  "/test.bar", "/test0bar"
+
+  converts "/:file.:ext", %r{\A/((?:[^\./?#%]|(?:%[^2].|%[2][^Ee]))+)(?:\.|%2[Ee])((?:[^\./?#%]|(?:%[^2].|%[2][^Ee]))+)\z}
+  parses "/:file.:ext", "/pony.jpg",   "file" => "pony", "ext" => "jpg"
+  parses "/:file.:ext", "/pony%2Ejpg", "file" => "pony", "ext" => "jpg"
+  fails  "/:file.:ext", "/.jpg"
+
+  converts "/:name.?:format?", %r{\A/((?:[^\./?#%]|(?:%[^2].|%[2][^Ee]))+)(?:\.|%2[Ee])?((?:[^\./?#%]|(?:%[^2].|%[2][^Ee]))+)?\z}
+  parses "/:name.?:format?", "/foo",       "name" => "foo", "format" => nil
+  parses "/:name.?:format?", "/foo.bar",   "name" => "foo", "format" => "bar"
+  parses "/:name.?:format?", "/foo%2Ebar", "name" => "foo", "format" => "bar"
+  fails  "/:name.?:format?", "/.bar"
+
+  converts "/:user@?:host?", %r{\A/((?:[^@/?#%]|(?:%[^4].|%[4][^0]))+)(?:@|%40)?((?:[^@/?#%]|(?:%[^4].|%[4][^0]))+)?\z}
+  parses "/:user@?:host?", "/foo@bar",     "user" => "foo", "host" => "bar"
+  parses "/:user@?:host?", "/foo.foo@bar", "user" => "foo.foo", "host" => "bar"
+  parses "/:user@?:host?", "/foo@bar.bar", "user" => "foo", "host" => "bar.bar"
+
+  # From https://gist.github.com/2154980#gistcomment-169469.
+  #
+  # converts "/:name(.:format)?", %r{\A/([^\.%2E/?#]+)(?:\(|%28)(?:\.|%2E)([^\.%2E/?#]+)(?:\)|%29)?\z}
+  # parses "/:name(.:format)?", "/foo", "name" => "foo", "format" => nil
+  # parses "/:name(.:format)?", "/foo.bar", "name" => "foo", "format" => "bar"
+  fails "/:name(.:format)?", "/foo."
+
+  parses "/:id/test.bar", "/3/test.bar", {"id" => "3"}
+  parses "/:id/test.bar", "/2/test.bar", {"id" => "2"}
+  parses "/:id/test.bar", "/2E/test.bar", {"id" => "2E"}
+  parses "/:id/test.bar", "/2e/test.bar", {"id" => "2e"}
+  fails  "/:id/test.bar", "/%2E/test.bar"
+
+  parses "/:file.:ext", "/pony%2ejpg", "file" => "pony", "ext" => "jpg"
+  parses "/:file.:ext", "/pony%E6%AD%A3%2Ejpg", "file" => "pony%E6%AD%A3", "ext" => "jpg"
+  parses "/:file.:ext", "/pony%e6%ad%a3%2ejpg", "file" => "pony%e6%ad%a3", "ext" => "jpg"
+  parses "/:file.:ext", "/pony正%2Ejpg", "file" => "pony正", "ext" => "jpg"
+  parses "/:file.:ext", "/pony正%2ejpg", "file" => "pony正", "ext" => "jpg"
+  fails  "/:file.:ext", "/pony正..jpg"
+  fails  "/:file.:ext", "/pony正.%2ejpg"
+end

data/test/contest.rb

@@ -1,15 +1,15 @@
 # Copyright (c) 2009 Damian Janowski and Michel Martens for Citrusbyte
-# 
+#
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
-# 
+#
 # The above copyright notice and this permission notice shall be included in
 # all copies or substantial portions of the Software.
-# 
+#
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -82,9 +82,7 @@ private
   end
 
   def self.test_name(name)
-    name = "test_#{sanitize_name(name).gsub(/\s+/,'_')}_0"
-    name = name.succ while method_defined? name
-    name.to_sym
+    "test_#{sanitize_name(name).gsub(/\s+/,'_')}".to_sym
   end
 
   def self.sanitize_name(name)

data/test/creole_test.rb

@@ -7,7 +7,7 @@ class CreoleTest < Test::Unit::TestCase
   def creole_app(&block)
     mock_app do
       set :views, File.dirname(__FILE__) + '/views'
-      get '/', &block
+      get('/', &block)
     end
     get '/'
   end
@@ -40,7 +40,9 @@ class CreoleTest < Test::Unit::TestCase
   end
 
   it "renders with file layouts" do
-    creole_app { creole 'Hello World', :layout => :layout2, :layout_engine => :erb }
+    creole_app do
+      creole 'Hello World', :layout => :layout2, :layout_engine => :erb
+    end
     assert ok?
     assert_body "ERB Layout!\n<p>Hello World</p>"
   end
@@ -49,9 +51,7 @@ class CreoleTest < Test::Unit::TestCase
     mock_app do
       template(:inner) { "hi" }
       template(:outer) { "<outer><%= creole :inner %></outer>" }
-      get '/' do
-        erb :outer
-      end
+      get('/') { erb :outer }
     end
 
     get '/'

data/test/delegator_test.rb

@@ -63,9 +63,7 @@ class DelegatorTest < Test::Unit::TestCase
   %w[get put post delete options patch].each do |verb|
     it "delegates #{verb} correctly" do
       delegation_app do
-        send verb, '/hello' do
-          'Hello World'
-        end
+        send(verb, '/hello') { 'Hello World' }
       end
 
       request = Rack::MockRequest.new(@app)

data/test/erb_test.rb

@@ -11,10 +11,10 @@ class ERBTest < Test::Unit::TestCase
   end
 
   def erb_app(&block)
-    mock_app {
+    mock_app do
       set :views, File.dirname(__FILE__) + '/views'
-      get '/', &block
-    }
+      get('/', &block)
+    end
     get '/'
   end
 
@@ -35,62 +35,74 @@ class ERBTest < Test::Unit::TestCase
   end
 
   it 'takes a :locals option' do
-    erb_app {
+    erb_app do
       locals = {:foo => 'Bar'}
       erb '<%= foo %>', :locals => locals
-    }
+    end
     assert ok?
     assert_equal 'Bar', body
   end
 
   it "renders with inline layouts" do
-    mock_app {
+    mock_app do
       layout { 'THIS. IS. <%= yield.upcase %>!' }
       get('/') { erb 'Sparta' }
-    }
+    end
     get '/'
     assert ok?
     assert_equal 'THIS. IS. SPARTA!', body
   end
 
   it "renders with file layouts" do
-    erb_app {
-      erb 'Hello World', :layout => :layout2
-    }
+    erb_app { erb 'Hello World', :layout => :layout2 }
     assert ok?
     assert_body "ERB Layout!\nHello World"
   end
 
   it "renders erb with blocks" do
-    mock_app {
+    mock_app do
       def container
         @_out_buf << "THIS."
         yield
         @_out_buf << "SPARTA!"
       end
       def is; "IS." end
-      get '/' do
-        erb '<% container do %> <%= is %> <% end %>'
-      end
-    }
+      get('/') { erb '<% container do %> <%= is %> <% end %>' }
+    end
     get '/'
     assert ok?
     assert_equal 'THIS. IS. SPARTA!', body
   end
 
   it "can be used in a nested fashion for partials and whatnot" do
-    mock_app {
+    mock_app do
       template(:inner) { "<inner><%= 'hi' %></inner>" }
       template(:outer) { "<outer><%= erb :inner %></outer>" }
-      get '/' do
-        erb :outer
-      end
-    }
+      get('/') { erb :outer }
+    end
 
     get '/'
     assert ok?
     assert_equal '<outer><inner>hi</inner></outer>', body
   end
+
+  it "can rendere truly nested layouts by accepting a layout and a block with the contents" do
+    mock_app do
+      template(:main_outer_layout) { "<h1>Title</h1>\n<%= yield %>" }
+      template(:an_inner_layout) { "<h2>Subtitle</h2>\n<%= yield %>" }
+      template(:a_page) { "<p>Contents.</p>\n" }
+      get('/') do
+        erb :main_outer_layout, :layout => false do
+          erb :an_inner_layout do
+            erb :a_page
+          end
+        end
+      end
+    end
+    get '/'
+    assert ok?
+    assert_body "<h1>Title</h1>\n<h2>Subtitle</h2>\n<p>Contents.</p>\n"
+  end
 end