braai 1.4.1 → 1.5.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    braai (1.4.1)
+    braai (1.5.0)
       activesupport
 
 GEM

data/lib/braai/handlers.rb

@@ -1,3 +1,19 @@
 require 'braai/handlers/base'
 require 'braai/handlers/default'
 require 'braai/handlers/iteration'
+
+module Braai
+  module Handlers
+    
+    class << self
+      def rescue_from(klass, handler)
+        self.rescuers.unshift({klass: klass, handler: handler})
+      end
+
+      def rescuers
+        @rescuers ||= []
+      end
+    end
+
+  end
+end

data/lib/braai/handlers/base.rb

@@ -1,4 +1,9 @@
+# Braai.rescue_from Exception, ->{}
+# Braai.rescue_from ArgumentError, ->{}
+
+
 module Braai::Handlers
+
   class Base
     attr_accessor :template, :key, :matches
 
@@ -10,8 +15,6 @@ module Braai::Handlers
 
     class << self
 
-      attr_accessor :error_handler, :nomatch_handler
-
       def call(template, key, matches)
         handler = self.new(template, key, matches)
         handler.safe_perform
@@ -24,11 +27,6 @@ module Braai::Handlers
       rescue => e
         rescue_from_error(e)
       end
-
-      if [key, nil].include?(value) && self.class.nomatch_handler
-        value = self.class.nomatch_handler.call(key)
-      end
-
       value
     end
 
@@ -38,11 +36,12 @@ module Braai::Handlers
     end
 
     def rescue_from_error(e)
-      if self.class.error_handler
-        self.class.error_handler.call(e)
-      else
-        key
+      Braai::Handlers.rescuers.each do |rescuer|
+        if e.is_a?(rescuer[:klass])
+          return rescuer[:handler].call(self)
+        end
       end
+      raise e
     end
   end
 end

data/lib/braai/version.rb

@@ -1,3 +1,3 @@
 module Braai
-  VERSION = "1.4.1"
+  VERSION = "1.5.0"
 end

data/spec/braai/handlers/base_spec.rb

@@ -12,8 +12,7 @@ describe Braai::Handlers::Base do
   let(:handler)  { Braai::Handlers::Base.new(template, key, matches) }
 
   before do
-    Braai::Handlers::Base.error_handler = nil
-    Braai::Handlers::Base.nomatch_handler = nil
+    Braai::Handlers.rescuers.clear
   end
 
   describe '.call' do
@@ -55,22 +54,27 @@ describe Braai::Handlers::Base do
       handler.safe_perform.must_equal('<!-- foo -->')
     end
 
-    it 'falls back on an optional nomatch handler' do
-      Braai::Handlers::Base.nomatch_handler = ->(value) { "<!-- no match for #{value} -->" }
-      handler.safe_perform.must_equal("<!-- no match for {{ person.name }} -->")
-    end
   end
 
   describe '#rescue_from_error' do
 
-    it 'defaults to returning the unmodified template' do
-      handler.rescue_from_error(ArgumentError).must_equal('{{ person.name }}')
+    it 'calls a user-defined error handler if specified' do
+      Braai::Handlers.rescue_from ArgumentError, ->(e) { "<!-- #{key} -->" }
+      handler.rescue_from_error(ArgumentError.new).must_equal('<!-- {{ person.name }} -->')
     end
 
-    it 'calls a user-defined error handler if specified' do
-      Braai::Handlers::Base.error_handler = ->(e) { "<!-- #{key} -->" }
-      handler.rescue_from_error(ArgumentError).must_equal('<!-- {{ person.name }} -->')
+    it "raises the error if there is not rescuer" do
+      ->{
+        handler.rescue_from_error(ArgumentError.new)
+      }.must_raise(ArgumentError)
     end
+
+    it "stops after the first matching rescuer" do
+      Braai::Handlers.rescue_from Exception, ->(e) { "!!! #{key} !!!" }
+      Braai::Handlers.rescue_from ArgumentError, ->(e) { "<!-- #{key} -->" }
+      handler.rescue_from_error(ArgumentError.new).must_equal('<!-- {{ person.name }} -->')
+    end
+
   end
 
   describe 'default template rendering' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: braai
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-03 00:00:00.000000000 Z
+date: 2013-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport