valid_email2 6.0.0 → 7.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0296ec313cffb7390cb7ca2b22d48f15854bbb1cc8dc1442b31389b7350f31b
-  data.tar.gz: 11da87b6097bdc4df988d16045809dc42336b68b2f4fdf087a1ad38013619061
+  metadata.gz: 18dccc719c18b67299952ce4096d4b1c0184810985015dacfc883d7b7dcb021f
+  data.tar.gz: c3a7f37eceb1dde232850accbd1fed04ba73cff1a899d4f12762f54d2d88a533
 SHA512:
-  metadata.gz: e6003807039faf5c307d53b2617adcc5c0a0e75055f560e48073ea9cc1d5093f50aba58f2cbe121cc913b99ba8df62789e11a59d236cd0b13b17ad800925e5a5
-  data.tar.gz: 981042cfa3c8a72f101ba40a3922a0a3c2c2aa26ea0635ac4beb0ce59917171ec0ff1126dde68c77edb42939e4618372960c88645f720ad588e6735a2c392baf
+  metadata.gz: b5276142248e94cc178345e6ea069fb1675003bd2aa011a732287b0cae349f0e43c2fe8a855080550286b373b0fec3359658555efb4b4de0cec0d22a2fff6f2e
+  data.tar.gz: '087ae98e571ac2eb9acbb0e1230f19e090f577d44e2d0eba75feb7fa2aeafa391848cb8eb86aca95c38e22a99b099ed702206f9bfa7232e6f4356a66ecceb040'

data/.release-please-manifest.json

@@ -1 +1 @@
-{".":"6.0.0"}
+{".":"7.0.0"}

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## [7.0.0](https://github.com/micke/valid_email2/compare/v6.0.0...v7.0.0) (2024-11-19)
+
+
+### ⚠ BREAKING CHANGES
+
+* revert allowing scandinavian characters by making allowed multibyte characters configurable ([#261](https://github.com/micke/valid_email2/issues/261))
+
+### Bug Fixes
+
+* revert allowing scandinavian characters by making allowed multibyte characters configurable ([#261](https://github.com/micke/valid_email2/issues/261)) ([cf6a1e9](https://github.com/micke/valid_email2/commit/cf6a1e9e28f78e0c6f3e3ea7e9160bf9194b45e6))
+
 ## [6.0.0](https://github.com/micke/valid_email2/compare/v5.3.0...v6.0.0) (2024-11-03)
 
 

data/README.md

@@ -128,6 +128,12 @@ address.valid_strict_mx? => true
 address.subaddressed? => false
 ```
 
+If you want to allow multibyte characters, set it explicitly.
+
+```ruby
+ValidEmail2::Address.permitted_multibyte_characters_regex = /[ÆæØøÅåÄäÖöÞþÐð]/
+```
+
 ### Test environment
 
 If you are validating `mx` then your specs will fail without an internet connection.

data/config/disposable_email_domains.txt

@@ -85654,6 +85654,7 @@ kwa-law.com
 kwa.xyz
 kwacollections.com
 kwadratowamaskar.pl
+kwalah.com
 kwalidd.cf
 kwangjinmold.com
 kwanj.ml
@@ -168874,4 +168875,4 @@ zzzmail.pl
 zzzpush.icu
 zzzz1717.com
 zzzzzzzzzzzzz.com
-zzzzzzzzzzzzz.com0-00.usa.cc
+zzzzzzzzzzzzz.com0-00.usa.cc

data/lib/valid_email2/address.rb

@@ -3,7 +3,6 @@
 require "valid_email2"
 require "resolv"
 require "mail"
-require "unicode/emoji"
 require "valid_email2/dns_records_cache"
 
 module ValidEmail2
@@ -22,6 +21,14 @@ module ValidEmail2
       @prohibited_domain_characters_regex = val
     end
 
+    def self.permitted_multibyte_characters_regex
+      @permitted_multibyte_characters_regex
+    end
+
+    def self.permitted_multibyte_characters_regex=(val)
+      @permitted_multibyte_characters_regex = val
+    end
+
     def initialize(address, dns_timeout = 5, dns_nameserver = nil)
       @parse_error = false
       @raw_address = address
@@ -34,7 +41,7 @@ module ValidEmail2
         @parse_error = true
       end
 
-      @parse_error ||= address_contain_emoticons?
+      @parse_error ||= address_contain_multibyte_characters?
     end
 
     def valid?
@@ -130,10 +137,12 @@ module ValidEmail2
       }
     end
 
-    def address_contain_emoticons?
+    def address_contain_multibyte_characters?
       return false if @raw_address.nil?
 
-      @raw_address.scan(Unicode::Emoji::REGEX).length >= 1
+      return false if @raw_address.ascii_only?
+
+      @raw_address.each_char.any? { |char| char.bytesize > 1 && char !~ self.class.permitted_multibyte_characters_regex }
     end
 
     def resolv_config

data/lib/valid_email2/version.rb

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

data/spec/address_spec.rb

@@ -34,9 +34,25 @@ describe ValidEmail2::Address do
       expect(address.valid?).to be false
     end
 
-    it "is valid if it contains special scandinavian characters" do
+    it "is invalid if it contains Japanese characters" do
+      address = described_class.new("あいうえお@example.com")
+      expect(address.valid?).to be false
+    end
+
+    it "is invalid if it contains special scandinavian characters" do
       address = described_class.new("jørgen@email.dk")
-      expect(address.valid?).to eq true
+      expect(address.valid?).to eq false
+    end
+
+    context "permitted_multibyte_characters_regex is set" do
+      before do
+        described_class.permitted_multibyte_characters_regex = /[ÆæØøÅåÄäÖöÞþÐð]/
+      end
+
+      it "is valid if it contains special scandinavian characters" do
+        address = described_class.new("jørgen@email.dk")
+        expect(address.valid?).to eq true
+      end
     end
   end
 

data/valid_email2.gemspec

@@ -28,5 +28,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "pry"
   spec.add_runtime_dependency "mail", "~> 2.5"
   spec.add_runtime_dependency "activemodel", ">= 6.0"
-  spec.add_runtime_dependency "unicode-emoji", "~> 3.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: valid_email2
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 7.0.0
 platform: ruby
 authors:
 - Micke Lisinge
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-11-03 00:00:00.000000000 Z
+date: 2024-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -122,20 +122,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '6.0'
-- !ruby/object:Gem::Dependency
-  name: unicode-emoji
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.7.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.7.0
 description: ActiveModel validation for email. Including MX lookup and disposable
   email deny list
 email: