pg_rails 7.0.8.pre.alpha.62 → 7.0.8.pre.alpha.64

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: afcf64379ab25a58e3b1d626f71371cc63448503880d182b8ad1e1164dbccf7e
-  data.tar.gz: 9917f1be640ccdbabbc1d7c12ca561d5714f1b4227e3899c3c1cc96749157284
+  metadata.gz: 897b3e763decbc3633e769f5c80b03b2ac4beeb6d7870418205890f07be921a3
+  data.tar.gz: bcb3121b4f5c7dbdbf43f7363121617fdc1576b37fae413b508e947e68b1789b
 SHA512:
-  metadata.gz: a620ba16efe37ac2794a11676bcecb89ad101053abcb04147a246b2c3d074de03799b01d1d0ad7578855d05347f793aec52a62a6722a4e755ee161aa156a98bf
-  data.tar.gz: 8d63151e40a4a105137d3a097b9ec09690c159b2130620d078bc5c428895522631c5ffc732acd20b4cd32094470f2e72aca5a05050e13cfc8381207662d61c2a
+  metadata.gz: 14f270d418616143ce27842e5ea615760ad472fdd81f758a41303a3cb45173b57beaec9ff54cdea07ef0b1200f02cfe24e2e978476f41d82f74627ce1de4c34c
+  data.tar.gz: e66b21ddb42ee202b0bcd62b5e6cb0a22f16e6f5561edbc4e142b12acdcc91bd0131402dfef49f20db159fff99b05b76d5f57db9a53acec4ad92251d3e46ee42

data/pg_engine/app/assets/config/pg_engine_manifest.js

@@ -0,0 +1 @@
+//= link_tree ../images

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

@@ -20,8 +20,6 @@ module PgEngine
     def index
       @collection = filtros_y_policy atributos_para_buscar
       @collection = sort_collection(@collection)
-      @records_filtered = policy_scope(clase_modelo).any? if @collection.empty?
-      # FIXME: si hay pero en páginas anteriores, mostrar texto correspondiente
       pg_respond_index
     end
 
@@ -208,6 +206,7 @@ module PgEngine
 
     def render_listing
       @collection = @collection.page(params[:page]).per(current_page_size)
+      @records_filtered = default_scope_for_current_model.any? if @collection.empty?
     end
 
     def buscar_instancia
@@ -272,6 +271,12 @@ module PgEngine
       @filtros.filtrar(scope)
     end
 
+    def default_scope_for_current_model
+      PgEngine::FiltrosBuilder.new(
+        self, clase_modelo, []
+      ).filtrar(policy_scope(clase_modelo))
+    end
+
     def do_sort(scope, field, direction)
       # TODO: restringir ciertos campos?
       unless scope.model.column_names.include?(field.to_s) ||
@@ -306,7 +311,7 @@ module PgEngine
         direction = options[:default].first[1]
         do_sort(scope, field, direction)
       else
-        scope
+        do_sort(scope, 'id', 'desc')
       end
     end
   end

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

@@ -22,7 +22,7 @@ module PgEngine
 
     protect_from_forgery with: :exception
 
-    rescue_from PgEngine::Error, with: :internal_error
+    rescue_from StandardError, with: :internal_error
     rescue_from Pundit::NotAuthorizedError, with: :not_authorized
     rescue_from Redirect do |e|
       redirect_to e.url

data/pg_engine/app/controllers/users/registrations_controller.rb

@@ -21,7 +21,7 @@ module Users
 
     def render_message
       msg = <<~HTML
-        <div class="alert alert-info mt-4">
+        <div class="alert alert-info mt-4 d-inline-block">
           #{I18n.t 'devise.registrations.signed_up_but_unconfirmed'}
         </div>
       HTML

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

@@ -5,8 +5,9 @@ module PgEngine
     end
 
     def render_turbo_stream_title
+      title = [breadcrumbs.last&.name, I18n.t('app_name')].compact.join(' - ')
       # rubocop:disable Rails/SkipsModelValidations
-      turbo_stream.update_all 'title', "#{breadcrumbs.last&.name} - #{Rails.application.class.module_parent_name}"
+      turbo_stream.update_all 'title', title
       # rubocop:enable Rails/SkipsModelValidations
     end
 

data/pg_engine/app/helpers/pg_engine/print_helper.rb

@@ -92,7 +92,7 @@ module PgEngine
     def print_currency(number, simbolo: '$', precision: nil)
       return if number.blank?
 
-      # FIXME: testear
+      # TODO!: testear
       precision ||= if (number % 0.01).positive?
                       3
                     else

data/pg_engine/app/lib/pg_engine/devise_failure_app.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module PgEngine
+  class DeviseFailureApp < Devise::FailureApp
+    def respond
+      if warden_message == :unconfirmed
+        render_unconfirmed
+      else
+        super
+      end
+    end
+
+    private
+
+    def user_email
+      params[:user][:email]
+    rescue StandardError => e
+      pg_warn e, :warn
+    end
+
+    def render_unconfirmed
+      self.content_type = 'text/vnd.turbo-stream.html'
+      self.status = 200
+      self.response_body = <<~HTML
+        <turbo-stream action="update" target="flash">
+          <template>
+            <div class="alert alert-warning d-flex align-items-center">
+              <div class="bi bi-exclamation-circle me-3"></div>
+              <span>
+                Tu cuenta aún no está confirmada.
+                <br>
+                Revisá tu bandeja de entrada o&nbsp;
+                <a href="/users/confirmation/new?email=#{user_email}">hacé click acá para reenviar el correo</a>
+              </span>
+            </div>
+          </template>
+        </turbo-stream>
+      HTML
+    end
+  end
+end

data/pg_engine/app/models/email.rb

@@ -52,7 +52,7 @@ class Email < ApplicationRecord
 
   validate do
     if to.present? && !to.split(/[,;]/).all? { |dest| dest.match(/\A[^@\s]+@[^@\s]+\z/) }
-      # FIXME: testear
+      # TODO!: testear
       errors.add(:to, 'no es válido')
     end
   end

data/pg_engine/app/views/public/mensaje_contactos/_gracias.html.slim

@@ -5,4 +5,4 @@
         h4 Gracias por tu mensaje
         p.m-0 Te responderemos a la brevedad
       .col-auto.fs-2
-        | 🌱
+        = image_tag 'plantita-sm', width: '30px'

data/pg_engine/app/views/public/mensaje_contactos/new.html.slim

@@ -1,4 +1,8 @@
 / # locals: (object: nil, asociable: false)
+
+.d-none
+  / Preload
+  = image_tag 'plantita-sm'
 .text-center
   #mensaje_contacto
     h2 Ponete en contacto

data/pg_engine/config/routes.rb

@@ -7,7 +7,7 @@ Rails.application.routes.draw do
   devise_for :users, controllers: {
     confirmations: 'users/confirmations',
     registrations: 'users/registrations'
-  }
+  }, failure_app: PgEngine::DeviseFailureApp
   namespace :admin, path: 'a' do
     pg_resource(:emails)
     pg_resource(:users)

data/pg_engine/lib/pg_engine/email_observer.rb

@@ -2,23 +2,20 @@
 
 module PgEngine
   class EmailObserver
-    def self.delivered_email(message)
+    def self.delivered_email(message) # rubocop:disable Metrics/AbcSize
       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
-        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))
+        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: '')
       end
+      email.encoded_eml.attach({ io: StringIO.new(message.encoded), filename: "email-#{email.id}.eml" })
     rescue StandardError => e
       pg_warn e, :error
     end

data/pg_engine/spec/controllers/devise/sessions_controller_spec.rb

@@ -15,4 +15,27 @@ describe Devise::SessionsController do
       expect(response).to have_http_status(:ok)
     end
   end
+
+  describe '#create' do
+    subject do
+      post :create, params: { user: { email: user.email, password: } }
+    end
+
+    let(:password) { 'cosas1234' }
+    let(:confirmed_at) { nil }
+    let(:user) { create :user, confirmed_at:, password: }
+
+    it do
+      subject
+      expect(response.body).to include 'Tu cuenta aún no está confirmada.'
+    end
+
+    context 'cuando está confirmado' do
+      let(:confirmed_at) { Time.zone.now }
+
+      it do
+        expect { subject }.to change(controller, :user_signed_in?).from(false).to(true)
+      end
+    end
+  end
 end

data/pg_layout/app/javascript/application.js

@@ -33,8 +33,8 @@ Rollbar.configure({
   }
 })
 
-document.addEventListener('turbo:load', bindToasts)
-document.addEventListener('turbo:render', bindToasts)
+document.addEventListener('turbo:load', bindAndObserveToasts)
+document.addEventListener('turbo:render', bindAndObserveToasts)
 
 document.addEventListener('turbo:before-cache', () => {
   document.querySelectorAll('.offcanvas-backdrop').forEach((el) => {
@@ -45,9 +45,20 @@ document.addEventListener('turbo:before-cache', () => {
   })
 })
 
-function bindToasts () {
-  const toastElList = document.querySelectorAll('.toast:not(.hide):not(.show)')
-  Array.from(toastElList).map(toastEl => new bootstrap.Toast(toastEl).show())
+function bindToastElements () {
+  const toastQuery = '.pg-toast:not(.hide):not(.show)'
+
+  const toastElList = document.querySelectorAll(toastQuery)
+  Array.from(toastElList).each(toastEl => {
+    new bootstrap.Toast(toastEl).show()
+    toastEl.addEventListener('hidden.bs.toast', () => {
+      toastEl.remove()
+    })
+  })
+}
+
+function bindAndObserveToasts () {
+  bindToastElements()
 
   // Select the node that will be observed for mutations
   const targetNode = document.getElementById('flash')
@@ -59,11 +70,7 @@ function bindToasts () {
   const callback = (mutationList, observer) => {
     for (const mutation of mutationList) {
       if (mutation.type === 'childList') {
-        // console.log('A child node has been added or removed.')
-        const toastElList = document.querySelectorAll('.toast:not(.hide):not(.show)')
-        Array.from(toastElList).map(toastEl => new bootstrap.Toast(toastEl).show())
-      } else if (mutation.type === 'attributes') {
-        // console.log(`The ${mutation.attributeName} attribute was modified.`)
+        bindToastElements()
       }
     }
   }

data/pg_layout/app/javascript/controllers/navbar_controller.js

@@ -5,7 +5,8 @@ import { fadeOut, fadeIn } from './../utils/utils'
 export default class extends Controller {
   connect () {
     if (document.getElementById('sidebar').classList.contains('opened')) {
-      document.querySelector('.navbar .navbar-brand').style.visibility = 'hidden'
+      const brand = document.querySelector('.navbar .navbar-brand')
+      if (brand) brand.style.visibility = 'hidden'
     }
   }
 

data/pg_layout/app/javascript/controllers/pg_form_controller.js

@@ -16,9 +16,9 @@ export default class extends Controller {
       const baseAlert = document.querySelector('.alert-danger')
       if (!invalidField && !baseAlert) {
         const errorTitle = this.element.querySelector('.error-title')
-        // FIXME: testear con capybara
+        // TODO!: testear con capybara
         errorTitle.innerText = 'Lo lamentamos mucho pero ocurrió algo inesperado. Por favor, intentá nuevamente o ponete en contacto con nosotros.'
-        // FIXME: link a contacto
+        // TODO!: link a contacto
         const form = this.element.querySelector('form')
         const errorMsg = `${form.id} - ${form.action} - ${form.dataset.errors}`
         console.error(errorMsg)

data/pg_layout/app/lib/navbar.rb

@@ -39,7 +39,7 @@ class Navbar
         show: item['policy'] ? eval(item['policy']) : true
       }
     rescue StandardError
-      # FIXME: testear
+      # TODO!: testear
       pg_err item
       return []
     end

data/pg_layout/app/views/devise/confirmations/new.html.erb

@@ -1,5 +1,3 @@
-<h2><%= t(".resend_confirmation_instructions") %></h2>
-
 <%= pg_form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| %>
   <%= f.mensajes_de_error %>
   <%= f.full_error :confirmation_token %>
@@ -9,7 +7,7 @@
                 required: true,
                 autofocus: true,
                 value: (resource.pending_reconfirmation? ? resource.unconfirmed_email : resource.email),
-                input_html: { autocomplete: "email" } %>
+                input_html: { value: params[:email], autocomplete: "email" } %>
   </div>
 
   <div class="form-actions">

data/pg_layout/app/views/layouts/pg_layout/base.html.slim

@@ -1,8 +1,16 @@
 doctype html
 html
   head
-    title = Rails.application.class.module_parent_name
+    meta charset="UTF-8"
+    meta http-equiv="X-UA-Compatible" content="IE=edge"
     meta name="viewport" content="width=device-width,initial-scale=1"
+    - cache :title_icon
+      title = t('app_name')
+      - begin
+        = render partial: 'layouts/favicon'
+      - rescue ActionView::MissingTemplate => e
+        - pg_err e
+
     - if @turbo_no_cache
       meta name="turbo-cache-control" content="no-cache"
     / El morph no estaría siendo de utilidad

data/pg_layout/app/views/pg_layout/_flash.html.slim

@@ -2,22 +2,4 @@
 - flash_to_show = flash.select { |fm| fm[0].to_sym.in?(ApplicationController._flash_types) && fm[1].present? }
 / slim-lint:enable LineLength
 - flash_to_show.each do |flash_type, message|
-  .alert.alert-dismissible[
-    class="mt-2 d-flex align-items-center alert-#{flash_type_to_class(flash_type)}"
-    data-turbo-temporary="true"
-    aria-live="assertive" aria-atomic="true" role="alert"
-  ]
-    - case flash_type
-    - when 'critical'
-      / .bi.bi-emoji-dizzy.me-3.fs-2
-      .bi.bi-exclamation-triangle-fill.me-3.fs-2
-    - when 'alert'
-      .bi.bi-exclamation-triangle-fill.me-2
-    - when 'warning'
-      .bi.bi-exclamation-circle.me-2
-    - when 'success'
-      .bi.bi-check-lg.me-2
-    - when 'notice'
-      .bi.bi-info-circle.me-2
-    = message
-    button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"
+  = render partial: 'pg_layout/flash_inner', locals: { flash_type:, message:, toast: flash[:toast] }

data/pg_layout/app/views/pg_layout/_flash_container.html.slim

@@ -1,3 +1,3 @@
 #flash-wrapper.d-flex.justify-content-around
-  #flash.flash
+  #flash.flash.position-relative.w-100.d-flex.justify-content-center
     = render partial: 'pg_layout/flash'

data/pg_layout/app/views/pg_layout/_flash_inner.html.slim

@@ -0,0 +1,24 @@
+/ # locals: (flash_type:, message:, toast: false)
+
+.alert.alert-dismissible[
+  class="
+    mt-2 d-flex align-items-center
+    alert-#{flash_type_to_class(flash_type)}
+    #{'position-absolute pg-toast' if toast}"
+  data-turbo-temporary="true" data-bs-autohide="true"
+  aria-live="assertive" aria-atomic="true" role="alert"
+]
+  - case flash_type
+  - when 'critical'
+    / .bi.bi-emoji-dizzy.me-3.fs-2
+    .bi.bi-exclamation-triangle-fill.me-3.fs-2
+  - when 'alert'
+    .bi.bi-exclamation-triangle-fill.me-2
+  - when 'warning'
+    .bi.bi-exclamation-circle.me-2
+  - when 'success'
+    .bi.bi-check-lg.me-2
+  - when 'notice'
+    .bi.bi-info-circle.me-2
+  = message
+  button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"

data/pg_rails/lib/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.0.8.pre.alpha.62
+  version: 7.0.8.pre.alpha.64
 platform: ruby
 authors:
 - Martín Rosso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-08 00:00:00.000000000 Z
+date: 2024-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -906,6 +906,9 @@ files:
 - pg_engine/app/admin/mensaje_contactos.rb
 - pg_engine/app/admin/user_accounts.rb
 - pg_engine/app/admin/users.rb
+- pg_engine/app/assets/config/pg_engine_manifest.js
+- pg_engine/app/assets/images/plantita-sm.png
+- pg_engine/app/assets/images/plantita.png
 - pg_engine/app/assets/javascripts/active_admin.js
 - pg_engine/app/assets/stylesheets/active_admin.scss
 - pg_engine/app/assets/stylesheets/pg_rails_b5.scss
@@ -935,6 +938,7 @@ files:
 - pg_engine/app/helpers/pg_engine/print_helper.rb
 - pg_engine/app/helpers/pg_engine/route_helper.rb
 - pg_engine/app/inputs/pg_engine/fecha_input.rb
+- pg_engine/app/lib/pg_engine/devise_failure_app.rb
 - pg_engine/app/lib/pg_engine/error_helper.rb
 - pg_engine/app/lib/pg_engine/filtros_builder.rb
 - pg_engine/app/lib/pg_form_builder.rb
@@ -1089,6 +1093,7 @@ files:
 - pg_layout/app/views/pg_layout/_error.html.erb
 - pg_layout/app/views/pg_layout/_flash.html.slim
 - pg_layout/app/views/pg_layout/_flash_container.html.slim
+- pg_layout/app/views/pg_layout/_flash_inner.html.slim
 - pg_layout/app/views/pg_layout/_navbar.html.erb
 - pg_layout/app/views/pg_layout/_sidebar.html.erb
 - pg_layout/app/views/pg_layout/_sidebar_mobile.html.erb