Syd-sinatra 0.3.2 → 0.9.0.2

data/{test → compat}/application_test.rb

@@ -16,7 +16,8 @@ context "Looking up a request" do
     Sinatra.application = nil
   end
 
-  specify "returns what's at the end" do
+  # Deprecated. The lookup method is no longer used.
+  xspecify "returns what's at the end" do
     block = Proc.new { 'Hello' }
     get '/', &block
 
@@ -31,7 +32,8 @@ context "Looking up a request" do
     result.block.should.be block
   end
 
-  specify "takes params in path" do
+  # Deprecated. The lookup method is no longer used.
+  xspecify "takes params in path" do
     block = Proc.new { 'Hello' }
     get '/:foo', &block
 
@@ -83,7 +85,8 @@ context "An app returns" do
 
   end
 
-  specify "the body set if set before the last" do
+  # Deprecated. The body method no longer halts.
+  xspecify "the body set if set before the last" do
 
     get '/' do
       body 'Blake'
@@ -96,6 +99,17 @@ context "An app returns" do
 
   end
 
+  specify "404 if NotFound is raised" do
+
+    get '/' do
+      raise Sinatra::NotFound
+    end
+
+    get_it '/'
+    should.be.not_found
+
+  end
+
 end
 
 context "Application#configure blocks" do
@@ -131,14 +145,16 @@ end
 
 context "Default Application Configuration" do
 
-  specify "includes 404 and 500 error handlers" do
+  # Sinatra::ServerError is no longer used
+  xspecify "includes 404 and 500 error handlers" do
     Sinatra.application.errors.should.include(Sinatra::ServerError)
     Sinatra.application.errors[Sinatra::ServerError].should.not.be.nil
     Sinatra.application.errors.should.include(Sinatra::NotFound)
     Sinatra.application.errors[Sinatra::NotFound].should.not.be.nil
   end
 
-  specify "includes Static event" do
+  # Deprecated. No such thing as a Static event anymore.
+  xspecify "includes Static event" do
     assert Sinatra.application.events[:get].any? { |e| Sinatra::Static === e }
   end
 

data/compat/builder_test.rb

@@ -0,0 +1,101 @@
+require File.dirname(__FILE__) + '/helper'
+
+context "Builder" do
+
+  setup do
+    Sinatra.application = nil
+  end
+
+  context "without layouts" do
+
+    setup do
+      Sinatra.application = nil
+    end
+
+    specify "should render" do
+
+      get '/no_layout' do
+        builder 'xml.instruct!'
+      end
+
+      get_it '/no_layout'
+      should.be.ok
+      body.should == %(<?xml version="1.0" encoding="UTF-8"?>\n)
+
+    end
+
+    specify "should render inline block" do
+
+      get '/no_layout_and_inlined' do
+        @name = "Frank & Mary"
+        builder do |xml|
+          xml.couple @name
+        end
+      end
+
+      get_it '/no_layout_and_inlined'
+      should.be.ok
+      body.should == %(<couple>Frank &amp; Mary</couple>\n)
+
+    end
+
+  end
+
+
+
+  context "Templates (in general)" do
+
+    setup do
+      Sinatra.application = nil
+    end
+
+    specify "are read from files if Symbols" do
+
+      get '/from_file' do
+        @name = 'Blue'
+        builder :foo, :views_directory => File.dirname(__FILE__) + "/views"
+      end
+
+      get_it '/from_file'
+      should.be.ok
+      body.should.equal %(<exclaim>You rock Blue!</exclaim>\n)
+
+    end
+
+    specify "use layout.ext by default if available" do
+
+      get '/' do
+        builder :foo, :views_directory => File.dirname(__FILE__) + "/views/layout_test"
+      end
+
+      get_it '/'
+      should.be.ok
+      body.should.equal "<layout>\n<this>is foo!</this>\n</layout>\n"
+
+    end
+
+    specify "renders without layout" do
+
+      get '/' do
+        builder :no_layout, :views_directory => File.dirname(__FILE__) + "/views/no_layout"
+      end
+
+      get_it '/'
+      should.be.ok
+      body.should.equal "<foo>No Layout!</foo>\n"
+
+    end
+
+    specify "raises error if template not found" do
+
+      get '/' do
+        builder :not_found
+      end
+
+      lambda { get_it '/' }.should.raise(Errno::ENOENT)
+
+    end
+
+  end
+
+end

data/compat/erb_test.rb

@@ -0,0 +1,136 @@
+require File.dirname(__FILE__) + '/helper'
+
+context "Erb" do
+
+  setup do
+    Sinatra.application = nil
+  end
+
+  context "without layouts" do
+
+    setup do
+      Sinatra.application = nil
+    end
+
+    specify "should render" do
+
+      get '/no_layout' do
+        erb '<%= 1 + 1 %>'
+      end
+
+      get_it '/no_layout'
+      should.be.ok
+      body.should == '2'
+
+    end
+
+    specify "should take an options hash with :locals set with a string" do
+      get '/locals' do
+        erb '<%= foo %>', :locals => {:foo => "Bar"}
+      end
+
+      get_it '/locals'
+      should.be.ok
+      body.should == 'Bar'
+    end
+
+    specify "should take an options hash with :locals set with a complex object" do
+      get '/locals-complex' do
+        erb '<%= foo[0] %>', :locals => {:foo => ["foo", "bar", "baz"]}
+      end
+
+      get_it '/locals-complex'
+      should.be.ok
+      body.should == 'foo'
+    end
+  end
+
+  context "with layouts" do
+
+    setup do
+      Sinatra.application = nil
+    end
+
+    specify "can be inline" do
+
+      layout do
+        %Q{This is <%= yield %>!}
+      end
+
+      get '/lay' do
+        erb 'Blake'
+      end
+
+      get_it '/lay'
+      should.be.ok
+      body.should.equal 'This is Blake!'
+
+    end
+
+    specify "can use named layouts" do
+
+      layout :pretty do
+        %Q{<h1><%= yield %></h1>}
+      end
+
+      get '/pretty' do
+        erb 'Foo', :layout => :pretty
+      end
+
+      get '/not_pretty' do
+        erb 'Bar'
+      end
+
+      get_it '/pretty'
+      body.should.equal '<h1>Foo</h1>'
+
+      get_it '/not_pretty'
+      body.should.equal 'Bar'
+
+    end
+
+    specify "can be read from a file if they're not inlined" do
+
+      get '/foo' do
+        @title = 'Welcome to the Hello Program'
+        erb 'Blake', :layout => :foo_layout,
+                     :views_directory => File.dirname(__FILE__) + "/views"
+      end
+
+      get_it '/foo'
+      body.should.equal "Welcome to the Hello Program\nHi Blake\n"
+
+    end
+
+  end
+
+  context "Templates (in general)" do
+
+    specify "are read from files if Symbols" do
+
+      get '/from_file' do
+        @name = 'Alena'
+        erb :foo, :views_directory => File.dirname(__FILE__) + "/views"
+      end
+
+      get_it '/from_file'
+
+      body.should.equal 'You rock Alena!'
+
+    end
+
+    specify "use layout.ext by default if available" do
+
+      get '/layout_from_file' do
+        erb :foo, :views_directory => File.dirname(__FILE__) + "/views/layout_test"
+      end
+
+      get_it '/layout_from_file'
+      should.be.ok
+      body.should.equal "x This is foo! x \n"
+
+    end
+
+  end
+
+end

data/{test → compat}/events_test.rb

@@ -1,7 +1,6 @@
 require File.dirname(__FILE__) + '/helper'
 
 context "Simple Events" do
-
   def simple_request_hash(method, path)
     Rack::Request.new({
       'REQUEST_METHOD' => method.to_s.upcase,
@@ -9,11 +8,21 @@ context "Simple Events" do
     })
   end
 
+  class MockResult < Struct.new(:block, :params)
+  end
+
   def invoke_simple(path, request_path, &b)
-    event = Sinatra::Event.new(path, &b)
-    event.invoke(simple_request_hash(:get, request_path))
+    params = nil
+    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)
@@ -28,6 +37,7 @@ 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'
@@ -38,14 +48,17 @@ 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/filter_test.rb

@@ -0,0 +1,30 @@
+require File.dirname(__FILE__) + '/helper'
+
+context "before filters" do
+
+  setup do
+    Sinatra.application = nil
+    @app = Sinatra.application
+  end
+
+  specify "should be executed in the order defined" do
+    invoked = 0x0
+    @app.before { invoked = 0x01 }
+    @app.before { invoked |= 0x02 }
+    @app.get('/') { 'Hello World' }
+    get_it '/'
+    should.be.ok
+    body.should.be == 'Hello World'
+    invoked.should.be == 0x03
+  end
+
+  specify "should be capable of modifying the request" do
+    @app.get('/foo') { 'foo' }
+    @app.get('/bar') { 'bar' }
+    @app.before { request.path_info = '/bar' }
+    get_it '/foo'
+    should.be.ok
+    body.should.be == 'bar'
+  end
+
+end

data/compat/haml_test.rb

@@ -0,0 +1,233 @@
+require File.dirname(__FILE__) + '/helper'
+
+context "Haml" do
+
+  setup do
+    Sinatra.application = nil
+  end
+
+  context "without layouts" do
+
+    setup do
+      Sinatra.application = nil
+    end
+
+    specify "should render" do
+
+      get '/no_layout' do
+        haml '== #{1+1}'
+      end
+
+      get_it '/no_layout'
+      should.be.ok
+      body.should == "2\n"
+
+    end
+  end
+
+  context "with layouts" do
+
+    setup do
+      Sinatra.application = nil
+    end
+
+    specify "can be inline" do
+
+      layout do
+        '== This is #{yield}!'
+      end
+
+      get '/lay' do
+        haml 'Blake'
+      end
+
+      get_it '/lay'
+      should.be.ok
+      body.should.equal "This is Blake\n!\n"
+
+    end
+
+    specify "can use named layouts" do
+
+      layout :pretty do
+        '%h1== #{yield}'
+      end
+
+      get '/pretty' do
+        haml 'Foo', :layout => :pretty
+      end
+
+      get '/not_pretty' do
+        haml 'Bar'
+      end
+
+      get_it '/pretty'
+      body.should.equal "<h1>Foo</h1>\n"
+
+      get_it '/not_pretty'
+      body.should.equal "Bar\n"
+
+    end
+
+    specify "can be read from a file if they're not inlined" do
+
+      get '/foo' do
+        @title = 'Welcome to the Hello Program'
+        haml 'Blake', :layout => :foo_layout,
+                      :views_directory => File.dirname(__FILE__) + "/views"
+      end
+
+      get_it '/foo'
+      body.should.equal "Welcome to the Hello Program\nHi Blake\n"
+
+    end
+
+    specify "can be read from file and layout from text" do
+      get '/foo' do
+        haml 'Test', :layout => '== Foo #{yield}'
+      end
+
+      get_it '/foo'
+
+      body.should.equal "Foo Test\n"
+    end
+
+  end
+
+  context "Templates (in general)" do
+
+    setup do
+      Sinatra.application = nil
+    end
+
+    specify "are read from files if Symbols" do
+
+      get '/from_file' do
+        @name = 'Alena'
+        haml :foo, :views_directory => File.dirname(__FILE__) + "/views"
+      end
+
+      get_it '/from_file'
+
+      body.should.equal "You rock Alena!\n"
+
+    end
+
+    specify "use layout.ext by default if available" do
+
+      get '/' do
+        haml :foo, :views_directory => File.dirname(__FILE__) + "/views/layout_test"
+      end
+
+      get_it '/'
+      should.be.ok
+      body.should.equal "x This is foo!\n x\n"
+
+    end
+
+    specify "renders without layout" do
+
+      get '/' do
+        haml :no_layout, :views_directory => File.dirname(__FILE__) + "/views/no_layout"
+      end
+
+      get_it '/'
+      should.be.ok
+      body.should.equal "<h1>No Layout!</h1>\n"
+
+    end
+
+    specify "can render with no layout" do
+      layout do
+        "X\n= yield\nX"
+      end
+
+      get '/' do
+        haml 'blake', :layout => false
+      end
+
+      get_it '/'
+
+      body.should.equal "blake\n"
+    end
+
+    specify "raises error if template not found" do
+      get '/' do
+        haml :not_found
+      end
+
+      lambda { get_it '/' }.should.raise(Errno::ENOENT)
+    end
+
+    specify "use layout.ext by default if available" do
+
+      template :foo do
+        'asdf'
+      end
+
+      get '/' do
+        haml :foo, :layout => false,
+                   :views_directory => File.dirname(__FILE__) + "/views/layout_test"
+      end
+
+      get_it '/'
+      should.be.ok
+      body.should.equal "asdf\n"
+
+    end
+
+  end
+
+  describe 'Options passed to the HAML interpreter' do
+    setup do
+      Sinatra.application = nil
+    end
+
+    specify 'are empty be default' do
+
+      get '/' do
+        haml 'foo'
+      end
+
+      Haml::Engine.expects(:new).with('foo', {}).returns(stub(:render => 'foo'))
+
+      get_it '/'
+      should.be.ok
+
+    end
+
+    specify 'can be configured by passing :options to haml' do
+
+      get '/' do
+        haml 'foo', :options => {:format => :html4}
+      end
+
+      Haml::Engine.expects(:new).with('foo', {:format => :html4}).returns(stub(:render => 'foo'))
+
+      get_it '/'
+      should.be.ok
+
+    end
+
+    specify 'can be configured using set_option :haml' do
+
+      configure do
+        set_option :haml, :format       => :html4,
+                          :escape_html  => true
+      end
+
+      get '/' do
+        haml 'foo'
+      end
+
+      Haml::Engine.expects(:new).with('foo', {:format => :html4,
+        :escape_html => true}).returns(stub(:render => 'foo'))
+
+      get_it '/'
+      should.be.ok
+
+    end
+
+  end
+
+end

data/compat/helper.rb

@@ -0,0 +1,30 @@
+require 'rubygems'
+require 'mocha'
+
+# disable warnings in compat specs.
+$VERBOSE = nil
+
+$:.unshift File.dirname(File.dirname(__FILE__)) + "/lib"
+
+ENV['RACK_ENV'] ||= 'test'
+
+require 'sinatra'
+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
+end