sinatra 1.0.a → 1.0.b

data/sinatra.gemspec

@@ -3,8 +3,8 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
 
   s.name = 'sinatra'
-  s.version = '1.0.a'
-  s.date = '2010-01-28'
+  s.version = '1.0.b'
+  s.date = '2010-03-07'
 
   s.description = "Classy web-development dressed in a DSL"
   s.summary     = "Classy web-development dressed in a DSL"
@@ -38,6 +38,7 @@ Gem::Specification.new do |s|
     test/haml_test.rb
     test/helper.rb
     test/helpers_test.rb
+    test/less_test.rb
     test/mapped_error_test.rb
     test/middleware_test.rb
     test/public/favicon.ico
@@ -62,6 +63,7 @@ Gem::Specification.new do |s|
     test/views/hello.erb
     test/views/hello.erubis
     test/views/hello.haml
+    test/views/hello.less
     test/views/hello.sass
     test/views/hello.test
     test/views/layout2.builder
@@ -81,6 +83,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'haml'
   s.add_development_dependency 'builder'
   s.add_development_dependency 'erubis'
+  s.add_development_dependency 'less'
 
   s.has_rdoc = true
   s.homepage = "http://sinatra.rubyforge.org"

data/test/helpers_test.rb

@@ -451,6 +451,15 @@ class HelpersTest < Test::Unit::TestCase
       assert_equal 304, status
       assert_equal '', body
     end
+
+    it 'ignores nil' do
+      mock_app {
+        get '/' do last_modified nil; 200; end
+      }
+
+      get '/'
+      assert ! response['Last-Modified']
+    end
   end
 
   describe 'etag' do

data/test/less_test.rb

@@ -0,0 +1,37 @@
+require File.dirname(__FILE__) + '/helper'
+require 'less'
+
+class LessTest < Test::Unit::TestCase
+  def less_app(&block)
+    mock_app {
+      set :views, File.dirname(__FILE__) + '/views'
+      get '/', &block
+    }
+    get '/'
+  end
+
+  it 'renders inline Less strings' do
+    less_app { less "@white_color: #fff; #main { background-color: @white_color }"}
+    assert ok?
+    assert_equal "#main { background-color: #ffffff; }\n", body
+  end
+
+  it 'renders .less files in views path' do
+    less_app { less :hello }
+    assert ok?
+    assert_equal "#main { background-color: #ffffff; }\n", body
+  end
+
+  it 'ignores the layout option' do
+    less_app { less :hello, :layout => :layout2 }
+    assert ok?
+    assert_equal "#main { background-color: #ffffff; }\n", body
+  end
+
+  it "raises error if template not found" do
+    mock_app {
+      get('/') { less :no_such_template }
+    }
+    assert_raise(Errno::ENOENT) { get('/') }
+  end
+end

data/test/mapped_error_test.rb

@@ -55,10 +55,9 @@ class MappedErrorTest < Test::Unit::TestCase
       assert_equal 'looks good', body
     end
 
-    it "raises without calling the handler when the raise_errors options is set" do
+    it "raises errors from the app when raise_errors set and no handler defined" do
       mock_app {
         set :raise_errors, true
-        error(FooError) { "she's not there." }
         get '/' do
           raise FooError
         end
@@ -66,6 +65,18 @@ class MappedErrorTest < Test::Unit::TestCase
       assert_raise(FooError) { get '/' }
     end
 
+    it "calls error handlers before raising errors even when raise_errors is set" do
+      mock_app {
+        set :raise_errors, true
+        error(FooError) { "she's there." }
+        get '/' do
+          raise FooError
+        end
+      }
+      assert_nothing_raised { get '/' }
+      assert_equal 500, status
+    end
+
     it "never raises Sinatra::NotFound beyond the application" do
       mock_app {
         set :raise_errors, true

data/test/server_test.rb

@@ -22,7 +22,7 @@ class ServerTest < Test::Unit::TestCase
   setup do
     mock_app {
       set :server, 'mock'
-      set :host, 'foo.local'
+      set :bind, 'foo.local'
       set :port, 9001
     }
     $stdout = File.open('/dev/null', 'wb')

data/test/settings_test.rb

@@ -21,6 +21,19 @@ class SettingsTest < Test::Unit::TestCase
     assert_equal 'baz', @base.foo
   end
 
+  it 'sets settings using a block' do
+    @base.set(:foo){ 'baz' }
+    assert @base.respond_to?(:foo)
+    assert_equal 'baz', @base.foo
+  end
+
+  it 'raises an error with a value and a block' do
+    assert_raise ArgumentError do
+      @base.set(:fiz, 'boom!'){ 'baz' }
+    end
+    assert !@base.respond_to?(:fiz)
+  end
+
   it "sets multiple settings with a Hash" do
     @base.set :foo => 1234,
         :bar => 'Hello World',
@@ -93,28 +106,33 @@ class SettingsTest < Test::Unit::TestCase
     assert !@base.bar
   end
 
-
   it 'is accessible from instances via #settings' do
     assert_equal :foo, @base.new.settings.environment
   end
 
   describe 'methodoverride' do
     it 'is disabled on Base' do
-      assert ! @base.methodoverride?
+      assert ! @base.method_override?
     end
 
     it 'is enabled on Application' do
-      assert @application.methodoverride?
+      assert @application.method_override?
     end
 
     it 'enables MethodOverride middleware' do
-      @base.set :methodoverride, true
+      @base.set :method_override, true
       @base.put('/') { 'okay' }
       @app = @base
       post '/', {'_method'=>'PUT'}, {}
       assert_equal 200, status
       assert_equal 'okay', body
     end
+
+    it 'is backward compatible with methodoverride' do
+      assert ! @base.methodoverride?
+      @base.enable :methodoverride
+      assert @base.methodoverride?
+    end
   end
 
   describe 'clean_trace' do
@@ -177,10 +195,11 @@ class SettingsTest < Test::Unit::TestCase
   end
 
   describe 'raise_errors' do
-    it 'is enabled on Base except under development' do
+    it 'is enabled on Base only in test' do
+      assert ! @base.raise_errors?
+
+      @base.set(:environment, :test)
       assert @base.raise_errors?
-      @base.environment = :development
-      assert !@base.raise_errors?
     end
 
     it 'is enabled on Application only in test' do
@@ -223,20 +242,20 @@ class SettingsTest < Test::Unit::TestCase
   end
 
   describe 'dump_errors' do
-    it 'is disabled on Base except in development' do
+    it 'is disabled on Base in test' do
+      @base.environment = :test
       assert ! @base.dump_errors?
       @base.environment = :development
       assert @base.dump_errors?
-    end
-
-    it 'is enabled on Application' do
-      assert @application.dump_errors?
+      @base.environment = :production
+      assert @base.dump_errors?
     end
 
     it 'dumps exception with backtrace to rack.errors' do
       klass = Sinatra.new(Sinatra::Application)
 
       mock_app(klass) {
+        enable :dump_errors
         disable :raise_errors
 
         error do
@@ -296,15 +315,27 @@ class SettingsTest < Test::Unit::TestCase
       assert @base.static?
     end
 
-    it 'is enabled on Application' do
+    it 'is disabled on Application by default' do
+      assert ! @application.static?
+    end
+
+    it 'is enabled on Application when public is set and exists' do
+      @application.set :environment, :development
+      @application.set :public, File.dirname(__FILE__)
+      assert @application.static?
+    end
+
+    it 'is enabled on Application when root is set and root/public exists' do
+      @application.set :environment, :development
+      @application.set :root, File.dirname(__FILE__)
       assert @application.static?
     end
   end
 
-  describe 'host' do
+  describe 'bind' do
     it 'defaults to 0.0.0.0' do
-      assert_equal '0.0.0.0', @base.host
-      assert_equal '0.0.0.0', @application.host
+      assert_equal '0.0.0.0', @base.bind
+      assert_equal '0.0.0.0', @application.bind
     end
   end
 

data/test/templates_test.rb

@@ -1,8 +1,9 @@
 require File.dirname(__FILE__) + '/helper'
 
 class TestTemplate < Tilt::Template
-  def compile!
+  def prepare
   end
+  alias compile! prepare # for tilt < 0.7
 
   def evaluate(scope, locals={}, &block)
     inner = block ? block.call : ''
@@ -76,21 +77,18 @@ class TemplatesTest < Test::Unit::TestCase
     assert_equal "Layout 3!\nHello World!\n", body
   end
 
-  it 'loads templates from source file with inline_templates enabled' do
-    mock_app {
-      enable :inline_templates
-    }
+  it 'loads templates from source file' do
+    mock_app { enable :inline_templates }
     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
+  it 'loads templates from given source file' do
+    mock_app { set :inline_templates, __FILE__ }
+    assert_equal "this is foo\n\n", @app.templates[:foo][0]
   end
 
-  test 'use_in_file_templates simply ignores IO errors' do
+  test 'inline_templates ignores IO errors' do
     assert_nothing_raised {
       mock_app {
         set :inline_templates, '/foo/bar'
@@ -100,6 +98,12 @@ class TemplatesTest < Test::Unit::TestCase
     assert @app.templates.empty?
   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
+
   it 'passes locals to the layout' do
     mock_app {
       template :my_layout do

data/test/views/hello.less

@@ -0,0 +1,5 @@
+@white_colour: #fff;
+
+#main {
+	background-color: @white_colour;
+}

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra
 version: !ruby/object:Gem::Version 
-  version: 1.0.a
+  prerelease: true
+  segments: 
+  - 1
+  - 0
+  - b
+  version: 1.0.b
 platform: ruby
 authors: 
 - Blake Mizerany
@@ -11,72 +16,103 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-28 00:00:00 -08:00
+date: 2010-03-07 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
         version: "1.0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: shotgun
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 6
         version: "0.6"
     - - <
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
         version: "1.0"
-    version: 
+  type: :development
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rack-test
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 3
+        - 0
         version: 0.3.0
-    version: 
+  type: :development
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: haml
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: builder
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: erubis
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: less
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id007
 description: Classy web-development dressed in a DSL
 email: sinatrarb@googlegroups.com
 executables: []
@@ -111,6 +147,7 @@ files:
 - test/haml_test.rb
 - test/helper.rb
 - test/helpers_test.rb
+- test/less_test.rb
 - test/mapped_error_test.rb
 - test/middleware_test.rb
 - test/public/favicon.ico
@@ -135,6 +172,7 @@ files:
 - test/views/hello.erb
 - test/views/hello.erubis
 - test/views/hello.haml
+- test/views/hello.less
 - test/views/hello.sass
 - test/views/hello.test
 - test/views/layout2.builder
@@ -160,18 +198,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
+      segments: 
+      - 1
+      - 3
+      - 1
       version: 1.3.1
-  version: 
 requirements: []
 
 rubyforge_project: sinatra
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 2
 summary: Classy web-development dressed in a DSL
@@ -184,6 +226,7 @@ test_files:
 - test/filter_test.rb
 - test/haml_test.rb
 - test/helpers_test.rb
+- test/less_test.rb
 - test/mapped_error_test.rb
 - test/middleware_test.rb
 - test/request_test.rb