validates_email_whitelist_of 1.0.2 → 1.1.0

data/README.markdown

@@ -16,23 +16,28 @@ Then on ActiveRecord 2.0+ you can do
 
 	class User < ActiveRecord::Base
 	  validates_email_whitelist_of :email, :whitelist => ['example.com', 'google.com']
+
+    validates_email_blacklist_of :email, :blacklist => ['123.com']
 	end
 
 On ActiveRecord 3.0+ you can do
 
 	class User < ActiveRecord::Base
-	  validates :email, :whitelist => true
+	  validates :email, :whitelist => ['example.com', 'google.com']
+    validates :email, :blacklist => ['123.com']
 	end
 
 If you want to use I18n, make sure you add the scope
 
   `activerecord.errors.messages.invalid_email`
   `activerecord.errors.messages.invalid_whitelist`
+  `activerecord.errors.messages.invalid_blacklist`
 
 or
 
   `errors.messages.invalid_email`
   `errors.messages.invalid_whitelist`
+  `errors.messages.invalid_blacklist`
 
 The following locales are builtin:
 

data/config/locales/en.yml

@@ -4,7 +4,9 @@ en:
       messages:
         invalid_email: "is not a valid address"
         invalid_whitelist: "is not an allowed email"
+        invalid_blacklist: "is not an allowed email"
   errors:
     messages:
       invalid_email: "is not a valid e-mail"
       invalid_whitelist: "is not an allowed email"
+      invalid_blacklist: "is not an allowed email"

data/config/locales/pt.yml

@@ -4,10 +4,12 @@ pt: &pt
       messages:
         invalid_email: "não parece ser um e-mail válido"
         invalid_whitelist: "não é um e-mail permitido"
+        invalid_blacklist: "não é um e-mail permitido"
   errors:
     messages:
       invalid_email: "não parece ser um e-mail válido"
       invalid_whitelist: "não é um e-mail permitido"
+      invalid_blacklist: "não é um e-mail permitido"
 
 pt-BR:
   <<: *pt

data/lib/rails2/validates_email_whitelist_of.rb

@@ -20,6 +20,27 @@ module SimplesIdeias
         end
       end
     end
+
+    def validates_email_blacklist_of(*attr_names)
+      options = {
+        :on          => :save,
+        :allow_nil   => false,
+        :allow_blank => false,
+        :blacklist   => []
+      }
+
+      options.update(attr_names.pop) if attr_names.last.kind_of?(Hash)
+
+      validates_each(attr_names, options) do |record, attr_name, value|
+        if value.to_s =~ EMAIL_FORMAT
+          message = ::I18n.t(:invalid_blacklist, :scope => 'activerecord.errors.messages')
+          record.errors.add(attr_name, message) if options[:blacklist].include?($2)
+        else
+          message = ::I18n.translate(options[:message], :default => [:"activerecord.errors.messages.invalid_email", "is not a valid address"])
+          record.errors.add(attr_name, message)
+        end
+      end
+    end
   end
 end
 

data/lib/rails3/validates_email_whitelist_of.rb

@@ -5,9 +5,13 @@ module ActiveModel
         if value.to_s !~ SimplesIdeias::ValidatesEmailWhitelistOf::EMAIL_FORMAT
           record.errors.add(attribute, :invalid_email, :default => options[:message], :value => value)
         else
-          unless (options[:whitelist] || []).include?($2)
+          if options[:whitelist] && !options[:whitelist].include?($2)
             record.errors.add(attribute, :invalid_whitelist, :default => options[:message], :value => value)
           end
+
+          if options[:blacklist] && options[:blacklist].include?($2)
+            record.errors.add(attribute, :invalid_blacklist, :default => options[:message], :value => value)
+          end
         end
       end
     end
@@ -16,6 +20,10 @@ module ActiveModel
       def validates_email_whitelist_of(*attr_names)
         validates_with EmailWhitelistValidator, _merge_attributes(attr_names)
       end
+
+      def validates_email_blacklist_of(*attr_names)
+        validates_with EmailWhitelistValidator, _merge_attributes(attr_names)
+      end
     end
   end
 end

data/validates_email_whitelist_of.gemspec

@@ -1,8 +1,8 @@
 spec = Gem::Specification.new do |s|
   s.name = 'validates_email_whitelist_of'
 
-  s.version = '1.0.2'
-  s.summary = 'Validates e-mail address format (RFC2822 and RFC3696) and whitelist the domain part.'
+  s.version = '1.1.0'
+  s.summary = 'Validates e-mail address format (RFC2822 and RFC3696) and whitelist/blacklist the domain part.'
   s.description  = "Rails 2 and Rails 3 plugin. #{s.summary}"
   s.homepage = 'https://github.com/rubenfonseca/validates_email_whitelist_of'
   s.extra_rdoc_files = ['README.markdown', 'MIT-LICENSE']

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: 
   segments: 
   - 1
+  - 1
   - 0
-  - 2
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors: 
 - Ruben Fonseca
@@ -63,7 +63,7 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id003
-description: Rails 2 and Rails 3 plugin. Validates e-mail address format (RFC2822 and RFC3696) and whitelist the domain part.
+description: Rails 2 and Rails 3 plugin. Validates e-mail address format (RFC2822 and RFC3696) and whitelist/blacklist the domain part.
 email: fonseka@gmail.com
 executables: []
 
@@ -121,7 +121,7 @@ rubyforge_project:
 rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
-summary: Validates e-mail address format (RFC2822 and RFC3696) and whitelist the domain part.
+summary: Validates e-mail address format (RFC2822 and RFC3696) and whitelist/blacklist the domain part.
 test_files: 
 - spec/spec_helper.rb
 - spec/validates_email_format_of_spec.rb