braai 1.4.0 → 1.4.1

data/Gemfile.lock

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

data/lib/braai/handlers/base.rb

@@ -10,27 +10,39 @@ 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
       end
-
     end
 
     def safe_perform
-      begin
+      value = begin
         perform
       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
 
+    # override this method in your own handlers
     def perform
-      template
+      key
     end
 
     def rescue_from_error(e)
-      template
+      if self.class.error_handler
+        self.class.error_handler.call(e)
+      else
+        key
+      end
     end
   end
 end

data/lib/braai/matchers.rb

@@ -1,5 +1,9 @@
 module Braai::Matchers
 
+  IterationMatcher = /({{\s*for (\w+) in (\w+)\s*}}(.+?){{\s*\/for\s*}})/im
+  DefaultMatcher = /({{\s*([\w\.]+)\s*}})/i
+  RegionMatcher = /({{\s*([\w]+)\s*}}(.*){{\s*\/([\w]+)\s*}})/mi
+
   def matchers
     @matchers ||= reset!
   end
@@ -22,8 +26,8 @@ module Braai::Matchers
   end
 
   def set_defaults
-    map(/({{\s*for (\w+) in (\w+)\s*}}(.+?){{\s*\/for\s*}})/im, Braai::Handlers::Iteration)
-    map(/({{\s*([\w\.]+)\s*}})/i, Braai::Handlers::Default)
+    map(IterationMatcher, Braai::Handlers::Iteration)
+    map(DefaultMatcher, Braai::Handlers::Default)
   end
 
 end

data/lib/braai/version.rb

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

data/spec/braai/handlers/base_spec.rb

@@ -11,6 +11,11 @@ describe Braai::Handlers::Base do
   let(:matches)  { [ "{{ person.name }}", "name" ] }
   let(:handler)  { Braai::Handlers::Base.new(template, key, matches) }
 
+  before do
+    Braai::Handlers::Base.error_handler = nil
+    Braai::Handlers::Base.nomatch_handler = nil
+  end
+
   describe '.call' do
 
     it 'condition' do
@@ -32,8 +37,8 @@ describe Braai::Handlers::Base do
 
   describe '#perform' do
 
-    it 'returns the original template by default' do
-      handler.perform.must_equal("Hello {{ person.name }}")
+    it 'returns the key by default (should be overridden in implementations)' do
+      handler.perform.must_equal("{{ person.name }}")
     end
   end
 
@@ -44,16 +49,37 @@ describe Braai::Handlers::Base do
       handler.safe_perform
     end
 
-    it 'should receive rescue_from_error when needed' do
+    it 'rescues from error when needed' do
       handler.stubs(:perform).raises(ArgumentError)
-      handler.safe_perform.must_equal('Hello {{ person.name }}')
+      handler.expects(:rescue_from_error).returns('<!-- foo -->')
+      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 'call the class method of the same name' do
-      handler.rescue_from_error(ArgumentError).must_equal('Hello {{ person.name }}')
+    it 'defaults to returning the unmodified template' do
+      handler.rescue_from_error(ArgumentError).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 }} -->')
+    end
+  end
+
+  describe 'default template rendering' do
+
+    it 'performs no substitution' do
+      Braai::Template.clear!
+      Braai::Template.map(Braai::Matchers::DefaultMatcher, Braai::Handlers::Base)
+      res = Braai::Template.new("{{ greet }} my name is {{ name }}").render(greet: "Hello")
+      res.must_equal("{{ greet }} my name is {{ name }}")
     end
   end
 end

metadata

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