sinatra 1.1.4 → 1.2.0

data/test/templates_test.rb

@@ -208,11 +208,64 @@ 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
+    render_app do
+      settings.template(:layout) { 'Hello <%= yield %>!' }
+      render :str, "<%= 'World' %>", :layout_engine => :erb
+    end
+    assert_equal "Hello <%= 'World' %>!", body
+  end
+
+  it "is possible to use a different engine for the layout than for the template itself globally" do
+    render_app :str => { :layout_engine => :erb } do
+      settings.template(:layout) { 'Hello <%= yield %>!' }
+      render :str, "<%= 'World' %>"
+    end
+    assert_equal "Hello <%= 'World' %>!", body
+  end
+
   it "is possible to register another template" do
     Tilt.register "html.erb", Tilt[:erb]
     render_app { render :erb, :calc }
     assert_equal '2', body
   end
+
+  it "passes scope to the template" do
+    mock_app do
+      template :scoped do
+        'Hello <%= foo %>'
+      end
+
+      get '/' do
+        some_scope = Object.new
+        def some_scope.foo() 'World!' end
+        erb :scoped, :scope => some_scope
+      end
+    end
+
+    get '/'
+    assert ok?
+    assert_equal 'Hello World!', body
+  end
+
+  it "is possible to use custom logic for finding template files" do
+    mock_app do
+      set :views, ["a", "b"].map { |d| File.dirname(__FILE__) + '/views/' + d }
+      def find_template(views, name, engine, &block)
+        Array(views).each { |v| super(v, name, engine, &block) }
+      end
+
+      get('/:name') do
+        render :str, params[:name].to_sym
+      end
+    end
+
+    get '/in_a'
+    assert_body 'Gimme an A!'
+
+    get '/in_b'
+    assert_body 'Gimme a B!'
+  end
 end
 
 # __END__ : this is not the real end of the script.

data/test/textile_test.rb

@@ -29,6 +29,7 @@ class TextileTest < Test::Unit::TestCase
     assert_raise(Errno::ENOENT) { get('/') }
   end
 end
-rescue
+
+rescue LoadError
   warn "#{$!.to_s}: skipping textile tests"
 end

data/test/views/a/in_a.str

@@ -0,0 +1 @@
+Gimme an A!

data/test/views/{ascii.haml → ascii.erb}

@@ -1,2 +1,2 @@
 This file has no unicode in it!
-= value
+<%= value %>

data/test/views/b/in_b.str

@@ -0,0 +1 @@
+Gimme a B!

data/test/views/hello.slim

@@ -0,0 +1 @@
+h1 Hello From Slim

data/test/views/layout2.slim

@@ -0,0 +1,3 @@
+h1 Slim Layout!
+p
+  == yield

data/test/views/{utf8.haml → utf8.erb}

@@ -1,2 +1,2 @@
-%h1= value
+<h1><%= value %></h1>
 Ingen vill veta var du köpt din tröja.

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra
 version: !ruby/object:Gem::Version 
+  hash: 31
   prerelease: 
-  version: 1.1.4
+  segments: 
+  - 1
+  - 2
+  - 0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Blake Mizerany
@@ -13,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-13 00:00:00 +02:00
+date: 2011-03-03 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,6 +29,10 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 1
+        - 1
         version: "1.1"
   type: :runtime
   version_requirements: *id001
@@ -35,177 +44,36 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 1
+        - 2
+        - 2
         version: 1.2.2
     - - <
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 0
         version: "2.0"
   type: :runtime
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rake
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
-  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: shotgun
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 0
+        - 6
         version: "0.6"
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rack-test
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.5.6
-  type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: haml
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "3.0"
-  type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: builder
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: erubis
-  prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: less
-  prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: liquid
-  prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: rdiscount
-  prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: RedCloth
-  prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
-  version_requirements: *id012
-- !ruby/object:Gem::Dependency 
-  name: radius
-  prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
-  version_requirements: *id013
-- !ruby/object:Gem::Dependency 
-  name: markaby
-  prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
-  version_requirements: *id014
-- !ruby/object:Gem::Dependency 
-  name: coffee-script
-  prerelease: false
-  requirement: &id015 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "2.0"
-  type: :development
-  version_requirements: *id015
-- !ruby/object:Gem::Dependency 
-  name: rdoc
-  prerelease: false
-  requirement: &id016 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
-  version_requirements: *id016
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
-  prerelease: false
-  requirement: &id017 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
-  version_requirements: *id017
+  version_requirements: *id003
 description: Classy web-development dressed in a DSL
 email: sinatrarb@googlegroups.com
 executables: []
@@ -224,6 +92,7 @@ extra_rdoc_files:
 files: 
 - AUTHORS
 - CHANGES
+- Gemfile
 - LICENSE
 - README.de.rdoc
 - README.es.rdoc
@@ -275,10 +144,13 @@ files:
 - test/server_test.rb
 - test/settings_test.rb
 - test/sinatra_test.rb
+- test/slim_test.rb
 - test/static_test.rb
 - test/templates_test.rb
 - test/textile_test.rb
-- test/views/ascii.haml
+- test/views/a/in_a.str
+- test/views/ascii.erb
+- test/views/b/in_b.str
 - test/views/calc.html.erb
 - test/views/error.builder
 - test/views/error.erb
@@ -301,6 +173,7 @@ files:
 - test/views/hello.rdoc
 - test/views/hello.sass
 - test/views/hello.scss
+- test/views/hello.slim
 - test/views/hello.str
 - test/views/hello.test
 - test/views/hello.textile
@@ -312,10 +185,11 @@ files:
 - test/views/layout2.mab
 - test/views/layout2.nokogiri
 - test/views/layout2.radius
+- test/views/layout2.slim
 - test/views/layout2.str
 - test/views/layout2.test
 - test/views/nested.str
-- test/views/utf8.haml
+- test/views/utf8.erb
 has_rdoc: true
 homepage: http://sinatra.rubyforge.org
 licenses: []
@@ -335,17 +209,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: sinatra
-rubygems_version: 1.6.2
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 2
 summary: Classy web-development dressed in a DSL
@@ -379,6 +259,7 @@ test_files:
 - test/server_test.rb
 - test/settings_test.rb
 - test/sinatra_test.rb
+- test/slim_test.rb
 - test/static_test.rb
 - test/templates_test.rb
 - test/textile_test.rb