sinatra 0.9.4 → 0.9.5

data/AUTHORS

@@ -10,6 +10,8 @@ Sinatra would not be possible:
 * Ryan Tomayko (rtomayko) for constantly fixing whitespace errors 60d5006   
 * Ezra Zygmuntowicz (ezmobius) for initial help and letting Blake steal
   some of merbs internal code.
+* Ari Lerner (http://xnot.org/) for his evangelism, spirit, and gumption
+  that got Sinatra recognized from Day 1.
 * Christopher Schneid (cschneid) for The Book, the blog (gittr.com),
   irclogger.com, and a bunch of useful patches.
 * Markus Prinz (cypher) for patches over the years, caring about

data/CHANGES

@@ -1,3 +1,28 @@
+= 0.9.5 / unreleased
+
+ * Fix use_in_file_templates! with jRuby on Windows.
+
+ * Fix sinatra/test to work with Rack > 1.0.1
+
+ * UI improvements to the show exception page.
+
+ * Slightly improved doc coverage.
+
+ * New 'settings' method gives access to options in both class and request
+   scopes. This replaces the 'options' method. (Chris Wanstrath)
+
+ * `Sinatra::Default` is obsolete; use `Sinatra::Base` instead.
+   `Sinatra::Base` acts more like `Sinatra::Default` in development mode.
+   For example, static file serving and sexy development error pages are
+   enabled by default.
+
+ * The `:methodoverride' option to enable/disable the POST _method hack is
+   obsolete; use `:method_override` instead.
+
+ * The 'media_type' helper method is deprecated. Use 'mime_type' instead.
+
+ * The 'mime' main and class method is deprecated. Use 'mime_type' instead.
+
 = 0.9.4 / 2009-07-26
 
  * The app_file and run options should be properly detected

data/README.rdoc

@@ -187,10 +187,9 @@ and overridden on an individual basis.
 
   get '/stylesheet.css' do
     content_type 'text/css', :charset => 'utf-8'
-    sass :stylesheet, :sass_options => {:style => :expanded } # overridden
+    sass :stylesheet, :style => :expanded # overridden
   end
 
-
 === Inline Templates
 
   get '/' do
@@ -219,7 +218,7 @@ Or, specify an explicit Hash of local variables:
 This is typically used when rendering templates as partials from within
 other templates.
 
-=== In-file Templates
+=== Inline Templates
 
 Templates may be defined at the end of the source file:
 
@@ -239,9 +238,9 @@ Templates may be defined at the end of the source file:
   @@ index
   %div.title Hello world!!!!!
 
-NOTE: In-file templates defined in the source file that requires sinatra
-are automatically loaded. Call the <tt>use_in_file_templates!</tt>
-method explicitly if you have in-file templates in other source files.
+NOTE: Inline templates defined in the source file that requires sinatra
+are automatically loaded. Call `enable :inline_templates` explicitly if you
+have inline templates in other source files.
 
 === Named Templates
 
@@ -303,25 +302,33 @@ To immediately stop a request during a before filter or route use:
 
   halt
 
-You can also specify a body when halting ...
+You can also specify the status when halting ...
+
+  halt 410
+
+Or the body ...
 
   halt 'this will be the body'
 
-Or set the status and body ...
+Or both ...
 
   halt 401, 'go away!'
 
+With headers ...
+
+  halt 402, {'Content-Type' => 'text/plain'}, 'revenge'
+
 == Passing
 
 A route can punt processing to the next matching route using <tt>pass</tt>:
 
   get '/guess/:who' do
     pass unless params[:who] == 'Frank'
-    "You got me!"
+    'You got me!'
   end
 
   get '/guess/*' do
-    "You missed!"
+    'You missed!'
   end
 
 The route block is immediately exited and control continues with the next
@@ -390,15 +397,35 @@ You get this:
 
   So what happened was... something bad
 
+Alternatively, you can install error handler for a status code:
+
+  error 403 do
+    'Access forbidden'
+  end
+
+  get '/secret' do
+    403
+  end
+
+Or a range:
+
+  error 400..510 do
+    'Boom'
+  end
+
 Sinatra installs special <tt>not_found</tt> and <tt>error</tt> handlers when
 running under the development environment.
 
 == Mime types
 
 When using <tt>send_file</tt> or static files you may have mime types Sinatra
-doesn't understand. Use +mime+ to register them by file extension:
+doesn't understand. Use +mime_type+ to register them by file extension:
+
+  mime_type :foo, 'text/foo'
+
+You can also use it with the +content_type+ helper:
 
-  mime :foo, 'text/foo'
+  content_type :foo
 
 == Rack Middleware
 

data/Rakefile

@@ -35,14 +35,7 @@ end
 
 # Load the gemspec using the same limitations as github
 def spec
-  @spec ||=
-    begin
-      require 'rubygems/specification'
-      data = File.read('sinatra.gemspec')
-      spec = nil
-      Thread.new { spec = eval("$SAFE = 3\n#{data}") }.join
-      spec
-    end
+  @spec ||= eval(File.read('sinatra.gemspec'))
 end
 
 def package(ext='')

data/compat/compat_test.rb

@@ -7,6 +7,6 @@ context "Compat" do
   end
 
   specify "makes EventContext available" do
-    assert_same Sinatra::Default, Sinatra::EventContext
+    assert_same Sinatra::Application, Sinatra::EventContext
   end
 end

data/compat/haml_test.rb

@@ -1,6 +1,7 @@
 require File.dirname(__FILE__) + '/helper'
 
 context "Haml" do
+  include Mocha::API
 
   setup do
     Sinatra.application = nil

data/compat/helper.rb

@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'mocha'
 
 # disable warnings in compat specs.
@@ -23,11 +22,13 @@ module Sinatra::Test
 end
 
 class Test::Unit::TestCase
+  include Mocha::API
   include Sinatra::Test
 
   PASSTHROUGH_EXCEPTIONS = [] unless const_defined?(:PASSTHROUGH_EXCEPTIONS)
 
   def setup
     @app = lambda { |env| Sinatra::Application.call(env) }
+    mocha_teardown
   end
 end

data/compat/sym_params_test.rb

@@ -14,6 +14,5 @@ context "Symbol Params" do
     get_it '/', :foo => "X"
     assert_equal('XX', body)
   end
-
 end
 

data/lib/sinatra.rb

@@ -5,4 +5,4 @@ require 'sinatra/base'
 require 'sinatra/main'
 require 'sinatra/compat'
 
-use_in_file_templates!
+enable :inline_templates

data/lib/sinatra/base.rb

@@ -5,8 +5,16 @@ require 'rack'
 require 'rack/builder'
 require 'sinatra/showexceptions'
 
+# Like Kernel#warn but outputs the location that triggered the warning.
+def sinatra_warn(*message) #:nodoc:
+  line = caller.
+    detect { |line| line !~ /(?:lib\/sinatra\/|__DELEGATE__)/ }.
+    sub(/:in .*/, '')
+  warn "#{line}: warning: #{message.join(' ')}"
+end
+
 module Sinatra
-  VERSION = '0.9.4'
+  VERSION = '0.9.5'
 
   # The request object. See Rack::Request for more info:
   # http://rack.rubyforge.org/doc/classes/Rack/Request.html
@@ -104,20 +112,25 @@ module Sinatra
     end
 
     # Look up a media type by file extension in Rack's mime registry.
+    def mime_type(type)
+      Base.mime_type(type)
+    end
+
     def media_type(type)
-      Base.media_type(type)
+      sinatra_warn "media_type is deprecated; use mime_type instead"
+      mime_type(type)
     end
 
     # Set the Content-Type of the response body given a media type or file
     # extension.
     def content_type(type, params={})
-      media_type = self.media_type(type)
-      fail "Unknown media type: %p" % type if media_type.nil?
+      mime_type = self.mime_type(type)
+      fail "Unknown media type: %p" % type if mime_type.nil?
       if params.any?
         params = params.collect { |kv| "%s=%s" % kv }.join(', ')
-        response['Content-Type'] = [media_type, params].join(";")
+        response['Content-Type'] = [mime_type, params].join(";")
       else
-        response['Content-Type'] = media_type
+        response['Content-Type'] = mime_type
       end
     end
 
@@ -136,8 +149,8 @@ module Sinatra
       stat = File.stat(path)
       last_modified stat.mtime
 
-      content_type media_type(opts[:type]) ||
-        media_type(File.extname(path)) ||
+      content_type mime_type(opts[:type]) ||
+        mime_type(File.extname(path)) ||
         response['Content-Type'] ||
         'application/octet-stream'
 
@@ -183,7 +196,7 @@ module Sinatra
 
     # Set the response entity tag (HTTP 'ETag' header) and halt if conditional
     # GET matches. The +value+ argument is an identifier that uniquely
-    # identifies the current version of the resource. The +strength+ argument
+    # identifies the current version of the resource. The +kind+ argument
     # indicates whether the etag should be used as a :strong (default) or :weak
     # cache validator.
     #
@@ -341,7 +354,7 @@ module Sinatra
     end
 
     def require_warn(engine)
-      warn "Auto-require of #{engine} is deprecated; add require '#{engine}' to your app."
+      sinatra_warn "auto-require of #{engine} is deprecated; add require '#{engine}' to your app."
       require engine.downcase
     end
   end
@@ -388,10 +401,11 @@ module Sinatra
       [status, header, body]
     end
 
-    # Access options defined with Base.set.
-    def options
+    # Access settings defined with Base.set.
+    def settings
       self.class
     end
+    alias_method :options, :settings
 
     # Exit the current block, halts any further processing
     # of the request, and returns the specified response.
@@ -671,15 +685,25 @@ module Sinatra
         template name, &block
       end
 
+      def use_in_file_templates!(file=nil)
+        sinatra_warn "use_in_file_templates! is deprecated; " \
+          "use enable :inline_templates instead"
+        set :inline_templates, file
+      end
+
       # Load embeded templates from the file; uses the caller's __FILE__
       # when no file is specified.
-      def use_in_file_templates!(file=nil)
-        file ||= caller_files.first
-        app, data =
-          ::IO.read(file).split(/^__END__$/, 2) rescue nil
+      def inline_templates=(file=nil)
+        file = (file.nil? || file == true) ? caller_files.first : file
+
+        begin
+          app, data =
+            ::IO.read(file).gsub("\r\n", "\n").split(/^__END__$/, 2)
+        rescue Errno::ENOENT
+          app, data = nil
+        end
 
         if data
-          data.gsub!(/\r\n/, "\n")
           lines = app.count("\n") + 1
           template = nil
           data.each_line do |line|
@@ -694,11 +718,17 @@ module Sinatra
         end
       end
 
-      # Look up a media type by file extension in Rack's mime registry.
-      def media_type(type)
+      # Lookup or register a mime type in Rack's mime registry.
+      def mime_type(type, value=nil)
         return type if type.nil? || type.to_s.include?('/')
         type = ".#{type}" unless type.to_s[0] == ?.
-        Rack::Mime.mime_type(type, nil)
+        return Rack::Mime.mime_type(type, nil) unless value
+        Rack::Mime::MIME_TYPES[type] = value
+      end
+
+      def media_type(type, value=nil)
+        sinatra_warn "media_type is deprecated; use mime_type instead"
+        mime_type(type, value)
       end
 
       # Define a before filter. Filters are run before all requests
@@ -733,7 +763,7 @@ module Sinatra
 
       def provides(*types)
         types = [types] unless types.kind_of? Array
-        types.map!{|t| media_type(t)}
+        types.map!{|t| mime_type(t)}
 
         condition {
           matching_types = (request.accept & types)
@@ -886,7 +916,7 @@ module Sinatra
         builder = Rack::Builder.new
         builder.use Rack::Session::Cookie if sessions? && !test?
         builder.use Rack::CommonLogger    if logging?
-        builder.use Rack::MethodOverride  if methodoverride?
+        builder.use Rack::MethodOverride  if method_override?
         builder.use ShowExceptions        if show_exceptions?
 
         @middleware.each { |c,a,b| builder.use(c, *a, &b) }
@@ -974,15 +1004,14 @@ module Sinatra
       end
     end
 
-    set :raise_errors, true
-    set :dump_errors, false
+    set :environment, (ENV['RACK_ENV'] || :development).to_sym
+    set :raise_errors, Proc.new { !development? }
+    set :dump_errors, Proc.new { development? }
+    set :show_exceptions, Proc.new { development? }
     set :clean_trace, true
-    set :show_exceptions, false
     set :sessions, false
     set :logging, false
-    set :methodoverride, false
-    set :static, false
-    set :environment, (ENV['RACK_ENV'] || :development).to_sym
+    set :method_override, false
 
     set :run, false
     set :server, %w[thin mongrel webrick]
@@ -993,8 +1022,14 @@ module Sinatra
     set :root, Proc.new { app_file && File.expand_path(File.dirname(app_file)) }
     set :views, Proc.new { root && File.join(root, 'views') }
     set :public, Proc.new { root && File.join(root, 'public') }
+    set :static, Proc.new { self.public && File.exist?(self.public) }
     set :lock, false
 
+    class << self
+      alias_method :methodoverride?, :method_override?
+      alias_method :methodoverride=, :method_override=
+    end
+
     # static files route
     get(/.*[^\/]$/) do
       pass unless options.static? && options.public?
@@ -1045,16 +1080,39 @@ module Sinatra
     end
   end
 
-  # Base class for classic style (top-level) applications.
+  # Deprecated as base class for non-top-level apps. Subclass
+  # Sinatra::Base instead and set options as needed.
   class Default < Base
     set :raise_errors, Proc.new { test? }
-    set :show_exceptions, Proc.new { development? }
     set :dump_errors, true
     set :sessions, false
     set :logging, Proc.new { ! test? }
-    set :methodoverride, true
+    set :method_override, true
+    set :run, Proc.new { ! test? }
     set :static, true
+
+    def self.inherited(subclass)
+      sinatra_warn 'Sinatra::Default is deprecated; ' \
+                   'subclass Sinatra::Base instead'
+      super
+    end
+  end
+
+  # Execution context for classic style (top-level) applications. All
+  # DSL methods executed on main are delegated to this class.
+  #
+  # 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
+  # modular applications.
+  class Application < Base
+    set :raise_errors, Proc.new { test? }
+    set :dump_errors, true
+    set :sessions, false
+    set :logging, Proc.new { ! test? }
+    set :method_override, true
     set :run, Proc.new { ! test? }
+    set :static, true
 
     def self.register(*extensions, &block) #:nodoc:
       added_methods = extensions.map {|m| m.public_instance_methods }.flatten
@@ -1063,11 +1121,6 @@ module Sinatra
     end
   end
 
-  # The top-level Application. All DSL methods executed on main are delegated
-  # to this class.
-  class Application < Default
-  end
-
   # Sinatra delegation mixin. Mixing this module into an object causes all
   # methods to be delegated to the Sinatra::Application class. Used primarily
   # at the top-level.
@@ -1086,7 +1139,7 @@ module Sinatra
     delegate :get, :put, :post, :delete, :head, :template, :layout, :before,
              :error, :not_found, :configures, :configure, :set, :set_option,
              :set_options, :enable, :disable, :use, :development?, :test?,
-             :production?, :use_in_file_templates!, :helpers
+             :production?, :use_in_file_templates!, :helpers, :mime_type
   end
 
   # Create a new Sinatra application. The block is evaluated in the new app's
@@ -1099,12 +1152,12 @@ module Sinatra
 
   # Extend the top-level DSL with the modules provided.
   def self.register(*extensions, &block)
-    Default.register(*extensions, &block)
+    Application.register(*extensions, &block)
   end
 
   # Include the helper modules provided in Sinatra's request context.
   def self.helpers(*extensions, &block)
-    Default.helpers(*extensions, &block)
+    Application.helpers(*extensions, &block)
   end
 end
 

data/lib/sinatra/compat.rb

@@ -8,14 +8,6 @@ require 'ostruct'
 require 'sinatra/base'
 require 'sinatra/main'
 
-# Like Kernel#warn but outputs the location that triggered the warning.
-def sinatra_warn(*message) #:nodoc:
-  line = caller.
-    detect { |line| line !~ /(?:lib\/sinatra\/|__DELEGATE__)/ }.
-    sub(/:in .*/, '')
-  warn "#{line}: warning: #{message.join(' ')}"
-end
-
 # Rack now supports evented and swiftiplied mongrels through separate
 # handler.
 if ENV['SWIFT']
@@ -53,12 +45,12 @@ module Sinatra
   module Compat #:nodoc:
   end
 
-  # Make Sinatra::EventContext an alias for Sinatra::Default to unbreak plugins.
+  # Make Sinatra::EventContext an alias for Sinatra::Application to unbreak plugins.
   def self.const_missing(const_name) #:nodoc:
     if const_name == :EventContext
-      const_set :EventContext, Sinatra::Default
-      sinatra_warn 'Sinatra::EventContext is deprecated; use Sinatra::Default instead.'
-      Sinatra::Default
+      const_set :EventContext, Sinatra::Application
+      sinatra_warn 'Sinatra::EventContext is deprecated; use Sinatra::Application instead.'
+      Sinatra::Application
     else
       super
     end

data/lib/sinatra/main.rb

@@ -1,7 +1,7 @@
 require 'sinatra/base'
 
 module Sinatra
-  class Default < Base
+  class Application < Base
 
     # we assume that the first file that requires 'sinatra' is the
     # app_file. all other path related options are calculated based
@@ -25,6 +25,7 @@ end
 include Sinatra::Delegator
 
 def mime(ext, type)
+  warn 'mime is deprecated; use mime_type instead.'
   ext = ".#{ext}" unless ext.to_s[0] == ?.
   Rack::Mime::MIME_TYPES[ext.to_s] = type
 end

data/lib/sinatra/showexceptions.rb

@@ -73,14 +73,14 @@ TEMPLATE = <<HTML
   #explanation        {font-size: 12px; color: #666666;
                        margin: 20px 0 0 100px;}
 /* WRAP */
-  #wrap               {width: 860px; background: #FFFFFF; margin: 0 auto;
+  #wrap               {width: 1000px; background: #FFFFFF; margin: 0 auto;
                        padding: 30px 50px 20px 50px;
                        border-left: 1px solid #DDDDDD;
                        border-right: 1px solid #DDDDDD;}
 /* HEADER */
   #header             {margin: 0 auto 25px auto;}
   #header img         {float: left;}
-  #header #summary    {float: left; margin: 12px 0 0 20px; width:520px;
+  #header #summary    {float: left; margin: 12px 0 0 20px; width:660px;
                        font-family: 'Lucida Grande', 'Lucida Sans Unicode';}
   h1                  {margin: 0; font-size: 36px; color: #981919;}
   h2                  {margin: 0; font-size: 22px; color: #333333;}
@@ -94,7 +94,7 @@ TEMPLATE = <<HTML
   #get,
   #post,
   #cookies,
-  #rack               {width: 860px; margin: 0 auto 10px auto;}
+  #rack               {width: 980px; margin: 0 auto 10px auto;}
   p#nav               {float: right; font-size: 14px;}
 /* BACKTRACE */
   a#expando           {float: left; padding-left: 5px; color: #666666;
@@ -107,7 +107,7 @@ TEMPLATE = <<HTML
                            font-size: 12px; color: #333333;}
   #backtrace ul       {list-style-position: outside; border: 1px solid #E9E9E9;
                        border-bottom: 0;}
-  #backtrace ol       {width: 808px; margin-left: 50px;
+  #backtrace ol       {width: 920px; margin-left: 50px;
                        font: 10px 'Lucida Console', monospace; color: #666666;}
   #backtrace ol li    {border: 0; border-left: 1px solid #E9E9E9;
                        padding: 2px 0;}
@@ -119,10 +119,11 @@ TEMPLATE = <<HTML
   #backtrace.condensed .framework {display:none;}
 /* REQUEST DATA */
   p.no-data           {padding-top: 2px; font-size: 12px; color: #666666;}
-  table.req           {width: 760px; text-align: left; font-size: 12px;
+  table.req           {width: 980px; text-align: left; font-size: 12px;
                        color: #666666; padding: 0; border-spacing: 0;
                        border: 1px solid #EEEEEE; border-bottom: 0;
-                       border-left: 0;}
+                       border-left: 0;
+                       clear:both}
   table.req tr th     {padding: 2px 10px; font-weight: bold;
                        background: #F7F7F7; border-bottom: 1px solid #EEEEEE;
                        border-left: 1px solid #EEEEEE;}
@@ -132,12 +133,15 @@ TEMPLATE = <<HTML
 /* HIDE PRE/POST CODE AT START */
   .pre-context,
   .post-context       {display: none;}
+
+  table td.code       {width:750px}
+  table td.code div   {width:750px;overflow:hidden}
 </style>
 </head>
 <body>
   <div id="wrap">
     <div id="header">
-      <img src="/__sinatra__/500.png" alt="application error" />
+      <img src="/__sinatra__/500.png" alt="application error" height="161" width="313" />
       <div id="summary">
         <h1><strong><%=h exception.class %></strong> at <strong><%=h path %>
           </strong></h1>
@@ -293,8 +297,8 @@ TEMPLATE = <<HTML
       <div class="clear"></div>
     </div> <!-- /RACK ENV -->
 
-    <p id="explanation">You're seeing this error because you use you have
-enabled the <code>show_exceptions</code> option.</p>
+    <p id="explanation">You're seeing this error because you have
+enabled the <code>show_exceptions</code> setting.</p>
   </div> <!-- /WRAP -->
   </body>
 </html>

data/lib/sinatra/test.rb

@@ -7,7 +7,7 @@ module Sinatra
     include Rack::Utils
 
     def self.included(base)
-      Sinatra::Default.set(:environment, :test)
+      Sinatra::Application.set(:environment, :test)
     end
 
     attr_reader :app, :request, :response
@@ -30,6 +30,7 @@ for more information.
       case
       when body.respond_to?(:to_hash)
         options.merge! body.delete(:env) if body.key?(:env)
+        options[:content_type] ||= 'application/x-www-form-urlencoded'
         options[:input] = param_string(body)
       when body.respond_to?(:to_str)
         options[:input] = body

data/lib/sinatra/test/bacon.rb

@@ -3,7 +3,7 @@ require 'sinatra/test'
 
 Sinatra::Test.deprecate('Bacon')
 
-Sinatra::Default.set(
+Sinatra::Application.set(
   :environment => :test,
   :run => false,
   :raise_errors => true,

data/lib/sinatra/test/rspec.rb

@@ -5,7 +5,7 @@ require 'spec/interop/test'
 
 Sinatra::Test.deprecate('RSpec')
 
-Sinatra::Default.set(
+Sinatra::Application.set(
   :environment => :test,
   :run => false,
   :raise_errors => true,

data/lib/sinatra/test/unit.rb

@@ -5,7 +5,7 @@ Sinatra::Test.deprecate('test/unit')
 
 Test::Unit::TestCase.send :include, Sinatra::Test
 
-Sinatra::Default.set(
+Sinatra::Application.set(
   :environment => :test,
   :run => false,
   :raise_errors => true,

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 = '0.9.4'
-  s.date = '2009-07-26'
+  s.version = '0.9.5'
+  s.date = '2010-03-04'
 
   s.description = "Classy web-development dressed in a DSL"
   s.summary     = "Classy web-development dressed in a DSL"
@@ -70,7 +70,6 @@ Gem::Specification.new do |s|
     test/base_test.rb
     test/builder_test.rb
     test/contest.rb
-    test/data/reload_app_file.rb
     test/erb_test.rb
     test/extensions_test.rb
     test/filter_test.rb
@@ -80,6 +79,7 @@ Gem::Specification.new do |s|
     test/mapped_error_test.rb
     test/middleware_test.rb
     test/options_test.rb
+    test/public/favicon.ico
     test/render_backtrace_test.rb
     test/request_test.rb
     test/response_test.rb

data/test/extensions_test.rb

@@ -35,9 +35,9 @@ class ExtensionsTest < Test::Unit::TestCase
     Sinatra::Base.register FooExtensions
     assert Sinatra::Base.respond_to?(:foo)
 
-    Sinatra::Default.register BarExtensions
-    assert Sinatra::Default.respond_to?(:bar)
-    assert Sinatra::Default.respond_to?(:foo)
+    Sinatra::Application.register BarExtensions
+    assert Sinatra::Application.respond_to?(:bar)
+    assert Sinatra::Application.respond_to?(:foo)
     assert !Sinatra::Base.respond_to?(:bar)
   end
 
@@ -48,8 +48,8 @@ class ExtensionsTest < Test::Unit::TestCase
     assert Sinatra::Base.respond_to?(:im_in_ur_anonymous_module)
   end
 
-  it 'will make sure any public methods added via Default#register are delegated to Sinatra::Delegator' do
-    Sinatra::Default.register FooExtensions
+  it 'will make sure any public methods added via Application#register are delegated to Sinatra::Delegator' do
+    Sinatra::Application.register FooExtensions
     assert Sinatra::Delegator.private_instance_methods.
       map { |m| m.to_sym }.include?(:foo)
     assert !Sinatra::Delegator.private_instance_methods.
@@ -57,7 +57,7 @@ class ExtensionsTest < Test::Unit::TestCase
   end
 
   it 'will handle special method names' do
-    Sinatra::Default.register PainExtensions
+    Sinatra::Application.register PainExtensions
     assert Sinatra::Delegator.private_instance_methods.
       map { |m| m.to_sym }.include?(:foo=)
     assert Sinatra::Delegator.private_instance_methods.
@@ -71,10 +71,10 @@ class ExtensionsTest < Test::Unit::TestCase
     assert !Sinatra::Delegator.private_instance_methods.include?("quux")
   end
 
-  it 'will extend the Sinatra::Default application by default' do
+  it 'will extend the Sinatra::Application by default' do
     Sinatra.register BazExtensions
     assert !Sinatra::Base.respond_to?(:baz)
-    assert Sinatra::Default.respond_to?(:baz)
+    assert Sinatra::Application.respond_to?(:baz)
   end
 
   module BizzleExtension

data/test/helpers_test.rb

@@ -200,29 +200,42 @@ class HelpersTest < Test::Unit::TestCase
     end
   end
 
-  describe 'media_type' do
+  describe 'mime_type' do
     include Sinatra::Helpers
 
-    it "looks up media types in Rack's MIME registry" do
+    it "looks up mime types in Rack's MIME registry" do
       Rack::Mime::MIME_TYPES['.foo'] = 'application/foo'
-      assert_equal 'application/foo', media_type('foo')
-      assert_equal 'application/foo', media_type('.foo')
-      assert_equal 'application/foo', media_type(:foo)
+      assert_equal 'application/foo', mime_type('foo')
+      assert_equal 'application/foo', mime_type('.foo')
+      assert_equal 'application/foo', mime_type(:foo)
     end
 
     it 'returns nil when given nil' do
-      assert media_type(nil).nil?
+      assert mime_type(nil).nil?
     end
 
     it 'returns nil when media type not registered' do
-      assert media_type(:bizzle).nil?
+      assert mime_type(:bizzle).nil?
     end
 
     it 'returns the argument when given a media type string' do
-      assert_equal 'text/plain', media_type('text/plain')
+      assert_equal 'text/plain', mime_type('text/plain')
     end
   end
 
+  test 'Base.mime_type registers mime type' do
+    mock_app {
+      mime_type :foo, 'application/foo'
+
+      get '/' do
+        "foo is #{mime_type(:foo)}"
+      end
+    }
+
+    get '/'
+    assert_equal 'foo is application/foo', body
+  end
+
   describe 'content_type' do
     it 'sets the Content-Type header' do
       mock_app {

data/test/middleware_test.rb

@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/helper'
 
 class MiddlewareTest < Test::Unit::TestCase
   setup do
-    @app = mock_app(Sinatra::Default) {
+    @app = mock_app(Sinatra::Base) {
       get '/*' do
         response.headers['X-Tests'] = env['test.ran'].
           map { |n| n.split('::').last }.

data/test/options_test.rb

@@ -3,9 +3,9 @@ require File.dirname(__FILE__) + '/helper'
 class OptionsTest < Test::Unit::TestCase
   setup do
     @base    = Sinatra.new(Sinatra::Base)
-    @default = Sinatra.new(Sinatra::Default)
+    @application = Sinatra.new(Sinatra::Application)
     @base.set    :environment, :development
-    @default.set :environment, :development
+    @application.set :environment, :development
   end
 
   it 'sets options to literal values' do
@@ -110,8 +110,8 @@ class OptionsTest < Test::Unit::TestCase
       assert @base.clean_trace?
     end
 
-    it 'is enabled on Default' do
-      assert @default.clean_trace?
+    it 'is enabled on Application' do
+      assert @application.clean_trace?
     end
 
     it 'does nothing when disabled' do
@@ -152,58 +152,61 @@ class OptionsTest < Test::Unit::TestCase
       assert ! @base.run?
     end
 
-    it 'is enabled on Default when not in test environment' do
-      @default.set :environment, :development
-      assert @default.development?
-      assert @default.run?
+    it 'is enabled on Application when not in test environment' do
+      @application.set :environment, :development
+      assert @application.development?
+      assert @application.run?
 
-      @default.set :environment, :development
-      assert @default.run?
+      @application.set :environment, :development
+      assert @application.run?
     end
 
     # TODO: it 'is enabled when $0 == app_file'
   end
 
   describe 'raise_errors' do
-    it 'is enabled on Base' do
+    it 'is enabled on Base except under development' do
+      @base.environment = :test
       assert @base.raise_errors?
+      @base.environment = :development
+      assert !@base.raise_errors?
     end
 
-    it 'is enabled on Default only in test' do
-      @default.set(:environment, :development)
-      assert @default.development?
-      assert ! @default.raise_errors?
+    it 'is enabled on Application only in test' do
+      @application.set(:environment, :development)
+      assert @application.development?
+      assert ! @application.raise_errors?
 
-      @default.set(:environment, :production)
-      assert ! @default.raise_errors?
+      @application.set(:environment, :production)
+      assert ! @application.raise_errors?
 
-      @default.set(:environment, :test)
-      assert @default.raise_errors?
+      @application.set(:environment, :test)
+      assert @application.raise_errors?
     end
   end
 
   describe 'show_exceptions' do
-    %w[development test production none].each do |environment|
-      it "is disabled on Base in #{environment} environments" do
-        @base.set(:environment, environment)
-        assert ! @base.show_exceptions?
-      end
+    it 'is disabled on Base except under development' do
+      @base.environment = :test
+      assert ! @base.show_exceptions?
+      @base.environment = :development
+      assert @base.show_exceptions?
     end
 
-    it 'is enabled on Default only in development' do
+    it 'is enabled on Application only in development' do
       @base.set(:environment, :development)
-      assert @default.development?
-      assert @default.show_exceptions?
+      assert @application.development?
+      assert @application.show_exceptions?
 
-      @default.set(:environment, :test)
-      assert ! @default.show_exceptions?
+      @application.set(:environment, :test)
+      assert ! @application.show_exceptions?
 
       @base.set(:environment, :production)
       assert ! @base.show_exceptions?
     end
 
     it 'returns a friendly 500' do
-      klass = Sinatra.new(Sinatra::Default)
+      klass = Sinatra.new(Sinatra::Application)
       mock_app(klass) {
         enable :show_exceptions
 
@@ -215,21 +218,24 @@ class OptionsTest < Test::Unit::TestCase
       get '/'
       assert_equal 500, status
       assert body.include?("StandardError")
-      assert body.include?("<code>show_exceptions</code> option")
+      assert body.include?("<code>show_exceptions</code> setting")
     end
   end
 
   describe 'dump_errors' do
-    it 'is disabled on Base' do
+    it 'is disabled on Base except in development' do
+      @base.environment = :test
       assert ! @base.dump_errors?
+      @base.environment = :development
+      assert @base.dump_errors?
     end
 
-    it 'is enabled on Default' do
-      assert @default.dump_errors?
+    it 'is enabled on Application' do
+      assert @application.dump_errors?
     end
 
     it 'dumps exception with backtrace to rack.errors' do
-      klass = Sinatra.new(Sinatra::Default)
+      klass = Sinatra.new(Sinatra::Application)
 
       mock_app(klass) {
         disable :raise_errors
@@ -256,8 +262,8 @@ class OptionsTest < Test::Unit::TestCase
       assert ! @base.sessions?
     end
 
-    it 'is disabled on Default' do
-      assert ! @default.sessions?
+    it 'is disabled on Application' do
+      assert ! @application.sessions?
     end
 
     # TODO: it 'uses Rack::Session::Cookie when enabled' do
@@ -268,99 +274,108 @@ class OptionsTest < Test::Unit::TestCase
       assert ! @base.logging?
     end
 
-    it 'is enabled on Default when not in test environment' do
-      assert @default.logging?
+    it 'is enabled on Application when not in test environment' do
+      assert @application.logging?
 
-      @default.set :environment, :test
-      assert ! @default.logging
+      @application.set :environment, :test
+      assert ! @application.logging
     end
 
     # TODO: it 'uses Rack::CommonLogger when enabled' do
   end
 
   describe 'static' do
-    it 'is disabled on Base' do
+    it 'is disabled on Base by Application' do
       assert ! @base.static?
     end
 
-    it 'is enabled on Default' do
-      assert @default.static?
+    it 'is enabled on Base when public is set and exists' do
+      @base.set :environment, :development
+      @base.set :public, File.dirname(__FILE__)
+      assert @base.static?
+    end
+
+    it 'is enabled on Base when root is set and root/public exists' do
+      @base.set :environment, :development
+      @base.set :root, File.dirname(__FILE__)
+      assert @base.static?
     end
 
-    # TODO: it setup static routes if public is enabled
-    # TODO: however, that's already tested in static_test so...
+    it 'is enabled on Application' do
+      assert @application.static?
+    end
   end
 
   describe 'host' do
     it 'defaults to 0.0.0.0' do
       assert_equal '0.0.0.0', @base.host
-      assert_equal '0.0.0.0', @default.host
+      assert_equal '0.0.0.0', @application.host
     end
   end
 
   describe 'port' do
     it 'defaults to 4567' do
       assert_equal 4567, @base.port
-      assert_equal 4567, @default.port
+      assert_equal 4567, @application.port
     end
   end
 
   describe 'server' do
     it 'is one of thin, mongrel, webrick' do
       assert_equal %w[thin mongrel webrick], @base.server
-      assert_equal %w[thin mongrel webrick], @default.server
+      assert_equal %w[thin mongrel webrick], @application.server
     end
   end
 
   describe 'app_file' do
     it 'is nil' do
       assert @base.app_file.nil?
-      assert @default.app_file.nil?
+      assert @application.app_file.nil?
     end
   end
 
   describe 'root' do
     it 'is nil if app_file is not set' do
       assert @base.root.nil?
-      assert @default.root.nil?
+      assert @application.root.nil?
     end
 
     it 'is equal to the expanded basename of app_file' do
       @base.app_file = __FILE__
       assert_equal File.expand_path(File.dirname(__FILE__)), @base.root
 
-      @default.app_file = __FILE__
-      assert_equal File.expand_path(File.dirname(__FILE__)), @default.root
+      @application.app_file = __FILE__
+      assert_equal File.expand_path(File.dirname(__FILE__)), @application.root
     end
   end
 
   describe 'views' do
     it 'is nil if root is not set' do
       assert @base.views.nil?
-      assert @default.views.nil?
+      assert @application.views.nil?
     end
 
     it 'is set to root joined with views/' do
       @base.root = File.dirname(__FILE__)
       assert_equal File.dirname(__FILE__) + "/views", @base.views
 
-      @default.root = File.dirname(__FILE__)
-      assert_equal File.dirname(__FILE__) + "/views", @default.views
+      @application.root = File.dirname(__FILE__)
+      assert_equal File.dirname(__FILE__) + "/views", @application.views
     end
   end
 
   describe 'public' do
     it 'is nil if root is not set' do
       assert @base.public.nil?
-      assert @default.public.nil?
+      assert @application.public.nil?
     end
 
     it 'is set to root joined with public/' do
       @base.root = File.dirname(__FILE__)
       assert_equal File.dirname(__FILE__) + "/public", @base.public
 
-      @default.root = File.dirname(__FILE__)
-      assert_equal File.dirname(__FILE__) + "/public", @default.public
+      @application.root = File.dirname(__FILE__)
+      assert_equal File.dirname(__FILE__) + "/public", @application.public
     end
   end
 

data/test/render_backtrace_test.rb

@@ -21,7 +21,7 @@ class RenderBacktraceTest < Test::Unit::TestCase
 
   def backtrace_app(&block)
     mock_app {
-      use_in_file_templates!
+      enable :inline_templates
       set :views, RenderBacktraceTest::VIEWS
       template :builder_template do
         'raise "error"'

data/test/templates_test.rb

@@ -68,9 +68,9 @@ class TemplatesTest < Test::Unit::TestCase
     assert_equal "Layout 3!\nHello World!\n", body
   end
 
-  it 'loads templates from source file with use_in_file_templates!' do
+  it 'loads templates from source file with inline templates' do
     mock_app {
-      use_in_file_templates!
+      enable :inline_templates
     }
     assert_equal "this is foo\n\n", @app.templates[:foo][:template]
     assert_equal "X\n= yield\nX\n", @app.templates[:layout][:template]
@@ -82,10 +82,10 @@ class TemplatesTest < Test::Unit::TestCase
     assert_equal "from another views directory\n", body
   end
 
-  test 'use_in_file_templates simply ignores IO errors' do
+  test 'inline_templates simply ignores IO errors' do
     assert_nothing_raised {
       mock_app {
-        use_in_file_templates!('/foo/bar')
+        set :inline_templates, '/foo/bar'
       }
     }
 

data/test/test_test.rb

@@ -65,6 +65,9 @@ class TestTest < Test::Unit::TestCase
   it 'allows to specify params' do
     get '/', :foo => 'bar'
     assert_equal 'bar', request_params['foo']
+
+    post '/', :foo => 'bar'
+    assert_equal 'bar', request_params['foo']
   end
 
   it 'supports nested params' do
@@ -111,7 +114,7 @@ class TestTest < Test::Unit::TestCase
   end
 
   it 'allow to test session easily' do
-    app = mock_app(Sinatra::Default) {
+    app = mock_app(Sinatra::Base) {
       get '/' do
         session['foo'] = 'bar'
         200
@@ -139,9 +142,9 @@ class TestTest < Test::Unit::TestCase
   end
 
   it 'sets the environment to :test on include' do
-    Sinatra::Default.set(:environment, :production)
+    Sinatra::Application.set(:environment, :production)
     Class.new { include Sinatra::Test }
-    assert_equal :test, Sinatra::Default.environment
+    assert_equal :test, Sinatra::Application.environment
   end
 
   def test_TestHarness

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra
 version: !ruby/object:Gem::Version 
-  version: 0.9.4
+  prerelease: false
+  segments: 
+  - 0
+  - 9
+  - 5
+  version: 0.9.5
 platform: ruby
 authors: 
 - Blake Mizerany
@@ -9,42 +14,56 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-26 00:00:00 -07:00
+date: 2010-03-04 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 1
         version: 0.9.1
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: shotgun
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 2
         version: "0.2"
     - - <
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
         version: "1.0"
-    version: 
+  type: :development
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rack-test
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 3
+        - 0
         version: 0.3.0
-    version: 
+  type: :development
+  version_requirements: *id003
 description: Classy web-development dressed in a DSL
 email: sinatrarb@googlegroups.com
 executables: []
@@ -111,7 +130,6 @@ files:
 - test/base_test.rb
 - test/builder_test.rb
 - test/contest.rb
-- test/data/reload_app_file.rb
 - test/erb_test.rb
 - test/extensions_test.rb
 - test/filter_test.rb
@@ -121,6 +139,7 @@ files:
 - test/mapped_error_test.rb
 - test/middleware_test.rb
 - test/options_test.rb
+- test/public/favicon.ico
 - test/render_backtrace_test.rb
 - test/request_test.rb
 - test/response_test.rb
@@ -165,18 +184,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: sinatra
-rubygems_version: 1.3.4
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 2
 summary: Classy web-development dressed in a DSL

data/test/data/reload_app_file.rb

@@ -1,3 +0,0 @@
-$reload_count += 1
-
-$reload_app.get('/') { 'Hello from reload file' }