wco_email 0.1.1.5 → 0.1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68de2aa2f69836c97bd54dd9fd7b7f5f8968933a8baa343351fb37d141a4ef64
-  data.tar.gz: 21d17f9d825d3cf51d3da1081149a2e17eded52b992150dca08fc91a330c2dcb
+  metadata.gz: aefcf5045641d214959f3cb2895410b7037f6df8ea914c604a8ff79216864251
+  data.tar.gz: 03ae9281b8bae48810e84fb994ee28ec451b4700fba179e50b93bc4b12aeca03
 SHA512:
-  metadata.gz: 128535731037f157e3f2d717b3f4b3b1d3778d946ac0e067afbc4d924ab188723ed2ce2cf377e5f459940ab3e99658384d014bb033e023a27f8053737ca4a9bd
-  data.tar.gz: 618e690c06f6fb09e3b025cee7bfe63714235f946cb10ebab48b28fec6489f4c6d5bc4e754e9db9578e9ad93cca95b1ad8c34b3d90cfb340cc01d30e84017257
+  metadata.gz: 76000396421a16c11b77ddb5d0d9c234c9a5635b3caee0881e39b1978531e73750a41d671121955f09964d161af9de3eef70f6172a25f1eb870714e1def6ad1f
+  data.tar.gz: 47db6a4513a6043e99bbc672c5425b66161ec4d308b5f309d300e262d538bacda0d5a946e28cdea11a53e2acb1b0adc0fdb6fde32ead49dc1e78c4b78f795812

data/app/controllers/wco_email/api_controller.rb

@@ -5,7 +5,7 @@ class WcoEmail::ApiController < ActionController::Base
   skip_before_action :verify_authenticity_token
 
   def create_email_message
-    puts! params, 'params'
+    # puts! params, 'params'
 
     stub = WcoEmail::MessageStub.create!({
       bucket:     params[:bucket],

data/app/controllers/wco_email/application_controller.rb

@@ -9,8 +9,8 @@ class WcoEmail::ApplicationController < Wco::ApplicationController
   ##
   private
 
-  def set_lists
-    @tags = Wco::Tag.all
-  end
+  # def set_lists
+  #   @tags = Wco::Tag.all
+  # end
 
 end

data/app/controllers/wco_email/conversations_controller.rb

@@ -119,7 +119,7 @@ class WcoEmail::ConversationsController < WcoEmail::ApplicationController
   private
 
   def set_lists
-    super
+    @tags       = Wco::Tag.all
     @email_templates_list = [ [nil, nil] ] + WcoEmail::EmailTemplate.all.map { |tmpl| [ tmpl.slug, tmpl.id ] }
     @leads_list = Wco::Lead.list
     @tags_list  = Wco::Tag.list

data/app/controllers/wco_email/email_filters_controller.rb

@@ -33,8 +33,8 @@ class WcoEmail::EmailFiltersController < WcoEmail::ApplicationController
 
   def index
     authorize! :index, WcoEmail::EmailFilter.new
-    @email_filter = WcoEmail::EmailFilter.new
-    @email_filters = WcoEmail::EmailFilter.active
+    @email_filter  = WcoEmail::EmailFilter.new
+    @email_filters = WcoEmail::EmailFilter.all
   end
 
   def new
@@ -60,7 +60,7 @@ class WcoEmail::EmailFiltersController < WcoEmail::ApplicationController
   private
 
   def set_lists
-    super
+    # super
     @email_templates_list        = WcoEmail::EmailTemplate.list
     @email_actions_list          = WcoEmail::EmailAction.list
     @email_action_templates_list = WcoEmail::EmailActionTemplate.list

data/app/views/wco_email/conversations/show.haml

@@ -24,4 +24,4 @@
         = render '/wco_email/messages/meta', message: msg
         %iframe.message-iframe{ src: message_iframe_path(msg) }
 
-        = render '/wco_email/contexts/form_reply', lead_id: msg.lead_id, message: msg, ctx: WcoEmail::Context.new({ from_email: msg.to.downcase, subject: msg.subject })
+        = render '/wco_email/contexts/form_reply', lead_id: msg.lead_id, message: msg, ctx: WcoEmail::Context.new({ from_email: msg.to&.downcase, subject: msg.subject })

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

@@ -23,13 +23,15 @@
         %th Subject Exact
         %th Body Exact
         %th Kind
-        %th Email Action
-        %th Email Template
-        %th Email Tag
-    - @email_filters.each do |ef|
+        -# %th Email Action
+        %th Email Action Template
+        -# %th Email Tag
+    - @email_filters.each_with_index do |ef, idx|
 
       %tr
-        %td= check_box_tag 'checked'
+        %td
+          .gray= idx+1
+          = check_box_tag 'checked'
         %td
           = link_to '[~]', edit_email_filter_path(ef)
           .inline-block= button_to '[x]', email_filter_path(ef), method: :delete, data: { confirm: 'Are you sure?' }
@@ -41,8 +43,8 @@
         %td= ef.subject_exact
         %td= ef.body_exact
         %td= ef.kind
-        %td= ef.email_action&.slug
-        %td= ef.email_template&.slug
-        %td= ef.category&.name
+        -# %td= ef.email_action&.id
+        %td= ef.email_action_template&.slug
+        -# %td= ef.category&.name
 
 

data/lib/systemd/system/wco_email_sidekiq.service

@@ -0,0 +1,22 @@
+[Unit]
+Description=wco_email_rb_sidekiq
+
+[Service]
+Type=simple
+User=root
+WorkingDirectory=/opt/projects/micros_email/current
+ExecStart=/root/.rbenv/shims/bundle exec sidekiq -q wco_email_rb -q wco_email_rb_mailers
+ExecStop=/bin/echo nothing
+Restart=on-failure
+Environment=RAILS_ENV=production
+Environment=RAILS_LOG_TO_STDOUT=true
+
+StandardOutput=syslog
+StandardError=syslog
+SyslogIdentifier=wco_email_rb_sidekiq
+
+# StandardOutput=append:/var/log/sidekiq/production.log
+# StandardError=append:/var/log/sidekiq/production.log
+
+[Install]
+WantedBy=multi-user.target

data/lib/tasks/db_tasks.rake

@@ -1,4 +1,26 @@
 
+=begin
+
+
+## clean
+WcoEmail::EmailAction.each do |act|
+  if !act.lead
+    act.delete
+  end
+end
+
+
+
+## clean
+WcoEmail::Context.each do |ttt|
+  if !ttt.lead
+    ttt.delete
+  end
+end
+
+
+=end
+
 namespace :db do
 
   desc "seed"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wco_email
 version: !ruby/object:Gem::Version
-  version: 0.1.1.5
+  version: 0.1.1.7
 platform: ruby
 authors:
 - Victor Pudeyev
@@ -450,6 +450,7 @@ files:
 - app/views/wco_email/unsubscribes/_table.haml
 - config/initializers/assets.rb
 - config/routes.rb
+- lib/systemd/system/wco_email_sidekiq.service
 - lib/tasks/bjjcollective/sitemap.rb
 - lib/tasks/db_tasks.rake
 - lib/tasks/direct_mail_tasks.rake
@@ -462,8 +463,6 @@ files:
 - lib/tasks/wasya_co/sitemap.rb
 - lib/tasks/wco_email_tasks.rake
 - lib/wco_email.rb
-- lib/wco_email/README_email_actions.rb
-- lib/wco_email/README_email_contexts.rb
 - lib/wco_email/engine.rb
 homepage: https://wasya.co
 licenses:

data/lib/wco_email/README_email_actions.rb

@@ -1,7 +0,0 @@
-
-## clean
-WcoEmail::EmailAction.each do |act|
-  if !act.lead
-    act.delete
-  end
-end

data/lib/wco_email/README_email_contexts.rb

@@ -1,7 +0,0 @@
-
-## clean
-WcoEmail::Context.each do |ttt|
-  if !ttt.lead
-    ttt.delete
-  end
-end