pg_rails 7.0.8.pre.alpha.97 → 7.0.8.pre.alpha.99

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d7fba0202ac234cf41de948b3ee244e94644114c8ac921bb8804e1dc4c57bdd
-  data.tar.gz: 320425763425f09994dbc189501899f25cf5596366d9b517ef6dea963b17bd4b
+  metadata.gz: 5eec38e939cd0d6ff81cd8cdf6d90eab6ea2e9ad52e0ac2a037f72708912430b
+  data.tar.gz: f2a4a37206c8593891d74bfc24f2928ee4698f23b1ca89c5e71cf21515e0f486
 SHA512:
-  metadata.gz: 9b6d04d3ce8eccfab6e5f9e287c82dee9569512a3a9a5ed7f7c5a7939e6892d32ce22a2d6ef44b75e995bab48356c5a21d996ef125686d17a25d044ba74f7495
-  data.tar.gz: 0d2f2c9c8c035949dbb688e57d9c3b326936d8260e2bb420b32c3c866a18cd93cc5d0a06735beda1549cc5069d928da4ea6062bd581dc7c234a9046a9aa7b062
+  metadata.gz: 54e5d70844d9f3b49c9747807ba72a90d764000263497a18e45087ba110d50c5eb090769c1602be21a1705660fefe8f8c0fa8e2ba5916d172c8abb500c88c95e
+  data.tar.gz: d40747733ad590ca22b37971ddc724454ec3259422176e50dbec5d7d74168d42600d32586d33e741257bffa6fa2714a40acdba466290519011980c73d0153815

data/pg_engine/app/assets/stylesheets/notifications.scss

@@ -3,7 +3,7 @@
   align-items: center;
   flex-direction: column;
   gap: 5px;
-  background-color: #6a2a05;
+  background-color: $primary;
   padding: 1.5em 5px;
 }
 

data/pg_engine/app/components/page_not_found_component.rb

@@ -0,0 +1,18 @@
+class PageNotFoundComponent < BaseComponent
+  def alert_wrapped(view_context)
+    AlertComponent.new(type: alert_type, dismissible: false)
+                  .with_content(render_in(view_context))
+  end
+
+  def alert_type
+    :warning
+  end
+
+  erb_template <<~ERB
+    <div>
+      <div class="mb-1">
+        La página que buscás no existe
+      </div>
+    </div>
+  ERB
+end

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

@@ -218,6 +218,8 @@ module PgEngine
       else
         @clase_modelo.find(params[:id])
       end
+    rescue ActiveRecord::RecordNotFound
+      raise PgEngine::PageNotFoundError
     end
 
     def set_instancia_modelo

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

@@ -27,6 +27,7 @@ module PgEngine
                 with: :invalid_authenticity_token
 
     rescue_from Pundit::NotAuthorizedError, with: :not_authorized
+    rescue_from PgEngine::PageNotFoundError, with: :page_not_found
     rescue_from Redirect do |e|
       redirect_to e.url
     end
@@ -43,6 +44,15 @@ module PgEngine
       render_my_component(BadRequestComponent.new, :bad_request)
     end
 
+    def page_not_found
+      render_my_component(PageNotFoundComponent.new, :not_found)
+    end
+
+    # Para cachear el html y guardarlo en public/500.html
+    def internal_error_but_with_status200
+      render_my_component(InternalErrorComponent.new, :ok)
+    end
+
     before_action do
       Current.user = current_user
     end

data/pg_engine/config/routes.rb

@@ -2,6 +2,11 @@ include PgEngine::RouteHelpers
 
 Rails.application.routes.draw do
   get "pg_engine/health" => "pg_engine/health#show", as: :pg_engine_health_check
+
+  get '404', to: 'pg_engine/base#page_not_found'
+  get '500', to: 'pg_engine/base#internal_error'
+  get 'internal_error_but_with_status200', to: 'pg_engine/base#internal_error_but_with_status200'
+
   namespace :public, path: '' do
     pg_resource(:mensaje_contactos, only: [:new, :create], path: 'contacto')
     post 'webhook/mailgun', to: 'webhooks#mailgun'

data/pg_engine/lib/pg_engine/engine.rb

@@ -13,6 +13,10 @@ module PgEngine
       g.fallbacks[:pg_active_record] = :active_record
     end
 
+    initializer 'pg_engine.set_exceptions_app' do
+      Rails.application.config.exceptions_app = Rails.application.routes
+    end
+
     initializer 'pg_engine.set_factory_paths', after: 'factory_bot.set_factory_paths' do
       # Para que tome las factories de pg_engine/spec/factories
       # además de las de dummy/spec/factories

data/pg_engine/lib/pg_engine/error.rb

@@ -1,4 +1,7 @@
 module PgEngine
   class Error < StandardError
   end
+
+  class PageNotFoundError < Error
+  end
 end

data/pg_engine/spec/components/alert_component_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.fdescribe AlertComponent, type: :component do
+RSpec.describe AlertComponent, type: :component do
   subject do
     render_inline(alert).to_html
   end

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

@@ -3,6 +3,25 @@ require 'rails_helper'
 describe PgEngine::Resource do
   let(:instancia) { Admin::CategoriaDeCosasController.new }
 
+  describe '#buscar_instancia cuando no existe el record' do
+    subject do
+      instancia.send(:buscar_instancia)
+    end
+
+    let(:request) { double }
+
+    before do
+      allow(request).to receive_messages(filtered_parameters: { id: 321 },
+                                         parameters: { id: 321 })
+      allow(instancia).to receive(:request).and_return(request)
+      instancia.set_clase_modelo
+    end
+
+    fit do
+      expect { subject }.to raise_error(PgEngine::PageNotFoundError)
+    end
+  end
+
   describe '#buscar_instancia' do
     subject do
       instancia.send(:buscar_instancia)

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

@@ -22,7 +22,7 @@ end
 
 # rubocop:disable RSpec/FilePath
 # rubocop:disable RSpec/SpecFilePathFormat
-fdescribe DummyBaseController do
+describe DummyBaseController do
   render_views
 
   describe 'PgEngine::BaseController::Redirect' do

data/pg_engine/spec/requests/base_controller_requests_spec.rb

@@ -1,6 +1,17 @@
 require 'rails_helper'
 
-fdescribe 'Base requests' do
+describe 'Base requests' do
+  describe 'internal_error_but_with_status200' do
+    subject do
+      get '/internal_error_but_with_status200'
+    end
+
+    it do
+      subject
+      expect(response).to have_http_status(:ok)
+    end
+  end
+
   describe 'invalid authenticity token' do
     subject { get '/admin/cosas', headers: }
 

data/pg_engine/spec/system/alerts_spec.rb

@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-fdescribe 'Alertas' do
+describe 'Alertas' do
   before do
     driven_by ENV['DRIVER']&.to_sym || :selenium_chrome_headless_iphone
   end

data/pg_engine/spec/system/send_mail_spec.rb

@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-fdescribe 'Enviar email' do
+describe 'Enviar email' do
   include ActiveJob::TestHelper
 
   subject do

data/pg_rails/lib/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.0.8.pre.alpha.97
+  version: 7.0.8.pre.alpha.99
 platform: ruby
 authors:
 - Martín Rosso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-13 00:00:00.000000000 Z
+date: 2024-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -991,6 +991,7 @@ files:
 - pg_engine/app/components/flash_container_component.rb
 - pg_engine/app/components/internal_error_component.rb
 - pg_engine/app/components/notification_component.rb
+- pg_engine/app/components/page_not_found_component.rb
 - pg_engine/app/controllers/admin/accounts_controller.rb
 - pg_engine/app/controllers/admin/email_logs_controller.rb
 - pg_engine/app/controllers/admin/emails_controller.rb