sinatra 1.2.6 → 1.2.7

data/README.ru.rdoc

@@ -1014,7 +1014,7 @@ DSL верхнего уровня загрязняет пространство
 Rack-совместимый сервер приложений.
 
   # config.ru
-  require 'my_app'
+  require './my_app'
   run MyApp
 
 Запускаем:
@@ -1034,7 +1034,7 @@ Rack-совместимый сервер приложений.
 
 И соответствующий <tt>config.ru</tt>:
 
-  require 'app'
+  require './app'
   run Sinatra::Application
 
 === Когда использовать config.ru?

data/README.zh.rdoc

@@ -884,7 +884,7 @@ Session被用来在请求之间保持状态。如果被激活，每一个用户
   get '/foo' do
     status 418
     headers \
-      "Allow"   => "BREW, POST, GET, PROPFIND, WHEN"
+      "Allow"   => "BREW, POST, GET, PROPFIND, WHEN",
       "Refresh" => "Refresh: 20; http://www.ietf.org/rfc/rfc2324.txt"
     body "I'm a tea pot!"
   end
@@ -948,7 +948,7 @@ Sinatra并不理解。使用 +mime_type+ 通过文件扩展名来注册它们：
 
 或者使用session:
 
-  enable :session
+  enable :sessions
 
   get '/foo' do
     session[:secret] = 'foo'
@@ -1500,7 +1500,7 @@ Sinatra::Base子类可用的方法实际上就是通过顶层 DSL
 或者使用一个 <tt>config.ru</tt>，允许你使用任何Rack处理器:
 
   # config.ru
-  require 'my_app'
+  require './my_app'
   run MyApp
 
 运行:
@@ -1520,7 +1520,7 @@ Sinatra::Base子类可用的方法实际上就是通过顶层 DSL
 
 加入相应的 <tt>config.ru</tt>:
 
-  require 'app'
+  require './app'
   run Sinatra::Application
 
 === 什么时候用 config.ru?

data/Rakefile

@@ -3,6 +3,12 @@ require 'rake/testtask'
 require 'fileutils'
 require 'date'
 
+# CI Reporter is only needed for the CI
+begin
+  require 'ci/reporter/rake/test_unit'
+rescue LoadError
+end
+
 task :default => :test
 task :spec => :test
 
@@ -37,6 +43,16 @@ Rake::TestTask.new(:test) do |t|
   t.ruby_opts << '-I.'
 end
 
+Rake::TestTask.new(:"test:core") do |t|
+  core_tests = %w[base delegator encoding extensions filter
+     helpers mapped_error middleware radius rdoc
+     readme request response result route_added_hook
+     routing server settings sinatra static templates]
+  t.test_files = core_tests.map {|n| "test/#{n}_test.rb"}
+  t.ruby_opts = ["-rubygems"] if defined? Gem
+  t.ruby_opts << "-I."
+end
+
 # Rcov ================================================================
 
 namespace :test do
@@ -67,7 +83,7 @@ task :add_template, [:name] do |t, args|
         puts "Liquid not found in #{file}"
       else
         puts "Adding section to #{file}"
-        template = template.gsub(/Liquid/, args.name.capitalize).gsub(/liquid/, args.name.downcase)        
+        template = template.gsub(/Liquid/, args.name.capitalize).gsub(/liquid/, args.name.downcase)
         code.gsub! /^(\s*===.*CoffeeScript)/, "\n" << template << "\n\\1"
         File.open(file, "w") { |f| f << code }
       end
@@ -90,18 +106,22 @@ task :thanks, [:release,:backports] do |t, a|
     "(based on commits included in #{a.release}, but not in #{a.backports})"
 end
 
-task :authors, [:format, :sep] do |t, a|
-  a.with_defaults :format => "%s (%d)", :sep => ', '
+desc "list of authors"
+task :authors, [:commit_range, :format, :sep] do |t, a|
+  a.with_defaults :format => "%s (%d)", :sep => ", ", :commit_range => '--all'
   authors = Hash.new { |h,k| h[k] = 0 }
   blake   = "Blake Mizerany"
+  overall = 0
   mapping = {
     "blake.mizerany@gmail.com" => blake, "bmizerany" => blake,
     "a_user@mac.com" => blake, "ichverstehe" => "Harry Vangberg",
     "Wu Jiang (nouse)" => "Wu Jiang" }
-  `git shortlog -s`.lines.map do |line|
+  `git shortlog -s #{a.commit_range}`.lines.map do |line|
     num, name = line.split("\t", 2).map(&:strip)
     authors[mapping[name] || name] += num.to_i
+    overall += num.to_i
   end
+  puts "#{overall} commits by #{authors.count} authors:"
   puts authors.sort_by { |n,c| -c }.map { |e| a.format % e }.join(a.sep)
 end
 
@@ -147,9 +167,8 @@ if defined?(Gem)
     # read spec file and split out manifest section
     spec = File.read(f.name)
     head, manifest, tail = spec.split("  # = MANIFEST =\n")
-    # replace version and date
+    # replace version
     head.sub!(/\.version = '.*'/, ".version = '#{source_version}'")
-    head.sub!(/\.date = '.*'/, ".date = '#{Date.today.to_s}'")
     # determine file list from git ls-files
     files = `git ls-files`.
       split("\n").

data/lib/sinatra/base.rb

@@ -7,7 +7,7 @@ require 'sinatra/showexceptions'
 require 'tilt'
 
 module Sinatra
-  VERSION = '1.2.6'
+  VERSION = '1.2.7'
 
   # The request object. See Rack::Request for more info:
   # http://rack.rubyforge.org/doc/classes/Rack/Request.html
@@ -16,7 +16,7 @@ module Sinatra
     def accept
       @env['sinatra.accept'] ||= begin
         entries = @env['HTTP_ACCEPT'].to_s.split(',')
-        entries.map { |e| accept_entry(e) }.sort_by(&:last).map(&:first)
+        entries.map { |e| accept_entry(e) }.sort_by { |e| e.last }.map { |e| e.first }
       end
     end
 
@@ -69,16 +69,16 @@ module Sinatra
   # http://rack.rubyforge.org/doc/classes/Rack/Response.html
   # http://rack.rubyforge.org/doc/classes/Rack/Response/Helpers.html
   class Response < Rack::Response
-    def finish
-      @body = block if block_given?
+    def finish(&block)
       if [204, 304].include?(status.to_i)
         header.delete "Content-Type"
+        header.delete "Content-Length"
         [status.to_i, header.to_hash, []]
       else
-        body = @body || []
-        body = [body] if body.respond_to? :to_str
-        if body.respond_to?(:to_ary)
-          header["Content-Length"] = body.to_ary.
+        body = block || @body || []
+        body = [body] if String === body
+        if Array === body
+          header["Content-Length"] = body.
             inject(0) { |len, part| len + Rack::Utils.bytesize(part) }.to_s
         end
         [status.to_i, header.to_hash, body]
@@ -127,9 +127,7 @@ module Sinatra
       return addr if addr =~ /\A[A-z][A-z0-9\+\.\-]*:/
       uri = [host = ""]
       if absolute
-        host << 'http'
-        host << 's' if request.secure?
-        host << "://"
+        host << "http#{'s' if request.secure?}://"
         if request.forwarded? or request.port != (request.secure? ? 443 : 80)
           host << request.host_with_port
         else
@@ -240,6 +238,11 @@ module Sinatra
 
       attr_accessor :range  # a Range or nil
 
+      def initialize(*args)
+        super(*args)
+        @range = nil
+      end
+
       # Checks for byte-ranges in the request and sets self.range appropriately.
       # Returns false if the ranges are unsatisfiable and the request should return 416.
       def parse_ranges(env, size)
@@ -281,6 +284,10 @@ module Sinatra
         ranges
       end
 
+      def close
+        super unless closed?
+      end
+
       CHUNK_SIZE = 8192
 
       def each
@@ -451,6 +458,11 @@ module Sinatra
       attr_accessor :content_type
     end
 
+    def initialize
+      super
+      @default_layout = :layout
+    end
+
     def erb(template, options={}, locals={})
       render :erb, template, options, locals
     end
@@ -548,7 +560,6 @@ module Sinatra
       # 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
@@ -619,6 +630,7 @@ module Sinatra
     attr_reader   :template_cache
 
     def initialize(app=nil)
+      super()
       @app = app
       @template_cache = Tilt::Cache.new
       yield self if block_given?
@@ -644,7 +656,7 @@ module Sinatra
       invoke { dispatch! }
       invoke { error_block!(response.status) }
       unless @response['Content-Type']
-        if body.respond_to?(:to_ary) and body.first.respond_to? :content_type
+        if Array === body and body.first.respond_to? :content_type
           content_type body.first.content_type
         else
           content_type :html
@@ -804,15 +816,14 @@ module Sinatra
     end
 
     # Run the block with 'throw :halt' support and apply result to the response.
