card error handling cleanup

wagn · Dec 21, 2016 · 1c06567 · 1c06567
1 parent 9bc9f9b
commit 1c06567
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/card/lib/card/error.rb b/card/lib/card/error.rb
@@ -45,6 +45,8 @@ def initialize status, msg=""
 
     class << self
       def exception_view card, exception
+        Card::Error.current = exception
+
         case exception
         ## arguably the view and status should be defined in the error class;
         ## some are redundantly defined in view

diff --git a/card/lib/card/format/error.rb b/card/lib/card/format/error.rb
@@ -3,8 +3,8 @@ class Format
     module Error
       def rescue_view e, view
         raise e if Rails.env =~ /^cucumber|test$/
-        Card::Error.current = e
-        card.notable_exception_raised
+        error_view = Card::Error.exception_view @card, e
+        # TODO: consider rendering dynamic error view here.
         rendering_error e, view
       end
 

diff --git a/wagn/rails/controllers/card_controller.rb b/wagn/rails/controllers/card_controller.rb
@@ -127,7 +127,6 @@ def render_errors
   rescue_from StandardError do |exception|
     Rails.logger.info "exception = #{exception.class}: #{exception.message}"
     @card ||= Card.new
-    Card::Error.current = exception
     show Card::Error.exception_view(@card, exception)
   end
 end