braai 1.6.1 → 1.6.2

data/Gemfile.lock

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

data/README.md

@@ -57,9 +57,22 @@ response = Braai::Template.new(template).render(name: "mark")
 response.must_equal "I'm MARK and Damn, I love BBQ!!"
 ```
 
+### Conditional Logic
+
+Braai supports conditional logic with simple if statements (no support for comparisons yet).
+
+```ruby
+template = '{{ product.name }}{{ if product.featured }}***{{ /if }}'
+featured_product = OpenStruct.new(name: 'Special Product', featured: true)
+regular_product = OpenStruct.new(name: 'Regular Product', featured: false)
+
+Braai::Template.new(template).render(product: featured_product).must_equal("Special Product***")
+Braai::Template.new(template).render(product: regular_product).must_equal("Regular Product")
+```
+
 ### For Loops
 
-Braai supports looping right out of the box.
+Braai also supports looping right out of the box.
 
 ```ruby
 template = <<-EOF
@@ -100,4 +113,4 @@ res.should match("<h2>MARK</h2>")
 * Mark Bates
 * Nick Plante
 * Sam Beam
-* Kevin Incorvia
+* Kevin Incorvia

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/helpers"
 require "braai/handlers"
 require "braai/matchers"
 require "braai/template"

data/lib/braai/handlers.rb

@@ -1,10 +1,11 @@
 require 'braai/handlers/base'
 require 'braai/handlers/default'
 require 'braai/handlers/iteration'
+require 'braai/handlers/conditional'
 
 module Braai
   module Handlers
-    
+
     class << self
       def rescue_from(klass, handler)
         self.rescuers.unshift({klass: klass, handler: handler})

data/lib/braai/handlers/conditional.rb

@@ -0,0 +1,14 @@
+module Braai::Handlers
+  class Conditional < Base
+    include Braai::Helpers
+
+    def perform
+      res = resolve_variable_chain_value(matches[1])
+      if res && res != ""
+        Braai::Context.new(matches[2], template, template.attributes).render
+      else
+        ""
+      end
+    end
+  end
+end

data/lib/braai/handlers/default.rb

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

data/lib/braai/helpers.rb

@@ -0,0 +1,30 @@
+module Braai
+  module Helpers
+    def resolve_variable_chain_value(str)
+      value = nil
+      chain = str.split('.')
+
+      if template.attributes.has_key?(chain.first)
+        value = template.attributes[chain.shift] || ''
+      else
+        return nil unless value
+      end
+
+      chain.each do |a|
+        if value.respond_to?(a.to_sym)
+          value = value.send(a) || ''
+        elsif value.is_a?(Hash)
+          if value.has_key?(a.to_sym) || value.has_key?(a.to_s)
+            value = value[a.to_sym] || value[a.to_s] || ''
+          else
+            return nil
+          end
+        else
+          return nil
+        end
+      end
+
+      value
+    end
+  end
+end

data/lib/braai/matchers.rb

@@ -2,9 +2,10 @@ 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
+  IterationMatcher   = /({{\s*for (\w+) in (\w+)\s*}}(.+?){{\s*\/for\s*}})/im
+  ConditionalMatcher = /({{\s*if\s*([\w\.]+)\s*}}(.*){{\s*\/if\s*}})/mi
+  DefaultMatcher     = /({{\s*([\w\.]+)\s*}})/i
+  RegionMatcher      = /({{\s*([\w]+)\s*}}(.*){{\s*\/([\w]+)\s*}})/mi
 
   def matchers
     @matchers ||= reset!
@@ -34,6 +35,7 @@ module Braai::Matchers
 
   def set_defaults
     map(IterationMatcher, Braai::Handlers::Iteration)
+    map(ConditionalMatcher, Braai::Handlers::Conditional)
     map(DefaultMatcher, Braai::Handlers::Default)
   end
 

data/lib/braai/version.rb

@@ -1,3 +1,3 @@
 module Braai
-  VERSION = "1.6.1"
+  VERSION = "1.6.2"
 end

data/spec/braai/handlers/conditional_spec.rb

