BYOB

Author: phoet

.rubocop.yml

@@ -15,3 +15,5 @@ Style/StringLiterals:
   EnforcedStyle: double_quotes
 Gemspec/OrderedDependencies:
   Enabled: no
+Metrics/BlockLength:
+  Enabled: no

README.md

@@ -145,11 +145,10 @@ If you want to allow multibyte characters, set it explicitly.
 ValidEmail2::Address.permitted_multibyte_characters_regex = /[ÆæØøÅåÄäÖöÞþÐð]/
 ```
 
-If you want to allow load any of the lists dynamically
+If you want to allow load any of the lists dynamically:
 
 ```ruby
-ValidEmail2.reset_lists # reset the content
-# make sure to use a Set for speedy access
+# make sure to use a Set for speedy access and cache the result
 ValidEmail2.disposable_emails = -> { Set.new(['your.com']) }
 ValidEmail2.deny_list = -> { Set.new(['data.com']) }
 ValidEmail2.allow_list = -> { Set.new(['provided.com']) }

lib/valid_email2.rb

@@ -7,25 +7,27 @@ module ValidEmail2
   ALLOW_LIST_FILE  = "config/allow_listed_email_domains.yml"
   DISPOSABLE_FILE = File.expand_path('../config/disposable_email_domains.txt', __dir__)
 
-  class << self
-    attr_accessor :disposable_proc, :deny_proc, :allow_proc
-
-    def reset_lists
-      @disposable_emails = nil
-      @deny_list = nil
-      @allow_list = nil
-    end
+  cattr_accessor :disposable_proc do
+    -> { @disposable_emails ||= load_file(DISPOSABLE_FILE) }
+  end
+  cattr_accessor :deny_proc do
+    -> { @deny_list ||= load_if_exists(DENY_LIST_FILE) || Set.new }
+  end
+  cattr_accessor :allow_proc do
+    -> { @allow_list ||= load_if_exists(ALLOW_LIST_FILE) || Set.new }
+  end
 
+  class << self
     def disposable_emails
-      @disposable_emails ||= disposable_proc&.call || load_file(DISPOSABLE_FILE)
+      disposable_proc&.call
     end
 
     def deny_list
-      @deny_list ||= deny_proc&.call || load_if_exists(DENY_LIST_FILE) || Set.new
+      deny_proc&.call
     end
 
     def allow_list
-      @allow_list ||= allow_proc&.call || load_if_exists(ALLOW_LIST_FILE) || Set.new
+      allow_proc&.call
     end
 
     private

spec/valid_email2_spec.rb

@@ -275,10 +275,19 @@ def set_allow_list
       user = TestUserDisallowDenyListed.new(email: "foo@deny-listed-test.com")
       expect(user.valid?).to be_falsey
     end
+  end
+
+  describe "with deny list validation" do
+    before do
+      @old_proc = ValidEmail2.deny_proc
+    end
+
+    after do
+      ValidEmail2.deny_proc = @old_proc
+    end
 
     it "is invalid if the domain is deny-listed from a proc" do
-      ValidEmail2.deny_proc = -> { Set.new(['dubbi.com']) }
-      ValidEmail2.reset_lists
+      ValidEmail2.deny_proc = -> { @deny_list ||= Set.new(['dubbi.com']) }
       user = TestUserDisallowDenyListed.new(email: "foo@dubbi.com")
       expect(user.valid?).to be_falsey
     end