effective_resources 2.25.7 → 2.25.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de01adb32f1387ff84cc11ad3fbc0859446e955bd293b147fc3901c685236ec0
-  data.tar.gz: fc867fc6b73847530e5a7d631a08809328fa31550c6171fed4d5bf4d7d520ec0
+  metadata.gz: c5e923e218d9738cf726a638f0d850c3b2b86e4177b040bc50b0a8a1665e4ba1
+  data.tar.gz: 4d362460cea6561d38058ec8764e9e98c7e1b9a0899f49244de71a17a0e11942
 SHA512:
-  metadata.gz: ac5ac456612f209116686abf18121ae62f5b5be8dcb7cf2d87e54a169f6bd645e76058bcf8c4a7b862bc2647cc982ed810bd1039e49649084e3da82e69bcb4aa
-  data.tar.gz: 961fc638312d8da54e755b93665546ec247b46ead0b7bbb8399031b693ca4e249c4f1666cbd7c53cee207bf5fc8f03763c9627fa0f8d0c808d1013f0493d3cea
+  metadata.gz: 2770956df98832a7d08471d6182643f3317daf85924d9797f0ac4e1863a26222bf9d4a16730e21a15d364a1fb04d0f88f26833ff198b201e1a2bc9a36bb7b881
+  data.tar.gz: 979ca1c1afc1d8a2645072e3710b5d68436259082f16fb92e8d786953f5f027401fcb07e23afeeba97cc7b66af73d86803de412030341269298377d3224248d5

data/app/helpers/effective_resources_helper.rb

@@ -324,17 +324,7 @@ module EffectiveResourcesHelper
   end
 
   def masked_email(resource)
-    public_email = resource.try(:public_email)
-    return public_email if public_email.present?
-
-    email = resource.email
-    return email if email.blank?
-
-    local, domain = email.split('@')
-    masked_local = local[0..1] + '*' * (local.length - 2)
-    masked_domain = domain.split('.').first[0..1] + '*' * (domain.split('.').first.length - 2) + '.' + domain.split('.').last
-
-    "#{masked_local}@#{masked_domain}"
+    EffectiveResources.masked_email(resource)
   end
 
 end

data/app/models/effective/attribute.rb

@@ -80,17 +80,19 @@ module Effective
         raise('expected an ActiveSupport::OrderedOptions') unless value.kind_of?(ActiveSupport::OrderedOptions)
         parse_ordered_options(value)
       when :date, :datetime
-        if (digits = value.to_s.scan(/(\d+)/).flatten).present?
-          date = if digits.first.length == 4  # 2017-01-10
+        date = Time.zone.parse(value) if value.to_s.include?('T')
+
+        date ||= if (digits = value.to_s.scan(/(\d+)/).flatten).present?
+          if digits.first.length == 4  # 2017-01-10
             (Time.zone.local(*digits) rescue nil)
           else # 01/10/2016
             year = digits.find { |d| d.length == 4 }
             digits = [year] + (digits - [year])
             (Time.zone.local(*digits) rescue nil)
           end
-
-          name.to_s.start_with?('end_') ? date.end_of_day : date
         end
+
+        date.present? && name.to_s.start_with?('end_') ? date.end_of_day : date
       when :time
         if (digits = value.to_s.scan(/(\d+)/).flatten).present?
           now = Time.zone.now

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '2.25.7'.freeze
+  VERSION = '2.25.9'.freeze
 end

data/lib/effective_resources.rb

@@ -237,4 +237,18 @@ module EffectiveResources
     end
   end
 
+  def self.masked_email(resource)
+    public_email = resource.try(:public_email)
+    return public_email if public_email.present?
+
+    email = resource.email
+    return email if email.blank?
+
+    local, domain = email.split('@')
+    masked_local = local[0..1] + '*' * (local.length - 2)
+    masked_domain = domain.split('.').first[0..1] + '*' * (domain.split('.').first.length - 2) + '.' + domain.split('.').last
+
+    "#{masked_local}@#{masked_domain}"
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 2.25.7
+  version: 2.25.9
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-08 00:00:00.000000000 Z
+date: 2024-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails