wco_email 0.1.1.100 → 0.1.1.102

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fac4111d9e1e9a7334adf73522d1d8fd3e0cd9496ba0a87449fc88b0d1d07c87
-  data.tar.gz: 91ebdda9f0946209d1228701ce89a323f7b3d762725cbe3f8458016304981374
+  metadata.gz: 72107d308d867b555572bdadf8a11b6ba84fdd12707aef2bb3e6bb12b5cc1928
+  data.tar.gz: 78c2c1208b8af74f5df417ac97c7213f21eafb4ec37124f3386c1f3fd41d3e63
 SHA512:
-  metadata.gz: bc573d25a79aa071c39ee696b01541e930ff78af4082354ccb311eddf7d7b03dc1a0cc9920a7383a8222d06c8a17157195c36267428056c8f528e82477c360b6
-  data.tar.gz: 5b629b01858a9d87570bcd1b5f8e5184a9673938470e44e7b055ef71220ce57608e6ec4ab92789864e5442b6de87751ff8b5ec1b5f2293643ad2b6147e27bdd3
+  metadata.gz: 8a97196fe771a40d02437520b8e78483c9dd9616d11b5148f7d6425ad67adb744fb5f27fdcdaf39ef75b9e1d69b4bdd4a01cf8fed3e0ec4f6e91484017300e5e
+  data.tar.gz: 3e27fc48a527ddc4d0ae6f2a71b24411252de3164ced5539a61f6464ee023602e478a576d464a16d1a4af3404d65fe1e0244019c68bd73ecb98d4884237994fa

data/app/controllers/wco_email/api/messages_controller.rb

@@ -0,0 +1,51 @@
+
+class WcoEmail::Api::MessagesController < WcoEmail::ApiController
+
+  before_action      :check_credentials, only: [ :create_email_message ]
+  before_action      :decode_jwt,      except: [ :create_email_message ]
+
+
+  ## 2026-03-27 payload is parsed json.
+  def create_postal
+    puts! params, 'api/messages#create_postal'
+
+    ## save to bucket
+    @client ||= Aws::S3::Client.new(::SES_S3_CREDENTIALS)
+    @client.put_obpect({
+      body:          params.to_json,
+      bucket:      ::SES_S3_BUCKET,
+      content_type: 'application/json',
+      key:           params['message_id'],
+    })
+
+    stub = WcoEmail::MessageStub.create({
+      bucket:   ::SES_S3_BUCKET,
+      format:    'json',
+      object_key: params['message_id'],
+    })
+
+    WcoEmail::MessageIntakeJob.perform_async( stub.id.to_s )
+    render status: :ok, json: { status: :ok }
+  end
+
+
+end
+
+
+
+  ## from aws ses
+  ## raw email
+  ## NEVER BEEN USED!
+=begin
+  def create
+    puts! params, 'params'
+
+    stub = WcoEmail::MessageStub.find_or_create_by({
+      bucket:     params[:bucket],
+      object_key: params[:object_key],
+    })
+
+    WcoEmail::MessageIntakeJob.perform_async( stub.id.to_s )
+    render status: :ok, json: { status: :ok }
+  end
+=end

data/app/controllers/wco_email/api_controller.rb

@@ -1,36 +1,9 @@
 
 class WcoEmail::ApiController < ActionController::Base
 
-  before_action      :check_credentials, only: [ :create_email_message ]
-  before_action      :decode_jwt,      except: [ :create_email_message ]
   skip_before_action :verify_authenticity_token
   layout false
 
-  def create_email_message
-    puts! params, 'params'
-
-    stub = WcoEmail::MessageStub.find_or_create_by({
-      bucket:     params[:bucket],
-      object_key: params[:object_key],
-    })
-
-    WcoEmail::MessageIntakeJob.perform_async( stub.id.to_s )
-    render status: :ok, json: { status: :ok }
-  end
-
-  def create_email_message_from_postal
-    puts! params, 'create_email_message_from_postal#params'
-
-    # stub = WcoEmail::MessageStub.find_or_create_by({
-    #   bucket:     params[:bucket],
-    #   object_key: params[:object_key],
-    # })
-
-    # WcoEmail::MessageIntakeJob.perform_async( stub.id.to_s )
-    # render status: :ok, json: { status: :ok }
-  end
-
-
 
   ##
   ## private

data/app/controllers/wco_email/application_controller.rb

@@ -11,8 +11,9 @@ class WcoEmail::ApplicationController < Wco::ApplicationController
   ##
   private
 
-  ## Nothing should be here.
+
   def set_lists
+    @tags_list = Wco::Tag.list
   end
 
 end

data/app/controllers/wco_email/email_filters_controller.rb

@@ -69,12 +69,15 @@ class WcoEmail::EmailFiltersController < WcoEmail::ApplicationController
     end
 
     flag = @email_filter.update_attributes( params[:email_filter].permit! )
+
     if flag
       flash[:notice] = 'Success'
+      redirect_to action: 'index'
     else
       flash[:alert] = "No luck: #{@email_filter.errors.full_messages.join(', ')}."
+      redirect_to request.referrer
     end
-    redirect_to action: 'index'
+
   end
 
   ##

data/app/jobs/wco_email/message_intake_job.rb

@@ -38,7 +38,11 @@ class WcoEmail::MessageIntakeJob
     end
 
     begin
-      stub.do_process
+      if 'json' == stub.format
+        stub.do_process_json ## postal server
+      else
+        stub.do_process
+      end
     rescue => err
       stub.update({ status: WcoEmail::MessageStub::STATUS_FAILED })
       puts! err, "WcoEmail::MessageIntakeJob error"

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

@@ -1,12 +1,14 @@
 
-.d-flex
-  .field
-    %label Field
-    = f.select :field, options_for_select(WcoEmail::EmailFilter::FIELD_OPTS)
-  .field
-    %label Matchtype
-    = f.select :matchtype, options_for_select(WcoEmail::EmailFilter::MATCHTYPE_OPTS)
-  .field
-    %label Value
-    = f.text_field :value
-  [-]
+.email-filter-conditions--form.descr
+  .d-flex
+    .field
+      %label Field
+      = f.select :field, options_for_select([[nil,nil]] + WcoEmail::EmailFilter::FIELD_OPTS, selected: cond.field )
+    .field
+      %label Matchtype
+      = f.select :matchtype, options_for_select([[nil,nil]] + WcoEmail::EmailFilter::MATCHTYPE_OPTS, selected: cond.matchtype)
+    .field
+      %label Value
+      = f.text_field :value, value: cond.value
+    [-]
+  -# .a= cond.inspect

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

@@ -35,11 +35,15 @@
           %label Kind
           = f.select :kind, options_for_select( WcoEmail::EmailFilter::KINDS, selected: email_filter.kind )
         .field
-          %label Template
+          %label Email Template
           = f.select :email_template_id, options_for_select(@email_templates_list, selected: params[:email_template_id] || email_filter.email_template_id ), {}, { class: 'select2' }
         .field
-          = f.label :email_action_template
-          = f.select :email_action_template, options_for_select( @email_action_templates_list, selected: email_filter.email_action_template_id ), {}, class: 'select2'
+          %label Email Action Template
+          = f.select :email_action_template_id, options_for_select( @email_action_templates_list, selected: email_filter.email_action_template_id ), {}, class: 'select2'
+        .field
+          %label Office Action Template
+          = f.select :office_action_template_id, options_for_select( ::Wco::OfficeActionTemplate.list, selected: email_filter.office_action_template_id ), {}, class: 'select2'
+
         .field
           = f.label :tag
           = f.select :tag, options_for_select( @tags_list, selected: email_filter.tag_id ), {}, class: 'select2'
@@ -52,6 +56,22 @@
           %label skip from regex
           = f.text_field :skip_from_regex
 
-      .col-md-6
+      .col-12
+        Conditions:
+        %ul
+          - email_filter.conditions.each do |cond|
+            %li
+              = f.fields_for( :conditions ) do |f_cond|
+                = render '/wco_email/email_filter_conditions/form', cond: cond, f: f_cond
+
+      .col-12
+        skip conditions:
+        %ul
+          - email_filter.skip_conditions.each do |cond|
+            %li
+              = f.fields_for( :skip_conditions ) do |f_cond|
+                = render '/wco_email/email_filter_conditions/form', cond: cond, f: f_cond
+
+      .col-12
         .actions
           = f.submit

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

@@ -28,19 +28,12 @@
           = f_cond.text_field :value
         [-]
     .d-flex [+]
-    %p Then [test]
-    - email_filter.action_tmpls.each do |f_act_tmpl|
-      .d-flex
-        %label Office Action
-        .field
-          %label slug
-          = f_act_tmpl.slug
-        .field
-          %label config
-          = f_act_tmpl.text_area :config
-        [-]
-    .d-flex [+]
-    [perform]
+    %p Then
+    .d-flex
+      %label OAT
+      = f.select :office_action_template, options_for_select(Wco::OfficeActionTemplate.list, selected: email_filter.office_action_template_id), {}, class: 'select2'
+
+    %p [perform]
 
     .actions
       = f.submit 'Go'

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

@@ -3,4 +3,4 @@
 = form_tag email_filters_path, method: :get do
   = text_field_tag :q
 = link_to '[+]', new_email_filter_path
-= link_to '[2+]', new2_email_filter_path
+= link_to '[+2]', new2_email_filter_path

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

@@ -3,3 +3,19 @@
   .header
     %h2.title Edit Email Filter
   = render 'form', email_filter: @email_filter
+
+-#
+  %hr
+  <b>Conditions (#{@email_filter.conditions.length}):</b>
+  %ul
+    - @email_filter.conditions.each do |cond|
+      %li
+        = cond.inspect
+
+  %hr
+  <b>Skip Conditions (#{@email_filter.skip_conditions.length}):</b>
+  %ul
+    - @email_filter.skip_conditions.each do |cond|
+      %li
+        = cond.inspect
+

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

@@ -22,6 +22,8 @@
         %th Match
         %th Skip
         %th Action
+        %th Conditions
+        %th Skip Conditions
 
     - @email_filters.each_with_index do |ef, idx|
 
@@ -64,6 +66,11 @@
           - if ef.kind == EF::KIND_REMOVE_TAG
             .a <b>#{EF::KIND_REMOVE_TAG}:</b> #{ef.tag&.slug}
 
+        %td.conditions
+          = ef.conditions.length
+        %td.skip-conditions
+          = ef.skip_conditions.length
+
   = paginate @email_filters, param_name: WcoEmail::EmailFilter::PAGE_PARAM_NAME, views_prefix: 'wco'
 
 

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

@@ -1,11 +1,18 @@
 
 - url = email_template.new_record? ? email_templates_path : email_template_path(email_template.id)
 
-.email-templates--form
+.email-templates--form.container
   = form_for email_template, as: :template, url: url do |f|
-    .field
-      %label Slug
-      = f.text_field :slug
+    .actions
+      = f.submit 'Save'
+
+    .row
+      .field.flex-grow-1
+        %label Slug
+        = f.text_field :slug
+      .field
+        %label Tag
+        = f.select :tag, options_for_select(@tags_list, selected: email_template.tag_id), {}, class: 'select2'
     .flex-row
       %label Layout
       = f.select :layout, options_for_select(WcoEmail::EmailTemplate::LAYOUTS, selected: email_template.layout), {}, class: 'select2'

data/app/views/wco_email/email_templates/_header.haml

@@ -4,8 +4,8 @@
 - else
   - templates = WcoEmail::EmailTemplate.all
 
-= link_to "Email Templates (#{templates.count})", email_templates_path
-= form_tag email_templates_path, method: :get do
+= link_to "Email Templates (#{templates.count})", wco_email.email_templates_path
+= form_tag wco_email.email_templates_path, method: :get do
   = text_field_tag :q, q
-= link_to '[+]', new_email_template_path
-= link_to '[expanded]', email_templates_path({ view: '_index_expanded' })
+= link_to '[+]', wco_email.new_email_template_path
+= link_to '[expanded]', wco_email.email_templates_path({ view: '_index_expanded' })

data/app/views/wco_email/email_templates/_index.haml

@@ -1,10 +1,11 @@
 
+- email_templates ||= @templates
+
 .email-templates--index.maxwidth
 
   %h5.flex-row.collapse-expand#emailTemplatesIndex
-    = render '/wco_email/email_templates/header', templates: @templates
+    = render '/wco_email/email_templates/header', templates: email_templates
 
-  -# = paginate @templates, :param_name => :templates_page, :views_prefix => 'wco'
   .email-templates-index.maxwidth
     %table.bordered.data-table
       %thead
@@ -14,14 +15,14 @@
           %th Created
           %th Updated
 
-      - @templates.each do |tmpl|
+      - email_templates.each do |tmpl|
         %tr
           %td
             .flex-row
-              = link_to '[use]', new_context_path({ email_template_id: tmpl.id })
-              = link_to '[~]', edit_email_template_path({ id: tmpl })
-              = button_to '[x]', email_template_path({ id: tmpl }), method: :delete, :data => { :confirm => 'Are you sure?' }, form_class: 'inline'
-          %td= link_to tmpl.slug, email_template_path({ id: tmpl })
+              = link_to '[use]', wco_email.new_context_path({ email_template_id: tmpl.id })
+              = link_to '[~]',   wco_email.edit_email_template_path({ id: tmpl })
+              = button_to '[x]', wco_email.email_template_path({ id: tmpl }), method: :delete, :data => { :confirm => 'Are you sure?' }, form_class: 'inline'
+          %td= link_to tmpl.slug, wco_email.email_template_path({ id: tmpl })
           %td= pp_date tmpl.created_at
           %td= pp_date tmpl.updated_at
   -# = paginate @templates, :param_name => :templates_page, :views_prefix => 'wco'

data/app/views/wco_email/email_templates/_index_mini.haml

@@ -0,0 +1,7 @@
+- email_templates ||= @templates
+.email-templates--index.maxwidth
+  %ul
+    - email_templates.each do |tmpl|
+      %li
+        = link_to '[~]',   wco_email.edit_email_template_path({ id: tmpl })
+        = tmpl.to_s

data/config/routes.rb

@@ -17,7 +17,7 @@ WcoEmail::Engine.routes.draw do
   get    'api/email_templates',             to: '/wco_email/api/email_templates#index'
   get    'api/tags/:tagname/conversations', to: '/wco_email/api/conversations#index'
 
-  post   'api/messages/from-postal',        to: '/wco_email/api#create_email_message'
+  post   'api/messages/from-postal/:secret', to: '/wco_email/api/messages#create_postal'
 
   get  'conversations/in/:tagname',         to: '/wco_email/conversations#index', as: :conversations_in
   get  'conversations/not-in/:tagname_not', to: '/wco_email/conversations#index', as: :conversations_not_in

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wco_email
 version: !ruby/object:Gem::Version
-  version: 0.1.1.100
+  version: 0.1.1.102
 platform: ruby
 authors:
 - Victor Pudeyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-01-05 00:00:00.000000000 Z
+date: 2026-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
@@ -314,6 +314,7 @@ files:
 - app/controllers/wco_email/api/email_action_templates_controller.rb
 - app/controllers/wco_email/api/email_filters_controller.rb
 - app/controllers/wco_email/api/email_templates_controller.rb
+- app/controllers/wco_email/api/messages_controller.rb
 - app/controllers/wco_email/api_controller.rb
 - app/controllers/wco_email/application_controller.rb
 - app/controllers/wco_email/contexts_controller.rb
@@ -432,6 +433,7 @@ files:
 - app/views/wco_email/email_templates/_header.haml
 - app/views/wco_email/email_templates/_index.haml
 - app/views/wco_email/email_templates/_index_expanded.haml
+- app/views/wco_email/email_templates/_index_mini.haml
 - app/views/wco_email/email_templates/_meta.haml
 - app/views/wco_email/email_templates/_piousbox_social.html.erb
 - app/views/wco_email/email_templates/_row_col3.html.erb