sinatra 1.1.4 → 1.2.0.a

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.1.4'
-  s.date = '2011-04-13'
+  s.version = '1.2.0.a'
+  s.date = '2010-12-25'
 
   s.description = "Classy web-development dressed in a DSL"
   s.summary     = "Classy web-development dressed in a DSL"
@@ -67,11 +67,11 @@ Gem::Specification.new do |s|
     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/ascii.haml
-    test/views/calc.html.erb
     test/views/error.builder
     test/views/error.erb
     test/views/error.erubis
@@ -93,6 +93,7 @@ Gem::Specification.new do |s|
     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
@@ -104,6 +105,7 @@ Gem::Specification.new do |s|
     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
@@ -115,7 +117,7 @@ Gem::Specification.new do |s|
 
   s.extra_rdoc_files = %w[README.rdoc README.de.rdoc README.jp.rdoc README.fr.rdoc README.es.rdoc README.hu.rdoc README.zh.rdoc LICENSE]
   s.add_dependency 'rack', '~> 1.1'
-  s.add_dependency 'tilt', '>= 1.2.2', '< 2.0'
+  s.add_dependency 'tilt', '~> 1.2'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'shotgun', '~> 0.6'
   s.add_development_dependency 'rack-test', '>= 0.5.6'
@@ -131,6 +133,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'coffee-script', '>= 2.0'
   s.add_development_dependency 'rdoc'
   s.add_development_dependency 'nokogiri'
+  s.add_development_dependency 'slim'
 
   s.has_rdoc = true
   s.homepage = "http://sinatra.rubyforge.org"

data/test/filter_test.rb

@@ -274,7 +274,7 @@ class AfterFilterTest < Test::Unit::TestCase
     get '/foo/bar'
     assert_equal subpath, 'bar'
   end
-  
+
   it 'is possible to access url params from the route param' do
     ran = false
     mock_app do
@@ -287,4 +287,108 @@ class AfterFilterTest < Test::Unit::TestCase
     get '/foo/bar'
     assert ran
   end
+
+  it 'is possible to apply host_name conditions to before filters with no path' do
+    ran = false
+    mock_app do
+      before(:host_name => 'example.com') { ran = true }
+      get('/') { 'welcome' }
+    end
+    get '/', {}, { 'HTTP_HOST' => 'example.org' }
+    assert !ran
+    get '/', {}, { 'HTTP_HOST' => 'example.com' }
+    assert ran
+  end
+
+  it 'is possible to apply host_name conditions to before filters with a path' do
+    ran = false
+    mock_app do
+      before('/foo', :host_name => 'example.com') { ran = true }
+      get('/') { 'welcome' }
+    end
+    get '/', {}, { 'HTTP_HOST' => 'example.com' }
+    assert !ran
+    get '/foo', {}, { 'HTTP_HOST' => 'example.org' }
+    assert !ran
+    get '/foo', {}, { 'HTTP_HOST' => 'example.com' }
+    assert ran
+  end
+
+  it 'is possible to apply host_name conditions to after filters with no path' do
+    ran = false
+    mock_app do
+      after(:host_name => 'example.com') { ran = true }
+      get('/') { 'welcome' }
+    end
+    get '/', {}, { 'HTTP_HOST' => 'example.org' }
+    assert !ran
+    get '/', {}, { 'HTTP_HOST' => 'example.com' }
+    assert ran
+  end
+
+  it 'is possible to apply host_name conditions to after filters with a path' do
+    ran = false
+    mock_app do
+      after('/foo', :host_name => 'example.com') { ran = true }
+      get('/') { 'welcome' }
+    end
+    get '/', {}, { 'HTTP_HOST' => 'example.com' }
+    assert !ran
+    get '/foo', {}, { 'HTTP_HOST' => 'example.org' }
+    assert !ran
+    get '/foo', {}, { 'HTTP_HOST' => 'example.com' }
+    assert ran
+  end
+
+  it 'is possible to apply user_agent conditions to before filters with no path' do
+    ran = false
+    mock_app do
+      before(:user_agent => /foo/) { ran = true }
+      get('/') { 'welcome' }
+    end
+    get '/', {}, { 'HTTP_USER_AGENT' => 'bar' }
+    assert !ran
+    get '/', {}, { 'HTTP_USER_AGENT' => 'foo' }
+    assert ran
+  end
+
+  it 'is possible to apply user_agent conditions to before filters with a path' do
+    ran = false
+    mock_app do
+      before('/foo', :user_agent => /foo/) { ran = true }
+      get('/') { 'welcome' }
+    end
+    get '/', {}, { 'HTTP_USER_AGENT' => 'foo' }
+    assert !ran
+    get '/foo', {}, { 'HTTP_USER_AGENT' => 'bar' }
+    assert !ran
+    get '/foo', {}, { 'HTTP_USER_AGENT' => 'foo' }
+    assert ran
+  end
+
+  it 'is possible to apply user_agent conditions to after filters with no path' do
+    ran = false
+    mock_app do
+      after(:user_agent => /foo/) { ran = true }
+      get('/') { 'welcome' }
+    end
+    get '/', {}, { 'HTTP_USER_AGENT' => 'bar' }
+    assert !ran
+    get '/', {}, { 'HTTP_USER_AGENT' => 'foo' }
+    assert ran
+  end
+
+  it 'is possible to apply user_agent conditions to before filters with a path' do
+    ran = false
+    mock_app do
+      after('/foo', :user_agent => /foo/) { ran = true }
+      get('/') { 'welcome' }
+    end
+    get '/', {}, { 'HTTP_USER_AGENT' => 'foo' }
+    assert !ran
+    get '/foo', {}, { 'HTTP_USER_AGENT' => 'bar' }
+    assert !ran
+    get '/foo', {}, { 'HTTP_USER_AGENT' => 'foo' }
+    assert ran
+  end
 end

