pg_rails 7.0.8.pre.alpha.57 → 7.0.8.pre.alpha.59

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49e6cb9913064fd946d0ed5100572a31e6e39b7b4c0c5efeb8ca8ca520d9e75b
-  data.tar.gz: 206b926af17474e1ce20b6d76724729b60a6ee10955b3b459191949d72bcd3ed
+  metadata.gz: b3d8524d771ec24a2b2728686f3823fe5f4d52ead73f969e99ba003361572b55
+  data.tar.gz: 2d6efcc793a2b907ba38b974c6b437bae06e1fb9a4bf15554d2d90434a13dc9e
 SHA512:
-  metadata.gz: 66dd233f281b67cf4557acdcc839095b6cf4327972f2bde48544a025fadf8ad272b5e6b15aea8fc000e7a8d4cb2dec37af3512d5326d23cf774dfef172a38147
-  data.tar.gz: '091b62e7722d9bdabb8df428074ac5f4a796cb1c2a4b058a86c6fd235a88b11dc160b1b30a5b34bd3f807a533c0c7337d61b8d92327028843c2ec1a2f8fd313a'
+  metadata.gz: 7fb40a82f52722779c7ac1dc58bc7c1d4c637ceed424861f8c927c7915c19d6c462e8800ee1e67dfcd9f5983052a7618967ffd84ee70ba8ba17771150b3bd677
+  data.tar.gz: 378f705720ae31579b3105c88e0d9d422ed8ad4c26b88bd5140b5fb3830fbcd005c6285681b19065576bd2be91f12feb5b52c6d943d2f29bcdcf6bed2ba0d365

data/pg_engine/app/controllers/admin/emails_controller.rb

@@ -10,14 +10,10 @@ module Admin
 
     before_action(only: :index) { authorize Email }
 
-    before_action :set_instancia_modelo, only: %i[new create show edit update destroy content_eml]
+    before_action :set_instancia_modelo, only: %i[new create show edit update destroy]
 
     add_breadcrumb Email.nombre_plural, :admin_emails_path
 
-    def content_eml
-      send_data @email.content_eml, filename: "email_#{@email.id}.txt", disposition: :inline
-    end
-
     private
 
     def atributos_permitidos
@@ -25,7 +21,7 @@ module Admin
     end
 
     def atributos_para_buscar
-      %i[accepted_at delivered_at opened_at from_address from_name reply_to to subject body_input tags content_eml
+      %i[accepted_at delivered_at opened_at from_address from_name reply_to to subject body_input tags
          message_id mailer status_detail status]
     end
 
@@ -35,7 +31,7 @@ module Admin
 
     def atributos_para_mostrar
       %i[message_id status status_detail accepted_at delivered_at opened_at from_address
-         from_name reply_to to subject body_input tags associated mailer content_eml_link]
+         from_name reply_to to subject body_input tags associated mailer encoded_eml_link]
     end
   end
 end

data/pg_engine/app/decorators/email_decorator.rb

@@ -14,7 +14,9 @@ class EmailDecorator < PgEngine::BaseDecorator
   #     end
   #   end
 
-  def content_eml_link
-    link_to 'Download', helpers.content_eml_admin_email_path(object), target: :_blank, rel: :noopener
+  def encoded_eml_link
+    return if object.encoded_eml.blank?
+
+    link_to 'Download', helpers.rails_blob_path(object.encoded_eml), target: :_blank, rel: :noopener
   end
 end

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

@@ -11,13 +11,17 @@ module PgEngine
 
     layout 'pg_layout/mailer'
 
+    # default delivery_method: :smtp
+
     rescue_from MailNotDelivered do |err|
-      # FIXME: marcar el Email en la DB como fallido
-      pg_err err
+      pg_warn err, :error
+      @email.update_columns(status: :failed, status_detail: err.to_s) # rubocop:disable Rails/SkipsModelValidations
     end
 
-    def mail
-      super.tap do |message|
+    protected
+
+    def mail(*args)
+      super(*args).tap do |message|
         # message.mailgun_options = {
         #   'tag' => email.tags,
         #   'tracking-opens' => true

data/pg_engine/app/models/email.rb

@@ -8,14 +8,13 @@
 #  accepted_at        :datetime
 #  associated_type    :string           indexed => [associated_id]
 #  body_input         :string
-#  content_eml        :string
 #  delivered_at       :datetime
 #  from_address       :string           not null
 #  from_name          :string
 #  mailer             :string
 #  opened_at          :datetime
 #  reply_to           :string
-#  status             :integer          default(0), not null
+#  status             :integer          default("pending"), not null
 #  status_detail      :string
 #  subject            :string
 #  tags               :string           is an Array
@@ -32,11 +31,12 @@
 #  fk_rails_...  (actualizado_por_id => users.id)
 #  fk_rails_...  (creado_por_id => users.id)
 #
-# generado con pg_rails
 
 class Email < ApplicationRecord
   audited
 
+  has_one_attached :encoded_eml
+
   belongs_to :associated, polymorphic: true, optional: true
 
   belongs_to :creado_por, optional: true, class_name: 'User'
@@ -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
 
@@ -66,16 +66,6 @@ class Email < ApplicationRecord
   after_initialize do
     self.from_address = ENV.fetch('DEFAULT_MAIL_FROM') if from_address.blank?
   end
-  # validates_format_of :subject, with: /\A[[[:alpha:]]\(\)\w\s.,;!¡?¿-]+\z/
-  # def strip_all(input)
-  #   return if input.blank?
-
-  #   strip_tags(input.strip)
-  # end
 
-  # def convert_br(input)
-  #   return if input.blank?
-
-  #   input.gsub("\n", '<br>').html_safe
-  # end
+  # validates_format_of :subject, with: /\A[[[:alpha:]]\(\)\w\s.,;!¡?¿-]+\z/
 end

data/pg_engine/app/policies/email_policy.rb

@@ -28,8 +28,4 @@ class EmailPolicy < ApplicationPolicy
   # def acceso_total?
   #   user.developer?
   # end
-
-  def content_eml?
-    acceso_total?
-  end
 end

data/pg_engine/config/routes.rb

@@ -9,11 +9,7 @@ Rails.application.routes.draw do
     registrations: 'users/registrations'
   }
   namespace :admin, path: 'a' do
-    pg_resource(:emails) do
-      member do
-        get :content_eml
-      end
-    end
+    pg_resource(:emails)
     pg_resource(:users)
     pg_resource(:accounts)
     pg_resource(:user_accounts)
@@ -98,7 +94,6 @@ end
 #                                              POST   /users/unlock(.:format)                                                                           devise/unlocks#create
 #                     abrir_modal_admin_emails GET    /a/emails/abrir_modal(.:format)                                                                   admin/emails#abrir_modal
 #                          buscar_admin_emails POST   /a/emails/buscar(.:format)                                                                        admin/emails#buscar
-#                      content_eml_admin_email GET    /a/emails/:id/content_eml(.:format)                                                               admin/emails#content_eml
 #                                 admin_emails GET    /a/emails(.:format)                                                                               admin/emails#index
 #                                              POST   /a/emails(.:format)                                                                               admin/emails#create
 #                              new_admin_email GET    /a/emails/new(.:format)                                                                           admin/emails#new

data/pg_engine/db/migrate/20240506194106_create_emails.rb

@@ -14,7 +14,6 @@ class CreateEmails < ActiveRecord::Migration[7.1]
       t.string :body_input
       t.string :tags, array: true
       t.references :associated, polymorphic: true, index: true
-      t.string :content_eml
       t.string :message_id
       t.string :mailer
       t.string :status_detail

data/pg_engine/lib/pg_engine/email_observer.rb

@@ -3,64 +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)
-      content_eml = message.encoded
-      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.update_columns(message_id:, mailer:, status:, content_eml:) # 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_engine/spec/controllers/admin/emails_controller_spec.rb

@@ -55,19 +55,6 @@ RSpec.describe Admin::EmailsController do
     end
   end
 
-  describe 'GET #content_eml' do
-    subject do
-      get :content_eml, params: { id: email.id }
-    end
-
-    let(:email) { create :email }
-
-    it do
-      subject
-      expect(response).to have_http_status(:ok)
-    end
-  end
-
   describe 'GET #index' do
     subject do
       get :index, params: {}
@@ -104,6 +91,7 @@ RSpec.describe Admin::EmailsController do
   describe 'GET #show' do
     it 'returns a success response' do
       email = create(:email)
+      email.encoded_eml.attach({ io: StringIO.new(Faker::Lorem.sentence), filename: 'email.eml' })
       get :show, params: { id: email.to_param }
       expect(response).to be_successful
     end

data/pg_engine/spec/factories/emails.rb

@@ -15,7 +15,6 @@ FactoryBot.define do
     body_input { Faker::Lorem.sentence }
     # tags { Faker::Lorem.sentence }
     # associated
-    # content_eml { Faker::Lorem.sentence }
     # message_id { Faker::Lorem.sentence }
     # mailer { Faker::Lorem.sentence }
     # status_detail { Faker::Lorem.sentence }

data/pg_rails/lib/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PgRails
-  VERSION = '7.0.8-alpha.57'
+  VERSION = '7.0.8-alpha.59'
 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.57
+  version: 7.0.8.pre.alpha.59
 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