rtomayko-sinatra 0.8.10 → 0.9.0

data/test/sass_test.rb

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

data/test/sinatra_test.rb

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

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: rtomayko-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,8 +31,7 @@ extra_rdoc_files:
 - README.rdoc
 - LICENSE
 files: 
-- AUTHORS
-- CHANGES
+- ChangeLog
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -76,8 +75,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
@@ -88,7 +87,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/CHANGES

@@ -1,185 +0,0 @@
-= 0.9.0 (unreleased)
-
- * Works with and requires Rack >= 0.9.1
-
- * Multiple Sinatra applications can now co-exist peacefully within a
-   single process. The new "Sinatra::Base" class can be subclassed to
-   establish a blank-slate Rack application or middleware component.
-   Documentation on using these features is forth-coming; the following
-   provides the basic gist: http://gist.github.com/38605
-
- * Parameters with subscripts are now parsed into a nested/recursive
-   Hash structure. e.g., "post[title]=Hello&post[body]=World" yields
-   params: {'post' => {'title' => 'Hello', 'body' => 'World'}}.
-
- * Regular expressions may now be used in route pattens; captures are
-   available at "params[:captures]".
-
- * New ":provides" route condition takes an array of mime types and
-   matches only when an Accept request header is present with a
-   corresponding type. [cypher]
-
- * New request-level "pass" method; immediately exits the current block
-   and passes control to the next matching route.
-
- * The request-level "body" method now takes a block; evaluation is
-   deferred until an attempt is made to read the body. The block must
-   return a String or Array.
-
- * New "route conditions" system for attaching rules for when a route
-   matches. The :agent and :host route options now use this system.
-
- * New "dump_errors" option controls whether the backtrace is dumped to
-   rack.errors when an exception is raised from a route. The option is
-   enabled by default for top-level apps.
-
- * Better default "app_file", "root", "public", and "views" location
-   detection; changes to "root" and "app_file" automatically cascade to
-   other options that depend on them.
-
- * Error mappings are now split into two distinct layers: exception
-   mappings and custom error pages. Exception mappings are registered
-   with "error(Exception)" and are run only when the app raises an
-   exception. Custom error pages are registered with "error(status_code)",
-   where "status_code" is an integer, and are run any time the response
-   has the status code specified. It's also possible to register an error
-   page for a range of status codes: "error(500..599)".
-
- * Sinatra's testing support is no longer dependent on Test::Unit. Requiring
-   'sinatra/test' adds the Sinatra::Test module and Sinatra::TestHarness
-   class, which can be used with any test framework. The 'sinatra/test/unit',
-   'sinatra/test/spec', 'sinatra/test/rspec', or 'sinatra/test/bacon' files
-   can be required to setup a framework-specific testing environment. See the
-   README for more information.
-
- * Added support for Bacon (test framework). The 'sinatra/test/bacon' file
-   can be required to setup Sinatra test helpers on Bacon::Context.
-
- * Deprecated "set_option" and "set_options"; use "set" instead.
-
- * Deprecated the "env" option ("options.env"); use "environment" instead.
-
- * Deprecated the request level "stop" method; use "halt" instead.
-
- * Deprecated the request level "entity_tag" method; use "etag" instead.
-   Both "entity_tag" and "etag" were previously supported.
-
- * Deprecated the request level "headers" method (HTTP response headers);
-   use "response['Header-Name']" instead.
-
- * Deprecated "Sinatra.application"; use "Sinatra::Application" instead.
-
- * Deprecated setting Sinatra.application = nil to reset an application.
-   This should no longer be necessary.
-
- * Deprecated "Sinatra.default_options"; use
-   "Sinatra::Default.set(key, value)" instead.
-
- * Deprecated the "ServerError" exception. All Exceptions are now
-   treated as internal server errors and result in a 500 response
-   status.
-
- * Deprecated the "get_it", "post_it", "put_it", "delete_it", and "head_it"
-   test helper methods. Use "get", "post", "put", "delete", and "head",
-   respectively, instead.
-
- * Removed Event and EventContext classes. Applications are defined in a
-   subclass of Sinatra::Base; each request is processed within an
-   instance.
-
-= 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! fails 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 codebase.