darkhelmet-sinatra 0.9.1.1 → 0.10.1

data/test/erb_test.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/helper'
 
-describe "ERB Templates" do
+class ERBTest < Test::Unit::TestCase
   def erb_app(&block)
     mock_app {
       set :views, File.dirname(__FILE__) + '/views'

data/test/erubis_test.rb

@@ -0,0 +1,82 @@
+require File.dirname(__FILE__) + '/helper'
+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

data/test/extensions_test.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/helper'
 
-describe 'Registering extensions' do
+class ExtensionsTest < Test::Unit::TestCase
   module FooExtensions
     def foo
     end
@@ -25,13 +25,19 @@ describe 'Registering extensions' do
     end
   end
 
+  module PainExtensions
+    def foo=(name); end
+    def bar?(name); end
+    def fizz!(name); end
+  end
+
   it 'will add the methods to the DSL for the class in which you register them and its subclasses' do
     Sinatra::Base.register FooExtensions
     assert Sinatra::Base.respond_to?(:foo)
 
-    Sinatra::Default.register BarExtensions
-    assert Sinatra::Default.respond_to?(:bar)
-    assert Sinatra::Default.respond_to?(:foo)
+    Sinatra::Application.register BarExtensions
+    assert Sinatra::Application.respond_to?(:bar)
+    assert Sinatra::Application.respond_to?(:foo)
     assert !Sinatra::Base.respond_to?(:bar)
   end
 
@@ -42,23 +48,33 @@ describe 'Registering extensions' do
     assert Sinatra::Base.respond_to?(:im_in_ur_anonymous_module)
   end
 
-  it 'will make sure any public methods added via Default#register are delegated to Sinatra::Delegator' do
-    Sinatra::Default.register FooExtensions
+  it 'will make sure any public methods added via Application#register are delegated to Sinatra::Delegator' do
+    Sinatra::Application.register FooExtensions
     assert Sinatra::Delegator.private_instance_methods.
       map { |m| m.to_sym }.include?(:foo)
     assert !Sinatra::Delegator.private_instance_methods.
       map { |m| m.to_sym }.include?(:im_hiding_in_ur_foos)
   end
 
+  it 'will handle special method names' do
+    Sinatra::Application.register PainExtensions
+    assert Sinatra::Delegator.private_instance_methods.
+      map { |m| m.to_sym }.include?(:foo=)
+    assert Sinatra::Delegator.private_instance_methods.
+      map { |m| m.to_sym }.include?(:bar?)
+    assert Sinatra::Delegator.private_instance_methods.
+      map { |m| m.to_sym }.include?(:fizz!)
+  end
+
   it 'will not delegate methods on Base#register' do
     Sinatra::Base.register QuuxExtensions
     assert !Sinatra::Delegator.private_instance_methods.include?("quux")
   end
 
-  it 'will extend the Sinatra::Default application by default' do
+  it 'will extend the Sinatra::Application application by default' do
     Sinatra.register BazExtensions
     assert !Sinatra::Base.respond_to?(:baz)
-    assert Sinatra::Default.respond_to?(:baz)
+    assert Sinatra::Application.respond_to?(:baz)
   end
 
   module BizzleExtension

data/test/filter_test.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/helper'
 
-describe "Filters" do
+class BeforeFilterTest < Test::Unit::TestCase
   it "executes filters in the order defined" do
     count = 0
     mock_app do
@@ -21,7 +21,7 @@ describe "Filters" do
     assert_equal 'Hello World', body
   end
 
-  it "allows filters to modify the request" do
+  it "can modify the request" do
     mock_app {
       get('/foo') { 'foo' }
       get('/bar') { 'bar' }
@@ -44,7 +44,7 @@ describe "Filters" do
     assert_equal 'bar', body
   end
 
-  it "allows redirects in filters" do
+  it "allows redirects" do
     mock_app {
       before { redirect '/bar' }
       get('/foo') do
@@ -96,4 +96,100 @@ describe "Filters" do
     assert ok?
     assert_equal 'cool', body
   end
+
+  it "runs filters defined in superclasses" do
+    base = Class.new(Sinatra::Base)
+    base.before { @foo = 'hello from superclass' }
+
+    mock_app(base) {
+      get('/foo') { @foo }
+    }
+
+    get '/foo'
+    assert_equal 'hello from superclass', body
+  end
+end
+
+class AfterFilterTest < Test::Unit::TestCase
+  it "executes filters in the order defined" do
+    invoked = 0
+    mock_app do
+      before   { invoked = 2 }
+      get('/') { invoked += 2 }
+      after    { invoked *= 2 }
+    end
+
+    get '/'
+    assert ok?
+
+    assert_equal 8, invoked
+  end
+
+  it "executes filters in the order defined" do
+    count = 0
+    mock_app do
+      get('/') { 'Hello World' }
+      after {
+        assert_equal 0, count
+        count = 1
+      }
+      after {
+        assert_equal 1, count
+        count = 2
+      }
+    end
+
+    get '/'
+    assert ok?
+    assert_equal 2, count
+    assert_equal 'Hello World', body
+  end
+
+  it "allows redirects" do
+    mock_app {
+      get('/foo') { 'ORLY' }
+      after { redirect '/bar' }
+    }
+
+    get '/foo'
+    assert redirect?
+    assert_equal '/bar', response['Location']
+    assert_equal '', body
+  end
+
+  it "does not modify the response with its return value" do
+    mock_app {
+      get('/foo') { 'cool' }
+      after { 'Hello World!' }
+    }
+
+    get '/foo'
+    assert ok?
+    assert_equal 'cool', body
+  end
+
+  it "does modify the response with halt" do
+    mock_app {
+      get '/foo' do
+        "should not be returned"
+      end
+      after { halt 302, 'Hi' }
+    }
+
+    get '/foo'
+    assert_equal 302, response.status
+    assert_equal 'Hi', body
+  end
+
+  it "runs filters defined in superclasses" do
+    count = 2
+    base = Class.new(Sinatra::Base)
+    base.after { count *= 2 }
+    mock_app(base) {
+      get('/foo') { count += 2 }
+    }
+
+    get '/foo'
+    assert_equal 8, count
+  end
 end

data/test/haml_test.rb

@@ -1,6 +1,7 @@
 require File.dirname(__FILE__) + '/helper'
+require 'haml'
 
-describe "HAML Templates" do
+class HAMLTest < Test::Unit::TestCase
   def haml_app(&block)
     mock_app {
       set :views, File.dirname(__FILE__) + '/views'
@@ -47,9 +48,12 @@ describe "HAML Templates" do
   end
 
   it "passes HAML options to the Haml engine" do
-    haml_app {
-      haml "!!!\n%h1 Hello World", :options => {:format => :html5}
+    mock_app {
+      get '/' do
+        haml "!!!\n%h1 Hello World", :format => :html5
+      end
     }
+    get '/'
     assert ok?
     assert_equal "<!DOCTYPE html>\n<h1>Hello World</h1>\n", body
   end
@@ -65,4 +69,22 @@ describe "HAML Templates" do
     assert ok?
     assert_equal "<!DOCTYPE html>\n<h1>Hello World</h1>\n", body
   end
+
+  it "merges the default HAML options with the overrides and passes them to the Haml engine" do
+    mock_app {
+      set :haml, {:format => :html5, :attr_wrapper => '"'} # default HAML attr are <tag attr='single-quoted'>
+      get '/' do
+        haml "!!!\n%h1{:class => :header} Hello World"
+      end
+      get '/html4' do
+        haml "!!!\n%h1{:class => 'header'} Hello World", :format => :html4
+      end
+    }
+    get '/'
+    assert ok?
+    assert_equal "<!DOCTYPE html>\n<h1 class=\"header\">Hello World</h1>\n", body
+    get '/html4'
+    assert ok?
+    assert_match(/^<!DOCTYPE html PUBLIC (.*) HTML 4.01/, body)
+  end
 end

data/test/helper.rb

@@ -1,3 +1,5 @@
+ENV['RACK_ENV'] = 'test'
+
 begin
   require 'rack'
 rescue LoadError
@@ -5,19 +7,35 @@ rescue LoadError
   require 'rack'
 end
 
+testdir = File.dirname(__FILE__)
+$LOAD_PATH.unshift testdir unless $LOAD_PATH.include?(testdir)
+
 libdir = File.dirname(File.dirname(__FILE__)) + '/lib'
 $LOAD_PATH.unshift libdir unless $LOAD_PATH.include?(libdir)
 
-require 'test/unit'
-require 'sinatra/test'
+require 'contest'
+require 'rack/test'
+require 'sinatra/base'
 
 class Sinatra::Base
   # Allow assertions in request context
   include Test::Unit::Assertions
 end
 
+Sinatra::Base.set :environment, :test
+
 class Test::Unit::TestCase
-  include Sinatra::Test
+  include Rack::Test::Methods
+
+  class << self
+    alias_method :it, :test
+  end
+
+  alias_method :response, :last_response
+
+  setup do
+    Sinatra::Base.set :environment, :test
+  end
 
   # Sets up a Sinatra::Base subclass defined with the block
   # given. Used in setup or individual spec methods to establish
@@ -26,56 +44,33 @@ class Test::Unit::TestCase
     @app = Sinatra.new(base, &block)
   end
 
-  def restore_default_options
-    Sinatra::Default.set(
-      :environment => :development,
-      :raise_errors => Proc.new { test? },
-      :dump_errors => true,
-      :sessions => false,
-      :logging => Proc.new { ! test? },
-      :methodoverride => true,
-      :static => true,
-      :run => Proc.new { ! test? }
-    )
+  def app
+    Rack::Lint.new(@app)
+  end
+
+  def body
+    response.body.to_s
   end
-end
 
-##
-# test/spec/mini
-# http://pastie.caboo.se/158871
-# chris@ozmm.org
-#
-def describe(*args, &block)
-  return super unless (name = args.first.capitalize) && block
-  name = "#{name.gsub(/\W/, '')}Test"
-  Object.send :const_set, name, Class.new(Test::Unit::TestCase)
-  klass = Object.const_get(name)
-  klass.class_eval do
-    def self.it(name, &block)
-      define_method("test_#{name.gsub(/\W/,'_').downcase}", &block)
+  # Delegate other missing methods to response.
+  def method_missing(name, *args, &block)
+    if response && response.respond_to?(name)
+      response.send(name, *args, &block)
+    else
+      super
     end
-    def self.xspecify(*args) end
-    def self.before(&block) define_method(:setup, &block)    end
-    def self.after(&block)  define_method(:teardown, &block) end
   end
-  klass.class_eval &block
-  klass
-end
 
-def describe_option(name, &block)
-  klass = describe("Option #{name}", &block)
-  klass.before do
-    restore_default_options
-    @base    = Sinatra.new
-    @default = Class.new(Sinatra::Default)
+  # Also check response since we delegate there.
+  def respond_to?(symbol, include_private=false)
+    super || (response && response.respond_to?(symbol, include_private))
   end
-  klass
-end
 
-# Do not output warnings for the duration of the block.
-def silence_warnings
-  $VERBOSE, v = nil, $VERBOSE
-  yield
-ensure
-  $VERBOSE = v
+  # Do not output warnings for the duration of the block.
+  def silence_warnings
+    $VERBOSE, v = nil, $VERBOSE
+    yield
+  ensure
+    $VERBOSE = v
+  end
 end