sinatra-base 1.0 → 1.4.0

data/test/textile_test.rb

@@ -0,0 +1,65 @@
+require File.expand_path('../helper', __FILE__)
+
+begin
+require 'redcloth'
+
+class TextileTest < Test::Unit::TestCase
+  def textile_app(&block)
+    mock_app do
+      set :views, File.dirname(__FILE__) + '/views'
+      get '/', &block
+    end
+    get '/'
+  end
+
+  it 'renders inline textile strings' do
+    textile_app { textile 'h1. Hiya' }
+    assert ok?
+    assert_equal "<h1>Hiya</h1>", body
+  end
+
+  it 'renders .textile files in views path' do
+    textile_app { textile :hello }
+    assert ok?
+    assert_equal "<h1>Hello From Textile</h1>", body
+  end
+
+  it "raises error if template not found" do
+    mock_app { get('/') { textile :no_such_template } }
+    assert_raise(Errno::ENOENT) { get('/') }
+  end
+
+  it "renders with inline layouts" do
+    mock_app do
+      layout { 'THIS. IS. #{yield.upcase}!' }
+      get('/') { textile 'Sparta', :layout_engine => :str }
+    end
+    get '/'
+    assert ok?
+    assert_like 'THIS. IS. <P>SPARTA</P>!', body
+  end
+
+  it "renders with file layouts" do
+    textile_app { textile 'Hello World', :layout => :layout2, :layout_engine => :erb }
+    assert ok?
+    assert_body "ERB Layout!\n<p>Hello World</p>"
+  end
+
+  it "can be used in a nested fashion for partials and whatnot" do
+    mock_app do
+      template(:inner) { "hi" }
+      template(:outer) { "<outer><%= textile :inner %></outer>" }
+      get '/' do
+        erb :outer
+      end
+    end
+
+    get '/'
+    assert ok?
+    assert_like '<outer><p>hi</p></outer>', body
+  end
+end
+
+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.erb

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

data/test/views/b/in_b.str

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

data/test/views/calc.html.erb

@@ -0,0 +1 @@
+<%= 1 + 1 %>

data/test/views/explicitly_nested.str

@@ -0,0 +1 @@
+<content>#{render :str, :hello, :layout => :layout2}</content>

data/test/views/hello.coffee

@@ -0,0 +1 @@
+alert "Aye!"

data/test/views/hello.creole

@@ -0,0 +1 @@
+= Hello From Creole

data/test/views/hello.liquid

@@ -0,0 +1 @@
+<h1>Hello From Liquid</h1>

data/test/views/hello.mab

@@ -0,0 +1 @@
+h1 "Hello From Markaby"

data/test/views/hello.md

@@ -0,0 +1 @@
+# Hello From Markdown

data/test/views/hello.nokogiri

@@ -0,0 +1 @@
+xml.exclaim "You're my boy, #{@name}!"

data/test/views/hello.radius

@@ -0,0 +1 @@
+<h1>Hello From Radius</h1>

data/test/views/hello.rdoc

@@ -0,0 +1 @@
+= Hello From RDoc

data/test/views/hello.sass

@@ -1,2 +1,2 @@
 #sass
-  :background-color #FFF
+  :background-color white

data/test/views/hello.scss

@@ -0,0 +1,3 @@
+#scss {
+  background-color: white
+}

data/test/views/hello.slim

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

data/test/views/hello.str

@@ -0,0 +1 @@
+<h1>Hello From String</h1>

data/test/views/hello.textile

@@ -0,0 +1 @@
+h1. Hello From Textile

data/test/views/hello.yajl

@@ -0,0 +1 @@
+json = { :yajl => "hello" }

data/test/views/layout2.liquid

@@ -0,0 +1,2 @@
+<h1>Liquid Layout!</h1>
+<p>{{ yield }}</p>

data/test/views/layout2.mab

@@ -0,0 +1,2 @@
+h1 "Markaby Layout!"
+p { yield }

data/test/views/layout2.nokogiri

@@ -0,0 +1,3 @@
+xml.layout do
+  xml << yield
+end

data/test/views/layout2.radius

@@ -0,0 +1,2 @@
+<h1>Radius Layout!</h1>
+<p><r:yield /></p>

data/test/views/layout2.slim

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

data/test/views/layout2.str

@@ -0,0 +1,2 @@
+<h1>String Layout!</h1>
+#{yield}

data/test/views/nested.str

@@ -0,0 +1 @@
+<content>#{render :str, :hello}</content>

data/test/views/utf8.erb

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

data/test/yajl_test.rb

@@ -0,0 +1,80 @@
+require File.expand_path('../helper', __FILE__)
+
+begin
+require 'yajl'
+
+class YajlTest < Test::Unit::TestCase
+  def yajl_app(&block)
+    mock_app {
+      set :views, File.dirname(__FILE__) + '/views'
+      get '/', &block
+    }
+    get '/'
+  end
+
+  it 'renders inline Yajl strings' do
+    yajl_app { yajl 'json = { :foo => "bar" }' }
+    assert ok?
+    assert_body '{"foo":"bar"}'
+  end
+
+  it 'renders .yajl files in views path' do
+    yajl_app { yajl :hello }
+    assert ok?
+    assert_body '{"yajl":"hello"}'
+  end
+
+  it 'raises error if template not found' do
+    mock_app {
+      get('/') { yajl :no_such_template }
+    }
+    assert_raise(Errno::ENOENT) { get('/') }
+  end
+
+  it 'accepts a :locals option' do
+    yajl_app {
+      locals = { :object => { :foo => 'bar' } }
+      yajl 'json = object', :locals => locals
+    }
+    assert ok?
+    assert_body '{"foo":"bar"}'
+  end
+
+  it 'accepts a :scope option' do
+    yajl_app {
+      scope = { :object => { :foo => 'bar' } }
+      yajl 'json = self[:object]', :scope => scope
+    }
+    assert ok?
+    assert_body '{"foo":"bar"}'
+  end
+
+  it 'decorates the json with a callback' do
+    yajl_app {
+      yajl 'json = { :foo => "bar" }', { :callback => 'baz' }
+    }
+    assert ok?
+    assert_body 'baz({"foo":"bar"});'
+  end
+
+  it 'decorates the json with a variable' do
+    yajl_app {
+      yajl 'json = { :foo => "bar" }', { :variable => 'qux' }
+    }
+    assert ok?
+    assert_body 'var qux = {"foo":"bar"};'
+  end
+
+  it 'decorates the json with a callback and a variable' do
+    yajl_app {
+      yajl 'json = { :foo => "bar" }',
+        { :callback => 'baz', :variable => 'qux' }
+    }
+    assert ok?
+    assert_body 'var qux = {"foo":"bar"}; baz(qux);'
+  end
+end
+
+rescue LoadError
+  warn "#{$!.to_s}: skipping yajl tests"
+end

metadata

@@ -1,22 +1,24 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra-base
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 7
   prerelease: 
   segments: 
   - 1
+  - 4
   - 0
-  version: "1.0"
+  version: 1.4.0
 platform: ruby
 authors: 
 - Blake Mizerany
 - Ryan Tomayko
 - Simon Rozet
+- Konstantin Haase
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-03-23 00:00:00 Z
+date: 2012-03-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
@@ -24,177 +26,193 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 1
+        - 3
+        version: "1.3"
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 23
         segments: 
         - 1
-        - 0
-        version: "1.0"
+        - 3
+        - 6
+        version: 1.3.6
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: shotgun
+  name: rack-protection
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 6
-        version: "0.6"
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 11
         segments: 
         - 1
-        - 0
-        version: "1.0"
-  type: :development
+        - 2
+        version: "1.2"
+  type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rack-test
+  name: tilt
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 9
         segments: 
-        - 0
+        - 1
         - 3
-        - 0
-        version: 0.3.0
-  type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: haml
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+        version: "1.3"
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 29
         segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: builder
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: erubis
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: less
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id007
-description: Classy web-development dressed in a DSL
+        - 1
+        - 3
+        - 3
+        version: 1.3.3
+  type: :runtime
+  version_requirements: *id003
+description: Sinatra is a DSL for quickly creating web applications in Ruby with minimal effort.
 email: sinatrarb@googlegroups.com
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
+- README.de.rdoc
+- README.es.rdoc
+- README.fr.rdoc
+- README.hu.rdoc
+- README.jp.rdoc
+- README.pt-br.rdoc
+- README.pt-pt.rdoc
 - README.rdoc
+- README.ru.rdoc
+- README.zh.rdoc
 - LICENSE
 files: 
+- .yardopts
 - AUTHORS
 - CHANGES
+- Gemfile
 - LICENSE
+- README.de.rdoc
+- README.es.rdoc
+- README.fr.rdoc
+- README.hu.rdoc
 - README.jp.rdoc
+- README.pt-br.rdoc
+- README.pt-pt.rdoc
 - README.rdoc
