herbgobbler 0.3.1 → 0.3.2

data/grammer/erb_grammer.treetop

@@ -101,7 +101,7 @@ grammar ERBGrammer
              (!erb_block_end .)* <ErbStringNonTextContent>
              {
                 def can_be_combined?
-                    true
+                    self.text_value.nil? || self.text_value.strip!.nil? || !self.text_value.strip!.match(/^render/)
                 end
                         
                 def node_name

data/lib/nodes/herb_node_retaining_text_node.rb

@@ -186,10 +186,10 @@ class HerbNodeRetainingTextNode < HerbNodeRetainingNode
         nested_level += 1
         nested_nodes[ nested_level ] = [] if nested_nodes[nested_level].nil?
       elsif( current_node.node_name == "html_end_tag" )
-        nested_level -= 1
+        nested_level -= 1 unless nested_level == 0
         nested_nodes[ nested_level ] << current_node
       elsif( current_node.is_a?( TextNode ) && current_node.contains_alpha_characters? )
-        nested_nodes[ nested_level ] << current_node
+        nested_nodes[nested_level] << current_node
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: herbgobbler
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-16 00:00:00.000000000 Z
+date: 2012-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler