trogdir_models 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9884fc337eee9e5dcf954d129095d6f1e257e496
-  data.tar.gz: 9f5bdf1409d39a475f97d8b08dcf9a5829dee018
+  metadata.gz: bda2aaec00f0a7ac241b2c4aa4006b27000fcf79
+  data.tar.gz: f925ff937641d8f69291f7eb6bdd0f9b358eb6e9
 SHA512:
-  metadata.gz: ad41f202f81a678a1ab0d50375b4957b1c93864364fcaffdbbba950d964d1e65ba9072e8a2cfc8d52520a042f4a91785b71af099bdae74440ba761e81f01cb73
-  data.tar.gz: 299380af2e10a39e6c54d8d1ebe0aff0006bf6dc30e2f7975453dac9d42fd48bec22aab2c7bddb828e62b9836d44e6fa0c4702d883bec3d7fc97b25f05f26c4f
+  metadata.gz: c0fa7ee18fb12f52f2471e0dfe9237aab351a4cd0f165e84fe2920c4cf1da3014cdce032bda415648d5f41debb47c96e72e54f454c1b63f734a3fe46afa855e1
+  data.tar.gz: bc713d434d370c48942656d6607720c54ccee6014fdc52b507a2316d7ffe5fbd11815421c626eb00541e4ee1048f16168f2c5b654bb1d9a74a9dabd41c250e8d

data/lib/trogdir_models.rb

@@ -24,8 +24,8 @@ autoload :Student, 'trogdir/concerns/student'
 autoload :Employee, 'trogdir/concerns/employee'
 
 require 'active_model/validations'
-autoload :EmailValidator, 'trogdir/validators/email_validator'
+require 'email_validator'
 autoload :AbsoluteUriValidator, 'trogdir/validators/absolute_uri_validator'
 
 require 'mongoid-history'
-Mongoid::History.tracker_class_name = :changeset
+Mongoid::History.tracker_class_name = :changeset

data/lib/trogdir_models/version.rb

@@ -1,3 +1,3 @@
 module TrogdirModels
-  VERSION = '0.6.5'
+  VERSION = '0.6.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trogdir_models
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors:
 - Adam Crownoble
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-01 00:00:00.000000000 Z
+date: 2014-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: api-auth
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: mail
+  name: email_validator
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
@@ -157,7 +157,6 @@ files:
 - lib/trogdir/sync_log.rb
 - lib/trogdir/syncinator.rb
 - lib/trogdir/validators/absolute_uri_validator.rb
-- lib/trogdir/validators/email_validator.rb
 - lib/trogdir_models.rb
 - lib/trogdir_models/version.rb
 - spec/factories/address_factory.rb

data/lib/trogdir/validators/email_validator.rb

@@ -1,40 +0,0 @@
-# From: https://gist.github.com/jcf/1188367
-
-require 'mail'
-
-class EmailValidator < ActiveModel::EachValidator
-  attr_reader :record, :attribute, :value, :email, :tree
-
-  def validate_each(record, attribute, value)
-    @record, @attribute, @value = record, attribute, value
-
-    @email = Mail::Address.new(value)
-    @tree  = email.__send__(:tree)
-
-    add_error unless valid?
-  rescue Mail::Field::ParseError
-    add_error
-  end
-
-  private
-
-  def valid?
-    !!(domain_and_address_present? && domain_has_more_than_one_atom?)
-  end
-
-  def domain_and_address_present?
-    email.domain && email.address == value
-  end
-
-  def domain_has_more_than_one_atom?
-    tree.domain.dot_atom_text.elements.length > 1
-  end
-
-  def add_error
-    if message = options[:message]
-      record.errors[attribute] << message
-    else
-      record.errors.add(attribute, :invalid)
-    end
-  end
-end