effective_resources 1.18.8 → 1.18.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05cb089260386fe9f72bc8837a10fd8cdfe16abd4414c5deb2f06268fa069c45
-  data.tar.gz: c1c15c971c728c5d0fdaec7fa571661bce9722fc429b7b8a2345772528be43e5
+  metadata.gz: 5cee67d7d1f8986997b77f0a8d4d2f50cd7b0344ec84522dea0980df07662098
+  data.tar.gz: 07bd05a2149368657239d5ed7abd4cce69a3d84b761f81f2653353c3cb4441d3
 SHA512:
-  metadata.gz: 9f7f1220362e03077e200fe6e9d9cc807b03ce0dce317803278a58b28676f6a936e219c5ba430cbcbe420c04f79cb6decc126d0abdd59e4b3760c7020f5b69ad
-  data.tar.gz: f35de510ebb41af0722a975939c99ea0c637324282a931846be21f6fe2bcd1a341d0985c7c4c9f2f449f68c3068c168f0ee0a6d7b3f18e9ad035f19e99369d36
+  metadata.gz: 395ca8155e668c86d1060901f9106f155d8202d0f235aac7ec8ef9e497b45b6b02386ec6e6e127615a3291640514508f2ccdbbc3696a1ff41c050ad83289b10e
+  data.tar.gz: 4d264db3c46fb74607fc31094a435e3b7c6db1895639f7a425ae65b971a0a051e0f09e1ad5ff059c38d3f5f36e243734302205a29fb6a703ac274847578da9e5

data/app/models/effective/attribute.rb

@@ -124,8 +124,32 @@ module Effective
         value.presence
       when :price # Integer * 100. Number of cents.
         value.kind_of?(Integer) ? value : (value.to_s.gsub(/[^0-9|\-|\.]/, '').to_f * 100.0).round
-      when :string, :email
+      when :string
         value.to_s
+      when :email
+        return nil unless value.kind_of?(String)
+
+        if value.include?('<') && value.include?('>')
+          value = value.match(/<(.+)>/)[1].to_s  # John Smith <john.smith@hotmail.com>
+        end
+
+        if value.include?(',')
+          value = value.split(',').find { |str| str.include?('@') }.to_s
+        end
+
+        if value.include?(' ')
+          value = value.split(' ').find { |str| str.include?('@') }.to_s
+        end
+
+        value = value.to_s.downcase.strip
+
+        return nil unless value.include?('@') && value.include?('.')
+
+        if defined?(Devise)
+          return nil unless Devise::email_regexp.match?(value)
+        end
+
+        value
       when :belongs_to_polymorphic
         value.to_s
       when :belongs_to, :has_many, :has_and_belongs_to_many, :has_one, :resource, :effective_addresses  # Returns an Array of ints, an Int or String

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.18.8'.freeze
+  VERSION = '1.18.9'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 1.18.8
+  version: 1.18.9
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-30 00:00:00.000000000 Z
+date: 2022-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails