effective_resources 1.18.7 → 1.18.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a34b28416f60d9a3077ffbc6a8e3faa4b4b9899abc612b1189dacdd8073d813
-  data.tar.gz: 6b2034d5550c9a47311dd9523e42794b656f24063c382c02663c33c2df9ca7d6
+  metadata.gz: c513100225a155db0f3922dbfcecfda7dc40b94b98746273053f35c2bf6c5d0b
+  data.tar.gz: 3669286a34fe2c0304d1a10a74e446279a7600f88766687e9e7cdbd06cbdc8f9
 SHA512:
-  metadata.gz: 5e3b681f41a9bd6a2193a7e92804b42949191b1e3df780d2006be2d195a78df43f127dbc24f4348062f16cbf43a3a71cd0b901f44aa22fba437b71134fad1832
-  data.tar.gz: 32d784ef5f929bbd3e0c00411532d23a606405fa4bbc568f05845a02b850e14bc818ce7cff12c7ef4e0a994cb2b5f5f7e4779a9a881cccfedbe8a37a9c2e1f17
+  metadata.gz: f10ad3eafe4170593b01a684f8c68dfdbffa8748fbc61ef60892385b2d4d8e12eddb1d1b3855c6bc99afa56f33631a1e238b6485e7b5daa7f8a7678d0f457514
+  data.tar.gz: 37f1b0a1c9d54da6783641729225f18815d60aa7d78e1ea07d86897e855a8b527317763a62c6bc36f393f2ea8eaf62837d432d217c8076c2d90d3c7ce8f4c0ee

data/app/helpers/effective_acts_as_email_form_helper.rb

@@ -9,8 +9,8 @@ module EffectiveActsAsEmailFormHelper
     raise('expected an acts_as_email_form resource') unless resource.class.respond_to?(:acts_as_email_form?)
 
     # Load the template.
-    email_template = if action.present? && resource.email_form_effective_email_templates?
-      Effective::EmailTemplate.where(template_name: action).first!
+    email_template = if action.present? && defined?(EffectiveEmailTemplates)
+      action.kind_of?(Effective::EmailTemplate) ? action : Effective::EmailTemplate.where(template_name: action).first!
     end
 
     # These defaults are only used when there is no email_template

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/app/models/effective/resources/sql.rb

@@ -64,7 +64,7 @@ module Effective
           :effective_obfuscation
         elsif name == 'roles' && defined?(EffectiveRoles) && klass.respond_to?(:with_role)
           :effective_roles
-        elsif (name.include?('_address') || name.include?('_addresses')) && defined?(EffectiveAddresses) && (klass.new rescue nil).respond_to?(:effective_addresses)
+        elsif (name.ends_with?('_address') || name.ends_with?('_addresses')) && defined?(EffectiveAddresses) && (klass.new rescue nil).respond_to?(name)
           :effective_addresses
         elsif name.ends_with?('_id')
           :integer

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.18.7'.freeze
+  VERSION = '1.18.10'.freeze
 end

metadata

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