gov_fake_notify 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d0b4a0c314fb0765dc52ded119d9de4c8116e102bac5700ab25397568b4fb23
-  data.tar.gz: eb26beb1c5413d77473206756baeec9fdd98bd57b2d4b0f77c1b61ff9a7664ad
+  metadata.gz: 328a4b8bd7150fa5fa80584e6a28163e911f1a8ab8c50d23630d31710a9b845d
+  data.tar.gz: baf4e19409990d079218613fe1b80572944b9ece9dff39855672baa551810872
 SHA512:
-  metadata.gz: 1cba914fabbf22c453f016048d460aa37b0b5fdccec28a616deefdef8c34b1deec1343dfb8a24477cbf36b59737762045d3960055406779ee9a2a5722a6bce93
-  data.tar.gz: d3d58b3c3e47e3fc8bec35948195a19c1bf3fcb4fb3d465baf6c2c131e09bdb19a84e18421078560d110020a835ac9821dd9ed6e9e4e8ff3877c8ce28d12557d
+  metadata.gz: 2ae605a812571782eb2d3147e8b6b39f981e247d783baf40497ed43c89a27bef9bdb384009373a14e8fba52f4c95201b3f731597b7d21e546cb2be61a4245487
+  data.tar.gz: 808e2eb41722aa9e279280ddfa4c25ffe204c3ae4a026e378411a0e4a8aa1e1558e6078266619b3e840bb26fb6913f64ceae489855d84342e8e90c6578424918

data/.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/gov_fake_notify.iml" filepath="$PROJECT_DIR$/.idea/gov_fake_notify.iml" />
+    </modules>
+  </component>
+</project>

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    gov_fake_notify (1.1.1)
-      activemodel (>= 5.2.3)
+    gov_fake_notify (1.2.0)
+      activemodel (>= 6.1)
       iodine (~> 0.7)
       jwt (~> 2.2, >= 2.2.3)
       mail (~> 2.7, >= 2.7.1)
@@ -13,34 +13,33 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.1.4.1)
-      activesupport (= 6.1.4.1)
-    activesupport (6.1.4.1)
+    activemodel (7.0.3.1)
+      activesupport (= 7.0.3.1)
+    activesupport (7.0.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
     ast (2.4.2)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
     diff-lcs (1.4.4)
-    i18n (1.8.10)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    iodine (0.7.44)
-    jwt (2.2.3)
+    iodine (0.7.48)
+    jwt (2.4.1)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
-    mini_mime (1.1.1)
-    minitest (5.14.4)
+    mini_mime (1.1.2)
+    minitest (5.16.2)
     parallel (1.21.0)
     parser (3.0.2.0)
       ast (~> 2.4.1)
-    rack (2.2.3)
+    rack (2.2.4)
     rainbow (3.0.0)
     rake (12.3.3)
     regexp_parser (2.1.1)
     rexml (3.2.5)
-    roda (3.48.0)
+    roda (3.58.0)
       rack
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
@@ -67,12 +66,11 @@ GEM
     rubocop-ast (1.11.0)
       parser (>= 3.0.1.1)
     ruby-progressbar (1.11.0)
-    thor (1.1.0)
-    tilt (2.0.10)
-    tzinfo (2.0.4)
+    thor (1.2.1)
+    tilt (2.0.11)
+    tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.1.0)
-    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby

data/gov_fake_notify.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'activemodel', '>= 5.2.3'
+  spec.add_dependency 'activemodel', '>= 6.1'
   spec.add_dependency 'iodine', '~> 0.7'
   spec.add_dependency 'jwt', '~> 2.2', '>= 2.2.3'
   spec.add_dependency 'mail', '~> 2.7', '>= 2.7.1'

data/lib/gov_fake_notify/commands/send_email_command.rb

@@ -57,19 +57,20 @@ module GovFakeNotify
     def send_email_from_template(template_data) # rubocop:disable Metrics/MethodLength
       pre_process_files
       our_params = params
-      our_body = mail_message(template_data)
+      our_html_body = mail_message_html(template_data)
+      our_text_body = mail_message_text(template_data)
       our_service = service
-      @message_body = our_body
+      @message_body = our_html_body
       mail = Mail.new do
         from    our_service['service_email']
         to      our_params['email_address']
         subject template_data['subject']
         html_part do
           content_type 'text/html; charset=UTF-8'
-          body our_body
+          body our_html_body
         end
         text_part do
-          body 'text part to go here'
+          body our_text_body
         end
       end
       mail.deliver
@@ -101,53 +102,102 @@ module GovFakeNotify
       end
     end
 
-    def mail_message(template_data)
+    def mail_message_html(template_data)
       layout = Tilt.new(File.absolute_path('../../views/layouts/govuk.html.erb', __dir__))
       layout.render do
-        template_content(template_data)
+        template_content_html(template_data)
       end
     end
 
-    def template_content(template_data)
+    def mail_message_text(template_data)
+      layout = Tilt.new(File.absolute_path('../../views/layouts/govuk.text.erb', __dir__))
+      layout.render do
+        template_content_text(template_data)
+      end
+    end
+
+    def template_content_html(template_data)
       template = template_data['message']
       buffer = ''.dup
       template.each_line do |line|
-        buffer << format_line(line)
+        buffer << format_line_html(line)
       end
       buffer
     end
 
-    def format_line(line)
+    def template_content_text(template_data)
+      template = template_data['message']
+      buffer = ''.dup
+      template.each_line do |line|
+        buffer << format_line_text(line)
+      end
+      buffer
+    end
+
+    def format_line_html(line)
+      replaced = line.gsub(/\(\(([^)]*)\)\)/) do
+        post_process_value_html params['personalisation'][Regexp.last_match[1]]
+      end
+      wrap_line_html(replaced)
+    end
+
+    def format_line_text(line)
       replaced = line.gsub(/\(\(([^)]*)\)\)/) do
-        post_process_value params['personalisation'][Regexp.last_match[1]]
+        post_process_value_text params['personalisation'][Regexp.last_match[1]]
       end
-      wrap_line(replaced)
+      wrap_line_text(replaced)
     end
 
-    def post_process_value(value)
+    def post_process_value_html(value)
       return value unless value.is_a?(Hash) && value.keys.include?('file')
 
-      render_file(value)
+      render_file_html(value)
     end
 
-    def wrap_line(line)
+    def post_process_value_text(value)
+      return value unless value.is_a?(Hash) && value.keys.include?('file')
+
+      render_file_text(value)
+    end
+
+    def wrap_line_html(line)
+      case line
+      when /^---/ then render_horizontal_line_html
+      else render_paragraph_html(line)
+      end
+    end
+
+    def wrap_line_text(line)
       case line
-      when /^---/ then render_horizontal_line
-      else render_paragraph(line)
+      when /^---/ then render_horizontal_line_text
+      else render_paragraph_text(line)
       end
     end
 
-    def render_horizontal_line
+    def render_horizontal_line_html
       Tilt.new(File.absolute_path('../../views/govuk/horizontal_line.html.erb', __dir__)).render
     end
 
-    def render_paragraph(line)
+    def render_horizontal_line_text
+      Tilt.new(File.absolute_path('../../views/govuk/horizontal_line.text.erb', __dir__)).render
+    end
+
+    def render_paragraph_html(line)
       Tilt.new(File.absolute_path('../../views/govuk/paragraph.html.erb', __dir__)).render(nil, content: line)
     end
 
-    def render_file(file_data)
+    def render_paragraph_text(line)
+      Tilt.new(File.absolute_path('../../views/govuk/paragraph.text.erb', __dir__)).render(nil, content: line)
+    end
+
+    def render_file_html(file_data)
       Tilt.new(File.absolute_path('../../views/govuk/file.html.erb', __dir__)).render(nil, file_data: file_data,
                                                                                            base_url: base_url)
     end
+
+    def render_file_text(file_data)
+      Tilt.new(File.absolute_path('../../views/govuk/file.text.erb', __dir__)).render(nil, file_data: file_data,
+                                                                                           base_url: base_url)
+    end
   end
 end

data/lib/gov_fake_notify/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GovFakeNotify
-  VERSION = '1.1.1'
+  VERSION = '1.2.0'
 end

data/lib/views/govuk/file.text.erb

@@ -0,0 +1 @@
+<%= base_url %>/files/confirm/<%= File.basename file_data['file'] %>

data/lib/views/govuk/horizontal_line.text.erb

@@ -0,0 +1 @@
+-------------------------------------------

data/lib/views/govuk/paragraph.text.erb

@@ -0,0 +1 @@
+<%= content %>

data/lib/views/layouts/govuk.text.erb

@@ -0,0 +1,2 @@
+
+<%= yield %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gov_fake_notify
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - garytaylor
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-28 00:00:00.000000000 Z
+date: 2022-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.3
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.3
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: iodine
   requirement: !ruby/object:Gem::Requirement
@@ -149,6 +149,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".idea/modules.xml"
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
@@ -186,10 +187,13 @@ files:
 - lib/views/files/confirm.html.erb
 - lib/views/files/download.html.erb
 - lib/views/govuk/file.html.erb
+- lib/views/govuk/file.text.erb
 - lib/views/govuk/horizontal_line.html.erb
+- lib/views/govuk/horizontal_line.text.erb
 - lib/views/govuk/paragraph.html.erb
-- lib/views/govuk/show.html.erb
+- lib/views/govuk/paragraph.text.erb
 - lib/views/layouts/govuk.html.erb
+- lib/views/layouts/govuk.text.erb
 homepage: https://github.com/hmcts/gov_fake_notify
 licenses:
 - MIT

data/lib/views/govuk/show.html.erb

@@ -1,19 +0,0 @@
-      <p style="Margin:0 0 20px 0;font-size:19px;line-height:25px;color:#0b0c0c">Claim number: 262000200400</p>
-      <p style="Margin:0 0 20px 0;font-size:19px;line-height:25px;color:#0b0c0c">Gary Taylor</p>
-      <p style="Margin:0 0 20px 0;font-size:19px;line-height:25px;color:#0b0c0c">Thank you for submitting your claim to an employment tribunal.</p>
-      <hr style="border:0;height:1px;background:#bfc1c3;Margin:30px 0 30px 0">
-      <p style="Margin:0 0 20px 0;font-size:19px;line-height:25px;color:#0b0c0c">WHAT HAPPENS NEXT</p>
-      <p style="Margin:0 0 20px 0;font-size:19px;line-height:25px;color:#0b0c0c">We’ll contact you once we have sent your claim to the respondent and explain what happens next.<br>At present, this is taking us an average of 25 days.<br>Once we have sent them your claim, the respondent has 28 days to reply.</p>
-      <hr style="border:0;height:1px;background:#bfc1c3;Margin:30px 0 30px 0">
-      <p style="Margin:0 0 20px 0;font-size:19px;line-height:25px;color:#0b0c0c">SUBMISSION DETAILS</p>
-      <p style="Margin:0 0 20px 0;font-size:19px;line-height:25px;color:#0b0c0c">Claim submitted:       09 October 2020<br>Tribunal office:       Midlands (East) ET<br>Contact: <a href="mailto:midlandseastet@justice.gov.uk" target="_blank">midlandseastet@justice.gov.uk</a>, 0115 947 5701</p>
-      <hr style="border:0;height:1px;background:#bfc1c3;Margin:30px 0 30px 0">
-      <p style="Margin:0 0 20px 0;font-size:19px;line-height:25px;color:#0b0c0c">Please use the link below to download a copy of your claim.<br><a style="word-wrap:break-word;color:#005ea5" href="https://documents.service.gov.uk/d/f8FKyAk4SCeu4_sjf5zV5w/p0-ZUPWESuGUsbUdomOoHQ?key=VvieEVMIEWUZTKZQWPR4Lb4HWCeCwVi3WtaqJICgvfA" target="_blank" data-saferedirecturl="https://www.google.com/url?q=https://documents.service.gov.uk/d/f8FKyAk4SCeu4_sjf5zV5w/p0-ZUPWESuGUsbUdomOoHQ?key%3DVvieEVMIEWUZTKZQWPR4Lb4HWCeCwVi3WtaqJICgvfA&amp;source=gmail&amp;ust=1632034513216000&amp;usg=AFQjCNG4im8mu2Nu231SXyHMi3gptqaYaQ">https://documents.service.gov.<wbr>uk/d/f8FKyAk4SCeu4_sjf5zV5w/<wbr>p0-ZUPWESuGUsbUdomOoHQ?key=<wbr>VvieEVMIEWUZTKZQWPR4Lb4HWCeCwV<wbr>i3WtaqJICgvfA</a></p>
-      <hr style="border:0;height:1px;background:#bfc1c3;Margin:30px 0 30px 0">
-      <p style="Margin:0 0 20px 0;font-size:19px;line-height:25px;color:#0b0c0c">Additional Information File</p>
-      <p style="Margin:0 0 20px 0;font-size:19px;line-height:25px;color:#0b0c0c">no additional file</p>
-      <p style="Margin:0 0 20px 0;font-size:19px;line-height:25px;color:#0b0c0c">no additional file</p>
-      <hr style="border:0;height:1px;background:#bfc1c3;Margin:30px 0 30px 0">
-      <p style="Margin:0 0 20px 0;font-size:19px;line-height:25px;color:#0b0c0c">Your feedback helps us improve this service:<br><a style="word-wrap:break-word;color:#005ea5" href="https://www.gov.uk/done/employment-tribunals-make-a-claim" target="_blank" data-saferedirecturl="https://www.google.com/url?q=https://www.gov.uk/done/employment-tribunals-make-a-claim&amp;source=gmail&amp;ust=1632034513216000&amp;usg=AFQjCNHY6ZdK3Y4wrMzZ6kpEubbSkN6byQ">https://www.gov.uk/done/<wbr>employment-tribunals-make-a-<wbr>claim</a></p>
-      <p style="Margin:0 0 20px 0;font-size:19px;line-height:25px;color:#0b0c0c">Help us keep track. Complete our diversity monitoring questionnaire.<br><a style="word-wrap:break-word;color:#005ea5" href="https://employmenttribunals.service.gov.uk/en/apply/diversity" target="_blank" data-saferedirecturl="https://www.google.com/url?q=https://employmenttribunals.service.gov.uk/en/apply/diversity&amp;source=gmail&amp;ust=1632034513216000&amp;usg=AFQjCNGBtP5C9AjOY9cl0HAKTJYjMna5BA">https://employmenttribunals.<wbr>service.gov.uk/en/apply/<wbr>diversity</a></p>
-      <p style="Margin:0 0 20px 0;font-size:19px;line-height:25px;color:#0b0c0c">Contact us: <a style="word-wrap:break-word;color:#005ea5" href="http://www.justice.gov.uk/contacts/hmcts/tribunals/employment" target="_blank" data-saferedirecturl="https://www.google.com/url?q=http://www.justice.gov.uk/contacts/hmcts/tribunals/employment&amp;source=gmail&amp;ust=1632034513216000&amp;usg=AFQjCNEq9IFj6UCn4aCCO1P8taYI_SQQRw">http://www.justice.gov.uk/<wbr>contacts/hmcts/tribunals/<wbr>employment</a></p>