effective_resources 1.18.7 → 1.18.10
Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: c513100225a155db0f3922dbfcecfda7dc40b94b98746273053f35c2bf6c5d0b
|
4
|
+
data.tar.gz: 3669286a34fe2c0304d1a10a74e446279a7600f88766687e9e7cdbd06cbdc8f9
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: f10ad3eafe4170593b01a684f8c68dfdbffa8748fbc61ef60892385b2d4d8e12eddb1d1b3855c6bc99afa56f33631a1e238b6485e7b5daa7f8a7678d0f457514
|
7
|
+
data.tar.gz: 37f1b0a1c9d54da6783641729225f18815d60aa7d78e1ea07d86897e855a8b527317763a62c6bc36f393f2ea8eaf62837d432d217c8076c2d90d3c7ce8f4c0ee
|
@@ -9,8 +9,8 @@ module EffectiveActsAsEmailFormHelper
|
|
9
9
|
raise('expected an acts_as_email_form resource') unless resource.class.respond_to?(:acts_as_email_form?)
|
10
10
|
|
11
11
|
# Load the template.
|
12
|
-
email_template = if action.present? &&
|
13
|
-
Effective::EmailTemplate.where(template_name: action).first!
|
12
|
+
email_template = if action.present? && defined?(EffectiveEmailTemplates)
|
13
|
+
action.kind_of?(Effective::EmailTemplate) ? action : Effective::EmailTemplate.where(template_name: action).first!
|
14
14
|
end
|
15
15
|
|
16
16
|
# These defaults are only used when there is no email_template
|
@@ -124,8 +124,32 @@ module Effective
|
|
124
124
|
value.presence
|
125
125
|
when :price # Integer * 100. Number of cents.
|
126
126
|
value.kind_of?(Integer) ? value : (value.to_s.gsub(/[^0-9|\-|\.]/, '').to_f * 100.0).round
|
127
|
-
when :string
|
127
|
+
when :string
|
128
128
|
value.to_s
|
129
|
+
when :email
|
130
|
+
return nil unless value.kind_of?(String)
|
131
|
+
|
132
|
+
if value.include?('<') && value.include?('>')
|
133
|
+
value = value.match(/<(.+)>/)[1].to_s # John Smith <john.smith@hotmail.com>
|
134
|
+
end
|
135
|
+
|
136
|
+
if value.include?(',')
|
137
|
+
value = value.split(',').find { |str| str.include?('@') }.to_s
|
138
|
+
end
|
139
|
+
|
140
|
+
if value.include?(' ')
|
141
|
+
value = value.split(' ').find { |str| str.include?('@') }.to_s
|
142
|
+
end
|
143
|
+
|
144
|
+
value = value.to_s.downcase.strip
|
145
|
+
|
146
|
+
return nil unless value.include?('@') && value.include?('.')
|
147
|
+
|
148
|
+
if defined?(Devise)
|
149
|
+
return nil unless Devise::email_regexp.match?(value)
|
150
|
+
end
|
151
|
+
|
152
|
+
value
|
129
153
|
when :belongs_to_polymorphic
|
130
154
|
value.to_s
|
131
155
|
when :belongs_to, :has_many, :has_and_belongs_to_many, :has_one, :resource, :effective_addresses # Returns an Array of ints, an Int or String
|
@@ -64,7 +64,7 @@ module Effective
|
|
64
64
|
:effective_obfuscation
|
65
65
|
elsif name == 'roles' && defined?(EffectiveRoles) && klass.respond_to?(:with_role)
|
66
66
|
:effective_roles
|
67
|
-
elsif (name.
|
67
|
+
elsif (name.ends_with?('_address') || name.ends_with?('_addresses')) && defined?(EffectiveAddresses) && (klass.new rescue nil).respond_to?(name)
|
68
68
|
:effective_addresses
|
69
69
|
elsif name.ends_with?('_id')
|
70
70
|
:integer
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: effective_resources
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.18.
|
4
|
+
version: 1.18.10
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Code and Effect
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2022-
|
11
|
+
date: 2022-09-12 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rails
|