organicmaps/twine
Archived
13
Fork 0
Code Issues 1 Pull requests 2 Projects Releases Wiki Activity Actions

Fixed #165 by disallowing single spaces as valid printf flags.

Browse source
This commit is contained in:
Sebastian Ludwig 2016-11-21 22:05:25 +01:00
parent c19b88d429
commit 43b83cc8e6
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/twine/placeholders.rb
View file

@ -2,7 +2,8 @@ module Twine
module Placeholders
extend self
PLACEHOLDER_FLAGS_WIDTH_PRECISION_LENGTH = '([-+ 0#])?(\d+|\*)?(\.(\d+|\*))?(hh?|ll?|L|z|j|t)?'
# Note: the ` ` (single space) flag is NOT supported
PLACEHOLDER_FLAGS_WIDTH_PRECISION_LENGTH = '([-+0#])?(\d+|\*)?(\.(\d+|\*))?(hh?|ll?|L|z|j|t)?'
PLACEHOLDER_PARAMETER_FLAGS_WIDTH_PRECISION_LENGTH = '(\d+\$)?' + PLACEHOLDER_FLAGS_WIDTH_PRECISION_LENGTH
# http://developer.android.com/guide/topics/resources/string-resource.html#FormattingAndStyling

7
test/test_placeholders.rb
View file

@ -11,7 +11,7 @@ class PlaceholderTest < TwineTest
lucky = lambda { rand > 0.5 }
placeholder = '%'
placeholder += (rand * 20).to_i.to_s + '$' if lucky.call
placeholder += '-+ 0#'.chars.to_a.sample if lucky.call
placeholder += '-+0#'.chars.to_a.sample if lucky.call
placeholder += (0.upto(20).map(&:to_s) << "*").sample if lucky.call
placeholder += '.' + (0.upto(20).map(&:to_s) << "*").sample if lucky.call
placeholder += %w(h hh l ll L z j t).sample if lucky.call
@ -39,6 +39,11 @@ class PlaceholderTest < TwineTest
assert_equal "some % value", to_android("some % value")
end
def test_does_not_modify_single_percent_signs_when_followed_by_space_and_format_letter
# Said differently: formartter parser should not recognize %a in "70% and"
assert_equal 'If 70% and 30% dog 80% end', to_android('If 70% and 30% dog 80% end')
end
def test_escapes_single_percent_signs_if_placeholder_present
assert_starts_with "some %% v", to_android("some % value #{placeholder}")
end