wco_models 3.1.0.304 → 3.1.0.306

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87541daeb7455882c94e744cf11f35ac8a491c2a7367e59bb666cb8230473613
-  data.tar.gz: 1a421dd9461abd591b248c6b9d1eeaadb6f05e3146a9e8420f35c35504d278c4
+  metadata.gz: a8f5b0a2dee427291f2f6e91778c749bad1d27000cfaec5248c0d753575ab897
+  data.tar.gz: 115c8df45585c59d17889e95fbb4122c8fa9da60f58c0cbb32a6b021fb62c5a8
 SHA512:
-  metadata.gz: 03f99e4c551e579c2cdc8ec4436ffb0ec66b4af7c812424bc7ed027d950b40b7fde8efbdf174bd64b9f7084bf4cefb8b97266da6bdb535ae3ef26972cdf9496f
-  data.tar.gz: df84c4aaa5f7f63c6fa5fa589cb7a4e596e70cceb661881c1900517e3ef6ca276524ea56c8d6f0f4cfe4d598534e57800ad800660b280330c0673272d495ae38
+  metadata.gz: ab1f1a65f9e3109e5ad25ad1a930dcda540421e8bb90870ee1d35d9c564364f5915f1cfc091a69255bb3e6e511052b9ddb794e62071b2bb62af661add155e230
+  data.tar.gz: '0589b0ea20dc4c9a912e02f88576c19ccda762ccc3e0a96c5888491c4a70a2f5acd9f77cb62377da32767ef22521a18186e647212e9d952c34fe61cb33ca654e'

data/app/controllers/wco/api/leads_controller.rb

@@ -5,7 +5,7 @@ class Wco::Api::LeadsController < Wco::ApiController
   before_action      :check_credentials, only: [ :by_email ]
 
   def by_email
-    @lead = Wco::Lead.where( email: params[:email] ).first
+    @lead = Wco::Lead.find_or_create_by_email( params[:email] )
   end
 
   ## select2-leads-ajax

data/app/models/wco/lead.rb

@@ -32,12 +32,7 @@ class Wco::Lead
   belongs_to :leadset, class_name: 'Wco::Leadset'
   before_validation :normalize_email, on: :create
   def normalize_email
-    self[:email] = email.downcase
-    if email.index('+')
-      a = email
-      a.slice!( a[a.index('+')...a.index('@')] )
-      self[:email] = a
-    end
+    self[:email] = Wco::Lead.normalize_email email
   end
   def self.normalize_email a
     a = a.downcase
@@ -49,19 +44,14 @@ class Wco::Lead
   before_validation :set_leadset, on: :create
   def set_leadset
     domain         = email.split('@')[1]
-    self.leadset ||= Wco::Leadset.find_or_create_by({ company_url: domain })
+    root_domain    = PublicSuffix.domain(domain)
+    self.leadset ||= Wco::Leadset.find_or_create_by({ company_url: root_domain })
   end
 
   def self.find_or_create_by_email email
     email = self.normalize_email email
-    out = where( email: email ).first
-    if !out
-      domain    = email.split('@')[1]
-      leadset   = Wco::Leadset.where(  company_url: domain ).first
-      leadset ||= Wco::Leadset.create( company_url: domain, email: email )
-      out = create!( email: email, leadset: leadset )
-    end
-    return out
+    out   = where( email: email ).first
+    out ||= create!( email: email )
   end
 
 

data/app/models/wco/photo.rb

@@ -6,6 +6,7 @@ class Wco::Photo
   include Mongoid::Document
   include Mongoid::Timestamps
   include Mongoid::Paperclip
+  include Mongoid::Paranoia
   include Wco::Utils
   store_in collection: 'photos'
 

data/app/models/wco_email/context.rb

@@ -51,7 +51,7 @@ class WcoEmail::Context
     elsif tmpl&.from_email
       return tmpl.from_email
     else
-      return DEFAULT_FROM_EMAIL
+      return 'no-reply@wasya.co' ## DEFAULT_FROM_EMAIL
     end
   end
   index({ from_email: -1 })

data/app/models/wco_email/email_filter_condition.rb

@@ -11,17 +11,17 @@ class WcoEmail::EmailFilterCondition
   FIELD_BODY_PLAIN  = 'body-plain'
   FIELD_FROM        = 'from'
   FIELD_LEADSET     = 'from-leadset'
-  FIELD_NOT_TAGGED  = 'leadset-not-tagged'
   FIELD_SUBJECT     = 'subject'
-  FIELD_TAGGED      = 'leadset-tagged'
+  FIELD_TAGGED      = 'leadset-tagged'     ## either lead or leadset, actually
+  FIELD_NOT_TAGGED  = 'leadset-not-tagged' ## either lead or leadset, actually
   FIELD_TO_OR_CC    = 'to-or-cc'
   FIELD_OPTS = [
     FIELD_BODY, FIELD_BODY_PLAIN,
     FIELD_FROM,
     FIELD_LEADSET,
-    FIELD_NOT_TAGGED,
     FIELD_SUBJECT,
     FIELD_TAGGED,
+    FIELD_NOT_TAGGED,
     FIELD_TO_OR_CC,
   ];
   field :field
@@ -49,10 +49,11 @@ class WcoEmail::EmailFilterCondition
 
   index({ email_filter_id: 1, field: 1, operator: 1, value: 1 }, unique: true )
 
-  def apply leadset:, message:
+  def apply lead:, message:
     cond = self
     reason = nil
     case cond.field
+
     ## from match-i <value>
     when WcoEmail::EmailFilterCondition::FIELD_FROM
       if cond.operator == WcoEmail::EmailFilterCondition::OPERATOR_MATCH
@@ -60,21 +61,35 @@ class WcoEmail::EmailFilterCondition
           reason = "#{email_skip_filter ? 'skip_' : ''}condition from match-i `#{value}`"
         end
       end
-    end
-    # when WcoEmail::FIELD_LEADSET
-    #   if cond.operator == WcoEmail::OPERATOR_NOT_HAS_TAG
-    #     this_tag = Wco::Tag.find cond.value
-    #     if leadset.tags.include?( this_tag )
-    #       ;
-    #     else
-    #       reason = "#{email_skip_filter ? 'skip_' : ''}condition leadset not-has-tag #{this_tag} NOT met"
-    #     end
-    #   end
-    # when WcoEmail::FIELD_TO
-    #   if message.to == cond.value
-    #     reason = "{email_skip_filter ? 'skip_' : ''}condition to = #{cond.value}"
-    #   end
-    # end
+
+    when WcoEmail::EmailFilterCondition::FIELD_TAGGED
+      ## cond.operator should eql OPERATOR__ID but I don't check b/c if its slug, it should work also.
+      tag   = Wco::Tag.find( cond.value ) rescue nil
+      tag ||= Wco::Tag.where( slug: cond.value ).first
+      if tag
+        if lead.leadset.tags.include?( tag ) ||
+           lead.tags.include?( tag )
+
+          reason = "#{email_skip_filter ? 'skip_' : ''}condition TAGGED `#{tag.slug}`"
+
+        end
+      end
+
+    when WcoEmail::EmailFilterCondition::FIELD_NOT_TAGGED
+      ## cond.operator should eql OPERATOR__ID but I don't check b/c if its slug, it should work also.
+      tag   = Wco::Tag.find( cond.value ) rescue nil
+      tag ||= Wco::Tag.where( slug: cond.value ).first
+      if tag
+        if !lead.leadset.tags.include?( tag ) &&
+           !lead.tags.include?( tag )
+
+          reason = "#{email_skip_filter ? 'skip_' : ''}condition NOT_TAGGED `#{tag.slug}`"
+
+        end
+      end
+
+    end ## end case
+
     return reason
   end
 

data/app/models/wco_email/message.rb

@@ -88,7 +88,8 @@ class WcoEmail::Message
 
   def apply_filter_action action
     message = self
-    aject = action.aject
+    aject   = action.aject
+
     case action.kind
     when WcoEmail::EmailFilterAction::KIND_ADD_TAG
       conv.tags.push aject

data/app/models/wco_email/message_stub.rb

@@ -72,14 +72,12 @@ class WcoEmail::MessageStub
       })
     end
 
-    ## Leadset, Lead
-    # from       = json['mail_from'] || "nobody@unknown-doma.in"
+    ## Lead, Leadset
     from       = json['from'][/<([^>]+)>/, 1].downcase rescue json['mail_from']
     mail_from  = json['mail_from']
     @lead      = Wco::Lead.find_or_create_by_email( from )
     @conv.leads.push @lead
-    @leadset   = Wco::Leadset.from_email from
-    @conv.leadsets.push @leadset
+    @conv.leadsets.push @lead.leadset
 
     ## message
     old_message   = WcoEmail::Message.unscoped.where( message_id: message_id ).first
@@ -111,11 +109,6 @@ class WcoEmail::MessageStub
       @message.save_attachment_postal( att )
     end
 
-    ## _TODO
-    # the_mail.cc&.each do |cc|
-    #   Wco::Lead.find_or_create_by_email( cc )
-    # end
-
     @conv.update_attributes({
       status:      WcoEmail::Conversation::STATUS_UNREAD,
       latest_at:   json['date'].to_time.to_s || Time.now.to_datetime,
@@ -135,7 +128,7 @@ class WcoEmail::MessageStub
       reason = nil
 
       filter.conditions.each do |cond|
-        reason ||= cond.apply(leadset: @leadset, message: @message )
+        reason ||= cond.apply(lead: @lead, message: @message )
       end
 
       if reason
@@ -145,13 +138,14 @@ class WcoEmail::MessageStub
         skip_reason = nil
 
         filter.skip_conditions.each do |scond|
-          skip_reason ||= scond.apply(leadset: @leadset, message: @message )
+          skip_reason ||= scond.apply(lead: @lead, message: @message )
         end
 
         if skip_reason
           puts! "NOT Applying2 filter #{filter} to conv #{@message.conversation} for matching #{skip_reason}" if DEBUG
         else
-          @conv.filters << filter; @conv.save
+          @conv.filters << filter
+          @conv.save
           filter.actions.each do |action|
             @message.apply_filter_action( action )
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wco_models
 version: !ruby/object:Gem::Version
-  version: 3.1.0.304
+  version: 3.1.0.306
 platform: ruby
 authors:
 - Victor Pudeyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-08-05 00:00:00.000000000 Z
+date: 2026-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
@@ -290,6 +290,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: public_suffix
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement