pg_rails 7.3.4 → 7.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b6625d4eea069719a53935223e89933c45ea8193b707a0a601646cf1c7d4d28
-  data.tar.gz: 8fc921c742a0dd8c2d361b8844a36d04f92ca03617cec64dd178bf043ae11781
+  metadata.gz: 76de379c2a544b8c8cbb3dc273d48c889a4e1433382f4cb5506f6af6ab5a87a0
+  data.tar.gz: 6e8328117a18ec5919b5e524491bd9dae8a157c14af0bf9ad4ff81c360ef39a1
 SHA512:
-  metadata.gz: 42908b6091fa4b5d36cc10bcdc19c6665171c107f73c0dd7b2457355550e931e8bec5d212de311a8bb667090531506b2aab8ce30c101829566e8acd20b8f260f
-  data.tar.gz: deba07fbf28846fb3a536ebc4d0002965cc131c4ad6bb626d4242c49ba9a45d303ccd85ccebec6f75cbd8eab6c3dea58159588541db785f4320e4fbdff0f5c7e
+  metadata.gz: '050966c0de869132e98d92ee13a2697f38429a1b11145161318c41ffa00cbba38f02dde11d2d72a6db798171cf99c9377eb48422bd292ba01a89ba5f49a1ee1d'
+  data.tar.gz: 0c61544a7e0152a31fd2e2cdea22172e809f04125d11cb2d009e40c676bd631e713c9758e9fb7189840e65851df32d2ee94f8f705baebba695ce04f5a8718b5e

data/pg_engine/app/components/internal_error_component.rb

@@ -15,7 +15,7 @@ class InternalErrorComponent < BaseComponent
       </div>
       Por favor, intentá nuevamente
       <br>
-      o <a class="text-decoration-underline" href="<%= new_public_mensaje_contacto_path %>">dejá un mensaje</a>
+      o <a class="text-decoration-underline" href="<%= new_public_mensaje_contacto_path %>" data-turbo="false">dejá un mensaje</a>
       para que te avisemos
       <br>
       cuando el problema esté resuelto 🙏

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

@@ -379,7 +379,7 @@ module PgEngine
     def render_listing
       total = @collection.count
       current_page = params[:page].presence&.to_i || 1
-      if current_page_size * (current_page - 1) > total
+      if current_page_size * (current_page - 1) >= total
         current_page = (total.to_f / current_page_size).ceil
       end
       @collection = @collection.page(current_page).per(current_page_size)

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

@@ -96,7 +96,7 @@ module PgEngine
       @navbar_chevron_class = navbar_expanded ? 'bi-chevron-left' : 'bi-chevron-right'
       @navbar = Navbar.new(Current.user)
 
-      if Rollbar.configuration.enabled && Rails.application.credentials.rollbar.present?
+      if defined?(Rollbar) && Rollbar.configuration.enabled && Rails.application.credentials.rollbar.present?
         @rollbar_token = Rails.application.credentials.rollbar.access_token_client
       end
 

data/pg_engine/app/controllers/pg_engine/devise_controller.rb

@@ -1,5 +1,15 @@
 module PgEngine
   class DeviseController < ApplicationController
+    prepend_before_action only: :create do
+      rate_limiting(
+        to: 10,
+        within: 1.hour,
+        by: -> { request.remote_ip },
+        with: -> { head :too_many_requests },
+        store: cache_store
+      )
+    end
+
     before_action :configure_permitted_parameters
     before_action do
       @no_main_frame = true

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

@@ -4,6 +4,16 @@
 
 module Public
   class MensajeContactosController < PublicController
+    prepend_before_action only: :create do
+      rate_limiting(
+        to: 3,
+        within: 1.hour,
+        by: -> { request.remote_ip },
+        with: -> { head :too_many_requests },
+        store: cache_store
+      )
+    end
+
     include PgEngine::Resource
 
     self.clase_modelo = MensajeContacto

data/pg_engine/config/initializers/active_admin.rb

@@ -1,3 +1,4 @@
+if defined? ActiveAdmin
 class MyAdapter < ActiveAdmin::AuthorizationAdapter
   def authorized?(action, subject = nil)
     user.developer?
@@ -356,3 +357,4 @@ ActiveAdmin.setup do |config|
   #
   # config.use_webpacker = true
 end
+end

data/pg_engine/config/initializers/rollbar.rb

@@ -1,3 +1,4 @@
+if defined? Rollbar
 Rollbar.configure do |config|
   # Without configuration, Rollbar is enabled in all environments.
   # To disable in specific environments, set config.enabled=false.
@@ -89,3 +90,4 @@ Rollbar.configure do |config|
     acceptable_levels.include?(item[:level].to_sym) ? 'gogoogogooo' : 'ignored'
   end
 end
+end

data/pg_engine/config/initializers/zeitwerk.rb

