pg_rails 7.0.8.pre.alpha.80 → 7.0.8.pre.alpha.82

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60b0661bbe95efdd5b745287b125b28ae41ed84671ad954d15d012f93749620a
-  data.tar.gz: 0ebe72c73adbc1fe921b93e2a6743d2e364093e73d5b2076735eaff9f7dce021
+  metadata.gz: f155f16783603b8b6acd943855ce4d4996d92722235ec8eea4fe9cf82dd6efb0
+  data.tar.gz: 4403492bc1eaeecb807dd9bab487047b89681007100baf5e6758271a8967f163
 SHA512:
-  metadata.gz: a647a66a04033744632a1e42bbd79db9c8e2f958e90592a4bd763d868a63d140e3527386e3bad7cef441c9053ddd41ac3ffecabcd0046df7fd1d52f96ddd2500
-  data.tar.gz: 477837a7b13838e1283f88a871c61f4670642e72a7c83ad885160c53e0550b3e63f1e74a8cda4897e87b51262723d87848c490662ca2dd06dac29f4cce59e041
+  metadata.gz: 97f5a71981109ce5a8dac87ce5db0184e5c21fc906adc0863ca916e2b8868e5dc013ea46a924e42780b49e9d658faf32a8b5c34bcdf272edd549f848a4ad9918
+  data.tar.gz: 69dc1acfe7f80c080c4f0263f1904f9ceaff511da31a24e37ba5f77fa6e76fb4888af45313c7c41ab58b3fe3697cdaf46306c28c426bcac91e0badc84ad4aa69

data/pg_associable/app/javascript/asociable_controller.tsx

@@ -265,7 +265,7 @@ export default class extends Controller {
       this.buscando()
     }, 200)
     // console.log(`setTimeOut ${timerBuscandoId}`)
-    document.addEventListener('turbo:before-stream-render', (i) => {
+    document.addEventListener('turbo:before-stream-render', () => {
       // console.log(`clear before stream render ${timerBuscandoId}`)
       clearTimeout(timerBuscandoId)
     }, { once: true })
@@ -290,6 +290,7 @@ export default class extends Controller {
   }
 
   completarCampo (target) {
+    // FIXME: savedInputState = null
     const textField = this.element.querySelector('input[type=text]')
     const hiddenField = this.element.querySelector('input[type=hidden]')
 

data/pg_engine/app/controllers/concerns/pg_engine/resource.rb

@@ -92,7 +92,6 @@ module PgEngine
           if params[:asociable]
             format.turbo_stream do
               render turbo_stream:
-                # rubocop:disable Rails/SkipsModelValidations
                 turbo_stream.update_all('.modal.show .pg-associable-form', <<~HTML
                   <div data-modal-target="response" data-response='#{object.decorate.to_json}'></div>
                 HTML

data/pg_engine/app/controllers/pg_engine/base_controller.rb

@@ -91,7 +91,7 @@ module PgEngine
 
     protected
 
-    def not_authorized
+    def not_authorized(_arg_required_for_active_admin)
       respond_to do |format|
         format.json do
           render json: { error: 'Acceso no autorizado' },

data/pg_engine/app/helpers/pg_engine/flash_helper.rb

@@ -6,7 +6,6 @@ module PgEngine
 
     def render_turbo_stream_title
       title = [breadcrumbs.last&.name, I18n.t('app_name')].compact.join(' - ')
-      # rubocop:disable Rails/SkipsModelValidations
       turbo_stream.update_all 'title', title
       # rubocop:enable Rails/SkipsModelValidations
     end

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

@@ -2,34 +2,38 @@ module PgEngine
   class BaseMailer < ActionMailer::Base # rubocop:disable Rails/ApplicationMailer
     class MailNotDelivered < StandardError; end
 
-    before_action { @email = params[:email] }
-
-    default from: -> { email_address_with_name(@email.from_address, @email.from_name) },
-            reply_to: -> { @email.reply_to },
-            subject: -> { @email.subject },
-            to: -> { @email.to }
+    before_action { @email_object = params[:email_object] }
+
+    default from: lambda { |_mailer|
+                    if @email_object.present?
+                      email_address_with_name(@email_object.from_address, @email_object.from_name)
+                    else
+                      email_address_with_name(ENV.fetch('DEFAULT_MAIL_FROM'), ENV.fetch('DEFAULT_MAIL_FROM_NAME'))
+                    end
+                  },
+            reply_to: ->(_mailer) { @email_object.reply_to if @email_object.present? },
+            subject: ->(_mailer) { @email_object.subject if @email_object.present? },
+            to: ->(_mailer) { @email_object.to if @email_object.present? }
 
     layout 'pg_layout/mailer'
 
     # default delivery_method: :smtp
 
     rescue_from StandardError do |err|
-      pg_warn err, :error
-      if @email.present?
-        @email.update_columns(status: :failed, status_detail: err.to_s) # rubocop:disable Rails/SkipsModelValidations
-      end
+      pg_err err
+      @email_object.update_columns(status: :failed, status_detail: err.to_s) if @email_object.present?
     end
 
     protected
 
     def mail(*args)
-      @footer_href = root_url(m: @email.hashid)
+      @footer_href = root_url(m: @email_object&.hashid)
       super(*args).tap do |message|
         # message.mailgun_options = {
         #   'tag' => email.tags,
         #   'tracking-opens' => true
         # }
-        message['email'] = @email
+        message['email_object'] = @email_object if @email_object.present?
       end
     end
   end

data/pg_engine/app/models/email.rb

@@ -36,6 +36,8 @@ class Email < ApplicationRecord
   include Hashid::Rails
   audited
 
+  attr_accessor :require_body_input
+
   has_one_attached :encoded_eml
 
   belongs_to :associated, polymorphic: true, optional: true
@@ -61,6 +63,9 @@ class Email < ApplicationRecord
   validates :from_name, length: { within: 0..80 }
   validates :to, length: { within: 3..200 }
 
+  validates :body_input, length: { minimum: 10 }, if: -> { require_body_input }
+  validates :body_input, presence: true, if: -> { require_body_input }
+
   validates :from_name, :subject, :to,
             format: { with: /\A[^\n<>&]*\z/, message: 'contiene caracteres inválidos' }
 

data/pg_engine/config/initializers/active_admin.rb

@@ -105,7 +105,7 @@ ActiveAdmin.setup do |config|
   # because, by default, user gets redirected to Dashboard. If user
   # doesn't have access to Dashboard, he'll end up in a redirect loop.
   # Method provided here should be defined in application_controller.rb.
-  # config.on_unauthorized_access = :access_denied
+  config.on_unauthorized_access = :not_authorized
 
   # == Current User
   #

data/pg_engine/config/initializers/devise.rb

@@ -24,13 +24,13 @@ Devise.setup do |config|
   # Configure the e-mail address which will be shown in Devise::Mailer,
   # note that it will be overwritten if you use your own mailer class
   # with default "from" parameter.
-  config.mailer_sender = ENV.fetch('DEFAULT_MAIL_FROM', 'please-change-me-at-config-initializers-devise@example.com')
+  # config.mailer_sender = ""
 
   # Configure the class responsible to send e-mails.
   # config.mailer = 'Devise::Mailer'
 
   # Configure the parent class responsible to send e-mails.
-  # config.parent_mailer = 'ActionMailer::Base'
+  config.parent_mailer = 'ApplicationMailer'
 
   # ==> ORM configuration
   # Load and configure the ORM. Supports :active_record (default) and

data/pg_engine/config/locales/es.yml

@@ -65,6 +65,7 @@ es:
       timeout: ''
       unauthenticated: ''
     registrations:
+      signed_up_but_unconfirmed: Te enviamos un correo electrónico con instrucciones para confirmar tu cuenta.
       new:
         sign_up: Crear una cuenta
     passwords:
@@ -77,6 +78,28 @@ es:
         sign_up: Crear una cuenta
         forgot_your_password: ¿Olvidaste tu contraseña?
         didn_t_receive_confirmation_instructions: ¿No recibiste las instrucciones para confirmar tu cuenta?
+    mailer:
+      confirmation_instructions:
+        action: Confirmá tu cuenta
+        greeting: "Hola %{recipient}"
+        instruction: 'por favor, confirmá tu cuenta haciendo click en el siguiente enlace:'
+        subject: Confirmación de cuenta
+      email_changed:
+        greeting: "Hola %{recipient}"
+        message: Estamos contactando contigo para notificarte que tu email ha sido cambiado a %{email}.
+        message_unconfirmed: Nos estamos contactando contigo para notificarte que tu correo se está cambiando a %{email}.
+        subject: Email cambiado
+      password_change:
+        greeting: "Hola %{recipient}"
+        message: Lo estamos contactando para notificarle que su contraseña ha sido cambiada.
+        subject: Contraseña cambiada
+      reset_password_instructions:
+        action: Cambiar mi contraseña
+        greeting: "Hola %{recipient}"
+        instruction: "Para cambiar tu contraseña ingresá al siguiente link:"
+        instruction_2: Si no solicitaste cambiar tu contraseña, podés ignorar este correo.
+        instruction_3: Tu contraseña no será cambiada hasta que accedas al link y crees una nueva.
+        subject: Recuperación de contraseña
   activerecord:
     attributes:
       user:

data/pg_engine/lib/pg_engine/email_observer.rb

@@ -6,18 +6,18 @@ module PgEngine
       message_id = message.message_id
       mailer = message.delivery_handler.to_s
       status = get_status(message)
-      if message['email'].present?
-        email = message['email'].unparsed_value
-        email.update_columns(message_id:, mailer:, status:) # rubocop:disable Rails/SkipsModelValidations
+      if message['email_object'].present?
+        email_object = message['email_object'].unparsed_value
+        email_object.update_columns(message_id:, mailer:, status:)
       else
         to = [message.to].flatten.join(', ')
         from = [message.from].flatten.join(', ')
-        email = Email.create!(message_id:, subject: message.subject, to:, mailer:, status:, from_address: from,
-                              from_name: '')
+        email_object = Email.create!(message_id:, subject: message.subject, to:, mailer:, status:, from_address: from,
+                                     from_name: '')
       end
-      email.encoded_eml.attach({ io: StringIO.new(message.encoded), filename: "email-#{email.id}.eml" })
+      email_object.encoded_eml.attach({ io: StringIO.new(message.encoded), filename: "email-#{email_object.id}.eml" })
     rescue StandardError => e
-      pg_warn e, :error
+      pg_err e
     end
 
     def self.get_status(message)

data/pg_engine/lib/pg_engine/engine.rb

@@ -20,6 +20,9 @@ module PgEngine
     end
 
     initializer 'configurar_pg_rails' do
+      # Ensure required env variables are set
+      ENV.fetch('DEFAULT_MAIL_FROM')
+      ENV.fetch('DEFAULT_MAIL_FROM_NAME')
       # SimpleForm
       require "#{PgEngine::Engine.root}/config/simple_form/simple_form"
       require "#{PgEngine::Engine.root}/config/simple_form/simple_form_bootstrap"

data/pg_engine/spec/controllers/concerns/pg_engine/resource_helper_spec.rb

@@ -68,8 +68,8 @@ describe PgEngine::Resource do
       let(:param) { :categoria_de_cosa }
 
       before do
-        cosa_pri.categoria_de_cosa.update_column(:nombre, 'a') # rubocop:disable Rails/SkipsModelValidations
-        cosa_ult.categoria_de_cosa.update_column(:nombre, 'z') # rubocop:disable Rails/SkipsModelValidations
+        cosa_pri.categoria_de_cosa.update_column(:nombre, 'a')
+        cosa_ult.categoria_de_cosa.update_column(:nombre, 'z')
       end
 
       context 'si es asc' do

data/pg_engine/spec/features/signup_spec.rb

@@ -23,7 +23,7 @@ describe 'Al Registrarse', :js do
         fill_in 'user_password', with: 'admin123'
         fill_in 'user_password_confirmation', with: 'admin123'
         instance_exec('input[type=submit]', &find_scroll).click
-        expect(page).to have_text('Se ha enviado un mensaje con un enlace')
+        expect(page).to have_text('Te enviamos un correo electrónico con instrucciones')
       end
     end
 

data/pg_engine/spec/mailers/previews/devise_preview.rb

@@ -0,0 +1,13 @@
+# Preview all emails at http://localhost:3000/rails/mailers/cliente
+class DevisePreview < ActionMailer::Preview
+  # Preview this email at http://localhost:3000/rails/mailers/cliente/comprobante_recibido
+  def confirmation_instructions
+    # ClienteMailer.comprobante_recibido(VComprobante.find(params[:]))
+    Devise::Mailer.confirmation_instructions(User.first, 'TOKENN')
+  end
+
+  def reset_password_instructions
+    # ClienteMailer.comprobante_recibido(VComprobante.find(params[:]))
+    Devise::Mailer.reset_password_instructions(User.first, 'TOKENN')
+  end
+end

data/pg_layout/app/views/devise/mailer/confirmation_instructions.html.erb

@@ -1,4 +1,4 @@
-<p><%= t('.greeting', recipient: @email) %></p>
+<p><%= t('.greeting', recipient: @resource.nombre) %></p>
 
 <p><%= t('.instruction') %></p>
 

data/pg_layout/app/views/devise/mailer/email_changed.html.erb

@@ -1,4 +1,4 @@
-<p><%= t('.greeting', recipient: @email) %></p>
+<p><%= t('.greeting', recipient: @resource.nombre) %></p>
 
 <% if @resource.try(:unconfirmed_email?) %>
   <p><%= t('.message_unconfirmed', email: @resource.unconfirmed_email) %></p>

data/pg_layout/app/views/devise/mailer/password_change.html.erb

@@ -1,3 +1,3 @@
-<p><%= t('.greeting', recipient: @resource.email) %></p>
+<p><%= t('.greeting', recipient: @resource.nombre) %></p>
 
 <p><%= t('.message') %></p>

data/pg_layout/app/views/devise/mailer/reset_password_instructions.html.erb

@@ -1,4 +1,4 @@
-<p><%= t('.greeting', recipient: @resource.email) %></p>
+<p><%= t('.greeting', recipient: @resource.nombre) %></p>
 
 <p><%= t('.instruction') %></p>
 

data/pg_layout/app/views/devise/mailer/unlock_instructions.html.erb

@@ -1,4 +1,4 @@
-<p><%= t('.greeting', recipient: @resource.email) %></p>
+<p><%= t('.greeting', recipient: @resource.nombre) %></p>
 
 <p><%= t('.message') %></p>
 

data/pg_rails/lib/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.0.8.pre.alpha.80
+  version: 7.0.8.pre.alpha.82
 platform: ruby
 authors:
 - Martín Rosso
@@ -1084,6 +1084,7 @@ files:
 - pg_engine/spec/lib/pg_engine/mailgun/log_sync_spec.rb
 - pg_engine/spec/lib/pg_engine/utils/pg_engine/pg_logger_spec.rb
 - pg_engine/spec/lib/pg_form_builder_spec.rb
+- pg_engine/spec/mailers/previews/devise_preview.rb
 - pg_engine/spec/models/account_spec.rb
 - pg_engine/spec/models/email_spec.rb
 - pg_engine/spec/models/mensaje_contacto_spec.rb