Escape angle brackets in Android formatter, if the string contains a placeholder to enable users to use the official way to retrieve these strings. Improves #212.

2 files changed, 15 insertions, 8 deletions

diff --git a/lib/twine/formatters/android.rb b/lib/twine/formatters/android.rb
index ced90b7..55c735c 100644
--- a/lib/twine/formatters/android.rb
+++ b/lib/twine/formatters/android.rb
@@ -116,10 +116,15 @@ module Twine
         value = gsub_unless(value, "'", "\\'") { |substring| substring =~ inside_cdata }
         value = gsub_unless(value, /&/, '&') { |substring| substring =~ inside_cdata || substring =~ inside_opening_anchor_tag }
 
-        # escape opening angle brackes unless it's a supported styling tag
+        # if `value` contains a placeholder, escape all angle brackets
+        # if not, escape opening angle brackes unless it's a supported styling tag
         # https://github.com/scelis/twine/issues/212
         # https://stackoverflow.com/questions/3235131/#18199543
-        angle_bracket = /<(?!(\/?(b|u|i|a|\!\[CDATA)))/   # matches all `<` but <b>, <u>, <i>, <a> and <![CDATA
+        if number_of_twine_placeholders(value) > 0
+          angle_bracket = /<(?!(\/?(\!\[CDATA)))/           # matches all `<` but <![CDATA
+        else  
+          angle_bracket = /<(?!(\/?(b|u|i|a|\!\[CDATA)))/   # matches all `<` but <b>, <u>, <i>, <a> and <![CDATA
+        end
         value = gsub_unless(value, angle_bracket, '&lt;') { |substring| substring =~ inside_cdata }
 
         # escape non resource identifier @ signs (http://developer.android.com/guide/topics/resources/accessing-resources.html#ResourcesFromXml)
diff --git a/lib/twine/placeholders.rb b/lib/twine/placeholders.rb
index 1c7b200..bc44d05 100644
--- a/lib/twine/placeholders.rb
+++ b/lib/twine/placeholders.rb
@@ -6,6 +6,11 @@ module Twine
     PLACEHOLDER_FLAGS_WIDTH_PRECISION_LENGTH = '([-+0#])?(\d+|\*)?(\.(\d+|\*))?(hh?|ll?|L|z|j|t|q)?'
     PLACEHOLDER_PARAMETER_FLAGS_WIDTH_PRECISION_LENGTH = '(\d+\$)?' + PLACEHOLDER_FLAGS_WIDTH_PRECISION_LENGTH
     PLACEHOLDER_TYPES = '[diufFeEgGxXoscpaA]'
+    PLACEHOLDER_REGEX = /%#{PLACEHOLDER_PARAMETER_FLAGS_WIDTH_PRECISION_LENGTH}#{PLACEHOLDER_TYPES}/
+
+    def number_of_twine_placeholders(input)
+      input.scan(PLACEHOLDER_REGEX).size
+    end
 
     def convert_twine_string_placeholder(input)
       # %@ -> %s
@@ -19,15 +24,13 @@ module Twine
       # %@ -> %s
       value = convert_twine_string_placeholder(input)
 
-      placeholder_syntax = PLACEHOLDER_PARAMETER_FLAGS_WIDTH_PRECISION_LENGTH + PLACEHOLDER_TYPES
-      placeholder_regex = /%#{placeholder_syntax}/
-
-      number_of_placeholders = value.scan(placeholder_regex).size
+      number_of_placeholders = number_of_twine_placeholders(input)
 
       return value if number_of_placeholders == 0
 
       # got placeholders -> need to double single percent signs
       # % -> %% (but %% -> %%, %d -> %d)
+      placeholder_syntax = PLACEHOLDER_PARAMETER_FLAGS_WIDTH_PRECISION_LENGTH + PLACEHOLDER_TYPES
       single_percent_regex = /([^%])(%)(?!(%|#{placeholder_syntax}))/
       value.gsub! single_percent_regex, '\1%%'
 
@@ -61,8 +64,7 @@ module Twine
     def convert_placeholders_from_twine_to_flash(input)
       value = convert_twine_string_placeholder(input)
 
-      placeholder_regex = /%#{PLACEHOLDER_PARAMETER_FLAGS_WIDTH_PRECISION_LENGTH}#{PLACEHOLDER_TYPES}/
-      value.gsub(placeholder_regex).each_with_index do |match, index|
+      value.gsub(PLACEHOLDER_REGEX).each_with_index do |match, index|
         "{#{index}}"
       end
     end