wco_email 0.1.1.4 → 0.1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61597801d89aaa1e36b55beaeea9acc706148ba6c1a83225770d979f02adc0b1
-  data.tar.gz: ae4dbd6690ecf5c61efb0bc3e4937f7ba1a40134e6b0a0f95da8588478a2301c
+  metadata.gz: '0785f28263ba6e1e09e55e7c36cd7bb121fdd0d52e5f58773031166334c3f918'
+  data.tar.gz: 50fab8b519267f3ab8aedb7faaf2db717d214bfcce90316be2849b2b55fae16d
 SHA512:
-  metadata.gz: caea37456ead2787bb43eafb68d24c342ce0a7ef2f308a20b384d0fa80a7668f2a3dca58784cae0963b742b68bd56f091db91110823ddb83ac83985dd7060104
-  data.tar.gz: 75993b2dae7cca5d52992e76e24fe26b73496af6efe998ce2c287d6aab8efa7490dc89766ceb109c500ea8ed995bd8797070b0b659855327789cdb0e54353ad1
+  metadata.gz: 2812d3b69f9f59c43a820590942e8e376ab9af6ba85aa63d3509d57fd2913cf0254e7f42b5228a66d56644fd983decc04c89369df7b15f48f6b72a7485590ee0
+  data.tar.gz: fd157a0a5bae64f097b4738ac0038b19de2b924868f0f39b12b30a4bfe45f7f702e86209fafe6b03721aaf4e53d5870a16354fdb51a1d54b2d76b576d1a606c6

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/contexts_controller.rb

@@ -129,7 +129,7 @@ class WcoEmail::ContextsController < WcoEmail::ApplicationController
     @ctx = WcoEmail::Context.find params[:id]
     authorize! :update, @ctx
 
-    if @ctx.update_attributes params[:ctx].permit!
+    if @ctx.update_attributes params[:context].permit!
       flash[:notice] = 'Saved.'
       redirect_to action: 'edit', id: @ctx.id
       return

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/contexts/_form.haml

@@ -3,7 +3,7 @@
 
 .email-contexts--form
   -# - url = ctx.new_record? ? contexts_path : context_path(ctx)
-  = form_for ctx, as: :ctx do |f|
+  = form_for ctx, as: :context do |f|
 
     .flex-row
       = f.label "Template"
@@ -34,7 +34,7 @@
 
     .flex-row
       = f.label :reply_to_message
-      = f.select :reply_to_message_id, options_for_select([[ ctx.reply_to_message.subject, ctx.reply_to_message_id ]], selected: ctx.reply_to_message_id), {}, class: 'w-100'
+      = f.select :reply_to_message_id, options_for_select([[ ctx.reply_to_message, ctx.reply_to_message_id ]], selected: ctx.reply_to_message_id), {}, class: 'w-100'
 
     .tab-labels.flex-row
       %a.label-raw{ href: "javascript: void(0)", data: { ref: '.tab-raw' } } Raw

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

@@ -2,4 +2,4 @@
 .email-contexts-new.maxwidth
   .header
     %h2.title New email context
-  = render '/wco_email/email_contexts/form', ctx: @ctx
+  = render '/wco_email/contexts/form', ctx: @ctx

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

@@ -13,7 +13,8 @@
           <b>Template:</b>           #{link_to @ctx.email_template.slug, email_template_path(@ctx.email_template), target: :_blank }
         %li <b>From:</b>             #{@ctx.from_email}
         %li <b>To Lead:</b>          #{link_to @ctx.lead.email, wco.lead_path(@ctx.lead)}
-        %li <b>reply_to_message:</b> #{ link_to @ctx.reply_to_message, message_path(@ctx.reply_to_message), target: :_blank }
+        - if @ctx.reply_to_message
+          %li <b>reply_to_message:</b> #{ link_to @ctx.reply_to_message, message_path(@ctx.reply_to_message), target: :_blank }
 
 
     .col-md-4

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"

data/lib/tasks/wco_email_tasks.rake

@@ -31,7 +31,7 @@ namespace :wco_email do
       stub.config = JSON.parse( stub.config ).merge({ process_images: process_images, skip_notification: true }).to_json
       stub.save!
 
-      WcoEmail::MessageIntakeJob.perform_sync( stub.id.to_s )
+      WcoEmail::MessageIntakeJob.perform_async( stub.id.to_s )
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wco_email
 version: !ruby/object:Gem::Version
-  version: 0.1.1.4
+  version: 0.1.1.6
 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