valid_email 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 066fc2f842dfd3d3afc0df730f7e44951a6692aa035b378036e2587731073dd1
-  data.tar.gz: a21522fd9b8453ff36fc960fdbcd916843fe3232a4a87f2528611f1d8f9f693c
+  metadata.gz: 912afd4576d829541b67adb5b5830c4c31d8bf7f7005092957a655f9dbcf07ba
+  data.tar.gz: a0647b0db0f921c5159c585fb2298211f1be85cafe138fd426ebf1ec5d32049d
 SHA512:
-  metadata.gz: f6dbf19e9942dacf1d749d3027d1d20e130a64c1418c7cae5e43165d0ddf304d46f02a530658760626af4cbe6cb686fcb30964bfd8512967e74c7599712c06cf
-  data.tar.gz: cd549c34b78c76ef33ed9e60b3d683706a6fde6bcf2e5dcf7223dbf26f46a7556bbcb3325e8a862f1708b80072fce0f5c4b2e8bef479178d9633ffabd8224ddd
+  metadata.gz: bc35a4b3adb7b092b9158dff8d2d2c16bd1e5cc5f59b91f521ea0cbfd30d0bd5c4c523f2990752486036fed8db8908566228eee18b7f3c282f7b9824cca0b1f2
+  data.tar.gz: 44233a8c92c72e597c3b10bdc052e17c1e8ead83c87dfab94103f7341d9b2b32348f555fbe4fdee2af0e474c7af92f253b3421fb4ed37aed779eabc30c1a9cbd

data/.travis.yml

@@ -1,15 +1,18 @@
-sudo: false
-language: ruby
+before_install:
+  - gem install bundler:1.17.3
 cache: bundler
+dist: xenial
+language: ruby
 rvm:
   - 1.9.3
-  - 2.0.0
+  - 2.0
   - 2.1
-  - 2.2.1
-  - 2.2.2
-  - 2.3.3
-  - 2.4.0
-  - jruby-19mode
-  - jruby-20mode
-before_install:
-  - gem install bundler:1.17.3
+  - 2.2
+  - 2.2
+  - 2.3
+  - 2.4
+  - 2.5
+  - 2.6
+  - 2.7
+  - 3.0
+  - jruby-head

data/README.md

@@ -1,98 +1,130 @@
-# Purpose
+# Valid Email
 
-It validates email for application use (registering a new account for example)
+## Purpose
 
-# Usage
+It validates email for application use (registering a new account for example).
 
-In your Gemfile :
-
-    gem 'valid_email'
+## Usage
 
+In your `Gemfile`:
+```ruby
+gem 'valid_email'
+```
 
-In your code :
+In your code:
+```ruby
+require 'valid_email'
 
-    require 'valid_email'
-    class Person
-      include ActiveModel::Validations
-      attr_accessor :name, :email
+class Person
+  include ActiveModel::Validations
+  attr_accessor :name, :email
 
-      validates :name, :presence => true, :length => { :maximum => 100 }
-      validates :email, :presence => true, :email => true
-    end
+  validates :name, presence: true, length: { maximum: 100 }
+  validates :email, presence: true, email: true
+end
 
 
-    p = Person.new
-    p.name = "hallelujah"
-    p.email = "john@doe.com"
-    p.valid? # => true
+person = Person.new
+person.name = 'hallelujah'
+person.email = 'john@doe.com'
+person.valid? # => true
 
-    p.email = "john@doe"
-    p.valid? # => false
+person.email = 'john@doe'
+person.valid? # => false
 
-    p.email = "John Does <john@doe.com>"
-    p.valid? # => false
+person.email = 'John Does <john@doe.com>'
+person.valid? # => false
+```
 
 You can check if email domain has MX record:
-
-    validates :email, :email => {:mx => true, :message => I18n.t('validations.errors.models.user.invalid_email')}
+```ruby
+validates :email,
+          email: {
+            mx: true,
+            message: I18n.t('validations.errors.models.user.invalid_email')
+          }
+```
 
 Or
 
