pg_rails 7.0.8.pre.alpha.58 → 7.0.8.pre.alpha.60

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 418b790d06e3fdd8000b1722d68c479728e29eca73c1181544cf9241aed5745a
-  data.tar.gz: ec5ae58ada69aacb782c37374051022747b41049bd8cdd4824dac3f278a92325
+  metadata.gz: 3eb3aafda57a8e794a17ccabaf1b6e644332a7f55809b758deda8aa8c997f518
+  data.tar.gz: d71a2873a4d5edb08068b22251c06f2b9228ff597ddc4ff76ede7a904f9de34f
 SHA512:
-  metadata.gz: e2b01bcb36204063d7374404571501f387adeec187364b16b014e9d81f20ed892ffc576af1cb69e967bef31008a90f197e412e6760ce02f493610b0ae8fe5eac
-  data.tar.gz: edfa1fbf40e2846af7c980f1bcbac849af13fe22ba5e4632ae7473795527a3da4b606f7e722d0dfc921017b71409f22010a79612bbcc34b7c137aa0815e51176
+  metadata.gz: 7ae29225d2bc35ef096a3dd1d5ab7bf77065ad83ac636e76b6c061bafd7704f71639cef9a128d09ec5cf6ef8171e2b26f0cb542e7c1ce4db2cd43c603aeaee2f
+  data.tar.gz: 570053dacc414063f5d9a767f662a8436117df5b655ba9b2e534021ea674b014f8d9a6a4fb504453024737c0961070f366635dac1a2c8f40dd6db2e4772a3792

data/pg_engine/app/mailers/pg_engine/base_mailer.rb

@@ -13,11 +13,9 @@ module PgEngine
 
     # default delivery_method: :smtp
 
-    # TODO: rescue from StandardError? from PgEngine::Error?
-
-    rescue_from MailNotDelivered do |err|
-      # FIXME: marcar el Email en la DB como fallido
-      pg_err err
+    rescue_from StandardError do |err|
+      pg_warn err, :error
+      @email.update_columns(status: :failed, status_detail: err.to_s) # rubocop:disable Rails/SkipsModelValidations
     end
 
     protected

data/pg_engine/app/models/email.rb

@@ -45,7 +45,7 @@ class Email < ApplicationRecord
   kredis_unique_list :logs
 
   # TODO: y el fallido temporario?
-  enumerize :status, in: { pending: 0, blocked: 1, sent: 2, accepted: 3, delivered: 4, rejected: 5 }
+  enumerize :status, in: { pending: 0, failed: 1, sent: 2, accepted: 3, delivered: 4, rejected: 5 }
 
   validates :from_address, :to, :status, presence: true
 

data/pg_engine/lib/pg_engine/email_observer.rb

@@ -3,65 +3,28 @@
 module PgEngine
   class EmailObserver
     def self.delivered_email(message)
-      # content = get_content(message)
-      # subject = message.subject
-
-      # message.to puede ser un string o un array de strings
-      # to = [message.to].flatten.join(', ')
-
       message_id = message.message_id
       mailer = message.delivery_handler.to_s
       status = get_status(message)
-      return if message['email'].blank?
-
-      # El objeto Email ya estaba creado. Agarro ese objeto y le actualizo las cosas
-      email = message['email'].unparsed_value
 
-      email.encoded_eml.attach({ io: StringIO.new(message.encoded), filename: "email-#{email.id}.eml" })
-
-      email.update_columns(message_id:, mailer:, status:) # rubocop:disable Rails/SkipsModelValidations
-      # else
-      # TODO: crear email
-      # pg_warn 'El mail no tenía objeto Email asociado, se creó uno on the fly.', :warn
-      # # No hay objeto Email, entonces le creo uno para que quede logueado.
-      # # TODO: el content puede ser TXT
-      # Email.create!(message_id: message.message_id, body_html: message.encoded,
-      # subject: subject, recipient: recipient,
-      #               date: DateTime.now, mailer: message.delivery_handler.to_s, associated: associated(message),
-      #               status: get_status(message), observations: get_observations(message))
+      if message['email'].present?
+        email = message['email'].unparsed_value
+        email.update_columns(message_id:, mailer:, status:) # rubocop:disable Rails/SkipsModelValidations
+        email.encoded_eml.attach({ io: StringIO.new(message.encoded), filename: "email-#{email.id}.eml" })
+      else
+        pg_warn 'El mail no tenía objeto Email asociado.', :warn
+        # FIX: el content puede ser TXT
+        # Email.create!(message_id: message.message_id, body_html: message.encoded,
+        # subject: subject, recipient: recipient,
+        #               date: DateTime.now, mailer: message.delivery_handler.to_s, associated: associated(message),
+        #               status: get_status(message), observations: get_observations(message))
+      end
+    rescue StandardError => e
+      pg_warn e, :error
     end
 
     def self.get_status(message)
       message.perform_deliveries ? :sent : :blocked
     end
-
-    # def self.get_html_or_text(message)
-    #   message.body.parts.find { |p| p.content_type.match(/multipart/).present? }
-    #   part = message.body.parts.find { |p| p.content_type.match(/html/).present? }
-    #   part = message.body.parts.find { |p| p.content_type.match(/text/).present? } if part.nil?
-    #   part = message if part.nil?
-    #   part.body.raw_source
-    # end
-
-    # def self.associated(message)
-    #   return if message['associated'].blank?
-
-    #   message['associated'].unparsed_value
-    # end
-
-    # def self.get_observations(message)
-    #   return if message['observations'].blank?
-
-    #   message['observations'].unparsed_value
-    # end
-
-    # def self.get_content(message)
-    #   multipart = message.body.parts.find { |p| p.content_type.match(/multipart/).present? }
-    #   part = multipart.presence || message
-    #   get_html_or_text(part)
-    # rescue StandardError => e
-    #   pg_err e
-    #   ''
-    # end
   end
 end

data/pg_rails/lib/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PgRails
-  VERSION = '7.0.8-alpha.58'
+  VERSION = '7.0.8-alpha.60'
 end

data/pg_rails/scss/bootstrap_overrides.scss

@@ -7,3 +7,5 @@ $danger-bg-subtle:        tint-color($danger, 98%);
 // $info-border-subtle:      tint-color($info, 60%);
 $warning-border-subtle:   tint-color($warning, 20%);
 // $danger-border-subtle:    tint-color($danger, 60%);
+
+$btn-close-focus-shadow: none;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.0.8.pre.alpha.58
+  version: 7.0.8.pre.alpha.60
 platform: ruby
 authors:
 - Martín Rosso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-07 00:00:00.000000000 Z
+date: 2024-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails