braai 1.2.2 → 1.3.0

data/Gemfile

@@ -3,4 +3,4 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in braai.gemspec
 gemspec
 
-gem "rspec"
+gem "minitest-colorize"

data/Gemfile.lock

@@ -1,30 +1,24 @@
 PATH
   remote: .
   specs:
-    braai (1.2.2)
+    braai (1.3.0)
       activesupport
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (3.2.9)
+    activesupport (3.2.11)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    diff-lcs (1.1.3)
     i18n (0.6.1)
+    minitest (2.12.1)
+    minitest-colorize (0.0.4)
+      minitest (~> 2.0)
     multi_json (1.5.0)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.2)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   braai!
-  rspec
+  minitest-colorize

data/README.md

@@ -28,7 +28,7 @@ The first matcher is a simple <code>to_s</code> matcher. It will match a single
 ```ruby
 template = "Hi {{ name }}!"
 response = Braai::Template.new(template).render(name: "Mark")
-response.should eql "Hi Mark!"
+response.must_equal "Hi Mark!"
 ```
 
 The second matcher will call a method on the variable.
@@ -36,7 +36,7 @@ The second matcher will call a method on the variable.
 ```ruby
 template = "Hi {{ name.upcase }}!"
 response = Braai::Template.new(template).render(name: "Mark")
-response.should eql "Hi MARK!"
+response.must_equal "Hi MARK!"
 ```
 
 ### Custom Matchers
@@ -54,7 +54,7 @@ Braai::Template.map(/({{\s*name\s*}})/i) do |template, key, matches|
 end
 
 response = Braai::Template.new(template).render(name: "mark")