@@ -0,0 +1,60 @@
+require 'spec_helper'
+
+describe Braai::Handlers::Conditional do
+  include Mocha::Integration::MiniTest
+  include Braai::Matchers
+
+  let(:template) do
+<<-EOF
+<ul>
+  {{ if product.active }}
+    <li>
+      <h1>{{ product.name }}</h1>
+      {{ if product.description }}<h2>{{ product.description }}</h2>{{ /if }}
+    </li>
+  {{ /if }}
+</ul>
+EOF
+  end
+
+  let(:inactive_product) do
+    OpenStruct.new(name: 'Inactive Thing', active: false, description: 'This is a thing.')
+  end
+
+  let(:active_product) do
+    OpenStruct.new(name: 'Active Thing', active: true, description: 'This is a thing.')
+  end
+
+  let(:missing_attribute_product) do
+    OpenStruct.new(name: 'No Description', active: true)
+  end
+
+  let(:empty_attribute_product) do
+    OpenStruct.new(name: 'Empty Description', active: true, description: '')
+  end
+
+  it "does not render conditional items that fail the test" do
+    res = Braai::Template.new(template).render(product: inactive_product)
+    res.gsub(/\s+/, '').must_match("<ul></ul>")
+  end
+
+  it "renders conditional items that pass the test" do
+    res = Braai::Template.new(template).render(product: active_product)
+    res.must_match(/Active Thing/)
+  end
+
+  it "renders the conditional string if present" do
+    res = Braai::Template.new(template).render(product: active_product)
+    res.must_match(/This is a thing/)
+  end
+
+  it "does not render conditional string when the value is empty" do
+    res = Braai::Template.new(template).render(product: empty_attribute_product)
+    res.wont_match("h2")
+  end
+
+  it "does not render conditional string when the attribute is missing" do
+    res = Braai::Template.new(template).render(product: missing_attribute_product)
+    res.wont_match("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(2)
-      map("foo") {}
       matchers.size.must_equal(3)
+      map("foo") {}
+      matchers.size.must_equal(4)
       reset!
-      matchers.size.must_equal(2)
+      matchers.size.must_equal(3)
     end
 
   end
@@ -59,7 +59,7 @@ describe Braai::Matchers do
       map("foo") {}
       matchers.size.must_equal(1)
       set_defaults
-      matchers.size.must_equal(3)
+      matchers.size.must_equal(4)
     end
 
   end

data/spec/braai/readme_spec.rb

@@ -28,6 +28,14 @@ describe 'README' do
     response.must_equal "I'm MARK and Damn, I love BBQ!!"
   end
 
+  it "if statement example" do
+    template = '{{ product.name }}{{ if product.featured }}***{{ /if }}'
+    featured_product = OpenStruct.new(name: 'Special Product', featured: true)
+    regular_product = OpenStruct.new(name: 'Regular Product', featured: false)
+    Braai::Template.new(template).render(product: featured_product).must_equal("Special Product***")
+    Braai::Template.new(template).render(product: regular_product).must_equal("Regular Product")
+  end
+
   it "for loop example" do
     template = <<-EOF
 <h1>{{ greet }}</h1>
@@ -54,4 +62,4 @@ EOF
     res.must_match("<h2>MARK</h2>")
   end
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: braai
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-11 00:00:00.000000000 Z
+date: 2013-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -62,13 +62,16 @@ files:
 - lib/braai/context.rb
 - lib/braai/handlers.rb
 - lib/braai/handlers/base.rb
+- lib/braai/handlers/conditional.rb
 - lib/braai/handlers/default.rb
 - lib/braai/handlers/iteration.rb
+- lib/braai/helpers.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/conditional_spec.rb
 - spec/braai/handlers/default_spec.rb
 - spec/braai/handlers/iteration_spec.rb
 - spec/braai/matchers_spec.rb
@@ -89,7 +92,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -348262951032349536
+      hash: -2452820398062054300
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -98,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -348262951032349536
+      hash: -2452820398062054300
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -108,6 +111,7 @@ summary: Fully extensible templating system.
 test_files:
 - spec/braai/context_spec.rb
 - spec/braai/handlers/base_spec.rb
+- spec/braai/handlers/conditional_spec.rb
 - spec/braai/handlers/default_spec.rb
 - spec/braai/handlers/iteration_spec.rb
 - spec/braai/matchers_spec.rb