sinatra 1.3.0.c → 1.3.0.d

data/test/helpers_test.rb

@@ -313,6 +313,20 @@ class HelpersTest < Test::Unit::TestCase
       assert_body 'ok'
     end
 
+    it 'allows disabling session secret' do
+      mock_app do
+        enable :sessions
+        disable :session_secret
+        get '/' do
+          assert !env['rack.session.options'].include?(:session_secret)
+          'ok'
+        end
+      end
+
+      get '/'
+      assert_body 'ok'
+    end
+
     it 'accepts an options hash' do
       mock_app do
         set :sessions, :foo => :bar

data/test/markdown_test.rb

@@ -1,10 +1,6 @@
 require File.dirname(__FILE__) + '/helper'
 
-begin
-fail LoadError, "rdiscount not available" if defined? JRuby
-require 'rdiscount'
-
-class MarkdownTest < Test::Unit::TestCase
+MarkdownTest = proc do
   def markdown_app(&block)
     mock_app do
       set :views, File.dirname(__FILE__) + '/views'
@@ -13,24 +9,73 @@ class MarkdownTest < Test::Unit::TestCase
     get '/'
   end
 
+  def setup
+    Tilt.prefer engine, 'markdown', 'mkd', 'md'
+    super
+  end
+
+  it 'uses the correct engine' do
+    assert_equal engine, Tilt[:md]
+    assert_equal engine, Tilt[:mkd]
+    assert_equal engine, Tilt[:markdown]
+  end
+
   it 'renders inline markdown strings' do
     markdown_app { markdown '# Hiya' }
     assert ok?
-    assert_equal "<h1>Hiya</h1>\n", body
+    assert_like "<h1>Hiya</h1>\n", body
   end
 
   it 'renders .markdown files in views path' do
     markdown_app { markdown :hello }
     assert ok?
-    assert_equal "<h1>Hello From Markdown</h1>\n", body
+    assert_like "<h1>Hello From Markdown</h1>", body
   end
 
   it "raises error if template not found" do
     mock_app { get('/') { markdown :no_such_template } }
     assert_raise(Errno::ENOENT) { get('/') }
   end
+
+  it "renders with inline layouts" do
+    mock_app do
+      layout { 'THIS. IS. #{yield.upcase}!' }
+      get('/') { markdown 'Sparta', :layout_engine => :str }
+    end
+    get '/'
+    assert ok?
+    assert_like 'THIS. IS. <P>SPARTA</P>!', body
+  end
+
+  it "renders with file layouts" do
+    markdown_app { markdown 'Hello World', :layout => :layout2, :layout_engine => :erb }
+    assert ok?
+    assert_body "ERB Layout!\n<p>Hello World</p>"
+  end
+
+  it "can be used in a nested fashion for partials and whatnot" do
+    mock_app do
+      template(:inner) { "hi" }
+      template(:outer) { "<outer><%= markdown :inner %></outer>" }
+      get '/' do
+        erb :outer
+      end
+    end
+
+    get '/'
+    assert ok?
+    assert_like '<outer><p>hi</p></outer>', body
+  end
 end
 
-rescue LoadError
-  warn "#{$!.to_s}: skipping markdown tests"
+# Will generate RDiscountTest, KramdownTest, etc.
+Tilt.mappings['md'].each do |t|
+  begin
+    t.new { "" }
+    klass = Class.new(Test::Unit::TestCase) { define_method(:engine) { t }}
+    klass.class_eval(&MarkdownTest)
+    Object.const_set t.name[/[^:]+(?=Template$)/] << "Test", klass
+  rescue LoadError
+    warn "#{$!}: skipping markdown tests with #{t}"
+  end
 end

data/test/radius_test.rb

@@ -1,7 +1,6 @@
 require File.dirname(__FILE__) + '/helper'
 
 begin
-fail LoadError, 'Radius broken on 1.9.' if RUBY_VERSION >= '1.9.1'
 require 'radius'
 
 class RadiusTest < Test::Unit::TestCase

data/test/rdoc_test.rb

@@ -28,6 +28,36 @@ class RdocTest < Test::Unit::TestCase
     mock_app { get('/') { rdoc :no_such_template } }
     assert_raise(Errno::ENOENT) { get('/') }
   end
+
+  it "renders with inline layouts" do
+    mock_app do
+      layout { 'THIS. IS. #{yield.upcase}!' }
+      get('/') { rdoc 'Sparta', :layout_engine => :str }
+    end
+    get '/'
+    assert ok?
+    assert_like 'THIS. IS.<P>SPARTA</P>!', body
+  end
+
+  it "renders with file layouts" do
+    rdoc_app { rdoc 'Hello World', :layout => :layout2, :layout_engine => :erb }
+    assert ok?
+    assert_body "ERB Layout!\n<p>Hello World</p>"
+  end
+
+  it "can be used in a nested fashion for partials and whatnot" do
+    mock_app do
+      template(:inner) { "hi" }
+      template(:outer) { "<outer><%= rdoc :inner %></outer>" }
+      get '/' do
+        erb :outer
+      end
+    end
+
+    get '/'
+    assert ok?
+    assert_like '<outer><p>hi</p></outer>', body
+  end
 end
 
 rescue LoadError

data/test/routing_test.rb

@@ -686,10 +686,10 @@ class RoutingTest < Test::Unit::TestCase
   it "filters by accept header" do
     mock_app {
       get '/', :provides => :xml do
-        request.env['HTTP_ACCEPT']
+        env['HTTP_ACCEPT']
       end
       get '/foo', :provides => :html do
-        request.env['HTTP_ACCEPT']
+        env['HTTP_ACCEPT']
       end
     }
 
@@ -714,7 +714,7 @@ class RoutingTest < Test::Unit::TestCase
 
     mock_app {
       get '/', :provides => types do
-        request.env['HTTP_ACCEPT']
+        env['HTTP_ACCEPT']
       end
     }
 
