pg_rails 7.0.8.pre.alpha.54 → 7.0.8.pre.alpha.56

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e9b803dcc4fc1155fb31efdeb33f3ab8f7b25f43db8abc04cd851c35f8f9db1
-  data.tar.gz: c99433c397a93742e57a71736f602f8f3e3b7c093e82792bcdbb3230f79beb55
+  metadata.gz: f7a80ab1d7122dd57f2e7a7d22a28c8c276bcaafd69da7cbf662ce630420fde9
+  data.tar.gz: 7f28e94ae447b35715c01dfa3c130db7bdc5ab2972a10f30e082fc6edd0fb60d
 SHA512:
-  metadata.gz: 534f5411925466cd4db3a5a0cb908c36f5212faceafd4a523e94f939d036f53b4db4ff5d52abed8675f4edc9eb783e2a17c900760a2f0ad6947ad9c01da7e87e
-  data.tar.gz: a116bda2dfc46a994cf7218364444d1488a8d4f4b285f74224766c82893dc545207f88a79dde19794662f27c9b79685ae63cd98974a099680a10b86e20f45a13
+  metadata.gz: 17bfb418de01d503c8e66bba436a31bf0d807396336e343f3bc202aef3ecadd665227329023b9b5d5f244b6be66ba7f6cadb44cafba90e8b706ee33b1461882e
+  data.tar.gz: f2cc161384fb6316203459232f9ccb97b6b3c2f5832cc4a143ee5f27fb460da8247f0046ba5b470659d54beb62c463d5bfaa905c9fd7e5a4093a7e3402207943

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

@@ -31,22 +31,12 @@ module PgEngine
     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
+          flash.now[:critical] = self.class.render(partial: 'pg_layout/default_error_message')
           render turbo_stream: (turbo_stream.remove_all('.modal') + render_turbo_stream_flash_messages)
         end
       end

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

@@ -49,6 +49,7 @@ describe DummyBaseController do
       subject
       expect(response).to have_http_status(:ok)
       expect(response.body).to include 'Ocurrió algo inesperado'
+      expect(response.body).to include '<html'
       expect(response.content_type).to include 'text/html'
     end
 

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

@@ -0,0 +1,13 @@
+<%# locals: (error_msg: nil) %>
+
+<div>
+  <div class="mb-1">
+    <%= error_msg || 'Ocurrió algo inesperado' %>
+  </div>
+  Por favor, intentá nuevamente
+  <br>
+  o <a class="text-decoration-underline" href="<%= new_public_mensaje_contacto_path %>">dejá un mensaje</a>
+  para que te avisemos
+  <br>
+  cuando el problema esté resuelto 🙏
+</div>

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

@@ -0,0 +1,13 @@
+<%# locals: (error_msg: nil) %>
+
+<div class="d-flex justify-content-around mt-2">
+  <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>
+      <%= render partial: 'pg_layout/default_error_message', locals: { error_msg: } %>
+    </div>
+  </div>
+</div>

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

@@ -1,11 +1,2 @@
-<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>
+<%# Se renderea en el rescue de base_controller %>
+<%= render partial: 'pg_layout/error' %>

data/pg_rails/lib/version.rb

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

data/pg_scaffold/lib/generators/pg_rspec/scaffold/templates/controller_spec.rb

@@ -241,7 +241,7 @@ RSpec.describe <%= controller_class_name %>Controller do
 
   describe 'DELETE #destroy' do
     subject do
-      request.headers['Accept'] = "text/vnd.turbo-stream.html,text/html"
+      request.headers['Accept'] = 'text/vnd.turbo-stream.html,text/html'
       delete :destroy, params: { id: <%= file_name %>.to_param, redirect_to: redirect_url }
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.0.8.pre.alpha.54
+  version: 7.0.8.pre.alpha.56
 platform: ruby
 authors:
 - Martín Rosso
@@ -1012,6 +1012,8 @@ files:
 - pg_layout/app/views/layouts/pg_layout/container_logo.html.slim
 - pg_layout/app/views/layouts/pg_layout/containerized.html.slim
 - pg_layout/app/views/layouts/pg_layout/devise.html.slim
+- pg_layout/app/views/pg_layout/_default_error_message.html.erb
+- 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/_navbar.html.erb