braai 1.5.0 → 1.6.0

data/Gemfile.lock

@@ -1,23 +1,23 @@
 PATH
   remote: .
   specs:
-    braai (1.5.0)
+    braai (1.6.0)
       activesupport
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (3.2.11)
+    activesupport (3.2.12)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    i18n (0.6.1)
+    i18n (0.6.4)
     metaclass (0.0.1)
     minitest (2.12.1)
     minitest-colorize (0.0.4)
       minitest (~> 2.0)
     mocha (0.12.4)
       metaclass (~> 0.0.1)
-    multi_json (1.5.0)
+    multi_json (1.6.1)
 
 PLATFORMS
   ruby

data/lib/braai/context.rb

@@ -1,32 +1,42 @@
 class Braai::Context
 
-  attr_accessor :attributes
-  attr_accessor :template
-  attr_accessor :matchers
+  attr_accessor :attributes, :matchers, :fallback, :substrate
 
-  def initialize(template, matchers, attributes = {})
+  def initialize(substrate, template, attributes = {})
     self.attributes = HashWithIndifferentAccess.new(attributes)
-    self.template = template.dup
-    self.matchers = matchers
+    self.substrate = substrate.dup
+    self.matchers = template.matchers
+    self.fallback = template.fallback
   end
 
   def render
     begin
+
       self.matchers.each do |regex, matcher|
-        regex = Regexp.new(regex)
-        matches = self.template.scan(regex)
-        matches.each do |set|
-          set = [set].flatten.map {|m| m.strip unless m.nil? }
-          val = matcher.call(self, set[0], set)
-          self.template.gsub!(set[0], val.to_s) if val
-        end
+        substitute(regex, matcher)
+      end
+
+      if self.fallback
+        substitute(self.fallback[:regex], self.fallback[:handler])
       end
-      return self.template
+
+      return self.substrate
     rescue Exception => e
-      puts e.inspect
       Braai.logger.error(e)
       raise e unless Braai.config.swallow_matcher_errors
     end
   end
 
+  private
+
+  def substitute(regex, matcher)
+    regex = Regexp.new(regex)
+    matches = self.substrate.scan(regex)
+    matches.each do |set|
+      set = [set].flatten.map {|m| m.strip unless m.nil? }
+      val = matcher.call(self, set[0], set)
+      self.substrate.gsub!(set[0], val.to_s) if val
+    end
+  end
+
 end

data/lib/braai/handlers/base.rb

@@ -38,7 +38,7 @@ module Braai::Handlers
     def rescue_from_error(e)
       Braai::Handlers.rescuers.each do |rescuer|
         if e.is_a?(rescuer[:klass])
-          return rescuer[:handler].call(self)
+          return rescuer[:handler].call(self, e)
         end
       end
       raise e

data/lib/braai/handlers/iteration.rb

@@ -3,7 +3,7 @@ module Braai::Handlers
     def perform
       res = []
       template.attributes[matches[2]].each do |val|
-        res << Braai::Context.new(matches[3], template.matchers, template.attributes.merge(matches[1] => val)).render
+        res << Braai::Context.new(matches[3], template, template.attributes.merge(matches[1] => val)).render
       end
       res.join("\n")
     end

data/lib/braai/handlers.rb

@@ -16,4 +16,4 @@ module Braai
     end
 
   end
-end
+end

data/lib/braai/matchers.rb

@@ -1,5 +1,7 @@
 module Braai::Matchers
 
+  attr_accessor :fallback
+
   IterationMatcher = /({{\s*for (\w+) in (\w+)\s*}}(.+?){{\s*\/for\s*}})/im
   DefaultMatcher = /({{\s*([\w\.]+)\s*}})/i
   RegionMatcher = /({{\s*([\w]+)\s*}}(.*){{\s*\/([\w]+)\s*}})/mi
@@ -12,12 +14,17 @@ module Braai::Matchers
     @matchers = {regex.to_s => handler || block}.merge(self.matchers)
   end
 
+  def add_fallback(regex, handler=nil, &block)
+    @fallback = { :regex => regex.to_s, :handler => handler || block }
+  end
+
   def unmap(regex)
     self.matchers.delete(regex.to_s)
   end
 
   def clear!
     self.matchers.clear
+    self.fallback = nil
   end
 
   def reset!

data/lib/braai/template.rb

@@ -2,17 +2,17 @@ class Braai::Template
   extend Braai::Matchers
   include Braai::Matchers
 
-  attr_accessor :attributes
   attr_accessor :template
 
   def initialize(template, matchers = {})
-    self.template = template
     @matchers = self.class.matchers.merge(matchers)
+    @template = template
+    @fallback = self.class.fallback
   end
 
   def render(attributes = {})
-    context = Braai::Context.new(self.template, self.matchers, attributes)
+    context = Braai::Context.new(@template, self, attributes)
     context.render
   end
 
-end
+end

data/lib/braai/version.rb

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

data/spec/braai/context_spec.rb

@@ -7,7 +7,8 @@ describe Braai::Context do
     describe 'attributes arguments' do
 
       it 'allows a nested hash' do
-        context = Braai::Context.new("template", "matchers", { hash: { foo: 'bar' } })
+        template = mock(:matchers => true, :fallback => true)
+        context = Braai::Context.new("some {{stuff}}", template, { hash: { foo: 'bar' } })
         context.attributes[:hash].must_equal("foo" => 'bar')
       end
 
@@ -15,4 +16,4 @@ describe Braai::Context do
 
   end
 
-end
+end

data/spec/braai/handlers/base_spec.rb

@@ -59,7 +59,7 @@ describe Braai::Handlers::Base do
   describe '#rescue_from_error' do
 
     it 'calls a user-defined error handler if specified' do
-      Braai::Handlers.rescue_from ArgumentError, ->(e) { "<!-- #{key} -->" }
+      Braai::Handlers.rescue_from ArgumentError, ->(handler, e) { "<!-- #{key} -->" }
       handler.rescue_from_error(ArgumentError.new).must_equal('<!-- {{ person.name }} -->')
     end
 
@@ -70,8 +70,8 @@ describe Braai::Handlers::Base do
     end
 
     it "stops after the first matching rescuer" do
-      Braai::Handlers.rescue_from Exception, ->(e) { "!!! #{key} !!!" }
-      Braai::Handlers.rescue_from ArgumentError, ->(e) { "<!-- #{key} -->" }
+      Braai::Handlers.rescue_from Exception, ->(handler, e) { "!!! #{key} !!!" }
+      Braai::Handlers.rescue_from ArgumentError, ->(handler, e) { "<!-- #{key} -->" }
       handler.rescue_from_error(ArgumentError.new).must_equal('<!-- {{ person.name }} -->')
     end
 

data/spec/braai/template_spec.rb

@@ -3,6 +3,7 @@ require 'ostruct'
 
 describe Braai::Template do
 
+
   class GreetHandler
     def self.call(template, key, matches)
       template.attributes[:greet].upcase
@@ -59,6 +60,7 @@ describe Braai::Template do
       res.must_equal("<h1>Hi Mark</h1><h2>Hi Mark</h2>")
     end
 
+
     describe 'matches' do
 
       describe 'multimatches' do
@@ -71,6 +73,7 @@ describe Braai::Template do
         end
 
         before do
+          Braai::Template.clear!
           Braai::Template.map(multi_regex, &multi_matcher)
         end
 
@@ -90,6 +93,29 @@ describe Braai::Template do
 
     end
 
+
+    describe "fallback matcher" do
+
+      before do
+        Braai::Template.map(/({{ yummy_(\w+) }})/, ->(view, key, matches) { "#{matches[1].upcase}: #{view.attributes[matches[1]]}" })
+        Braai::Template.add_fallback(/({{ (\w+) }})/, ->(view, key, matches) { "UNMATCHED_TAG" })
+      end
+
+      it "is called" do
+        template = "<h2>{{ bango }}</h2>"
+        res = Braai::Template.new(template).render
+        res.must_equal("<h2>UNMATCHED_TAG</h2>")
+      end
+
+      it "always comes last" do
+        template = "<h2>{{ bango }}</h2><p>{{ yummy_food }}</p><p>{{ yummy_drink }}</p> {{ blaz }}"
+
+        res = Braai::Template.new(template).render(food: 'pizza', drink: 'beer')
+        res.must_equal("<h2>UNMATCHED_TAG</h2><p>FOOD: pizza</p><p>DRINK: beer</p> UNMATCHED_TAG")
+      end
+
+    end
+
     describe "matcher errors" do
 
       before do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: braai
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-04 00:00:00.000000000 Z
+date: 2013-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -95,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Fully extensible templating system.