herbgobbler 0.3.2 → 0.3.3

data/lib/core/method_call_node.rb

@@ -5,7 +5,15 @@ module MethodCallNode
     text_string = ''
     self.elements.each do |node|      
       if( node.is_a?( TextNode ) )
-        translated_node = text_extractor.translate_text( node.text_value )
+
+        # If this method call is part of a string, then translate it
+        # as a method call otherwise just translate it is regular text
+        if( surrounding_nodes.nil? || !surrounded_by_text?( surrounding_nodes ) )
+          translated_node = text_extractor.translate_text( node.text_value )          
+        else
+          translated_node = text_extractor.translate_method_call_text( node.text_value )
+        end
+        
         text_string << "(#{translated_node.text_value})"
       else
         text_string << node.text_value

data/lib/core/rails_text_extractor.rb

@@ -63,7 +63,12 @@ class RailsTextExtractor < BaseTextExtractor
     @translation_store.add_translation( call_node.key_value, call_node.original_text )
     call_node
   end
+
+  def translate_method_call_text( method_to_translate )
+    translate_text( method_to_translate )
+  end
   
+    
   # This takes in a text node and returns one or more nodes that will
   # then be output.  The nodes that are output should implement
   # node_name and text_value

data/lib/core/text_extractor.rb

@@ -22,6 +22,10 @@ class TextExtractor
   def translate_text( text_node_to_translate )
     raise "Please impelement me (translate_text)"
   end
+
+  def translate_method_call_text( method_to_translate )
+    raise "Please implement me (method_to_translate)"
+  end
   
   def end_html_text
     raise "Please implement me (end_html_text)"

data/lib/core/tr8n_text_extractor.rb

@@ -6,6 +6,7 @@ class Tr8nTextExtractor < BaseTextExtractor
     @key_store = []
     @debug = false
     @html_tag_count = 0
+    @lambda_call = nil
   end
   
   # This is called when text extraction has begun
@@ -19,9 +20,19 @@ class Tr8nTextExtractor < BaseTextExtractor
 
   def add_variable( variable_name, variable_value )
     puts "Adding variable: #{variable_name} = #{variable_value}" if @debug
-    @current_node.add_variable( variable_name, variable_value )
+    if( @lambda_call.nil? )
+      @current_node.add_variable( variable_name, variable_value )
+    else
+      @current_node.add_lambda( variable_name, variable_value, @lambda_call )
+      @lambda_call = nil
+    end      
   end
 
+  def translate_method_call_text( method_to_translate )
+    @lambda_call = HerbTr8nLambdaCallNode.new( method_to_translate )
+    @lambda_call
+  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

data/lib/nodes/herb_erb_tr8n_text_call_node.rb

@@ -9,6 +9,10 @@ class HerbErbTr8nTextCallNode < HerbTr8nTextCallNode
     mark_as_called_and_push_whitespace
     super( name, value )
   end
+  def add_lambda( variable_name, variable_value, lambda_call_node )
+    mark_as_called_and_push_whitespace
+    super( variable_name, variable_value, lambda_call_node )
+  end
 
   def add_pluralization( variable_name, singular, variable )
     mark_as_called_and_push_whitespace

data/lib/nodes/herb_node_retaining_text_node.rb

@@ -16,7 +16,7 @@ class HerbNodeRetainingTextNode < HerbNodeRetainingNode
       else
         false
       end
-    elsif( find_last_non_whitespace_node.node_name == "html_start_tag" || find_first_non_whitespace_node.node_name == "html_end_tag" )
+    elsif( find_last_non_whitespace_node.node_name == "html_start_tag" || find_first_non_whitespace_node.node_name == "html_end_tag" || find_first_non_whitespace_node.node_name == "erb_block_end" )
       true
     else
       false
@@ -45,7 +45,7 @@ class HerbNodeRetainingTextNode < HerbNodeRetainingNode
       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_end_tag" )
+    elsif(find_first_non_whitespace_node.node_name == "html_end_tag" || find_first_non_whitespace_node.node_name == "erb_block_end")
       start_tag = extract_leading_tag
       end_tag = HerbNodeRetainingTextNode.new
       end_tag.add_all( nodes[start_tag.nodes.length..nodes.length ] )

data/lib/nodes/herb_tr8n_lambda_call_node.rb

@@ -0,0 +1,17 @@
+class HerbTr8nLambdaCallNode
+
+  attr_reader :original_text
+  
+  def initialize( original_text )
+    @original_text = original_text
+  end
+
+  def generate_lambda( value )
+    "lambda {|text| #{value}}"
+  end
+  
+  def text_value
+    '"#{text}"'
+  end
+  
+end

data/lib/nodes/herb_tr8n_string_node.rb

@@ -5,7 +5,7 @@ class HerbTr8nStringNode
 
   ESCAPE_LOOKUP_TABLE = [
                          ["\"", "quot"],
-                         ["\n", "break"],
+                         ["\n", "br"],
                          ["–", "ndash"],
                          ["—", "mdash"],
                          ["¡", "iexcl"],

data/lib/nodes/herb_tr8n_text_call_node.rb

@@ -19,6 +19,12 @@ class HerbTr8nTextCallNode
     @child_nodes << child_node
     @text_values << child_node
   end
+
+  def add_lambda( variable_name, variable_value, lambda_call_node )
+    @variable_names_and_values << [variable_name, lambda_call_node.generate_lambda( variable_value )]
+    @text_values << generate_block_variable( variable_name, lambda_call_node.original_text )
+
+  end
   
   def add_variable( name, value )
     @variable_names_and_values << [name, value]
@@ -40,12 +46,16 @@ class HerbTr8nTextCallNode
   end
   
   def block_variable
-    to_return = "[#{variable_name_being_assigned_to}: "
-    to_return += text_values_as_concated_string
-    to_return += "]"
-    to_return
+    generate_block_variable( variable_name_being_assigned_to, text_values_as_concated_string )
   end
 
+  def generate_block_variable( variable, text )
+    to_return = "[#{variable}: "
+    to_return += text
+    to_return += "]"
+    to_return    
+  end
+  
   def empty?
     @text_values.empty? && @variable_names_and_values.empty?
   end
@@ -93,7 +103,7 @@ class HerbTr8nTextCallNode
 
   def variable_string( html_end_tag, count )
     to_return = "\""
-    to_return += @html_start_tag.text_value 
+    to_return += escape_double_quotes( @html_start_tag.text_value )
     to_return += "{$#{count}}"
     to_return += html_end_tag.text_value
     to_return += "\""
@@ -142,5 +152,10 @@ class HerbTr8nTextCallNode
     @text_values << ( HerbTr8nStringNode.new( white_space_text ) ).to_s
   end
 
+  private
+  def escape_double_quotes( text )
+    text.gsub( "\"", "\\\"" )
+  end
+  
 end
 

data/lib/nodes/nodes.rb

@@ -15,3 +15,4 @@ 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'
+require 'nodes/herb_tr8n_lambda_call_node'

data/scripts/display_syntax_tree.rb

@@ -1,3 +1,4 @@
+#!/usr/bin/env ruby
 require 'backports'
 require_relative '../lib/herbgobbler'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: herbgobbler
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-17 00:00:00.000000000 Z
+date: 2012-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -102,6 +102,7 @@ files:
 - lib/nodes/herb_non_text_node.rb
 - lib/nodes/herb_string_variable.rb
 - lib/nodes/herb_text_node.rb
+- lib/nodes/herb_tr8n_lambda_call_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