+- README.ru.rdoc
+- README.zh.rdoc
 - Rakefile
+- examples/chat.rb
+- examples/simple.rb
+- examples/stream.ru
 - lib/sinatra.rb
 - lib/sinatra/base.rb
 - lib/sinatra/images/404.png
 - lib/sinatra/images/500.png
 - lib/sinatra/main.rb
 - lib/sinatra/showexceptions.rb
-- lib/sinatra/tilt.rb
+- lib/sinatra/version.rb
 - sinatra-base.gemspec
 - test/base_test.rb
 - test/builder_test.rb
+- test/coffee_test.rb
 - test/contest.rb
+- test/creole_test.rb
+- test/delegator_test.rb
+- test/encoding_test.rb
 - test/erb_test.rb
-- test/erubis_test.rb
 - test/extensions_test.rb
 - test/filter_test.rb
 - test/haml_test.rb
 - test/helper.rb
 - test/helpers_test.rb
+- test/integration/app.rb
+- test/integration_helper.rb
+- test/integration_test.rb
 - test/less_test.rb
+- test/liquid_test.rb
 - test/mapped_error_test.rb
+- test/markaby_test.rb
+- test/markdown_test.rb
 - test/middleware_test.rb
+- test/nokogiri_test.rb
 - test/public/favicon.ico
+- test/rack_test.rb
+- test/radius_test.rb
+- test/rdoc_test.rb
+- test/readme_test.rb
 - test/request_test.rb
 - test/response_test.rb
 - test/result_test.rb
 - test/route_added_hook_test.rb
 - test/routing_test.rb
 - test/sass_test.rb
+- test/scss_test.rb
 - test/server_test.rb
 - test/settings_test.rb
 - test/sinatra_test.rb
+- test/slim_test.rb
 - test/static_test.rb
+- test/streaming_test.rb
 - test/templates_test.rb
+- test/textile_test.rb
+- 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
-- test/views/error.erubis
 - test/views/error.haml
 - test/views/error.sass
+- test/views/explicitly_nested.str
 - test/views/foo/hello.test
 - test/views/hello.builder
+- test/views/hello.coffee
+- test/views/hello.creole
 - test/views/hello.erb
-- test/views/hello.erubis
 - test/views/hello.haml
 - test/views/hello.less
+- test/views/hello.liquid
+- test/views/hello.mab
+- test/views/hello.md
+- test/views/hello.nokogiri
+- test/views/hello.radius
+- 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
+- test/views/hello.yajl
 - test/views/layout2.builder
 - test/views/layout2.erb
-- test/views/layout2.erubis
 - test/views/layout2.haml
+- test/views/layout2.liquid
+- test/views/layout2.mab
+- test/views/layout2.nokogiri
+- test/views/layout2.radius
+- test/views/layout2.slim
+- test/views/layout2.str
 - test/views/layout2.test
-homepage: http://sinatra.rubyforge.org
+- test/views/nested.str
+- test/views/utf8.erb
+- test/yajl_test.rb
+homepage: http://www.sinatrarb.com/
 licenses: []
 
 post_install_message: 
@@ -227,31 +245,48 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: sinatra
-rubygems_version: 1.8.18
+rubyforge_project: 
+rubygems_version: 1.8.15
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Classy web-development dressed in a DSL
 test_files: 
 - test/base_test.rb
 - test/builder_test.rb
+- test/coffee_test.rb
+- test/creole_test.rb
+- test/delegator_test.rb
+- test/encoding_test.rb
 - test/erb_test.rb
-- test/erubis_test.rb
 - test/extensions_test.rb
 - test/filter_test.rb
 - test/haml_test.rb
 - test/helpers_test.rb
+- test/integration_test.rb
 - test/less_test.rb
+- test/liquid_test.rb
 - test/mapped_error_test.rb
+- test/markaby_test.rb
+- test/markdown_test.rb
 - test/middleware_test.rb
+- test/nokogiri_test.rb
+- test/rack_test.rb
+- test/radius_test.rb
+- test/rdoc_test.rb
+- test/readme_test.rb
 - test/request_test.rb
 - test/response_test.rb
 - test/result_test.rb
 - test/route_added_hook_test.rb
 - test/routing_test.rb
 - test/sass_test.rb
+- test/scss_test.rb
 - test/server_test.rb
 - test/settings_test.rb
 - test/sinatra_test.rb
+- test/slim_test.rb
 - test/static_test.rb
+- test/streaming_test.rb
 - test/templates_test.rb
+- test/textile_test.rb
+- test/yajl_test.rb