threedaymonk-l10nizer 0.0.3 → 0.0.4

data/lib/l10nizer/grammar.treetop

@@ -32,11 +32,15 @@ grammar HtmlErb
   end
 
   rule text
-    (optional_whitespace erb_eval / optional_whitespace word)+ <Text>
+    (optional_whitespace (erb_eval / inline_markup / word))+ <Text>
+  end
+
+  rule inline_markup
+    "<" "/"? ("em" / "strong" / "span") [^>]* ">"
   end
 
   rule word
-    [^<\s]+
+    [^<\s]+ <Word>
   end
 
   rule erb_eval

data/lib/l10nizer/node.rb

@@ -6,6 +6,8 @@ module L10nizer
         TextNode.new(node, keygen)
       when HtmlErb::Eval
         EvalNode.new(node, keygen)
+      when HtmlErb::Word
+        WordNode.new(node)
       else
         BasicNode.new(node)
       end
@@ -29,6 +31,10 @@ module L10nizer
     def evaluated?
       false
     end
+
+    def string?
+      false
+    end
   end
 
   class TextNode < BasicNode
@@ -60,7 +66,7 @@ module L10nizer
 
     def vars_and_text
       @vars_and_text ||= (
-        if children.all?{ |c| c.evaluated? }
+        if children.all?{ |c| c.evaluated? } || !children.any?{ |c| c.string? }
           []
         else
           l10n = ""
@@ -93,4 +99,10 @@ module L10nizer
       true
     end
   end
+
+  class WordNode < BasicNode
+    def string?
+      true
+    end
+  end
 end

data/lib/l10nizer/parser.rb

@@ -14,4 +14,7 @@ module HtmlErb
 
   class Eval < Treetop::Runtime::SyntaxNode
   end
+
+  class Word < Treetop::Runtime::SyntaxNode
+  end
 end

data/lib/l10nizer/version.rb

@@ -2,7 +2,7 @@ module L10nizer #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 0
-    TINY  = 3
+    TINY  = 4
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/test/test_processor.rb

@@ -87,6 +87,23 @@ class ProcessorTest < Test::Unit::TestCase
     assert_equal html, l10nizer.reformed
   end
 
+  context "when string contains inline markup" do
+    setup do
+      html = "<p>String with a <span>span</span> and <strong>strong</strong> and <em>emphasised</em> text</p>"
+      @l10nizer = L10nizer::Processor.new(html, lambda{ "key" })
+    end
+
+    should "include that markup in text" do
+      expected = "String with a <span>span</span> and <strong>strong</strong> and <em>emphasised</em> text"
+      assert_equal [expected], @l10nizer.l10ns.values
+    end
+
+    should "use only one localisation" do
+      expected = %{<p><%= t("key") %></p>}
+      assert_equal expected, @l10nizer.reformed
+    end
+  end
+
   context "when parsing a sample document" do
     setup do
       @html     = File.read(File.join(File.dirname(__FILE__), "samples", "input.html.erb"))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: threedaymonk-l10nizer
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Paul Battley