braai 1.3.0 → 1.4.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    braai (1.3.0)
+    braai (1.4.0)
       activesupport
 
 GEM
@@ -11,9 +11,12 @@ GEM
       i18n (~> 0.6)
       multi_json (~> 1.0)
     i18n (0.6.1)
+    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)
 
 PLATFORMS
@@ -22,3 +25,4 @@ PLATFORMS
 DEPENDENCIES
   braai!
   minitest-colorize
+  mocha

data/braai.gemspec

@@ -18,5 +18,6 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_dependency("activesupport")
+  gem.add_development_dependency("mocha")
 
 end

data/lib/braai.rb

@@ -2,6 +2,7 @@ require 'logger'
 require "active_support/core_ext/hash/indifferent_access"
 require "braai/version"
 require "braai/configuration"
+require "braai/handlers"
 require "braai/matchers"
 require "braai/template"
 require "braai/context"

data/lib/braai/handlers.rb

@@ -0,0 +1,3 @@
+require 'braai/handlers/base'
+require 'braai/handlers/default'
+require 'braai/handlers/iteration'

data/lib/braai/handlers/base.rb

@@ -0,0 +1,36 @@
+module Braai::Handlers
+  class Base
+    attr_accessor :template, :key, :matches
+
+    def initialize(template, key, matches)
+      @template = template
+      @key = key
+      @matches = matches
+    end
+
+    class << self
+
+      def call(template, key, matches)
+        handler = self.new(template, key, matches)
+        handler.safe_perform
+      end
+
+    end
+
+    def safe_perform
+      begin
+        perform
+      rescue => e
+        rescue_from_error(e)
+      end
+    end
+
+    def perform
+      template
+    end
+
+    def rescue_from_error(e)
+      template
+    end
+  end
+end

data/lib/braai/handlers/default.rb

@@ -0,0 +1,21 @@
+module Braai::Handlers
+  class Default < Base
+    def perform
+      chain = matches[1].split('.')
+      value = template.attributes[chain.shift]
+      return nil unless value
+
+      chain.each do |a|
+        if value.respond_to?(a.to_sym)
+          value = value.send(a)
+        elsif value.is_a?(Hash)
+          value = value[a.to_sym] || value[a.to_s]
+        else
+          return nil
+        end
+      end
+
+      value
+    end
+  end
+end

data/lib/braai/handlers/iteration.rb

@@ -0,0 +1,11 @@
+module Braai::Handlers
+  class Iteration < Base
+    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
+      end
+      res.join("\n")
+    end
+  end
+end

data/lib/braai/matchers.rb

@@ -22,40 +22,8 @@ module Braai::Matchers
   end
 
   def set_defaults
-    @matchers ||= {}
-
-    @matchers[/({{\s*for (\w+) in (\w+)\s*}}(.+?){{\s*\/for\s*}})/im] = ->(template, key, matches) {
-      res = []
-      template.attributes[matches[2]].each do |val|
-        res << Braai::Context.new(matches[3], template.matchers, template.attributes.merge(matches[1] => val)).render
-      end
-      res.join("\n")
-    }
-
-    @matchers[/({{\s*([\w\.]+)\s*}})/i] = ->(template, key, matches) {
-      chain = matches[1].split('.')
-      value = template.attributes[chain.shift]
-      return nil unless value
-
-      chain.each do |a|
-        if value.respond_to?(a.to_sym)
-          value = value.send(a)
-        elsif value.is_a?(Hash)
-          value = value[a.to_sym] || value[a.to_s]
-        else
-          return nil
-        end
-      end
-
-      value
-    }
-
-    @matchers[/({{\s*([\w]+)\s*}})/i] = ->(template, key, matches) {
-      attr = template.attributes[matches.last]
-      attr ? attr.to_s : nil
-    }
-
-    @matchers
+    map(/({{\s*for (\w+) in (\w+)\s*}}(.+?){{\s*\/for\s*}})/im, Braai::Handlers::Iteration)
+    map(/({{\s*([\w\.]+)\s*}})/i, Braai::Handlers::Default)
   end
 
 end

data/lib/braai/version.rb

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

data/spec/braai/handlers/base_spec.rb

@@ -0,0 +1,59 @@
+require 'spec_helper'
+require 'ostruct'
+
+describe Braai::Handlers::Base do
+  include Mocha::Integration::MiniTest
+  include Braai::Matchers
+
+  let(:person)   { OpenStruct.new(name: "My Name", title: "Director") }
+  let(:template) { "Hello {{ person.name }}" }
+  let(:key)      { "{{ person.name }}" }
+  let(:matches)  { [ "{{ person.name }}", "name" ] }
+  let(:handler)  { Braai::Handlers::Base.new(template, key, matches) }
+
+  describe '.call' do
+
+    it 'condition' do
+      Braai::Handlers::Base.any_instance.expects(:safe_perform)
+      Braai::Handlers::Base.call(template, key, matches)
+    end
+
+  end
+
+  describe '#initialize' do
+
+    it 'creates an object with instance variables' do
+      handler = Braai::Handlers::Base.new(template, key, matches)
+      handler.template.must_equal(template)
+      handler.key.must_equal(key)
+      handler.matches.must_equal(matches)
+    end
+  end
+
+  describe '#perform' do
+
+    it 'returns the original template by default' do
+      handler.perform.must_equal("Hello {{ person.name }}")
+    end
+  end
+
+  describe '#safe_perform' do
+
+    it 'calls perform on the handler' do
+      handler.expects(:perform)
+      handler.safe_perform
+    end
+
+    it 'should receive rescue_from_error when needed' do
+      handler.stubs(:perform).raises(ArgumentError)
+      handler.safe_perform.must_equal('Hello {{ 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 }}')
+    end
+  end
+end

data/spec/braai/handlers/default_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+describe Braai::Handlers::Default do
+  include Mocha::Integration::MiniTest
+  include Braai::Matchers
+
+  let(:template) { "{{ greet }} {{ name.upcase }}" }
+  let(:adv_template) { "{{ greet }} my name is {{ name.full_name.upcase }}" }
+
+  it "uses the default matcher to render" do
+    res = Braai::Template.new(template).render(greet: "Hi", name: "mark")
+    res.must_equal("Hi MARK")
+  end
+
+  it "handles the attribute not being there" do
+    res = Braai::Template.new(template).render(greet: "Hi")
+    res.must_equal("Hi {{ name.upcase }}")
+  end
+
+  it "handles deeply nested attributes" do
+    res = Braai::Template.new(adv_template).render(greet: "Hello", name: OpenStruct.new(full_name: 'inigo montoya'))
+    res.must_equal("Hello my name is INIGO MONTOYA")
+  end
+
+  it "handles nested attribute hashes" do
+    res = Braai::Template.new(adv_template).render(greet: "Hello", name: { full_name: 'inigo montoya' })
+    res.must_equal("Hello my name is INIGO MONTOYA")
+  end
+end

data/spec/braai/handlers/iteration_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+describe Braai::Handlers::Iteration do
+  include Mocha::Integration::MiniTest
+  include Braai::Matchers
+
+  let(:template) do
+<<-EOF
+<h1>{{ greet }}</h1>
+<ul>
+  {{ for product in products }}
+    <li>{{ product }}</li>
+  {{ /for }}
+</ul>
+<div>
+  {{ for food in foods }}
+    <p>{{ food }}</p>
+  {{ /for }}
+</div>
+<h2>{{greet.upcase}}</h2>
+EOF
+  end
+
+  it "renders the loop" do
+    res = Braai::Template.new(template).render(greet: "mark", products: %w{car boat truck}, foods: %w{apple orange})
+    res.must_match("<h1>mark</h1>")
+    res.must_match("<li>car</li>")
+    res.must_match("<li>boat</li>")
+    res.must_match("<li>truck</li>")
+    res.must_match("<p>apple</p>")
+    res.must_match("<p>orange</p>")
+    res.must_match("<h2>MARK</h2>")
+  end
+end

data/spec/braai/matchers_spec.rb

@@ -43,11 +43,11 @@ describe Braai::Matchers do
   describe 'reset!' do
 
     it "resets the matchers to their original state" do
-      matchers.size.must_equal(3)
+      matchers.size.must_equal(2)
       map("foo") {}
-      matchers.size.must_equal(4)
-      reset!
       matchers.size.must_equal(3)
+      reset!
+      matchers.size.must_equal(2)
     end
 
   end
@@ -59,7 +59,7 @@ describe Braai::Matchers do
       map("foo") {}
       matchers.size.must_equal(1)
       set_defaults
-      matchers.size.must_equal(4)
+      matchers.size.must_equal(3)
     end
 
   end

data/spec/braai/template_spec.rb

@@ -38,6 +38,11 @@ describe Braai::Template do
       Braai::Template.map(/{{ greetings }}/i, GreetHandler)
     end
 
