text utils for RTL

2 years ago · f1ebd8f912
parent 98f5bba832
commit f1ebd8f912
5 changed files with 26 additions and 29 deletions
--- a/app/views/layouts/mailer.html.erb
+++ b/app/views/layouts/mailer.html.erb
@ -6,7 +6,7 @@
    <style>
    </style>
  </head>
-  <body dir="<%= yield&.match?(/[\p{Hebrew}\p{Arabic}]/) ? 'rtl' : 'auto' %>">
+  <body dir="<%= yield&.match?(TextUtils::RTL_REGEXP) ? 'rtl' : 'auto' %>">
    <%= yield %>
    <%= render partial: 'shared/mailer_attribution' %>
  </body>
--- a/config/initializers/filter_parameter_logging.rb
+++ b/config/initializers/filter_parameter_logging.rb
@ -1,4 +1,4 @@
 # frozen_string_literal: true

 Rails.application.config.filter_parameters += %i[password token otp_attempt passw secret token _key crypt salt
-                                                 certificate otp ssn]
+                                                 certificate otp ssn file]
--- a/lib/submissions/generate_audit_trail.rb
+++ b/lib/submissions/generate_audit_trail.rb
@ -27,7 +27,7 @@ module Submissions
      'GBP' => '£'
    }.freeze

-    RTL_REGEXP = Submissions::GenerateResultAttachments::RTL_REGEXP
+    RTL_REGEXP = TextUtils::RTL_REGEXP

    module_function

@ -149,7 +149,7 @@ module Submissions
              [
                submission.template_submitters.size > 1 && { text: "#{item['name']}\n" },
                submitter.email && { text: "#{submitter.email}\n", font: [FONT_BOLD_NAME, { variant: :bold }] },
-                submitter.name && { text: "#{maybe_rtl_reverse(submitter.name)}\n" },
+                submitter.name && { text: "#{TextUtils.maybe_rtl_reverse(submitter.name)}\n" },
                submitter.phone && { text: "#{submitter.phone}\n" }
              ].compact_blank, line_spacing: 1.8, padding: [0, 20, 0, 0]
            )
@ -187,7 +187,7 @@ module Submissions
            composer.formatted_text_box(
              [
                {
-                  text: maybe_rtl_reverse(field['name'].to_s).upcase.presence ||
+                  text: TextUtils.maybe_rtl_reverse(field['name'].to_s).upcase.presence ||
                        "#{field['type']} Field #{submitter_field_counters[field['type']]}\n".upcase,
                  font_size: 6
                }
@ -237,7 +237,7 @@ module Submissions

              value = value.join(', ') if value.is_a?(Array)

-              composer.formatted_text_box([{ text: maybe_rtl_reverse(value.to_s.presence || 'n/a') }],
+              composer.formatted_text_box([{ text: TextUtils.maybe_rtl_reverse(value.to_s.presence || 'n/a') }],
                                          align: value.to_s.match?(RTL_REGEXP) ? :right : :left,
                                          padding: [0, 0, 10, 0])
            end
@ -298,16 +298,6 @@ module Submissions
      )
    end

-    def maybe_rtl_reverse(text)
-      if text.match?(RTL_REGEXP)
-        TwitterCldr::Shared::Bidi
-          .from_string(ArabicLetterConnector.transform(text), direction: :RTL)
-          .reorder_visually!.to_s
-      else
-        text
-      end
-    end
-
    def add_logo(column, _submission = nil)
      column.image(PdfIcons.logo_io, width: 40, height: 40, position: :float)

--- a/lib/submissions/generate_result_attachments.rb
+++ b/lib/submissions/generate_result_attachments.rb
@ -13,7 +13,7 @@ module Submissions
    SIGN_REASON = 'Signed by %<name>s with DocuSeal.co'
    SIGN_SIGNLE_REASON = 'Digitally signed with DocuSeal.co'

-    RTL_REGEXP = /[\p{Hebrew}\p{Arabic}]/
+    RTL_REGEXP = TextUtils::RTL_REGEXP

    TEXT_LEFT_MARGIN = 1
    TEXT_TOP_MARGIN = 1
@ -159,7 +159,7 @@ module Submissions
          when 'cells'
            cell_width = area['cell_w'] * width

-            maybe_rtl_reverse(value).chars.each_with_index do |char, index|
+            TextUtils.maybe_rtl_reverse(value).chars.each_with_index do |char, index|
              text = HexaPDF::Layout::TextFragment.create(char, font: pdf.fonts.add(FONT_NAME),
                                                                font_size:)

@ -172,7 +172,7 @@ module Submissions
              value = TimeUtils.format_date_string(value, field.dig('preferences', 'format'), account.locale)
            end

-            value = maybe_rtl_reverse(Array.wrap(value).join(', '))
+            value = TextUtils.maybe_rtl_reverse(Array.wrap(value).join(', '))

            text = HexaPDF::Layout::TextFragment.create(value, font: pdf.fonts.add(FONT_NAME),
                                                               font_size:)
@ -318,16 +318,6 @@ module Submissions
      pdf
    end

-    def maybe_rtl_reverse(text)
-      if text.match?(RTL_REGEXP)
-        TwitterCldr::Shared::Bidi
-          .from_string(ArabicLetterConnector.transform(text), direction: :RTL)
-          .reorder_visually!.to_s
-      else
-        text
-      end
-    end
-
    def sign_reason(name)
      format(SIGN_REASON, name:)
    end
--- a/lib/text_utils.rb
+++ b/lib/text_utils.rb
@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module TextUtils
+  RTL_REGEXP = /[\p{Hebrew}\p{Arabic}]/
+
+  module_function
+
+  def maybe_rtl_reverse(text)
+    if text.match?(RTL_REGEXP)
+      TwitterCldr::Shared::Bidi
+        .from_string(ArabicLetterConnector.transform(text), direction: :RTL)
+        .reorder_visually!.to_s
+    else
+      text
+    end
+  end
+end