sinatra 1.2.0.a → 1.2.0.c

data/README.zh.rdoc

@@ -172,7 +172,7 @@ Rack body对象或者HTTP状态码：
 
 需要引入haml gem/library以渲染 HAML 模板：
 
-  ## 你需要在你的应用中引入 haml
+  # 你需要在你的应用中引入 haml
   require 'haml'
 
   get '/' do
@@ -195,7 +195,7 @@ Rack body对象或者HTTP状态码：
 
 === Erb模板
 
-  ## 你需要在你的应用中引入 erb
+  # 你需要在你的应用中引入 erb
   require 'erb'
 
   get '/' do
@@ -208,7 +208,7 @@ Rack body对象或者HTTP状态码：
 
 需要引入erubis gem/library以渲染 erubis 模板：
 
-  ## 你需要在你的应用中引入 erubis
+  # 你需要在你的应用中引入 erubis
   require 'erubis'
 
   get '/' do
@@ -221,7 +221,7 @@ Rack body对象或者HTTP状态码：
 
 需要引入 builder gem/library 以渲染 builder templates：
 
-  ## 需要在你的应用中引入builder
+  # 需要在你的应用中引入builder
   require 'builder'
 
   get '/' do
@@ -234,7 +234,7 @@ Rack body对象或者HTTP状态码：
 
 需要引入 nokogiri gem/library 以渲染 nokogiri 模板：
 
-  ## 需要在你的应用中引入 nokogiri
+  # 需要在你的应用中引入 nokogiri
   require 'nokogiri'
 
   get '/' do
@@ -247,7 +247,7 @@ Rack body对象或者HTTP状态码：
 
 需要引入 haml gem/library 以渲染 Sass 模板：
 
-  ## 需要在你的应用中引入 haml 或者 sass 
+  # 需要在你的应用中引入 haml 或者 sass 
   require 'sass'
 
   get '/stylesheet.css' do
@@ -271,7 +271,7 @@ Rack body对象或者HTTP状态码：
 
 需要引入 haml gem/library 来渲染 Scss templates：
 
-  ## 需要在你的应用中引入 haml 或者 sass
+  # 需要在你的应用中引入 haml 或者 sass
   require 'sass'
 
   get '/stylesheet.css' do
@@ -295,7 +295,7 @@ Rack body对象或者HTTP状态码：
 
 需要引入 less gem/library 以渲染 Less 模板：
 
-  ## 需要在你的应用中引入 less
+  # 需要在你的应用中引入 less
   require 'less'
 
   get '/stylesheet.css' do
@@ -308,7 +308,7 @@ Rack body对象或者HTTP状态码：
 
 需要引入 liquid gem/library 来渲染 Liquid 模板：
 
-  ## 需要在你的应用中引入 liquid
+  # 需要在你的应用中引入 liquid
   require 'liquid'
 
   get '/' do
@@ -326,7 +326,7 @@ Rack body对象或者HTTP状态码：
 
 需要引入 rdiscount gem/library 以渲染 Markdown 模板：
 
-  ## 需要在你的应用中引入rdiscount
+  # 需要在你的应用中引入rdiscount
   require "rdiscount"
   
   get '/' do
@@ -349,7 +349,7 @@ Rack body对象或者HTTP状态码：
 
 需要引入 RedCloth gem/library 以渲染 Textile 模板：
 
-  ## 在你的应用中引入redcloth
+  # 在你的应用中引入redcloth
   require "redcloth"
 
   get '/' do
@@ -371,7 +371,7 @@ Rack body对象或者HTTP状态码：
 
 需要引入 RDoc gem/library 以渲染RDoc模板：
 
-  ## 需要在你的应用中引入rdoc
+  # 需要在你的应用中引入rdoc
   require "rdoc"
 
   get '/' do
@@ -393,7 +393,7 @@ Rack body对象或者HTTP状态码：
 
 需要引入 radius gem/library 以渲染 Radius 模板：
 
-  ## You'll need to require radius in your app
+  # You'll need to require radius in your app
   require 'radius'
 
   get '/' do
@@ -411,7 +411,7 @@ Rack body对象或者HTTP状态码：
 
 需要引入markaby gem/library以渲染Markaby模板：
 
-  ##需要在你的应用中引入 markaby
+  #需要在你的应用中引入 markaby
   require 'markaby'
 
   get '/' do
@@ -424,7 +424,7 @@ Rack body对象或者HTTP状态码：
 
 需要引入 slim gem/library 来渲染 Slim 模板：
 
-  ## 需要在你的应用中引入 slim
+  # 需要在你的应用中引入 slim
   require 'slim'
 
   get '/' do
@@ -438,7 +438,7 @@ Rack body对象或者HTTP状态码：
 需要引入 coffee-script gem/library 并在路径中存在 `coffee` 二进制文件以渲染
 CoffeeScript 模板：
 
-  ## 需要在你的应用中引入coffee-script
+  # 需要在你的应用中引入coffee-script
   require 'coffee-script'
 
   get '/application.js' do

data/Rakefile

@@ -6,6 +6,8 @@ require 'date'
 task :default => :test
 task :spec => :test
 
+CLEAN.include "**/*.rbc"
+
 def source_version
   line = File.read('lib/sinatra/base.rb')[/^\s*VERSION = .*/]
   line.match(/.*VERSION = '(.*)'/)[1]
@@ -17,21 +19,11 @@ task :test do
   ENV.delete 'LC_CTYPE'
 end
 
-if !ENV['NO_TEST_FIX'] and RUBY_VERSION == '1.9.2' and RUBY_PATCHLEVEL == 0
-  # Avoids seg fault
-  task(:test) do
-    second_run  = %w[settings rdoc markaby templates static textile].map { |l| "test/#{l}_test.rb" }
-    first_run   = Dir.glob('test/*_test.rb') - second_run
-    [first_run, second_run].each { |f| sh "testrb #{f.join ' '}" }
-  end
-else
-  Rake::TestTask.new(:test) do |t|
-    t.test_files = FileList['test/*_test.rb']
-    t.ruby_opts = ['-rubygems'] if defined? Gem
-    t.ruby_opts << '-I.'
-  end
+Rake::TestTask.new(:test) do |t|
+  t.test_files = FileList['test/*_test.rb']
+  t.ruby_opts = ['-rubygems'] if defined? Gem
+  t.ruby_opts << '-I.'
 end
-
 # Rcov ================================================================
 namespace :test do
   desc 'Mesures test coverage'

data/lib/sinatra/base.rb

@@ -7,7 +7,7 @@ require 'sinatra/showexceptions'
 require 'tilt'
 
 module Sinatra
-  VERSION = '1.2.0.a'
+  VERSION = '1.2.0.c'
 
   # The request object. See Rack::Request for more info:
   # http://rack.rubyforge.org/doc/classes/Rack/Request.html
@@ -29,6 +29,10 @@ module Sinatra
       alias secure? ssl?
     end
 
+    def forwarded?
+      @env.include? "HTTP_X_FORWARDED_HOST"
+    end
+
     def route
       @route ||= begin
         path = Rack::Utils.unescape(path_info)
@@ -91,24 +95,37 @@ module Sinatra
 
     # Halt processing and redirect to the URI provided.
     def redirect(uri, *args)
-      if not uri =~ /^https?:\/\//
-        # According to RFC 2616 section 14.30, "the field value consists of a
-        # single absolute URI"
-        abs_uri = "#{request.scheme}://#{request.host}"
-
-        if request.scheme == 'https' && request.port != 443 ||
-              request.scheme == 'http' && request.port != 80
-          abs_uri << ":#{request.port}"
-        end
-
-        uri = (abs_uri << uri)
-      end
-
       status 302
-      response['Location'] = uri
+
+      # According to RFC 2616 section 14.30, "the field value consists of a
+      # single absolute URI"
+      response['Location'] = url(uri, settings.absolute_redirects?, settings.prefixed_redirects?)
       halt(*args)
     end
 
+    # Generates the absolute URI for a given path in the app.
+    # Takes Rack routers and reverse proxies into account.
+    def uri(addr = nil, absolute = true, add_script_name = true)
+      return addr if addr =~ /^https?:\/\//
+      uri = [host = ""]
+      if absolute
+        host << 'http'
+        host << 's' if request.secure?
+        host << "://"
+        if request.forwarded? or request.port != (request.secure? ? 443 : 80)
+          host << request.host_with_port
+        else
+          host << request.host
+        end
+      end
+      uri << request.script_name.to_s if add_script_name
+      uri << (addr ? addr : request.path_info).to_s
+      File.join uri
+    end
+
+    alias url uri
+    alias to uri
+
     # Halt processing and return the error status provided.
     def error(code, body=nil)
       code, body    = 500, code.to_str if code.respond_to? :to_str
@@ -324,10 +341,17 @@ module Sinatra
     # with a '304 Not Modified' response.
     def last_modified(time)
       return unless time
-      time = time.to_time if time.respond_to?(:to_time)
-      time = Time.parse time.strftime('%FT%T%:z') if time.respond_to?(:strftime)
-      response['Last-Modified'] = time.respond_to?(:httpdate) ? time.httpdate : time.to_s
-      halt 304 if Time.httpdate(request.env['HTTP_IF_MODIFIED_SINCE']) >= time
+      if time.respond_to?(:to_time)
+          time = time.to_time
+      else
+          ## make a best effort to convert something else to a time object
+          ## if this fails, this should throw an ArgumentError, then the
+          # rescue will result in an http 200, which should be safe
+          time = Time.parse(time.to_s)
+      end
+      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
     rescue ArgumentError
     end
 
@@ -446,6 +470,15 @@ module Sinatra
       render :slim, 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)
+      Tilt.mappings.each do |ext, klass|
+        next unless klass == engine
+        yield ::File.join(views, "#{name}.#{ext}")
+      end
+    end
+
   private
     # logic shared between builder and nokogiri
     def render_ruby(engine, template, options={}, locals={}, &block)
@@ -469,17 +502,18 @@ module Sinatra
       layout          = @default_layout if layout.nil? or layout == true
       content_type    = options.delete(:content_type)  || options.delete(:default_content_type)
       layout_engine   = options.delete(:layout_engine) || engine
+      scope           = options.delete(:scope)         || self
 
       # compile and render template
       layout_was      = @default_layout
       @default_layout = false
       template        = compile_template(engine, data, options, views)
-      output          = template.render(self, locals, &block)
+      output          = template.render(scope, locals, &block)
       @default_layout = layout_was
 
       # render layout
       if layout
-        options = options.merge(:views => views, :layout => false, :eat_errors => eat_errors)
+        options = options.merge(:views => views, :layout => false, :eat_errors => eat_errors, :scope => scope)
         catch(:layout_missing) { output = render(layout_engine, layout, options, locals) { output }}
       end
 
@@ -501,13 +535,14 @@ module Sinatra
             template.new(path, line.to_i, options) { body }
           else
             found = false
-            path = ::File.join(views, "#{data}.#{engine}")
-            Tilt.mappings.each do |ext, klass|
-              break if found = File.exists?(path)
-              next unless klass == template
-              path = ::File.join(views, "#{data}.#{ext}")
+            find_template(views, data, template) do |file|
+              path ||= file # keep the initial path rather than the last one
+              if found = File.exists?(file)
+                path = file
+                break
+              end
             end
-            throw :layout_missing if eat_errors and !found
+            throw :layout_missing if eat_errors and not found
             template.new(path, 1, options)
           end
         when data.is_a?(Proc) || data.is_a?(String)
@@ -990,7 +1025,7 @@ module Sinatra
       # Will set params[:agent].
       def user_agent(pattern)
         condition do
-          if request.user_agent =~ pattern
+          if request.user_agent.to_s =~ pattern
             @params[:agent] = $~[1..-1]
             true
           else
@@ -1007,7 +1042,7 @@ module Sinatra
         condition do
           matching_types = (request.accept & types)
           unless matching_types.empty?
-            response.headers['Content-Type'] = matching_types.first
+            content_type matching_types.first
             true
           else
             false
@@ -1067,7 +1102,7 @@ module Sinatra
       def compile(path)
         keys = []
         if path.respond_to? :to_str
-          special_chars = %w{. + ( )}
+          special_chars = %w{. + ( ) $}
           pattern =
             path.to_str.gsub(/((:\w+)|[\*#{special_chars.join}])/) do |match|
               case match
@@ -1084,6 +1119,8 @@ module Sinatra
           [/^#{pattern}$/, keys]
         elsif path.respond_to?(:keys) && path.respond_to?(:match)
           [path, path.keys]
+        elsif path.respond_to?(:names) && path.respond_to?(:match)
+          [path, path.names]
         elsif path.respond_to? :match
           [path, keys]
         else
@@ -1280,6 +1317,9 @@ module Sinatra
     set :bind, '0.0.0.0'
     set :port, 4567
 
+    set :absolute_redirects, true
+    set :prefixed_redirects, false
+
     set :app_file, nil
     set :root, Proc.new { app_file && File.expand_path(File.dirname(app_file)) }
     set :views, Proc.new { root && File.join(root, 'views') }

data/lib/sinatra/showexceptions.rb

@@ -8,11 +8,36 @@ module Sinatra
   # Be careful when you use this on public-facing sites as it could reveal
   # information helpful to attackers.
   class ShowExceptions < Rack::ShowExceptions
+    @@eats_errors = Object.new
+    def @@eats_errors.flush(*) end
+    def @@eats_errors.puts(*) end
+
     def initialize(app)
       @app      = app
       @template = ERB.new(TEMPLATE)
     end
 
+    def call(env)
+      @app.call(env)
+    rescue Exception => e
+      errors, env["rack.errors"] = env["rack.errors"], @@eats_errors
+
+      if respond_to?(:prefers_plain_text?) and prefers_plain_text?(env)
+        content_type = "text/plain"
+        body = [dump_exception(e)]
+      else
+        content_type = "text/html"
+        body = pretty(env, e)
+      end
+
+      env["rack.errors"] = errors
+
+      [500,
+       {"Content-Type" => content_type,
+        "Content-Length" => Rack::Utils.bytesize(body.join).to_s},
+       body]
+    end
+
     private
 
     def frame_class(frame)

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.2.0.a'
-  s.date = '2010-12-25'
+  s.version = '1.2.0.c'
+  s.date = '2011-02-19'
 
   s.description = "Classy web-development dressed in a DSL"
   s.summary     = "Classy web-development dressed in a DSL"
@@ -16,6 +16,8 @@ Gem::Specification.new do |s|
   s.files = %w[
     AUTHORS
     CHANGES
+    Gemfile
+    Gemfile.lock
     LICENSE
     README.de.rdoc
     README.es.rdoc
@@ -71,7 +73,10 @@ Gem::Specification.new do |s|
     test/static_test.rb
     test/templates_test.rb
     test/textile_test.rb
+    test/views/a/in_a.str
     test/views/ascii.haml
+    test/views/b/in_b.str
+    test/views/calc.html.erb
     test/views/error.builder
     test/views/error.erb
     test/views/error.erubis
@@ -117,23 +122,8 @@ 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.1'
-  s.add_dependency 'tilt', '~> 1.2'
-  s.add_development_dependency 'rake'
+  s.add_dependency 'tilt', '>= 1.2.2', '< 2.0'
   s.add_development_dependency 'shotgun', '~> 0.6'
-  s.add_development_dependency 'rack-test', '>= 0.5.6'
-  s.add_development_dependency 'haml', '>= 3.0'
-  s.add_development_dependency 'builder'
-  s.add_development_dependency 'erubis'
-  s.add_development_dependency 'less'
-  s.add_development_dependency 'liquid'
-  s.add_development_dependency 'rdiscount'
-  s.add_development_dependency 'RedCloth'
-  s.add_development_dependency 'radius'
-  s.add_development_dependency 'markaby'
-  s.add_development_dependency 'coffee-script', '>= 2.0'
-  s.add_development_dependency 'rdoc'
-  s.add_development_dependency 'nokogiri'
-  s.add_development_dependency 'slim'
 
   s.has_rdoc = true
   s.homepage = "http://sinatra.rubyforge.org"