wco_models 3.1.0.305 → 3.1.0.306

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ab5f3e9735c73de3708a8b0cedec3bba5b93a1f6c693396d6f6b492c5639702
-  data.tar.gz: 94708879c3fc160e214afe8522e9bc792fdf046fa903f9c27151e237419189d3
+  metadata.gz: a8f5b0a2dee427291f2f6e91778c749bad1d27000cfaec5248c0d753575ab897
+  data.tar.gz: 115c8df45585c59d17889e95fbb4122c8fa9da60f58c0cbb32a6b021fb62c5a8
 SHA512:
-  metadata.gz: 0d9e765a2b3b61a7641704fe779b297191fa7a8d2c167f5e7163f51d2a8fd0696839620e2864ad557bbbc0fa7b8b26366023f85c797ff0bb52c36b3bd59ec27f
-  data.tar.gz: 453ab1dd3bd2f1acc9239445522836ce18064a6fbb16b54499db401044e86545702f344d0c1fb1e2099b911e19dbe4386d2b2828ccc237d2a0e3a982476ae5ec
+  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_email/email_filter_condition.rb

@@ -49,7 +49,7 @@ class WcoEmail::EmailFilterCondition
 
   index({ email_filter_id: 1, field: 1, operator: 1, value: 1 }, unique: true )
 
-  def apply lead:, leadset:, message:
+  def apply lead:, message:
     cond = self
     reason = nil
     case cond.field
@@ -67,7 +67,7 @@ class WcoEmail::EmailFilterCondition
       tag   = Wco::Tag.find( cond.value ) rescue nil
       tag ||= Wco::Tag.where( slug: cond.value ).first
       if tag
-        if leadset.tags.include?( tag ) ||
+        if lead.leadset.tags.include?( tag ) ||
            lead.tags.include?( tag )
 
           reason = "#{email_skip_filter ? 'skip_' : ''}condition TAGGED `#{tag.slug}`"
@@ -80,7 +80,7 @@ class WcoEmail::EmailFilterCondition
       tag   = Wco::Tag.find( cond.value ) rescue nil
       tag ||= Wco::Tag.where( slug: cond.value ).first
       if tag
-        if !leadset.tags.include?( tag ) &&
+        if !lead.leadset.tags.include?( tag ) &&
            !lead.tags.include?( tag )
 
           reason = "#{email_skip_filter ? 'skip_' : ''}condition NOT_TAGGED `#{tag.slug}`"
@@ -90,20 +90,6 @@ class WcoEmail::EmailFilterCondition
 
     end ## end case
 
-    # 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
     return reason
   end
 

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
@@ -130,7 +128,7 @@ class WcoEmail::MessageStub
       reason = nil
 
       filter.conditions.each do |cond|
-        reason ||= cond.apply(lead: @lead, leadset: @leadset, message: @message )
+        reason ||= cond.apply(lead: @lead, message: @message )
       end
 
       if reason
@@ -140,7 +138,7 @@ class WcoEmail::MessageStub
         skip_reason = nil
 
         filter.skip_conditions.each do |scond|
-          skip_reason ||= scond.apply(lead: @lead, leadset: @leadset, message: @message )
+          skip_reason ||= scond.apply(lead: @lead, message: @message )
         end
 
         if skip_reason

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wco_models
 version: !ruby/object:Gem::Version
-  version: 3.1.0.305
+  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