valid_email2 7.0.0 → 7.0.9

data/gemfiles/activemodel8.gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem 'activemodel', '~> 8.0'
+
+gemspec path: '../'

data/lib/valid_email2/address.rb

@@ -1,9 +1,8 @@
 # frozen_string_literal:true
 
 require "valid_email2"
-require "resolv"
 require "mail"
-require "valid_email2/dns_records_cache"
+require "valid_email2/dns"
 
 module ValidEmail2
   class Address
@@ -29,11 +28,10 @@ module ValidEmail2
       @permitted_multibyte_characters_regex = val
     end
 
-    def initialize(address, dns_timeout = 5, dns_nameserver = nil)
+    def initialize(address, dns = Dns.new)
       @parse_error = false
       @raw_address = address
-      @dns_timeout = dns_timeout
-      @dns_nameserver = dns_nameserver
+      @dns = dns
 
       begin
         @address = Mail::Address.new(address)
@@ -103,14 +101,14 @@ module ValidEmail2
       return false unless valid?
       return false if null_mx?
 
-      mx_or_a_servers.any?
+      @dns.mx_servers(address.domain).any? || @dns.a_servers(address.domain).any?
     end
 
     def valid_strict_mx?
       return false unless valid?
       return false if null_mx?
 
-      mx_servers.any?
+      @dns.mx_servers(address.domain).any?
     end
 
     private
@@ -126,7 +124,7 @@ module ValidEmail2
     end
 
     def mx_server_is_in?(domain_list)
-      mx_servers.any? { |mx_server|
+      @dns.mx_servers(address.domain).any? { |mx_server|
         return false unless mx_server.respond_to?(:exchange)
 
         mx_server = mx_server.exchange.to_s
@@ -145,41 +143,9 @@ module ValidEmail2
       @raw_address.each_char.any? { |char| char.bytesize > 1 && char !~ self.class.permitted_multibyte_characters_regex }
     end
 
-    def resolv_config
-      @resolv_config ||= begin
-        config = Resolv::DNS::Config.default_config_hash
-        config[:nameserver] = @dns_nameserver if @dns_nameserver
-        config
-      end
-
-      @resolv_config
-    end
-
-    def mx_servers
-      @mx_servers_cache ||= ValidEmail2::DnsRecordsCache.new
-
-      @mx_servers_cache.fetch(address.domain.downcase) do
-        Resolv::DNS.open(resolv_config) do |dns|
-          dns.timeouts = @dns_timeout
-          dns.getresources(address.domain, Resolv::DNS::Resource::IN::MX)
-        end
-      end
-    end
-
     def null_mx?
+      mx_servers = @dns.mx_servers(address.domain)
       mx_servers.length == 1 && mx_servers.first.preference == 0 && mx_servers.first.exchange.length == 0
     end
-
-    def mx_or_a_servers
-      @mx_or_a_servers_cache ||= ValidEmail2::DnsRecordsCache.new
-
-      @mx_or_a_servers_cache.fetch(address.domain.downcase) do
-        Resolv::DNS.open(resolv_config) do |dns|
-          dns.timeouts = @dns_timeout
-          (mx_servers.any? && mx_servers) ||
-            dns.getresources(address.domain, Resolv::DNS::Resource::IN::A)
-        end
-      end
-    end
   end
 end

data/lib/valid_email2/dns.rb

@@ -0,0 +1,71 @@
+require "resolv"
+
+module ValidEmail2
+  class Dns
+    MAX_CACHE_SIZE = 1_000
+    CACHE = {}
+
+    CacheEntry = Struct.new(:records, :cached_at, :ttl)
+
+    def self.prune_cache
+      entries_sorted_by_cached_at_asc = CACHE.sort_by { |key, data| data.cached_at }
+      entries_to_remove = entries_sorted_by_cached_at_asc.first(CACHE.size - MAX_CACHE_SIZE)
+      entries_to_remove.each { |key, _value| CACHE.delete(key) }
+    end
+
+    def self.clear_cache
+      CACHE.clear
+    end
+
+    def initialize(dns_timeout = 5, dns_nameserver = nil)
+      @dns_timeout = dns_timeout
+      @dns_nameserver = dns_nameserver
+    end
+
+    def mx_servers(domain)
+      fetch(domain, Resolv::DNS::Resource::IN::MX)
+    end
+
+    def a_servers(domain)
+      fetch(domain, Resolv::DNS::Resource::IN::A)
+    end
+
+    private
+
+    def prune_cache
+      self.class.prune_cache
+    end
+
+    def fetch(domain, type)
+      prune_cache if CACHE.size > MAX_CACHE_SIZE
+
+      domain = domain.downcase
+      cache_key = [domain, type]
+      cache_entry = CACHE[cache_key]
+
+      if cache_entry && Time.now - cache_entry.cached_at < cache_entry.ttl
+        return cache_entry.records
+      else
+        CACHE.delete(cache_key)
+      end
+
+      records = Resolv::DNS.open(resolv_config) do |dns|
+        dns.timeouts = @dns_timeout
+        dns.getresources(domain, type)
+      end
+
+      if records.any?
+        ttl = records.map(&:ttl).min
+        CACHE[cache_key] = CacheEntry.new(records, Time.now, ttl)
+      end
+
+      records
+    end
+
+    def resolv_config
+      config = Resolv::DNS::Config.default_config_hash
+      config[:nameserver] = @dns_nameserver if @dns_nameserver
+      config
+    end
+  end
+end

data/lib/valid_email2/email_validator.rb

@@ -1,4 +1,5 @@
 require "valid_email2/address"
+require "logger" # Fix concurrent-ruby removing logger dependency which Rails itself does not have
 require "active_model"
 require "active_model/validations"
 
@@ -12,7 +13,8 @@ module ValidEmail2
       return unless value.present?
       options = default_options.merge(self.options)
 
-      addresses = sanitized_values(value).map { |v| ValidEmail2::Address.new(v, options[:dns_timeout], options[:dns_nameserver]) }
+      dns = ValidEmail2::Dns.new(options[:dns_timeout], options[:dns_nameserver])
+      addresses = sanitized_values(value).map { |v| ValidEmail2::Address.new(v, dns) }
 
       error(record, attribute) && return unless addresses.all?(&:valid?)
 

data/lib/valid_email2/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal:true
 
 module ValidEmail2
-  VERSION = "7.0.0"
+  VERSION = "7.0.9"
 end

data/spec/address_spec.rb

@@ -3,6 +3,10 @@
 require "spec_helper"
 
 describe ValidEmail2::Address do
+  before do
+    ValidEmail2::Dns.clear_cache
+  end
+
   describe "#valid?" do
     it "is valid" do
       address = described_class.new("foo@bar123.com")
@@ -58,8 +62,8 @@ describe ValidEmail2::Address do
 
   describe "caching" do
     let(:email_address) { "example@ymail.com" }
-    let(:email_instance) { described_class.new(email_address) }
-    let(:dns_records_cache_instance) { ValidEmail2::DnsRecordsCache.new }
+    let(:dns_instance) { ValidEmail2::Dns.new }
+    let(:email_instance) { described_class.new(email_address, dns_instance) }
     let(:ttl) { 1_000 }
     let(:mock_resolv_dns) { instance_double(Resolv::DNS) }
     let(:mock_mx_records) { [double("MX", exchange: "mx.ymail.com", preference: 10, ttl: ttl)] }
@@ -72,7 +76,7 @@ describe ValidEmail2::Address do
 
     describe "#valid_strict_mx?" do
       let(:cached_at) { Time.now }
-      let(:mock_cache_data) { { email_instance.address.domain => { records: mock_mx_records, cached_at: cached_at, ttl: ttl } } }
+      let(:mock_cache_data) { { [email_instance.address.domain, Resolv::DNS::Resource::IN::MX] => ValidEmail2::Dns::CacheEntry.new(mock_mx_records, cached_at, ttl) } }
 
       before do
         allow(mock_resolv_dns).to receive(:getresources)
@@ -108,9 +112,9 @@ describe ValidEmail2::Address do
 
       describe "ttl" do
         before do
-          dns_records_cache_instance.instance_variable_set(:@cache, mock_cache_data)
-          allow(ValidEmail2::DnsRecordsCache).to receive(:new).and_return(dns_records_cache_instance)
-          allow(dns_records_cache_instance).to receive(:fetch).with(email_instance.address.domain).and_call_original
+          stub_const("ValidEmail2::Dns::CACHE", mock_cache_data)
+          allow(ValidEmail2::Dns).to receive(:new).and_return(dns_instance)
+          allow(dns_instance).to receive(:fetch).with(email_instance.address.domain, Resolv::DNS::Resource::IN::MX).and_call_original
         end
 
         context "when the time since last lookup is less than the cached ttl entry" do
@@ -136,18 +140,18 @@ describe ValidEmail2::Address do
 
       describe "cache size" do
         before do
-          dns_records_cache_instance.instance_variable_set(:@cache, mock_cache_data)
-          allow(ValidEmail2::DnsRecordsCache).to receive(:new).and_return(dns_records_cache_instance)
-          allow(dns_records_cache_instance).to receive(:fetch).with(email_instance.address.domain).and_call_original
+          stub_const("ValidEmail2::Dns::CACHE", mock_cache_data)
+          allow(ValidEmail2::Dns).to receive(:new).and_return(dns_instance)
+          allow(dns_instance).to receive(:fetch).with(email_instance.address.domain, Resolv::DNS::Resource::IN::MX).and_call_original
         end
 
         context "when the cache size is less than or equal to the max cache size" do
           before do
-            stub_const("ValidEmail2::DnsRecordsCache::MAX_CACHE_SIZE", 1)
+            stub_const("ValidEmail2::Dns::MAX_CACHE_SIZE", 1)
           end
 
           it "does not prune the cache" do
-            expect(dns_records_cache_instance).not_to receive(:prune_cache)
+            expect(dns_instance).not_to receive(:prune_cache)
 
             email_instance.valid_strict_mx?
           end
@@ -159,42 +163,40 @@ describe ValidEmail2::Address do
           end
 
           context "and there are older cached entries" do
-            let(:mock_cache_data) { { "another_domain.com" => { records: mock_mx_records, cached_at: cached_at - 100, ttl: ttl } } }
+            let(:mock_cache_data) { { ["another_domain.com", Resolv::DNS::Resource::IN::MX] => ValidEmail2::Dns::CacheEntry.new(mock_mx_records, cached_at - 100, ttl) } }
 
             it "does not prune those entries" do
               email_instance.valid_strict_mx?
 
-              expect(dns_records_cache_instance.instance_variable_get(:@cache).keys.size).to eq 2
-              expect(dns_records_cache_instance.instance_variable_get(:@cache).keys).to match_array([email_instance.address.domain, "another_domain.com"])
+              expect(ValidEmail2::Dns::CACHE.keys).to match_array([[email_instance.address.domain, Resolv::DNS::Resource::IN::MX], ["another_domain.com", Resolv::DNS::Resource::IN::MX]])
             end
           end
         end
 
         context "when the cache size is greater than the max cache size" do
           before do
-            stub_const("ValidEmail2::DnsRecordsCache::MAX_CACHE_SIZE", 0)
+            stub_const("ValidEmail2::Dns::MAX_CACHE_SIZE", 0)
           end
 
           it "prunes the cache" do
-            expect(dns_records_cache_instance).to receive(:prune_cache).once
+            expect(dns_instance).to receive(:prune_cache).once
 
             email_instance.valid_strict_mx?
           end
 
-          it "calls the the MX servers lookup" do    
+          it "calls the the MX servers lookup" do
             email_instance.valid_strict_mx?
 
             expect(Resolv::DNS).to have_received(:open).once
           end
 
           context "and there are older cached entries" do
-            let(:mock_cache_data) { { "another_domain.com" => { records: mock_mx_records, cached_at: cached_at - 100, ttl: ttl } } }
+            let(:mock_cache_data) { { ["another_domain.com", Resolv::DNS::Resource::IN::MX] => ValidEmail2::Dns::CacheEntry.new(mock_mx_records, cached_at - 100, ttl) } }
 
             it "prunes those entries" do
               email_instance.valid_strict_mx?
 
-              expect(dns_records_cache_instance.instance_variable_get(:@cache).keys.size).to eq 1
-              expect(dns_records_cache_instance.instance_variable_get(:@cache).keys).to match_array([email_instance.address.domain])
+              expect(ValidEmail2::Dns::CACHE.keys).to match_array([[email_instance.address.domain, Resolv::DNS::Resource::IN::MX]])
             end
           end
         end
@@ -203,13 +205,13 @@ describe ValidEmail2::Address do
 
     describe "#valid_mx?" do
       let(:cached_at) { Time.now }
-      let(:mock_cache_data) { { email_instance.address.domain => { records: mock_a_records, cached_at: cached_at, ttl: ttl } } }
+      let(:mock_cache_data) { { [email_instance.address.domain, Resolv::DNS::Resource::IN::MX] => ValidEmail2::Dns::CacheEntry.new(mock_a_records, cached_at, ttl) } }
       let(:mock_a_records) { [double("A", address: "192.168.1.1", ttl: ttl)] }
 
       before do
         allow(email_instance).to receive(:mx_servers).and_return(mock_mx_records)
         allow(mock_resolv_dns).to receive(:getresources)
-          .with(email_instance.address.domain, Resolv::DNS::Resource::IN::A)
+          .with(email_instance.address.domain, Resolv::DNS::Resource::IN::MX)
           .and_return(mock_a_records)
       end
 
@@ -241,9 +243,9 @@ describe ValidEmail2::Address do
 
       describe "ttl" do
         before do
-          dns_records_cache_instance.instance_variable_set(:@cache, mock_cache_data)
-          allow(ValidEmail2::DnsRecordsCache).to receive(:new).and_return(dns_records_cache_instance)
-          allow(dns_records_cache_instance).to receive(:fetch).with(email_instance.address.domain).and_call_original
+          stub_const("ValidEmail2::Dns::CACHE", mock_cache_data)
+          allow(ValidEmail2::Dns).to receive(:new).and_return(dns_instance)
+          allow(dns_instance).to receive(:fetch).with(email_instance.address.domain, Resolv::DNS::Resource::IN::MX).and_call_original
         end
 
         context "when the time since last lookup is less than the cached ttl entry" do
@@ -269,14 +271,14 @@ describe ValidEmail2::Address do
 
       describe "cache size" do
         before do
-          dns_records_cache_instance.instance_variable_set(:@cache, mock_cache_data)
-          allow(ValidEmail2::DnsRecordsCache).to receive(:new).and_return(dns_records_cache_instance)
-          allow(dns_records_cache_instance).to receive(:fetch).with(email_instance.address.domain).and_call_original
+          stub_const("ValidEmail2::Dns::CACHE", mock_cache_data)
+          allow(ValidEmail2::Dns).to receive(:new).and_return(dns_instance)
+          allow(dns_instance).to receive(:fetch).with(email_instance.address.domain, Resolv::DNS::Resource::IN::MX).and_call_original
         end
 
         context "when the cache size is less than or equal to the max cache size" do
           before do
-            stub_const("ValidEmail2::DnsRecordsCache::MAX_CACHE_SIZE", 1)
+            stub_const("ValidEmail2::Dns::MAX_CACHE_SIZE", 1)
           end
 
           it "does not prune the cache" do
@@ -292,24 +294,23 @@ describe ValidEmail2::Address do
           end
 
           context "and there are older cached entries" do
-            let(:mock_cache_data) { { "another_domain.com" => { records: mock_a_records, cached_at: cached_at - 100, ttl: ttl } } }
+            let(:mock_cache_data) { { ["another_domain.com", Resolv::DNS::Resource::IN::MX] => ValidEmail2::Dns::CacheEntry.new(mock_a_records, cached_at - 100, ttl) } }
 
             it "does not prune those entries" do
               email_instance.valid_mx?
 
-              expect(dns_records_cache_instance.instance_variable_get(:@cache).keys.size).to eq 2
-              expect(dns_records_cache_instance.instance_variable_get(:@cache).keys).to match_array([email_instance.address.domain, "another_domain.com"])
+              expect(ValidEmail2::Dns::CACHE.keys).to match_array([[email_instance.address.domain, Resolv::DNS::Resource::IN::MX], ["another_domain.com", Resolv::DNS::Resource::IN::MX]])
             end
           end
         end
 
         context "when the cache size is greater than the max cache size" do
           before do
-            stub_const("ValidEmail2::DnsRecordsCache::MAX_CACHE_SIZE", 0)
+            stub_const("ValidEmail2::Dns::MAX_CACHE_SIZE", 0)
           end
 
-          it "prunes the cache" do 
-            expect(dns_records_cache_instance).to receive(:prune_cache).once 
+          it "prunes the cache" do
+            expect(dns_instance).to receive(:prune_cache).once
 
             email_instance.valid_mx?
           end
@@ -321,17 +322,16 @@ describe ValidEmail2::Address do
           end
 
           context "and there are older cached entries" do
-            let(:mock_cache_data) { { "another_domain.com" => { records: mock_a_records, cached_at: cached_at - 100, ttl: ttl } } }
+            let(:mock_cache_data) { { ["another_domain.com", Resolv::DNS::Resource::IN::MX] => ValidEmail2::Dns::CacheEntry.new(mock_a_records, cached_at - 100, ttl) } }
 
             it "prunes those entries" do
               email_instance.valid_mx?
 
-              expect(dns_records_cache_instance.instance_variable_get(:@cache).keys.size).to eq 1
-              expect(dns_records_cache_instance.instance_variable_get(:@cache).keys).to match_array([email_instance.address.domain])
+              expect(ValidEmail2::Dns::CACHE.keys).to match_array([[email_instance.address.domain, Resolv::DNS::Resource::IN::MX]])
             end
           end
         end
-      end    
+      end
     end
   end
 end

data/spec/dns_spec.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe ValidEmail2::Dns do
+  describe "#mx_servers" do
+    it "gets a record" do
+      dns = described_class.new
+      records = dns.mx_servers("gmail.com")
+      expect(records.size).to_not be_zero
+    end
+  end
+
+  describe "#a_servers" do
+    it "gets a record" do
+      dns = described_class.new
+      records = dns.a_servers("gmail.com")
+      expect(records.size).to_not be_zero
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,5 +1,6 @@
 $:.unshift File.expand_path("../lib",__FILE__)
 require "valid_email2"
+require "debug"
 
 # Include and configure  benchmark
 require 'rspec-benchmark'

data/spec/valid_email2_spec.rb

@@ -76,6 +76,9 @@ class TestUserMultiple < TestModel
 end
 
 describe ValidEmail2 do
+  before do
+    ValidEmail2::Dns.clear_cache
+  end
 
   let(:disposable_domain) { ValidEmail2.disposable_emails.first }
 

data/valid_email2.gemspec

@@ -22,10 +22,11 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 12.3"
+  spec.add_development_dependency "securerandom", "0.3.1" # https://github.com/micke/valid_email2/actions/runs/13325070756/job/37216488894
   spec.add_development_dependency "rspec", "~> 3.5"
   spec.add_development_dependency "rspec-benchmark", "~> 0.6"
   spec.add_development_dependency "net-smtp"
-  spec.add_development_dependency "pry"
+  spec.add_development_dependency "debug"
   spec.add_runtime_dependency "mail", "~> 2.5"
   spec.add_runtime_dependency "activemodel", ">= 6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: valid_email2
 version: !ruby/object:Gem::Version
-  version: 7.0.0
+  version: 7.0.9
 platform: ruby
 authors:
 - Micke Lisinge
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-19 00:00:00.000000000 Z
+date: 2025-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '12.3'
+- !ruby/object:Gem::Dependency
+  name: securerandom
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.3.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -81,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: debug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -144,15 +158,17 @@ files:
 - config/disposable_email_domains.txt
 - gemfiles/activemodel6.gemfile
 - gemfiles/activemodel7.gemfile
+- gemfiles/activemodel8.gemfile
 - lib/valid_email2.rb
 - lib/valid_email2/address.rb
-- lib/valid_email2/dns_records_cache.rb
+- lib/valid_email2/dns.rb
 - lib/valid_email2/email_validator.rb
 - lib/valid_email2/version.rb
 - pull_mailchecker_emails.rb
 - release-please-config.json
 - spec/address_spec.rb
 - spec/benchmark_spec.rb
+- spec/dns_spec.rb
 - spec/spec_helper.rb
 - spec/valid_email2_spec.rb
 - valid_email2.gemspec
@@ -160,7 +176,7 @@ homepage: https://github.com/micke/valid_email2
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -176,12 +192,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.5.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: ActiveModel validation for email. Including MX lookup and disposable email
   deny list
 test_files:
 - spec/address_spec.rb
 - spec/benchmark_spec.rb
+- spec/dns_spec.rb
 - spec/spec_helper.rb
 - spec/valid_email2_spec.rb

data/lib/valid_email2/dns_records_cache.rb

@@ -1,37 +0,0 @@
-module ValidEmail2
-  class DnsRecordsCache
-    MAX_CACHE_SIZE = 1_000
-
-    def initialize
-      # Cache structure: { domain (String): { records: [], cached_at: Time, ttl: Integer } }
-      @cache = {}
-    end
-
-    def fetch(domain, &block)
-      prune_cache if @cache.size > MAX_CACHE_SIZE
-
-      cache_entry = @cache[domain]
-
-      if cache_entry && (Time.now - cache_entry[:cached_at]) < cache_entry[:ttl]
-        return cache_entry[:records]
-      else
-        @cache.delete(domain)
-      end
-
-      records = block.call
-
-      if records.any?
-        ttl = records.map(&:ttl).min
-        @cache[domain] = { records: records, cached_at: Time.now, ttl: ttl }
-      end
-
-      records
-    end
-
-    def prune_cache
-      entries_sorted_by_cached_at_asc = (@cache.sort_by { |_domain, data| data[:cached_at] }).flatten
-      entries_to_remove = entries_sorted_by_cached_at_asc.first(@cache.size - MAX_CACHE_SIZE)
-      entries_to_remove.each { |domain| @cache.delete(domain) }
-    end
-  end
-end