-    validates :email, :email => {:message => I18n.t('validations.errors.models.user.invalid_email')}, :mx => {:message => I18n.t('validations.errors.models.user.invalid_mx')}
+```ruby
+validates :email,
+          email: {
+            message: I18n.t('validations.errors.models.user.invalid_email')
+          },
+          mx: {
+            message: I18n.t('validations.errors.models.user.invalid_mx')
+          }
+```
 
 By default, the email domain is validated using a regular expression, which does not require an external service and improves performance.
 Alternatively, you can check if an email domain has a MX or A record by using `:mx_with_fallback` instead of `:mx`.
 
-    validates :email, :email => {:mx_with_fallback => true}
+```ruby
+validates :email, email: { mx_with_fallback: true }
+```
 
 You can detect disposable accounts
 
-    validates :email, :email => {:ban_disposable_email => true, :message => I18n.t('validations.errors.models.user.invalid_email')}
+```ruby
+validates :email,
+          email: {
+            ban_disposable_email: true,
+            message: I18n.t('validations.errors.models.user.invalid_email')
+          }
+```
 
 If you don't want the MX validator stuff, just require the right file
 
-    require 'valid_email/email_validator'
-
-Or in your Gemfile
+```ruby
+require 'valid_email/email_validator'
+```
 
-    gem 'valid_email', :require => 'valid_email/email_validator'
+Or in your `Gemfile`
 
+```ruby
+gem 'valid_email', require: 'valid_email/email_validator'
+```
 
 ### Usage outside of model validation
-There is a chance that you want to use e-mail validator outside of model validation.  
+
+There is a chance that you want to use e-mail validator outside of model validation.
 If that's the case, you can use the following methods:
 
 ```ruby
-ValidateEmail.valid?('email@randommail.com') # You can optionally pass a hash of options, same as validator
+options = {} # You can optionally pass a hash of options, same as validator
+ValidateEmail.valid?('email@randommail.com', options)
 ValidateEmail.mx_valid?('email@randommail.com')
 ValidateEmail.mx_valid_with_fallback?('email@randommail.com')
 ValidateEmail.valid?('email@randommail.com')
 ```
 
-Load it (and not the rails extensions) with 
-
-    gem 'valid_email', require: 'valid_email/validate_email'
+Load it (and not the Rails extensions) with
 
+```ruby
+gem 'valid_email', require: 'valid_email/validate_email'
+```
 
 ### String and Nil object extensions
 
-There is also a String and Nil class extension, if you require the gem in this way in Gemfile:
+There is also a String and Nil class extension, if you require the gem in this way in `Gemfile`:
 
 ```ruby
-gem 'valid_email', require: ['valid_email/all_with_extensions']
+gem 'valid_email', require: 'valid_email/all_with_extensions'
 ```
 
 You will be able to use the following methods:
 ```ruby
 nil.email? # => false
-"john@gmail.com".email? # => May return true if it exists. It accepts a hash of options like ValidateEmail.valid?
+'john@gmail.com'.email? # => May return true if it exists.
+# It accepts a hash of options like ValidateEmail.valid?
 ```
 
 ## Code Status
 
