darkhelmet-sinatra 0.9.1.1 → 0.10.1

data/test/sass_test.rb

@@ -1,6 +1,7 @@
 require File.dirname(__FILE__) + '/helper'
+require 'sass'
 
-describe "Sass Templates" do
+class SassTest < Test::Unit::TestCase
   def sass_app(&block)
     mock_app {
       set :views, File.dirname(__FILE__) + '/views'
@@ -33,4 +34,46 @@ describe "Sass Templates" do
     }
     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

@@ -1,21 +1,25 @@
 require File.dirname(__FILE__) + '/helper'
 
-class Rack::Handler::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
+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
 
-  def stop
-  end
+  register 'mock', 'Rack::Handler::Mock'
 end
 
-describe 'Sinatra::Base.run!' do
-  before do
+class ServerTest < Test::Unit::TestCase
+  setup do
     mock_app {
       set :server, 'mock'
       set :host, 'foo.local'
@@ -24,7 +28,9 @@ describe 'Sinatra::Base.run!' do
     $stdout = File.open('/dev/null', 'wb')
   end
 
-  after { $stdout = STDOUT }
+  def teardown
+    $stdout = STDOUT
+  end
 
   it "locates the appropriate Rack handler and calls ::run" do
     @app.run!

data/test/sinatra_test.rb

@@ -1,6 +1,6 @@
 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

data/test/static_test.rb

@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + '/helper'
 
-describe 'Static' do
-  before do
+class StaticTest < Test::Unit::TestCase
+  setup do
     mock_app {
       set :static, true
       set :public, File.dirname(__FILE__)
@@ -34,6 +34,13 @@ describe 'Static' do
     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("/#{File.basename(__FILE__)}") { 'Hello World' }
     get "/#{File.basename(__FILE__)}"

data/test/templates_test.rb

@@ -1,12 +1,20 @@
 require File.dirname(__FILE__) + '/helper'
 
-describe 'Templating' do
-  def render_app(&block)
-    mock_app {
-      def render_test(template, data, options, &block)
-        inner = block ? block.call : ''
-        data + inner
-      end
+class TestTemplate < Tilt::Template
+  def compile!
+  end
+
+  def evaluate(scope, locals={}, &block)
+    inner = block ? block.call : ''
+    data + inner
+  end
+
+  Tilt.register 'test', self
+end
+
+class TemplatesTest < Test::Unit::TestCase
+  def render_app(base=Sinatra::Base, &block)
+    mock_app(base) {
       set :views, File.dirname(__FILE__) + '/views'
       get '/', &block
       template(:layout3) { "Layout 3!\n" }
@@ -68,15 +76,74 @@ describe 'Templating' do
     assert_equal "Layout 3!\nHello World!\n", body
   end
 
-  it 'loads templates from source file with use_in_file_templates!' do
+  it 'loads templates from source file with inline_templates enabled' do
     mock_app {
-      use_in_file_templates!
+      enable :inline_templates
     }
-    assert_equal "this is foo\n\n", @app.templates[:foo]
-    assert_equal "X\n= yield\nX\n", @app.templates[:layout]
+    assert_equal "this is foo\n\n", @app.templates[:foo][0]
+    assert_equal "X\n= yield\nX\n", @app.templates[:layout][0]
+  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 {
+        set :inline_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' }
+    assert_equal 'template in superclass', base.templates[:foo].first.call
+
+    mock_app(base) {
+      set :views, File.dirname(__FILE__) + '/views'
+      template(:foo) { 'template in subclass' }
+      get('/') { render :test, :foo }
+    }
+    assert_equal 'template in subclass', @app.templates[:foo].first.call
+
+    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.erubis

@@ -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

data/test/views/hello.erubis

@@ -0,0 +1 @@
+Hello <%= 'World' %>

data/test/views/layout2.erubis

@@ -0,0 +1,2 @@
+ERubis Layout!
+<%= yield %>

metadata

@@ -1,15 +1,17 @@
 --- !ruby/object:Gem::Specification 
 name: darkhelmet-sinatra
 version: !ruby/object:Gem::Version 
-  version: 0.9.1.1
+  version: 0.10.1
 platform: ruby
 authors: 
 - Blake Mizerany
+- Ryan Tomayko
+- Simon Rozet
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-03-09 00:00:00 -07:00
+date: 2009-12-13 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,21 +22,31 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.1
+        version: "1.0"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: rack
-  type: :runtime
+  name: shotgun
+  type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.1
+        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: sinatrarb@googlegroups.com
 executables: []
@@ -48,59 +60,22 @@ files:
 - AUTHORS
 - CHANGES
 - LICENSE
+- README.jp.rdoc
 - README.rdoc
 - Rakefile
-- compat/app_test.rb
-- compat/application_test.rb
-- compat/builder_test.rb
-- compat/compat_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/bacon.rb
-- lib/sinatra/test/rspec.rb
-- lib/sinatra/test/spec.rb
-- lib/sinatra/test/unit.rb
+- lib/sinatra/showexceptions.rb
+- lib/sinatra/tilt.rb
 - sinatra.gemspec
 - test/base_test.rb
 - test/builder_test.rb
-- test/data/reload_app_file.rb
+- test/contest.rb
 - test/erb_test.rb
+- test/erubis_test.rb
 - test/extensions_test.rb
 - test/filter_test.rb
 - test/haml_test.rb
@@ -108,29 +83,37 @@ files:
 - test/helpers_test.rb
 - test/mapped_error_test.rb
 - test/middleware_test.rb
-- test/options_test.rb
-- test/reload_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/test_test.rb
+- test/views/error.builder
+- test/views/error.erb
+- test/views/error.erubis
+- test/views/error.haml
+- test/views/error.sass
+- test/views/foo/hello.test
 - test/views/hello.builder
 - test/views/hello.erb
+- test/views/hello.erubis
 - test/views/hello.haml
 - test/views/hello.sass
 - test/views/hello.test
 - test/views/layout2.builder
 - test/views/layout2.erb
+- test/views/layout2.erubis
 - test/views/layout2.haml
 - test/views/layout2.test
 has_rdoc: true
 homepage: http://sinatra.rubyforge.org
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --line-numbers
@@ -156,7 +139,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
@@ -164,21 +147,20 @@ test_files:
 - test/base_test.rb
 - test/builder_test.rb
 - test/erb_test.rb
+- test/erubis_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/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/test_test.rb