bmizerany-sinatra 0.8.10 → 0.9.0

data/test/static_test.rb

@@ -1,10 +1,13 @@
-require File.dirname(__FILE__) + '/helper'
+require 'test/spec'
+require 'sinatra/base'
+require 'sinatra/test'
 
 describe 'Static' do
+  include Sinatra::Test
   F = ::File
 
   before do
-    mock_app {
+    @app = mock_app {
       set :static, true
       set :public, F.dirname(__FILE__)
     }
@@ -12,46 +15,46 @@ describe 'Static' do
 
   it 'serves GET requests for files in the public directory' do
     get "/#{F.basename(__FILE__)}"
-    assert ok?
-    assert_equal File.read(__FILE__), body
-    assert_equal File.size(__FILE__).to_s, response['Content-Length']
-    assert response.headers.include?('Last-Modified')
+    should.be.ok
+    body.should.equal File.read(__FILE__)
+    response['Content-Length'].should.equal File.size(__FILE__).to_s
+    response.headers.should.include 'Last-Modified'
   end
 
   it 'serves HEAD requests for files in the public directory' do
     head "/#{F.basename(__FILE__)}"
-    assert ok?
-    assert_equal '', body
-    assert_equal File.size(__FILE__).to_s, response['Content-Length']
-    assert response.headers.include?('Last-Modified')
+    should.be.ok
+    body.should.be.empty
+    response['Content-Length'].should.equal File.size(__FILE__).to_s
+    response.headers.should.include 'Last-Modified'
   end
 
   it 'serves files in preference to custom routes' do
     @app.get("/#{F.basename(__FILE__)}") { 'Hello World' }
     get "/#{F.basename(__FILE__)}"
-    assert ok?
-    assert body != 'Hello World'
+    should.be.ok
+    body.should.not.equal 'Hello World'
   end
 
   it 'does not serve directories' do
     get "/"
-    assert not_found?
+    should.be.not_found
   end
 
   it 'passes to the next handler when the static option is disabled' do
     @app.set :static, false
     get "/#{F.basename(__FILE__)}"
-    assert not_found?
+    should.be.not_found
   end
 
   it 'passes to the next handler when the public option is nil' do
     @app.set :public, nil
     get "/#{F.basename(__FILE__)}"
-    assert not_found?
+    should.be.not_found
   end
 
   it '404s when a file is not found' do
     get "/foobarbaz.txt"
-    assert not_found?
+    should.be.not_found
   end
 end

data/test/templates_test.rb

@@ -1,6 +1,10 @@
-require File.dirname(__FILE__) + '/helper'
+require 'test/spec'
+require 'sinatra/base'
+require 'sinatra/test'
 
 describe 'Templating' do
+  include Sinatra::Test
+
   def render_app(&block)
     mock_app {
       def render_test(template, data, options, &block)
@@ -24,56 +28,48 @@ describe 'Templating' do
 
   it 'renders String templates directly' do
     render_app { render :test, 'Hello World' }
-    assert ok?
-    assert_equal 'Hello World', body
+    should.be.ok
+    body.should.equal 'Hello World'
   end
 
   it 'renders Proc templates using the call result' do
     render_app { render :test, Proc.new {'Hello World'} }
-    assert ok?
-    assert_equal 'Hello World', body
+    should.be.ok
+    body.should.equal 'Hello World'
   end
 
   it 'looks up Symbol templates in views directory' do
     render_app { render :test, :hello }
-    assert ok?
-    assert_equal "Hello World!\n", body
+    should.be.ok
+    body.should.equal "Hello World!\n"
   end
 
   it 'uses the default layout template if not explicitly overridden' do
     with_default_layout do
       render_app { render :test, :hello }
-      assert ok?
-      assert_equal "Layout!\nHello World!\n", body
-    end
-  end
-
-  it 'uses the default layout template if not really overriden' do
-    with_default_layout do
-      render_app { render :test, :hello, :layout => true }
-      assert ok?
-      assert_equal "Layout!\nHello World!\n", body
+      should.be.ok
+      body.should.equal "Layout!\nHello World!\n"
     end
   end
 
   it 'uses the layout template specified' do
     render_app { render :test, :hello, :layout => :layout2 }
-    assert ok?
-    assert_equal "Layout 2!\nHello World!\n", body
+    should.be.ok
+    body.should.equal "Layout 2!\nHello World!\n"
   end
 
   it 'uses layout templates defined with the #template method' do
     render_app { render :test, :hello, :layout => :layout3 }
-    assert ok?
-    assert_equal "Layout 3!\nHello World!\n", body
+    should.be.ok
+    body.should.equal "Layout 3!\nHello World!\n"
   end
 
   it 'loads templates from source file with use_in_file_templates!' do
     mock_app {
       use_in_file_templates!
     }
-    assert_equal "this is foo\n\n", @app.templates[:foo]
-    assert_equal "X\n= yield\nX\n", @app.templates[:layout]
+    @app.templates[:foo].should.equal "this is foo\n\n"
+    @app.templates[:layout].should.equal "X\n= yield\nX\n"
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bmizerany-sinatra
 version: !ruby/object:Gem::Version 
-  version: 0.8.10
+  version: 0.9.0
 platform: ruby
 authors: 
 - Blake Mizerany
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-16 00:00:00 -08:00
+date: 2009-01-06 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -19,10 +19,10 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.1
+        version: 0.9.0
     version: 
 description: Classy web-development dressed in a DSL
-email: sinatrarb@googlegroups.com
+email: 
 executables: []
 
 extensions: []
@@ -31,7 +31,6 @@ extra_rdoc_files:
 - README.rdoc
 - LICENSE
 files: 
-- AUTHORS
 - CHANGES
 - LICENSE
 - README.rdoc
@@ -77,7 +76,6 @@ files:
 - lib/sinatra/images/500.png
 - lib/sinatra/main.rb
 - lib/sinatra/test.rb
-- lib/sinatra/test/bacon.rb
 - lib/sinatra/test/rspec.rb
 - lib/sinatra/test/spec.rb
 - lib/sinatra/test/unit.rb
@@ -88,7 +86,6 @@ files:
 - test/erb_test.rb
 - test/filter_test.rb
 - test/haml_test.rb
-- test/helper.rb
 - test/helpers_test.rb
 - test/mapped_error_test.rb
 - test/middleware_test.rb

data/AUTHORS

@@ -1,40 +0,0 @@
-Sinatra was designed and developed by Blake Mizerany (bmizerany) in
-California. Continued development would not be possible without the ongoing
-financial support provided by Heroku <heroku.com> and the emotional support
-provided by Adam Wiggins (adamwiggins), Chris Wanstrath (defunkt), PJ Hyett (pjhyett), and
-the rest of the Github crew.
-
-Special thanks to the following extraordinary individuals, who-out which
-Sinatra would not be possible:
-
-* Ryan Tomayko (rtomayko) for constantly fixing whitespace errors 60d5006
-* Ezra Zygmuntowicz (ezmobius) for initial help and letting Blake steal
-  some of merbs internal code.
-* Christopher Schneid (cschneid) for The Book, the blog (gittr.com),
-  irclogger.com, and a bunch of useful patches.
-* Markus Prinz (cypher) for patches over the years, caring about
-  the README, and hanging in there when times were rough.
-* Simon Rozet (sr) for a ton of doc patches, HAML options, and all that
-  advocacy stuff he's going to do for 1.0.
-* Erik Kastner (kastner) for fixing MIME_TYPES under Rack 0.5.
-* Ben Bleything (bleything) for caring about HTTP status codes and doc fixes.
-* Igal Koshevoy (igal) for root path detection under Thin/Passenger.
-* Jon Crosby (jcrosby) for coffee breaks, doc fixes, and just because, man.
-* Karel Minarik (karmi) for screaming until the website came back up.
-* Jeremy Evans (jeremyevans) for unbreaking optional path params (twice!)
-* The GitHub guys for stealing Blake's table.
-* Nickolas Means (nmeans) for Sass template support.
-* Victor Hugo Borja (vic) for splat'n routes specs and doco.
-* Avdi Grimm (avdi) for basic RSpec support.
-* Jack Danger Canty for a more accurate root directory and for making me
-  watch this just now: http://www.youtube.com/watch?v=ueaHLHgskkw.
-* Mathew Walker for making escaped paths work with static files.
-* Millions of Us for having the problem that led to Sinatra's conception.
-* Songbird for the problems that helped Sinatra's future become realized.
-* Rick Olsen (technoweenie) for the killer plug at RailsConf '08.
-* Steven Garcia for the amazing custom artwork you see on 404's and 500's
-
-and last but not least:
-
-* Frank Sinatra (chairman of the board) for having so much class he
-  deserves a web-framework named after him.

data/lib/sinatra/test/bacon.rb

@@ -1,17 +0,0 @@
-require 'bacon'
-require 'sinatra/test'
-
-Sinatra::Default.set(
-  :env => :test,
-  :run => false,
-  :raise_errors => true,
-  :logging => false
-)
-
-module Sinatra::Test
-  def should
-    @response.should
-  end
-end
-
-Bacon::Context.send(:include, Sinatra::Test)

data/test/helper.rb

@@ -1,25 +0,0 @@
-begin
-  require 'test/spec'
-rescue LoadError
-  require 'rubygems'
-  require 'test/spec'
-end
-
-$:.unshift File.dirname(File.dirname(__FILE__)) + '/lib'
-require 'sinatra/base'
-require 'sinatra/test'
-require 'sinatra/test/spec'
-
-module Sinatra::Test
-  # Sets up a Sinatra::Base subclass defined with the block
-  # given. Used in setup or individual spec methods to establish
-  # the application.
-  def mock_app(base=Sinatra::Base, &block)
-    @app = Sinatra.new(base, &block)
-  end
-end
-
-class Sinatra::Base
-  # Allow assertions in request context
-  include Test::Unit::Assertions
-end