Merge pull request #1 from VentureSpirit/allow-subdomains

Added subdomain validator

Author: andruby

README.md

@@ -25,7 +25,7 @@ class Person
   include ActiveModel::Validations
   attr_accessor :name, :email
 
-  validates :email, email_domain_inclusion: {allowed_domains: ["hotmail.com", "gmail.com"]}
+  validates :email, email_domain_inclusion: {allow_subdomains: true, allowed_domains: ["hotmail.com", "gmail.com"]}
 end
 ```
 

lib/email_domain_inclusion.rb

@@ -5,15 +5,29 @@
 # +allowed_domains+ can be an array of strings, or a Proc that returns an array of strings
 class EmailDomainInclusionValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
-    domains = options[:allowed_domains]
-    domains = domains.call if domains.respond_to?(:call)
-    domain = domain_from_email(value)
-    unless domains.include?(domain)
+    allow_subdomains = options[:allow_subdomains]
+    unless valid_full_domain?(value) || (allow_subdomains && valid_subdomain?(value))
       record.errors[attribute] << options[:message] || "domain_not_in_list"
     end
   end
 
   private
+  def valid_subdomain?(value)
+    domain = domain_from_email(value)
+    allowed_domains.any? { |allowed_domain| domain.end_with? ".#{allowed_domain}" }
+  end
+
+  def valid_full_domain?(value)
+    domain = domain_from_email(value)
+    allowed_domains.include?(domain)
+  end
+
+  def allowed_domains
+    domains = options[:allowed_domains]
+    domains = domains.call if domains.respond_to?(:call)
+    domains
+  end
+
   def domain_from_email(email)
     Mail::Address.new(email).try(:domain).try(:downcase)
   rescue Mail::Field::ParseError