herbgobbler 0.3.0 → 0.3.1

data/grammer/erb_grammer.treetop

@@ -94,7 +94,7 @@ grammar ERBGrammer
         end
 
         rule method_call_content
-             method_names whitespace ruby_string:double_quoted_ruby_string everything_else:(comma erb_string_non_text_content)? <MethodCallNode>
+             method_names whitespace ruby_string:(double_quoted_ruby_string / single_quoted_ruby_string) everything_else:(comma erb_string_non_text_content)? <MethodCallNode>
         end
        
         rule erb_string_non_text_content
@@ -111,7 +111,7 @@ grammar ERBGrammer
         end
 
         rule erb_string
-             start_erb:erb_string_start start_space:(space)? text:(method_call_content / double_quoted_ruby_string)? everything_else:(pluralize / erb_string_non_text_content) end_erb:(erb_block_end) <NonTextNode>
+             start_erb:erb_string_start start_space:(space)? text:(method_call_content / double_quoted_ruby_string / single_quoted_ruby_string)? everything_else:(pluralize / erb_string_non_text_content) end_erb:(erb_block_end) <NonTextNode>
              {
                 def node_name
                     "erb_string"
@@ -125,6 +125,28 @@ grammar ERBGrammer
  
         end
 
+        rule single_quoted_ruby_string
+            start_quote:"'" unquoted_text:(( !"'" .)*) end_quote:"'"  <TextNode>
+             {
+                def can_be_combined?
+                    false
+                end
+                
+                def html?
+                    false
+                end 
+                
+                def text_value
+                    self.unquoted_text.text_value
+                end
+
+                def node_name
+                    "single_quoted_ruby_string"
+                end
+             }
+
+        end
+
         rule double_quoted_ruby_string
         start_quote:'"' unquoted_text:((!'"' (string_variable / .))*) end_quote:'"' <DoubleQuotedTextNode>
              {
@@ -262,7 +284,11 @@ grammar ERBGrammer
              start_tag:'<' tag_name:([a-zA-Z])+ tag_contents:(!'/>' (erb_string / .))* end_tag:'/>' <NonTextNode> 
              {
                 def can_be_combined?
-                   true
+                   if( tag_name.text_value.downcase == 'br' )
+                       false
+                   else
+                       true
+                   end
                 end
 
                 def node_name
@@ -355,7 +381,7 @@ grammar ERBGrammer
         end
         
         rule whitespace
-            ((![a-zA-Z\.] !('<' [a-zA-Z]+) !('</' [a-zA-Z]+) !'<%' !'"' !'<!' ) . )+ <NonTextNode>
+            ((![a-zA-Z\.] !('<' [a-zA-Z]+) !('</' [a-zA-Z]+) !'<%' !'"' !"'" !'<!' ) . )+ <NonTextNode>
             {
                 def can_be_combined?
                    true

data/lib/core/erb_file.rb

@@ -111,7 +111,7 @@ class ErbFile
     nodes.each do |node|
       if( node.is_a?( HerbNodeRetainingTextNode ) )
         if( node.can_be_exploded? )
-          to_return += node.nodes
+          to_return += node.explode
         else
           to_return << node
         end

data/lib/nodes/herb_node_retaining_text_node.rb

@@ -6,11 +6,13 @@ class HerbNodeRetainingTextNode < HerbNodeRetainingNode
       self << node
     end
   end
-  
+
   def can_remove_starting_or_ending_html_tags?
     if( find_first_non_whitespace_node.node_name == "html_start_tag" && find_last_non_whitespace_node.node_name == "html_end_tag"  )
       if( find_first_non_whitespace_node.tag_name.text_value == find_last_non_whitespace_node.tag_name.text_value )
         true
+      elsif( last_tag_does_not_match_first_tag? )
+        true
       else
         false
       end
@@ -22,9 +24,17 @@ class HerbNodeRetainingTextNode < HerbNodeRetainingNode
     
   end
 
+  def last_tag_does_not_match_first_tag?
+    find_last_non_whitespace_node.node_name == "html_end_tag" && find_first_non_whitespace_node.node_name == "html_start_tag" && find_last_non_whitespace_node.tag_name.text_value.downcase != find_first_non_whitespace_node.tag_name.text_value.downcase
+  end
+  
   def break_out_start_and_end_tags
-    if( find_first_non_whitespace_node.node_name == "html_start_tag" && find_last_non_whitespace_node.node_name == "html_end_tag"  )
-( can_remove_starting_or_ending_html_tags? )
+    if( last_tag_does_not_match_first_tag? )
+      end_tag = extract_trailing_tag
+      start_tag = HerbNodeRetainingTextNode.new
+      start_tag.add_all( nodes[0..nodes.length - (end_tag.nodes.length + 1 ) ] )
+      [start_tag, end_tag]          
+    elsif( find_first_non_whitespace_node.node_name == "html_start_tag" && find_last_non_whitespace_node.node_name == "html_end_tag"  ) && ( can_remove_starting_or_ending_html_tags? )
       start_tag = extract_leading_tag
       end_tag = extract_trailing_tag
       middle_tag = HerbNodeRetainingTextNode.new
@@ -56,10 +66,68 @@ class HerbNodeRetainingTextNode < HerbNodeRetainingNode
     end
   end
 
+  def explode
+    nested_level = nesting_level
+    to_return = []
+    current_nest = 0
+    new_node_list = nil
+    
+    # Go through and try to build rolled up nodes for all of the node
+    # contents that are below the nested list level
+    nodes.each do |current_node|
+      if( current_node.node_name == "html_start_tag" )
+        current_nest += 1
+        if( new_node_list.nil? )
+          to_return << current_node
+        else
+          new_node_list << current_node
+        end
+        if( current_nest == nesting_level + 1 )
+          new_node_list = []
+        end
+      elsif( current_node.node_name == "html_end_tag" )
+        if( current_nest == nesting_level + 1 )          
+          to_return << build_correct_node_retaining_node( new_node_list )
+          to_return << current_node
+          new_node_list = nil
+        elsif( new_node_list.nil? )
+          to_return << current_node
+        else
+          new_node_list << current_node
+        end
+        current_nest -= 1
+      elsif( new_node_list.nil? )
+        to_return << current_node
+      elsif( !new_node_list.nil?)
+        new_node_list << current_node
+      end
+
+    end
+    to_return << build_correct_node_retaining_node( new_node_list ) unless new_node_list.nil?   
+    
+    return to_return
+  end
+
+  def build_correct_node_retaining_node( array_of_nodes )
+    text_retaining_node = false
+    array_of_nodes.each do |node|
+      text_retaining_node = true if node.is_a?(TextNode) && node.contains_alpha_characters?
+    end
+
+    if( text_retaining_node )
+      to_return = HerbNodeRetainingTextNode.new
+      to_return.add_all( array_of_nodes )
+    else
+      to_return = HerbNodeRetainingNonTextNode.create_from_nodes( array_of_nodes )
+    end
+
+    to_return
+  end
+  
   def can_be_exploded?
     # 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?
+    contains_list_of_elements? || contains_only_non_text_and_non_method_nodes?
   end
   
   def can_be_combined?
@@ -89,10 +157,55 @@ class HerbNodeRetainingTextNode < HerbNodeRetainingNode
     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 contains_list_of_elements?
+    # Two cases, first there could be an outer element that wraps the
+    # list, if this is true we want to strip it.
+    # After the outer elements are stripped then we want to walk
+    # through and find all of the top level elements - where a top
+    # level element is defined as anything that isn't nested further.
+    nested_level = nesting_level
+    nested_nodes = nested_nodes_list
+    to_return = true    
+    nested_nodes[nested_level].each do |node_at_node_level|
+      to_return = false if node_at_node_level.is_a?(TextNode)
+    end
+
+    return to_return
+  end
+
+  def nested_nodes_list
+    nested_level = 0
+    nested_nodes = [ [] ]
+    nodes.each do |current_node|
+      if( current_node.node_name == "html_start_tag" )
+        nested_nodes[nested_level] << current_node
+        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_nodes[ nested_level ] << current_node
+      elsif( current_node.is_a?( TextNode ) && current_node.contains_alpha_characters? )
+        nested_nodes[ nested_level ] << current_node
+      end
+    end
+
+    return nested_nodes
+  end
+  
+  def nesting_level
+    nested_nodes = nested_nodes_list
+    nested_level = 0
+    while( nested_nodes[nested_level].size == 2 && nested_nodes[nested_level].first.node_name == "html_start_tag" && nested_nodes[nested_level].last.node_name == "html_end_tag" )
+      nested_level += 1
+    end
+
+    return nested_level
+  end
+  
   
   def extract_leading_tag
     node = find_first_non_whitespace_node
@@ -117,26 +230,4 @@ class HerbNodeRetainingTextNode < HerbNodeRetainingNode
     
   end
   
-  def find_all_non_matched_tags_and_white_space( nodes )
-    to_return = []
-    search_node_name = nil
-    nodes.each do |current_node|
-      if( !current_node.respond_to?( :node_name ) )
-        to_return << current_node
-      elsif( search_node_name.nil? && current_node.node_name == "html_start_tag" )
-        search_node_name = current_node.tag_name.text_value
-      elsif( !search_node_name.nil? && current_node.node_name == "html_end_tag" )
-        search_node_name = nil if search_node_name == current_node.tag_name.text_value
-      elsif( search_node_name.nil? && current_node.is_a?(TextNode ) )
-        if( current_node.contains_alpha_characters? )
-          to_return << current_node
-        end
-      end
-    end
-    
-    return to_return
-  end
-
-  
-  
 end

data/scripts/display_syntax_tree.rb

@@ -20,6 +20,6 @@ erb_file.combine_nodes( erb_file.flatten_elements ).each do |element|
     name = ""
   end
   
-  puts "`#{element.text_value}`(text=#{element.is_a?(TextNode)})(combindable=#{element.is_a?(NonTextNode) && element.can_be_combined?})(class=#{element.class})#{name}"
+  puts "`#{element.text_value}`(text=#{element.is_a?(TextNode)})(combindable=#{element.respond_to?(:can_be_combined?) && element.can_be_combined?})(class=#{element.class})#{name}"
 end
 

metadata

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