sinatra 1.4.0.d → 1.4.0

data/test/slim_test.rb

@@ -78,7 +78,7 @@ class SlimTest < Test::Unit::TestCase
     assert_body '<x foo="bar"></x>'
   end
 
-  it "can rendere truly nested layouts by accepting a layout and a block with the contents" do
+  it "can render truly nested layouts by accepting a layout and a block with the contents" do
     mock_app do
       template(:main_outer_layout) { "h1 Title\n== yield" }
       template(:an_inner_layout) { "h2 Subtitle\n== yield" }

data/test/streaming_test.rb

@@ -3,7 +3,7 @@ require File.expand_path('../helper', __FILE__)
 class StreamingTest < Test::Unit::TestCase
   Stream = Sinatra::Helpers::Stream
 
-  it 'returns the concatinated body' do
+  it 'returns the concatenated body' do
     mock_app do
       get('/') do
         stream do |out|
@@ -41,18 +41,18 @@ class StreamingTest < Test::Unit::TestCase
   it 'calls the callback after it is done' do
     step   = 0
     final  = 0
-    stream = Stream.new { |o| 10.times { step += 1 }}
+    stream = Stream.new { |_| 10.times { step += 1 }}
     stream.callback { final = step }
-    stream.each { |str| }
+    stream.each {|_|}
     assert_equal 10, final
   end
 
   it 'does not trigger the callback if close is set to :keep_open' do
     step   = 0
     final  = 0
-    stream = Stream.new(Stream, :keep_open) { |o| 10.times { step += 1 } }
+    stream = Stream.new(Stream, :keep_open) { |_| 10.times { step += 1 } }
     stream.callback { final = step }
-    stream.each { |str| }
+    stream.each {|_|}
     assert_equal 0, final
   end
 
@@ -61,7 +61,7 @@ class StreamingTest < Test::Unit::TestCase
     stream = Stream.new { }
     stream.callback { a = true }
     stream.callback { b = true }
-    stream.each { |str| }
+    stream.each {|_| }
     assert a, 'should trigger first callback'
     assert b, 'should trigger second callback'
   end
@@ -110,7 +110,7 @@ class StreamingTest < Test::Unit::TestCase
 
   it 'does not trigger an infinite loop if you call close in a callback' do
     stream = Stream.new { |out| out.callback { out.close }}
-    stream.each { |str| }
+    stream.each { |_| }
   end
 
   it 'gives access to route specific params' do

data/test/templates_test.rb

@@ -223,16 +223,13 @@ class TemplatesTest < Test::Unit::TestCase
   end
 
   it 'sets layout-only options via layout_options' do
-    mock_app do
-      get '/' do
-        render(:str, :in_a,
-          :views          => settings.views + '/a',
-          :layout_options => { :views => settings.views },
-          :layout         => :layout2)
-      end
+    render_app do
+      render(:str, :in_a,
+        :views          => settings.views + '/a',
+        :layout_options => { :views => settings.views },
+        :layout         => :layout2)
     end
 
-    get '/'
     assert ok?
     assert_equal "<h1>String Layout!</h1>\nGimme an A!\n", body
   end
@@ -284,7 +281,7 @@ class TemplatesTest < Test::Unit::TestCase
     assert_equal 'template in subclass', body
   end
 
-  it "is possible to use a different engine for the layout than for the template itself explicitely" do
+  it "is possible to use a different engine for the layout than for the template itself explicitly" do
     render_app do
       settings.template(:layout) { 'Hello <%= yield %>!' }
       render :str, "<%= 'World' %>", :layout_engine => :erb

data/test/wlang_test.rb

@@ -63,7 +63,7 @@ class WLangTest < Test::Unit::TestCase
     assert_body "WLang Layout!\nHello World"
   end
 
-  it "can rendere truly nested layouts by accepting a layout and a block with the contents" do
+  it "can rendered truly nested layouts by accepting a layout and a block with the contents" do
     mock_app do
       template(:main_outer_layout) { "<h1>Title</h1>\n>{ yield }" }
       template(:an_inner_layout) { "<h2>Subtitle</h2>\n>{ yield }" }

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: sinatra
 version: !ruby/object:Gem::Version
-  version: 1.4.0.d
-  prerelease: 6
+  version: 1.4.0
+  prerelease: 
 platform: ruby
 authors:
 - Blake Mizerany
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-09 00:00:00.000000000 Z
+date: 2013-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -236,13 +236,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2481345757706038995
+      hash: -99514115148589374
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: -99514115148589374
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23