effective_resources 1.18.6 → 1.18.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62921f58ed6ed86c3dc1fc8f08b78509170185d28ca302e8edaac034aee13c3a
-  data.tar.gz: 984a86a6c60a73b257a771d3d805673c7d0ab2bc4b6009580fb81c25b6c0c10c
+  metadata.gz: 5cee67d7d1f8986997b77f0a8d4d2f50cd7b0344ec84522dea0980df07662098
+  data.tar.gz: 07bd05a2149368657239d5ed7abd4cce69a3d84b761f81f2653353c3cb4441d3
 SHA512:
-  metadata.gz: 1209d346a9de8b331e2976578881b1308a12593ede050e2fb9964c10ccd9dbd24ec85ecc520d6d9e438589de4845692b162897967953f7c3076df54c9b43c631
-  data.tar.gz: ab56820215894af275fa99a4de2ba66b8a1fc05e1acf43167936a9674bd3330b50de5fb4f35bc5da63d505aff84794e8404c848e1ccef06f327c796f3c128db9
+  metadata.gz: 395ca8155e668c86d1060901f9106f155d8202d0f235aac7ec8ef9e497b45b6b02386ec6e6e127615a3291640514508f2ccdbbc3696a1ff41c050ad83289b10e
+  data.tar.gz: 4d264db3c46fb74607fc31094a435e3b7c6db1895639f7a425ae65b971a0a051e0f09e1ad5ff059c38d3f5f36e243734302205a29fb6a703ac274847578da9e5

data/app/controllers/concerns/effective/flash_messages.rb

@@ -8,7 +8,11 @@ module Effective
     def flash_success(resource, action = nil, name: nil)
       raise 'expected an ActiveRecord resource' unless (name || resource.class.respond_to?(:model_name))
 
-      name ||= resource_human_name
+      name ||= if resource.respond_to?(:destroyed?) && resource.destroyed?
+        resource_human_name
+      else
+        resource.to_s.presence || resource_human_name
+      end
 
       "Successfully #{action_verb(action)} #{name || 'resource'}".html_safe
     end
@@ -21,7 +25,12 @@ module Effective
       action = action.to_s.gsub('_', ' ')
 
       messages = flash_errors(resource, e: e)
-      name ||= resource_human_name
+
+      name ||= if resource.respond_to?(:destroyed?) && resource.destroyed?
+        resource_human_name
+      else
+        resource.to_s.presence || resource_human_name
+      end
 
       ["Unable to #{action}", (" #{name}" if name), (": #{messages}" if messages)].compact.join.html_safe
     end

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.6'.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.6
+  version: 1.18.9
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-15 00:00:00.000000000 Z
+date: 2022-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails