RubyGems - adamwiggins-sinatra - Versions diffs - 0.8.9 → 0.10.1 - Mend

adamwiggins-sinatra 0.8.9 → 0.10.1

Files changed (79) hide show

data/AUTHORS +8 -7
data/CHANGES +211 -1
data/LICENSE +1 -1
data/README.rdoc +183 -139
data/Rakefile +20 -81
data/lib/sinatra.rb +5 -1
data/lib/sinatra/base.rb +569 -278
data/lib/sinatra/main.rb +12 -25
data/lib/sinatra/showexceptions.rb +303 -0
data/sinatra.gemspec +20 -44
data/test/base_test.rb +140 -52
data/test/builder_test.rb +14 -17
data/test/contest.rb +64 -0
data/test/erb_test.rb +42 -16
data/test/extensions_test.rb +100 -0
data/test/filter_test.rb +85 -13
data/test/haml_test.rb +39 -21
data/test/helper.rb +76 -0
data/test/helpers_test.rb +219 -84
data/test/mapped_error_test.rb +168 -146
data/test/middleware_test.rb +22 -17
data/test/options_test.rb +323 -54
data/test/render_backtrace_test.rb +145 -0
data/test/request_test.rb +28 -6
data/test/response_test.rb +42 -0
data/test/result_test.rb +27 -21
data/test/route_added_hook_test.rb +59 -0
data/test/routing_test.rb +558 -77
data/test/sass_test.rb +52 -13
data/test/server_test.rb +47 -0
data/test/sinatra_test.rb +3 -5
data/test/static_test.rb +57 -30
data/test/templates_test.rb +74 -25
data/test/views/error.builder +3 -0
data/test/views/error.erb +3 -0
data/test/views/error.haml +3 -0
data/test/views/error.sass +2 -0
data/test/views/foo/hello.test +1 -0
metadata +50 -46
data/compat/app_test.rb +0 -300
data/compat/application_test.rb +0 -334
data/compat/builder_test.rb +0 -101
data/compat/custom_error_test.rb +0 -62
data/compat/erb_test.rb +0 -136
data/compat/events_test.rb +0 -75
data/compat/filter_test.rb +0 -30
data/compat/haml_test.rb +0 -233
data/compat/helper.rb +0 -21
data/compat/mapped_error_test.rb +0 -72
data/compat/pipeline_test.rb +0 -71
data/compat/public/foo.xml +0 -1
data/compat/sass_test.rb +0 -57
data/compat/sessions_test.rb +0 -39
data/compat/streaming_test.rb +0 -121
data/compat/sym_params_test.rb +0 -19
data/compat/template_test.rb +0 -30
data/compat/use_in_file_templates_test.rb +0 -47
data/compat/views/foo.builder +0 -1
data/compat/views/foo.erb +0 -1
data/compat/views/foo.haml +0 -1
data/compat/views/foo.sass +0 -2
data/compat/views/foo_layout.erb +0 -2
data/compat/views/foo_layout.haml +0 -2
data/compat/views/layout_test/foo.builder +0 -1
data/compat/views/layout_test/foo.erb +0 -1
data/compat/views/layout_test/foo.haml +0 -1
data/compat/views/layout_test/foo.sass +0 -2
data/compat/views/layout_test/layout.builder +0 -3
data/compat/views/layout_test/layout.erb +0 -1
data/compat/views/layout_test/layout.haml +0 -1
data/compat/views/layout_test/layout.sass +0 -2
data/compat/views/no_layout/no_layout.builder +0 -1
data/compat/views/no_layout/no_layout.haml +0 -1
data/lib/sinatra/compat.rb +0 -239
data/lib/sinatra/test.rb +0 -112
data/lib/sinatra/test/rspec.rb +0 -2
data/lib/sinatra/test/spec.rb +0 -2
data/lib/sinatra/test/unit.rb +0 -11
data/test/reload_test.rb +0 -65

