braai 1.1.1 → 1.1.2

data/Gemfile.lock

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

data/README.md

@@ -25,25 +25,25 @@ Braai comes shipped with two simple matchers for you, but you can easily add you
 
 The first matcher is a simple <code>to_s</code> matcher. It will match a single variable and then call <code>to_s</code> on it:
 
-<pre><code>
+```ruby
 template = "Hi {{ name }}!"
 response = Braai::Template.new(template).render(name: "Mark")
 response.should eql "Hi Mark!"
-</code></pre>
+```
 
 The second matcher will call a method on the variable.
 
-<pre><code>
+```ruby
 template = "Hi {{ name.upcase }}!"
 response = Braai::Template.new(template).render(name: "Mark")
 response.should eql "Hi MARK!"
-</code></pre>
+```
 
 ### Custom Matchers
 
 Braai let's you easily define your own matchers to do whatever you would like to do.
 
-<pre><code>
+```ruby
 template = "I'm {{ name }} and {{ mmm... bbq }}!"
 Braai::Template.map(/({{\s*mmm\.\.\. bbq\s*}})/i) do |template, key, matches|
   "Damn, I love BBQ!"
@@ -55,13 +55,13 @@ end
 
 response = Braai::Template.new(template).render(name: "mark")
 response.should eql "I'm MARK and Damn, I love BBQ!!"
-</code></pre>
+```
 
 ### For Loops
 
 Braai supports looping right out of the box.
 
-<pre><code>
+```ruby
 template = &lt;&lt;-EOF
 &lt;h1>{{ greet }}&lt;/h1>
 &lt;ul>
@@ -85,7 +85,7 @@ res.should match("&lt;li>truck&lt;/li>")
 res.should match("&lt;p>apple&lt;/p>")
 res.should match("&lt;p>orange&lt;/p>")
 res.should match("&lt;h2>MARK&lt;/h2>")
-</code></pre>
+```
 
 ## Contributing
 
@@ -94,3 +94,8 @@ res.should match("&lt;h2>MARK&lt;/h2>")
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+
+## Contributers
+
+* Mark Bates
+* Kevin Incorvia

data/lib/braai/context.rb

@@ -16,7 +16,7 @@ class Braai::Context
         regex = Regexp.new(regex)
         matches = self.template.scan(regex)
         matches.each do |set|
-          set = [set].flatten.map {|m| m.strip}
+          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
@@ -29,4 +29,4 @@ class Braai::Context
     end
   end
 
-end
+end

data/lib/braai/version.rb

@@ -1,3 +1,3 @@
 module Braai
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

data/spec/braai/template_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Braai::Template do
-  
+
   let(:greet_regex) { /^greet$/i }
   let(:greet_matcher) do
     ->(view, key, matches) {
@@ -16,7 +16,7 @@ describe Braai::Template do
       Braai::Template.map(greet_regex, &greet_matcher)
       Braai::Template.matchers.should have_key(greet_regex.to_s)
     end
-    
+
   end
 
   describe '#render' do
@@ -24,7 +24,7 @@ describe Braai::Template do
     before(:each) do
       Braai::Template.map(greet_regex, &greet_matcher)
     end
-    
+
     it "renders a simple template" do
       res = Braai::Template.new("{{ greet }}").render(greet: "Hi Mark")
       res.should eql("Hi Mark")
@@ -36,8 +36,33 @@ describe Braai::Template do
       res.should eql("<h1>Hi Mark</h1><h2>Hi Mark</h2>")
     end
 
+    context 'matches' do
+
+      context 'multimatches' do
+
+        let(:multi_regex) { /({{\s*(greet)\s*(mark)?\s*}})/ }
+        let(:multi_matcher) do
+          ->(view, key, matches) {
+            "#{matches[1]}#{matches[2]}"
+          }
+        end
+
+        before(:each) 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>")
+        end
+
+      end
+
+    end
+
     context "for loops" do
-      
+
       let(:template) do
 <<-EOF
 <h1>{{ greet }}</h1>
@@ -69,7 +94,7 @@ EOF
     end
 
     context "default matcher" do
-      
+
       let(:template) { "{{ greet }} {{ name.upcase }}" }
 
       it "uses the default matcher to render" do
@@ -85,17 +110,17 @@ EOF
     end
 
     context "matcher errors" do
-      
+
       before(:each) do
         Braai::Template.map(/foo/) do |view, key, matches|
-          raise ArgumentError 
+          raise ArgumentError
         end
       end
 
       let(:template) { "foo" }
 
       context "swallow_matcher_errors is true" do
-        
+
         it "swallows errors in the matcher" do
           expect {
             res = Braai::Template.new(template).render()
@@ -109,7 +134,7 @@ EOF
         before(:each) do
           Braai.config.swallow_matcher_errors = false
         end
-        
+
         it "raises the errors from the matcher" do
           expect {
             res = Braai::Template.new(template).render
@@ -122,4 +147,4 @@ EOF
 
   end
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: braai
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-26 00:00:00.000000000 Z
+date: 2012-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport