sinatra 1.2.7 → 1.2.8

data/CHANGES

@@ -1,4 +1,11 @@
-= 1.2.7 (backports release) / Not Yet Released
+= 1.2.8 (backports release) / 2011-12-30
+
+Backported from 1.3.2:
+
+* Fix bug where rendering a second template in the same request after the
+  first one raised an exception skipped the default layout (Nathan Baum)
+
+= 1.2.7 (backports release) / 2011-09-30
 
 Custom changes:
 

data/Gemfile

@@ -40,7 +40,7 @@ if RUBY_VERSION > '1.8.6'
     gem 'nokogiri'
   end
   gem 'coffee-script', '>= 2.0', :group => 'coffee-script'
-  gem 'rdoc', :group => 'rdoc'
+  gem 'rdoc', '< 3.10', :group => 'rdoc'
 end
 
 platforms :ruby do

data/Rakefile

@@ -185,6 +185,10 @@ if defined?(Gem)
   end
 
   task 'release' => ['test', package('.gem')] do
+    if File.read("CHANGES") =~ /= \d\.\d\.\d . not yet released$/i
+      fail 'please update changes first'
+    end
+
     sh <<-SH
       gem install #{package('.gem')} --local &&
       gem push #{package('.gem')}  &&

data/lib/sinatra/base.rb

@@ -7,7 +7,7 @@ require 'sinatra/showexceptions'
 require 'tilt'
 
 module Sinatra
-  VERSION = '1.2.7'
+  VERSION = '1.2.8'
 
   # The request object. See Rack::Request for more info:
   # http://rack.rubyforge.org/doc/classes/Rack/Request.html
@@ -568,11 +568,14 @@ module Sinatra
       scope           = options.delete(:scope)         || self
 
       # compile and render template
-      layout_was      = @default_layout
-      @default_layout = false
-      template        = compile_template(engine, data, options, views)
-      output          = template.render(scope, locals, &block)
-      @default_layout = layout_was
+      begin
+        layout_was      = @default_layout
+        @default_layout = false
+        template        = compile_template(engine, data, options, views)
+        output          = template.render(scope, locals, &block)
+      ensure
+        @default_layout = layout_was
+      end
 
       # render layout
       if layout

data/sinatra.gemspec

@@ -3,7 +3,7 @@ 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.2.7'
+  s.version = '1.2.8'
 
   s.description = "Classy web-development dressed in a DSL"
   s.summary     = "Classy web-development dressed in a DSL"

data/test/coffee_test.rb

@@ -71,7 +71,7 @@ class CoffeeTest < Test::Unit::TestCase
   it "passes coffee options to the coffee engine" do
     coffee_app { coffee "alert 'Aye!'\n", :no_wrap => true }
     assert ok?
-    assert_equal "alert('Aye!');", body
+    assert_equal "alert('Aye!');", body.gsub(/\s/, '')
   end
 
   it "passes default coffee options to the coffee engine" do
@@ -83,7 +83,7 @@ class CoffeeTest < Test::Unit::TestCase
     end
     get '/'
     assert ok?
-    assert_equal "alert('Aye!');", body
+    assert_equal "alert('Aye!');", body.gsub(/\s/, '')
   end
 end
 

data/test/static_test.rb

@@ -36,7 +36,6 @@ class StaticTest < Test::Unit::TestCase
     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
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra
 version: !ruby/object:Gem::Version
-  version: 1.2.7
+  version: 1.2.8
   prerelease: 
 platform: ruby
 authors:
@@ -12,11 +12,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-01 00:00:00.000000000Z
+date: 2011-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &2157377220 !ruby/object:Gem::Requirement
+  requirement: &2152939680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -24,10 +24,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *2157377220
+  version_requirements: *2152939680
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &2157376740 !ruby/object:Gem::Requirement
+  requirement: &2152938920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -38,10 +38,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157376740
+  version_requirements: *2152938920
 - !ruby/object:Gem::Dependency
   name: shotgun
-  requirement: &2157376020 !ruby/object:Gem::Requirement
+  requirement: &2152937800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -49,7 +49,7 @@ dependencies:
         version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: *2157376020
+  version_requirements: *2152937800
 description: Classy web-development dressed in a DSL
 email: sinatrarb@googlegroups.com
 executables: []
@@ -187,7 +187,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 134946586241568196
+      hash: -1174004778160710546
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: