pg_rails 7.0.8.pre.alpha.53 → 7.0.8.pre.alpha.54

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc65c537b0f07c6659a716cf31aca506a9da7d7ee43f6bbaa425a756864875ef
-  data.tar.gz: ba019b72eb7fac96fc364396da6890040a86b7743e2532e73c677a20809c546d
+  metadata.gz: 8e9b803dcc4fc1155fb31efdeb33f3ab8f7b25f43db8abc04cd851c35f8f9db1
+  data.tar.gz: c99433c397a93742e57a71736f602f8f3e3b7c093e82792bcdbb3230f79beb55
 SHA512:
-  metadata.gz: 46fe858cbdfde69a00935a3e92aa2524729a030217629556a3f4a6717b7f873c80ccf72fee9698f0599b0b7768ddd27b392273b01685eb556c46c236a1eb1450
-  data.tar.gz: 3be35c7a9db5507e1c84f62e3b405772986ffb3fd63a09b5a93f5fd54128fca897da7f707437e66556a5aee9f6d26bfe639bdf51dceac99f210730cfd089134d
+  metadata.gz: 534f5411925466cd4db3a5a0cb908c36f5212faceafd4a523e94f939d036f53b4db4ff5d52abed8675f4edc9eb783e2a17c900760a2f0ad6947ad9c01da7e87e
+  data.tar.gz: a116bda2dfc46a994cf7218364444d1488a8d4f4b285f74224766c82893dc545207f88a79dde19794662f27c9b79685ae63cd98974a099680a10b86e20f45a13

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

@@ -22,12 +22,36 @@ module PgEngine
 
     protect_from_forgery with: :exception
 
-    rescue_from PrintHelper::FechaInvalidaError, with: :fecha_invalida
+    rescue_from PgEngine::Error, with: :internal_error
     rescue_from Pundit::NotAuthorizedError, with: :not_authorized
     rescue_from Redirect do |e|
       redirect_to e.url
     end
 
+    def internal_error(error)
+      pg_err error
+
+      @error_msg = <<~HTML.html_safe # rubocop:disable Rails/OutputSafety
+        <div>
+          Ocurrió algo inesperado
+          <br>
+          Por favor, intentá nuevamente
+          <br>
+          o <a class="text-decoration-underline" href="#{new_public_mensaje_contacto_path}">ponete en contacto</a> y pronto lo resolveremos
+        </div>
+      HTML
+
+      respond_to do |format|
+        format.html do
+          render 'pg_layout/error', layout: 'pg_layout/containerized'
+        end
+        format.turbo_stream do
+          flash.now[:critical] = @error_msg
+          render turbo_stream: (turbo_stream.remove_all('.modal') + render_turbo_stream_flash_messages)
+        end
+      end
+    end
+
     before_action do
       Current.user = current_user
     end
@@ -47,8 +71,8 @@ module PgEngine
     layout 'pg_layout/base'
 
     # Los flash_types resultantes serían:
-    # [:alert, :notice, :warning, :success]
-    add_flash_types :warning, :success
+    # [:critical, :alert, :notice, :warning, :success]
+    add_flash_types :critical, :warning, :success
 
     before_action do
       console if dev_user_or_env? && (params[:show_web_console] || params[:wc])
@@ -76,32 +100,13 @@ module PgEngine
 
     protected
 
-    # TODO: ver qué pasa en producción
-    # def default_url_options(options = {})
-    #   if Rails.env.production?
-    #     options.merge(protocol: 'https')
-    #   else
-    #     options
-    #   end
-    # end
-
-    # TODO!: ver qué onda esto, tiene sentido acá?
-    def fecha_invalida
-      respond_to do |format|
-        format.json do
-          render json: { error: 'Formato de fecha inválido' },
-                 status: :unprocessable_entity
-        end
-        format.html { go_back('Formato de fecha inválido') }
-      end
-    end
-
     def not_authorized
       respond_to do |format|
         format.json do
           render json: { error: 'Acceso no autorizado' },
                  status: :unprocessable_entity
         end
+        # TODO: responder a turbo_stream
         format.html do
           if request.path == root_path
             # TODO!: renderear un 500.html y pg_err

data/pg_engine/app/controllers/public/mensaje_contactos_controller.rb

@@ -17,6 +17,10 @@ module Public
     def new; end
 
     def create
+      if Current.user.present?
+        @mensaje_contacto.email = Current.user.email
+        @mensaje_contacto.nombre = Current.user.nombre_completo
+      end
       if @mensaje_contacto.save
         render turbo_stream: turbo_stream.update('mensaje_contacto', partial: 'gracias')
       else

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

@@ -14,7 +14,7 @@ module PgEngine
       case flash_type
       when 'notice'
         'info'
-      when 'alert'
+      when 'critical', 'alert'
         'danger'
       when 'warning'
         'warning'

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

@@ -4,9 +4,6 @@ module PgEngine
   module PrintHelper
     include ActionView::Helpers::NumberHelper
 
-    class FechaInvalidaError < PgEngine::Error
-    end
-
     def mostrar_con_link(objeto, options = {})
       return if objeto.blank?
 
@@ -42,42 +39,36 @@ module PgEngine
     end
 
     def dmy_time(date)
-      date = parsear_tiempo(date) if date.is_a? String
       return if date.blank?
 
       date.strftime('%d/%m/%Y %H:%M')
     end
 
     def dmy(date)
-      date = parsear_fecha(date) if date.is_a? String
       return if date.blank?
 
       date.strftime('%d/%m/%Y')
     end
 
     def ymd(date)
-      date = parsear_fecha(date) if date.is_a? String
       return if date.blank?
 
       date.strftime('%Y/%m/%d')
     end
 
     def dmyg(date)
-      date = parsear_fecha(date) if date.is_a? String
       return if date.blank?
 
       date.strftime('%d-%m-%Y')
     end
 
     def ymdg(date)
-      date = parsear_fecha(date) if date.is_a? String
       return if date.blank?
 
       date.strftime('%Y-%m-%d')
     end
 
     def myg(date)
-      date = parsear_fecha(date) if date.is_a? String
       return if date.blank?
 
       date.strftime('%m-%Y')
@@ -142,22 +133,6 @@ module PgEngine
       end
     end
 
-    def parsear_tiempo(datetime)
-      return nil if datetime.blank?
-
-      DateTime.parse(datetime)
-    rescue ArgumentError
-      raise FechaInvalidaError, datetime
-    end
-
-    def parsear_fecha(date)
-      return nil if date.blank?
-
-      Date.parse(date)
-    rescue ArgumentError
-      raise FechaInvalidaError, date
-    end
-
     def show_percentage(value)
       return if value.blank?
 

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

@@ -8,8 +8,9 @@
           = f.mensajes_de_error
 
           = hidden_field_tag :asociable, true if asociable
-          = f.input :nombre, input_html: { style: 'max-width: 22em' }
-          = f.input :email, input_html: { style: 'max-width: 23em' }
+          - unless user_signed_in?
+            = f.input :nombre, input_html: { style: 'max-width: 22em' }
+            = f.input :email, input_html: { style: 'max-width: 23em' }
           = f.input :telefono, hint: '(Opcional)', input_html: { style: 'max-width: 15em' }
           = f.input :mensaje, as: :text, input_html: { rows: 5 }
           .mt-2

data/pg_engine/spec/controllers/pg_engine/base_controller_spec.rb

@@ -9,6 +9,10 @@ class DummyBaseController < PgEngine::BaseController
     raise Pundit::NotAuthorizedError
   end
 
+  def test_internal_error
+    raise PgEngine::Error
+  end
+
   def check_dev_user
     @dev_user_or_env = dev_user_or_env?
     @dev_user = dev_user?
@@ -20,6 +24,8 @@ end
 # rubocop:disable RSpec/FilePath
 # rubocop:disable RSpec/SpecFilePathFormat
 describe DummyBaseController do
+  render_views
+
   describe 'PgEngine::BaseController::Redirect' do
     before { get :action_with_redirect }
 
@@ -28,6 +34,39 @@ describe DummyBaseController do
     end
   end
 
+  describe 'internal_error' do
+    subject do
+      get :test_internal_error
+    end
+
+    around do |example|
+      PgEngine::PgLogger.raise_errors = false
+      example.run
+      PgEngine::PgLogger.raise_errors = true
+    end
+
+    it do
+      subject
+      expect(response).to have_http_status(:ok)
+      expect(response.body).to include 'Ocurrió algo inesperado'
+      expect(response.content_type).to include 'text/html'
+    end
+
+    context 'cuando acepta turbo stream' do
+      before do
+        request.headers['Accept'] = 'text/vnd.turbo-stream.html,text/html'
+      end
+
+      it do
+        subject
+        expect(response).to have_http_status(:ok)
+        expect(response.content_type).to include 'text/vnd.turbo-stream.html'
+        expect(response.body).to include 'Ocurrió algo inesperado'
+        expect(response.body).to include '<turbo-stream action="remove" targets=".modal">'
+      end
+    end
+  end
+
   describe 'not_authorized' do
     subject do
       get :test_not_authorized

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

@@ -7,14 +7,17 @@
     data-turbo-temporary="true"
     aria-live="assertive" aria-atomic="true" role="alert"
   ]
-    - case flash_type_to_class(flash_type)
-    - when 'danger'
+    - 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 'info'
+    - when 'notice'
       .bi.bi-info-circle.me-2
     = message
     button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"

data/pg_layout/app/views/pg_layout/error.html.erb

@@ -0,0 +1,11 @@
+<div class="d-flex justify-content-around">
+  <div class="alert alert-danger d-flex align-items-center">
+    <div>
+      <span class="bi bi-emoji-dizzy fs-1 me-3"></span>
+      <%# <span class="bi bi-exclamation-triangle fs-1 me-3"></span> %>
+    </div>
+    <div>
+      <%= @error_msg %>
+    </div>
+  </div>
+</div>

data/pg_rails/lib/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.0.8.pre.alpha.53
+  version: 7.0.8.pre.alpha.54
 platform: ruby
 authors:
 - Martín Rosso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-03 00:00:00.000000000 Z
+date: 2024-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -1017,6 +1017,7 @@ files:
 - 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
+- pg_layout/app/views/pg_layout/error.html.erb
 - pg_layout/lib/pg_layout.rb
 - pg_layout/lib/pg_layout/engine.rb
 - pg_layout/spec/lib/navbar_spec.rb