sandboxed_erb 0.4.1 → 0.4.2

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/lib/sandboxed_erb/tree_processor.rb

@@ -152,7 +152,7 @@ module SandboxedErb
     
     #allowed
     
-    [[:block, true],[:lasgn, true],[:arglist, true],[:str, true],[:dstr, true],[:evstr, true],[:lit, true],[:lvar, true],[:for, true], [:while, true], [:do, true], [:if, true], [:case, true], [:when, true], [:array, true], [:hash, true],[:iter, true]].each { |action, add_line_number|
+    [[:block, true],[:lasgn, true],[:arglist, true],[:str, true],[:dstr, true],[:evstr, true],[:lit, true],[:lvar, true],[:for, true], [:while, true], [:do, true], [:if, true], [:case, true], [:when, true], [:array, true], [:hash, true],[:iter, true],[:and, true],[:or, true]].each { |action, add_line_number|
       if add_line_number
         define_method "process_#{action}".intern do |tree|
           puts tree.inspect if $DEBUG

data/sandboxed_erb.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sandboxed_erb}
-  s.version = "0.4.1"
+  s.version = "0.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["MarkPent"]

data/test/test_valid_templates.rb

@@ -57,6 +57,24 @@ class TestValidTemplates < Test::Unit::TestCase
     assert_equal "2", result
   end
   
+  should "allow extended conditions" do
+    str_template = "<% 
+    i=5
+    if i > 10 && i < 300 %>1<%elsif i > 100 || i == 5%>2<%end%>"
+
+    template = SandboxedErb::Template.new
+    result = template.compile(str_template)
+
+    assert_equal nil, template.get_error
+    
+    assert_equal true, result
+    
+    result = template.run(nil,{})
+    
+    assert_equal nil, template.get_error
+    assert_equal "2", result
+  end
+  
   should "allow unless statement" do
     str_template = "<% 
     i=0

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sandboxed_erb
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - MarkPent