data/test/helpers_test.rb

@@ -419,6 +419,13 @@ class HelpersTest < Test::Unit::TestCase
       assert_equal File.mtime(@file).httpdate, response['Last-Modified']
     end
 
+    it 'allows passing in a differen Last-Modified response header with :last_modified' do
+      time = Time.now
+      send_file_app :last_modified => time
+      get '/file.txt'
+      assert_equal time.httpdate, response['Last-Modified']
+    end
+
     it "returns a 404 when not found" do
       mock_app {
         get '/' do
@@ -592,9 +599,6 @@ class HelpersTest < Test::Unit::TestCase
             get '/compare', {}, { 'HTTP_IF_MODIFIED_SINCE' => 'Sun, 26 Sep 2010 23:43:52 GMT' }
             assert_equal 200, status
             assert_equal 'foo', body
-            get '/compare', {}, { 'HTTP_IF_MODIFIED_SINCE' => 'Sun, 26 Sep 2100 23:43:52 GMT' }
-            assert_equal 304, status
-            assert_equal '', body
           end
         end
 

data/test/markaby_test.rb

@@ -40,6 +40,27 @@ class MarkabyTest < Test::Unit::TestCase
     assert_equal "<h1>Markaby Layout!</h1><p>Hello World</p>", body
   end
 
+  it 'renders inline markaby blocks' do
+    markaby_app { markaby { h1 'Hiya' } }
+    assert ok?
+    assert_equal "<h1>Hiya</h1>", body
+  end
+
+  it 'renders inline markaby blocks with inline layouts' do
+    markaby_app do
+      settings.layout { 'h1 { text "THIS. IS. "; yield }' }
+      markaby { em 'SPARTA' }
+    end
+    assert ok?
+    assert_equal "<h1>THIS. IS. <em>SPARTA</em></h1>", body
+  end
+
+  it 'renders inline markaby blocks with file layouts' do    
+    markaby_app { markaby(:layout => :layout2) { text "Hello World" } }
+    assert ok?
+    assert_equal "<h1>Markaby Layout!</h1><p>Hello World</p>", body
+  end
+
   it "raises error if template not found" do
     mock_app { get('/') { markaby :no_such_template } }
     assert_raise(Errno::ENOENT) { get('/') }

data/test/routing_test.rb

@@ -23,7 +23,7 @@ class RegexpLookAlike
 end
 
 class RoutingTest < Test::Unit::TestCase
-  %w[get put post delete].each do |verb|
+  %w[get put post delete options].each do |verb|
     it "defines #{verb.upcase} request handlers with #{verb}" do
       mock_app {
         send verb, '/hello' do
@@ -247,7 +247,7 @@ class RoutingTest < Test::Unit::TestCase
     assert_equal 'right on', body
   end
 
-  it "literally matches dot in paths" do
+  it "literally matches . in paths" do
     route_def '/test.bar'
 
     get '/test.bar'
@@ -256,14 +256,14 @@ class RoutingTest < Test::Unit::TestCase
     assert not_found?
   end
 
-  it "literally matches dollar sign in paths" do
+  it "literally matches $ in paths" do
     route_def '/test$/'
 
     get '/test$/'
     assert ok?
   end
 
-  it "literally matches plus sign in paths" do
+  it "literally matches + in paths" do
     route_def '/te+st/'
 
     get '/te%2Bst/'
@@ -272,7 +272,7 @@ class RoutingTest < Test::Unit::TestCase
     assert not_found?
   end
 
-  it "literally matches parens in paths" do
+  it "literally matches () in paths" do
     route_def '/test(bar)/'
 
     get '/test(bar)/'
@@ -611,18 +611,6 @@ class RoutingTest < Test::Unit::TestCase
     assert_equal 'Hello World', body
   end
 
-  it "treats missing user agent like an empty string" do
-    mock_app do
-      user_agent(/.*/)
-      get '/' do
-        "Hello World"
-      end
-    end
-    get '/'
-    assert_equal 200, status
-    assert_equal 'Hello World', body
-  end
-
   it "makes captures in user agent pattern available in params[:agent]" do
     mock_app {
       user_agent(/Foo (.*)/)
@@ -648,7 +636,7 @@ class RoutingTest < Test::Unit::TestCase
     get '/', {}, { 'HTTP_ACCEPT' => 'application/xml' }
     assert ok?
     assert_equal 'application/xml', body
-    assert_equal 'application/xml;charset=utf-8', response.headers['Content-Type']
+    assert_equal 'application/xml', response.headers['Content-Type']
 
     get '/', {}, { :accept => 'text/html' }
     assert !ok?

data/test/slim_test.rb

@@ -0,0 +1,97 @@
+require File.dirname(__FILE__) + '/helper'
+
+begin
+require 'slim'
+
+class SlimTest < Test::Unit::TestCase
+  def slim_app(&block)
+    mock_app {
+      set :views, File.dirname(__FILE__) + '/views'
+      get '/', &block
+    }
+    get '/'
+  end
+
+  it 'renders inline slim strings' do
+    slim_app { slim "h1 Hiya\n" }
+    assert ok?
+    assert_equal "<h1>Hiya</h1>", body
+  end
+  
+  it 'renders .slim files in views path' do
+    slim_app { slim :hello }
+    assert ok?
+    assert_equal "<h1>Hello From Slim</h1>", body
+  end
+  
+  it "renders with inline layouts" do
+    mock_app {
+      layout { %(h1\n  | THIS. IS. \n  == yield.upcase ) }
+      get('/') { slim 'em Sparta' }
+    }
+    get '/'
+    assert ok?
+    assert_equal "<h1>THIS. IS. <EM>SPARTA</EM></h1>", body
+  end
+  
+  it "renders with file layouts" do
+    slim_app {
+      slim '| Hello World', :layout => :layout2
+    }
+    assert ok?
+    assert_equal "<h1>Slim Layout!</h1><p>Hello World</p>", body
+  end
+  
+  it "raises error if template not found" do
+    mock_app {
+      get('/') { slim :no_such_template }
+    }
+    assert_raise(Errno::ENOENT) { get('/') }
+  end
+  
+  HTML4_DOCTYPE = "<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">"
+  
+  it "passes slim options to the slim engine" do
+    mock_app {
+      get '/' do
+        slim "! doctype html\nh1 Hello World", :format => :html4
+      end
+    }
+    get '/'
+    assert ok?
+    assert_equal "#{HTML4_DOCTYPE}<h1>Hello World</h1>", body
+  end
+  
+  it "passes default slim options to the slim engine" do
+    mock_app {
+      set :slim, {:format => :html4}
+      get '/' do
+        slim "! doctype html\nh1 Hello World"
+      end
+    }
+    get '/'
+    assert ok?
+    assert_equal "#{HTML4_DOCTYPE}<h1>Hello World</h1>", body
+  end
+  
+  it "merges the default slim options with the overrides and passes them to the slim engine" do
+    mock_app {
+      set :slim, {:format => :html4}
+      get '/' do
+        slim "! doctype html\nh1.header Hello World"
+      end
+      get '/html5' do
+        slim "! doctype html\nh1.header Hello World", :format => :html5
+      end
+    }
+    get '/'
+    assert ok?
+    assert_match(/^#{HTML4_DOCTYPE}/, body)
+    get '/html5'
+    assert ok?
+    assert_equal "<!DOCTYPE html><h1 class=\"header\">Hello World</h1>", body
+  end
+end
+rescue
+  warn "#{$!.to_s}: skipping slim tests"
+end

data/test/templates_test.rb

@@ -208,10 +208,20 @@ class TemplatesTest < Test::Unit::TestCase
     assert_equal 'template in subclass', body
   end
 
-  it "is possible to register another template" do
-    Tilt.register "html.erb", Tilt[:erb]
-    render_app { render :erb, :calc }
-    assert_equal '2', body
+  it "is possible to use a different engine for the layout than for the template itself explicitely" do
+    render_app do
+      settings.template(:layout) { 'Hello <%= yield %>!' }
+      render :str, "<%= 'World' %>", :layout_engine => :erb
+    end
+    assert_equal "Hello <%= 'World' %>!", body
+  end
+
+  it "is possible to use a different engine for the layout than for the template itself globally" do
+    render_app :str => { :layout_engine => :erb } do
+      settings.template(:layout) { 'Hello <%= yield %>!' }
+      render :str, "<%= 'World' %>"
+    end
+    assert_equal "Hello <%= 'World' %>!", body
   end
 end
 

data/test/views/hello.slim

@@ -0,0 +1 @@
+h1 Hello From Slim

data/test/views/layout2.slim

@@ -0,0 +1,3 @@
+h1 Slim Layout!
+p
+  == yield

metadata

@@ -1,8 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 1.1.4
+  hash: 42
+  prerelease: true
+  segments: 
+  - 1
+  - 2
+  - 0
+  - a
+  version: 1.2.0.a
 platform: ruby
 authors: 
 - Blake Mizerany
@@ -13,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-13 00:00:00 +02:00
+date: 2010-12-25 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,6 +30,10 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 1
+        - 1
         version: "1.1"
   type: :runtime
   version_requirements: *id001
@@ -33,12 +43,13 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.2.2
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "2.0"
+        hash: 11
+        segments: 
+        - 1
+        - 2
+        version: "1.2"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -49,6 +60,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id003
@@ -60,6 +74,10 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 0
+        - 6
         version: "0.6"
   type: :development
   version_requirements: *id004
@@ -71,6 +89,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 0
+        - 5
+        - 6
         version: 0.5.6
   type: :development
   version_requirements: *id005
@@ -82,6 +105,10 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
         version: "3.0"
   type: :development
   version_requirements: *id006
@@ -93,6 +120,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id007
@@ -104,6 +134,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id008
@@ -115,6 +148,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id009
@@ -126,6 +162,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id010
@@ -137,6 +176,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id011
@@ -148,6 +190,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id012
@@ -159,6 +204,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id013
@@ -170,6 +218,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id014
@@ -181,6 +232,10 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 0
         version: "2.0"
   type: :development
   version_requirements: *id015
@@ -192,6 +247,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id016
@@ -203,9 +261,26 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id017
+- !ruby/object:Gem::Dependency 
+  name: slim
+  prerelease: false
+  requirement: &id018 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id018
 description: Classy web-development dressed in a DSL
 email: sinatrarb@googlegroups.com
 executables: []
@@ -275,11 +350,11 @@ files:
 - 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/ascii.haml
-- test/views/calc.html.erb
 - test/views/error.builder
 - test/views/error.erb
 - test/views/error.erubis
@@ -301,6 +376,7 @@ files:
 - 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
@@ -312,6 +388,7 @@ files:
 - 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
@@ -335,17 +412,25 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: sinatra
-rubygems_version: 1.6.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 2
 summary: Classy web-development dressed in a DSL
@@ -379,6 +464,7 @@ test_files:
 - 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