pg_rails 7.0.8.pre.alpha.62 → 7.0.8.pre.alpha.63

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: afcf64379ab25a58e3b1d626f71371cc63448503880d182b8ad1e1164dbccf7e
-  data.tar.gz: 9917f1be640ccdbabbc1d7c12ca561d5714f1b4227e3899c3c1cc96749157284
+  metadata.gz: 8d32d439bc5fe9dd6527c13d1800daf3381c2590b883844e772ca336732efeec
+  data.tar.gz: f9aff03d93288060f00dfb7efcb6c9160ffc2f7ac6ba9cd3c59aa6f3934d5bbe
 SHA512:
-  metadata.gz: a620ba16efe37ac2794a11676bcecb89ad101053abcb04147a246b2c3d074de03799b01d1d0ad7578855d05347f793aec52a62a6722a4e755ee161aa156a98bf
-  data.tar.gz: 8d63151e40a4a105137d3a097b9ec09690c159b2130620d078bc5c428895522631c5ffc732acd20b4cd32094470f2e72aca5a05050e13cfc8381207662d61c2a
+  metadata.gz: 397c4960f4e804ed8b88096542573b34475a935426db607cb14542a70991697c76404bae1460b0a8859eb3dbe6eefc2b9f829ebebf9cb019a9501b89c5b24790
+  data.tar.gz: dd5e763c4fe36a2f5b7115dffcadceba504e8bdd99a874c727e5ce1197698dafadb142b5601ada51d61a980421c6beef2fbea865fa3df1a15dd0391e96054d82

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) ||

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/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_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.63'
 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.63
 platform: ruby
 authors:
 - Martín Rosso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-08 00:00:00.000000000 Z
+date: 2024-05-09 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