wco_email 0.1.1.9 → 0.1.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e57ecd1bf1d0b46720dcccaa03f2d64dd5f2cdad1f388deb3c8911dd0aa6d356
-  data.tar.gz: 13b0c8d1e091583953a55c4df15649ad013941d2edf55490daa291e1b2a6b705
+  metadata.gz: 57871044dbe34a83eb21daf21efce6e5f80f58a4d05002e335a5de68708c9db2
+  data.tar.gz: e3813b3170e891df5f8d49168b319823f7eaa935ca4aa2f4e21606eba5cbf49c
 SHA512:
-  metadata.gz: 95cea1283f602b863a91c45fa6a8d0fe0ac1ed4a719a4b4acbe6466b7553efdff646e4f990b2653d6cd692e9c7181dceab79004440cd147e1ec8f5e7e4b751fb
-  data.tar.gz: e549dec48e17c1aa283ed2163c6bf52937bca3a5bf14b5d6a4c1b261fab888a45bff52f97cd5590e73940b6eda76ddff10c1278e5d4676cc27bf423c6b67bf87
+  metadata.gz: 67012b8a6f4a425ebc669e3b31aef2ae94305e59774052e1e122a98f9f1878a48d890dca3f2f1661e0a53e818abe76bfe4565b85c7c5e9bd9517c60d46e49750
+  data.tar.gz: e1958e70b7e6f17f4c3507dee615fd21567385d51097b51cbdaafd4493f76a40b7c94eae06e6da3057db4c2b54bbd0717157fe94e51e9ae0225c15acb3c3db50

data/app/controllers/wco_email/email_filters_controller.rb

@@ -34,7 +34,7 @@ class WcoEmail::EmailFiltersController < WcoEmail::ApplicationController
   def index
     authorize! :index, WcoEmail::EmailFilter.new
     @email_filter  = WcoEmail::EmailFilter.new
-    @email_filters = WcoEmail::EmailFilter.all
+    @email_filters = WcoEmail::EmailFilter.all.page( params[WcoEmail::EmailFilter::PAGE_PARAM_NAME] ).per( current_profile.per_page )
   end
 
   def new
@@ -60,7 +60,7 @@ class WcoEmail::EmailFiltersController < WcoEmail::ApplicationController
   private
 
   def set_lists
-    # super
+    @tags_list = Wco::Tag.list
     @email_templates_list        = WcoEmail::EmailTemplate.list
     @email_actions_list          = WcoEmail::EmailAction.list
     @email_action_templates_list = WcoEmail::EmailActionTemplate.list

data/app/jobs/wco_email/message_intake_job.rb

@@ -2,6 +2,7 @@
 require 'aws-sdk-s3'
 require 'mail'
 require 'sidekiq'
+require 'exception_notification'
 
 ##
 ## 2023-02-26 _vp_ Let's go
@@ -40,7 +41,7 @@ class WcoEmail::MessageIntakeJob
       stub.do_process
     rescue => err
       puts! err, "WcoEmail::MessageIntakeJob error"
-      ExceptionNotifier.notify_exception(
+      ::ExceptionNotifier.notify_exception(
         err,
         data: { stub: stub }
       )

data/app/views/wco_email/contexts/_form.haml

@@ -6,7 +6,7 @@
 
     .flex-row
       = f.label :email_template_id
-      = f.select :email_template_id, options_for_select(@email_templates_list, selected: params[:email_template_id] || ctx.email_template_id || blank_tmpl_id ), {}, { class: 'select2', required: true }
+      = f.select :email_template_id, options_for_select(@email_templates_list, selected: params[:email_template_id] || ctx.email_template_id ), {}, { class: 'select2', required: true }
       - if ctx.email_template_id
         = link_to '[view]', email_template_path( ctx.email_template_id ), target: :_blank, class: [ 'action-view' ]
         = link_to '[~]', edit_email_template_path( ctx.email_template_id ), target: :_blank, class: [ 'action-view' ]

data/app/views/wco_email/email_filters/_form.haml

@@ -33,8 +33,8 @@
         .field
           = f.label :email_action_template
           = f.select :email_action_template, options_for_select( @email_action_templates_list, selected: email_filter.email_action_template ), {}, class: 'select2'
-        -# .field
-        -#   = f.label :wp_term_id
-        -#   = f.select :wp_term_id, options_for_select( @email_tags_list, selected: email_filter.wp_term_id ), {}, class: 'select2'
+        .field
+          = f.label :tag
+          = f.select :tag, options_for_select( @tags_list, selected: email_filter.tag_id ), {}, class: 'select2'
         .actions
           = f.submit

data/app/views/wco_email/email_filters/index.haml

@@ -12,6 +12,7 @@
     = render 'form', email_filter: @email_filter
   %hr
 
+  = paginate @email_filters, param_name: WcoEmail::EmailFilter::PAGE_PARAM_NAME, views_prefix: 'wco'
   %table.bordered.data-table
     %thead
       %tr
@@ -23,9 +24,9 @@
         %th Subject Exact
         %th Body Exact
         %th Kind
-        -# %th Email Action
-        %th Email Action Template
-        -# %th Email Tag
+        %th Respond with <br />Email Template
+        %th Email Action <br />(template)
+        %th Tag
     - @email_filters.each_with_index do |ef, idx|
 
       %tr
@@ -43,8 +44,8 @@
         %td= ef.subject_exact
         %td= ef.body_exact
         %td= ef.kind
-        -# %td= ef.email_action&.id
+        %td= ef.email_template&.slug
         %td= ef.email_action_template&.slug
-        -# %td= ef.category&.name
+        %td= ef.tag&.slug
 
 

data/lib/tasks/wco_email_tasks.rake

@@ -93,22 +93,24 @@ namespace :wco_email do
   desc 'import objectkey list'
   task import_objectkey_list: :environment do
 
-    bucket = 'ish-ses'
+    # bucket = 'ish-ses'
+    bucket = 'ish-test-2024'
     client ||= Aws::S3::Client.new({
       region:            ::S3_CREDENTIALS[:region_ses],
       access_key_id:     ::S3_CREDENTIALS[:access_key_id_ses],
       secret_access_key: ::S3_CREDENTIALS[:secret_access_key_ses],
     })
 
-    lines = File.read( './data/20240110_ish-ses_objectkeys' )
+    # lines = File.read( './data/20240110_ish-ses_objectkeys' )
+    lines = File.read( './data/out_head' )
     lines.split("\n").each_with_index do |line, idx|
 
         object_key = line.split.last
         stub = WcoEmail::MessageStub.create( object_key: object_key, bucket: bucket )
         if stub.persisted?
-          print "#{idx}."
+          print "#{idx+1}."
         else
-          outs! stub.errors.full_messages.join(", ")
+          puts! stub.errors.full_messages.join(", ")
         end
 
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wco_email
 version: !ruby/object:Gem::Version
-  version: 0.1.1.9
+  version: 0.1.1.11
 platform: ruby
 authors:
 - Victor Pudeyev
@@ -317,7 +317,6 @@ files:
 - app/controllers/wco_email/unsubscribes_controller.rb
 - app/helpers/wco_email/application_helper.rb
 - app/jobs/wco_email/message_intake_job.rb
-- app/mailers/wco_email/application_mailer.rb
 - app/views/202212 Mailchimp Templates/202212 1col fixed-width.html
 - app/views/202212 Mailchimp Templates/202212 1col full-width.html
 - app/views/202212 Mailchimp Templates/202212 2col fixed-width 2.html
@@ -355,13 +354,12 @@ files:
 - app/views/202310 Email Templates/_acknowledgement_of_document_receipt.html.erb
 - app/views/202310 Email Templates/_support_ticket_created.html.erb
 - app/views/layouts/wco_email/application.haml
-- app/views/layouts/wco_email/mailbox.haml-trash
 - app/views/wco_email/_analytics.erb
 - app/views/wco_email/_main_header.haml
 - app/views/wco_email/_sidebar.haml
 - app/views/wco_email/application_mailer/_footer_unsubscribe.html.erb
 - app/views/wco_email/application_mailer/_header_logo.html.erb
-- app/views/wco_email/application_mailer/forwarder_notify.html.erb
+- app/views/wco_email/application_mailer/forwarder_notify.html.erb-trash
 - app/views/wco_email/contexts/_form.haml
 - app/views/wco_email/contexts/_form_reply.haml
 - app/views/wco_email/contexts/_header.haml

data/app/mailers/wco_email/application_mailer.rb

@@ -1,98 +0,0 @@
-
-class WcoEmail::ApplicationMailer < ActionMailer::Base
-
-  default from: 'WasyaCo Consulting <no-reply@wco.com.de>'
-  helper(Wco::ApplicationHelper)
-
-  layout 'mailer'
-
-
-  def forwarder_notify msg_id
-    @msg = WcoEmail::Message.find msg_id
-    mail( to:      "poxlovi@gmail.com",
-          subject: "POX::#{@msg.subject}" )
-  end
-
-  def shared_galleries profiles, gallery
-    return if profiles.count == 0
-    @gallery        = gallery
-    @domain         = Rails.application.config.action_mailer.default_url_options[:host]
-    @galleries_path = IshManager::Engine.routes.url_helpers.galleries_path
-    @gallery_path   = IshManager::Engine.routes.url_helpers.gallery_path(@gallery.slug)
-    mail( :to => '314658@gmail.com',
-          :bcc => profiles.map { |p| p.email },
-          :subject => 'You got new shared galleries on pi manager' )
-  end
-
-  def option_alert option
-    @option = option
-    mail({
-      :to => option.profile.email,
-      :subject => "IshManager Option Alert :: #{option.ticker}",
-    })
-  end
-
-  def stock_alert watch_id
-    @watch = Iro::OptionWatch.find watch_id
-    mail({
-      to: @watch.profile.email,
-      subject: "Iro Watch Alert :: #{@watch.ticker} is #{@watch.direction} #{@watch.mark}."
-    })
-  end
-
-  def test_email
-    mail( to: DEFAULT_RECIPIENT, subject: "Test email at #{Time.now}" )
-  end
-
-  ## 2023-04-02 _vp_ Continue.
-  ## 2023-09-24 _vp_ Continue : )
-  def send_context_email ctx_id
-    @ctx         = Ctx.find ctx_id
-    @lead        = Wco::Lead.find @ctx.lead_id
-    @tmpl_config = OpenStruct.new JSON.parse( @ctx.tmpl[:config_json] )
-
-    @utm_tracking_str = {
-      'cid'          => @ctx.lead_id,
-      'utm_campaign' => @ctx.tmpl.slug,
-      'utm_medium'   => 'email',
-      'utm_source'   => @ctx.tmpl.slug,
-    }.map { |k, v| "#{k}=#{v}" }.join("&")
-
-    # @origin         = "https://#{Rails.application.config.action_mailer.default_url_options[:host]}"
-
-    @unsubscribe_url = WcoEmail::Engine.routes.url_helpers.unsubscribes_url({
-      template_id: @ctx.tmpl.id,
-      lead_id:     @lead.id,
-      token:       @lead.unsubscribe_token,
-      host:        Rails.application.routes.default_url_options[:host],
-    })
-    # renderer = Tmp6Ctl.new
-    # renderer = IshManager::ApplicationController.new
-    # renderer.send( :include, ::IshManager::ApplicationHelper )
-    # renderer.send( :request, { host: 'test-host' } )
-    renderer = WcoEmail::ApplicationMailer.new
-
-    renderer.instance_variable_set( :@ctx,              @ctx )
-    renderer.instance_variable_set( :@lead,             @ctx.lead )
-    renderer.instance_variable_set( :@utm_tracking_str, @utm_tracking_str )
-    renderer.instance_variable_set( :@unsubscribe_url,  @unsubscribe_url )
-    renderer.instance_variable_set( :@tmpl_config,      @tmpl_config )
-
-    # eval( @ctx.tmpl.config_exe )
-
-    rendered_str = renderer.render_to_string("/wco_email/email_templates/_#{@ctx.tmpl.layout}")
-    @ctx.update({
-      rendered_str: rendered_str,
-      sent_at: Time.now.to_s,
-    })
-
-    mail( from:    @ctx.from_email,
-          to:      @ctx.to_email,
-          cc:      @ctx.cc,
-          bcc:     "poxlovi@gmail.com",
-          subject: ERB.new( @ctx.subject ).result( @ctx.get_binding ),
-          body:    rendered_str,
-          content_type: "text/html" )
-  end
-
-end

data/app/views/layouts/wco_email/mailbox.haml-trash

@@ -1,62 +0,0 @@
-!!!
-%html
-  %head
-    %title #{@page_title} | wco_email_rb-mailbox
-    %link{ :rel => 'icon', :href => "/favicon_#{ENV['RAILS_ENV']}.gif" }
-    %meta{ :name => :viewport, :content => 'width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=2' }
-    %meta{ :charset => 'UTF-8' }
-    %meta{ :description => @page_description }
-
-    = javascript_include_tag "//code.jquery.com/jquery-3.3.1.min.js"
-
-    %script{ :src => "//cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js" }
-    = stylesheet_link_tag "//cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css"
-
-    = stylesheet_link_tag "//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css", :media => 'all'
-    = stylesheet_link_tag "//fonts.googleapis.com/icon?family=Material+Icons"
-
-    = stylesheet_link_tag "//cdn.jsdelivr.net/npm/bootstrap@4.3.1/dist/css/bootstrap.min.css"
-    = javascript_include_tag "//cdn.jsdelivr.net/npm/popper.js@1.14.7/dist/umd/popper.min.js"
-    = javascript_include_tag "//cdn.jsdelivr.net/npm/bootstrap@4.3.1/dist/js/bootstrap.min.js"
-
-    = stylesheet_link_tag "//cdn.jsdelivr.net/npm/select2@4.0.0/dist/css/select2.min.css"
-    = javascript_include_tag "//cdn.jsdelivr.net/npm/select2@4.0.0/dist/js/select2.min.js"
-
-    -# summernote
-    = stylesheet_link_tag "//cdn.jsdelivr.net/npm/summernote@0.8.18/dist/summernote.min.css"
-    = javascript_include_tag "//cdn.jsdelivr.net/npm/summernote@0.8.18/dist/summernote.min.js"
-    -# quill core
-    -# = stylesheet_link_tag "//cdn.quilljs.com/1.3.6/quill.core.css"
-    -# = javascript_include_tag "//cdn.quilljs.com/1.3.6/quill.core.js"
-    -# quill
-    -# = stylesheet_link_tag "//cdn.quilljs.com/1.3.6/quill.snow.css"
-    -# = javascript_include_tag "//cdn.quilljs.com/1.3.6/quill.min.js"
-
-    = javascript_include_tag "wco_email/application"
-    = stylesheet_link_tag    "wco_email/application", media: "all"
-    = stylesheet_link_tag    "wco/application", media: "all"
-
-    -# %script{crossorigin: "", src: "https://unpkg.com/react@18/umd/react.development.js"}
-    -# %script{crossorigin: "", src: "https://unpkg.com/react-dom@18/umd/react-dom.development.js"}
-    -# %script{src: "https://unpkg.com/prop-types@15.6/prop-types.min.js"}
-    -# %script{src: "https://unpkg.com/axios/dist/axios.min.js"}
-    -# %script{src: "https://unpkg.com/recharts/umd/Recharts.js"}
-
-    = csrf_meta_tags
-  %body{ class: [ params[:controller].gsub("wco_email/",""), "#{params[:controller].gsub("wco_email/","")}-#{params[:action]}", params[:action], "application-fullwidth" ] }
-
-    = render "/wco/main_header"
-    = render "/wco_email/main_header"
-    = render '/wco/alerts_notices' if notice || alert
-    %hr
-
-    .padded
-      .row
-        .col-md-2.border-right
-          = render 'wco_email/sidebar'
-        .col-md-10
-          %span.absolute.collapse-expand#mainW
-          = yield
-
-    = render '/wco/main_footer'
-    = render '/wco_email/analytics' if Rails.env.production?