valid8ors 0.0.7 → 0.0.8

data/README.md

@@ -20,10 +20,6 @@ Add the following to one of your models:
 
     validates :name, blacklist: true
 
-You can also modify the default message ("is blacklisted") if validation fails:
-
-    validates :name, blacklist: { message: "is not part of the whitelist" }
-
 ### Blacklist file
 
 You can create a blacklist.yml file in the config directory of your Rails application if you need to overload the one used by this gem.
@@ -40,7 +36,7 @@ You can translate (or overload) the default message via for e.g. using activerec
 
     cd test
     ruby blacklist_test.rb
-    
+
 ## Reserved Validator
 
 ### Usage
@@ -49,10 +45,6 @@ Add the following to one of your models:
 
     validates :name, reserved: true
 
-You can also modify the default message ("is reserved") if validation fails:
-
-    validates :name, reserved: { message: "is not part of the whitelist" }
-
 ### Reserved file
 
 You can create a reserved.yml file in the config directory of your Rails application if you need to overload the one used by this gem.
@@ -78,13 +70,14 @@ Add the following to one of your models:
 
     validates :email, email_format: true
 
-You can also modify the default message ("is improperly formatted") if validation fails:
+Restrict your validation to accept emails from specific domains only:
 
-    validates :email, email_format: { message: "is not well formatted" }
+    validates :email, email_format: { domains: ['gmail.com', 'live.com'] }
 
 ### I18n
 
-If you use I18n, the default key to translate is :improperly_formatted. So if you add to your User model:
+Default keys to translate are :improperly_formatted (when not an email format) and :invalid_domain (when email domain not listed in "domains" option).
+So if you add to your User model:
 
     validates :email, email_format: true
 
@@ -107,10 +100,6 @@ Add the following to one of your models:
 
     validates :url, url_format: true
 
-You can also modify the default message ("is improperly formatted") if validation fails:
-
-    validates :url, url_format: { message: "is not well formatted" }
-
 ### I18n
 
 If you use I18n, the default key to translate is :improperly_formatted. So if you add to your User model:
@@ -124,6 +113,30 @@ You can translate (or overload) the default message via for e.g. (in english): "
     cd test
     ruby url_format_test.rb
 
+## Password Strength Validator
+
+Check if a password contains at least a lower case letter, an upper case letter and a digit.
+Password length validation is not included here as you can use Rails' builtin "LengthValidator".
+
+### Usage
+
+Add the following to one of your models:
+
+    validates :password, password_strength: true
+
+### I18n
+
+The default key to translate is :insecure. So if you add to your User model:
+
+    validates :password, password_strength: true
+
+You can translate (or overload) the default message via for e.g. (in english): "en.activerecord.errors.models.user.attributes.password.insecure"
+
+### Tests
+
+    cd test
+    ruby password_strength_test.rb
+
 ## Compatibility
 
 Ruby 1.8 is not supported.

data/lib/valid8ors/blacklist.rb

@@ -3,7 +3,7 @@
 class BlacklistValidator < ActiveModel::EachValidator
 
   def validate_each(record, attribute, value)
-    record.errors.add(attribute, options[:message] || invalid_message(record, attribute)) if blacklisted?(value)
+    record.errors.add(attribute, invalid_message(record, attribute)) if blacklisted?(value)
   end
 
   # Lazy load and transform directly words to patterns instead of creating regexps at each matching tests

data/lib/valid8ors/email_format.rb

@@ -2,11 +2,15 @@
 
 class EmailFormatValidator < ActiveModel::EachValidator
 
-  EMAIL_PATTERN = /\A[\w\-\+_\.]+@((?:[\w\-\.]+\.)+[a-z]{2,})\Z/i
+  EMAIL_PATTERN = /\A[\w\-\+_\.]+@(?<domain>(?:[\w\-\.]+\.)+[a-z]{2,})\Z/i
 
   def validate_each(record, attribute, value)
-    unless value =~ EMAIL_PATTERN
-      record.errors.add(attribute, options[:message] || invalid_message(record, attribute))
+    if matching = EMAIL_PATTERN.match(value)
+      if options[:domains] && !options[:domains].include?(matching[:domain])
+        record.errors.add(attribute, invalid_domain_message(record, attribute))
+      end
+    else
+      record.errors.add(attribute, invalid_message(record, attribute))
     end
   end
 
@@ -22,4 +26,10 @@ class EmailFormatValidator < ActiveModel::EachValidator
             default:  "is improperly formatted"
   end
 
+  def invalid_domain_message(record, attribute)
+    I18n.t  :invalid_domain,
+            scope:    "#{record.class.i18n_scope}.errors.models.#{record.class.model_name.i18n_key}.attributes.#{attribute}",
+            default:  "can't be from this domain"
+  end
+
 end

data/lib/valid8ors/password_strength.rb

@@ -0,0 +1,26 @@
+# -*- encoding: utf-8 -*-
+
+class PasswordStrengthValidator < ActiveModel::EachValidator
+
+  # It must contain a lower case letter, an upper case letter and a digit
+  PASSWORD_PATTERN = /^(?=.*\d)(?=.*[a-z])(?=.*[A-Z])(?!.*\s).*$/
+
+  def validate_each(record, attribute, value)
+    unless value =~ PASSWORD_PATTERN
+      record.errors.add(attribute, invalid_message(record, attribute))
+    end
+  end
+
+  #######################
+  ### Private methods ###
+  #######################
+
+  private
+
+  def invalid_message(record, attribute)
+    I18n.t  :insecure,
+            scope:    "#{record.class.i18n_scope}.errors.models.#{record.class.model_name.i18n_key}.attributes.#{attribute}",
+            default:  "is not strong enough"
+  end
+
+end

data/lib/valid8ors/reserved.rb

@@ -3,7 +3,7 @@
 class ReservedValidator < ActiveModel::EachValidator
 
   def validate_each(record, attribute, value)
-    record.errors.add(attribute, options[:message] || invalid_message(record, attribute)) if reserved?(value)
+    record.errors.add(attribute, invalid_message(record, attribute)) if reserved?(value)
   end
 
   # Lazy load and transform directly words to patterns instead of creating regexps at each matching tests

data/lib/valid8ors/url_format.rb

@@ -6,7 +6,7 @@ class UrlFormatValidator < ActiveModel::EachValidator
 
   def validate_each(record, attribute, value)
     unless value =~ URL_PATTERN
-      record.errors.add(attribute, options[:message] || invalid_message(record, attribute))
+      record.errors.add(attribute, invalid_message(record, attribute))
     end
   end
 

data/lib/valid8ors.rb

@@ -4,3 +4,4 @@ require 'valid8ors/email_format'
 require 'valid8ors/blacklist'
 require 'valid8ors/reserved'
 require 'valid8ors/url_format'
+require 'valid8ors/password_strength'

data/test/blacklist_test.rb

@@ -6,10 +6,6 @@ class TestUser < TestModel
   validates :name, blacklist: true
 end
 
-class TestUserWithMessage < TestModel
-  validates :name, blacklist: { message: 'is not part of the whitelist' }
-end
-
 class TestBlacklistValidator < MiniTest::Unit::TestCase
 
   def test_some_blacklisted_words
@@ -30,12 +26,6 @@ class TestBlacklistValidator < MiniTest::Unit::TestCase
     assert test_user.errors[:name].include?("is blacklisted")
   end
 
-  def test_custom_message_on_error
-    test_user = TestUserWithMessage.new(name: "Fuck it up")
-    refute test_user.valid?
-    assert test_user.errors[:name].include?("is not part of the whitelist")
-  end
-
   #######################
   ### Private methods ###
   #######################

data/test/email_format_test.rb

@@ -6,16 +6,16 @@ class TestUser < TestModel
   validates :email, email_format: true
 end
 
-class TestUserAllowsNilToTrue < TestModel
-  validates :email, email_format: { allow_nil: true }
+class TestUserWithEmailDomains < TestModel
+  validates :email, email_format: { domains: ['mail.com', 'subdomain.mail.com'] }
 end
 
-class TestUserAllowsNilToFalse < TestModel
-  validates :email, email_format: { allow_nil: false }
+class TestUserAllowsNilEmailToTrue < TestModel
+  validates :email, email_format: { allow_nil: true }
 end
 
-class TestUserWithMessage < TestModel
-  validates :email, email_format: { message: 'is not well formatted' }
+class TestUserAllowsNilEmailToFalse < TestModel
+  validates :email, email_format: { allow_nil: false }
 end
 
 class TestEmailFormatValidator < MiniTest::Unit::TestCase
@@ -28,16 +28,29 @@ class TestEmailFormatValidator < MiniTest::Unit::TestCase
     invalid_emails.each { |email| refute TestUser.new(email: email).valid? }
   end
 
-  def test_default_message_on_error
-    test_user = TestUser.new(email: "invalid_email@")
+  def test_email_when_domains_option
+    valid_emails_with_correct_domains = ['user@mail.com', 'user@subdomain.mail.com']
+    valid_emails_with_incorrect_domains = ['user@gmail.com', 'user@subdomain.gmail.com']
+
+    valid_emails_with_correct_domains.each do |email|
+      assert TestUserWithEmailDomains.new(email: email).valid?
+    end
+
+    valid_emails_with_incorrect_domains.each do |email|
+      refute TestUserWithEmailDomains.new(email: email).valid?
+    end
+  end
+
+  def test_default_invalid_domain_message_on_error
+    test_user = TestUserWithEmailDomains.new(email: "user@gmail.com")
     refute test_user.valid?
-    assert test_user.errors[:email].include?("is improperly formatted")
+    assert test_user.errors[:email].include?("can't be from this domain")
   end
 
-  def test_custom_message_on_error
-    test_user = TestUserWithMessage.new(email: "invalid_email@")
+  def test_default_message_on_error
+    test_user = TestUser.new(email: "invalid_email@")
     refute test_user.valid?
-    assert test_user.errors[:email].include?("is not well formatted")
+    assert test_user.errors[:email].include?("is improperly formatted")
   end
 
   def test_nil_email_when_allow_nil_option_is_not_set
@@ -45,11 +58,11 @@ class TestEmailFormatValidator < MiniTest::Unit::TestCase
   end
 
   def test_nil_email_when_allow_nil_option_is_set_to_true
-    assert TestUserAllowsNilToTrue.new(email: nil).valid?
+    assert TestUserAllowsNilEmailToTrue.new(email: nil).valid?
   end
 
   def test_nil_email_when_allow_nil_option_is_set_to_false
-    refute TestUserAllowsNilToFalse.new(email: nil).valid?
+    refute TestUserAllowsNilEmailToFalse.new(email: nil).valid?
   end
 
   #######################

data/test/password_strength_test.rb

@@ -0,0 +1,75 @@
+# -*- encoding: utf-8 -*-
+
+require_relative 'test_helper'
+
+class TestUser < TestModel
+  validates :password, password_strength: true
+end
+
+class TestUserAllowsNilPasswordToTrue < TestModel
+  validates :password, password_strength: { allow_nil: true }
+end
+
+class TestUserAllowsNilPasswordToFalse < TestModel
+  validates :password, password_strength: { allow_nil: false }
+end
+
+class TestPasswordFormatValidator < MiniTest::Unit::TestCase
+
+  def test_valid_passwords
+    valid_passwords.each { |password| assert TestUser.new(password: password).valid? }
+  end
+
+  def test_invalid_passwords
+    invalid_passwords.each { |password| refute TestUser.new(password: password).valid? }
+  end
+
+  def test_default_message_on_error
+    test_user = TestUser.new(password: "invalid_password")
+    refute test_user.valid?
+    assert test_user.errors[:password].include?("is not strong enough")
+  end
+
+  def test_nil_password_when_allow_nil_option_is_not_set
+    refute TestUser.new(password: nil).valid?
+  end
+
+  def test_nil_password_when_allow_nil_option_is_set_to_true
+    assert TestUserAllowsNilPasswordToTrue.new(password: nil).valid?
+  end
+
+  def test_nil_password_when_allow_nil_option_is_set_to_false
+    refute TestUserAllowsNilPasswordToFalse.new(password: nil).valid?
+  end
+
+  #######################
+  ### Private methods ###
+  #######################
+
+  private
+
+  def valid_passwords
+    [
+      'aA1',
+      'Hey!Co0l',
+      'SmA$H1nG!_PUmP!',
+      'L0c@l'
+    ]
+  end
+
+  def invalid_passwords
+    [
+      'aaa',
+      'AAA',
+      '123',
+      'aAa',
+      'a1a',
+      '1A1',
+      ' aA1',
+      'aA1 ',
+      ' aA1 ',
+      'aA 12c'
+    ]
+  end
+
+end

data/test/reserved_test.rb

@@ -6,10 +6,6 @@ class TestUser < TestModel
   validates :name, reserved: true
 end
 
-class TestUserWithMessage < TestModel
-  validates :name, reserved: { message: 'is not part of the whitelist' }
-end
-
 class TestReservedValidator < MiniTest::Unit::TestCase
 
   def test_some_reserved_words
@@ -23,7 +19,7 @@ class TestReservedValidator < MiniTest::Unit::TestCase
   def test_some_not_reserved_words
     names_that_should_be_not_reserved.each { |name| assert TestUser.new(name: name).valid? }
   end
-  
+
   def test_with_nil_attribute
     test_user = TestUser.new(name: nil)
     assert test_user.valid?
@@ -35,12 +31,6 @@ class TestReservedValidator < MiniTest::Unit::TestCase
     assert test_user.errors[:name].include?("is reserved")
   end
 
-  def test_custom_message_on_error
-    test_user = TestUserWithMessage.new(name: "hElp")
-    refute test_user.valid?
-    assert test_user.errors[:name].include?("is not part of the whitelist")
-  end
-
   #######################
   ### Private methods ###
   #######################

data/test/url_format_test.rb

@@ -14,10 +14,6 @@ class TestSiteAllowsNilToFalse < TestModel
   validates :url, url_format: { allow_nil: false }
 end
 
-class TestSiteWithMessage < TestModel
-  validates :url, url_format: { message: 'is not well formatted' }
-end
-
 class TestUrlFormatValidator < MiniTest::Unit::TestCase
 
   def test_valid_url
@@ -34,12 +30,6 @@ class TestUrlFormatValidator < MiniTest::Unit::TestCase
     assert test_site.errors[:url].include?("is improperly formatted")
   end
 
-  def test_custom_message_on_error
-    test_site = TestSiteWithMessage.new(url: "invalid_url")
-    refute test_site.valid?
-    assert test_site.errors[:url].include?("is not well formatted")
-  end
-
   def test_nil_url_when_allow_nil_option_is_not_set
     refute TestSite.new(url: nil).valid?
   end

data/valid8ors.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "valid8ors"
-  s.version     = "0.0.7"
+  s.version     = "0.0.8"
   s.authors     = ["Axel Vergult", "Vincent Pochet", "Ben Colon"]
   s.email       = ["axel@official.fm", "vincent@official.fm", "ben@official.fm"]
   s.homepage    = ""

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: valid8ors
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-02 00:00:00.000000000Z
+date: 2012-07-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70251716111360 !ruby/object:Gem::Requirement
+  requirement: &70180450534040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,7 +23,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70251716111360
+  version_requirements: *70180450534040
 description: Rails 3 awesome custom validators
 email:
 - axel@official.fm
@@ -43,10 +43,12 @@ files:
 - lib/valid8ors.rb
 - lib/valid8ors/blacklist.rb
 - lib/valid8ors/email_format.rb
+- lib/valid8ors/password_strength.rb
 - lib/valid8ors/reserved.rb
 - lib/valid8ors/url_format.rb
 - test/blacklist_test.rb
 - test/email_format_test.rb
+- test/password_strength_test.rb
 - test/reserved_test.rb
 - test/test_helper.rb
 - test/url_format_test.rb
@@ -65,7 +67,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4557959331409826166
+      hash: 2205064151455909401
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -74,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4557959331409826166
+      hash: 2205064151455909401
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10
@@ -84,6 +86,7 @@ summary: Rails 3 awesome custom validators
 test_files:
 - test/blacklist_test.rb
 - test/email_format_test.rb
+- test/password_strength_test.rb
 - test/reserved_test.rb
 - test/test_helper.rb
 - test/url_format_test.rb