email_domain_inclusion 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6693a7481613ac7e5d8021b5d3aaf682c6f82dac
-  data.tar.gz: efb361f0b7a53f03692653c660dc4c90135a1d14
+  metadata.gz: 2729b5136cdc717dd8f70812757a632dbf3f0438
+  data.tar.gz: bebb71f95e7b16d6228a26135218288031527286
 SHA512:
-  metadata.gz: 0439b71550c1d0f4524a9d8a852ab3add86522d9e95fc2a4cea4ef39ad0457fa07aadda830149345dcc53da72d93fa6711138ad2e81eebf561d11c00d5486ec7
-  data.tar.gz: 25135bf01635e1b8635f23d29b6723146b5fb81ac7c425670feb0e341857abfb622390f71ccd9a5bea2b3515f42b0a5593065eeb57beebd1a024ce13500f730e
+  metadata.gz: 14e074510939b06348208d3575d896042832d4378cf82a3ade8ac45e58a4b422e9f4e2f1bd79a8be08425f445532b09cf89fefcf3bed784dd572a0e0207f4814
+  data.tar.gz: 12451415cce64c359ceba4f9e09121b2eaf0b9e50da9ad4daeb2279f5903a473ff1d7f6336e02a1d13eab5971f2808fc860f28c547935cc7b860956c2bffb3ce

data/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
 ```
 

data/lib/email_domain_inclusion/version.rb

@@ -1,3 +1,3 @@
 module EmailDomainInclusion
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/lib/email_domain_inclusion.rb

@@ -5,15 +5,29 @@ require "email_domain_inclusion/version"
 # +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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: email_domain_inclusion
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Andrew Fecheyr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-25 00:00:00.000000000 Z
+date: 2015-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler