pg_rails 7.6.40 → 7.6.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf260a16e98842bebe950a0d4c3253d6c63f2690a922ec767c04d8a99ae7a0f7
-  data.tar.gz: 57dfdff6f3042539d11089edccf7fa32df6c38f86d151256a1536f5efe6d073b
+  metadata.gz: 519ff463ff0b6b54cc215587c8b526a9ac0385b0f084ef40e67379d88a1d7f35
+  data.tar.gz: 6a2ecec603c7daafaef6ee31da7b734b5e5fd810d2da4b43dc8bda4132bc6def
 SHA512:
-  metadata.gz: e6fa99a2c8881e8f615839ce690c7cb9bf1d3c3ed3cf31f5490641bc253bd2de7b8826ee7c9c2374716dc8b85653db0d066d5bf5dcd4739d41bac81ff2938fbc
-  data.tar.gz: 65c53c5d31a893c6700347d16f9e3b2146a82b21ca2b5905fc214ab551ff844c9b9880118f59a1adc030cd8636fffd44908c5032482e28e3c1501dc14041af9e
+  metadata.gz: c113f2b3d27671bd93409e82c234be4a0dbcf595140b2dd2b5be95da5b5e0e115045127ce1f00d560d0973579f2befcf692ed8079d28459b870ed5256e40b04e
+  data.tar.gz: efd482246afc90ecfbd885041f62446d337c084a12af4ba71d7f1142a63060384cac0b7b01ebcd21e037efde1339458bb8aa46b9df080b731ca2fff400ad29cb

data/pg_associable/app/helpers/pg_associable/form_builder_methods.rb

@@ -21,7 +21,7 @@ module PgAssociable
       # porque de todos modos se pisaría en el create
       if !object.persisted? &&
          template.nested_record.present? &&
-         object.send(atributo) == (template.nested_record)
+         object.send(atributo) == template.nested_record
         options[:disabled] = true
       end
 

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

@@ -23,7 +23,11 @@ $values: 0, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100;
 }
 
 // Table row clickable (bindListingClick)
-.listado tr:has(td:hover):has(.bi-eye-fill):not(:has(.actions-wrapper:hover)):not(:has(a:hover)):not(:has(.inline-edit:hover)) td {
+.listado tr:has(td:hover):has(.bi-eye-fill):not(:has(.actions-wrapper:hover)):not(:has(a:hover)):not(:has(.inline-edit:hover)):not(:has(.inline-no-edit:hover)) td {
+	background-color: #f2f2f2;
+	cursor: pointer;
+}
+.listado tr:has(td:hover):has(.main-row-link):not(:has(.actions-wrapper:hover)):not(:has(a:hover)):not(:has(.inline-edit:hover)):not(:has(.inline-no-edit:hover)) td {
 	background-color: #f2f2f2;
 	cursor: pointer;
 }

data/pg_engine/app/components/inline_edit/inline_show_component.html.slim

@@ -14,4 +14,5 @@
       i.bi.bi-pencil
     span = @model.decorate.send(@attribute)
 - else
-  = @model.decorate.send(@attribute)
+  span.inline-no-edit
+    = @model.decorate.send(@attribute)

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

@@ -382,7 +382,9 @@ module PgEngine
 
     def pg_respond_update
       object = instancia_modelo
+      # Maybe lock! to ensure consistency of audits
       if (@saved = object.save)
+        ActiveSupport::Notifications.instrument("record_updated.pg_engine", object)
         respond_to do |format|
           format.html do
             if params[:inline_attribute].present?
@@ -419,6 +421,7 @@ module PgEngine
     def pg_respond_create
       object = instancia_modelo
       if (@saved = object.save)
+        ActiveSupport::Notifications.instrument("record_created.pg_engine", object)
         if in_modal?
           body = <<~HTML.html_safe
             <pg-event data-event-name="pg:record-created" data-turbo-temporary
@@ -475,6 +478,7 @@ module PgEngine
     # rubocop:disable Metrics/PerceivedComplexity
     def pg_respond_destroy(model, land_on = nil)
       if destroy_model(model)
+        ActiveSupport::Notifications.instrument("record_destroyed.pg_engine", model)
         # TODO!!: rename to main
         if turbo_frame? && current_turbo_frame != 'top'
           body = <<~HTML.html_safe
@@ -581,12 +585,12 @@ module PgEngine
       if action_name == 'new'
         params.permit(atributos_permitidos)
       else
-        params.require(nombre_modelo).permit(atributos_permitidos)
+        params.require(clase_modelo.model_name.param_key).permit(atributos_permitidos)
       end
     end
 
     def nombre_modelo
-      clase_modelo.name.underscore
+      clase_modelo.model_name.element
     end
 
     def filtros_y_policy(campos, dflt_sort = nil, archived: false)

data/pg_engine/app/controllers/users/accounts_controller.rb

@@ -75,7 +75,7 @@ module Users
     end
 
     def atributos_para_listar
-      %i[nombre owner]
+      %i[logo_f nombre owner]
     end
   end
 end

data/pg_engine/app/decorators/account_decorator.rb

@@ -33,4 +33,12 @@ class AccountDecorator < PgEngine::BaseRecordDecorator
       end
     end
   end
+
+  def logo_f
+    if logo.present?
+      image_tag logo.variant(:thumb), style: 'max-height:3em'
+    else
+      content_tag 'i', nil, class: 'bi bi-bag-fill text-center d-inline-block', style: 'font-size: 1.7em; width: 1.6em'
+    end
+  end
 end

data/pg_engine/app/decorators/pg_engine/base_record_decorator.rb

@@ -196,7 +196,7 @@ module PgEngine
     end
 
     def target_new
-      mod_name_sing = object.class.model_name.singular.to_sym
+      mod_name_sing = object.class.model_name.singular_route_key.to_sym
       [:new, pg_namespace, nested_record, mod_name_sing]
     end
 

data/pg_engine/app/decorators/user_account_decorator.rb

@@ -15,7 +15,7 @@ class UserAccountDecorator < PgEngine::BaseRecordDecorator
     helpers.content_tag :span do
       h.link_to h.tenant_root_path(tid: object.to_param),
                 'data-turbo-frame': :_top,
-                class: 'btn btn-sm btn-primary' do
+                class: 'btn btn-sm btn-primary main-row-link' do
         '<i class="bi bi-box-arrow-in-right"></i> Ingresar'.html_safe
       end
     end

data/pg_engine/app/views/pg_engine/base/index.html.slim

@@ -53,6 +53,8 @@
           tr
             th
             - atributos_para_listar.each do |att|
+              / TODO: poder configurar el ordenable en false
+              / Sería ideal hacer algo OOP, pero es medio bardo
               th.text-nowrap style="font-size: 0.8em" = encabezado att, ordenable: true
             - if action_name == 'archived'
               th.text-nowrap style="font-size: 0.8em" = encabezado :discarded_at, ordenable: true

data/pg_engine/app/views/users/accounts/index.html.slim

@@ -3,3 +3,8 @@
 - content_for(:padding_top_class) { 'pt-0' }
 
 = render template: 'pg_engine/base/index'
+
+css:
+  .listado {
+    vertical-align: middle;
+  }

data/pg_engine/app/views/users/accounts/show.html.slim

@@ -5,7 +5,7 @@
 .text-center
   .d-flex.justify-content-center.gap-2.align-items-center.m-3
     - if @account.logo.present?
-      = image_tag @account.logo, style: 'max-height:3em'
+      = image_tag @account.logo.variant(:thumb), style: 'max-height:3em'
     .fs-1
       = @account
 

data/pg_engine/config/locales/es.yml

@@ -187,6 +187,8 @@ es:
     attributes:
       account:
         owner: Administrado por
+        logo/scoped:
+          listado_header: ""
       user_account:
         membership_status: Estado
         user: Nombre

data/pg_engine/lib/pg_engine/test/dummy_brand.rb

@@ -1,7 +1,7 @@
 module PgEngine
   module Test
     class DummyBrand < PgEngine::SiteBrand
-      def initialize(include_all: false) # rubocop:disable Metrics/MethodLength
+      def initialize(skip_default_url_options: Rails.env.test?) # rubocop:disable Metrics/MethodLength
         super()
 
         @default_site_brand = :factura
@@ -48,7 +48,7 @@ module PgEngine
           }
         }
 
-        return unless Rails.env.development? || include_all
+        return if skip_default_url_options
 
         @options.merge!({
                           default_url_options: {

data/pg_engine/spec/mailers/pg_engine/base_mailer_spec.rb

@@ -27,7 +27,7 @@ describe PgEngine::BaseMailer do
     # rubocop:disable Style/GlobalVars
     before do
       $site_brand_before = PgEngine.site_brand
-      PgEngine.site_brand = PgEngine::Test::DummyBrand.new(include_all: true)
+      PgEngine.site_brand = PgEngine::Test::DummyBrand.new(skip_default_url_options: false)
     end
 
     after do

data/pg_engine/spec/requests/base_controller_requests_spec.rb

@@ -42,7 +42,7 @@ describe 'Base requests' do
         { 'ACCEPT' => 'text/html' }
       end
 
-      include_examples 'manda el status correcto'
+      it_behaves_like 'manda el status correcto'
 
       it 'no manda el flash' do
         subject
@@ -60,7 +60,7 @@ describe 'Base requests' do
         { 'ACCEPT' => 'text/vnd.turbo-stream.html' }
       end
 
-      include_examples 'manda el status correcto'
+      it_behaves_like 'manda el status correcto'
 
       it 'manda el flash' do
         subject
@@ -73,7 +73,7 @@ describe 'Base requests' do
         { 'ACCEPT' => 'application/json' }
       end
 
-      include_examples 'manda el status correcto'
+      it_behaves_like 'manda el status correcto'
     end
   end
 

data/pg_engine/spec/system/signup_spec.rb

@@ -6,7 +6,7 @@ describe 'Al Registrarse' do
   include ActiveJob::TestHelper
 
   find_scroll = proc do |selector, options = {}|
-    elem = find(selector, **options.merge(visible: :all))
+    elem = find(selector, **options, visible: :all)
     script = 'arguments[0].scrollIntoView({ behavior: "instant", block: "start", inline: "nearest" });'
     page.execute_script(script, elem)
     sleep 0.5

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

@@ -11,14 +11,20 @@ function bindListingClick () {
   document.body.onclick = (ev) => {
     if (ev.target.closest('a')) return
     if (ev.target.closest('.inline-edit')) return
+    if (ev.target.closest('.inline-no-edit')) return
     if (ev.target.closest('.listado')) {
       const row = ev.target.closest('tr')
       if (row) {
-        const show = row.querySelector('.bi-eye-fill')
-        if (show) {
-          const link = show.closest('a')
-          if (link) {
-            link.click()
+        const mainRowLink = row.querySelector('.main-row-link')
+        if (mainRowLink) {
+          mainRowLink.click()
+        } else {
+          const show = row.querySelector('.bi-eye-fill')
+          if (show) {
+            const link = show.closest('a')
+            if (link) {
+              link.click()
+            }
           }
         }
       }

data/pg_layout/app/lib/navbar.rb

@@ -31,6 +31,14 @@ class Navbar
     @configured = true
   end
 
+  def topbar_signed_in_links
+    return [] if @user.blank?
+
+    configure
+
+    bar('topbar.signed_in')
+  end
+
   def sidebar
     configure
 
@@ -43,13 +51,13 @@ class Navbar
     bar_data = @yaml_data[key]
     return [] if bar_data.blank?
 
-    # rubocop:disable Style/MultilineBlockChain:
+    # rubocop:disable Style/MultilineBlockChain
     orig_idx = 0
     bar_data.map do |item|
       orig_idx += 1
       evaluate_node(item, orig_idx)
     end.sort_by { |a| [a[:priority], a[:orig_idx]] }
-    # rubocop:enable Style/MultilineBlockChain:
+    # rubocop:enable Style/MultilineBlockChain
   end
 
   def evaluate_node(item, orig_idx = nil)
@@ -77,7 +85,6 @@ class Navbar
 
   def any_children_active?(entry, request)
     entry[:children].any? { |child| active_entry?(child, request) }
-    # TODO: quitar
   end
 
   def hide_entry?(entry)

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

@@ -33,6 +33,8 @@ html
     meta name="view-transition" content="same-origin"
     meta name="cable-history-timestamp" content="#{Time.now.to_i}"
 
+    / Para qué era esto? Tenía que ver con la cache, no sé si del browser o de nginx, o de Rails
+    / Pero no sé si sigue siendo necesario. Se usa en las páginas estáticas de legales y history
     - unless @skip_csrf_meta_tags
       = csrf_meta_tags
 

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

@@ -16,7 +16,8 @@ div id="sidebar" class="#{@navbar_opened_class} flex-shrink-0 d-none d-#{@breakp
               - else
                 span.bi.bi-chevron-right.ms-1.align-text-bottom style="font-size: 0.7em"
 
-            .collapse data-turbo-temporary=('true' unless active) class="#{ 'show' if active}" id=entry_id
+            / data-turbo-temporary=('true' unless active)
+            .collapse class="#{ 'show' if active}" id=entry_id
               .collapse-inner
                 - entry[:children].each do |child|
                   - next if @navbar.hide_entry?(child)

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

@@ -21,7 +21,8 @@
                 - else
                   span.bi.bi-chevron-right.ms-1.align-text-bottom style="font-size: 0.7em"
 
-              .collapse data-turbo-temporary=('true' unless active) class="#{ 'show' if active}" id=entry_id
+              / data-turbo-temporary=('true' unless active)
+              .collapse class="#{ 'show' if active}" id=entry_id
                 .collapse-inner
                   - entry[:children].each do |child|
                     - next if @navbar.hide_entry?(child)

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

@@ -15,7 +15,13 @@ ul.navbar-nav.gap-3.align-items-center class="gap-#{@breakpoint_navbar_expand}-0
         - if @other_active_accounts&.any?
           h6.dropdown-header Cambiar a:
           - @other_active_accounts.each do |ua|
-            li = link_to ua.account, tenant_root_path(tid: ua.to_param), class: 'dropdown-item'
+            li
+              = link_to tenant_root_path(tid: ua.to_param), class: 'dropdown-item' do
+                - if ua.account.logo.present?
+                  span = image_tag ua.account.logo.variant(:thumb), class: 'rounded-circle border border-2 me-2', width: 40, height: 40
+                - else
+                  i.bi.bi-bag-fill.me-2.d-inline-block.text-center style="font-size: 1.7em; width: 1.6em"
+                span = ua.account
           li
             hr.dropdown-divider
         li = link_to "Administrar #{Account.nombre_plural.downcase}", users_accounts_path(tid: nil), class: 'dropdown-item'
@@ -27,7 +33,11 @@ ul.navbar-nav.gap-3.align-items-center class="gap-#{@breakpoint_navbar_expand}-0
         = Account.nombre_plural
       ul.dropdown-menu
         - @other_active_accounts.each do |ua|
-          li = link_to ua.account, tenant_root_path(tid: ua.to_param), class: 'dropdown-item'
+          li
+            = link_to tenant_root_path(tid: ua.to_param), class: 'dropdown-item' do
+              - if ua.account.logo.present?
+                span = image_tag ua.account.logo.variant(:thumb), class: 'rounded-circle border border-2 me-2', width: 40, height: 40
+              span = ua.account
         li
           hr.dropdown-divider
         li = link_to "Administrar #{Account.nombre_plural.downcase}", users_accounts_path(tid: nil), class: 'dropdown-item'
@@ -50,5 +60,12 @@ ul.navbar-nav.gap-3.align-items-center class="gap-#{@breakpoint_navbar_expand}-0
       li = link_to Account.nombre_plural, users_accounts_path(tid: nil), class: 'dropdown-item'
       - if Current.user.developer?
         li = link_to 'Admin', admin_users_path, class: 'dropdown-item'
+
+      - if @navbar.present?
+        - @navbar.topbar_signed_in_links.each do |entry|
+          - next if @navbar.hide_entry?(entry)
+          li
+            a href=entry[:path] class="dropdown-item #{@navbar.active_entry?(entry, request) ? 'active' : ''} #{entry[:attributes]}"
+              = entry[:title]
       li = link_to 'Cerrar sesión', destroy_user_session_path(tid: nil),
                    'data-turbo-method': :delete, class: 'dropdown-item'

data/pg_rails/lib/version.rb

@@ -2,6 +2,6 @@
 
 # :nocov:
 module PgRails
-  VERSION = '7.6.40'
+  VERSION = '7.6.42'
 end
 # :nocov:

data/pg_scaffold/lib/generators/pg_factory_bot/model/model_generator.rb

@@ -82,7 +82,7 @@ module PgFactoryBot
           'Faker::Lorem.sentence'
         elsif attribute.type == :date
           'Faker::Date.backward'
-        elsif attribute.type == :float || attribute.type == :decimal
+        elsif %i[float decimal].include?(attribute.type)
           'Faker::Number.decimal(l_digits: 3, r_digits: 2)'
         elsif attribute.type == :integer
           'rand(1..9999)'

data/pg_scaffold/lib/generators/pg_rspec/scaffold/scaffold_generator.rb

@@ -15,8 +15,8 @@ module PgRspec
       class_option :trackeo_de_usuarios, type: :boolean, default: true,
                                          desc: 'Genera campos creado_por y actualizado_por.'
 
-      class_option :controller_specs, type: :boolean, default: true
-      class_option :request_specs,    type: :boolean, default: false
+      class_option :controller_specs, type: :boolean, default: false
+      class_option :request_specs,    type: :boolean, default: true
       class_option :view_specs,       type: :boolean, default: false
 
       # remove_hook_for :integration_tool, as: :integration

data/pg_scaffold/spec/generators_spec.rb

@@ -33,9 +33,8 @@ describe 'Generators', type: :generator do
     it do
       run_generator(['users/modelo', 'bla:integer'])
 
-      my_assert_file 'spec/controllers/users/modelos_controller_spec.rb' do |content|
-        expect(content).to match(/routing/)
-        expect(content).to match(/sign_in/)
+      my_assert_file 'spec/requests/users/modelos_spec.rb' do |content|
+        expect(content).to match(/valid_attributes/)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.6.40
+  version: 7.6.42
 platform: ruby
 authors:
 - Martín Rosso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-04-08 00:00:00.000000000 Z
+date: 2025-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails