adamwiggins-sinatra 0.8.9 → 0.10.1

data/test/sass_test.rb

@@ -1,10 +1,7 @@
-require 'test/spec'
-require 'sinatra/base'
-require 'sinatra/test'
-
-describe "Sass Templates" do
-  include Sinatra::Test
+require File.dirname(__FILE__) + '/helper'
+require 'sass'
 
+class SassTest < Test::Unit::TestCase
   def sass_app(&block)
     mock_app {
       set :views, File.dirname(__FILE__) + '/views'
@@ -15,26 +12,68 @@ 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
+
+  it "passes SASS options to the Sass engine" do
+    sass_app {
+      sass "#sass\n  :background-color #FFF\n  :color #000\n", :style => :compact
+    }
+    assert ok?
+    assert_equal "#sass { background-color: #FFF; color: #000; }\n", body
+  end
+
+  it "passes default SASS options to the Sass engine" do
+    mock_app {
+      set :sass, {:style => :compact} # default Sass style is :nested
+      get '/' do
+        sass "#sass\n  :background-color #FFF\n  :color #000\n"
+      end
+    }
+    get '/'
+    assert ok?
+    assert_equal "#sass { background-color: #FFF; color: #000; }\n", body
+  end
+
+  it "merges the default SASS options with the overrides and passes them to the Sass engine" do
+    mock_app {
+      set :sass, {:style => :compact, :attribute_syntax => :alternate } # default Sass attribute_syntax is :normal (with : in front)
+      get '/' do
+        sass "#sass\n  background-color: #FFF\n  color: #000\n"
+      end
+      get '/raised' do
+        sass "#sass\n  :background-color #FFF\n  :color #000\n", :style => :expanded # retains global attribute_syntax settings
+      end
+      get '/expanded_normal' do
+        sass "#sass\n  :background-color #FFF\n  :color #000\n", :style => :expanded, :attribute_syntax => :normal
+      end
+    }
+    get '/'
+    assert ok?
+    assert_equal "#sass { background-color: #FFF; color: #000; }\n", body
+    assert_raise(Sass::SyntaxError) { get('/raised') }
+    get '/expanded_normal'
+    assert ok?
+    assert_equal "#sass {\n  background-color: #FFF;\n  color: #000;\n}\n", body
   end
 end

data/test/server_test.rb

@@ -0,0 +1,47 @@
+require File.dirname(__FILE__) + '/helper'
+
+module Rack::Handler
+  class Mock
+    extend Test::Unit::Assertions
+
+    def self.run(app, options={})
+      assert(app < Sinatra::Base)
+      assert_equal 9001, options[:Port]
+      assert_equal 'foo.local', options[:Host]
+      yield new
+    end
+
+    def stop
+    end
+  end
+
+  register 'mock', 'Rack::Handler::Mock'
+end
+
+class ServerTest < Test::Unit::TestCase
+  setup do
+    mock_app {
+      set :server, 'mock'
+      set :host, 'foo.local'
+      set :port, 9001
+    }
+    $stdout = File.open('/dev/null', 'wb')
+  end
+
+  def teardown
+    $stdout = STDOUT
+  end
+
+  it "locates the appropriate Rack handler and calls ::run" do
+    @app.run!
+  end
+
+  it "sets options on the app before running" do
+    @app.run! :sessions => true
+    assert @app.sessions?
+  end
+
+  it "falls back on the next server handler when not found" do
+    @app.run! :server => %w[foo bar mock]
+  end
+end

data/test/sinatra_test.rb

@@ -1,8 +1,6 @@
-require 'test/spec'
-require 'sinatra/base'
-require 'sinatra/test'
+require File.dirname(__FILE__) + '/helper'
 
-describe 'Sinatra' do
+class SinatraTest < Test::Unit::TestCase
   it 'creates a new Sinatra::Base subclass on new' do
     app =
       Sinatra.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,60 +1,87 @@
-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 {
+class StaticTest < Test::Unit::TestCase
+  setup do
+    mock_app {
       set :static, true
-      set :public, F.dirname(__FILE__)
+      set :public, File.dirname(__FILE__)
     }
   end
 
   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'
+    get "/#{File.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')
+  end
+
+  it 'produces a body that can be iterated over multiple times' do
+    env = Rack::MockRequest.env_for("/#{File.basename(__FILE__)}")
+    status, headers, body = @app.call(env)
+    buf1, buf2 = [], []
+    body.each { |part| buf1 << part }
+    body.each { |part| buf2 << part }
+    assert_equal buf1.join, buf2.join
+    assert_equal File.read(__FILE__), buf1.join
   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'
+    head "/#{File.basename(__FILE__)}"
+    assert ok?
+    assert_equal '', body
+    assert_equal File.size(__FILE__).to_s, response['Content-Length']
+    assert response.headers.include?('Last-Modified')
+  end
+
+  %w[POST PUT DELETE].each do |verb|
+    it "does not serve #{verb} requests" do
+      send verb.downcase, "/#{File.basename(__FILE__)}"
+      assert_equal 404, status
+    end
   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'
+    @app.get("/#{File.basename(__FILE__)}") { 'Hello World' }
+    get "/#{File.basename(__FILE__)}"
+    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
+    get "/#{File.basename(__FILE__)}"
+    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
+    get "/#{File.basename(__FILE__)}"
+    assert not_found?
   end
 
   it '404s when a file is not found' do
     get "/foobarbaz.txt"
-    should.be.not_found
+    assert not_found?
+  end
+
+  it 'serves files when .. path traverses within public directory' do
+    get "/data/../#{File.basename(__FILE__)}"
+    assert ok?
+    assert_equal File.read(__FILE__), body
+  end
+
+  it '404s when .. path traverses outside of public directory' do
+    mock_app {
+      set :static, true
+      set :public, File.dirname(__FILE__) + '/data'
+    }
+    get "/../#{File.basename(__FILE__)}"
+    assert not_found?
   end
 end

data/test/templates_test.rb

@@ -1,13 +1,9 @@
-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)
+class TemplatesTest < Test::Unit::TestCase
+  def render_app(base=Sinatra::Base, &block)
+    mock_app(base) {
+      def render_test(data, options, locals, &block)
         inner = block ? block.call : ''
         data + inner
       end
@@ -28,59 +24,112 @@ 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 }
-      should.be.ok
-      body.should.equal "Layout!\nHello World!\n"
+      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][:template]
+    assert_equal "X\n= yield\nX\n", @app.templates[:layout][:template]
+  end
+
+  it 'loads templates from specified views directory' do
+    render_app { render :test, :hello, :views => options.views + '/foo' }
+
+    assert_equal "from another views directory\n", body
+  end
+
+  test 'use_in_file_templates simply ignores IO errors' do
+    assert_nothing_raised {
+      mock_app {
+        use_in_file_templates!('/foo/bar')
+      }
+    }
+
+    assert @app.templates.empty?
+  end
+
+  it 'passes locals to the layout' do
+    mock_app {
+      template :my_layout do
+        'Hello <%= name %>!<%= yield %>'
+      end
+
+      get '/' do
+        erb '<p>content</p>', { :layout => :my_layout }, { :name => 'Mike'}
+      end
+    }
+
+    get '/'
+    assert ok?
+    assert_equal 'Hello Mike!<p>content</p>', body
+  end
+
+  it 'loads templates defined in subclasses' do
+    base = Class.new(Sinatra::Base)
+    base.template(:foo) { 'bar' }
+    render_app(base) { render :test, :foo }
+    assert ok?
+    assert_equal 'bar', body
+  end
+
+  it 'uses templates in superclasses before subclasses' do
+    base = Class.new(Sinatra::Base)
+    base.template(:foo) { 'template in superclass' }
+    render_app(base) { render :test, :foo }
+    @app.template(:foo) { 'template in subclass' }
+
+    get '/'
+    assert ok?
+    assert_equal 'template in subclass', body
   end
 end
 
+# __END__ : this is not the real end of the script.
+
 __END__
 
 @@ foo

data/test/views/error.builder

@@ -0,0 +1,3 @@
+xml.error do
+  raise "goodbye"
+end

data/test/views/error.erb

@@ -0,0 +1,3 @@
+Hello <%= 'World' %>
+<% raise 'Goodbye' unless defined?(french) && french %>
+<% raise 'Au revoir' if defined?(french) && french %>

data/test/views/error.haml

@@ -0,0 +1,3 @@
+%h1 Hello From Haml
+= raise 'goodbye' unless defined?(french) && french
+= raise 'au revoir' if defined?(french) && french

data/test/views/error.sass

@@ -0,0 +1,2 @@
+#sass
+  +argle-bargle

data/test/views/foo/hello.test

@@ -0,0 +1 @@
+from another views directory

metadata

@@ -1,28 +1,54 @@
 --- !ruby/object:Gem::Specification 
 name: adamwiggins-sinatra
 version: !ruby/object:Gem::Version 
-  version: 0.8.9
+  version: 0.10.1
 platform: ruby
 authors: 
 - Blake Mizerany
+- Ryan Tomayko
+- Simon Rozet
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-01-13 00:00:00 -08:00
+date: 2009-06-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.0
+        version: "1.0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: shotgun
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0.3"
+    - - <
+      - !ruby/object:Gem::Version 
+        version: "1.0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rack-test
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.3.0
     version: 
 description: Classy web-development dressed in a DSL
-email: 
+email: sinatrarb@googlegroups.com
 executables: []
 
 extensions: []
@@ -36,69 +62,42 @@ files:
 - LICENSE
 - README.rdoc
 - Rakefile
-- compat/app_test.rb
-- compat/application_test.rb
-- compat/builder_test.rb
-- compat/custom_error_test.rb
-- compat/erb_test.rb
-- compat/events_test.rb
-- compat/filter_test.rb
-- compat/haml_test.rb
-- compat/helper.rb
-- compat/mapped_error_test.rb
-- compat/pipeline_test.rb
-- compat/public/foo.xml
-- compat/sass_test.rb
-- compat/sessions_test.rb
-- compat/streaming_test.rb
-- compat/sym_params_test.rb
-- compat/template_test.rb
-- compat/use_in_file_templates_test.rb
-- compat/views/foo.builder
-- compat/views/foo.erb
-- compat/views/foo.haml
-- compat/views/foo.sass
-- compat/views/foo_layout.erb
-- compat/views/foo_layout.haml
-- compat/views/layout_test/foo.builder
-- compat/views/layout_test/foo.erb
-- compat/views/layout_test/foo.haml
-- compat/views/layout_test/foo.sass
-- compat/views/layout_test/layout.builder
-- compat/views/layout_test/layout.erb
-- compat/views/layout_test/layout.haml
-- compat/views/layout_test/layout.sass
-- compat/views/no_layout/no_layout.builder
-- compat/views/no_layout/no_layout.haml
 - lib/sinatra.rb
 - lib/sinatra/base.rb
-- lib/sinatra/compat.rb
 - lib/sinatra/images/404.png
 - lib/sinatra/images/500.png
 - lib/sinatra/main.rb
-- lib/sinatra/test.rb
-- lib/sinatra/test/rspec.rb
-- lib/sinatra/test/spec.rb
-- lib/sinatra/test/unit.rb
+- lib/sinatra/showexceptions.rb
 - sinatra.gemspec
 - test/base_test.rb
 - test/builder_test.rb
+- test/contest.rb
 - test/data/reload_app_file.rb
 - test/erb_test.rb
+- test/extensions_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
 - test/options_test.rb
-- test/reload_test.rb
+- test/render_backtrace_test.rb
 - test/request_test.rb
+- test/response_test.rb
 - test/result_test.rb
+- test/route_added_hook_test.rb
 - test/routing_test.rb
 - test/sass_test.rb
+- test/server_test.rb
 - test/sinatra_test.rb
 - test/static_test.rb
 - test/templates_test.rb
+- test/views/error.builder
+- test/views/error.erb
+- test/views/error.haml
+- test/views/error.sass
+- test/views/foo/hello.test
 - test/views/hello.builder
 - test/views/hello.erb
 - test/views/hello.haml
@@ -110,6 +109,7 @@ files:
 - test/views/layout2.test
 has_rdoc: true
 homepage: http://sinatra.rubyforge.org
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --line-numbers
@@ -135,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: sinatra
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
 summary: Classy web-development dressed in a DSL
@@ -143,17 +143,21 @@ test_files:
 - test/base_test.rb
 - test/builder_test.rb
 - test/erb_test.rb
+- test/extensions_test.rb
 - test/filter_test.rb
 - test/haml_test.rb
 - test/helpers_test.rb
 - test/mapped_error_test.rb
 - test/middleware_test.rb
 - test/options_test.rb
-- test/reload_test.rb
+- test/render_backtrace_test.rb
 - test/request_test.rb
+- test/response_test.rb
 - test/result_test.rb
+- test/route_added_hook_test.rb
 - test/routing_test.rb
 - test/sass_test.rb
+- test/server_test.rb
 - test/sinatra_test.rb
 - test/static_test.rb
 - test/templates_test.rb