-    def invoke(&block)
-      res = catch(:halt) { instance_eval(&block) }
+    def invoke
+      res = catch(:halt) { yield }
       return if res.nil?
 
       case
       when res.respond_to?(:to_str)
         @response.body = [res]
-      when res.respond_to?(:to_ary)
-        res = res.to_ary
+      when Array === res
         if Fixnum === res.first
           if res.length == 3
             @response.status, headers, body = res
@@ -1069,6 +1080,15 @@ module Sinatra
         @conditions << block
       end
 
+      def public=(value)
+        set :public_folder, value
+      end
+
+      def public(*)
+        super
+        public_folder
+      end
+
    private
       # Condition for matching host name. Parameter might be String or Regexp.
       def host_name(pattern)
@@ -1186,7 +1206,7 @@ module Sinatra
       # Makes the methods defined in the block and in the Modules given
       # in `extensions` available to the handlers and templates
       def helpers(*extensions, &block)
-        class_eval(&block)  if block_given?
+        class_eval(&block)   if block_given?
         include(*extensions) if extensions.any?
       end
 
@@ -1220,7 +1240,7 @@ module Sinatra
       def quit!(server, handler_name)
         # Use Thin's hard #stop! if available, otherwise just #stop.
         server.respond_to?(:stop!) ? server.stop! : server.stop
-        puts "\n== Sinatra has ended his set (crowd applauds)" unless handler_name =~/cgi/i
+        $stderr.puts "\n== Sinatra has ended his set (crowd applauds)" unless handler_name =~/cgi/i
       end
 
       # Run the Sinatra app as a self-hosted server using
@@ -1229,14 +1249,14 @@ module Sinatra
         set options
         handler      = detect_rack_handler
         handler_name = handler.name.gsub(/.*::/, '')
-        puts "== Sinatra/#{Sinatra::VERSION} has taken the stage " +
+        $stderr.puts "== Sinatra/#{Sinatra::VERSION} has taken the stage " +
           "on #{port} for #{environment} with backup from #{handler_name}" unless handler_name =~/cgi/i
         handler.run self, :Host => bind, :Port => port do |server|
           [:INT, :TERM].each { |sig| trap(sig) { quit!(server, handler_name) } }
           set :running, true
         end
       rescue Errno::EADDRINUSE => e
-        puts "== Someone is already performing on port #{port}!"
+        $stderr.puts "== Someone is already performing on port #{port}!"
       end
 
       # The prototype instance used to process requests.
@@ -1282,7 +1302,7 @@ module Sinatra
         servers = Array(server)
         servers.each do |server_name|
           begin
-            return Rack::Handler.get(server_name.downcase)
+            return Rack::Handler.get(server_name)
           rescue LoadError
           rescue NameError
           end
@@ -1313,7 +1333,7 @@ module Sinatra
       CALLERS_TO_IGNORE = [ # :nodoc:
         /\/sinatra(\/(base|main|showexceptions))?\.rb$/, # all sinatra code
         /lib\/tilt.*\.rb$/,                              # all tilt code
-        /\(.*\)/,                                        # generated code
+        /^\(.*\)$/,                                      # generated code
         /rubygems\/custom_require\.rb$/,                 # rubygems require hacks
         /active_support/,                                # active_support require hacks
         /bundler(\/runtime)?\.rb/,                       # bundler require hacks
@@ -1350,7 +1370,7 @@ module Sinatra
       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 encoding
+          data.force_encoding(encoding).encode!
         elsif data.respond_to? :each_value
           data.each_value { |v| force_encoding(v, encoding) }
         elsif data.respond_to? :each
@@ -1360,7 +1380,7 @@ module Sinatra
       end
     else
       def self.force_encoding(data, *) data end
-      end
+    end
 
     reset!
 
@@ -1372,7 +1392,8 @@ 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']
+    set :add_charset, %w[javascript xml xhtml+xml json].map { |t| "application/#{t}" }
+    settings.add_charset << /^text\//
 
     # explicitly generating this eagerly to play nice with preforking
     set :session_secret, '%x' % rand(2**255)
@@ -1398,7 +1419,7 @@ module Sinatra
     set :reload_templates, Proc.new { development? or RUBY_VERSION < '1.8.7' }
     set :lock, false
 
-    set :public, Proc.new { root && File.join(root, 'public') }
+    set :public_folder, Proc.new { root && File.join(root, 'public') }
     set :static, Proc.new { public && File.exist?(public) }
 
     error ::Exception do
@@ -1446,7 +1467,7 @@ module Sinatra
   #
   # The Application class should not be subclassed, unless you want to
   # inherit all settings, routes, handlers, and error pages from the
-  # top-level. Subclassing Sinatra::Base is heavily recommended for
+  # top-level. Subclassing Sinatra::Base is highly recommended for
   # modular applications.
   class Application < Base
     set :logging, Proc.new { ! test? }

data/lib/sinatra/main.rb

@@ -16,7 +16,7 @@ module Sinatra
         op.on('-x')        {       set :lock, true }
         op.on('-e env')    { |val| set :environment, val.to_sym }
         op.on('-s server') { |val| set :server, val }
-        op.on('-p port')   { |val| set :port, val.to_i }
+        op.on('-p port')   { |val| set :port, Integer(val) }
         op.on('-o addr')   { |val| set :bind, val }
       }.parse!(ARGV.dup)
     end

data/lib/sinatra/showexceptions.rb

@@ -252,7 +252,7 @@ TEMPLATE = <<-HTML # :nodoc:
 
     <div id="get">
       <h3 id="get-info">GET</h3>
-      <% unless req.GET.empty? %>
+      <% if req.GET and not req.GET.empty? %>
         <table class="req">
           <tr>
             <th>Variable</th>
@@ -273,7 +273,7 @@ TEMPLATE = <<-HTML # :nodoc:
 
     <div id="post">
       <h3 id="post-info">POST</h3>
-      <% unless req.POST.empty? %>
+      <% if req.POST and not req.POST.empty? %>
         <table class="req">
           <tr>
             <th>Variable</th>

data/sinatra.gemspec

@@ -3,8 +3,7 @@ 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.6'
-  s.date = '2011-05-01'
+  s.version = '1.2.7'
 
   s.description = "Classy web-development dressed in a DSL"
   s.summary     = "Classy web-development dressed in a DSL"
@@ -58,6 +57,7 @@ Gem::Specification.new do |s|
     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/request_test.rb

data/test/delegator_test.rb

@@ -1,3 +1,5 @@
+require File.expand_path('../helper', __FILE__)
+
 class DelegatorTest < Test::Unit::TestCase
   class Mirror
     attr_reader :last_call

data/test/helpers_test.rb

@@ -419,6 +419,7 @@ class HelpersTest < Test::Unit::TestCase
           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(:json),   'application/json;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'

data/test/nokogiri_test.rb

@@ -15,7 +15,7 @@ class NokogiriTest < Test::Unit::TestCase
   it 'renders inline Nokogiri strings' do
     nokogiri_app { nokogiri 'xml' }
     assert ok?
-    assert_body %{<?xml version="1.0"?>\n}
+    assert_body %(<?xml version="1.0"?>\n)
   end
 
   it 'renders inline blocks' do
@@ -26,7 +26,7 @@ class NokogiriTest < Test::Unit::TestCase
       end
     end
     assert ok?
-    assert_body "<?xml version=\"1.0\"?>\n<couple>Frank &amp; Mary</couple>\n"
+    assert_body %(<?xml version="1.0"?>\n<couple>Frank &amp; Mary</couple>\n)
   end
 
   it 'renders .nokogiri files in views path' do
@@ -35,7 +35,7 @@ class NokogiriTest < Test::Unit::TestCase
       nokogiri :hello
     end
     assert ok?
-    assert_body %(<?xml version="1.0"?>\n<exclaim>You're my boy, Blue!</exclaim>\n)
+    assert_body "<?xml version=\"1.0\"?>\n<exclaim>You're my boy, Blue!</exclaim>\n"
   end
 
   it "renders with inline layouts" do
@@ -46,17 +46,16 @@ class NokogiriTest < Test::Unit::TestCase
     end
     get '/'
     assert ok?
-    assert_body "<?xml version=\"1.0\"?>\n<layout>\n  <em>Hello World</em>\n</layout>\n"
+    assert_body %(<?xml version="1.0"?>\n<layout>\n  <em>Hello World</em>\n</layout>\n)
   end
 
   it "renders with file layouts" do
     next if Tilt::VERSION <= "1.1"
     nokogiri_app do
-      @name = "Blue"
       nokogiri %(xml.em 'Hello World'), :layout => :layout2
     end
     assert ok?
-    assert_body "<?xml version=\"1.0\"?>\n<layout>\n  <em>Hello World</em>\n</layout>\n"
+    assert_body %(<?xml version="1.0"?>\n<layout>\n  <em>Hello World</em>\n</layout>\n)
   end
 
   it "raises error if template not found" do