@@ -729,7 +729,7 @@ class RoutingTest < Test::Unit::TestCase
   it 'degrades gracefully when optional accept header is not provided' do
     mock_app {
       get '/', :provides => :xml do
-        request.env['HTTP_ACCEPT']
+        env['HTTP_ACCEPT']
       end
       get '/' do
         'default'
@@ -1042,4 +1042,35 @@ class RoutingTest < Test::Unit::TestCase
     get '/foo'
     assert not_found?
   end
+
+  it 'allows using call to fire another request internally' do
+    mock_app do
+      get '/foo' do
+        status, headers, body = call env.merge("PATH_INFO" => '/bar')
+        [status, headers, body.map(&:upcase)]
+      end
+
+      get '/bar' do
+        "bar"
+      end
+    end
+
+    get '/foo'
+    assert ok?
+    assert_body "BAR"
+  end
+
+  it 'plays well with other routing middleware' do
+    middleware = Sinatra.new
+    inner_app  = Sinatra.new { get('/foo') { 'hello' } }
+    builder    = Rack::Builder.new do
+      use middleware
+      map('/test') { run inner_app }
+    end
+
+    @app = builder.to_app
+    get '/test/foo'
+    assert ok?
+    assert_body 'hello'
+  end
 end

data/test/settings_test.rb

@@ -34,6 +34,24 @@ class SettingsTest < Test::Unit::TestCase
     assert !@base.respond_to?(:fiz)
   end
 
+  it 'raises an error without value and block' do
+    assert_raise(ArgumentError) { @base.set(:fiz) }
+    assert !@base.respond_to?(:fiz)
+  end
+
+  it 'allows setting a value to the app class' do
+    @base.set :base, @base
+    assert @base.respond_to?(:base)
+    assert_equal @base, @base.base
+  end
+
+  it 'raises an error with the app class as value and a block' do
+    assert_raise ArgumentError do
+      @base.set(:fiz, @base) { 'baz' }
+    end
+    assert !@base.respond_to?(:fiz)
+  end
+
   it "sets multiple settings with a Hash" do
     @base.set :foo => 1234,
         :bar => 'Hello World',

data/test/textile_test.rb

@@ -28,6 +28,36 @@ class TextileTest < Test::Unit::TestCase
     mock_app { get('/') { textile :no_such_template } }
     assert_raise(Errno::ENOENT) { get('/') }
   end
+
+  it "renders with inline layouts" do
+    mock_app do
+      layout { 'THIS. IS. #{yield.upcase}!' }
+      get('/') { textile 'Sparta', :layout_engine => :str }
+    end
+    get '/'
+    assert ok?
+    assert_like 'THIS. IS. <P>SPARTA</P>!', body
+  end
+
+  it "renders with file layouts" do
+    textile_app { textile 'Hello World', :layout => :layout2, :layout_engine => :erb }
+    assert ok?
+    assert_body "ERB Layout!\n<p>Hello World</p>"
+  end
+
+  it "can be used in a nested fashion for partials and whatnot" do
+    mock_app do
+      template(:inner) { "hi" }
+      template(:outer) { "<outer><%= textile :inner %></outer>" }
+      get '/' do
+        erb :outer
+      end
+    end
+
+    get '/'
+    assert ok?
+    assert_like '<outer><p>hi</p></outer>', body
+  end
 end
 
 rescue LoadError

data/test/views/hello.creole

@@ -0,0 +1 @@
+= Hello From Creole

metadata

@@ -2,7 +2,7 @@
 name: sinatra
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 1.3.0.c
+  version: 1.3.0.d
 platform: ruby
 authors: 
 - Blake Mizerany
@@ -13,8 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-13 00:00:00 +02:00
-default_executable: 
+date: 2011-04-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
@@ -34,10 +33,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "1.2"
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.2.2
+        version: "1.3"
   type: :runtime
   prerelease: false
   version_requirements: *id002
@@ -95,10 +91,10 @@ files:
 - test/builder_test.rb
 - test/coffee_test.rb
 - test/contest.rb
+- test/creole_test.rb
 - test/delegator_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
@@ -134,15 +130,14 @@ files:
 - 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.creole
 - test/views/hello.erb
-- test/views/hello.erubis
 - test/views/hello.haml
 - test/views/hello.less
 - test/views/hello.liquid
@@ -159,7 +154,6 @@ files:
 - 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
@@ -170,7 +164,6 @@ files:
 - test/views/layout2.test
 - test/views/nested.str
 - test/views/utf8.erb
-has_rdoc: true
 homepage: http://sinatra.rubyforge.org
 licenses: []
 
@@ -189,7 +182,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1589888549486616538
+      hash: -3511635882760576003
       segments: 
       - 0
       version: "0"
@@ -202,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: sinatra
-rubygems_version: 1.6.2
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 2
 summary: Classy web-development dressed in a DSL
@@ -210,10 +203,10 @@ test_files:
 - test/base_test.rb
 - test/builder_test.rb
 - test/coffee_test.rb
+- test/creole_test.rb
 - test/delegator_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

data/test/erubis_test.rb

@@ -1,88 +0,0 @@
-require File.dirname(__FILE__) + '/helper'
-
-begin
-require 'erubis'
-
-class ERubisTest < Test::Unit::TestCase
-  def erubis_app(&block)
-    mock_app {
-      set :views, File.dirname(__FILE__) + '/views'
-      get '/', &block
-    }
-    get '/'
-  end
-
-  it 'renders inline ERubis strings' do
-    erubis_app { erubis '<%= 1 + 1 %>' }
-    assert ok?
-    assert_equal '2', body
-  end
-
-  it 'renders .erubis files in views path' do
-    erubis_app { erubis :hello }
-    assert ok?
-    assert_equal "Hello World\n", body
-  end
-
-  it 'takes a :locals option' do
-    erubis_app {
-      locals = {:foo => 'Bar'}
-      erubis '<%= foo %>', :locals => locals
-    }
-    assert ok?
-    assert_equal 'Bar', body
-  end
-
-  it "renders with inline layouts" do
-    mock_app {
-      layout { 'THIS. IS. <%= yield.upcase %>!' }
-      get('/') { erubis 'Sparta' }
-    }
-    get '/'
-    assert ok?
-    assert_equal 'THIS. IS. SPARTA!', body
-  end
-
-  it "renders with file layouts" do
-    erubis_app {
-      erubis 'Hello World', :layout => :layout2
-    }
-    assert ok?
-    assert_equal "ERubis Layout!\nHello World\n", body
-  end
-
-  it "renders erubis with blocks" do
-    mock_app {
-      def container
-        @_out_buf << "THIS."
-        yield
-        @_out_buf << "SPARTA!"
-      end
-      def is; "IS." end
-      get '/' do
-        erubis '<% 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 {
-      template(:inner) { "<inner><%= 'hi' %></inner>" }
-      template(:outer) { "<outer><%= erubis :inner %></outer>" }
-      get '/' do
-        erubis :outer
-      end
-    }
-
-    get '/'
-    assert ok?
-    assert_equal '<outer><inner>hi</inner></outer>', body
-  end
-end
-
-rescue LoadError
-  warn "#{$!.to_s}: skipping erubis tests"
-end