trogdir_models 0.6.5 → 0.6.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/trogdir_models.rb +2 -2
- data/lib/trogdir_models/version.rb +1 -1
- metadata +5 -6
- data/lib/trogdir/validators/email_validator.rb +0 -40
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: bda2aaec00f0a7ac241b2c4aa4006b27000fcf79
|
|
4
|
+
data.tar.gz: f925ff937641d8f69291f7eb6bdd0f9b358eb6e9
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: c0fa7ee18fb12f52f2471e0dfe9237aab351a4cd0f165e84fe2920c4cf1da3014cdce032bda415648d5f41debb47c96e72e54f454c1b63f734a3fe46afa855e1
|
|
7
|
+
data.tar.gz: bc713d434d370c48942656d6607720c54ccee6014fdc52b507a2316d7ffe5fbd11815421c626eb00541e4ee1048f16168f2c5b654bb1d9a74a9dabd41c250e8d
|
data/lib/trogdir_models.rb
CHANGED
|
@@ -24,8 +24,8 @@ autoload :Student, 'trogdir/concerns/student'
|
|
|
24
24
|
autoload :Employee, 'trogdir/concerns/employee'
|
|
25
25
|
|
|
26
26
|
require 'active_model/validations'
|
|
27
|
-
|
|
27
|
+
require 'email_validator'
|
|
28
28
|
autoload :AbsoluteUriValidator, 'trogdir/validators/absolute_uri_validator'
|
|
29
29
|
|
|
30
30
|
require 'mongoid-history'
|
|
31
|
-
Mongoid::History.tracker_class_name = :changeset
|
|
31
|
+
Mongoid::History.tracker_class_name = :changeset
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: trogdir_models
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.6.
|
|
4
|
+
version: 0.6.6
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Adam Crownoble
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2014-
|
|
11
|
+
date: 2014-07-08 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: api-auth
|
|
@@ -25,19 +25,19 @@ dependencies:
|
|
|
25
25
|
- !ruby/object:Gem::Version
|
|
26
26
|
version: '1.0'
|
|
27
27
|
- !ruby/object:Gem::Dependency
|
|
28
|
-
name:
|
|
28
|
+
name: email_validator
|
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
|
30
30
|
requirements:
|
|
31
31
|
- - "~>"
|
|
32
32
|
- !ruby/object:Gem::Version
|
|
33
|
-
version: '
|
|
33
|
+
version: '1.4'
|
|
34
34
|
type: :runtime
|
|
35
35
|
prerelease: false
|
|
36
36
|
version_requirements: !ruby/object:Gem::Requirement
|
|
37
37
|
requirements:
|
|
38
38
|
- - "~>"
|
|
39
39
|
- !ruby/object:Gem::Version
|
|
40
|
-
version: '
|
|
40
|
+
version: '1.4'
|
|
41
41
|
- !ruby/object:Gem::Dependency
|
|
42
42
|
name: mongoid
|
|
43
43
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -157,7 +157,6 @@ files:
|
|
|
157
157
|
- lib/trogdir/sync_log.rb
|
|
158
158
|
- lib/trogdir/syncinator.rb
|
|
159
159
|
- lib/trogdir/validators/absolute_uri_validator.rb
|
|
160
|
-
- lib/trogdir/validators/email_validator.rb
|
|
161
160
|
- lib/trogdir_models.rb
|
|
162
161
|
- lib/trogdir_models/version.rb
|
|
163
162
|
- spec/factories/address_factory.rb
|
|
@@ -1,40 +0,0 @@
|
|
|
1
|
-
# From: https://gist.github.com/jcf/1188367
|
|
2
|
-
|
|
3
|
-
require 'mail'
|
|
4
|
-
|
|
5
|
-
class EmailValidator < ActiveModel::EachValidator
|
|
6
|
-
attr_reader :record, :attribute, :value, :email, :tree
|
|
7
|
-
|
|
8
|
-
def validate_each(record, attribute, value)
|
|
9
|
-
@record, @attribute, @value = record, attribute, value
|
|
10
|
-
|
|
11
|
-
@email = Mail::Address.new(value)
|
|
12
|
-
@tree = email.__send__(:tree)
|
|
13
|
-
|
|
14
|
-
add_error unless valid?
|
|
15
|
-
rescue Mail::Field::ParseError
|
|
16
|
-
add_error
|
|
17
|
-
end
|
|
18
|
-
|
|
19
|
-
private
|
|
20
|
-
|
|
21
|
-
def valid?
|
|
22
|
-
!!(domain_and_address_present? && domain_has_more_than_one_atom?)
|
|
23
|
-
end
|
|
24
|
-
|
|
25
|
-
def domain_and_address_present?
|
|
26
|
-
email.domain && email.address == value
|
|
27
|
-
end
|
|
28
|
-
|
|
29
|
-
def domain_has_more_than_one_atom?
|
|
30
|
-
tree.domain.dot_atom_text.elements.length > 1
|
|
31
|
-
end
|
|
32
|
-
|
|
33
|
-
def add_error
|
|
34
|
-
if message = options[:message]
|
|
35
|
-
record.errors[attribute] << message
|
|
36
|
-
else
|
|
37
|
-
record.errors.add(attribute, :invalid)
|
|
38
|
-
end
|
|
39
|
-
end
|
|
40
|
-
end
|