wco_models 3.1.0.143 → 3.1.0.145

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7dcd0e6443ef46946446ff666738bc396e56de3ec322efbdb6883bae10a5300a
-  data.tar.gz: c952c2ce1d2e7d4b01e4253e207b779196753cc343f8edeecbfd3ba5c42fabb1
+  metadata.gz: b33246a107d7069cc1805c1caee3a3897d4d46debcd43b8895f1f9ade01bbb69
+  data.tar.gz: f86ddbc8f6d908421e30549059c398e06f70cdd10a30a856659bcc60253b3516
 SHA512:
-  metadata.gz: 218c4d18150413167875616b4e9b4af5158e7b13d4e41813e02f9521bdde33a1d42e81f0b801555cddf6c8ec7812a8ac80495d34f134cbc164a39bdac3734a0f
-  data.tar.gz: acc8fe29b0fd09af799db9adeb5ec376c866f5d4a41b760c5191441240872f7a23343de78dd02d2ed050bd86a3b8c7194752e692089bcf971ba3924e9768ad0b
+  metadata.gz: b0e2dd7311c02468f60364f9ac0a3e8d23a3f23a631edaab4ea27464c4535b74603a23cb21e370d2a234bbda23c2c624167a86ee7bf61cd75693223df4283bc9
+  data.tar.gz: d60c0cc8b3cb816a0601017ed7fd8adba87f580205223c2f0c99c96ec793e1c7223d0dc0db3008d45598babc4bf246a6f1aab508ddd1b3d2f23234b461947466

data/app/mailers/wco_email/application_mailer.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 
 class WcoEmail::ApplicationMailer < ActionMailer::Base
 
@@ -49,15 +50,35 @@ class WcoEmail::ApplicationMailer < ActionMailer::Base
     @ctx         = Ctx.find ctx_id
     @renderer    = self.class.renderer ctx: @ctx
     rendered_str = @renderer.render_to_string("/wco_email/email_layouts/_#{@ctx.tmpl.layout}")
+
+
+    rendered_subject = ERB.new( @ctx.subject ).result( @ctx.get_binding )
+    if @ctx.lead.leadset.mangle_subject || @ctx.email_template.mangle_subject
+      ## From: https://www.ascii-code.com/
+      n1 = 33
+      n2 = 64
+      ch1 = ( rand(n2-n1)+n1 ).chr # ('UTF-8')
+      ch2 = ( rand(n2-n1)+n1 ).chr
+
+      if rendered_subject.last.ord >= n1 &&
+         rendered_subject.last.ord <= n2
+        space_idx = rendered_subject.rindex(/ /)
+        rendered_subject = rendered_subject[0...space_idx]
+      end
+
+      rendered_subject = "#{rendered_subject} #{ ch1 }#{ ch2 }"
+    end
+
     @ctx.update({
       rendered_str: rendered_str,
+      subject: rendered_subject,
     })
 
     mail( from:    @ctx.from_email,
           to:      @ctx.to_email,
           cc:      @ctx.cc,
           bcc:     "poxlovibb1@gmail.com",
-          subject: ERB.new( @ctx.subject ).result( @ctx.get_binding ),
+          subject: rendered_subject,
           body:    rendered_str,
           content_type: "text/html" )
   end

data/app/mailers/wco_email/application_mailer.rb-trash

@@ -0,0 +1,18 @@
+      ## From: https://www.fileformat.info/info/unicode/char/a.htm
+      ## From: https://stackoverflow.com/questions/7019034/utf-8-encoding-in-ruby-using-a-variable
+      ## From: https://stackoverflow.com/questions/52654509/random-generate-a-valid-unicode-character-in-ruby
+      ## latin
+      # n1 = 0x192
+      # n2 = 0x687
+      ##
+      ## weird punctuation
+      # n1 = 0x133
+      # n2 = 0x255
+
+      # random_utf8 = Enumerator.new do |yielder|
+      #   loop do
+      #     yielder << ( rand(n2-n1)+n1 ).chr('UTF-8')
+      #   rescue RangeError
+      #   end
+      # end
+      # rendered_subject = "#{rendered_subject} #{ random_utf8.next }#{ random_utf8.next }"

data/app/models/wco/leadset.rb

@@ -31,6 +31,7 @@ class Wco::Leadset
 
 
   field :next_invoice_number, type: :integer, default: 100
+  field :mangle_subject, type: :boolean, default: false
 
   has_and_belongs_to_many :serverhosts, class_name: '::WcoHosting::Serverhost' # , inverse_of: :leadset
   def next_serverhost

data/app/models/wco_email/email_template.rb

@@ -40,6 +40,7 @@ class WcoEmail::EmailTemplate
   field :config_exe,                      default: ""      ## unused! _vp_ 2023-09-24
   field :config_json,     type: Object,   default: '{}'
   field :layout, default: 'plain'
+  field :mangle_subject, type: :boolean, default: false
 
   DEFAULT_FROM_EMAIL = 'Victor Pudeyev <no-reply@wasya.co>'
   FROM_EMAILS = [

data/app/views/wco/galleries/edit.haml

@@ -1,6 +1,6 @@
 
 .galleries-edit.maxwidth
-  = render 'header_mini', gallery: @gallery
+  = render 'header', gallery: @gallery
   = render 'form', gallery: @gallery, :url => gallery_path( @gallery )
   = render 'thumbs', gallery: @gallery
   = render 'wco/photos/multinew', gallery: @gallery

data/app/views/wco/leads/show.haml

@@ -12,7 +12,9 @@
         %li Name: #{@lead.name}
         %li Email: #{@lead.email}
         %li
-          Leadset: #{ link_to @lead.leadset.company_url, leadset_path(@lead.leadset) }
+          Leadset:
+          = link_to @lead.leadset.company_url, leadset_path(@lead.leadset)
+          = link_to '[~]', edit_leadset_path(@lead.leadset)
         -# %li Rating: #{@lead.rating}
         - if @lead.phone
           %li Phone: #{@lead.phone}

data/app/views/wco/leadsets/_form.haml

@@ -10,6 +10,9 @@
   .input-field
     = f.label :email
     = f.text_field :email
+  .field
+    %label mangle_subject
+    = f.check_box :mangle_subject
 
   .input-field
     = f.label :next_invoice_number

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wco_models
 version: !ruby/object:Gem::Version
-  version: 3.1.0.143
+  version: 3.1.0.145
 platform: ruby
 authors:
 - Victor Pudeyev
@@ -434,6 +434,7 @@ files:
 - app/helpers/wco/application_helper.rb
 - app/jobs/wco_hosting/certbot_job.rb
 - app/mailers/wco_email/application_mailer.rb
+- app/mailers/wco_email/application_mailer.rb-trash
 - app/models/ability.rb
 - app/models/wco/asset.rb
 - app/models/wco/gallery.rb