can_has_validations 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98d343f6a4e3bded76cac6973926550938ba481bc9357585c3d83fb8427f48e1
-  data.tar.gz: dc5648966508e9db4ff6972475f1df6b813fa9beb7bd5b83192eb5483ad09e08
+  metadata.gz: eb1dc3533f35f980fd7061b9ac1aaa3b8cf4f9c43af0ed1d7d6d4fb898bf7931
+  data.tar.gz: 02d171105d2abf207de0a182e0f7a81344afafb0c8191d2e186929f4dfe0344a
 SHA512:
-  metadata.gz: 4b6bf6510a992f70ffb418010bc05ae0f97ddb181c7d0482c93ff87756abac7024b8c3e9cf32caee7cfefac7a93bf60b0292475732ea9dc3a39a2009196f6893
-  data.tar.gz: 4a157d72a5ec06a71e3e07a93e4f9fa009fedc7e637b4188d7a7aad2aadb3f55b612e94f3eb3a54dcd1581874ae646f001d00efa956e31e2eb65633b5551a276
+  metadata.gz: ef067e3db2f6f0d157390794db619f77048c3cce20951efd2ee17276be321fad01f9923c984b268f9d95db51235a1afb191d6d3d763cae245176adcc39e73f70
+  data.tar.gz: b46c618a0b3d4cea672626766b71944ccef2e2150495bbc2de06329edf4c1ff521e0903e18dde409404af7f32a0561887d6df45d3dba907906b8397e500a9b2f

data/lib/can_has_validations/validators/email_validator.rb

@@ -1,15 +1,54 @@
 # Ensure an attribute is generally formatted as an email.
 # eg: validates :user_email, email: true
 
+require_relative 'hostname_validator'
+
 module ActiveModel::Validations
   class EmailValidator < ActiveModel::EachValidator
 
-    EMAIL_REGEXP = /\A([a-z0-9._+-]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i
+    EMAIL_REGEXP       = /\A([a-z0-9._+-]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i
+    SEGMENT_REGEXP     = /\A[a-z0-9+_-]+\z/i
+    LABEL_REGEXP       = HostnameValidator::LABEL_REGEXP
+    FINAL_LABEL_REGEXP = HostnameValidator::FINAL_LABEL_REGEXP
 
     def validate_each(record, attribute, value)
-      unless value =~ EMAIL_REGEXP
+      unless email_valid?(value)
         record.errors.add(attribute, :invalid_email, options.merge(value: value))
       end
     end
+
+    def email_valid?(value)
+      recipient, domain = value.split('@', 2)
+      is_valid = true
+
+      recipient ||= ''
+      is_valid &&= recipient.length <= 255
+      is_valid &&= recipient !~ /\.\./
+      is_valid &&= !recipient.starts_with?('.') 
+      is_valid &&= !recipient.ends_with?('.') 
+      recipient.split('.').each do |segment|
+        is_valid &&= segment =~ SEGMENT_REGEXP
+      end
+
+      domain ||= ''
+      if defined?(Addressable::IDNA)
+        domain &&= Addressable::IDNA.to_ascii(domain)
+      end
+      labels = domain.split('.')
+      is_valid &&= domain.length <= 255
+      is_valid &&= domain !~ /\.\./
+      is_valid &&= labels.size.in? 2..100
+      labels.each_with_index do |label, idx|
+        is_valid &&= label.length <= 63
+        if idx+1==labels.size
+          is_valid &&= label =~ FINAL_LABEL_REGEXP
+        else
+          is_valid &&= label =~ LABEL_REGEXP
+        end
+      end
+
+      is_valid
+    end
+
   end
 end

data/lib/can_has_validations/version.rb

@@ -1,3 +1,3 @@
 module CanHasValidations
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: can_has_validations
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - thomas morgan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-16 00:00:00.000000000 Z
+date: 2019-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails