rtomayko-sinatra 0.9.0 → 0.9.0.2

data/test/sass_test.rb

@@ -1,10 +1,6 @@
-require 'test/spec'
-require 'sinatra/base'
-require 'sinatra/test'
+require File.dirname(__FILE__) + '/helper'
 
 describe "Sass Templates" do
-  include Sinatra::Test
-
   def sass_app(&block)
     mock_app {
       set :views, File.dirname(__FILE__) + '/views'
@@ -15,26 +11,26 @@ describe "Sass Templates" do
 
   it 'renders inline Sass strings' do
     sass_app { sass "#sass\n  :background-color #FFF\n" }
-    should.be.ok
-    body.should.equal "#sass {\n  background-color: #FFF; }\n"
+    assert ok?
+    assert_equal "#sass {\n  background-color: #FFF; }\n", body
   end
 
   it 'renders .sass files in views path' do
     sass_app { sass :hello }
-    should.be.ok
-    body.should.equal "#sass {\n  background-color: #FFF; }\n"
+    assert ok?
+    assert_equal "#sass {\n  background-color: #FFF; }\n", body
   end
 
   it 'ignores the layout option' do
     sass_app { sass :hello, :layout => :layout2 }
-    should.be.ok
-    body.should.equal "#sass {\n  background-color: #FFF; }\n"
+    assert ok?
+    assert_equal "#sass {\n  background-color: #FFF; }\n", body
   end
 
   it "raises error if template not found" do
     mock_app {
       get('/') { sass :no_such_template }
     }
-    lambda { get('/') }.should.raise(Errno::ENOENT)
+    assert_raise(Errno::ENOENT) { get('/') }
   end
 end

data/test/sinatra_test.rb

@@ -1,6 +1,4 @@
-require 'test/spec'
-require 'sinatra/base'
-require 'sinatra/test'
+require File.dirname(__FILE__) + '/helper'
 
 describe 'Sinatra' do
   it 'creates a new Sinatra::Base subclass on new' do
@@ -10,6 +8,6 @@ describe 'Sinatra' do
           'Hello World'
         end
       end
-    app.superclass.should.be Sinatra::Base
+    assert_same Sinatra::Base, app.superclass
   end
 end

data/test/static_test.rb

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

data/test/templates_test.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rtomayko-sinatra
 version: !ruby/object:Gem::Version 
-  version: 0.9.0
+  version: 0.9.0.2
 platform: ruby
 authors: 
 - Blake Mizerany
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-06 00:00:00 -08:00
+date: 2009-01-18 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.0
+        version: 0.9.1
     version: 
 description: Classy web-development dressed in a DSL
-email: 
+email: sinatrarb@googlegroups.com
 executables: []
 
 extensions: []
@@ -31,7 +31,8 @@ extra_rdoc_files:
 - README.rdoc
 - LICENSE
 files: 
-- ChangeLog
+- AUTHORS
+- CHANGES
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -75,8 +76,8 @@ files:
 - lib/sinatra/images/404.png
 - lib/sinatra/images/500.png
 - lib/sinatra/main.rb
-- lib/sinatra/rack/methodoverride.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
@@ -87,6 +88,7 @@ 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/ChangeLog

@@ -1,96 +0,0 @@
-= 0.3.3 / 2009-01-06
-
-  * Pin to Rack 0.4.0 (this is the last release on Rack 0.4)
-
-  * Log unhandled exception backtraces to rack.errors.
-
-  * Use RACK_ENV environment variable to establish Sinatra
-    environment when given. Thin sets this when started with
-    the -e argument.
-
-  * BUG: raising Sinatra::NotFound resulted in a 500 response
-    code instead of 404.
-
-  * BUG: use_in_file_templates! failes with CR/LF (#45)
-
-  * BUG: Sinatra detects the app file and root path when run under
-    thin/passenger.
-
-= 0.3.2
-
-  * BUG: Static and send_file read entire file into String before
-    sending. Updated to stream with 8K chunks instead.
-
-  * Rake tasks and assets for building basic documentation website.
-    See http://sinatra.rubyforge.org
-
-  * Various minor doc fixes.
-
-= 0.3.1
-
-  * Unbreak optional path parameters [jeremyevans]
-
-= 0.3.0
-
-  * Add sinatra.gemspec w/ support for github gem builds. Forks can now
-    enable the build gem option in github to get free username-sinatra.gem
-    builds: gem install username-sinatra.gem --source=http://gems.github.com/
-
-  * Require rack-0.4 gem; removes frozen rack dir.
-
-  * Basic RSpec support; require 'sinatra/test/rspec' instead of
-    'sinatra/test/spec' to use. [avdi]
-
-  * before filters can modify request environment vars used for
-    routing (e.g., PATH_INFO, REQUEST_METHOD, etc.) for URL rewriting
-    type functionality.
-
-  * In-file templates now uses @@ instead of ## as template separator.
-
-  * Top-level environment test predicates: development?, test?, production?
-
-  * Top-level "set", "enable", and "disable" methods for tweaking
-    app options. [rtomayko]
-
-  * Top-level "use" method for building Rack middleware pipelines
-    leading to app. See README for usage. [rtomayko]
-
-  * New "reload" option - set false to disable reloading in development.
-
-  * New "host" option - host/ip to bind to [cschneid]
-
-  * New "app_file" option - override the file to reload in development
-    mode [cschneid]
-
-  * Development error/not_found page cleanup [sr, adamwiggins]
-
-  * Remove a bunch of core extensions (String#to_param, String#from_param,
-    Hash#from_params, Hash#to_params, Hash#symbolize_keys, Hash#pass)
-
-  * Various grammar and formatting fixes to README; additions on
-    community and contributing [cypher]
-
-  * Build RDoc using Hanna template: http://sinatrarb.rubyforge.org/api
-
-  * Specs, documentation and fixes for splat'n routes [vic]
-
-  * Fix whitespace errors across all source files. [rtomayko]
-
-  * Fix streaming issues with Mongrel (body not closed). [bmizerany]
-
-  * Fix various issues with environment not being set properly (configure
-    blocks not running, error pages not registering, etc.) [cypher]
-
-  * Fix to allow locals to be passed to ERB templates [cschneid]
-
-  * Fix locking issues causing random errors during reload in development.
-
-  * Fix for escaped paths not resolving static files [Matthew Walker]
-
-= 0.2.1
-
-  * File upload fix and minor tweaks.
-
-= 0.2.0
-
-  * Initial gem release of 0.2 coebase.