email_address 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a0acf217d99455d8e47f25dc21b4ff25478234932c8618f3d5fe0fe4629e433
-  data.tar.gz: 5da4449168ec63611c8e510efd010b12995502b3162c67d3222c46cbabbbe6e8
+  metadata.gz: f6fb959ca75da2d73ed378a3b2f97b4dceead14d634cf24ff5ce18c5a52f0e4a
+  data.tar.gz: 47dd7dcb50a3e11b99d2be141dc1e3737b41b7a2b0f13ec80fb83ef59bc68d15
 SHA512:
-  metadata.gz: 1703377fdf988adabaaf4d728db211320a1f33cf0daeeabd68448cf4a4d02b8647fcb9aad636d0aa14250386b8c8d2ede3cb89b42b55ffa2af793b1f788a9a08
-  data.tar.gz: 15d5b84368e692e6ce08db5ad596ec1ef684f87c70a8db4d1a2d69ab977c72ed5b5f80d9945fc6cdf42af3af5581a9f3a55b26c9138370ce228ad663c758f387
+  metadata.gz: '097d2fa911cef5a006f7280e569107fcba3c18a025597fc89a18fb542e49bb4603efd1bae6ad39d68f9514ed26b27ea4e7890f018a32fa7e6d80ee608ebb6f4e'
+  data.tar.gz: 1c688907c73eb2dad9d64793fda1f2a8baece32f694710f9384a50cb92584c59b169f425d776e7d85a918d17cdcd5995f063fe8143f559d27241103f8e6114d5

data/lib/email_address/active_record_validator.rb

@@ -28,16 +28,16 @@ module EmailAddress
         @opt[:fields].each { |f| validate_email(r, f) }
       elsif @opt[:field]
         validate_email(r, @opt[:field])
-      elsif r.respond_to? :email
-        validate_email(r, :email)
-      elsif r.respond_to? :email_address
-        validate_email(r, :email_address)
+      else
+        validate_email(r, :email) || validate_email(r, :email_address)
       end
     end
 
     def validate_email(r, f)
-      return if r[f].nil?
-      e = Address.new(r[f])
+      v = field_value(r, f)
+      return if v.nil?
+
+      e = Address.new(v)
       unless e.valid?
         error_code = @opt[:code] || :invalid_address
         error_message = @opt[:message] ||
@@ -46,5 +46,17 @@ module EmailAddress
         r.errors.add(f, error_code, message: error_message)
       end
     end
+
+    def field_value(r, f)
+      if r.respond_to?(f)
+        r.send(f)
+      elsif r[f]
+        r[f]
+      else
+        nil
+      end
+    rescue NoMethodError
+      nil
+    end
   end
 end

data/lib/email_address/host.rb

@@ -36,7 +36,7 @@ module EmailAddress
     MAX_HOST_LENGTH = 255
 
     # Sometimes, you just need a Regexp...
-    DNS_HOST_REGEX = / [\p{L}\p{N}]+ (?: (?: -{1,2} | \.) [\p{L}\p{N}]+ )*/x
+    DNS_HOST_REGEX = / [\p{L}\p{N}]+ (?: (?: -{1,3} | \.) [\p{L}\p{N}]+ )*/x
 
     # The IPv4 and IPv6 were lifted from Resolv::IPv?::Regex and tweaked to not
     # \A...\z anchor at the edges.

data/lib/email_address/version.rb

@@ -1,3 +1,3 @@
 module EmailAddress
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

data/test/activerecord/test_ar.rb

@@ -34,4 +34,14 @@ class TestAR < MiniTest::Test
       end
     end
   end
+
+  def test_store_accessor_valid_email
+    user = User.new(support_email: "test@gmail.com")
+    assert user.valid?
+  end
+
+  def test_store_accessor_invalid_email
+    user = User.new(support_email: "this_is_not_an_email")
+    assert_equal false, user.valid?
+  end
 end

data/test/activerecord/user.rb

@@ -45,6 +45,8 @@ end
 ################################################################################
 
 class User < ApplicationRecord
+  store :settings, accessors: [ :support_email ], coder: JSON
+
   if defined?(ActiveRecord) && ::ActiveRecord::VERSION::MAJOR >= 5
     attribute :email, :email_address
     attribute :canonical_email, :canonical_email_address
@@ -52,7 +54,7 @@ class User < ApplicationRecord
   end
 
   validates_with EmailAddress::ActiveRecordValidator,
-    fields: %i[email canonical_email]
+    fields: %i[email canonical_email support_email]
   validates_with EmailAddress::ActiveRecordValidator,
     field: :alternate_email, code: :some_error_code, message: "Check your email"
 

data/test/email_address/test_host.rb

@@ -161,4 +161,9 @@ class TestHost < MiniTest::Test
     assert !EmailAddress::Host.new("zaboz.com").valid?
     assert EmailAddress::Host.new("zaboz.com", dns_lookup: :a).valid?
   end
+
+  # Issue #102 off---white.com should be valid 
+  def test_triple_dash_domain 
+    assert EmailAddress::Host.new("off---white.com").valid?
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: email_address
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Allen Fair
 bindir: bin
 cert_chain: []
-date: 2025-01-09 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -263,7 +263,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.9
 specification_version: 4
 summary: This gem provides a ruby language library for working with and validating
   email addresses. By default, it validates against conventional usage, the format