rtomayko-sinatra 0.9.0 → 0.9.0.2

data/Rakefile

@@ -57,16 +57,17 @@ file package('.gem') => %w[dist/ sinatra.gemspec] + spec.files do |f|
 end
 
 file package('.tar.gz') => %w[dist/] + spec.files do |f|
-  sh "git archive --format=tar HEAD | gzip > #{f.name}"
+  sh <<-SH
+    git archive \
+      --prefix=sinatra-#{source_version}/ \
+      --format=tar \
+      HEAD | gzip > #{f.name}
+  SH
 end
 
 # Rubyforge Release / Publish Tasks ==================================
 
-desc 'Publish website to rubyforge'
-task 'publish:doc' => 'doc/api/index.html' do
-  sh 'scp -rp doc/* rubyforge.org:/var/www/gforge-projects/sinatra/'
-end
-
+desc 'Publish gem and tarball to rubyforge'
 task 'publish:gem' => [package('.gem'), package('.tar.gz')] do |t|
   sh <<-end
     rubyforge add_release sinatra sinatra #{spec.version} #{package('.gem')} &&
@@ -78,7 +79,7 @@ end
 # Building docs requires HAML and the hanna gem:
 #   gem install mislav-hanna --source=http://gems.github.com
 
-task 'doc'     => ['doc:api','doc:site']
+task 'doc'     => ['doc:api']
 
 desc 'Generate Hanna RDoc under doc/api'
 task 'doc:api' => ['doc/api/index.html']
@@ -104,47 +105,6 @@ def rdoc_to_html(file_name)
   rdoc.convert(File.read(file_name))
 end
 
-def haml(locals={})
-  require 'haml'
-  template = File.read('doc/template.haml')
-  haml = Haml::Engine.new(template, :format => :html4, :attr_wrapper => '"')
-  haml.render(Object.new, locals)
-end
-
-desc 'Build website HTML and stuff'
-task 'doc:site' => ['doc/index.html', 'doc/book.html']
-
-file 'doc/index.html' => %w[README.rdoc doc/template.haml] do |file|
-  File.open(file.name, 'w') do |file|
-    file << haml(:title => 'Sinatra', :content => rdoc_to_html('README.rdoc'))
-  end
-end
-CLEAN.include 'doc/index.html'
-
-file 'doc/book.html' => ['book/output/sinatra-book.html'] do |file|
-  File.open(file.name, 'w') do |file|
-    book_content = File.read('book/output/sinatra-book.html')
-    file << haml(:title => 'Sinatra Book', :content => book_content)
-  end
-end
-CLEAN.include 'doc/book.html'
-
-file 'book/output/sinatra-book.html' => FileList['book/**'] do |f|
-  unless File.directory?('book')
-    sh 'git clone git://github.com/cschneid/sinatra-book.git book'
-  end
-  sh((<<-SH).strip.gsub(/\s+/, ' '))
-    cd book &&
-    git fetch origin &&
-    git rebase origin/master &&
-    thor book:build
-  SH
-end
-CLEAN.include 'book/output/sinatra-book.html'
-
-desc 'Build the Sinatra book'
-task 'doc:book' => ['book/output/sinatra-book.html']
-
 # Gemspec Helpers ====================================================
 
 def source_version
@@ -152,7 +112,12 @@ def source_version
   line.match(/.*VERSION = '(.*)'/)[1]
 end
 
-file 'sinatra.gemspec' => FileList['{lib,test,images}/**','Rakefile'] do |f|
+project_files =
+  FileList[
+    '{lib,test,compat,images}/**',
+    'Rakefile', 'CHANGES', 'README.rdoc'
+  ]
+file 'sinatra.gemspec' => project_files do |f|
   # read spec file and split out manifest section
   spec = File.read(f.name)
   head, manifest, tail = spec.split("  # = MANIFEST =\n")

data/compat/events_test.rb

@@ -1,7 +1,6 @@
 require File.dirname(__FILE__) + '/helper'
 
 context "Simple Events" do
-
   def simple_request_hash(method, path)
     Rack::Request.new({
       'REQUEST_METHOD' => method.to_s.upcase,
@@ -14,16 +13,16 @@ context "Simple Events" do
 
   def invoke_simple(path, request_path, &b)
     params = nil
-    mock_app {
-      get path do
-        params = self.params
-        b.call if b
-      end
-    }
+    get path do
+      params = self.params
+      b.call if b
+    end
     get_it request_path
     MockResult.new(b, params)
   end
 
+  setup { Sinatra.application = nil }
+
   specify "return last value" do
     block = Proc.new { 'Simple' }
     result = invoke_simple('/', '/', &block)
@@ -38,6 +37,7 @@ context "Simple Events" do
     result.params.should.equal "foo" => 'a', "bar" => 'b'
 
     # unscapes
+    Sinatra.application = nil
     result = invoke_simple('/:foo/:bar', '/a/blake%20mizerany')
     result.should.not.be.nil
     result.params.should.equal "foo" => 'a', "bar" => 'blake mizerany'
@@ -48,14 +48,17 @@ context "Simple Events" do
     result.should.not.be.nil
     result.params.should.equal "foo" => 'a', "bar" => 'b'
 
+    Sinatra.application = nil
     result = invoke_simple('/?:foo?/?:bar?', '/a/')
     result.should.not.be.nil
     result.params.should.equal "foo" => 'a', "bar" => nil
 
+    Sinatra.application = nil
     result = invoke_simple('/?:foo?/?:bar?', '/a')
     result.should.not.be.nil
     result.params.should.equal "foo" => 'a', "bar" => nil
 
+    Sinatra.application = nil
     result = invoke_simple('/:foo?/?:bar?', '/')
     result.should.not.be.nil
     result.params.should.equal "foo" => nil, "bar" => nil

data/compat/helper.rb

@@ -1,6 +1,9 @@
 require 'rubygems'
 require 'mocha'
 
+# disable warnings in compat specs.
+$VERBOSE = nil
+
 $:.unshift File.dirname(File.dirname(__FILE__)) + "/lib"
 
 ENV['RACK_ENV'] ||= 'test'
@@ -10,9 +13,18 @@ require 'sinatra/test'
 require 'sinatra/test/unit'
 require 'sinatra/test/spec'
 
+module Sinatra::Test
+  # we need to remove the new test helper methods since they conflict with
+  # the top-level methods of the same name.
+  %w(get head post put delete).each do |verb|
+    remove_method verb
+  end
+  include Sinatra::Delegator
+end
+
 class Test::Unit::TestCase
+  include Sinatra::Test
   def setup
     @app = lambda { |env| Sinatra::Application.call(env) }
   end
-  include Sinatra::Test
 end

data/lib/sinatra.rb

@@ -1,3 +1,8 @@
+libdir = File.dirname(__FILE__)
+$LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
+
 require 'sinatra/base'
 require 'sinatra/main'
 require 'sinatra/compat'
+
+use_in_file_templates!

data/lib/sinatra/base.rb

@@ -4,12 +4,23 @@ require 'rack'
 require 'rack/builder'
 
 module Sinatra
-  VERSION = '0.9.0'
+  VERSION = '0.9.0.2'
 
   class Request < Rack::Request
     def user_agent
       @env['HTTP_USER_AGENT']
     end
+
+    def accept
+      @env['HTTP_ACCEPT'].split(',').map { |a| a.strip }
+    end
+
+    # Override Rack 0.9.x's #params implementation (see #72 in lighthouse)
+    def params
+      self.GET.update(self.POST)
+    rescue EOFError => boom
+      self.GET
+    end
   end
 
   class Response < Rack::Response
@@ -66,7 +77,7 @@ module Sinatra
     def redirect(uri, *args)
       status 302
       response['Location'] = uri
-      halt *args
+      halt(*args)
     end
 
     # Halt processing and return the error status provided.
@@ -88,9 +99,7 @@ module Sinatra
 
     # Look up a media type by file extension in Rack's mime registry.
     def media_type(type)
-      return type if type.nil? || type.to_s.include?('/')
-      type = ".#{type}" unless type.to_s[0] == ?.
-      Rack::Mime.mime_type(type, nil)
+      Base.media_type(type)
     end
 
     # Set the Content-Type of the response body given a media type or file
@@ -133,7 +142,7 @@ module Sinatra
     class StaticFile < ::File #:nodoc:
       alias_method :to_path, :path
       def each
-        while buf = read(8196)
+        while buf = read(8192)
           yield buf
         end
       end
@@ -208,6 +217,7 @@ module Sinatra
 
     def lookup_layout(engine, options)
       return if options[:layout] == false
+      options.delete(:layout) if options[:layout] == true
       template = options[:layout] || :layout
       data = lookup_template(engine, template, options)
       [template, data]
@@ -296,10 +306,10 @@ module Sinatra
     attr_accessor :env, :request, :response, :params
 
     def call!(env)
-      @env = env
-      @request = Request.new(env)
+      @env      = env
+      @request  = Request.new(env)
       @response = Response.new
-      @params = nil
+      @params   = nil
       error_detection { dispatch! }
       @response.finish
     end
@@ -318,13 +328,16 @@ module Sinatra
 
   private
     def dispatch!
-      self.class.filters.each {|block| instance_eval(&block)}
+      self.class.filters.each do |block|
+        res = catch(:halt) { instance_eval(&block) ; :continue }
+        return unless res == :continue
+      end
+
       if routes = self.class.routes[@request.request_method]
         path = @request.path_info
-        original_params = Hash.new{ |hash,k| hash[k.to_s] if Symbol === k }
-        original_params.merge! @request.params
+        original_params = nested_params(@request.params)
 
-        routes.each do |pattern, keys, conditions, block|
+        routes.each do |pattern, keys, conditions, method_name|
           if pattern =~ path
             values = $~.captures.map{|val| val && unescape(val) }
             params =
@@ -342,13 +355,12 @@ module Sinatra
               else
                 {}
               end
-            @params = original_params.dup
-            @params.merge!(params)
+            @params = original_params.merge(params)
 
             catch(:pass) {
               conditions.each { |cond|
                 throw :pass if instance_eval(&cond) == false }
-              return invoke(block)
+              return invoke(method_name)
             }
           end
         end
@@ -356,8 +368,26 @@ module Sinatra
       raise NotFound
     end
 
+    def nested_params(params)
+      return indifferent_hash.merge(params) if !params.keys.join.include?('[')
+      params.inject indifferent_hash do |res, (key,val)|
+        if key =~ /\[.*\]/
+          splat = key.scan(/(^[^\[]+)|\[([^\]]+)\]/).flatten.compact
+          head, last = splat[0..-2], splat[-1]
+          head.inject(res){ |s,v| s[v] ||= indifferent_hash }[last] = val
+        end
+        res
+      end
+    end
+
+    def indifferent_hash
+      Hash.new {|hash,key| hash[key.to_s] if Symbol === key }
+    end
+
     def invoke(block)
       res = catch(:halt) { instance_eval(&block) }
+      return if res.nil?
+
       case
       when res.respond_to?(:to_str)
         @response.body = [res]
@@ -377,17 +407,12 @@ module Sinatra
         else
           @response.body = res
         end
-      when res.kind_of?(Symbol)  # TODO: deprecate this.
-        @response.body = __send__(res)
       when res.respond_to?(:each)
         @response.body = res
       when (100...599) === res
         @response.status = res
-      when res.nil?
-        @response.body = []
-      else
-        raise TypeError, "#{res.inspect} not supported"
       end
+
       res
     end
 
@@ -402,6 +427,12 @@ module Sinatra
       invoke handler unless handler.nil?
     rescue ::Exception => boom
       @env['sinatra.error'] = boom
+
+      if options.dump_errors?
+        msg = ["#{boom.class} - #{boom.message}:", *boom.backtrace].join("\n ")
+        @env['rack.errors'] << msg
+      end
+
       raise boom if options.raise_errors?
       @response.status = 500
       invoke errmap[boom.class] || errmap[Exception]
@@ -454,6 +485,10 @@ module Sinatra
         end
       end
 
+      def not_found(&block)
+        error 404, &block
+      end
+
       def template(name, &block)
         templates[name] = block
       end
@@ -463,11 +498,16 @@ module Sinatra
       end
 
       def use_in_file_templates!
-        line = caller.detect { |s| s !~ /lib\/sinatra.*\.rb/ &&
-          s !~ /\(.*\)/ }
+        line = caller.detect do |s|
+          [
+           /lib\/sinatra.*\.rb/,
+           /\(.*\)/,
+           /rubygems\/custom_require\.rb/
+          ].all? { |x| s !~ x }
+        end
         file = line.sub(/:\d+.*$/, '')
         if data = ::IO.read(file).split('__END__')[1]
-          data.gsub! /\r\n/, "\n"
+          data.gsub!(/\r\n/, "\n")
           template = nil
           data.each_line do |line|
             if line =~ /^@@\s*(.*)/
@@ -479,6 +519,13 @@ module Sinatra
         end
       end
 
+      # Look up a media type by file extension in Rack's mime registry.
+      def media_type(type)
+        return type if type.nil? || type.to_s.include?('/')
+        type = ".#{type}" unless type.to_s[0] == ?.
+        Rack::Mime.mime_type(type, nil)
+      end
+
       def before(&block)
         @filters << block
       end
@@ -502,9 +549,24 @@ module Sinatra
         }
       end
 
+      def accept_mime_types(types)
+        types = [types] unless types.kind_of? Array
+        types.map!{|t| media_type(t)}
+
+        condition {
+          matching_types = (request.accept & types)
+          unless matching_types.empty?
+            response.headers['Content-Type'] = matching_types.first
+            true
+          else
+            false
+          end
+        }
+      end
+
       def get(path, opts={}, &block)
         conditions = @conditions.dup
-        route 'GET', path, opts, &block
+        route('GET', path, opts, &block)
 
         @conditions = conditions
         head(path, opts) { invoke(block) ; [] }
@@ -516,14 +578,20 @@ module Sinatra
       def head(path, opts={}, &bk); route 'HEAD', path, opts, &bk; end
 
     private
-      def route(method, path, opts={}, &block)
+      def route(verb, path, opts={}, &block)
         host_name  opts[:host]  if opts.key?(:host)
         user_agent opts[:agent] if opts.key?(:agent)
+        accept_mime_types opts[:provides] if opts.key?(:provides)
 
         pattern, keys = compile(path)
         conditions, @conditions = @conditions, []
-        (routes[method] ||= []).
-          push [pattern, keys, conditions, block]
+
+        define_method "#{verb} #{path}", &block
+        unbound_method = instance_method("#{verb} #{path}")
+        block = lambda { unbound_method.bind(self).call }
+
+        (routes[verb] ||= []).
+          push([pattern, keys, conditions, block]).last
       end
 
       def compile(path)
@@ -562,8 +630,8 @@ module Sinatra
       end
 
       def run!(options={})
-        set(options)
-        handler = Rack::Handler.get(server)
+        set options
+        handler = detect_rack_handler
         handler_name = handler.name.gsub(/.*::/, '')
         puts "== Sinatra/#{Sinatra::VERSION} has taken the stage " +
           "on #{port} for #{environment} with backup from #{handler_name}"
@@ -584,6 +652,17 @@ module Sinatra
       end
 
     private
+      def detect_rack_handler
+        servers = Array(self.server)
+        servers.each do |server_name|
+          begin
+            return Rack::Handler.get(server_name)
+          rescue LoadError
+          end
+        end
+        fail "Server handler (#{servers.join(',')}) not found."
+      end
+
       def construct_middleware(builder=Rack::Builder.new)
         builder.use Rack::Session::Cookie if sessions?
         builder.use Rack::CommonLogger if logging?
@@ -622,6 +701,7 @@ module Sinatra
     end
 
     set :raise_errors, true
+    set :dump_errors, false
     set :sessions, false
     set :logging, false
     set :methodoverride, false
@@ -629,7 +709,7 @@ module Sinatra
     set :environment, (ENV['RACK_ENV'] || :development).to_sym
 
     set :run, false
-    set :server, (defined?(Rack::Handler::Thin) ? "thin" : "mongrel")
+    set :server, %w[thin mongrel webrick]
     set :host, '0.0.0.0'
     set :port, 4567
 
@@ -715,34 +795,45 @@ module Sinatra
 
   class Default < Base
     set :raise_errors, false
+    set :dump_errors, true
     set :sessions, false
     set :logging, true
     set :methodoverride, true
     set :static, true
     set :run, false
     set :reload, Proc.new { app_file? && development? }
+    set :lock, Proc.new { reload? }
 
-    @reloading = false
-
-    class << self
-      def reloading?
-        @reloading
-      end
+    def self.reloading?
+      @reloading ||= false
+    end
 
-      def configure(*envs)
-        super unless reloading?
-      end
+    def self.configure(*envs)
+      super unless reloading?
+    end
 
-      def call(env)
+    def self.call(env)
+      synchronize do
         reload! if reload?
         super
       end
+    end
+
+    def self.reload!
+      @reloading = true
+      superclass.send :inherited, self
+      $LOADED_FEATURES.delete("sinatra.rb")
+      ::Kernel.load app_file
+      @reloading = false
+    end
 
-      def reload!
-        @reloading = true
-        superclass.send :inherited, self
-        ::Kernel.load app_file
-        @reloading = false
+  private
+    @@mutex = Mutex.new
+    def self.synchronize(&block)
+      if lock?
+        @@mutex.synchronize(&block)
+      else
+        yield
       end
     end
   end