-response.should eql "I'm MARK and Damn, I love BBQ!!"
+response.must_equal "I'm MARK and Damn, I love BBQ!!"
 ```
 
 ### For Loops
@@ -98,5 +98,5 @@ res.should match("<h2>MARK</h2>")
 ## Contributers
 
 * Mark Bates
-* Kevin Incorvia
 * Nick Plante
+* Kevin Incorvia

data/Rakefile

@@ -1,7 +1,12 @@
 require 'bundler'  
 Bundler::GemHelper.install_tasks
 
-desc "Run tests"
-task :default do
-  system "bundle exec rspec"
-end
+require 'rake/testtask'
+
+Rake::TestTask.new(:default) do |t|
+  t.libs << "spec"
+  t.pattern = "spec/**/*_spec.rb"
+end
+
+task :spec => :default
+task :test => :default

data/lib/braai/matchers.rb

@@ -32,9 +32,22 @@ module Braai::Matchers
       res.join("\n")
     }
 
-    @matchers[/({{\s*([\w]+)\.([\w]+)\s*}})/i] = ->(template, key, matches) {
-      attr = template.attributes[matches[1]]
-      attr ? attr.send(matches[2]) : nil
+    @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) {

data/lib/braai/version.rb

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

data/spec/braai/context_spec.rb

@@ -8,8 +8,11 @@ describe Braai::Context do
 
       it 'allows a nested hash' do
         context = Braai::Context.new("template", "matchers", { hash: { foo: 'bar' } })
-        context.attributes[:hash].should eql("foo" => 'bar')
+        context.attributes[:hash].must_equal("foo" => 'bar')
       end
+
     end
+
   end
-end
+
+end

data/spec/braai/matchers_spec.rb

@@ -2,40 +2,40 @@ require 'spec_helper'
 
 describe Braai::Matchers do
   include Braai::Matchers
-  
+
   describe 'map' do
 
     it "maps a new matcher" do
       map("foo") {}
-      matchers.should include("foo")
+      matchers.must_include("foo")
     end
 
     it "makes the latest matcher the first matcher in the list" do
       map("foo") {}
       map("bar") {}
-      matchers.keys.first.should eql("bar")
+      matchers.keys.first.must_equal("bar")
     end
-    
+
   end
 
   describe 'unmap' do
-    
+
     it "unmaps a matcher" do
       map("foo") {}
-      matchers.should include("foo")
+      matchers.must_include("foo")
       unmap("foo")
-      matchers.should_not include("foo")
+      matchers.wont_include("foo")
     end
 
   end
 
   describe 'clear!' do
-    
+
     it "removes all of the matchers" do
       map("foo") {}
-      matchers.should_not be_empty
+      matchers.wont_be_empty
       clear!
-      matchers.should be_empty
+      matchers.must_be_empty
     end
 
   end
@@ -43,11 +43,11 @@ describe Braai::Matchers do
   describe 'reset!' do
 
     it "resets the matchers to their original state" do
-      matchers.should have(3).matchers
+      matchers.size.must_equal(3)
       map("foo") {}
-      matchers.should have(4).matchers
+      matchers.size.must_equal(4)
       reset!
-      matchers.should have(3).matchers
+      matchers.size.must_equal(3)
     end
 
   end
@@ -57,9 +57,9 @@ describe Braai::Matchers do
     it "installs the three base matchers" do
       clear!
       map("foo") {}
-      matchers.should have(1).matchers
+      matchers.size.must_equal(1)
       set_defaults
-      matchers.should have(4).matchers
+      matchers.size.must_equal(4)
     end
 
   end

data/spec/braai/readme_spec.rb

@@ -5,13 +5,13 @@ describe 'README' do
   it "simple example" do
     template = "Hi {{ name }}!"
     response = Braai::Template.new(template).render(name: "Mark")
-    response.should eql "Hi Mark!"
+    response.must_equal "Hi Mark!"
   end  
 
   it "simple method call example" do
     template = "Hi {{ name.upcase }}!"
     response = Braai::Template.new(template).render(name: "Mark")
-    response.should eql "Hi MARK!"
+    response.must_equal "Hi MARK!"
   end
 
   it "custom matcher example" do
@@ -25,7 +25,7 @@ describe 'README' do
     end
 
     response = Braai::Template.new(template).render(name: "mark")
-    response.should eql "I'm MARK and Damn, I love BBQ!!"
+    response.must_equal "I'm MARK and Damn, I love BBQ!!"
   end
 
   it "for loop example" do
@@ -44,29 +44,14 @@ describe 'README' do
 <h2>{{greet.upcase}}</h2>
 EOF
 
-  res = Braai::Template.new(template).render(greet: "mark", products: %w{car boat truck}, foods: %w{apple orange})
-  res.should match("<h1>mark</h1>")
-  res.should match("<li>car</li>")
-  res.should match("<li>boat</li>")
-  res.should match("<li>truck</li>")
-  res.should match("<p>apple</p>")
-  res.should match("<p>orange</p>")
-  res.should match("<h2>MARK</h2>")
+    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
 
-        # it "description" do
-      #   template = "I'm {{ name }} and {{ mmm... bbq }}!"
-      #   Braai::Template.map(/mmm\.\.\. bbq/i) do |template, key, matches|
-      #     puts "key: #{key.inspect}"
-      #     puts "matches: #{matches.inspect}"
-      #     "Damn, I love BBQ!"
-      #   end
-
-      #   Braai::Template.map(/name/i) do |template, key, matches|
-      #     template.attributes[matches.first].upcase
-      #   end
-
-      #   puts Braai::Template.new(template).render(name: "Mark")
-      # end
-
 end

data/spec/braai/template_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'ostruct'
 
 describe Braai::Template do
 
@@ -17,45 +18,45 @@ describe Braai::Template do
 
   describe '.map' do
 
-    it "let's you register a matcher" do
-      Braai::Template.matchers.should_not have_key(greet_regex.to_s)
+    it "lets you register a matcher" do
+      Braai::Template.matchers.wont_include(greet_regex.to_s)
       Braai::Template.map(greet_regex, &greet_matcher)
-      Braai::Template.matchers.should have_key(greet_regex.to_s)
+      Braai::Template.matchers.must_include(greet_regex.to_s)
     end
 
     it "takes a class that responds to call" do
       Braai::Template.map(greet_regex, GreetHandler)
-      Braai::Template.matchers.should have_key(greet_regex.to_s)
+      Braai::Template.matchers.must_include(greet_regex.to_s)
     end
 
   end
 
   describe '#render' do
 
-    before(:each) do
+    before do
       Braai::Template.map(greet_regex, &greet_matcher)
       Braai::Template.map(/{{ greetings }}/i, GreetHandler)
     end
 
     it "renders a simple template using a block" do
       res = Braai::Template.new("{{ greet }}").render(greet: "Hi Mark")
-      res.should eql("Hi Mark")
+      res.must_equal("Hi Mark")
     end
 
     it "renders a simple template using a handler class" do
       res = Braai::Template.new("{{ greetings }}").render(greet: "Hi Mark")
-      res.should eql("HI MARK")
+      res.must_equal("HI MARK")
     end
 
     it "doesn't care about spaces" do
       template = "<h1>{{greet}}</h1><h2>{{ greet }}</h2>"
       res = Braai::Template.new(template).render(greet: "Hi Mark")
-      res.should eql("<h1>Hi Mark</h1><h2>Hi Mark</h2>")
+      res.must_equal("<h1>Hi Mark</h1><h2>Hi Mark</h2>")
     end
 
-    context 'matches' do
+    describe 'matches' do
 
-      context 'multimatches' do
+      describe 'multimatches' do
 
         let(:multi_regex) { /({{\s*(greet)\s*(mark)?\s*}})/ }
         let(:multi_matcher) do
@@ -64,21 +65,21 @@ describe Braai::Template do
           }
         end
 
-        before(:each) do
+        before do
           Braai::Template.map(multi_regex, &multi_matcher)
         end
 
         it "allows nil matches" do
           template = "<h1>{{ greet }}</h1><h2>{{ greet mark }}</h2>"
           res = Braai::Template.new(template).render
-          res.should eql("<h1>greet</h1><h2>greetmark</h2>")
+          res.must_equal("<h1>greet</h1><h2>greetmark</h2>")
         end
 
       end
 
     end
 
-    context "for loops" do
+    describe "for loops" do
 
       let(:template) do
 <<-EOF
@@ -99,36 +100,47 @@ EOF
 
       it "renders the loop" do
         res = Braai::Template.new(template).render(greet: "mark", products: %w{car boat truck}, foods: %w{apple orange})
-        res.should match("<h1>mark</h1>")
-        res.should match("<li>car</li>")
-        res.should match("<li>boat</li>")
-        res.should match("<li>truck</li>")
-        res.should match("<p>apple</p>")
-        res.should match("<p>orange</p>")
-        res.should match("<h2>MARK</h2>")
+        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
 
-    context "default matcher" do
+    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.should eql("Hi MARK")
+        res.must_equal("Hi MARK")
       end
 
       it "handles the attribute not being there" do
         res = Braai::Template.new(template).render(greet: "Hi")
-        res.should eql("Hi {{ name.upcase }}")
+        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
 
-    context "matcher errors" do
+    describe "matcher errors" do
 
-      before(:each) do
+      before do
         Braai::Template.map(/foo/) do |view, key, matches|
           raise ArgumentError
         end
@@ -136,26 +148,30 @@ EOF
 
       let(:template) { "foo" }
 
-      context "swallow_matcher_errors is true" do
+      describe "swallow_matcher_errors is true" do
+
+        before do
+          Braai.config.swallow_matcher_errors = true
+        end
 
         it "swallows errors in the matcher" do
-          expect {
+          -> {
             res = Braai::Template.new(template).render()
-          }.to_not raise_error
+          }
         end
 
       end
 
-      context "swallow_matcher_errors is false" do
+      describe "swallow_matcher_errors is false" do
 
-        before(:each) do
+        before do
           Braai.config.swallow_matcher_errors = false
         end
 
         it "raises the errors from the matcher" do
-          expect {
+          -> {
             res = Braai::Template.new(template).render
-          }.to raise_error(ArgumentError)
+          }.must_raise(ArgumentError)
         end
 
       end

data/spec/spec_helper.rb

@@ -2,12 +2,15 @@ require 'bundler/setup'
 
 require 'braai' # and any other gems you need
 
+require 'minitest/autorun'
+require "minitest-colorize"
+
 Braai.config.logger = Logger.new(StringIO.new)
 
-RSpec.configure do |config|
+class MiniTest::Spec
 
-  config.before do
+  before do
     Braai::Template.reset!
   end
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: braai
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-17 00:00:00.000000000 Z
+date: 2013-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -72,7 +72,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Fully extensible templating system.