email_validator 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d15cdeca6720498d1bdd8dc2d3a07db1cafb8c5
-  data.tar.gz: bf391b40bf7e65cbd21c73e438fb30cf8d8ecac7
+  metadata.gz: 46498bfe9a730667a04d6defd887df5d2db1e2d9
+  data.tar.gz: 8d82a1910be79a0301fb8bea538e48ce39e1783e
 SHA512:
-  metadata.gz: f6da0bd3866fb08aa5083853d8f67c392d328fa7590d641dc970025e6b5ece0d56b07be73e9edb8c9cd7d12af9c130f319e8553ffe59e46cb8c61563167cf058
-  data.tar.gz: 295f35413dcb7b7eaef6ce56856ca8aa9651bad8c6cf65c6b3196de049630385e6cc5efdb4b49a170d203e96ad4605e4164556898e23768cf0dc6a84910b9524
+  metadata.gz: 5021fee86809281a8931171f82cde476dc5aff110c904c0a6d1c1aa57b8c06757dcd77215d28c5c66cd43e27da643b58e241bfb1a930da0d5110f86a976a28a5
+  data.tar.gz: 90b1b4a2b6b6cc9a7a80edbbf5adabd15ce0bb0218a289da766c40fe3d4ab53de192641cbaf946e769ce3dcf606ff0b7df638ac16b1e7181daf28c8e74d60847

data/.travis.yml

@@ -1,8 +1,7 @@
 rvm:
-  - 1.8.7
-  - 1.9.2
   - 1.9.3
   - 2.0.0
-  - jruby-18mode
+  - 2.1.3
+  - ruby-head
   - jruby-19mode
-  - ree
+  - rbx-2

data/Changes.md

@@ -0,0 +1,7 @@
+# HEAD
+
+# 1.5.0
+
+* Add a class method for simpler validation [TiteiKo and cluesque #19]
+* RSpec 3.0 syntax [strivedi183 #17]
+* Create Changes.md

data/README.md

@@ -34,6 +34,23 @@ Or you can do this in a specific `validates` call:
 validates :my_email_attribute, :email => {:strict_mode => true}
 ```
 
+## Validation outside a model
+
+If you need to validate an email outside a model, you can get the regexp :
+
+### Normal mode
+
+```ruby
+EmailValidator.regexp # returns the regex
+EmailValidator.valid?('narf@example.com') # boolean
+```
+
+### Strict mode
+
+```ruby
+EmailValidator.regexp(:strict_mode => true)
+```
+
 ## Thread safety
 
 This gem is thread safe, with one caveat: `EmailValidator.default_options` must be configured before use in a multi-threaded environment. If you configure `default_options` in a Rails initializer file, then you're good to go since initializers are run before worker threads are spawned.

data/Rakefile

@@ -1,10 +1,4 @@
 require 'bundler'
-require 'rake/testtask'
-begin
-  require 'rdoc/task'
-rescue LoadError
-  require 'rake/rdoctask' # deprecated in Ruby 1.9.3 but needed for Ruby 1.8.7 and JRuby
-end
 require 'rspec/core/rake_task'
 
 Bundler::GemHelper.install_tasks
@@ -13,13 +7,4 @@ RSpec::Core::RakeTask.new do |t|
   t.rspec_opts = %w(--format documentation --colour)
 end
 
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "email_validator #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
 task :default => 'spec'

data/email_validator.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = %q{email_validator}
-  s.version = "1.4.0"
+  s.version = "1.5.0"
   s.authors = ["Brian Alexander"]
   s.description = %q{An email validator for Rails 3+. See homepage for details: http://github.com/balexand/email_validator}
   s.email = %q{balexand@gmail.com}
@@ -18,5 +18,6 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency("rake")
   s.add_development_dependency("rspec", ">= 0")
-end
 
+  s.add_development_dependency('rubysl', '~> 2.0') if RUBY_ENGINE == 'rbx'
+end

data/lib/email_validator.rb

@@ -2,14 +2,26 @@
 class EmailValidator < ActiveModel::EachValidator
   @@default_options = {}
 
+  def self.regexp(options = {})
+    options = default_options.merge(options)
+
+    name_validation = options[:strict_mode] ? "-a-z0-9+._" : "^@\\s"
+
+    /\A\s*([#{name_validation}]{1,64})@((?:[-a-z0-9]+\.)+[a-z]{2,})\s*\z/i
+  end
+
+  def self.valid?(value, options = {})
+    !!(value =~ regexp(options))
+  end
+
   def self.default_options
     @@default_options
   end
 
   def validate_each(record, attribute, value)
     options = @@default_options.merge(self.options)
-    name_validation = options[:strict_mode] ? "-a-z0-9+._" : "^@\\s"
-    unless value =~ /\A\s*([#{name_validation}]{1,64})@((?:[-a-z0-9]+\.)+[a-z]{2,})\s*\z/i
+
+    unless self.class.valid?(value, self.options)
       record.errors.add(attribute, options[:message] || :invalid)
     end
   end

data/spec/email_validator_spec.rb

@@ -51,11 +51,23 @@ describe EmailValidator do
       ].each do |email|
 
         it "#{email.inspect} should be valid" do
-          TestUser.new(:email => email).should be_valid
+          expect(TestUser.new(:email => email)).to be_valid
         end
 
         it "#{email.inspect} should be valid in strict_mode" do
-          StrictUser.new(:email => email).should be_valid
+          expect(StrictUser.new(:email => email)).to be_valid
+        end
+
+        it "#{email.inspect} should match the regexp" do
+          expect(email =~ EmailValidator.regexp).to be_truthy
+        end
+
+        it "#{email.inspect} should match the strict regexp" do
+          expect(email =~ EmailValidator.regexp(:strict_mode => true)).to be_truthy
+        end
+
+        it "#{email.inspect} should pass the class tester" do
+          expect(EmailValidator.valid?(email)).to be_truthy
         end
 
       end
@@ -89,11 +101,23 @@ describe EmailValidator do
       ].each do |email|
 
         it "#{email.inspect} should not be valid" do
-          TestUser.new(:email => email).should_not be_valid
+          expect(TestUser.new(:email => email)).not_to be_valid
         end
 
         it "#{email.inspect} should not be valid in strict_mode" do
-          StrictUser.new(:email => email).should_not be_valid
+          expect(StrictUser.new(:email => email)).not_to be_valid
+        end
+
+        it "#{email.inspect} should not match the regexp" do
+          expect(email =~ EmailValidator.regexp).to be_falsy
+        end
+
+        it "#{email.inspect} should not match the strict regexp" do
+          expect(email =~ EmailValidator.regexp(:strict_mode => true)).to be_falsy
+        end
+
+        it "#{email.inspect} should fail the class tester" do
+          expect(EmailValidator.valid?(email)).to be_falsy
         end
 
       end
@@ -110,11 +134,19 @@ describe EmailValidator do
       ].each do |email|
 
         it "#{email.inspect} should be valid" do
-          TestUser.new(:email => email).should be_valid
+          expect(TestUser.new(:email => email)).to be_valid
         end
 
         it "#{email.inspect} should not be valid in strict_mode" do
-          StrictUser.new(:email => email).should_not be_valid
+          expect(StrictUser.new(:email => email)).not_to be_valid
+        end
+
+        it "#{email.inspect} should match the regexp" do
+          expect(email =~ EmailValidator.regexp).to be_truthy
+        end
+
+        it "#{email.inspect} should not match the strict regexp" do
+          expect(email =~ EmailValidator.regexp(:strict_mode => true)).to be_falsy
         end
 
       end
@@ -127,7 +159,7 @@ describe EmailValidator do
       before { subject.valid? }
 
       it "should add the default message" do
-        subject.errors[:email].should include "is invalid"
+        expect(subject.errors[:email]).to include "is invalid"
       end
     end
 
@@ -136,22 +168,22 @@ describe EmailValidator do
       before { subject.valid? }
 
       it "should add the customized message" do
-        subject.errors[:email_address].should include "is not looking very good!"
+        expect(subject.errors[:email_address]).to include "is not looking very good!"
       end
     end
   end
 
   describe "nil email" do
     it "should not be valid when :allow_nil option is missing" do
-      TestUser.new(:email => nil).should_not be_valid
+      expect(TestUser.new(:email => nil)).not_to be_valid
     end
 
     it "should be valid when :allow_nil options is set to true" do
-      TestUserAllowsNil.new(:email => nil).should be_valid
+      expect(TestUserAllowsNil.new(:email => nil)).to be_valid
     end
 
     it "should not be valid when :allow_nil option is set to false" do
-      TestUserAllowsNilFalse.new(:email => nil).should_not be_valid
+      expect(TestUserAllowsNilFalse.new(:email => nil)).not_to be_valid
     end
   end
 
@@ -160,7 +192,7 @@ describe EmailValidator do
       before { require 'email_validator/strict' }
 
       it "should validate using strict mode" do
-        TestUser.new(:email => "&'*+-./=?^_{}~@other-valid-characters-in-local.net").should_not be_valid
+        expect(TestUser.new(:email => "&'*+-./=?^_{}~@other-valid-characters-in-local.net")).not_to be_valid
       end
     end
   end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: email_validator
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Brian Alexander
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-29 00:00:00.000000000 Z
+date: 2014-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
   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: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: 'An email validator for Rails 3+. See homepage for details: http://github.com/balexand/email_validator'
@@ -59,9 +59,10 @@ extensions: []
 extra_rdoc_files:
 - LICENSE
 files:
-- .document
-- .gitignore
-- .travis.yml
+- ".document"
+- ".gitignore"
+- ".travis.yml"
+- Changes.md
 - Gemfile
 - LICENSE
 - README.md
@@ -80,17 +81,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: An email validator for Rails 3+.