braai 1.2.1 → 1.2.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    braai (1.2.1)
+    braai (1.2.2)
       activesupport
 
 GEM
@@ -12,7 +12,7 @@ GEM
       multi_json (~> 1.0)
     diff-lcs (1.1.3)
     i18n (0.6.1)
-    multi_json (1.4.0)
+    multi_json (1.5.0)
     rspec (2.11.0)
       rspec-core (~> 2.11.0)
       rspec-expectations (~> 2.11.0)

data/README.md

@@ -99,3 +99,4 @@ res.should match("<h2>MARK</h2>")
 
 * Mark Bates
 * Kevin Incorvia
+* Nick Plante

data/lib/braai/matchers.rb

@@ -17,24 +17,32 @@ module Braai::Matchers
   end
 
   def reset!
-    @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")
-      },
-      /({{\s*([\w]+)\.([\w]+)\s*}})/i => ->(template, key, matches) {
-        attr = template.attributes[matches[1]]
-        attr ? attr.send(matches[2]) : nil
-      },
-      /({{\s*([\w]+)\s*}})/i => ->(template, key, matches) {
-        attr = template.attributes[matches.last]
-        attr ? attr.to_s : nil
-      }
+    @matchers = {}
+    set_defaults
+  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]+)\.([\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) {
+      attr = template.attributes[matches.last]
+      attr ? attr.to_s : nil
     }
-    return @matchers
+
+    @matchers
   end
 
-end
+end

data/lib/braai/version.rb

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

data/spec/braai/matchers_spec.rb

@@ -41,7 +41,7 @@ describe Braai::Matchers do
   end
 
   describe 'reset!' do
-    
+
     it "resets the matchers to their original state" do
       matchers.should have(3).matchers
       map("foo") {}
@@ -52,4 +52,16 @@ describe Braai::Matchers do
 
   end
 
-end
+  describe 'set_defaults' do
+
+    it "installs the three base matchers" do
+      clear!
+      map("foo") {}
+      matchers.should have(1).matchers
+      set_defaults
+      matchers.should have(4).matchers
+    end
+
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: braai
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-03 00:00:00.000000000 Z
+date: 2012-12-17 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.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Fully extensible templating system.