dzl 1.0.0.rc7 → 1.0.0.rc8

data/config.ru

@@ -15,10 +15,10 @@ end
 #   run Dzl::Examples::Trey
 # end
 
-require 'dzl/examples/fun_with_params'
-map '/' do
-  run Dzl::Examples::FunWithParams
-end
+# require 'dzl/examples/fun_with_params'
+# map '/' do
+#   run Dzl::Examples::FunWithParams
+# end
 
 # require 'dzl/examples/fun_with_requests'
 # map '/' do
@@ -30,10 +30,10 @@ end
 #   run Dzl::Examples::RouteProfile
 # end
 
-# require 'dzl/examples/fun_with_handlers'
-# map '/' do
-#   run Dzl::Examples::FunWithHandlers
-# end
+require 'dzl/examples/fun_with_handlers'
+map '/' do
+  run Dzl::Examples::FunWithHandlers
+end
 
 # require 'dzl/examples/fun_with_hooks'
 # map '/' do

data/lib/dzl/dsl_proxies/router.rb

@@ -46,6 +46,12 @@ class Dzl::DSLProxies::Router < Dzl::DSLProxy
     @subject.call_with_subject(Proc.new, @subject.defaults_dslsub)
   end
 
+  def error_hook(&block)
+    raise ArgumentError unless block_given?
+
+    @subject.error_hooks << block
+  end
+
   REQUEST_METHODS.each do |m|
     define_method(m) do |route, *request_methods, &block|
       request_methods << m

data/lib/dzl/dsl_subjects/router.rb

@@ -3,7 +3,7 @@ require 'dzl/dsl_subjects/defaults'
 
 class Dzl::DSLSubjects::Router < Dzl::DSLSubject
   include Dzl::RouterDoc
-  attr_reader :pblocks, :defaults_dslsub, :defaults, :app
+  attr_reader :pblocks, :defaults_dslsub, :defaults, :app, :error_hooks
 
   def initialize(app)
     @pblocks = {}
@@ -16,6 +16,7 @@ class Dzl::DSLSubjects::Router < Dzl::DSLSubject
     @defaults_dslsub = Dzl::DSLSubjects::Defaults.new(self)
     @dsl_proxy = Dzl::DSLProxies::Router.new(self)
     @app = app
+    @error_hooks = []
   end
 
   def call_with_subject(proc, subject)

data/lib/dzl/examples/fun_with_handlers.rb

@@ -5,6 +5,18 @@ class Dzl::Examples::FunWithHandlers < Dzl::Examples::Base
     content_type 'application/json'
   end
 
+  error_hook do |e|
+    Object.first_error_hook
+  end
+
+  error_hook do |e|
+    Object.second_error_hook
+
+    if e.to_s.match('explode')
+      raise 'explode'
+    end
+  end
+
   endpoint '/say_bar' do
     optional :foo, :bar, :baz, :bam
 
@@ -31,6 +43,12 @@ class Dzl::Examples::FunWithHandlers < Dzl::Examples::Base
     end
   end
 
+  get '/explode' do
+    handle do
+      raise 'explode'
+    end
+  end
+
   get '/validation_error' do
     handle do
       raise Dzl::ValidationError.new(

data/lib/dzl/rack_interface.rb

@@ -10,23 +10,30 @@ module Dzl::RackInterface
     request = nil
     start_time = Time.now
     start_profile if PROFILE_REQUESTS
-    response = begin
+    response, error = begin
       request = Dzl::Request.new(env)
-      __router.handle_request(request)
+      [__router.handle_request(request), nil]
     rescue Dzl::RespondWithHTTPBasicChallenge
-      respond_with_http_basic_challenge
+      [respond_with_http_basic_challenge, nil]
     rescue Dzl::Error => e
-      respond_with_dzl_error_handler(e)
+      [respond_with_dzl_error_handler(e), nil]
     rescue StandardError => e
-      respond_with_standard_error_handler(e)
+      [respond_with_standard_error_handler(e), e]
     end
 
     if response[0] < 100
-      response = respond_with_standard_error_handler(StandardError.new('Application did not respond'))
+      error = Dzl::Error.new('Application did not respond')
+      response = respond_with_standard_error_handler(error)
+    end
+
+    if error.present?
+      __router.error_hooks.each do |hook|
+        hook.call(error) rescue nil
+      end
     end
 
     stop_profiling_and_print if PROFILE_REQUESTS
-    log_request(request, response, (Time.now - start_time)) unless request.silent?
+    log_request(request, response, (Time.now - start_time), error) unless request.silent?
 
     if Dzl.production? || Dzl.staging?
       (response[0] < 500) ? response : [response[0], [], [response[0].to_s]]
@@ -88,10 +95,17 @@ module Dzl::RackInterface
     )
   end
 
-  def log_request(request, response, seconds)
+  def log_request(request, response, seconds, error)
     logger.info  "#{request.request_method} #{request.path}"
     logger.info  "PARAMS: #{request.params}"
     logger.debug "BODY: #{request.body}" unless request.body.blank?
     logger.info  "#{response[0]} in #{seconds * 1000}ms"
+    
+    if error.present?
+      logger.info error.inspect
+      error.backtrace.each do |line|
+        logger.info "  #{line}"
+      end
+    end
   end
 end

data/lib/dzl/version.rb

@@ -1,3 +1,3 @@
 module Dzl
-  VERSION = "1.0.0.rc7"
+  VERSION = "1.0.0.rc8"
 end

data/spec/fun_with_handlers_spec.rb

@@ -29,12 +29,24 @@ describe 'handlers' do
     end
   end
 
-  it 'can raise exceptions without exploding everything' do
+  it 'calls error hooks on errors' do
+    Object.should_receive(:first_error_hook)
+    Object.should_receive(:second_error_hook)
+
     get '/raise' do |response|
       response.status.should == 500
     end
   end
 
+  it 'exceptions raised in error hooks are squashed, sorry' do
+    Object.should_receive(:first_error_hook)
+    Object.should_receive(:second_error_hook)
+
+    get '/explode' do |response|
+      response.status.should == 500
+    end
+  end
+
   it 'are good places to raise Dzl::ValidationError' do
     get '/validation_error' do |response|
       response.status.should == 404

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dzl
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc7
+  version: 1.0.0.rc8
   prerelease: 6
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-25 00:00:00.000000000 Z
+date: 2012-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70287627293400 !ruby/object:Gem::Requirement
+  requirement: &70294010134960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 1.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *70287627293400
+  version_requirements: *70294010134960
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70287627291640 !ruby/object:Gem::Requirement
+  requirement: &70294010134460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,7 +33,7 @@ dependencies:
         version: 3.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *70287627291640
+  version_requirements: *70294010134460
 description: Small, fast racktivesupport web framework with handy DSL and explicit
   parameter validation.
 email: