sinatra 1.1.0 → 1.1.2

data/test/nokogiri_test.rb

@@ -15,7 +15,7 @@ class NokogiriTest < Test::Unit::TestCase
   it 'renders inline Nokogiri strings' do
     nokogiri_app { nokogiri 'xml' }
     assert ok?
-    assert_equal %{<?xml version="1.0"?>\n}, body
+    assert_body %{<?xml version="1.0"?>\n}
   end
 
   it 'renders inline blocks' do
@@ -26,7 +26,7 @@ class NokogiriTest < Test::Unit::TestCase
       end
     end
     assert ok?
-    assert_equal "<?xml version=\"1.0\"?>\n<couple>Frank &amp; Mary</couple>\n", body
+    assert_body "<?xml version=\"1.0\"?>\n<couple>Frank &amp; Mary</couple>\n"
   end
 
   it 'renders .nokogiri files in views path' do
@@ -35,7 +35,7 @@ class NokogiriTest < Test::Unit::TestCase
       nokogiri :hello
     end
     assert ok?
-    assert_equal %(<?xml version="1.0"?>\n<exclaim>You're my boy, Blue!</exclaim>\n), body
+    assert_body %(<?xml version="1.0"?>\n<exclaim>You're my boy, Blue!</exclaim>\n)
   end
 
   it "renders with inline layouts" do
@@ -46,7 +46,7 @@ class NokogiriTest < Test::Unit::TestCase
     end
     get '/'
     assert ok?
-    assert_equal "<?xml version=\"1.0\"?>\n<layout>\n  <em>Hello World</em>\n</layout>\n", body
+    assert_body "<?xml version=\"1.0\"?>\n<layout>\n  <em>Hello World</em>\n</layout>\n"
   end
 
   it "renders with file layouts" do
@@ -56,7 +56,7 @@ class NokogiriTest < Test::Unit::TestCase
       nokogiri %(xml.em 'Hello World'), :layout => :layout2
     end
     assert ok?
-    assert_equal "<?xml version=\"1.0\"?>\n<layout>\n  <em>Hello World</em>\n</layout>\n", body
+    assert_body "<?xml version=\"1.0\"?>\n<layout>\n  <em>Hello World</em>\n</layout>\n"
   end
 
   it "raises error if template not found" do

data/test/rdoc_test.rb

@@ -15,13 +15,13 @@ class RdocTest < Test::Unit::TestCase
   it 'renders inline rdoc strings' do
     rdoc_app { rdoc '= Hiya' }
     assert ok?
-    assert_equal "<h1>Hiya</h1>\n", body
+    assert_body "<h1>Hiya</h1>"
   end
 
   it 'renders .rdoc files in views path' do
     rdoc_app { rdoc :hello }
     assert ok?
-    assert_equal "<h1>Hello From RDoc</h1>\n", body
+    assert_body "<h1>Hello From RDoc</h1>"
   end
 
   it "raises error if template not found" do

data/test/routing_test.rb

@@ -1,3 +1,4 @@
+# I like coding: UTF-8
 require File.dirname(__FILE__) + '/helper'
 
 # Helper method for easy route pattern matching testing
@@ -69,6 +70,14 @@ class RoutingTest < Test::Unit::TestCase
     assert_equal 'pass', response.headers['X-Cascade']
   end
 
+  it "allows using unicode" do
+    mock_app do
+      get('/föö') { }
+    end
+    get '/f%C3%B6%C3%B6'
+    assert_equal 200, status
+  end
+
   it "overrides the content-type in error handlers" do
     mock_app {
       before { content_type 'text/plain' }

data/test/templates_test.rb

@@ -1,10 +1,10 @@
+# encoding: UTF-8
 require File.dirname(__FILE__) + '/helper'
 File.delete(File.dirname(__FILE__) + '/views/layout.test') rescue nil
 
 class TestTemplate < Tilt::Template
   def prepare
   end
-  alias compile! prepare # for tilt < 0.7
 
   def evaluate(scope, locals={}, &block)
     inner = block ? block.call : ''
@@ -101,6 +101,15 @@ class TemplatesTest < Test::Unit::TestCase
     assert_equal "<h1>String Layout!</h1>\n<content><h1>Hello From String</h1></content>", body
   end
 
+  it 'is possible to use partials in layouts' do
+    render_app do
+      settings.layout { "<%= erb 'foo' %><%= yield %>" }
+      erb 'bar'
+    end
+    assert ok?
+    assert_equal "foobar", body
+  end
+
   it 'loads templates from source file' do
     mock_app { enable :inline_templates }
     assert_equal "this is foo\n\n", @app.templates[:foo][0]
@@ -128,6 +137,12 @@ class TemplatesTest < Test::Unit::TestCase
     assert @app.templates.empty?
   end
 
+  it 'allows unicode in inline templates' do
+    mock_app { set :inline_templates, __FILE__ }
+    assert_equal "Den som tror at hemma det är där man bor har aldrig vart hos mig.\n\n",
+      @app.templates[:umlaut][0]
+  end
+
   it 'loads templates from specified views directory' do
     render_app { render :test, :hello, :views => options.views + '/foo' }
 
@@ -207,6 +222,9 @@ There's a space after 'bar'!
 @@ foo bar
 this is not foo
 
+@@ umlaut
+Den som tror at hemma det är där man bor har aldrig vart hos mig.
+
 @@ layout
 X
 = yield

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 23
   prerelease: false
   segments: 
   - 1
   - 1
-  - 0
-  version: 1.1.0
+  - 2
+  version: 1.1.2
 platform: ruby
 authors: 
 - Blake Mizerany
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-24 00:00:00 +02:00
+date: 2010-12-25 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -44,11 +44,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 11
         segments: 
         - 1
-        - 1
-        version: "1.1"
+        - 2
+        version: "1.2"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -233,8 +233,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         hash: 3
         segments: 
+        - 2
         - 0
-        version: "0"
+        version: "2.0"
   type: :development
   version_requirements: *id015
 - !ruby/object:Gem::Dependency 
@@ -289,7 +290,9 @@ files:
 - README.fr.rdoc
 - README.hu.rdoc
 - README.jp.rdoc
+- README.pt-br.rdoc
 - README.rdoc
+- README.ru.rdoc
 - README.zh.rdoc
 - Rakefile
 - lib/sinatra.rb