effective_resources 2.25.5 → 2.25.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97c4d9e57cbb9190a61fa28058ded7f0e66462849da488234cb7850d6ff3f3b5
-  data.tar.gz: 6d5d739a219cc0468ea5d3074e45da0d35eb59dbbb52bd2ba33f851dfbec9497
+  metadata.gz: de01adb32f1387ff84cc11ad3fbc0859446e955bd293b147fc3901c685236ec0
+  data.tar.gz: fc867fc6b73847530e5a7d631a08809328fa31550c6171fed4d5bf4d7d520ec0
 SHA512:
-  metadata.gz: c2dc4d8ad8923d37e16d133ff9543d23d3ef98e5d99a0e21fa93d761d8ea67d3ae555c225d3a6acc66e8603c7c467761f0a9bc5527823e87b98a6c37ca39c065
-  data.tar.gz: 2d0bdc822b307c8274e54a6992b75a95eadf9b54ef4fa5931e82b905859f4599ceb1d080fea04c4812ee6d9824f3be6922b8bbd818ccd1529b65b01d5198dff2
+  metadata.gz: ac5ac456612f209116686abf18121ae62f5b5be8dcb7cf2d87e54a169f6bd645e76058bcf8c4a7b862bc2647cc982ed810bd1039e49649084e3da82e69bcb4aa
+  data.tar.gz: 961fc638312d8da54e755b93665546ec247b46ead0b7bbb8399031b693ca4e249c4f1666cbd7c53cee207bf5fc8f03763c9627fa0f8d0c808d1013f0493d3cea

data/app/controllers/concerns/effective/crud_controller/actions.rb

@@ -42,7 +42,8 @@ module Effective
 
         # Duplicate if possible
         if params[:duplicate_id].present?
-          duplicate = resource_scope.find(params[:duplicate_id])
+          duplicate = (resource_scope.find(params[:duplicate_id]) rescue false)
+          duplicate ||= resource_scope.find_by_id(params[:duplicate_id])
 
           EffectiveResources.authorize!(self, :show, duplicate)
 

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

@@ -56,6 +56,16 @@ module Effective
 
     private
 
+    def to_masked_select2(resource)
+      if resource.respond_to?(:public_email)
+        "<span>#{resource}</span> <small>#{view_context.masked_email(resource)}</small>"
+      elsif resource.try(:email).present?
+        "<span>#{resource}</span> <small>#{resource.email}</small>"
+      else
+        "<span>#{resource}</span>"
+      end
+    end
+
     def to_select2(resource)
       if resource.try(:email).present?
         "<span>#{resource}</span> <small>#{resource.email}</small>"

data/app/helpers/effective_resources_helper.rb

@@ -323,6 +323,18 @@ module EffectiveResourcesHelper
     EffectiveResources.etsd(resource, attribute)
   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}"
+  end
 
 end

data/app/models/concerns/acts_as_published.rb

@@ -22,8 +22,12 @@ module ActsAsPublished
   included do
     attr_writer :save_as_draft
 
-    before_validation do
-      assign_attributes(published_start_at: nil, published_end_at: nil) if EffectiveResources.truthy?(@save_as_draft)
+    before_validation(if: -> { EffectiveResources.falsey?(@save_as_draft) && @save_as_draft.present? }) do
+      self.published_start_at ||= Time.zone.now
+    end
+
+    before_validation(if: -> { EffectiveResources.truthy?(@save_as_draft) }) do
+      assign_attributes(published_start_at: nil, published_end_at: nil)
     end
 
     validate(if: -> { published_start_at.present? && published_end_at.present? }) do

data/app/models/concerns/effective_devise_user.rb

@@ -291,4 +291,8 @@ module EffectiveDeviseUser
     devise_mailer.send(notification, self, *args).deliver_now
   end
 
+  def to_select2_search_columns
+    [:email, :public_email, :first_name, :last_name, :name]
+  end
+
 end

data/lib/effective_resources/version.rb

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

data/lib/effective_resources.rb

@@ -127,6 +127,10 @@ module EffectiveResources
     end
   end
 
+  def self.falsey?(value)
+    !truthy?(value)
+  end
+
   def self.advance_date(date, business_days: 1, holidays: [:us, :observed])
     raise('business_days must be an integer <= 365') unless business_days.kind_of?(Integer) && business_days <= 365
 

metadata

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