-* [![Build Status](https://travis-ci.org/hallelujah/valid_email.svg?branch=master)](https://travis-ci.org/hallelujah/valid_email)
+[![Build Status](https://travis-ci.org/hallelujah/valid_email.svg?branch=master)](https://travis-ci.org/hallelujah/valid_email)
 
-# Credits
+## Credits
 
 * Ramihajamalala Hery hery[at]rails-royce.org
 * Fire-Dragon-DoL francesco.belladonna[at]gmail.com
@@ -109,18 +141,14 @@ nil.email? # => false
 * Jean Boussier jean.boussier[at]gmail.com
 * Masaki Hara - @qnighy
 
-# Note on Patches/Pull Requests
-
-* Fork the project.
-
-* Make your feature addition or bug fix.
-
-* Add tests for it. This is important so I don’t break it in a future version unintentionally.
-
-* Commit, do not mess with rakefile, version, or history. (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
+## Pull Requests
 
-* Send me a pull request. Bonus points for topic branches.
+1. Fork the project.
+2. Make your feature addition or bug fix.
+3. Add tests for it. This is important so I don’t break it in a future version unintentionally.
+4. Commit, do not mess with rakefile, version, or history. (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
+5. Send me a pull request. Bonus points for topic branches.
 
-# Copyright
+## Copyright
 
 Copyright &copy; 2011 Ramihajamalala Hery. See LICENSE for details

data/config/locales/cs.yml

@@ -0,0 +1,5 @@
+cs:
+  valid_email:
+    validations:
+      email:
+        invalid: je neplatný

data/config/locales/es.yml

@@ -0,0 +1,5 @@
+es:
+  valid_email:
+    validations:
+      email:
+        invalid: "no es válido"

data/config/valid_email.yml

@@ -347,7 +347,6 @@ disposable_email_services:
   - prtnx.com
   - punkass.com
   - putthisinyourspamdatabase.com
-  - qq.com
   - quickinbox.com
   - rcpt.at
   - recode.me

data/lib/valid_email/email_validator.rb

@@ -22,7 +22,7 @@ class EmailValidator < ActiveModel::EachValidator
     end
     unless r
       msg = (options[:message] || I18n.t(:invalid, :scope => "valid_email.validations.email"))
-      record.errors.add attribute, (msg % {value: value})
+      record.errors.add attribute, message: (msg % {value: value})
     end
   end
 end

data/lib/valid_email/validate_email.rb

@@ -1,4 +1,5 @@
 require 'mail'
+require 'simpleidn'
 
 class ValidateEmail
   class << self
@@ -27,7 +28,7 @@ class ValidateEmail
       return false unless m.domain.match(/^\S+$/)
 
       domain_dot_elements = m.domain.split(/\./)
-      return false unless domain_dot_elements.size > 1 && !domain_dot_elements.any?(&:empty?)
+      return false unless domain_dot_elements.size > 1 && domain_dot_elements.none?(&:empty?)
 
       # Ensure that the local segment adheres to adheres to RFC-5322
       return false unless valid_local?(m.local)
@@ -90,11 +91,17 @@ class ValidateEmail
       m = Mail::Address.new(value)
       return false unless m.domain
 
+      if m.domain.ascii_only?
+        ascii_domain = m.domain
+      else
+        ascii_domain = SimpleIDN.to_ascii(m.domain)
+      end
+
       Resolv::DNS.open do |dns|
         dns.timeouts = MxValidator.config[:timeouts] unless MxValidator.config[:timeouts].empty?
 
-        return dns.getresources(m.domain, Resolv::DNS::Resource::IN::MX).size > 0 || (
-          fallback && dns.getresources(m.domain, Resolv::DNS::Resource::IN::A).size > 0
+        return dns.getresources(ascii_domain, Resolv::DNS::Resource::IN::MX).size > 0 || (
+          fallback && dns.getresources(ascii_domain, Resolv::DNS::Resource::IN::A).size > 0
         )
       end
     rescue Mail::Field::ParseError

data/lib/valid_email/version.rb

@@ -1 +1 @@
-ValidEmailVersion = "0.1.3"
+ValidEmailVersion = "0.1.4"

data/spec/email_validator_spec.rb

@@ -1,63 +1,53 @@
 require 'spec_helper'
 
 describe EmailValidator do
-  person_class = Class.new do
+  email_class = Class.new do
     include ActiveModel::Validations
+
     attr_accessor :email
+
+    def self.model_name
+      ActiveModel::Name.new(self, nil, "TestModel")
+    end
+  end
+
+  person_class = Class.new(email_class) do
     validates :email, :email => true
   end
 
-  person_class_mx = Class.new do
-    include ActiveModel::Validations
-    attr_accessor :email
+  person_class_mx = Class.new(email_class) do
     validates :email, :email => {:mx => true}
   end
 
-  person_class_mx_with_fallback = Class.new do
-    include ActiveModel::Validations
-    attr_accessor :email
+  person_class_mx_with_fallback = Class.new(email_class) do
     validates :email, :email => {:mx_with_fallback => true}
   end
 
-  person_class_disposable_email = Class.new do
-    include ActiveModel::Validations
-    attr_accessor :email
+  person_class_disposable_email = Class.new(email_class) do
     validates :email, :email => {:ban_disposable_email => true}
   end
 
-  person_class_nil_allowed = Class.new do
-    include ActiveModel::Validations
-    attr_accessor :email
+  person_class_nil_allowed = Class.new(email_class) do
     validates :email, :email => {:allow_nil => true}
   end
 
-  person_class_blank_allowed = Class.new do
-    include ActiveModel::Validations
-    attr_accessor :email
+  person_class_blank_allowed = Class.new(email_class) do
     validates :email, :email => {:allow_blank => true}
   end
 
-  person_class_mx_separated = Class.new do
-    include ActiveModel::Validations
-    attr_accessor :email
+  person_class_mx_separated = Class.new(email_class) do
     validates :email, :mx => true
   end
 
-  person_class_mx_with_fallback_separated = Class.new do
-    include ActiveModel::Validations
-    attr_accessor :email
+  person_class_mx_with_fallback_separated = Class.new(email_class) do
     validates :email, :mx_with_fallback => true
   end
 
-  person_class_domain = Class.new do
-    include ActiveModel::Validations
-    attr_accessor :email
+  person_class_domain = Class.new(email_class) do
     validates :email, :domain => true
   end
 
-  person_message_specified = Class.new do
-    include ActiveModel::Validations
-    attr_accessor :email
+  person_message_specified = Class.new(email_class) do
     validates :email, :email => { :message => 'custom message', :ban_disposable_email => true }
   end
 
@@ -290,4 +280,19 @@ describe EmailValidator do
     let!(:errors) { [ "est invalide" ] }
     it_behaves_like "Validating emails"
   end
+
+  describe 'Translating in czech' do
+    let!(:locale){ :cs }
+    let!(:errors) do
+      [
+        I18n.t(
+          :invalid,
+          locale: locale,
+          scope: [:valid_email, :validations, :email]
+        )
+      ]
+    end
+
+    it_behaves_like 'Validating emails'
+  end
 end

data/spec/spec_helper.rb

@@ -2,5 +2,8 @@ $:.unshift File.expand_path('../../lib',__FILE__)
 require 'valid_email'
 
 RSpec.configure do |config|
+  config.order = :random
+  config.profile_examples = 10
   config.raise_errors_for_deprecations!
+  Kernel.srand config.seed
 end

data/spec/validate_email_spec.rb

@@ -15,13 +15,27 @@ describe ValidateEmail do
     end
 
     context 'when mx: true option passed' do
+      let(:dns) { Resolv::DNS.new }
+
+      def mock_dns_mx
+        allow(dns).to receive(:getresources).and_return([])
+        allow(Resolv::DNS).to receive(:new).and_return(dns)
+      end
+
       it 'returns true when mx record exist' do
         expect(ValidateEmail.valid?('user@gmail.com', mx: true)).to be_truthy
       end
 
       it "returns false when mx record doesn't exist" do
+        mock_dns_mx
         expect(ValidateEmail.valid?('user@example.com', mx: true)).to be_falsey
       end
+
+      it "IDN-encodes the domain name if it contains multibyte characters" do
+        mock_dns_mx
+        ValidateEmail.valid?("user@\u{1F600}.com", mx: true)
+        expect(dns).to have_received(:getresources).with('xn--e28h.com', anything)
+      end
     end
 
     context 'when domain: true option passed' do

data/valid_email.gemspec

@@ -12,17 +12,16 @@ Gem::Specification.new do |s|
   s.description = %q{ActiveModel Validation for email}
   s.license     = 'MIT'
 
-  s.rubyforge_project = "valid_email"
-
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
   # specify any dependencies here; for example:
-  s.add_development_dependency "rspec", "~> 2.99"
+  s.add_development_dependency "rspec", "~> 3.10"
   s.add_development_dependency "rake", '< 11.0'
   s.add_runtime_dependency "mail", ">= 2.6.1"
+  s.add_runtime_dependency "simpleidn"
   if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new('2.0')
     s.add_runtime_dependency 'mime-types', '<= 2.6.2'
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: valid_email
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Ramihajamalala Hery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-24 00:00:00.000000000 Z
+date: 2021-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.99'
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.99'
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.6.1
+- !ruby/object:Gem::Dependency
+  name: simpleidn
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
@@ -80,8 +94,10 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- config/locales/cs.yml
 - config/locales/de.yml
 - config/locales/en.yml
+- config/locales/es.yml
 - config/locales/fi.yml
 - config/locales/fr.yml
 - config/locales/hu.yml
@@ -128,8 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: valid_email
-rubygems_version: 2.7.6
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: ActiveModel Validation for email