appending 1.4 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eaa340dc648f9c8e5eb15c6a871e7e2f4688aafa2c1674686351f71e32f0326b
-  data.tar.gz: ca698fb7a9abcd78968a8fc0ea9d25352796052d5a2903a0b0c3cb732531aab7
+  metadata.gz: e018ab896cfc8ade090d1520b22241d6a6ff94af9680466ce659aa5ad6e7fb9b
+  data.tar.gz: 1d9ddd8428910b8085399bbcdbba8198cb05bdc112200714844c29a35bde0ff0
 SHA512:
-  metadata.gz: 5f09789eb67bc56e93df692a7d63d0c41fea701297ab6691ee67a641b709927721bd2783a6c6915a33d18f8cebacbe635f534f49d5f0b9cc4bdbf45d7a9d4e1c
-  data.tar.gz: e7a04a46cbecaeec589be05f29330ad40478fb16fc5516eea663b6edfbdf39dfd1cced15853b614d568704ecc1692086b1e145d60accf95e2c79595160e95920
+  metadata.gz: 721ec624c8fe4594ab7fff4aac354fbc0dafb1215abb5c5c51c88d942eb8929877fa4bfe85ae4b9f960166caee84bd480ba318c26b998d3b4b68dd4aa69c6539
+  data.tar.gz: 9a16c08e7ff289a88253b81dafe553aee4792672e4ac83c4325e554a9da743ddf9282f0ee13f9c4d5ce312694268882da2daad730d28aade85777c69268ec2d1

data/lib/appending.rb

@@ -183,32 +183,11 @@ module BlackStack
             params = {
                 :email => email,
             }
-            res = BlackStack::Netting::call_get(url, params)
+            # send HTTP-GET request to @@verifier_url, using the standard HTTP module
+            res = Net::HTTP.get_response(URI.parse("#{url}?email=#{params[:email]}"))
             parsed = JSON.parse(res.body)
-            parsed['status'] == 'success'
-        end
-
-        # verify an email address
-        def self.append(fname, lname, domain)
-            ret = []
-            if !catch_all?(domain)
-                [
-                    "#{fname}@#{domain}",
-                    "#{lname}@#{domain}",
-
-                    "#{fname}.#{lname}@#{domain}",
-                    "#{lname}.#{fname}@#{domain}",
-
-                    "#{fname}#{lname}@#{domain}",
-                    "#{lname}#{fname}@#{domain}",
-
-                    "#{fname[0]}#{lname}@#{domain}",
-                    "#{fname[0]}.#{lname}@#{domain}",
-                ].each { |email|
-                    ret << email.downcase if BlackStack::Appending.verify(email)
-                }
-            end
-            ret
+            #parsed = JSON.parse(`curl --location --request GET '#{url}?email=#{email}' --header 'Content-Type: application/json'`)
+            parsed['status'] == 'success'            
         end
 
         # This is a support method for the `append` methods.
@@ -259,8 +238,8 @@ module BlackStack
 
         # Find a person in the indexes by its full name and company name.
         # Append all the information in the index row.
-        def self.find_persons_with_full_name(name, cname)
-            l = BlackStack::Appending.logger || BlackStack::DummyLogger.new
+        def self.find_persons_with_full_name(name, cname, l=nil)
+            l = BlackStack::DummyLogger.new if l.nil?
 
             l.logs "Guessing fname from #{name}... "
             fname = BlackStack::Appending::cleanup_fname(name)
@@ -270,13 +249,13 @@ module BlackStack
             lname = BlackStack::Appending::cleanup_lname(name)
             l.logf lname
 
-            BlackStack::Appending.find_persons(fname, lname, cname)
+            BlackStack::Appending.find_persons(fname, lname, cname, l)
         end
 
         # Find a person in the indexes by its first name, last name and company name.
         # Append all the information in the index row.
-        def self.find_persons(fname, lname, cname)
-            l = BlackStack::Appending.logger || BlackStack::DummyLogger.new
+        def self.find_persons(fname, lname, cname, l=nil)
+            l = BlackStack::DummyLogger.new if l.nil?
             h = {
                 :matches => [],
                 :enlapsed_seconds => 0,
@@ -310,8 +289,8 @@ module BlackStack
 
         # Find a company in the indexes by its first name, last name and company name.
         # Append all the information in the index row.
-        def self.find_persons_by_company(cname)
-            l = BlackStack::Appending.logger || BlackStack::DummyLogger.new
+        def self.find_persons_by_company(cname, l=nil)
+            l = BlackStack::DummyLogger.new if l.nil?
             h = {
                 :matches => [],
                 :enlapsed_seconds => 0,
@@ -339,8 +318,8 @@ module BlackStack
             h[:matches].map { |m| BlackStack::Appending::Result.new(m) }
         end
 
-        def self.find_verified_emails_with_full_name(name, cname)
-            l = BlackStack::Appending.logger || BlackStack::DummyLogger.new
+        def self.find_verified_emails_with_full_name(name, cname, l=nil)
+            l = BlackStack::DummyLogger.new if l.nil?
 
             l.logs "Guessing fname from #{name}... "
             fname = BlackStack::Appending::cleanup_fname(name)
@@ -350,25 +329,27 @@ module BlackStack
             lname = BlackStack::Appending::cleanup_lname(name)
             l.logf lname
 
-            BlackStack::Appending.find_verified_emails(fname, lname, cname)
+            BlackStack::Appending.find_verified_emails(fname, lname, cname, l)
         end
 
-        def self.find_verified_emails(fname, lname, cname)
-            l = BlackStack::Appending.logger || BlackStack::DummyLogger.new
+        def self.find_verified_emails(fname, lname, cname, l=nil)
+            l = BlackStack::DummyLogger.new if l.nil?
             emails = []
             domains = []
             verified_emails = []
             # get lead emails from in the indexes
             l.logs ("Searching index emails... ")
-                emails = BlackStack::Appending.find_persons(fname, lname, cname).map { |res| 
+                emails = BlackStack::Appending.find_persons(fname, lname, cname, l).map { |res| 
                     res.emails 
                 }.flatten.uniq.reject { |email|
                     email.to_s.empty?
-                }
-            l.done
+                }.uniq
+            # remove duplications
+            emails = emails.map { |email| email.to_s.downcase.strip }.uniq
+            l.logf "done (#{emails.to_s})"
             # get company domains from the indexes
             l.logs ("Searching index domains... ")
-                domains = BlackStack::Appending.find_persons_by_company(cname).map { |res| 
+                domains = BlackStack::Appending.find_persons_by_company(cname, l).map { |res| 
                     res.company_domains
                 }.flatten.reject { |email|
                     email.to_s.empty?
@@ -376,22 +357,51 @@ module BlackStack
                     # normalize domain
                     domain.to_s.gsub('www.', '').downcase
                 }.uniq
-            l.done
+            # remove duplications
+            domains = domains.map { |domain| domain.to_s.downcase.strip }.uniq
+            l.logf "done (#{domains.to_s})"
+            # add emails using fname and lname and company domains
+            # if the domain has not a catch-all address, then add all possible email variations to the array `emails`.
+            # if the domain has a catch-all address, then remove all emails with such a domain from the array `emails`.
+            l.logs ("Building list of candidates... ")
+            domains.each { |domain|
+                if !BlackStack::Appending.catch_all?(domain)
+                    emails += [
+                        "#{fname}@#{domain}",
+                        "#{lname}@#{domain}",
+                        "#{fname}.#{lname}@#{domain}",
+                        "#{lname}.#{fname}@#{domain}",
+                        "#{fname}#{lname}@#{domain}",
+                        "#{lname}#{fname}@#{domain}",
+                        "#{fname[0]}#{lname}@#{domain}",
+                        "#{fname[0]}.#{lname}@#{domain}",
+                    ]
+                else
+                    emails = emails.reject { |email| email =~ /@#{domain}$/ } 
+                end
+            }
+            # delete duplicates
+            emails.uniq!
+            l.logf "done (#{emails.to_s})"
             # verify all the emails found in the indexes
-            l.logs ("Verifying index emails... ")
+            l.logs ("Verifying emails... ")
             emails.each { |email|
                 l.logs "Verifying #{email}... "
-                domain = email.split('@').last
-                verified_emails << email if BlackStack::Appending.verify(email) && !BlackStack::Appending.catch_all?(domain)
+                verified_emails << email if BlackStack::Appending.verify(email)
                 l.done
+                break if verified_emails.size > 0
             }
             l.done
-            # appending with domains found in the indexes
-            l.logs ("Appending with domains... ")
-            domains.each { |domain|
-                l.logs "Appending with #{domain}... "
-                verified_emails += BlackStack::Appending.append(fname, lname, domain)
-                l.done
+            # verify all the emails found in the indexes
+            l.logs ("Double check emails... ")
+            verified_emails.each { |email|
+                l.logs "Double-checking #{email}... "
+                if BlackStack::Appending.verify(email)
+                    l.logf 'keep'
+                else
+                    verified_emails.delete(email)
+                    l.logf "removed"
+                end
             }
             l.done
             # return 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appending
 version: !ruby/object:Gem::Version
-  version: '1.4'
+  version: 1.4.2
 platform: ruby
 authors:
 - Leandro Daniel Sardi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-20 00:00:00.000000000 Z
+date: 2023-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: csv