sinatra 1.1.0 → 1.1.2

data/README.zh.rdoc

@@ -859,7 +859,7 @@ Sinatra::Base子类可用的方法实际上就是
   require 'sinatra/base'
   
   class LoginScreen < Sinatra::Base
-    enable :session
+    enable :sessions
     
     get('/login') { haml :login }
     
@@ -901,7 +901,7 @@ Sinatra::Application，或者这个类就是你显式创建的子类。
 
 通过 `set` 创建的选项是类层面的方法：
 
-    class MyApp << Sinatra::Base
+    class MyApp < Sinatra::Base
       # 嘿，我在应用变量域！
       set :foo, 42
       foo # => 42
@@ -931,7 +931,7 @@ Sinatra::Application，或者这个类就是你显式创建的子类。
 `erb` 或者 `haml`。你可以在请求变量域当中通过`settings`辅助方法
 访问应用变量域：
 
-  class MyApp << Sinatra::Base
+  class MyApp < Sinatra::Base
     # 嘿，我在应用变量域!
     get '/define_route/:name' do
       # 针对 '/define_route/:name' 的请求变量域

data/Rakefile

@@ -12,6 +12,10 @@ def source_version
 end
 
 # SPECS ===============================================================
+task :test do
+  ENV['LANG'] = 'C'
+  ENV.delete 'LC_CTYPE'
+end
 
 if !ENV['NO_TEST_FIX'] and RUBY_VERSION == '1.9.2' and RUBY_PATCHLEVEL == 0
   # Avoids seg fault
@@ -44,26 +48,28 @@ end
 
 desc 'Generate RDoc under doc/api'
 task 'doc'     => ['doc:api']
+task('doc:api') { sh "yardoc -o doc/api" }
+CLEAN.include 'doc/api'
 
-task 'doc:api' => ['doc/api/index.html']
-
-file 'doc/api/index.html' => FileList['lib/**/*.rb', 'README.*'] do |f|
-  require 'rbconfig'
-  hanna = RbConfig::CONFIG['ruby_install_name'].sub('ruby', 'hanna')
-  rb_files = f.prerequisites
-  sh(<<-end.gsub(/\s+/, ' '))
-    #{hanna}
-      --charset utf8
-      --fmt html
-      --inline-source
-      --line-numbers
-      --main README.rdoc
-      --op doc/api
-      --title 'Sinatra API Documentation'
-      #{rb_files.join(' ')}
+# README ===============================================================
+task :add_template, [:name] do |t, args|
+  Dir.glob('README.*') do |file|
+    code = File.read(file)
+    if code =~ /^===.*#{args.name.capitalize}/
+      puts "Already covered in #{file}"
+    else
+      template = code[/===[^\n]*Liquid.*index\.liquid<\/tt>[^\n]*/m]
+      if !template
+        puts "Liquid not found in #{file}"
+      else
+        puts "Adding section to #{file}"
+        template = template.gsub(/Liquid/, args.name.capitalize).gsub(/liquid/, args.name.downcase)        
+        code.gsub! /^(\s*===.*CoffeeScript)/, template << "\n\\1"        
+        File.open(file, "w") { |f| f << code }
+      end
+    end
   end
 end
-CLEAN.include 'doc/api'
 
 # PACKAGING ============================================================
 

data/lib/sinatra/base.rb

@@ -7,7 +7,7 @@ require 'sinatra/showexceptions'
 require 'tilt'
 
 module Sinatra
-  VERSION = '1.1.0'
+  VERSION = '1.1.2'
 
   # The request object. See Rack::Request for more info:
   # http://rack.rubyforge.org/doc/classes/Rack/Request.html
@@ -28,6 +28,18 @@ module Sinatra
     else
       alias secure? ssl?
     end
+
+    def route
+      @route ||= begin
+        path = Rack::Utils.unescape(path_info)
+        path.empty? ? "/" : path
+      end
+    end
+
+    def path_info=(value)
+      @route = nil
+      super
+    end
   end
 
   # The response object. See Rack::Response and Rack::ResponseHelpers for
@@ -128,10 +140,15 @@ module Sinatra
     # Set the Content-Type of the response body given a media type or file
     # extension.
     def content_type(type, params={})
-      mime_type = mime_type(type)
+      default = params.delete :default
+      mime_type = mime_type(type) || default
       fail "Unknown media type: %p" % type if mime_type.nil?
-      params[:charset] ||= params.delete('charset') || settings.default_encoding
-      response['Content-Type'] = "#{mime_type};#{params.map { |kv| kv.join('=') }.join(', ')}"
+      mime_type = mime_type.dup
+      unless params.include? :charset or settings.add_charset.all? { |p| not p === mime_type }
+        params[:charset] = params.delete('charset') || settings.default_encoding
+      end
+      mime_type << ";#{params.map { |kv| kv.join('=') }.join(', ')}" unless params.empty?
+      response['Content-Type'] = mime_type
     end
 
     # Set the Content-Disposition to "attachment" with the specified filename,
@@ -149,10 +166,9 @@ module Sinatra
       stat = File.stat(path)
       last_modified stat.mtime
 
-      content_type opts[:type] ||
-        File.extname(path) ||
-        response['Content-Type'] ||
-        'application/octet-stream'
+      if opts[:type] or not response['Content-Type']
+        content_type opts[:type] || File.extname(path), :default => 'application/octet-stream'
+      end
 
       if opts[:disposition] == 'attachment' || opts[:filename]
         attachment opts[:filename] || path
@@ -264,7 +280,11 @@ module Sinatra
       end
 
       values = values.map { |value| value.to_s.tr('_','-') }
-      hash.each { |k,v| values << [k.to_s.tr('_', '-'), v].join('=') }
+      hash.each do |key, value|
+        key = key.to_s.tr('_', '-')
+        value = value.to_i if key == "max-age"
+        values << [key, value].join('=')
+      end
 
       response['Cache-Control'] = values.join(', ') if values.any?
     end
@@ -435,30 +455,29 @@ module Sinatra
     def render(engine, data, options={}, locals={}, &block)
       # merge app-level options
       options = settings.send(engine).merge(options) if settings.respond_to?(engine)
-      options[:outvar] ||= '@_out_buf'
+      options[:outvar]           ||= '@_out_buf'
+      options[:default_encoding] ||= settings.default_encoding
 
       # extract generic options
       locals          = options.delete(:locals) || locals         || {}
       views           = options.delete(:views)  || settings.views || "./views"
       @default_layout = :layout if @default_layout.nil?
       layout          = options.delete(:layout)
+      eat_errors      = layout.nil?
       layout          = @default_layout if layout.nil? or layout == true
       content_type    = options.delete(:content_type) || options.delete(:default_content_type)
 
       # compile and render template
       layout_was      = @default_layout
-      @default_layout = false if layout
+      @default_layout = false
       template        = compile_template(engine, data, options, views)
       output          = template.render(self, locals, &block)
       @default_layout = layout_was
 
       # render layout
       if layout
-        begin
-          options = options.merge(:views => views, :layout => false)
-          output = render(engine, layout, options, locals) { output }
-        rescue Errno::ENOENT
-        end
+        options = options.merge(:views => views, :layout => false, :eat_errors => eat_errors)
+        catch(:layout_missing) { output = render(engine, layout, options, locals) { output }}
       end
 
       output.extend(ContentTyped).content_type = content_type if content_type
@@ -466,6 +485,7 @@ module Sinatra
     end
 
     def compile_template(engine, data, options, views)
+      eat_errors = options.delete :eat_errors
       template_cache.fetch engine, data, options do
         template = Tilt[engine]
         raise "Template engine not found: #{engine}" if template.nil?
@@ -477,12 +497,14 @@ module Sinatra
             body = body.call if body.respond_to?(:call)
             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 File.exists?(path)
+              break if found = File.exists?(path)
               next unless klass == template
               path = ::File.join(views, "#{data}.#{ext}")
             end
+            throw :layout_missing if eat_errors and !found
             template.new(path, 1, options)
           end
         when data.is_a?(Proc) || data.is_a?(String)
@@ -524,6 +546,7 @@ module Sinatra
       @response = Response.new
       @params   = indifferent_params(@request.params)
       template_cache.clear if settings.reload_templates
+      force_encoding(@request.route)
       force_encoding(@params)
 
       @response['Content-Type'] = nil
@@ -627,11 +650,7 @@ module Sinatra
     # Returns pass block.
     def process_route(pattern, keys, conditions)
       @original_params ||= @params
-      @path ||= begin
-        path = unescape(@request.path_info)
-        path.empty? ? "/" : path
-      end
-      if match = pattern.match(@path)
+      if match = pattern.match(@request.route)
         values = match.captures.to_a
         params =
           if keys.any?
@@ -893,19 +912,25 @@ module Sinatra
         file = (file.nil? || file == true) ? (caller_files.first || File.expand_path($0)) : file
 
         begin
-          app, data =
-            ::IO.read(file).gsub("\r\n", "\n").split(/^__END__$/, 2)
+          io = ::IO.respond_to?(:binread) ? ::IO.binread(file) : ::IO.read(file)
+          app, data = io.gsub("\r\n", "\n").split(/^__END__$/, 2)
         rescue Errno::ENOENT
           app, data = nil
         end
 
         if data
+          if app and app =~ /([^\n]*\n)?#[^\n]*coding: *(\S+)/m
+            encoding = $2
+          else
+            encoding = settings.default_encoding
+          end
           lines = app.count("\n") + 1
           template = nil
+          force_encoding data, encoding
           data.each_line do |line|
             lines += 1
             if line =~ /^@@\s*(.*\S)\s*$/
-              template = ''
+              template = force_encoding('', encoding)
               templates[$1.to_sym] = [template, file, lines]
             elsif template
               template << line
@@ -1181,7 +1206,8 @@ module Sinatra
         /\(.*\)/,                                        # generated code
         /rubygems\/custom_require\.rb$/,                 # rubygems require hacks
         /active_support/,                                # active_support require hacks
-        /<internal:/,                                    # internal in ruby >= 1.9.2
+        /bundler(\/runtime)?\.rb/,                       # bundler require hacks
+        /<internal:/                                     # internal in ruby >= 1.9.2
       ]
 
       # add rubinius (and hopefully other VM impls) ignore patterns ...
@@ -1209,20 +1235,22 @@ module Sinatra
     #
     # The latter might not be necessary if Rack handles it one day.
     # Keep an eye on Rack's LH #100.
+    def force_encoding(*args) settings.force_encoding(*args) end
     if defined? Encoding
-      def force_encoding(data)
-        return if data == self || data.is_a?(Tempfile)
+      def self.force_encoding(data, encoding = default_encoding)
+        return if data == settings || data.is_a?(Tempfile)
         if data.respond_to? :force_encoding
-          data.force_encoding settings.default_encoding
+          data.force_encoding encoding
         elsif data.respond_to? :each_value
-          data.each_value { |v| force_encoding(v) }
+          data.each_value { |v| force_encoding(v, encoding) }
         elsif data.respond_to? :each
-          data.each { |v| force_encoding(v) }
+          data.each { |v| force_encoding(v, encoding) }
         end
+        data
       end
     else
-      def force_encoding(*) end
-    end
+      def self.force_encoding(data, *) data end
+      end
 
     reset!
 
@@ -1234,6 +1262,7 @@ module Sinatra
     set :logging, false
     set :method_override, false
     set :default_encoding, "utf-8"
+    set :add_charset, [/^text\//, 'application/javascript', 'application/xml', 'application/xhtml+xml']
 
     class << self
       alias_method :methodoverride?, :method_override?

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.1.0'
-  s.date = '2010-10-24'
+  s.version = '1.1.2'
+  s.date = '2010-12-25'
 
   s.description = "Classy web-development dressed in a DSL"
   s.summary     = "Classy web-development dressed in a DSL"
@@ -22,7 +22,9 @@ Gem::Specification.new do |s|
     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
@@ -112,7 +114,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.1'
-  s.add_dependency 'tilt', '~> 1.1'
+  s.add_dependency 'tilt', '~> 1.2'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'shotgun', '~> 0.6'
   s.add_development_dependency 'rack-test', '>= 0.5.6'
@@ -125,7 +127,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'RedCloth'
   s.add_development_dependency 'radius'
   s.add_development_dependency 'markaby'
-  s.add_development_dependency 'coffee-script'
+  s.add_development_dependency 'coffee-script', '>= 2.0'
   s.add_development_dependency 'rdoc'
   s.add_development_dependency 'nokogiri'
 

data/test/coffee_test.rb

@@ -16,7 +16,7 @@ class CoffeeTest < Test::Unit::TestCase
   it 'renders inline Coffee strings' do
     coffee_app { coffee "alert 'Aye!'\n" }
     assert ok?
-    assert_equal "(function() {\n  alert('Aye!');\n})();\n", body
+    assert_equal "(function() {\n  alert('Aye!');\n}).call(this);\n", body
   end
 
   it 'defaults content type to javascript' do
@@ -45,13 +45,13 @@ class CoffeeTest < Test::Unit::TestCase
   it 'renders .coffee files in views path' do
     coffee_app { coffee :hello }
     assert ok?
-    assert_equal "(function() {\n  alert(\"Aye!\");\n})();\n", body
+    assert_equal "(function() {\n  alert(\"Aye!\");\n}).call(this);\n", body
   end
 
   it 'ignores the layout option' do
     coffee_app { coffee :hello, :layout => :layout2 }
     assert ok?
-    assert_equal "(function() {\n  alert(\"Aye!\");\n})();\n", body
+    assert_equal "(function() {\n  alert(\"Aye!\");\n}).call(this);\n", body
   end
 
   it "raises error if template not found" do

data/test/filter_test.rb

@@ -255,6 +255,16 @@ class AfterFilterTest < Test::Unit::TestCase
     assert ran_filter
   end
 
+  it 'changes to path_info from a pattern matching before filter are respoected when routing' do
+    mock_app do
+      before('/foo') { request.path_info = '/bar' }
+      get('/bar') { 'blah' }
+    end
+    get '/foo'
+    assert ok?
+    assert_equal 'blah', body
+  end
+
   it 'generates block arguments from route pattern' do
     subpath = nil
     mock_app do

data/test/haml_test.rb

@@ -89,6 +89,11 @@ class HAMLTest < Test::Unit::TestCase
     assert ok?
     assert_match(/^<!DOCTYPE html PUBLIC (.*) HTML 4.01/, body)
   end
+
+  it "is possible to pass locals" do
+    haml_app { haml "= foo", :locals => { :foo => 'bar' }}
+    assert_equal "bar\n", body
+  end
 end
 rescue
   warn "#{$!.to_s}: skipping haml tests"

data/test/helper.rb

@@ -53,6 +53,10 @@ class Test::Unit::TestCase
     response.body.to_s
   end
 
+  def assert_body(value)
+    assert_equal value.lstrip.gsub(/\s*\n\s*/, ""), body.lstrip.gsub(/\s*\n\s*/, "")
+  end
+
   # Delegate other missing methods to response.
   def method_missing(name, *args, &block)
     if response && response.respond_to?(name)

data/test/helpers_test.rb

@@ -320,7 +320,7 @@ class HelpersTest < Test::Unit::TestCase
 
       get '/foo.xml'
       assert ok?
-      assert_equal 'application/foo;charset=utf-8', response['Content-Type']
+      assert_equal 'application/foo', response['Content-Type']
       assert_equal 'I AM FOO', body
     end
 
@@ -334,6 +334,32 @@ class HelpersTest < Test::Unit::TestCase
 
       assert_raise(RuntimeError) { get '/foo.xml' }
     end
+
+    it 'only sets default charset for specific mime types' do
+      tests_ran = false
+      mock_app do
+        mime_type :foo, 'text/foo'
+        mime_type :bar, 'application/bar'
+        mime_type :baz, 'application/baz'
+        add_charset << mime_type(:baz)
+        get '/' do
+          assert_equal content_type(:txt),    'text/plain;charset=utf-8'
+          assert_equal content_type(:css),    'text/css;charset=utf-8'
+          assert_equal content_type(:html),   'text/html;charset=utf-8'
+          assert_equal content_type(:foo),    'text/foo;charset=utf-8'
+          assert_equal content_type(:xml),    'application/xml;charset=utf-8'
+          assert_equal content_type(:xhtml),  'application/xhtml+xml;charset=utf-8'
+          assert_equal content_type(:js),     'application/javascript;charset=utf-8'
+          assert_equal content_type(:bar),    'application/bar'
+          assert_equal content_type(:png),    'image/png'
+          assert_equal content_type(:baz),    'application/baz;charset=utf-8'
+          tests_ran = true
+          "done"
+        end
+      end
+      get '/'
+      assert tests_ran
+    end
   end
 
   describe 'send_file' do
@@ -378,7 +404,7 @@ class HelpersTest < Test::Unit::TestCase
     it 'sets the Content-Type response header if type option is set to a mime type' do
       send_file_app :type => 'application/octet-stream'
       get '/file.txt'
-      assert_equal 'application/octet-stream;charset=utf-8', response['Content-Type']
+      assert_equal 'application/octet-stream', response['Content-Type']
     end
 
     it 'sets the Content-Length response header' do
@@ -420,13 +446,45 @@ class HelpersTest < Test::Unit::TestCase
       get '/file.txt'
       assert_equal 'attachment; filename="foo.txt"', response['Content-Disposition']
     end
+
+    it "is able to send files with unkown mime type" do
+      @file = File.dirname(__FILE__) + '/file.foobar'
+      File.open(@file, 'wb') { |io| io.write('Hello World') }
+      send_file_app
+      get '/file.txt'
+      assert_equal 'application/octet-stream', response['Content-Type']
+    end
+
+    it "does not override Content-Type if already set and no explicit type is given" do
+      path = @file
+      mock_app do
+        get '/' do
+          content_type :png
+          send_file path
+        end
+      end
+      get '/'
+      assert_equal 'image/png', response['Content-Type']
+    end
+
+    it "does override Content-Type even if already set, if explicit type is given" do
+      path = @file
+      mock_app do
+        get '/' do
+          content_type :png
+          send_file path, :type => :gif
+        end
+      end
+      get '/'
+      assert_equal 'image/gif', response['Content-Type']
+    end
   end
 
   describe 'cache_control' do
     setup do
       mock_app {
         get '/' do
-          cache_control :public, :no_cache, :max_age => 60
+          cache_control :public, :no_cache, :max_age => 60.0
           'Hello World'
         end
       }