@@ -1,4 +1,5 @@
 Rails.autoloaders.main.ignore(
+  "#{Rails.root}/app/admin",
   "#{PgEngine::Engine.root}/app/admin",
   "#{PgEngine::Engine.root}/app/assets",
   "#{PgEngine::Engine.root}/app/javascript",

data/pg_engine/config/routes.rb

@@ -35,7 +35,9 @@ Rails.application.routes.draw do
     pg_resource(:user_accounts)
     get 'login_as', to: 'users#login_as'
   end
-  ActiveAdmin.routes(self)
+  if defined? ActiveAdmin
+    ActiveAdmin.routes(self)
+  end
 end
 
 #                                       Prefix Verb   URI Pattern                                                                                       Controller#Action

data/pg_engine/lib/pg_engine/engine.rb

@@ -28,7 +28,7 @@ module PgEngine
     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
-      FactoryBot.definition_file_paths << "#{root}/spec/factories"
+      FactoryBot.definition_file_paths << "#{root}/spec/factories" if defined? FactoryBot
     end
 
     initializer 'configurar_pg_rails' do

data/pg_engine/lib/pg_engine.rb

@@ -35,14 +35,12 @@ require 'discard'
 require 'audited'
 require 'pundit'
 require 'dotenv-rails'
-require 'faker'
 require 'puma'
 require 'rollbar'
 require 'sprockets/rails'
 require 'jsbundling-rails'
 require 'cssbundling-rails'
 require 'turbo-rails'
-require 'activeadmin'
 require 'sassc'
 require 'image_processing'
 require 'hashid/rails'
@@ -52,6 +50,7 @@ require 'mailgun-ruby'
 require 'pg_search'
 require 'view_component'
 require 'noticed'
+require 'ransack'
 require 'ransack_memory'
 require 'holidays'
 
@@ -74,6 +73,7 @@ if Rails.env.local?
   # require 'spring-commands-rspec'
   require 'rspec-rails'
   require 'factory_bot_rails'
+  require 'faker'
   require 'rails-controller-testing'
 end
 

data/pg_layout/app/javascript/application.js

@@ -31,7 +31,7 @@ document.addEventListener('turbo:before-fetch-request', (ev) => {
   // on successful redirect no haya posibilidad de que se abra un modal
   // FIXME: buscar una manera mejor de hacerlo porque es para problemas
   //        quizás, con la movida de abrir modales desde JS
-  if (ev.detail.fetchOptions.method === 'post') {
+  if (ev.detail.fetchOptions.method.toLowerCase() === 'post') {
     ev.detail.fetchOptions.headers.Accept = 'text/html, application/xhtml+xml'
   }
 

data/pg_layout/app/javascript/config/turbo_rails/index.js

@@ -3,8 +3,9 @@
 
 import './set_consumer'
 import './progress_bar'
-
 import '@hotwired/turbo-rails'
+import { flashMessage } from 'pg_rails/utils'
+import Rollbar from 'rollbar'
 
 // TODO: testear con capybara
 document.addEventListener('turbo:before-cache', () => {
@@ -22,6 +23,25 @@ document.addEventListener('turbo:before-cache', () => {
   })
 })
 
+document.addEventListener('turbo:frame-missing', (ev) => {
+  Rollbar.error('Turbo Frame missing')
+  ev.preventDefault()
+  const html = `
+    <div>
+      <div class="mb-1">
+        Ocurrió algo inesperado
+      </div>
+      Por favor, intentá nuevamente
+      <br>
+      o <a class="text-decoration-underline" href="/contacto" data-turbo="false">dejá un mensaje</a>
+      para que te avisemos
+      <br>
+      cuando el problema esté resuelto 🙏
+    </div>
+  `
+
+  flashMessage(html, 'alert')
+})
 // document.addEventListener('turbo:before-stream-render', function () { console.log('turbo:before-stream-render') })
 // document.addEventListener('turbo:render', function () { console.log('turbo:render') })
 // document.addEventListener('turbo:before-render', function () { console.log('turbo:before-render') })

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

@@ -28,7 +28,8 @@ html
     meta name="cable-history-timestamp" content="#{Time.now.to_i}"
     = csrf_meta_tags
     = csp_meta_tag
-    = action_cable_with_jwt_meta_tag
+    - if defined? Anycable
+      = action_cable_with_jwt_meta_tag
 
     = stylesheet_link_tag 'application', 'data-turbo-track': 'reload'
     = javascript_include_tag 'application', 'data-turbo-track': 'reload', type: 'module'

data/pg_rails/lib/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PgRails
-  VERSION = '7.3.4'
+  VERSION = '7.4.0'
 end

data/pg_scaffold/lib/pg_scaffold/railtie.rb

@@ -1,15 +1,17 @@
 module PgScaffold
   class Railtie < ::Rails::Railtie
     initializer 'configurar_generators', after: 'factory_bot.set_fixture_replacement' do
-      require_relative 'monkey_patches/mejoras_de_atributos'
-      require_relative 'monkey_patches/mejoras_a_named_base'
+      unless Rails.env.production?
+        require_relative 'monkey_patches/mejoras_de_atributos'
+        require_relative 'monkey_patches/mejoras_a_named_base'
 
-      config.app_generators do |g|
-        g.test_framework :pg_rspec
-        g.orm :pg_active_record
+        config.app_generators do |g|
+          g.test_framework :pg_rspec
+          g.orm :pg_active_record
 
-        g.fallbacks[:pg_rspec] = :rspec
-        g.fallbacks[:pg_active_record] = :active_record
+          g.fallbacks[:pg_rspec] = :rspec
+          g.fallbacks[:pg_active_record] = :active_record
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.3.4
+  version: 7.4.0
 platform: ruby
 authors:
 - Martín Rosso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-30 00:00:00.000000000 Z
+date: 2024-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails