herbgobbler 0.2.2 → 0.3.0

data/bin/gobble

@@ -5,22 +5,24 @@ def print_usage
   puts " ***** HerbGobbler Usage ***** "
   puts
   puts "Options "
+  puts "tr8n | i18n : Use the normal rails i18n output format or use tr8n output"
   puts "-a : Process an entire Rails Code Base"
   puts "-f <full path to file> : Process a single file"
   puts
-  puts "Usage: gobble <options> <rails root>"
+  puts "Usage: gobble tr8n -a <rails root>"
 end
 
-if( ARGV.length < 2 )
+if( ARGV.length < 3 )
   print_usage
 else
+  type = ARGV.shift
   option = ARGV.shift
   rails_root = ARGV.pop
   case option
   when "-a"
-    command_line_object = GobbleAll.new( rails_root, ARGV )    
+    command_line_object = GobbleAll.new( rails_root, type, ARGV )    
   when "-f"
-    command_line_object = GobbleSingleFile.new( rails_root, ARGV )
+    command_line_object = GobbleSingleFile.new( rails_root, type, ARGV )
   else
     print_usage
   end

data/grammer/erb_grammer.treetop

@@ -15,7 +15,7 @@ grammar ERBGrammer
          end
 
         rule method_names             
-             "link_to" <NonTextNode>
+             "link_to_function" / "link_to"  <NonTextNode>
              {
                 def node_name  
                     "method_names"
@@ -30,7 +30,7 @@ grammar ERBGrammer
             "," <NonTextNode>
             {
                 def node_name
-                    "method_names"
+                    "comma"
                 end
 
                 def can_be_combined?
@@ -40,8 +40,61 @@ grammar ERBGrammer
             }
         end 
        
+        rule not_whitespace_or_comma
+          ((!comma !space ) . )+ <NonTextNode>
+          {
+          
+            def can_be_combined? 
+               true
+            end
+          
+            def node_name
+              "not_whitespace_or_comma"
+            end
+          }
+        end
+
+        rule double_quoted_non_string
+          '"' ( !'"' .)* '"' <NonTextNode>
+          {
+            def can_be_combined? 
+               true
+            end
+          
+            def node_name
+              "double_quoted_non_string"
+            end            
+          }
+        end
+
+        rule single_quoted_non_string
+          "'" ( !"'" .)* "'" <NonTextNode>
+          {
+            def can_be_combined? 
+               true
+            end
+          
+            def node_name
+              "single_quoted_non_string"
+            end            
+          }
+        end
+          
+        rule pluralize
+          "pluralize"  space? "("? space? repetition:not_whitespace_or_comma space? comma space? string_to_pluralize:(single_quoted_non_string / double_quoted_non_string) space? ")"? space? <PluralizeNode>
+          {
+            def can_be_combined? 
+               true
+            end
+          
+            def node_name
+              "pluralize"
+            end
+          }
+        end
+
         rule method_call_content
-             method_names whitespace double_quoted_ruby_string (comma erb_string_non_text_content)? <MethodCallNode>
+             method_names whitespace ruby_string:double_quoted_ruby_string everything_else:(comma erb_string_non_text_content)? <MethodCallNode>
         end
        
         rule erb_string_non_text_content
@@ -58,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: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)? everything_else:(pluralize / erb_string_non_text_content) end_erb:(erb_block_end) <NonTextNode>
              {
                 def node_name
                     "erb_string"
@@ -68,7 +121,8 @@ grammar ERBGrammer
         end
         
         rule string_variable 
-             '#{' variable:((!'}' .)*) '}' <HerbStringVariable>
+            '#{' variable:((!'}'  (pluralize / .))*) '}' <HerbStringVariable>
+ 
         end
 
         rule double_quoted_ruby_string
@@ -232,8 +286,17 @@ grammar ERBGrammer
 
         end
         
+        rule tag_to_process
+             ('title' space? '=' space? ('\'' / '"' ) text erb_string (!'\'' !'"' text)*  ('\'' / '"') space? ) <NonTextNode>
+             {
+               def node_name
+                 "tag_to_process"
+               end
+             }
+        end
+
         rule tag_text
-            (!'>' !'/>' ( erb_block / erb_string / . ) )* <NonTextNode>
+            (!'>' !'/>' ( tag_to_process / erb_block / erb_string / . ) )* <NonTextNode>
             {
                def node_name
                    "tag_text"
@@ -292,7 +355,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/commandline/gobble_all.rb

@@ -1,15 +1,48 @@
 class GobbleAll
   include GobbleShare
   
-  def initialize( rails_root, options )
+  def initialize( rails_root, type, options )
     @rails_root = rails_root
     @options = options
+    @text_extractor_type = type
   end
 
   def execute
     puts "Processing all of: #{@rails_root}"
     puts ""
+
+    if( @text_extractor_type == 'tr8n' )
+      execute_tr8n
+    else
+      execute_i18n      
+    end
+    
+  end
+  
+  def valid?
+    @options.empty?
+  end
+
+
+  private
+
+  def execute_tr8n
+    rails_view_directory = "#{@rails_root}/app/views"
+    text_extractor = Tr8nTextExtractor.new
     
+    Dir["#{rails_view_directory}/**/*html.erb" ].each do |full_erb_file_path|
+      
+      erb_file = full_erb_file_path.gsub( @rails_root, '' )
+      erb_file = ErbFile.load( full_erb_file_path )
+      erb_file.extract_text( text_extractor )
+
+      File.open(full_erb_file_path, 'w') {|f| f.write(erb_file.to_s) }
+      puts "Wrote #{full_erb_file_path}"
+    end
+
+  end
+  
+  def execute_i18n
     locale_file_name = "en.yml"
     
     rails_view_directory = "#{@rails_root}/app/views"
@@ -30,11 +63,7 @@ class GobbleAll
     end
 
     File.open(full_yml_file_path, 'w') {|f| f.write(rails_translation_store.serialize) }
-    puts "Wrote #{full_yml_file_path}"
-  end
-  
-  def valid?
-    @options.empty?
+    puts "Wrote #{full_yml_file_path}"    
   end
   
 end

data/lib/commandline/gobble_single_file.rb

@@ -1,13 +1,46 @@
 class GobbleSingleFile
   include GobbleShare
   
-  def initialize( rails_root, options )
+  def initialize( rails_root, type, options )
     @rails_root = rails_root
     @options = options
+    @text_extractor_type = type
   end
 
   def execute
     file_name = @options.first
+    if( @text_extractor_type == 'tr8n' )
+      execute_tr8n( file_name )
+    else
+      execute_i18n( file_name )
+    end
+    
+  end
+
+  def valid?
+    @options.size == 1
+  end
+
+  private
+
+  def execute_tr8n( file_name )
+    rails_view_directory = "#{@rails_root}/app/views"
+    erb_file = "/app/#{file_name.gsub( /.*\/app\//, '' )}"
+    puts "Gobbling file: #{file_name}"
+    puts ""
+
+    # load erb file into tr8n translation store
+    text_extractor = Tr8nTextExtractor.new
+    
+    erb_file = ErbFile.load( file_name )
+    erb_file.extract_text( text_extractor )
+    
+    # write file
+    File.open(file_name, 'w') {|f| f.write(erb_file.to_s) }
+    
+  end
+  
+  def execute_i18n( file_name )
     locale_file_name = "en.yml"
     rails_view_directory = "#{@rails_root}/app/views"
     full_yml_file_path = "#{@rails_root}/config/locales/#{locale_file_name}"
@@ -25,16 +58,12 @@ class GobbleSingleFile
     erb_file = ErbFile.load( file_name )
     erb_file.extract_text( text_extractor )
     
-    # wiret file
+    # write file
     File.open(file_name, 'w') {|f| f.write(erb_file.to_s) }
 
     # re-write yml file
-    File.open(full_yml_file_path, 'w') {|f| f.write(rails_translation_store.serialize) }
-
-  end
-
-  def valid?
-    @options.size == 1
+    File.open(full_yml_file_path, 'w') {|f| f.write(rails_translation_store.serialize) }    
   end
   
+  
 end

data/lib/core/core.rb

@@ -6,6 +6,7 @@ require 'core/non_text_node'
 require 'core/text_extractor'
 require 'core/base_text_extractor'
 require 'core/rails_text_extractor'
+require 'core/tr8n_text_extractor'
 require 'core/i18n_key'
 require 'core/ignorable_tag_node'
 require 'core/base_translation_store'
@@ -14,4 +15,5 @@ require 'core/double_quoted_text_node'
 require 'core/erb_string_non_text_content'
 require 'core/non_extracting_non_text_node'
 require 'core/method_call_node'
+require 'core/pluralize_node'
 

data/lib/core/method_call_node.rb

@@ -3,7 +3,7 @@ module MethodCallNode
 
   def extract_text( text_extractor, node_tree, surrounding_nodes = nil )
     text_string = ''
-    self.elements.each do |node|
+    self.elements.each do |node|      
       if( node.is_a?( TextNode ) )
         translated_node = text_extractor.translate_text( node.text_value )
         text_string << "(#{translated_node.text_value})"
@@ -22,6 +22,10 @@ module MethodCallNode
     
   end
 
+  def node_name
+    "method_call_node"
+  end
+  
   private
 
   def surrounded_by_text?( nodes )

data/lib/core/node_processing.rb

@@ -10,7 +10,8 @@ module NodeProcessing
         node.elements.nil? ||
         node.elements.empty? ||
         (node.is_a?( TextNode ) && !node.has_variables?)||
-        node.is_a?( HerbStringVariable ) || 
+        node.is_a?( HerbStringVariable ) ||
+        node.is_a?( PluralizeNode ) || 
         ( node.is_a?(NonTextNode) && node.can_be_combined? ) )
       leaves << node if( !node.text_value.empty? )
       leaves

data/lib/core/pluralize_node.rb

@@ -0,0 +1,28 @@
+module PluralizeNode
+  include TextNode
+  attr_reader :variable_name, :variable_value
+  
+  def extract_text( text_extractor, node_tree, surrounding_nodes = nil )
+    set_variable_name_and_value( text_extractor, node_tree, surrounding_nodes )
+    variable_name = I18nKey.new( self.repetition.text_value, get_key_hash(text_extractor, node_tree) ).to_s      
+    text_extractor.pluralize( self, variable_name )
+  end
+
+  private
+
+  def set_variable_name_and_value( text_extractor, node_tree, surrounding_nodes )
+    @variable_value = ''
+    self.elements.each do |node|        
+      if( node.is_a?( TextNode ) )
+        translated_node = text_extractor.translate_text( node.text_value )
+        @variable_value << "(#{translated_node.text_value})"
+      else
+        @variable_value << node.text_value
+      end   
+    end
+    @variable_value = @variable_value.strip
+    @variable_name = generate_i18n_key( text_extractor, node_tree ).to_s
+    
+  end
+  
+end

data/lib/core/rails_text_extractor.rb

@@ -36,6 +36,11 @@ class RailsTextExtractor < BaseTextExtractor
     return to_return + whitespace
   end
 
+  def pluralize( pluralize_node, variable_name )
+    add_variable( variable_name,
+                  pluralize_node.text_value )
+  end
+  
   def white_space( node )
     if( @current_text.empty? )
       @current_nodes << node

data/lib/core/text_extractor.rb

@@ -15,6 +15,10 @@ class TextExtractor
     raise "Please implement me (add_variable)"    
   end
 
+  def pluralize( pluralize_node )
+    raise "Please implement me (pluralize)"
+  end
+  
   def translate_text( text_node_to_translate )
     raise "Please impelement me (translate_text)"
   end
@@ -27,5 +31,12 @@ class TextExtractor
     raise "Please implement me (start_html_text)"
   end
 
+  def white_space( node )
+    raise "Please implement me (white_space)"
+  end
+  
+  def add_non_text( non_text_node )
+    raise "Please implement me (add_non_text)"
+  end
    
 end

data/lib/core/tr8n_text_extractor.rb

@@ -0,0 +1,107 @@
+class Tr8nTextExtractor < BaseTextExtractor
+
+  def initialize
+    @current_node = nil
+    @node_queue = []
+    @key_store = []
+    @debug = false
+    @html_tag_count = 0
+  end
+  
+  # This is called when text extraction has begun
+  def starting_text_extraction
+  end
+
+  def add_html_text( text_node )
+    puts "Adding html text: #{text_node.text_value}" if @debug
+    @current_node.add_text( text_node.text_value )
+  end
+
+  def add_variable( variable_name, variable_value )
+    puts "Adding variable: #{variable_name} = #{variable_value}" if @debug
+    @current_node.add_variable( variable_name, variable_value )
+  end
+
+  def translate_text( text_node_to_translate )
+    puts "Translating text: #{text_node_to_translate}" if @debug
+    # This should just return a node that responds to text_value
+    to_return = HerbTr8nTextCallNode.new
+    to_return.add_text( text_node_to_translate )
+    to_return
+    
+  end
+  
+  def end_html_text
+    puts "End HTML Text" if @debug
+    to_return = @current_node
+    @current_node = nil
+    @html_tag_count = 0
+    @key_store = []    
+    [to_return]
+  end
+
+  def pluralize( pluralize_node, variable_name )
+    variable = pluralize_node.repetition.text_value
+    singluar = pluralize_node.string_to_pluralize.text_value
+    variable_name
+    @current_node.add_pluralization( variable_name, singluar, variable ) 
+ end
+  
+  def start_html_text
+    puts "Starting html text" if @debug
+    @current_node = HerbErbTr8nTextCallNode.new
+  end
+    
+  def completed_text_extraction
+  end
+
+  def white_space( node )
+    puts "Whitespace" if @debug
+    @current_node.white_space( node.text_value )
+  end
+
+  def add_non_text( non_text_node )
+    puts "Adding non text" if @debug
+    if( non_text_node.node_name == 'html_start_tag' )
+      start_html_tag( non_text_node )
+    elsif( non_text_node.node_name == 'html_end_tag' )
+      end_html_tag( non_text_node )
+    elsif( non_text_node.node_name == 'html_self_contained' )
+      self_contained_html_node( non_text_node )
+    end
+  end
+
+  def start_html_tag( html_start_node )
+    puts "Start html tag: #{html_start_node.text_value}" if @debug
+    @node_queue.push(  @current_node )
+    new_node = HerbTr8nTextCallNode.new( html_start_node, get_and_increment_tag_count, I18nKey.new( html_start_node.tag_name.text_value, @key_store ).to_s )
+    new_node.start_html_tag( html_start_node )
+    @current_node.add_child( new_node )
+    @current_node = new_node
+  end
+  
+  def end_html_tag( html_end_node )
+    puts "End html tag: #{html_end_node.text_value}" if @debug
+    if( !@node_queue.empty? && @current_node.closing_tag_for_this_node?( html_end_node ) )
+      @current_node.end_html_tag( html_end_node )
+      @current_node = @node_queue.pop
+    end
+    
+  end
+
+  def self_contained_html_node( html_self_contained_node )
+    puts "Self contained html node" if @debug
+    @current_node.self_contained_html_node( html_self_contained_node.tag_name.text_value )
+  end
+
+  private
+
+  def get_and_increment_tag_count
+    to_return = @html_tag_count
+    @html_tag_count += 1
+    to_return
+  end
+  
+  
+  
+end

data/lib/nodes/herb_erb_tr8n_text_call_node.rb

@@ -0,0 +1,74 @@
+class HerbErbTr8nTextCallNode < HerbTr8nTextCallNode
+
+  def add_text( text_value_as_string )
+    mark_as_called_and_push_whitespace
+    super( text_value_as_string )
+  end
+
+  def add_variable( name, value )
+    mark_as_called_and_push_whitespace
+    super( name, value )
+  end
+
+  def add_pluralization( variable_name, singular, variable )
+    mark_as_called_and_push_whitespace
+    super( variable_name, singular, variable )    
+  end
+
+  def add_child( node )
+    mark_as_called_and_push_whitespace
+    super( node )    
+  end    
+  def end_html_tag( html_end_tag )
+    mark_as_called_and_push_whitespace
+    super( html_end_tag )
+  end
+
+  def self_contained_html_node( node_name )
+    mark_as_called_and_push_whitespace
+    super( node_name )
+  end
+
+  def start_html_tag( html_start_tag )
+    mark_as_called_and_push_whitespace
+    super( html_start_tag )
+  end
+  
+  def tr_call( html_end_tag = nil, count = 0 )
+    if( empty? )
+      ""
+    else
+      to_return = ""
+      to_return += @prepended_whitespace if @prepended_whitespace
+      to_return += "<%= #{super(html_end_tag, count) } %>"
+      to_return += @last_whitespace_node if @last_whitespace_node
+      to_return
+    end
+  end
+
+  def white_space( white_space_text, queue = true )
+    if( first_call? )
+      @prepended_whitespace = white_space_text
+    elsif( !queue )
+      super( white_space_text )
+      @last_whitespace_node = nil
+    else
+      super( @last_whitespace_node ) unless @last_whitespace_node.nil?
+      @last_whitespace_node = white_space_text
+    end
+    
+  end
+
+  private
+
+  def first_call?
+    @call_made.nil? || @call_made == false
+  end
+
+  def mark_as_called_and_push_whitespace
+    @call_made = true
+    white_space( @last_whitespace_node, false ) if @last_whitespace_node
+  end
+  
+  
+end

data/lib/nodes/herb_string_variable.rb

@@ -4,10 +4,37 @@ class HerbStringVariable < Treetop::Runtime::SyntaxNode
   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 )    
+    pluralize = find_pluralize_node(variable)
+    
+    # if this variable is a pluralize node, then don't treat it like a
+    # variable but like a pluralize
+    unless( pluralize.nil? )
+      variable_name = I18nKey.new( pluralize.repetition.text_value, get_key_hash(text_extractor, node_tree) ).to_s      
+      text_extractor.pluralize( pluralize, variable_name )
+    else
+      text_extractor.add_variable( I18nKey.new( self.variable.text_value, get_key_hash(text_extractor, node_tree) ).to_s , self.variable.text_value )    
+    end
+    
   end
   
+  private
+
+  # Unravel all the nodes to see if there is a pluralize node
+  def find_pluralize_node( node )
+    unless( node.elements.nil? || node.elements.empty? )
+      node.elements.each do |element|
+        if element.is_a?(PluralizeNode )
+          return element
+        else
+          found_node = find_pluralize_node( element )
+          return found_node unless found_node.nil?
+        end
+      end
+    end
+    nil
+  end
   
+    
 end

data/lib/nodes/herb_tr8n_string_node.rb

@@ -0,0 +1,49 @@
+# This class is mostly responsible for all of the escaping that needs
+# to occur for Tr8n to correctly understand the string.
+
+class HerbTr8nStringNode
+
+  ESCAPE_LOOKUP_TABLE = [
+                         ["\"", "quot"],
+                         ["\n", "break"],
+                         ["–", "ndash"],
+                         ["—", "mdash"],
+                         ["¡", "iexcl"],
+                         ["¿", "iquest"],
+                         [""", "quot"],
+                         ["“", "ldquo"],
+                         ["”", "rdquo"],
+                         ["‘", "lsquo"],
+                         ["’", "rsquo"],
+                         ["«", "laquo"],
+                         ["»", "raquo"],
+                         [" ", "nbsp"]
+                        ]
+
+  def initialize( string )
+    @escaped_string = tr8n_escape( string )
+  end
+
+  def text_value
+    @escaped_string
+  end
+
+  def to_s
+    text_value
+  end
+
+  private
+
+  def replace_character( string, search_character, replace_character )
+    string.gsub( search_character, "{#{replace_character}}" )
+  end
+  
+  def tr8n_escape( string )
+    ESCAPE_LOOKUP_TABLE.each do |lookup_pair|
+      string = replace_character( string, lookup_pair.first, lookup_pair.last )
+    end
+    string
+  end
+  
+  
+end

data/lib/nodes/herb_tr8n_text_call_node.rb

@@ -0,0 +1,146 @@
+class HerbTr8nTextCallNode
+
+  attr_reader :variable_name_being_assigned_to
+  
+  def initialize( html_start_tag = nil, tag_count = 0, tag_variable_name = nil )
+    @text_values = []
+    @variable_names_and_values = []
+    @html_start_tag = html_start_tag
+    @variable_name_being_assigned_to = tag_variable_name
+    @number_of_html_nodes = tag_count
+    @child_nodes = []
+  end
+
+  def add_text( text_value_as_string )
+    @text_values << HerbTr8nStringNode.new( text_value_as_string )
+  end
+
+  def add_child( child_node )
+    @child_nodes << child_node
+    @text_values << child_node
+  end
+  
+  def add_variable( name, value )
+    @variable_names_and_values << [name, value]
+    @text_values << "{#{name}}"
+  end
+
+  def add_pluralization( variable_name, singular, variable )
+    @text_values << "[#{variable_name} || #{singular}]"
+    @variable_names_and_values << [variable_name, variable ]
+  end
+
+  
+  def being_assigned_to_variable?
+    !@variable_name_being_assigned_to.nil?
+  end
+
+  def closing_tag_for_this_node?( closing_tag )
+    ( !@html_start_tag.nil? && @html_start_tag.tag_name.text_value == closing_tag.tag_name.text_value )
+  end
+  
+  def block_variable
+    to_return = "[#{variable_name_being_assigned_to}: "
+    to_return += text_values_as_concated_string
+    to_return += "]"
+    to_return
+  end
+
+  def empty?
+    @text_values.empty? && @variable_names_and_values.empty?
+  end
+  
+  def end_html_tag( html_end_tag )
+    @variable_names_and_values << [self.variable_name_being_assigned_to, self.variable_string( html_end_tag, @number_of_html_nodes) ]
+  end
+  
+  
+  def self_contained_html_node( node_name )
+      @text_values << "{#{node_name}}"
+  end
+
+  def start_html_tag( html_start_tag )
+  end
+
+
+  def text_value
+    if( being_assigned_to_variable? )
+      block_variable
+    else
+      tr_call
+    end
+  end
+
+  def text_values_as_concated_string
+    to_return = ""
+    @text_values.each do |text_value|
+      to_return += text_value.to_s
+    end
+    to_return
+  end
+
+  def variables
+    to_return = @variable_names_and_values.dup
+    @child_nodes.each do |child_node|
+      to_return += child_node.variables
+    end
+    to_return
+  end
+  
+  def to_s
+    text_value
+  end
+
+  def variable_string( html_end_tag, count )
+    to_return = "\""
+    to_return += @html_start_tag.text_value 
+    to_return += "{$#{count}}"
+    to_return += html_end_tag.text_value
+    to_return += "\""
+    to_return
+  end
+  
+  def tr_text( html_end_tag = nil, count = 0 )
+    to_return = "\""
+    unless( empty? )
+      to_return += @html_start_tag.text_value if being_assigned_to_variable?
+
+      if( being_assigned_to_variable? )
+        to_return += "{$#{count}}"
+      else
+        to_return += text_values_as_concated_string      
+      end
+
+      to_return += html_end_tag.text_value if being_assigned_to_variable?
+      
+      to_return +='"'
+      
+      unless( self.variables.empty? )
+        to_return += ", nil, { "
+        self.variables.each do |variable_name_value|
+          to_return += ":#{variable_name_value.first} => #{variable_name_value.last}"
+          to_return += ", " unless variable_name_value == variables.last
+        end
+        to_return += " }"
+      end
+    end
+
+    to_return
+  end
+  
+  def tr_call( html_end_tag = nil, count = 0 )
+    to_return = ""
+    unless( empty? )
+      to_return += 'tr( '
+      to_return += tr_text( html_end_tag, count )
+      to_return += ' )'
+    end
+    to_return
+  end
+
+  def white_space( white_space_text )
+    @text_values << ( HerbTr8nStringNode.new( white_space_text ) ).to_s
+  end
+
+end
+

data/lib/nodes/nodes.rb

@@ -10,4 +10,8 @@ require 'nodes/herb_node_retaining_text_node'
 require 'nodes/herb_node_retaining_node'
 require 'nodes/herb_node_retaining_text_node'
 require 'nodes/herb_node_retaining_non_text_node'
+require 'nodes/herb_tr8n_text_call_node'
+require 'nodes/herb_tr8n_text_call_node'
+require 'nodes/herb_erb_tr8n_text_call_node'
+require 'nodes/herb_tr8n_string_node'
 require 'nodes/rails_text_variable_node'

data/scripts/display_syntax_tree.rb

@@ -1,4 +1,5 @@
-require 'lib/herbgobbler'
+require 'backports'
+require_relative '../lib/herbgobbler'
 
 
 file_name = ARGV.first
@@ -9,7 +10,7 @@ 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} #{top_level.is_a?(TextNode)}"
+  puts "(#{index}): #{top_level.text_value} #{top_level.node_name if top_level.respond_to?(:node_name)} #{top_level.is_a?(TextNode)}"
 end
 puts "---------- Combined Syntax Tree -------------"
 erb_file.combine_nodes( erb_file.flatten_elements ).each do |element|

data/scripts/extract_text_from_erb.rb

@@ -1,12 +1,34 @@
 #!/usr/bin/env ruby
-require 'lib/herbgobbler'
+require 'backports'
+require_relative '../lib/herbgobbler'
+
+def print_usage
+  puts "usage: ruby extract_text_from_erb.rb i18n|tr8n <file name>"
+end
+
+if( ARGV.length != 2 )
+  print_usage
+else
+  engine = ARGV.first
+  file_name = ARGV.last
+  if( engine == 'i18n' )
+    text_extractor = RailsTextExtractor.new
+    erb_file = ErbFile.load( file_name )
+    erb_file.extract_text( text_extractor )
+    print erb_file.to_s
+  elsif( engine == 'tr8n' )
+    text_extractor = Tr8nTextExtractor.new
+    erb_file = ErbFile.load( file_name )
+    erb_file.extract_text( text_extractor )
+    print erb_file.to_s    
+  else
+    print_usage
+  end
+end
+
+
 
-file_name = ARGV.first
-text_extractor = RailsTextExtractor.new
-erb_file = ErbFile.load( file_name )
-erb_file.extract_text( text_extractor )
 
-print erb_file.to_s
 
 
 

data/scripts/extract_yml_from_erb.rb

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
-require 'lib/herbgobbler'
+
+require 'backports'
+require_relative '../lib/herbgobbler'
 
 file_name = ARGV.first
 rails_translation_store = RailsTranslationStore.new

data/scripts/save_result.rb

@@ -3,9 +3,12 @@
 test_to_save = ARGV.first
 test_name = test_to_save.split( '/' ).last
 
-`ruby scripts/extract_text_from_erb.rb #{test_to_save} > tests/integration/result/erb/#{test_name}.result`
+`ruby scripts/extract_text_from_erb.rb i18n #{test_to_save} > tests/integration/result/erb/#{test_name}.i18n.result`
 
-`ruby scripts/extract_yml_from_erb.rb #{test_to_save} > tests/integration/result/yml/#{test_name}.yml.result`
+`ruby scripts/extract_text_from_erb.rb tr8n #{test_to_save} > tests/integration/result/erb/#{test_name}.tr8n.result`
 
-puts "Wrote: tests/integration/result/erb/#{test_name}.result"
-puts "Wrote: tests/integration/result/yml/#{test_name}.yml.result"
+`ruby scripts/extract_yml_from_erb.rb #{test_to_save} > tests/integration/result/yml/#{test_name}.yml.i18n.result`
+
+puts "Wrote: tests/integration/result/erb/#{test_name}.i18n.result"
+puts "Wrote: tests/integration/result/erb/#{test_name}.tr8n.result"
+puts "Wrote: tests/integration/result/yml/#{test_name}.yml.i18n.result"

metadata

@@ -1,80 +1,72 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: herbgobbler
-version: !ruby/object:Gem::Version 
-  hash: 19
+version: !ruby/object:Gem::Version
+  version: 0.3.0
   prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 2
-  version: 0.2.2
 platform: ruby
-authors: 
+authors:
 - Douglas Sellers
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-03-08 00:00:00 -08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-04-09 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: bundler
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 0
-        - 2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.2
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: polyglot
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.2
+- !ruby/object:Gem::Dependency
+  name: polyglot
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 17
-        segments: 
-        - 0
-        - 3
-        - 1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.3.1
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: treetop
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 4
-        - 8
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.1
+- !ruby/object:Gem::Dependency
+  name: treetop
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.4.8
   type: :runtime
-  version_requirements: *id003
-description: Allows english text extraction, for internationalization and localization, from Ruby on Rails ERB files
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.8
+description: Allows english text extraction, for internationalization and localization,
+  from Ruby on Rails ERB files
 email: douglas.sellers@gmail.com
-executables: 
+executables:
 - gobble
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - bin/gobble
 - lib/commandline/commandline.rb
 - lib/commandline/gobble_all.rb
@@ -93,20 +85,25 @@ files:
 - lib/core/node_processing.rb
 - lib/core/non_extracting_non_text_node.rb
 - lib/core/non_text_node.rb
+- lib/core/pluralize_node.rb
 - lib/core/rails_text_extractor.rb
 - lib/core/rails_translation_store.rb
 - lib/core/text_extractor.rb
 - lib/core/text_node.rb
+- lib/core/tr8n_text_extractor.rb
 - lib/herbgobbler.rb
 - lib/nodes/combindable_herb_non_text_node.rb
 - lib/nodes/herb_combined_node.rb
 - lib/nodes/herb_erb_text_call_node.rb
+- lib/nodes/herb_erb_tr8n_text_call_node.rb
 - lib/nodes/herb_node_retaining_node.rb
 - lib/nodes/herb_node_retaining_non_text_node.rb
 - lib/nodes/herb_node_retaining_text_node.rb
 - lib/nodes/herb_non_text_node.rb
 - lib/nodes/herb_string_variable.rb
 - lib/nodes/herb_text_node.rb
+- lib/nodes/herb_tr8n_string_node.rb
+- lib/nodes/herb_tr8n_text_call_node.rb
 - lib/nodes/herb_white_space_text_node.rb
 - lib/nodes/nodes.rb
 - lib/nodes/rails_text_variable_node.rb
@@ -116,43 +113,29 @@ files:
 - scripts/rails_gobble_file.rb
 - scripts/save_result.rb
 - grammer/erb_grammer.treetop
-has_rdoc: true
 homepage: https://github.com/douglasjsellers/herbgobbler
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 57
-      segments: 
-      - 1
-      - 8
-      - 7
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 21
-      segments: 
-      - 1
-      - 3
-      - 7
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.7
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
-summary: Allows english text extraction, for internationalization and localization, from Ruby on Rails ERB files
+summary: Allows english text extraction, for internationalization and localization,
+  from Ruby on Rails ERB files
 test_files: []
-