herbgobbler 0.1.0 → 0.1.1

data/lib/core/erb_file.rb

@@ -50,7 +50,7 @@ class ErbFile
         combined_nodes << node
       end
     end
-    remove_edge_tags_from_combined_text_nodes( combined_nodes )
+    remove_edge_tags_from_combined_text_nodes( unwind_list( combined_nodes ) )
   end
   
 
@@ -105,6 +105,23 @@ class ErbFile
   
   private
 
+  def unwind_list( nodes )
+    to_return = []
+    nodes.each do |node|
+      if( node.is_a?( HerbNodeRetainingTextNode ) )
+        if( node.can_be_exploded? )
+          to_return += node.nodes
+        else
+          to_return << node
+        end
+      else
+        to_return << node
+      end
+    end
+
+    return to_return
+  end
+  
   def remove_edge_tags_from_combined_text_nodes( nodes )
     node_count = nodes.size
     to_return = []

data/lib/core/text_node.rb

@@ -35,6 +35,10 @@ module TextNode
   def white_space?
     false
   end
+
+  def contains_alpha_characters?
+    !self.text_value[/[a-zA-Z]/].nil?
+  end
   
 
   def amount_of_ending_whitespace

data/lib/nodes/herb_node_retaining_non_text_node.rb

@@ -10,11 +10,11 @@ class HerbNodeRetainingNonTextNode < HerbNodeRetainingNode
     super(node)
     @can_be_combined ||= ( node.respond_to?( :can_be_combined? ) && node.can_be_combined? )
   end
-
+  
   def can_be_combined?
     @can_be_combined
   end
-
+  
   def self.create_from_nodes( nodes )
     to_return = HerbNodeRetainingNonTextNode.new
     nodes.each do |node|

data/lib/nodes/herb_node_retaining_text_node.rb

@@ -55,6 +55,10 @@ class HerbNodeRetainingTextNode < HerbNodeRetainingNode
       end
     end
   end
+
+  def can_be_exploded?
+    find_all_non_matched_tags_and_white_space(nodes).empty?
+  end
   
   def can_be_combined?
     true
@@ -78,7 +82,6 @@ class HerbNodeRetainingTextNode < HerbNodeRetainingNode
 
 
   private
-
   
   def extract_leading_tag
     node = find_first_non_whitespace_node
@@ -103,5 +106,26 @@ 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/lib/nodes/herb_string_variable.rb

@@ -1,5 +1,9 @@
 class HerbStringVariable < Treetop::Runtime::SyntaxNode
   include TextNode
+
+  def node_name
+    "herb_string_variable"
+  end
   
   def extract_text( text_extractor, node_tree )
     text_extractor.add_variable( I18nKey.new( self.variable.text_value, get_key_hash(text_extractor, node_tree) ).to_s , self.variable.text_value )    

data/lib/nodes/herb_text_node.rb

@@ -11,6 +11,10 @@ class HerbTextNode
     true
   end
 
+  def node_name
+    "herb_text_node"
+  end
+  
   def strip_whitespace?
     @strip_whitespace
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: herbgobbler
 version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: 
+  hash: 25
+  prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Douglas Sellers
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-20 00:00:00 -08:00
+date: 2011-02-14 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -146,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Allows english text extraction, for internationalization and localization, from Ruby on Rails ERB files