sinatra 1.3.0.c → 1.3.0.d

data/README.ru.rdoc

@@ -584,6 +584,19 @@ Thin - это более производительный и функциона
 
 Отобразит <tt>./views/index.slim</tt>.
 
+=== Creole шаблоны
+
+<tt>creole</tt> gem/библиотека необходима для рендеринга creole шаблонов:
+
+  # Вам нужно будет подключить creole в приложении
+  require 'creole'
+
+  get '/' do
+    creole :index
+  end
+
+Отобразит <tt>./views/index.creole</tt>.
+
 === CoffeeScript шаблоны
 
 Вам понадобится <tt>coffee-script</tt> gem/библиотека и что-то <b>одно</b> из следующего списка,
@@ -858,8 +871,8 @@ Thin - это более производительный и функциона
 вызова другого обработчика маршрута. В таком случае просто используйте +call+:
 
   get '/foo' do
-    status, headers, body = call request.env.merge("PATH_INFO" => '/bar')
-    [status, body.upcase]
+    status, headers, body = call env.merge("PATH_INFO" => '/bar')
+    [status, headers, body.map(&:upcase)]
   end
 
   get '/bar' do
@@ -1349,7 +1362,7 @@ Thin - это более производительный и функциона
 Частные ошибки:
 
   error MyCustomError do
-    'So what happened was...' + request.env['sinatra.error'].message
+    'So what happened was...' + env['sinatra.error'].message
   end
 
 Тогда, если это произошло:

data/README.zh.rdoc

@@ -582,6 +582,19 @@ Rack body对象或者HTTP状态码：
 
 渲染 <tt>./views/index.slim</tt>。
 
+=== Creole 模板 
+
+需要引入 <tt>creole</tt> gem/library 来渲染 Creole 模板：
+
+  # 需要在你的应用中引入 creole
+  require 'creole'
+
+  get '/' do
+    creole :index
+  end
+
+渲染 <tt>./views/index.creole</tt>。
+
 === CoffeeScript 模板
 
 需要引入 <tt>coffee-script</tt> gem/library 并至少满足下面条件一项
@@ -843,8 +856,8 @@ Session被用来在请求之间保持状态。如果被激活，每一个用户
 。简单的使用 +call+ 可以做到这一点:
 
   get '/foo' do
-    status, headers, body = call request.env.merge("PATH_INFO" => '/bar')
-    [status, body.upcase]
+    status, headers, body = call env.merge("PATH_INFO" => '/bar')
+    [status, headers, body.map(&:upcase)]
   end
 
   get '/bar' do
@@ -1314,7 +1327,7 @@ Sinatra会自动处理range请求。
 自定义错误：
 
   error MyCustomError do
-    'So what happened was...' + request.env['sinatra.error'].message
+    'So what happened was...' + env['sinatra.error'].message
   end
 
 那么，当这个发生的时候：

data/lib/sinatra/base.rb

@@ -6,15 +6,11 @@ require 'sinatra/showexceptions'
 require 'tilt'
 
 module Sinatra
-  VERSION = '1.3.0.c'
+  VERSION = '1.3.0.d'
 
   # The request object. See Rack::Request for more info:
   # http://rack.rubyforge.org/doc/classes/Rack/Request.html
   class Request < Rack::Request
-    def self.new(env)
-      env['sinatra.request'] ||= super
-    end
-
     # Returns an array of acceptable media types for the response
     def accept
       @env['sinatra.accept'] ||= begin
@@ -366,7 +362,7 @@ module Sinatra
       time = time_for time
       response['Last-Modified'] = time.httpdate
       # compare based on seconds since epoch
-      halt 304 if Time.httpdate(request.env['HTTP_IF_MODIFIED_SINCE']).to_i >= time.to_i
+      halt 304 if Time.httpdate(env['HTTP_IF_MODIFIED_SINCE']).to_i >= time.to_i
     rescue ArgumentError
     end
 
@@ -455,6 +451,8 @@ module Sinatra
     end
 
     def erubis(template, options={}, locals={})
+      warn "Sinatra::Templates#erubis is deprecated and will be removed, use #erb instead.\n" \
+        "If you have Erubis installed, it will be used automatically.\n\tfrom #{caller.first}"
       render :erubis, template, options, locals
     end
 
@@ -520,12 +518,16 @@ module Sinatra
       render :slim, template, options, locals
     end
 
+    def creole(template, options={}, locals={})
+      render :creole, template, options, locals
+    end
+
     # Calls the given block for every possible template file in views,
     # named name.ext, where ext is registered on engine.
     def find_template(views, name, engine)
       yield ::File.join(views, "#{name}.#{@preferred_extension}")
       Tilt.mappings.each do |ext, engines|
-        next unless ext != @preferred_extension and Array(engines).include? engine
+        next unless ext != @preferred_extension and engines.include? engine
         yield ::File.join(views, "#{name}.#{ext}")
       end
     end
@@ -650,17 +652,7 @@ module Sinatra
         end
       end
 
-      status, header, body = @response.finish
-
-      # Never produce a body on HEAD requests. Do retain the Content-Length
-      # unless it's "0", in which case we assume it was calculated erroneously
-      # for a manual HEAD response and remove it entirely.
-      if @env['REQUEST_METHOD'] == 'HEAD'
-        body = []
-        header.delete('Content-Length') if header['Content-Length'] == '0'
-      end
-
-      [status, header, body]
+      @response.finish
     end
 
     # Access settings defined with Base.set.
@@ -696,7 +688,7 @@ module Sinatra
     # Forward the request to the downstream app -- middleware only.
     def forward
       fail "downstream app not set" unless @app.respond_to? :call
-      status, headers, body = @app.call(@request.env)
+      status, headers, body = @app.call env
       @response.status = status
       @response.body = body
       @response.headers.merge! headers
@@ -948,14 +940,15 @@ module Sinatra
 
       # Sets an option to the given value.  If the value is a proc,
       # the proc will be called every time the option is accessed.
-      def set(option, value=self, &block)
-        raise ArgumentError if block && value != self
+      def set(option, value = (not_set = true), &block)
+        raise ArgumentError if block and !not_set
         value = block if block
         if value.kind_of?(Proc)
           metadef(option, &value)
           metadef("#{option}?") { !!__send__(option) }
           metadef("#{option}=") { |val| metadef(option, &Proc.new{val}) }
-        elsif value == self && option.respond_to?(:each)
+        elsif not_set
+          raise ArgumentError unless option.respond_to?(:each)
           option.each { |k,v| set(k, v) }
         elsif respond_to?("#{option}=")
           __send__ "#{option}=", value
@@ -1269,6 +1262,7 @@ module Sinatra
         builder = Rack::Builder.new
         builder.use Rack::MethodOverride if method_override?
         builder.use ShowExceptions       if show_exceptions?
+        builder.use Rack::Head
         setup_logging  builder
         setup_sessions builder
         middleware.each { |c,a,b| builder.use(c, *a, &b) }
@@ -1296,7 +1290,8 @@ module Sinatra
 
       def setup_sessions(builder)
         return unless sessions?
-        options = { :secret => session_secret }
+        options = {}
+        options[:secret] = session_secret if session_secret?
         options.merge! sessions.to_hash if sessions.respond_to? :to_hash
         builder.use Rack::Session::Cookie, options
       end
@@ -1451,7 +1446,7 @@ module Sinatra
           </style>
         </head>
         <body>
-          <h2>Sinatra doesn't know this ditty.</h2>
+          <h2>Sinatra doesn&rsquo;t know this ditty.</h2>
           <img src='#{uri "/__sinatra__/404.png"}'>
           <div id="c">
             Try this:
@@ -1475,6 +1470,7 @@ module Sinatra
     set :logging, Proc.new { ! test? }
     set :method_override, true
     set :run, Proc.new { ! test? }
+    set :session_secret, Proc.new { super() unless development? }
 
     def self.register(*extensions, &block) #:nodoc:
       added_methods = extensions.map {|m| m.public_instance_methods }.flatten
@@ -1489,12 +1485,11 @@ module Sinatra
   module Delegator #:nodoc:
     def self.delegate(*methods)
       methods.each do |method_name|
-        eval <<-RUBY, binding, '(__DELEGATE__)', 1
-          def #{method_name}(*args, &b)
-            ::Sinatra::Delegator.target.send(#{method_name.inspect}, *args, &b)
-          end
-          private #{method_name.inspect}
-        RUBY
+        define_method(method_name) do |*args, &block|
+          return super(*args, &block) if respond_to? method_name
+          Delegator.target.send(method_name, *args, &block)
+        end
+        private method_name
       end
     end
 

data/sinatra.gemspec

@@ -3,8 +3,8 @@ 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.3.0.c'
-  s.date = '2011-04-13'
+  s.version = '1.3.0.d'
+  s.date = '2011-04-30'
 
   s.description = "Classy web-development dressed in a DSL"
   s.summary     = "Classy web-development dressed in a DSL"
@@ -41,10 +41,10 @@ Gem::Specification.new do |s|
     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
@@ -80,15 +80,14 @@ Gem::Specification.new do |s|
     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
@@ -105,7 +104,6 @@ Gem::Specification.new do |s|
     test/views/hello.textile
     test/views/layout2.builder
     test/views/layout2.erb
-    test/views/layout2.erubis
     test/views/layout2.haml
     test/views/layout2.liquid
     test/views/layout2.mab
@@ -123,7 +121,7 @@ Gem::Specification.new do |s|
 
   s.extra_rdoc_files = %w[README.rdoc README.de.rdoc README.jp.rdoc README.fr.rdoc README.es.rdoc README.hu.rdoc README.zh.rdoc LICENSE]
   s.add_dependency 'rack', '~> 1.2'
-  s.add_dependency 'tilt', '~> 1.2', '>= 1.2.2'
+  s.add_dependency 'tilt', '~> 1.3'
   s.add_development_dependency 'shotgun', '~> 0.6'
 
   s.homepage = "http://sinatra.rubyforge.org"

data/test/creole_test.rb

@@ -0,0 +1,65 @@
+require File.dirname(__FILE__) + '/helper'
+
+begin
+require 'creole'
+
+class CreoleTest < Test::Unit::TestCase
+  def creole_app(&block)
+    mock_app do
+      set :views, File.dirname(__FILE__) + '/views'
+      get '/', &block
+    end
+    get '/'
+  end
+
+  it 'renders inline creole strings' do
+    creole_app { creole '= Hiya' }
+    assert ok?
+    assert_body "<h1>Hiya</h1>"
+  end
+
+  it 'renders .creole files in views path' do
+    creole_app { creole :hello }
+    assert ok?
+    assert_body "<h1>Hello From Creole</h1>"
+  end
+
+  it "raises error if template not found" do
+    mock_app { get('/') { creole :no_such_template } }
+    assert_raise(Errno::ENOENT) { get('/') }
+  end
+
+  it "renders with inline layouts" do
+    mock_app do
+      layout { 'THIS. IS. #{yield.upcase}!' }
+      get('/') { creole 'Sparta', :layout_engine => :str }
+    end
+    get '/'
+    assert ok?
+    assert_like 'THIS. IS. <P>SPARTA</P>!', body
+  end
+
+  it "renders with file layouts" do
+    creole_app { creole '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><%= creole :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 creole tests"
+end

data/test/delegator_test.rb

@@ -100,13 +100,39 @@ class DelegatorTest < Test::Unit::TestCase
     assert_equal app.last_call, ["helpers", mixin.to_s ]
   end
 
-
   it "registers helpers with the delegation target" do
     app, mixin = mirror, Module.new
     Sinatra.use mixin
     assert_equal app.last_call, ["use", mixin.to_s ]
   end
 
+  it "should work with method_missing proxies for options" do
+    mixin = Module.new do
+      def respond_to?(method, *)
+        method.to_sym == :options or super
+      end
+
+      def method_missing(method, *args, &block)
+        return super unless method.to_sym == :options
+        {:some => :option}
+      end
+    end
+
+    value = nil
+    mirror do
+      extend mixin
+      value = options
+    end
+
+    assert_equal({:some => :option}, value)
+  end
+
+  it "delegates crazy method names" do
+    Sinatra::Delegator.delegate "foo:bar:"
+    method = mirror { send "foo:bar:" }.last_call.first
+    assert_equal "foo:bar:", method
+  end
+
   delegates 'get'
   delegates 'patch'
   delegates 'put'

data/test/erb_test.rb

@@ -1,6 +1,15 @@
 require File.dirname(__FILE__) + '/helper'
 
 class ERBTest < Test::Unit::TestCase
+  def engine
+    Tilt::ERBTemplate
+  end
+
+  def setup
+    Tilt.prefer engine, :erb
+    super
+  end
+
   def erb_app(&block)
     mock_app {
       set :views, File.dirname(__FILE__) + '/views'
@@ -9,6 +18,10 @@ class ERBTest < Test::Unit::TestCase
     get '/'
   end
 
+  it 'uses the correct engine' do
+    assert_equal engine, Tilt[:erb]
+  end
+
   it 'renders inline ERB strings' do
     erb_app { erb '<%= 1 + 1 %>' }
     assert ok?
@@ -45,7 +58,7 @@ class ERBTest < Test::Unit::TestCase
       erb 'Hello World', :layout => :layout2
     }
     assert ok?
-    assert_equal "ERB Layout!\nHello World\n", body
+    assert_body "ERB Layout!\nHello World"
   end
 
   it "renders erb with blocks" do
@@ -79,3 +92,13 @@ class ERBTest < Test::Unit::TestCase
     assert_equal '<outer><inner>hi</inner></outer>', body
   end
 end
+
+
+begin
+  require 'erubis'
+  class ErubisTest < ERBTest
+    def engine; Tilt::ErubisTemplate end
+  end
+rescue LoadError
+  warn "#{$!.to_s}: skipping erubis tests"
+end

data/test/helper.rb

@@ -65,6 +65,11 @@ class Test::Unit::TestCase
     assert_equal value.lstrip.gsub(/\s*\n\s*/, ""), body.lstrip.gsub(/\s*\n\s*/, "")
   end
 
+  def assert_like(a,b)
+    pattern = /\s*\n\s*| id=['"][^"']*["']/
+    assert_equal a.strip.gsub(pattern, ""), b.strip.gsub(pattern, "")
+  end
+
   def assert_include(str, substr)
     assert str.include?(substr), "expected #{str.inspect} to include #{substr.inspect}"
   end
@@ -76,6 +81,8 @@ class Test::Unit::TestCase
     else
       super
     end
+  rescue Rack::Test::Error
+    super
   end
 
   # Also check response since we delegate there.