From 0c0ec9f23ff9947c5137d43c364df2fdf18aa2ba Mon Sep 17 00:00:00 2001
From: ccocchi <cocchi.c@gmail.com>
Date: Mon, 5 Mar 2012 15:33:25 +0100
Subject: [PATCH] Enable :if condition for node properties

---
 lib/rabl-fast-json/compiler.rb | 12 +++++++++++-
 lib/rabl-fast-json/template.rb |  3 +++
 test/compiled_template_test.rb | 20 ++++++++++++++++++++
 test/compiler_test.rb          |  7 +++++++
 4 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/lib/rabl-fast-json/compiler.rb b/lib/rabl-fast-json/compiler.rb
index ea15181..3b614df 100644
--- a/lib/rabl-fast-json/compiler.rb
+++ b/lib/rabl-fast-json/compiler.rb
@@ -47,7 +47,17 @@ module RablFastJson
     end
 
     def node(name, options = {}, &block)
-      @template[name] = block
+      condition = options[:if]
+
+      if condition.present?
+        if condition.is_a?(Proc)
+          @template[name] = [condition, block]
+        else
+          @template[name] = block if condition
+        end
+      else
+        @template[name] = block
+      end
     end
     alias_method :code, :node
 
diff --git a/lib/rabl-fast-json/template.rb b/lib/rabl-fast-json/template.rb
index f1de078..5081e8e 100644
--- a/lib/rabl-fast-json/template.rb
+++ b/lib/rabl-fast-json/template.rb
@@ -30,6 +30,9 @@ module RablFastJson
           data.send(value) # attributes
         when Proc
           value.call(data) # node
+        when Array # node with condition
+          next output if !value.first.call(data)
+          value.last.call(data)
         when Hash
           current_value = value.dup
           data_symbol = current_value.delete(:_data)
diff --git a/test/compiled_template_test.rb b/test/compiled_template_test.rb
index b62a96b..2555651 100644
--- a/test/compiled_template_test.rb
+++ b/test/compiled_template_test.rb
@@ -36,4 +36,24 @@ class TestCompiledTemplate < ActiveSupport::TestCase
       { :uid => 2, :name => 'bar', :gender => 'female'}
     ], @template.render)
   end
+
+  test "render object with node property" do
+    proc = lambda { |object| object.sex }
+    @template.source = { :sex => proc }
+    assert_equal({ :sex => 'male' }, @template.render)
+  end
+
+  test "render obejct with conditionnal node property" do
+    condition = lambda { |u| u.name.present? }
+    proc = lambda { |object| object.name }
+    @template.source = { :name => [condition, proc] }
+    assert_equal({ :name => 'foobar' }, @template.render)
+  end
+
+  test "render node property with false condition" do
+    condition = lambda { |u| false }
+    proc = lambda { |object| object.name }
+    @template.source = { :name => [condition, proc] }
+    assert_equal({}, @template.render)
+  end
 end
\ No newline at end of file
diff --git a/test/compiler_test.rb b/test/compiler_test.rb
index 41750c9..fe73da9 100644
--- a/test/compiler_test.rb
+++ b/test/compiler_test.rb
@@ -122,4 +122,11 @@ class CompilerTest < ActiveSupport::TestCase
     assert_not_nil t.source[:foo]
     assert_instance_of Proc, t.source[:foo]
   end
+
+  test "node with condition are compiled as an array of procs" do
+    t = @compiler.compile_source(%{ node(:foo, :if => lambda { |m| m.foo.present? }) do |m| m.foo end })
+    assert_not_nil t.source[:foo]
+    assert_instance_of Array, t.source[:foo]
+    assert_equal 2, t.source[:foo].size
+  end
 end
\ No newline at end of file