@@ -1,48 +1,35 @@
 require 'sinatra/base'
 module Sinatra
-  class Default < Base
-    set :app_file, lambda {
-      ignore = [
-        /lib\/sinatra.*\.rb$/, # all sinatra code
-        /\(.*\)/,              # generated code
-        /custom_require\.rb$/  # rubygems require hacks
-      ]
-      path =
-        caller.map{ |line| line.split(':', 2).first }.find do |file|
-          next if ignore.any? { |pattern| file =~ pattern }
-          file
-        end
-      path || $0
-    }.call
+  class Application < Base
+    # we assume that the first file that requires 'sinatra' is the
+    # app_file. all other path related options are calculated based
+    # on this path by default.
+    set :app_file, caller_files.first || $0
     set :run, Proc.new { $0 == app_file }
-    set :reload, Proc.new{ app_file? && development? }
     if run? && ARGV.any?
       require 'optparse'
       OptionParser.new { |op|
-        op.on('-x')        {       set :mutex, true }
+        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 }
       }.parse!(ARGV.dup)
     end
+    at_exit do
+      raise $! if $!
+      run! if run?
+    end
   end
 end
 include Sinatra::Delegator
-def helpers(&block)
-  Sinatra::Application.send :class_eval, &block
-end
 def mime(ext, type)
   ext = ".#{ext}" unless ext.to_s[0] == ?.
   Rack::Mime::MIME_TYPES[ext.to_s] = type
 end
-at_exit do
-  raise $! if $!
-  Sinatra::Application.run! if Sinatra::Application.run?
-end

data/lib/sinatra/showexceptions.rb ADDED

@@ -0,0 +1,303 @@
+require 'rack/showexceptions'
+module Sinatra
+  class ShowExceptions < Rack::ShowExceptions
+    def initialize(app)
+      @app      = app
+      @template = ERB.new(TEMPLATE)
+    end
+    def frame_class(frame)
+      if frame.filename =~ /lib\/sinatra.*\.rb/
+        "framework"
+      elsif (defined?(Gem) && frame.filename.include?(Gem.dir)) ||
+            frame.filename =~ /\/bin\/(\w+)$/
+        "system"
+      else
+        "app"
+      end
+    end
+TEMPLATE = <<HTML
+<!DOCTYPE html>
+<html>
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+  <title><%=h exception.class %> at <%=h path %></title>
+  <script type="text/javascript">
+  //<!--
+  function toggle(id) {
+    var pre  = document.getElementById("pre-" + id);
+    var post = document.getElementById("post-" + id);
+    var context = document.getElementById("context-" + id);
+    if (pre.style.display == 'block') {
+      pre.style.display = 'none';
+      post.style.display = 'none';
+      context.style.background = "none";
+    } else {
+      pre.style.display = 'block';
+      post.style.display = 'block';
+      context.style.background = "#fffed9";
+    }
+  }
+  function toggleBacktrace(){
+    var bt = document.getElementById("backtrace");
+    var toggler = document.getElementById("expando");
+    if (bt.className == 'condensed') {
+      bt.className = 'expanded';
+      toggler.innerHTML = "(condense)";
+    } else {
+      bt.className = 'condensed';
+      toggler.innerHTML = "(expand)";
+    }
+  }
+  //-->
+  </script>
+<style type="text/css" media="screen">
+  *                   {margin: 0; padding: 0; border: 0; outline: 0;}
+  div.clear           {clear: both;}
+  body                {background: #EEEEEE; margin: 0; padding: 0;
+                       font-family: 'Lucida Grande', 'Lucida Sans Unicode',
+                       'Garuda';}
+  code                {font-family: 'Lucida Console', monospace;
+                       font-size: 12px;}
+  li                  {height: 18px;}
+  ul                  {list-style: none; margin: 0; padding: 0;}
+  ol:hover            {cursor: pointer;}
+  ol li               {white-space: pre;}
+  #explanation        {font-size: 12px; color: #666666;
+                       margin: 20px 0 0 100px;}
+/* WRAP */
+  #wrap               {width: 860px; 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;
+                       font-family: 'Lucida Grande', 'Lucida Sans Unicode';}
+  h1                  {margin: 0; font-size: 36px; color: #981919;}
+  h2                  {margin: 0; font-size: 22px; color: #333333;}
+  #header ul          {margin: 0; font-size: 12px; color: #666666;}
+  #header ul li strong{color: #444444;}
+  #header ul li       {display: inline; padding: 0 10px;}
+  #header ul li.first {padding-left: 0;}
+  #header ul li.last  {border: 0; padding-right: 0;}
+/* BODY */
+  #backtrace,
+  #get,
+  #post,
+  #cookies,
+  #rack               {width: 860px; margin: 0 auto 10px auto;}
+  p#nav               {float: right; font-size: 14px;}
+/* BACKTRACE */
+  a#expando           {float: left; padding-left: 5px; color: #666666;
+                      font-size: 14px; text-decoration: none; cursor: pointer;}
+  a#expando:hover     {text-decoration: underline;}
+  h3                  {float: left; width: 100px; margin-bottom: 10px;
+                       color: #981919; font-size: 14px; font-weight: bold;}
+  #nav a              {color: #666666; text-decoration: none; padding: 0 5px;}
+  #backtrace li.frame-info {background: #f7f7f7; padding-left: 10px;
+                           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;
+                       font: 10px 'Lucida Console', monospace; color: #666666;}
+  #backtrace ol li    {border: 0; border-left: 1px solid #E9E9E9;
+                       padding: 2px 0;}
+  #backtrace ol code  {font-size: 10px; color: #555555; padding-left: 5px;}
+  #backtrace-ul li    {border-bottom: 1px solid #E9E9E9; height: auto;
+                       padding: 3px 0;}
+  #backtrace-ul .code {padding: 6px 0 4px 0;}
+  #backtrace.condensed .system,
+  #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;
+                       color: #666666; padding: 0; border-spacing: 0;
+                       border: 1px solid #EEEEEE; border-bottom: 0;
+                       border-left: 0;}
+  table.req tr th     {padding: 2px 10px; font-weight: bold;
+                       background: #F7F7F7; border-bottom: 1px solid #EEEEEE;
+                       border-left: 1px solid #EEEEEE;}
+  table.req tr td     {padding: 2px 20px 2px 10px;
+                       border-bottom: 1px solid #EEEEEE;
+                       border-left: 1px solid #EEEEEE;}
+/* HIDE PRE/POST CODE AT START */
+  .pre-context,
+  .post-context       {display: none;}
+</style>
+</head>
+<body>
+  <div id="wrap">
+    <div id="header">
+      <img src="/__sinatra__/500.png" alt="application error" />
+      <div id="summary">
+        <h1><strong><%=h exception.class %></strong> at <strong><%=h path %>
+          </strong></h1>
+        <h2><%=h exception.message %></h2>
+        <ul>
+          <li class="first"><strong>file:</strong> <code>
+            <%=h frames.first.filename.split("/").last %></code></li>
+          <li><strong>location:</strong> <code><%=h frames.first.function %>
+            </code></li>
+          <li class="last"><strong>line:
+            </strong> <%=h frames.first.lineno %></li>
+        </ul>
+      </div>
+      <div class="clear"></div>
+    </div>
+    <div id="backtrace" class='condensed'>
+      <h3>BACKTRACE</h3>
+      <p><a href="#" id="expando"
+            onclick="toggleBacktrace(); return false">(expand)</a></p>
+      <p id="nav"><strong>JUMP TO:</strong>
+         <a href="#get-info">GET</a>
+         <a href="#post-info">POST</a>
+         <a href="#cookie-info">COOKIES</a>
+         <a href="#env-info">ENV</a>
+      </p>
+      <div class="clear"></div>
+      <ul id="backtrace-ul">
+      <% id = 1 %>
+      <% frames.each do |frame| %>
+          <% if frame.context_line && frame.context_line != "#" %>
+            <li class="frame-info <%= frame_class(frame) %>">
+              <code><%=h frame.filename %></code> in
+                <code><strong><%=h frame.function %></strong></code>
+            </li>
+            <li class="code <%= frame_class(frame) %>">
+              <% if frame.pre_context %>
+              <ol start="<%=h frame.pre_context_lineno + 1 %>"
+                  class="pre-context" id="pre-<%= id %>"
+                  onclick="toggle(<%= id %>);">
+                <% frame.pre_context.each do |line| %>
+                <li class="pre-context-line"><code><%=h line %></code></li>
+                <% end %>
+              </ol>
+              <% end %>
+              <ol start="<%= frame.lineno %>" class="context" id="<%= id %>"
+                  onclick="toggle(<%= id %>);">
+                <li class="context-line" id="context-<%= id %>"><code><%=
+                  h frame.context_line %></code></li>
+              </ol>
+              <% if frame.post_context %>
+              <ol start="<%=h frame.lineno + 1 %>" class="post-context"
+                  id="post-<%= id %>" onclick="toggle(<%= id %>);">
+                <% frame.post_context.each do |line| %>
+                <li class="post-context-line"><code><%=h line %></code></li>
+                <% end %>
+              </ol>
+              <% end %>
+              <div class="clear"></div>
+            </li>
+          <% end %>
+        <% id += 1 %>
+      <% end %>
+      </ul>
+    </div> <!-- /BACKTRACE -->
+    <div id="get">
+      <h3 id="get-info">GET</h3>
+      <% unless req.GET.empty? %>
+        <table class="req">
+          <tr>
+            <th>Variable</th>
+            <th>Value</th>
+          </tr>
+           <% req.GET.sort_by { |k, v| k.to_s }.each { |key, val| %>
+          <tr>
+            <td><%=h key %></td>
+            <td class="code"><div><%=h val.inspect %></div></td>
+          </tr>
+          <% } %>
+        </table>
+      <% else %>
+        <p class="no-data">No GET data.</p>
+      <% end %>
+      <div class="clear"></div>
+    </div> <!-- /GET -->
+    <div id="post">
+      <h3 id="post-info">POST</h3>
+      <% unless req.POST.empty? %>
+        <table class="req">
+          <tr>
+            <th>Variable</th>
+            <th>Value</th>
+          </tr>
+          <% req.POST.sort_by { |k, v| k.to_s }.each { |key, val| %>
+          <tr>
+            <td><%=h key %></td>
+            <td class="code"><div><%=h val.inspect %></div></td>
+          </tr>
+          <% } %>
+        </table>
+      <% else %>
+        <p class="no-data">No POST data.</p>
+      <% end %>
+      <div class="clear"></div>
+    </div> <!-- /POST -->
+    <div id="cookies">
+      <h3 id="cookie-info">COOKIES</h3>
+      <% unless req.cookies.empty? %>
+        <table class="req">
+          <tr>
+            <th>Variable</th>
+            <th>Value</th>
+          </tr>
+          <% req.cookies.each { |key, val| %>
+            <tr>
+              <td><%=h key %></td>
+              <td class="code"><div><%=h val.inspect %></div></td>
+            </tr>
+          <% } %>
+        </table>
+      <% else %>
+        <p class="no-data">No cookie data.</p>
+      <% end %>
+      <div class="clear"></div>
+    </div> <!-- /COOKIES -->
+    <div id="rack">
+      <h3 id="env-info">Rack ENV</h3>
+      <table class="req">
+        <tr>
+          <th>Variable</th>
+          <th>Value</th>
+        </tr>
+         <% env.sort_by { |k, v| k.to_s }.each { |key, val| %>
+         <tr>
+           <td><%=h key %></td>
+           <td class="code"><div><%=h val %></div></td>
+         </tr>
+         <% } %>
+      </table>
+      <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>
+  </div> <!-- /WRAP -->
+  </body>
+</html>
+HTML
+  end
+end

data/sinatra.gemspec CHANGED

@@ -3,13 +3,14 @@ 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.8.9'
-  s.date = '2009-01-13'
+  s.version = '0.10.1'
+  s.date = '2009-06-07'
   s.description = "Classy web-development dressed in a DSL"
   s.summary     = "Classy web-development dressed in a DSL"
-  s.authors = ["Blake Mizerany"]
+  s.authors = ["Blake Mizerany", "Ryan Tomayko", "Simon Rozet"]
+  s.email = "sinatrarb@googlegroups.com"
   # = MANIFEST =
   s.files = %w[
@@ -18,69 +19,42 @@ Gem::Specification.new do |s|
     LICENSE
     README.rdoc
     Rakefile
-    compat/app_test.rb
-    compat/application_test.rb
-    compat/builder_test.rb
-    compat/custom_error_test.rb
-    compat/erb_test.rb
-    compat/events_test.rb
-    compat/filter_test.rb
-    compat/haml_test.rb
-    compat/helper.rb
-    compat/mapped_error_test.rb
-    compat/pipeline_test.rb
-    compat/public/foo.xml
-    compat/sass_test.rb
-    compat/sessions_test.rb
-    compat/streaming_test.rb
-    compat/sym_params_test.rb
-    compat/template_test.rb
-    compat/use_in_file_templates_test.rb
-    compat/views/foo.builder
-    compat/views/foo.erb
-    compat/views/foo.haml
-    compat/views/foo.sass
-    compat/views/foo_layout.erb
-    compat/views/foo_layout.haml
-    compat/views/layout_test/foo.builder
-    compat/views/layout_test/foo.erb
-    compat/views/layout_test/foo.haml
-    compat/views/layout_test/foo.sass
-    compat/views/layout_test/layout.builder
-    compat/views/layout_test/layout.erb
-    compat/views/layout_test/layout.haml
-    compat/views/layout_test/layout.sass
-    compat/views/no_layout/no_layout.builder
-    compat/views/no_layout/no_layout.haml
     lib/sinatra.rb
     lib/sinatra/base.rb
-    lib/sinatra/compat.rb
     lib/sinatra/images/404.png
     lib/sinatra/images/500.png
     lib/sinatra/main.rb
-    lib/sinatra/test.rb
-    lib/sinatra/test/rspec.rb
-    lib/sinatra/test/spec.rb
-    lib/sinatra/test/unit.rb
+    lib/sinatra/showexceptions.rb
     sinatra.gemspec
     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
     test/haml_test.rb
+    test/helper.rb
     test/helpers_test.rb
     test/mapped_error_test.rb
     test/middleware_test.rb
     test/options_test.rb
-    test/reload_test.rb
+    test/render_backtrace_test.rb
     test/request_test.rb
+    test/response_test.rb
     test/result_test.rb
+    test/route_added_hook_test.rb
     test/routing_test.rb
     test/sass_test.rb
+    test/server_test.rb
     test/sinatra_test.rb
     test/static_test.rb
     test/templates_test.rb
+    test/views/error.builder
+    test/views/error.erb
+    test/views/error.haml
+    test/views/error.sass
+    test/views/foo/hello.test
     test/views/hello.builder
     test/views/hello.erb
     test/views/hello.haml
@@ -96,7 +70,9 @@ Gem::Specification.new do |s|
   s.test_files = s.files.select {|path| path =~ /^test\/.*_test.rb/}
   s.extra_rdoc_files = %w[README.rdoc LICENSE]
-  s.add_dependency 'rack', '>= 0.9.0'
+  s.add_dependency 'rack',    '>= 1.0'
+  s.add_development_dependency 'shotgun', '>= 0.3',   '< 1.0'
+  s.add_development_dependency 'rack-test', '>= 0.3.0'
   s.has_rdoc = true
   s.homepage = "http://sinatra.rubyforge.org"