frank 1.0.5 → 1.0.6

data/Gemfile

@@ -1,6 +1,6 @@
 source :gemcutter
 gem 'rack', '>=1.0'
-gem 'mongrel', '>=1.0'
+gem 'mongrel', '>=1.2.0.pre2'
 gem 'haml', '>=3.0'
 gem 'tilt', '=0.9'
 gem 'net-ssh', '>=2.0'

data/frank.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{frank}
-  s.version = "1.0.5"
+  s.version = "1.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["blahed", "nwah"]
-  s.date = %q{2010-12-07}
+  s.date = %q{2010-12-09}
   s.default_executable = %q{frank}
   s.description = %q{Rapidly develop static sites using any supported templating language}
   s.email = %q{travis.dunn@thisismedium.com}
@@ -121,7 +121,7 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rack>, [">= 1.0"])
-      s.add_runtime_dependency(%q<mongrel>, [">= 1.0"])
+      s.add_runtime_dependency(%q<mongrel>, [">= 1.2.0.pre2"])
       s.add_runtime_dependency(%q<haml>, [">= 3.0"])
       s.add_runtime_dependency(%q<tilt>, ["= 0.9"])
       s.add_runtime_dependency(%q<net-ssh>, [">= 2.0"])
@@ -142,7 +142,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<ruby-debug>, [">= 0"])
     else
       s.add_dependency(%q<rack>, [">= 1.0"])
-      s.add_dependency(%q<mongrel>, [">= 1.0"])
+      s.add_dependency(%q<mongrel>, [">= 1.2.0.pre2"])
       s.add_dependency(%q<haml>, [">= 3.0"])
       s.add_dependency(%q<tilt>, ["= 0.9"])
       s.add_dependency(%q<net-ssh>, [">= 2.0"])
@@ -164,7 +164,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<rack>, [">= 1.0"])
-    s.add_dependency(%q<mongrel>, [">= 1.0"])
+    s.add_dependency(%q<mongrel>, [">= 1.2.0.pre2"])
     s.add_dependency(%q<haml>, [">= 3.0"])
     s.add_dependency(%q<tilt>, ["= 0.9"])
     s.add_dependency(%q<net-ssh>, [">= 2.0"])

data/lib/frank/base.rb

@@ -6,7 +6,7 @@ require 'frank/middleware/statik'
 require 'frank/middleware/refresh'
 
 module Frank
-  VERSION = '1.0.5'
+  VERSION = '1.0.6'
   extend Frank::Upgrades
 
   module Render; end
@@ -39,9 +39,9 @@ module Frank
       @response['Content-Type'] = Rack::Mime.mime_type(File.extname(@request.path), 'text/html')
       @response.write render(@request.path)
     rescue Frank::TemplateError
-      render_404
+      @response.write render_404
     rescue Exception => e
-      render_500 e
+      @response.write render_500(e)
     end
 
     # prints requests and errors to STDOUT

data/lib/frank/rescue.rb

@@ -2,6 +2,7 @@ module Frank
   module Rescue
 
     def render_404
+      log_request('404')
       template = File.expand_path(File.dirname(__FILE__)) + '/templates/404.haml'
       locals = { :request => @env,
                  :dynamic_folder => Frank.dynamic_folder,
@@ -10,13 +11,13 @@ module Frank
 
       @response['Content-Type'] = 'text/html'
       @response.status          = 404
-      obj                       = Object.new.extend(TemplateHelpers)
-      @response.body            = Tilt::HamlTemplate.new(template).render(obj, locals = locals)
 
-      log_request('404')
+      obj = Object.new.extend(TemplateHelpers)
+      Tilt::HamlTemplate.new(template).render(obj, locals = locals)
     end
 
     def render_500(excp)
+      log_request('500', excp)
       template = File.expand_path(File.dirname(__FILE__)) + '/templates/500.haml'
       locals   = { :request => @env,
                    :params => @request.params,
@@ -24,10 +25,9 @@ module Frank
 
       @response['Content-Type'] = 'text/html'
       @response.status          = 500
-      obj                       = Object.new.extend(TemplateHelpers)
-      @response.body            = Tilt::HamlTemplate.new(template).render(obj, locals = locals)
 
-      log_request('500', excp)
+      obj = Object.new.extend(TemplateHelpers)
+      Tilt::HamlTemplate.new(template).render(obj, locals = locals)
     end
 
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: frank
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 1
   - 0
-  - 5
-  version: 1.0.5
+  - 6
+  version: 1.0.6
 platform: ruby
 authors: 
 - blahed
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-07 00:00:00 -05:00
+date: 2010-12-09 00:00:00 -05:00
 default_executable: frank
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,11 +40,13 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: -1876988191
         segments: 
         - 1
+        - 2
         - 0
-        version: "1.0"
+        - pre2
+        version: 1.2.0.pre2
   type: :runtime
   name: mongrel
   prerelease: false