diff --git a/app/helpers/stream_entries_helper.rb b/app/helpers/stream_entries_helper.rb index 00a01df44..daa4a48e4 100644 --- a/app/helpers/stream_entries_helper.rb +++ b/app/helpers/stream_entries_helper.rb @@ -37,20 +37,22 @@ module StreamEntriesHelper end def rtl?(text) - return false if text.empty? + rtl_characters = /[\p{Hebrew}|\p{Arabic}|\p{Syriac}|\p{Thaana}|\p{Nko}]+/m.match(text) - matches = /[\p{Hebrew}|\p{Arabic}|\p{Syriac}|\p{Thaana}|\p{Nko}]+/m.match(text) - - return false unless matches - - rtl_size = matches.to_a.reduce(0) { |acc, elem| acc + elem.size }.to_f - ltr_size = text.strip.size.to_f - - rtl_size / ltr_size > 0.3 + if rtl_characters.present? + total_size = text.strip.size.to_f + rtl_size(rtl_characters.to_a) / total_size > 0.3 + else + false + end end private + def rtl_size(characters) + characters.reduce(0) { |acc, elem| acc + elem.size }.to_f + end + def embedded_view? params[:controller] == 'stream_entries' && params[:action] == 'embed' end diff --git a/spec/helpers/stream_entries_helper_spec.rb b/spec/helpers/stream_entries_helper_spec.rb index e2544e311..706a872f1 100644 --- a/spec/helpers/stream_entries_helper_spec.rb +++ b/spec/helpers/stream_entries_helper_spec.rb @@ -14,4 +14,22 @@ RSpec.describe StreamEntriesHelper, type: :helper do expect(helper.display_name(account)).to eq "Username" end end + + describe '#rtl?' do + it 'is false if text is empty' do + expect(helper).not_to be_rtl '' + end + + it 'is false if there are no right to left characters' do + expect(helper).not_to be_rtl 'hello world' + end + + it 'is false if right to left characters are fewer than 1/3 of total text' do + expect(helper).not_to be_rtl 'hello ݟ world' + end + + it 'is true if right to left characters are greater than 1/3 of total text' do + expect(helper).to be_rtl 'aaݟ' + end + end end