+    it "renders a template without matches" do
+      res = Braai::Template.new("Hi {{ greet }}").render()
+      res.must_equal("Hi {{ greet }}")
+    end
+
     it "renders a simple template using a block" do
       res = Braai::Template.new("{{ greet }}").render(greet: "Hi Mark")
       res.must_equal("Hi Mark")
@@ -75,65 +80,12 @@ describe Braai::Template do
           res.must_equal("<h1>greet</h1><h2>greetmark</h2>")
         end
 
-      end
-
-    end
-
-    describe "for loops" do
-
-      let(:template) do
-<<-EOF
-<h1>{{ greet }}</h1>
-<ul>
-  {{ for product in products }}
-    <li>{{ product }}</li>
-  {{ /for }}
-</ul>
-<div>
-  {{ for food in foods }}
-    <p>{{ food }}</p>
-  {{ /for }}
-</div>
-<h2>{{greet.upcase}}</h2>
-EOF
-      end
-
-      it "renders the loop" do
-        res = Braai::Template.new(template).render(greet: "mark", products: %w{car boat truck}, foods: %w{apple orange})
-        res.must_match("<h1>mark</h1>")
-        res.must_match("<li>car</li>")
-        res.must_match("<li>boat</li>")
-        res.must_match("<li>truck</li>")
-        res.must_match("<p>apple</p>")
-        res.must_match("<p>orange</p>")
-        res.must_match("<h2>MARK</h2>")
-      end
-
-    end
-
-    describe "default matcher" do
-
-      let(:template) { "{{ greet }} {{ name.upcase }}" }
-      let(:adv_template) { "{{ greet }} my name is {{ name.full_name.upcase }}" }
-
-      it "uses the default matcher to render" do
-        res = Braai::Template.new(template).render(greet: "Hi", name: "mark")
-        res.must_equal("Hi MARK")
-      end
-
-      it "handles the attribute not being there" do
-        res = Braai::Template.new(template).render(greet: "Hi")
-        res.must_equal("Hi {{ name.upcase }}")
-      end
-
-      it "handles deeply nested attributes" do
-        res = Braai::Template.new(adv_template).render(greet: "Hello", name: OpenStruct.new(full_name: 'inigo montoya'))
-        res.must_equal("Hello my name is INIGO MONTOYA")
-      end
+        it "matches only one" do
+          template = "<h1>{{ greet }}</h1><h2>{{ unmatched }}</h2>"
+          res = Braai::Template.new(template).render
+          res.must_equal("<h1>greet</h1><h2>{{ unmatched }}</h2>")
+        end
 
-      it "handles nested attribute hashes" do
-        res = Braai::Template.new(adv_template).render(greet: "Hello", name: { full_name: 'inigo montoya' })
-        res.must_equal("Hello my name is INIGO MONTOYA")
       end
 
     end

data/spec/spec_helper.rb

@@ -3,7 +3,8 @@ require 'bundler/setup'
 require 'braai' # and any other gems you need
 
 require 'minitest/autorun'
-require "minitest-colorize"
+require 'minitest-colorize'
+require 'mocha'
 
 Braai.config.logger = Logger.new(StringIO.new)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: braai
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-28 00:00:00.000000000 Z
+date: 2013-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -27,6 +27,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Fully extensible templating system.
 email:
 - mark@markbates.com
@@ -44,10 +60,17 @@ files:
 - lib/braai.rb
 - lib/braai/configuration.rb
 - lib/braai/context.rb
+- lib/braai/handlers.rb
+- lib/braai/handlers/base.rb
+- lib/braai/handlers/default.rb
+- lib/braai/handlers/iteration.rb
 - lib/braai/matchers.rb
 - lib/braai/template.rb
 - lib/braai/version.rb
 - spec/braai/context_spec.rb
+- spec/braai/handlers/base_spec.rb
+- spec/braai/handlers/default_spec.rb
+- spec/braai/handlers/iteration_spec.rb
 - spec/braai/matchers_spec.rb
 - spec/braai/readme_spec.rb
 - spec/braai/template_spec.rb
@@ -78,6 +101,9 @@ specification_version: 3
 summary: Fully extensible templating system.
 test_files:
 - spec/braai/context_spec.rb
+- spec/braai/handlers/base_spec.rb
+- spec/braai/handlers/default_spec.rb
+- spec/braai/handlers/iteration_spec.rb
 - spec/braai/matchers_spec.rb
 - spec/braai/readme_spec.rb
 - spec/braai/template_spec.rb