lib/hanami/rendering_policy.rb in hanami-0.7.3 vs lib/hanami/rendering_policy.rb in hanami-0.8.0

@@ -11,13 +11,14 @@
     STATUS  = 0
     HEADERS = 1
     BODY    = 2
 
     HANAMI_ACTION = 'hanami.action'.freeze
+    RACK_EXCEPTION = 'rack.exception'.freeze
 
     SUCCESSFUL_STATUSES = (200..201).freeze
-    RENDERABLE_FORMATS  = [:all, :html].freeze
+    RENDERABLE_FORMATS = [:all, :html].freeze
 
     def initialize(configuration)
       @controller_pattern = %r{#{ configuration.controller_pattern.gsub(/\%\{(controller|action)\}/) { "(?<#{ $1 }>(.*))" } }}
       @view_pattern       = configuration.view_pattern
       @namespace          = configuration.namespace
@@ -32,46 +33,45 @@
     end
 
     private
     def _render(env, response)
       if action = renderable?(env)
-        _render_action(action, response) ||
+        _render_action(action, env, response) ||
           _render_status_page(action, response)
       end
     end
 
-    def _render_action(action, response)
-      if successful?(response)
+    def _render_action(action, env, response)
+      begin
         view_for(action, response).render(
           action.exposures
         )
+      rescue => e
+        env[RACK_EXCEPTION] = e
+        raise e
       end
     end
 
     def _render_status_page(action, response)
-      if render_status_page?(action)
+      if render_status_page?(action, response)
         Hanami::Views::Default.render(@templates, response[STATUS], response: response, format: :html)
       end
     end
 
     def renderable?(env)
-      ((action = env.delete(HANAMI_ACTION)) && action.renderable? ) and action
+      ((action = env.delete(HANAMI_ACTION)) && action.renderable?) and action
     end
 
-    def successful?(response)
-      SUCCESSFUL_STATUSES.include?(response[STATUS])
+    def render_status_page?(action, response)
+      RENDERABLE_FORMATS.include?(action.format) && !SUCCESSFUL_STATUSES.include?(response[STATUS])
     end
 
-    def render_status_page?(action)
-      RENDERABLE_FORMATS.include?(action.format)
-    end
-
     def view_for(action, response)
-      if response[BODY].respond_to?(:empty?) && response[BODY].empty?
+      view = if response[BODY].respond_to?(:empty?) && response[BODY].empty?
         captures = @controller_pattern.match(action.class.name)
-        Utils::Class.load!(@view_pattern % { controller: captures[:controller], action: captures[:action] }, @namespace)
-      else
-        Views::NullView.new(response[BODY])
+        Utils::Class.load(@view_pattern % { controller: captures[:controller], action: captures[:action] }, @namespace)
       end
+
+      view || Views::NullView.new
     end
   end
 end