herbgobbler 0.1.7 → 0.1.8

data/grammer/erb_grammer.treetop

@@ -233,7 +233,7 @@ grammar ERBGrammer
         end
         
         rule tag_text
-            (!'>' !'/>' (erb_string / .) )* <NonTextNode>
+            (!'>' !'/>' ( erb_block / erb_string / . ) )* <NonTextNode>
             {
                def node_name
                    "tag_text"

data/lib/core/erb_file.rb

@@ -64,7 +64,7 @@ class ErbFile
     new_node_set = []
     @nodes = combine_nodes( @nodes )    
     @nodes.each do |node|
-      if( node.text? )
+      if( node.respond_to?(:text?) && node.text? )
         text_extractor.start_html_text
         node.extract_text( text_extractor, new_node_set )
         new_node_set += text_extractor.end_html_text

data/lib/core/method_call_node.rb

@@ -1,8 +1,7 @@
 module MethodCallNode
   include TextNode
 
-  def extract_text( text_extractor, node_tree, surrounding_nodes )
-    
+  def extract_text( text_extractor, node_tree, surrounding_nodes = nil )
     text_string = ''
     self.elements.each do |node|
       if( node.is_a?( TextNode ) )
@@ -12,8 +11,10 @@ module MethodCallNode
         text_string << node.text_value
       end   
     end
-    
-    if( surrounded_by_text? (surrounding_nodes) )
+
+    if( surrounding_nodes.nil? )
+      node_tree << HerbNonTextNode.new( text_string )
+    elsif( surrounded_by_text? (surrounding_nodes) )
       text_extractor.add_variable( generate_i18n_key( text_extractor, node_tree ).to_s, text_string.strip )
     else
       node_tree << HerbNonTextNode.new( "<%= #{text_string.strip} %>" )

data/lib/nodes/herb_node_retaining_text_node.rb

@@ -57,7 +57,9 @@ class HerbNodeRetainingTextNode < HerbNodeRetainingNode
   end
 
   def can_be_exploded?
-    find_all_non_matched_tags_and_white_space(nodes).empty?
+    # it is possible that this node contains only non text nodes.  If
+    # there is no text within this combined node then this should be uncombined
+    find_all_non_matched_tags_and_white_space(nodes).empty? || contains_only_non_text_and_non_method_nodes?
   end
   
   def can_be_combined?
@@ -83,6 +85,15 @@ class HerbNodeRetainingTextNode < HerbNodeRetainingNode
 
   private
   
+  def contains_only_non_text_and_non_method_nodes?
+    found_text = false
+    nodes.each do |current_node|
+      found_text = true if current_node.is_a?( TextNode ) && !current_node.is_a?(MethodCallNode)
+      
+    end
+    !found_text
+  end
+  
   def extract_leading_tag
     node = find_first_non_whitespace_node
     to_return = []

data/scripts/display_syntax_tree.rb

@@ -9,10 +9,16 @@ puts "---------- Original ----------------"
 puts File.read( file_name )
 puts "---------- Un-Combined Syntax Tree -------------"
 top_levels.each_with_index do |top_level, index|
-  puts "(#{index}): #{top_level.text_value}"
+  puts "(#{index}): #{top_level.text_value} #{top_level.is_a?(TextNode)}"
 end
 puts "---------- Combined Syntax Tree -------------"
 erb_file.combine_nodes( erb_file.flatten_elements ).each do |element|
-  puts "`#{element.text_value}`(text=#{element.is_a?(TextNode)})(combindable=#{element.is_a?(NonTextNode) && element.can_be_combined?})(class=#{element.class})"
+  if( element.respond_to?(:node_name) )
+    name = "(node_name = #{element.node_name})"
+  else
+    name = ""
+  end
+  
+  puts "`#{element.text_value}`(text=#{element.is_a?(TextNode)})(combindable=#{element.is_a?(NonTextNode) && element.can_be_combined?})(class=#{element.class})#{name}"
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: herbgobbler
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 1
-  - 7
-  version: 0.1.7
+  - 8
+  version: 0.1.8
 platform: ruby
 authors: 
 - Douglas Sellers
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-01 00:00:00 -08:00
+date: 2012-03-05 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency