wco_models 3.1.0.251 → 3.1.0.252

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39ff8539983a6709aedd6fcf0911f115be954871240531a07da6f1afb3c4190b
-  data.tar.gz: fafe5bc829f076d8c6ac44530452ced44dab15cd0d7e6b07bd2a816fa4666d8b
+  metadata.gz: ed799fd6948e57e5cac5dbd097f38e5d0667f6c5463a1ddecd8c105664b615cc
+  data.tar.gz: 513fd17a407cda9383315c04afad64a9f3b67725619db1472e445fba722137f8
 SHA512:
-  metadata.gz: cfe753f23ac7f15c7cf6921f30cf097354983bfa0cbd0e9edf70498a2e4a5537a9fce49b24d4b4ec3a3da5f82c10dfb821ba5615ef91c57fb4e79b711b07ce4e
-  data.tar.gz: bf43f6f095b710c1348e97bfe107633dc11f479784ca1f3c9a3acc11d38b8d63d37c8739e5ae531234e6d1804657ec53beb04d00388b123f555c30391ff90506
+  metadata.gz: f78c8eef005478261535954e8fe4627d24dc88a6502abe709bd79a0499690389b4744c21ace3c991b68b45935f713308aafed1e79e7f36eb557c803fac447f14
+  data.tar.gz: 7904647d7475fca316cfa238d511c40bbc0d9bdef8efe3eb6f15ac44deda98b9e11eb1aab9c9637d8c5063e21672ccc970b429a78cb9013cdf8e385d57f02a4c

data/app/controllers/wco/unsubscribes_controller.rb

@@ -2,6 +2,9 @@
 ## In order to have unsubscribes_url , unsubscribes must be in wco .
 class Wco::UnsubscribesController < Wco::ApplicationController
 
+  skip_before_action :current_profile, only: [ :create, :do_unsubscribe, :new, ]
+
+
   def create
     authorize! :open_permission, Wco
     @lead = Wco::Lead.find params[:lead_id]
@@ -29,6 +32,19 @@ class Wco::UnsubscribesController < Wco::ApplicationController
     render layout: false
   end
 
+  def do_unsubscribe
+    authorize! :open_permission, Wco
+    lead = Wco::Lead.find_by email: params[:email]
+    if params[:token] == lead.unsubscribe_token
+      lead.update({ unsubscribed_at: Time.now })
+      flash[:notice] = 'You have been unsubscribed!'
+      render 'success', layout: false
+    else
+      flash[:error] = 'security token mismatch.'
+      render 'error', layout: false
+    end
+  end
+
   def index
     authorize! :index, WcoEmail::Unsubscribe
     @unsubscribes = WcoEmail::Unsubscribe.all
@@ -36,5 +52,10 @@ class Wco::UnsubscribesController < Wco::ApplicationController
     render '_table'
   end
 
+  def new
+    authorize! :open_permission, Wco
+    render layout: false
+  end
+
 end
 

data/app/mailers/wco_email/application_mailer.rb

@@ -38,8 +38,20 @@ class WcoEmail::ApplicationMailer < ActionMailer::Base
     @renderer    = self.class.renderer ctx: @ctx
     rendered_str = @renderer.render_to_string("/wco_email/email_layouts/_#{@ctx.tmpl.layout}")
 
+    if @ctx.lead.unsubscribed_at
+      @ctx.update({
+        unsubscribed_at:      Time.now,
+      })
+      return
+    end
+
+    ## for binding only
+    @lead        = @ctx.lead
+    lead = @lead
+    @leadset     = @ctx.lead.leadset
+    leadset = @leadset
+    rendered_subject = ERB.new( @ctx.subject ).result( binding )
 
-    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
@@ -57,9 +69,9 @@ class WcoEmail::ApplicationMailer < ActionMailer::Base
     end
 
     @ctx.update({
-      rendered_str: rendered_str,
-      sent_at:      Time.now,
-      subject:      rendered_subject,
+      rendered_str:     rendered_str,
+      sent_at:          Time.now,
+      rendered_subject: rendered_subject,
     })
 
     profile = Wco::Profile.find_by email: @ctx.from_email
@@ -108,6 +120,7 @@ class WcoEmail::ApplicationMailer < ActionMailer::Base
     out = self.new
     out.instance_variable_set( :@ctx,              ctx )
     out.instance_variable_set( :@lead,             ctx.lead )
+    out.instance_variable_set( :@leadset,          ctx.lead.leadset )
     out.instance_variable_set( :@utm_tracking_str, ctx.utm_tracking_str )
     out.instance_variable_set( :@unsubscribe_url,  ctx.unsubscribe_url )
     out.instance_variable_set( :@config,           ctx.config )

data/app/models/wco/lead.rb

@@ -12,6 +12,14 @@ class Wco::Lead
   index({ email: -1 }, { unique: true })
 
   field :name
+  def name
+    if !self[:name].present?
+      _name = (email[/\A[a-zA-Z]+/] || 'associate').capitalize
+      update_attributes( name: _name )
+    end
+    self[:name]
+  end
+
   field :phone
   field :address
   field :comment ## _TODO: replace with log?
@@ -80,6 +88,7 @@ class Wco::Lead
     end
     self[:unsubscribe_token]
   end
+  field :unsubscribed_at
 
   def to_s
     # "`#{name}` <#{email}>"

data/app/models/wco/office_action_template.rb

@@ -33,7 +33,7 @@ class Wco::OfficeActionTemplate
   # has_and_belongs_to_many :email_filters, class_name: WcoEmail::EmailFilter
   has_many :email_filters, class_name: '::WcoEmail::EmailFilter', inverse_of: :office_action_template
 
-  has_many :ajects, inverse_of: :aject ## email action object
+  has_many :ajects,         class_name: '::WcoEmail::EmailFilterAction', inverse_of: :aject ## email action object
 
   def to_s
     "#{slug}"

data/app/models/wco/photo.rb

@@ -10,9 +10,12 @@ class Wco::Photo
   include Wco::Utils
   store_in collection: 'photos'
 
-  belongs_to :email_message, class_name: 'WcoEmail::Message', optional: true
-  belongs_to :gallery,       class_name: 'Wco::Gallery',      optional: true
-  belongs_to :lead,          class_name: 'Wco::Lead',         optional: true
+  belongs_to :email_message,  class_name: 'WcoEmail::Message', optional: true
+
+  belongs_to :gallery,        class_name: 'Wco::Gallery',      optional: true
+  belongs_to :lead,           class_name: 'Wco::Lead',         optional: true
+
+  has_many :email_templates, class_name: 'WcoEmail::EmailTemplate'
   # belongs_to :newsitem,      :optional => true
 
   field :name

data/app/models/wco_email/context.rb

@@ -53,6 +53,7 @@ class WcoEmail::Context
   end
 
   field :subject
+  field :rendered_subject
   def subject
     self[:subject].presence || tmpl&.subject
   end

data/app/models/wco_email/email_action_template.rb

@@ -15,7 +15,7 @@ class WcoEmail::EmailActionTemplate
 
   belongs_to :email_template, class_name: 'EmailTemplate'
 
-  has_many :ajects, inverse_of: :aject ## email action object
+  has_many :ajects,         class_name: '::WcoEmail::EmailFilterAction', inverse_of: :aject ## email action object
 
   has_many :email_actions, class_name: 'EmailAction'
 

data/app/models/wco_email/email_template.rb

@@ -127,7 +127,9 @@ class WcoEmail::EmailTemplate
   has_many :email_contexts, class_name: '::WcoEmail::Context'
   has_many :email_filters,  class_name: '::WcoEmail::EmailFilter'
   has_many :unsubscribes,   class_name: '::WcoEmail::Unsubscribe'
-  has_many :ajects, inverse_of: :aject ## email action object
+  has_many :ajects,         class_name: '::WcoEmail::EmailFilterAction', inverse_of: :aject ## email action object
+
+  belongs_to :photo,  class_name: '::Wco::Photo', optional: true # , dependent: :destroy, inverse_of: :email_template
 
   belongs_to :tag, class_name: '::Wco::Tag', inverse_of: :email_templates, optional: true
 

data/app/views/wco/unsubscribes/error.haml

@@ -0,0 +1,9 @@
+
+
+.unsubscribes-error
+  %h2.text-center
+    Could not unsubscribe:
+    = flash[:error]
+
+  %p Please submit a manual unsubscribe request at #{link_to 'wasya.co/unsubscribe', 'https://wasyaco.com/unsubscribe' }.
+

data/app/views/wco/unsubscribes/new.haml

@@ -0,0 +1,10 @@
+
+.unsubscribes--new{ style: "font-size: 2em;" }
+  %h5.text-center
+    Unsubscribe from WasyaCo emails
+
+  = form_tag do
+    %label email
+    = text_field_tag :email, params[:email], style: "min-width: 300px; padding: 1em;"
+    = submit_tag 'Unsubscribe'
+

data/app/views/wco/unsubscribes/success.haml

@@ -0,0 +1,5 @@
+
+.unsubscribes-success
+  %h5.text-center
+    You have been unsubscribed!
+

data/app/views/wco_email/email_layouts/_plain.haml

@@ -18,3 +18,8 @@
     .mini{ style: "font-size: 0.7em; color: gray; text-align: right" } Your previous message is shown below.
     %hr
     = raw @ctx.reply_to_message.part_html_sanitized
+
+%br
+= link_to 'unsubscribe', wco.unsubscribe_by_token_url( token: @ctx.lead.unsubscribe_token, email: @ctx.lead.email ), style: "color: #999;"
+%br
+.div{ style: "color: #999;" } WasyaCo 201 W 5th St 11th Floor, Austin, TX 78701

data/config/routes.rb

@@ -105,7 +105,9 @@ Wco::Engine.routes.draw do
   resources :tags
 
   ## In order to have unsubscribes_url , unsubscribes must be in wco .
-  get 'unsubscribes/analytics', to: 'unsubscribes#analytics'
+  get  'unsubscribes/analytics',            to: 'unsubscribes#analytics'
+  get  'api/unsubscribes/by-token/:token',  to: 'unsubscribes#new', as: :unsubscribe_by_token
+  post 'api/unsubscribes/by-token/:token',  to: 'unsubscribes#do_unsubscribe'
   resources :unsubscribes
 
   resources :videos

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wco_models
 version: !ruby/object:Gem::Version
-  version: 3.1.0.251
+  version: 3.1.0.252
 platform: ruby
 authors:
 - Victor Pudeyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-04-03 00:00:00.000000000 Z
+date: 2026-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ahoy_matey
@@ -716,6 +716,9 @@ files:
 - app/views/wco/tags/show.haml
 - app/views/wco/unsubscribes/_header.haml
 - app/views/wco/unsubscribes/_table.haml
+- app/views/wco/unsubscribes/error.haml
+- app/views/wco/unsubscribes/new.haml
+- app/views/wco/unsubscribes/success.haml
 - app/views/wco/videos/_form.haml
 - app/views/wco/videos/_header.haml
 - app/views/wco/videos/_index.haml