email_format 0.0.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1572f05a8b9ebf1fa07bd0066312b822372f44cb
-  data.tar.gz: 559b63ccc610d4cff6cb55555f75c9ea28c91db5
+  metadata.gz: c31c4d88f2a0645a013a802257d3babbc90f0e2b
+  data.tar.gz: be4d1fd92dc9bf36dfa4522ae65e6156fff2d5ee
 SHA512:
-  metadata.gz: 2ea307ac3967b10f1486e1ce015abe888680b83d62a8ea5e00a701f5637d3d0e2df376a1fa43e6c0693499c707c7f9b40cb3d2b5488fa244d830d247bd47b9f1
-  data.tar.gz: 633d4f45495ecd04e2f12187e0b6f3d8f9afb60757dc9607d34a1dff089be7f62d58921e935d5433cf1cf7817eb8496dfd02a57a5c8e2198d1ed615e969015f9
+  metadata.gz: bfacbc6d8596a86ea00d9316dd68774b4d3d149d73890ef09dd955c1658053d04f9db4105b02a5a6c8767cbd9c93df6b3b307e97d296632eda9ad4e4758819a7
+  data.tar.gz: c2d7be4a4014895dfbf7e43946742788ef55813a9d4ab0210c2a2d8cbb3affe8072b66599157431c76910b0e0fbf4370b70867bedac18ea9aef800a2ccc1fdf0

data/.rspec

@@ -0,0 +1 @@
+--color

data/.travis.yml

@@ -1,9 +1,7 @@
 language: ruby
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.0
-  
-notifications:
-  email:
-    - johnotander@gmail.com
+  - '1.9'
+  - '2'
+
+before_install:
+  - gem install bundler

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2013 johnotander
+Copyright (c) 2013-2015 johnotander
 
 MIT License
 

data/README.md

@@ -22,7 +22,7 @@ Or install it yourself as:
 
 ## Usage
 
-### `EmailFormat` Module
+### EmailFormat Module
 
 There's a `valid?` method in the `EmailFormat` module that accepts an email as an argument:
 
@@ -32,7 +32,7 @@ EmailFormat.valid?('invalid_email')   # => false
 EmailFormat.valid?('valid@email.com') # => true
 ```
 
-### `ActiveModel::Validations`
+### ActiveModel::Validations
 
 Using it is as simple as using the `validates` keyword in your model:
 
@@ -55,6 +55,20 @@ User.new('valid@email.com').valid? # => true
 User.new('invalid_email@@').valid? # => false
 ```
 
+By default, `email_format` is pretty relaxed, but there is a `strict` mode
+
+```ruby
+class User < ActiveRecord::Base
+
+  # ...
+
+  validates :email, email_format: { strict: true }
+
+  # ...
+
+end
+```
+
 Also, the model in question doesn't need to inherit from ActiveRecord::Base, you only need to `include ActiveModel::Validations` in your class:
 
 ```ruby

data/Rakefile

@@ -1,4 +1,4 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new

data/email_format.gemspec

@@ -4,24 +4,24 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'email_format/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "email_format"
+  spec.name          = 'email_format'
   spec.version       = EmailFormat::VERSION
-  spec.authors       = ["johnotander"]
-  spec.email         = ["johnotander@gmail.com"]
+  spec.authors       = ['johnotander']
+  spec.email         = ['johnotander@gmail.com']
   spec.description   = %q{Validates the email format.}
   spec.summary       = %q{Validates the email format with the email_regex gem.}
-  spec.homepage      = "https://github.com/johnotander/email_format"
-  spec.license       = "MIT"
+  spec.homepage      = 'https://github.com/johnotander/email_format'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_development_dependency "rspec"
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
+  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'bundler', '> 1.10'
+  spec.add_development_dependency 'rake'
 
-  spec.add_dependency "activemodel"
-  spec.add_dependency "email_regex"
+  spec.add_dependency 'activemodel'
+  spec.add_dependency 'email_regex'
 end

data/lib/email_format.rb

@@ -1,10 +1,13 @@
-require "email_regex"
-require "email_format/version"
-require "email_format/email_format_validator"
+require 'email_regex'
+require 'email_format/version'
+require 'email_format/email_format_validator'
 
 module EmailFormat
-
-  def self.valid?(email)
-    !!(email =~ EmailRegex::EMAIL_ADDRESS_REGEX)
+  def self.valid?(email, strict)
+    if strict
+      !!(email =~ EmailRegex::EMAIL_ADDRESS_REGEX)
+    else
+      !!(email =~ /^[\S&&[^@]]+@[\S&&[^@]]+$/)
+    end
   end
 end

data/lib/email_format/email_format_validator.rb

@@ -1,7 +1,6 @@
 class EmailFormatValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
-    unless EmailFormat.valid?(value)
-      record.errors[attribute] << (options[:message] || "is invalid")
-    end
+    return if EmailFormat.valid?(value, options[:strict])
+    record.errors[attribute] << (options[:message] || 'is invalid')
   end
 end

data/lib/email_format/version.rb

@@ -1,3 +1,3 @@
 module EmailFormat
-  VERSION = "0.0.2"
+  VERSION = '1.0.0'
 end

data/spec/email_format_validator_spec.rb

@@ -1,47 +1,84 @@
 require 'spec_helper'
 
 describe EmailFormatValidator do
-
   let(:fake_model) { FakeModel.new }
+  let(:fake_model_strict) { FakeModelStrict.new }
+
+  describe 'valid emails' do
+    context 'with strict email requirements' do
+      let(:valid_emails) { %w(valid@email.com another.valid@email.email.net) }
 
-  context "with valid emails" do
+      it 'should be happy' do
+        valid_emails.each do |email|
+          fake_model_strict.email = email
+          expect(fake_model_strict.valid?).to be_truthy
+        end
+      end
+    end
 
-    let(:valid_emails) { %w(valid@email.com another.valid@email.email.net) }
+    context 'with non strict requirements' do
+      let(:valid_emails) do
+        %w(valid@email.com
+           another.valid@email.email.net
+           valid@a
+           a@vaild
+           a@a)
+      end
 
-    it "should be happy" do
-      valid_emails.each do |email|
-        fake_model.email = email
-        expect(fake_model.valid?).to be_true
+      it 'should be happy' do
+        valid_emails.each do |email|
+          fake_model.email = email
+          expect(fake_model.valid?).to be_truthy
+        end
       end
     end
   end
 
-  context "with invalid emails" do
+  describe 'invalid emails' do
+    context 'with strict requirements' do
+      let(:invalid_emails) do
+        %w(invalid_email@
+           another_invalid_email@@email.email
+           invalid
+           bad@email@here
+           @bad_email
+           another@bad,email)
+      end
 
-    let(:invalid_emails) { %w(invalid_email@
-                              another_invalid_email@@email.email
-                              invalid
-                              bad@email@here
-                              @bad_email
-                              another@bad,email) }
+      it 'should not be happy' do
+        invalid_emails.each do |email|
+          fake_model_strict.email = email
+          expect(fake_model_strict.valid?).to be_falsey
+        end
+      end
+    end
 
-    it "shouldn't be happy" do
-      invalid_emails.each do |email|
-        fake_model.email = email
-        expect(fake_model.valid?).to be_false
+    context 'with non strict requirements' do
+      let(:invalid_emails) do
+        %w(invalid_email@
+           another_invalid_email@@email.email
+           invalid
+           bad@email@here
+           @bad_email)
+      end
+
+      it 'should not be happy' do
+        invalid_emails.each do |email|
+          fake_model.email = email
+          expect(fake_model.valid?).to be_falsey
+        end
       end
     end
   end
 
-  context "with allow_blank: true" do
-
-    let(:fake_model)   { FakeModelWithBlankEmail.new }
+  context 'with allow_blank: true' do
+    let(:fake_model_strict)   { FakeModelWithBlankEmail.new }
     let(:blank_emails) { ['', nil, ' '] }
 
-    it "should allow blank emails" do
+    it 'should allow blank emails' do
       blank_emails.each do |blank_email|
-        fake_model.email = blank_email
-        expect(fake_model.valid?).to be_true
+        fake_model_strict.email = blank_email
+        expect(fake_model_strict.valid?).to be_truthy
       end
     end
   end

data/spec/spec_helper.rb

@@ -4,10 +4,6 @@ require 'rspec'
 require 'active_model'
 require 'email_format'
 
-RSpec.configure do |config|
-  config.color_enabled = true
-end
-
 class FakeModel
   include ActiveModel::Validations
 
@@ -16,6 +12,14 @@ class FakeModel
   validates :email, email_format: true
 end
 
+class FakeModelStrict
+  include ActiveModel::Validations
+
+  attr_accessor :email
+
+  validates :email, email_format: { strict: true }
+end
+
 class FakeModelWithBlankEmail
   include ActiveModel::Validations
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: email_format
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 1.0.0
 platform: ruby
 authors:
 - johnotander
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-05 00:00:00.000000000 Z
+date: 2016-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -28,16 +28,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -88,6 +88,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt
@@ -119,11 +120,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Validates the email format with the email_regex gem.
 test_files:
 - spec/email_format_validator_spec.rb
 - spec/spec_helper.rb
-has_rdoc: