pg_rails 7.5.2 → 7.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cbc9c1b9067850c9f99c3a28d9252248c8657cacbd7cade188c50bced6d4559d
-  data.tar.gz: 4a9b8e39d04fa9837a488262f679c93f946461140229d7da84c124ade30bd120
+  metadata.gz: 0f12846cd393967f0aac07acebf37b6799a9e67983da3ee892311aac4fd8a93b
+  data.tar.gz: dc6a9d65a1454b891de4bcd751f5f74f1b51a27d2fdc46c0baaf216db28a9306
 SHA512:
-  metadata.gz: dec0fda9ea266e4a8b57d186f70bf3395bb4ee2220cbc302556048d600014c7fee086e6dbec2fbfa3189cfe381221b06966e2a5d0afd2fe5d2754044067aee6d
-  data.tar.gz: a6dd1b4a963542a169fd2a3e67ef9003e4f37b0c549ddf59118f4b402f373c64708d92bca3a257342b75c9b83af74d39edbff162a4e91f9dcbd01bc98ebb5ddb
+  metadata.gz: a832616bb110d3662bc1b2f07991f4dc9015ba95a0e17584b749c36058cea9d87928ca7403cc3c46a62789f13abdaff3c827be6bce8d3468420861380bddff3b
+  data.tar.gz: 3c103db1aa747b5fd09757c680505d203d06afad591b46ee1903d36037a35de5b2b02ef0475f15f4f8e222accfafb21a8f75a2932b83e93f7fa6c2a82eb763b7

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

@@ -3,7 +3,7 @@ module PgAssociable
     MAX_RESULTS = 8
 
     def pg_respond_abrir_modal
-      src = @clase_modelo.new.decorate.new_object_url
+      src = clase_modelo.new.decorate.new_object_url
       content = ModalContentComponent.new(src:).render_in(view_context)
       modal = AsociableModalComponent.new(modal_id: params[:id]).with_content(content)
       render turbo_stream: turbo_stream.append_all('body', modal)
@@ -14,10 +14,27 @@ module PgAssociable
       resultados_prefix = 'resultados-inline'
       query = params[:query]
       timeout_id = params[:timeout_id]
-      @collection = policy_scope(@clase_modelo).kept.query(query).limit(MAX_RESULTS)
+      @collection = search_in_scope(query)
       render turbo_stream:
         turbo_stream.update("#{resultados_prefix}-#{params[:id]}",
                             partial:, locals: { collection: @collection, query:, timeout_id: })
     end
+
+    def search_in_scope(query)
+      scope = policy_scope(clase_modelo).kept
+
+      if clase_modelo.ransackable_attributes.include?('search')
+        scope.ransack(search_cont: query).result
+      else
+        Rails.logger.warn("WARNING: #{clase_modelo} should implement a 'search' ransacker")
+
+        if scope.respond_to?(:query)
+          Rails.logger.warn("DEPRECATED WARNING: #{clase_modelo}#query is deprecated in favor of 'search' ransacker")
+          scope.query(query)
+        else
+          scope.where(id: query)
+        end
+      end
+    end
   end
 end

data/pg_associable/app/javascript/asociable_controller.tsx

@@ -66,7 +66,7 @@ export default class extends Controller {
     }
     const doSearchBounce = debounce((force) => {
       this.doSearch(force)
-    }, 900)
+    }, 200)
 
     this.input.addEventListener('blur', () => {
       this.input.placeholder = this.originalPlaceholder

data/pg_associable/spec/pg_associable/helpers_spec.rb

@@ -1,7 +1,41 @@
 require 'rails_helper'
 
 describe PgAssociable::Helpers do
-  describe '#pg_respond_buscar' do
+  include ActiveSupport::CurrentAttributes::TestHelper
+
+  describe 'current attributes gets reset' do
+    it 'sets a current attribute' do
+      Current.user = 1
+      expect(Current.namespace).to be_nil
+    end
+
+    it 'the attribute gets reset' do
+      Current.namespace = 2
+      expect(Current.user).to be_nil
+    end
+  end
+
+  # DEPRECATED
+  describe '#pg_respond_buscar with query scope' do
+    let(:ctrl) do
+      Admin::CategoriaDeCosasController.new
+    end
+    let!(:categoria_de_cosa) { create :categoria_de_cosa }
+
+    before do
+      Current.user = create :user, :developer
+      allow(ctrl).to receive_messages(params: { id: 123, query: categoria_de_cosa.nombre })
+      allow(ctrl).to receive(:render)
+    end
+
+    it do
+      ctrl.pg_respond_buscar
+      categoria_de_cosas = ctrl.instance_variable_get(:@collection)
+      expect(categoria_de_cosas).to eq [categoria_de_cosa]
+    end
+  end
+
+  describe '#pg_respond_buscar with id' do
     let(:ctrl) do
       Admin::CosasController.new
     end
@@ -11,7 +45,6 @@ describe PgAssociable::Helpers do
       Current.user = create :user, :developer
       allow(ctrl).to receive_messages(params: { id: 123, query: cosa.id })
       allow(ctrl).to receive(:render)
-      ctrl.instance_variable_set(:@clase_modelo, Cosa)
     end
 
     it do
@@ -20,4 +53,23 @@ describe PgAssociable::Helpers do
       expect(cosas).to eq [cosa]
     end
   end
+
+  describe '#pg_respond_buscar with ransack' do
+    let(:ctrl) do
+      Admin::AccountsController.new
+    end
+    let!(:account) { create :account }
+
+    before do
+      Current.user = create :user, :developer
+      allow(ctrl).to receive_messages(params: { id: 123, query: account.nombre })
+      allow(ctrl).to receive(:render)
+    end
+
+    it do
+      ctrl.pg_respond_buscar
+      accounts = ctrl.instance_variable_get(:@collection)
+      expect(accounts).to eq [account]
+    end
+  end
 end

data/pg_engine/app/controllers/admin/user_accounts_controller.rb

@@ -15,7 +15,11 @@ module Admin
     private
 
     def atributos_permitidos
-      %i[user_id account_id profiles]
+      [
+        :user_id,
+        :account_id,
+        { profiles: [] }
+      ]
     end
 
     def atributos_para_buscar

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

@@ -9,7 +9,7 @@ module PgEngine
     def require_tenant_set
       return if ActsAsTenant.current_tenant.present?
 
-      redirect_to users_account_switcher_path
+      raise ActsAsTenant::Errors::NoTenantSet
     end
   end
 end

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

@@ -418,9 +418,7 @@ module PgEngine
         instancia_modelo.assign_attributes(modelo_params) if action_name.in? %w[update]
       end
 
-      # FIXME: estaría bueno delegar directamente a pundit, pero habría que
-      # arreglar tema policies
-      Current.user&.developer? || authorize(instancia_modelo)
+      authorize(instancia_modelo)
 
       # TODO: problema en create y update cuando falla la validacion
       # Reproducir el error antes de arreglarlo

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

@@ -17,19 +17,22 @@ module PgEngine
       # if ActsAsTenant.current_tenant.blank? && !global_domain?
       #   raise ActsAsTenant::Errors::NoTenantSet
       # end
+      # FIXME: if current_tenant.present? check it's not discarded
 
       if Current.user.present?
+        user_accounts = Current.user.user_accounts.kept
         if ActsAsTenant.current_tenant.present?
-          unless Current.user.user_accounts.exists?(account: ActsAsTenant.current_tenant)
+          unless user_accounts.exists?(account: ActsAsTenant.current_tenant)
             sign_out(Current.user)
             throw :warden, scope: :user, message: :invalid
           end
 
+          @current_tenant_set_by_domain_or_subdomain = true
         else
-          account = if session['current_user_account'].present?
+          account = if user_accounts.count == 1
+                      user_accounts.first.account
+                    elsif session['current_user_account'].present?
                       UserAccount.where(id: session['current_user_account']).first&.account
-                    elsif Current.user.user_accounts.count == 1
-                      Current.user.user_accounts.first.account
                     end
           set_current_tenant(account)
         end

data/pg_engine/app/controllers/pg_engine/base_public_controller.rb

@@ -1,5 +1,9 @@
 module PgEngine
   class BasePublicController < ApplicationController
+    before_action do
+      Current.namespace = :public
+    end
+
     # :nocov:
     def login_as
       return head :bad_request unless dev_user_or_env?

data/pg_engine/app/controllers/pg_engine/health_controller.rb

@@ -35,7 +35,6 @@ module PgEngine
 
     def html_status(color:)
       %(<!DOCTYPE html><html><body style="background-color: #{color}"></body></html>).html_safe
-      # rubocop:enable Rails/OutputSafety
     end
   end
 end

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

@@ -7,6 +7,8 @@ module Users
       @no_main_frame = true
     end
 
+    layout 'pg_layout/centered'
+
     def list
       @user_accounts = Current.user.user_accounts
     end

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

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+# generado con pg_rails
+
+module Users
+  class AccountsController < UsersController
+    include PgEngine::Resource
+
+    self.clase_modelo = Account
+    add_breadcrumb 'Cuentas'
+    self.skip_default_breadcrumb = true
+
+    before_action(only: :index) { authorize Account }
+
+    before_action :set_instancia_modelo, only: %i[new create show edit update destroy]
+
+    # private
+
+    # def atributos_permitidos
+    #   %i[plan nombre domain subdomain]
+    # end
+
+    # def atributos_para_buscar
+    #   atributos_permitidos
+    # end
+
+    # def atributos_para_listar
+    #   atributos_permitidos
+    # end
+
+    # def atributos_para_mostrar
+    #   atributos_permitidos
+    # end
+  end
+end

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

@@ -9,9 +9,8 @@ module PgEngine
     end
 
     def render_turbo_stream_title
-      title = [breadcrumbs.last&.name, I18n.t('app_name')].compact.join(' - ')
+      title = [breadcrumbs.last&.name, ActsAsTenant.current_tenant, I18n.t('app_name')].compact.join(' - ')
       turbo_stream.update_all 'title', title
-      # rubocop:enable Rails/SkipsModelValidations
     end
   end
 end

data/pg_engine/app/models/account.rb

@@ -22,6 +22,7 @@
 class Account < ApplicationRecord
   audited
   include Discard::Model
+  include Hashid::Rails
 
   has_many :user_accounts
   has_many :users, through: :user_accounts
@@ -33,6 +34,10 @@ class Account < ApplicationRecord
 
   validates :plan, :nombre, presence: true
 
+  ransacker :search do |parent|
+    parent.table[:nombre]
+  end
+
   def to_s
     nombre
   end

data/pg_engine/app/models/email.rb

@@ -47,7 +47,6 @@ class Email < ApplicationRecord
   has_one_attached :encoded_eml
 
   acts_as_tenant :account, optional: true
-
   tenantable_belongs_to :associated, polymorphic: true, optional: true,
                                      assign_tenant_from_associated: true
 

data/pg_engine/app/models/pg_engine/base_record.rb

@@ -19,7 +19,9 @@ module PgEngine
       attr_accessor :default_modal
     end
 
-    scope :query, ->(param) { param.present? ? where(id: param) : all }
+    # ransacker :search do |parent|
+    #   parent.table[:nombre]
+    # end
 
     def self.ransackable_associations(_auth_object = nil)
       authorizable_ransackable_associations

data/pg_engine/app/models/user.rb

@@ -71,6 +71,15 @@ class User < ApplicationRecord
 
   attr_accessor :orphan
 
+  def active_for_authentication?
+    super && kept?
+  end
+
+  # TODO: test
+  def inactive_message
+    kept? ? super : :locked
+  end
+
   after_create do
     create_account unless orphan
   end
@@ -99,8 +108,20 @@ class User < ApplicationRecord
   #   true
   # end
 
+  # DEPRECATED
   scope :query, ->(param) { where('email ILIKE ?', "%#{param}%") }
 
+  ransacker :search do |parent|
+    Arel::Nodes::InfixOperation.new(
+      '||',
+      Arel::Nodes::InfixOperation.new(
+        '||',
+        parent.table[:nombre], parent.table[:apellido]
+      ),
+      parent.table[:email]
+    )
+  end
+
   def to_s
     nombre_completo
   end

data/pg_engine/app/models/user_account.rb

@@ -21,6 +21,7 @@
 #  fk_rails_...  (user_id => users.id)
 #
 
+# FIXME: add column active?
 class UserAccount < ApplicationRecord
   audited
   include Hashid::Rails
@@ -31,9 +32,12 @@ class UserAccount < ApplicationRecord
   belongs_to :creado_por, optional: true, class_name: 'User'
   belongs_to :actualizado_por, optional: true, class_name: 'User'
 
+  # scope :kept, -> { undiscarded.joins(:account).merge(Account.kept) }
+  scope :kept, -> { joins(:account).merge(Account.kept) }
+
   enumerize :profiles, in: {
-    admin: 1,
-    dueño: 2,
-    invitado: 3
+    administracion: 1,
+    operacion: 2,
+    lectura: 3
   }, multiple: true
 end

data/pg_engine/app/policies/account_policy.rb

@@ -28,4 +28,8 @@ class AccountPolicy < ApplicationPolicy
   # def acceso_total?
   #   user.developer?
   # end
+  def base_access_to_record?
+    ActsAsTenant.unscoped? ||
+      record.user_accounts.pluck(:user_id).include?(user.id)
+  end
 end

data/pg_engine/app/views/admin/user_accounts/_form.html.slim

@@ -2,8 +2,8 @@
 
 div style="max-width: 22em"
   = pg_form_for(@user_account || object) do |f|
-    = f.pg_associable :user
-    = f.pg_associable :account
+    = f.pg_associable :user, preload: 10
+    = f.pg_associable :account, preload: 5
     = f.input :profiles
     .mt-2
     = f.button :submit

data/pg_engine/app/views/users/account_switcher/list.html.slim

@@ -1,6 +1,24 @@
-h1 Switcher
+h1 Cambiar a otra cuenta
 
-ul
-  - @user_accounts.each do |user_account|
-    li = link_to user_account.account, users_account_switch_path(user_account),
-                 'data-turbo-method': :post
+/ FIXME!: user_accounts add active column
+- if @user_accounts.empty?
+  p No tenés ninguna cuenta disponible
+- else
+  - if @current_tenant_set_by_domain_or_subdomain
+    p Estás en el dominio de #{ActsAsTenant.current_tenant} (#{request.host})
+    p
+      | Para cambiar de cuenta vas a tener que iniciar sesión en el dominio
+      |< de Bien o de la cuenta específica a la que quieras cambiar
+
+  ul.m-auto.list-group style="max-width: 20em"
+    - @user_accounts.each do |user_account|
+      li.list-group-item
+        - if @current_tenant_set_by_domain_or_subdomain
+          = user_account.account
+        - elsif user_account.account == ActsAsTenant.current_tenant
+          b
+            = user_account.account
+            |  (Actual)
+        - else
+          = link_to user_account.account, users_account_switch_path(user_account),
+                    'data-turbo-method': :post

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

@@ -0,0 +1,13 @@
+h1
+  |> Usuarios de la cuenta:
+  = @account
+
+div style="max-width: 30em"
+  table.table.table-sm
+    tr
+      th Nombre
+      th Roles
+    - @account.user_accounts.each do |user_account|
+      tr
+        td = user_account.user
+        td = user_account.profiles.texts.join(', ')

data/pg_engine/config/initializers/acts_as_tenant.rb

@@ -1,16 +1,7 @@
 ActsAsTenant.configure do |config|
-  config.require_tenant = true
-  # config.require_tenant = lambda do |options|
-  #   # if options[:scope] == User && true # global_domain?
-  #   #   # tal vez en algunos casos de devise sí requeriría el tenant?
-  #   #   #   creería que no, el único lugar en donde se debería queriar
-  #   #   #   User es en devise y es para obtener el current_user
-  #   #   #   hay que ver luego qué pasa con invitable
-  #   #   false
-  #   # else
-  #   #   true
-  #   # end
-  # end
+  config.require_tenant = lambda do
+    Current.namespace == :users
+  end
 
   # Customize the query for loading the tenant in background jobs
   # config.job_scope = ->{ all }

data/pg_engine/config/routes.rb

@@ -28,6 +28,9 @@ Rails.application.routes.draw do
       get '', action: 'list', as: 'account_switcher'
       post ':user_account_id', action: 'switch', as: 'account_switch'
     end
+
+    pg_resource(:accounts, path: 'cuentas', only: [:show])
+    # get 'account', to: 'accounts#show'
   end
 
   get '/u', to: 'users#home', as: :users_root

data/pg_engine/db/seeds.rb

@@ -1,15 +1,16 @@
-ActsAsTenant.without_tenant do
-  DatabaseCleaner.clean_with(:truncation, except: %w(ar_internal_metadata))
+DatabaseCleaner.clean_with(:truncation, except: %w(ar_internal_metadata))
 
+bien = FactoryBot.create(:account, nombre: 'Bien', subdomain: 'bien')
+rosso = FactoryBot.create(:user, email: 'mrosso10@gmail.com', nombre: 'Martín', apellido: 'Rosso', password: 'admin123',
+                                 confirmed_at: Time.now, developer: true, orphan: true)
 
-  bien = FactoryBot.create :account, nombre: 'Bien', subdomain: 'bien'
-  uno = FactoryBot.create :user, email: 'mrosso10@gmail.com', nombre: 'Martín', apellido: 'Rosso', password: 'admin123',
-                           confirmed_at: Time.now, developer: true, orphan: true
-  bien.users << uno
+bien.user_accounts.create(user: rosso, profiles: [:administracion])
 
-  mal = FactoryBot.create :account, nombre: 'Mal', subdomain: 'mal'
-  otro = FactoryBot.create :user, email: 'mal@gmail.com', nombre: 'Mal', apellido: 'Mal', password: 'admin123',
-                           confirmed_at: Time.now, developer: true, orphan: true
+racionalismo = FactoryBot.create(:account, nombre: 'Racionalismo', subdomain: 'racionalismo')
+baruch = FactoryBot.create(:user, email: 'baruch@bien.com', nombre: 'Baruch', apellido: 'Spinoza', password: 'admin123',
+                                  confirmed_at: Time.now, orphan: true)
+rené = FactoryBot.create(:user, email: 'rene@bien.com', nombre: 'René', apellido: 'Descartes', password: 'admin123',
+                                confirmed_at: Time.now, orphan: true)
 
-  mal.users << otro
-end
+racionalismo.user_accounts.create(user: baruch, profiles: [:administracion])
+racionalismo.user_accounts.create(user: rené, profiles: [:operacion])

data/pg_engine/lib/pg_engine/utils/pg_logger.rb

@@ -36,6 +36,11 @@ def pg_log(*)
   PgEngine::PgLogger.log(*)
 end
 
+# To be called inside a method or block that is deprecated
+def pg_deprecation(method, message = nil, deprecator:)
+  deprecator.warn(deprecator.deprecation_warning(method, message), caller_locations(3))
+end
+
 module PgEngine
   class PgLogger
     def self.test_logged_messages

data/pg_engine/spec/controllers/admin/accounts_controller_spec.rb

@@ -42,7 +42,7 @@ RSpec.describe Admin::AccountsController do
     }
   end
 
-  let(:user) { create :user, :admin }
+  let(:user) { create :user, :developer }
 
   before do
     sign_in user if user.present?

data/pg_engine/spec/controllers/admin/users_controller_spec.rb

@@ -43,7 +43,7 @@ RSpec.describe Admin::UsersController do
     }
   end
 
-  let(:logged_user) { create :user, :admin }
+  let(:logged_user) { create :user, :developer }
 
   before do
     sign_in logged_user

data/pg_engine/spec/controllers/devise/sessions_controller_spec.rb

@@ -2,6 +2,7 @@ require 'rails_helper'
 
 describe Devise::SessionsController do
   before do
+    ActsAsTenant.current_tenant = nil
     # rubocop:disable RSpec/InstanceVariable
     @request.env['devise.mapping'] = Devise.mappings[:user]
     # rubocop:enable RSpec/InstanceVariable

data/pg_engine/spec/controllers/users/registrations_controller_spec.rb

@@ -51,7 +51,7 @@ describe Users::RegistrationsController do
   describe '#edit' do
     subject { get :edit }
 
-    let(:logger_user) { create :user, :admin }
+    let(:logger_user) { create :user, :developer }
 
     before do
       sign_in logger_user

data/pg_engine/spec/factories/users.rb

@@ -58,7 +58,11 @@ FactoryBot.define do
     end
 
     trait :admin do
-      developer { true }
+      developer do
+        pg_deprecation 'trait "admin"', 'use trait "developer" instead',
+                       deprecator: PgEngine.deprecator
+        true
+      end
     end
 
     trait :developer do

data/pg_engine/spec/lib/pg_engine/mailgun/log_sync_spec.rb

@@ -5,6 +5,10 @@ describe PgEngine::Mailgun::LogSync, vcr: { cassette_name: 'mailgun/log_sync_dow
                                             match_requests_on: %i[method host] } do
   let(:instancia) { described_class }
 
+  before do
+    ActsAsTenant.current_tenant = nil
+  end
+
   describe '#download' do
     subject do
       instancia.download

data/pg_engine/spec/models/email_spec.rb

@@ -11,6 +11,11 @@ RSpec.describe Email do
     expect(email).to be_persisted
   end
 
+  it 'se persiste cuando no hay tenant' do
+    ActsAsTenant.current_tenant = nil
+    expect(email).to be_persisted
+  end
+
   describe 'update_status!' do
     context 'cuando hay accepted y delivered' do
       subject do

data/pg_engine/spec/models/user_spec.rb

@@ -56,4 +56,11 @@ RSpec.describe User do
       expect(user).not_to be_persisted
     end
   end
+
+  describe 'search ransacker' do
+    it 'searchs' do
+      results = described_class.ransack(search_cont: user.nombre).result.to_a
+      expect(results).to eq [user]
+    end
+  end
 end

data/pg_engine/spec/requests/current_attributes_spec.rb

@@ -0,0 +1,22 @@
+require 'rails_helper'
+
+describe 'current attributes' do
+  it 'Current gets reset between requests' do
+    allow(Current).to receive(:namespace=)
+    allow(Current.instance).to receive(:reset)
+    get '/contacto/new'
+    expect(Current).to have_received(:namespace=).with(:public)
+    expect(Current.instance).to have_received(:reset).at_least(:twice)
+    expect(Current.namespace).to be_nil
+  end
+
+  it 'sets a current attribute' do
+    Current.user = 1
+    expect(Current.namespace).to be_nil
+  end
+
+  it 'the attribute gets reset' do
+    Current.namespace = 2
+    expect(Current.user).to be_nil
+  end
+end

data/pg_engine/spec/requests/devise_spec.rb

@@ -0,0 +1,24 @@
+require 'rails_helper'
+
+describe 'devise flows' do
+  describe 'resend confirmation' do
+    subject do
+      post '/users/confirmation', params: { user: { email: user.email } }
+    end
+
+    let!(:user) { create :user, confirmed_at: nil }
+
+    it do
+      expect { subject }.to change(ActionMailer::Base.deliveries, :length).by(1)
+    end
+
+    it do
+      subject
+      expect(response).to redirect_to(new_user_session_path)
+    end
+
+    it do
+      expect { subject }.not_to have_errored
+    end
+  end
+end

data/pg_engine/spec/requests/users/accounts_spec.rb

@@ -0,0 +1,22 @@
+require 'rails_helper'
+
+describe 'Users::AccountsController' do
+  let(:account) { ActsAsTenant.current_tenant }
+  let(:user) { create :user }
+
+  before do
+    sign_in user
+  end
+
+  it 'shows the owned account' do
+    get "/u/cuentas/#{account.to_param}"
+    expect(response).to have_http_status(:ok)
+  end
+
+  it 'denies foreign account' do
+    other_account = create :account
+    get "/u/cuentas/#{other_account.to_param}"
+    expect(response).to have_http_status(:redirect)
+    expect(flash[:alert]).to eq 'Acceso no autorizado'
+  end
+end

data/pg_engine/spec/requests/users/switcher_spec.rb

@@ -26,21 +26,39 @@ describe 'redirection' do
     expect(response).to have_http_status(:ok)
   end
 
+  context 'when account is discarded' do
+    it do
+      get '/u/cosas'
+      expect(response.body).to include 'No hay cosos que mostrar'
+      logged_user.user_accounts.first.account.discard!
+      get '/u/cosas'
+      expect(response).to redirect_to users_account_switcher_path
+    end
+  end
+
   context 'when has been removed from account' do
     let!(:other_account) { create :account }
     let!(:other_user_account) { logged_user.user_accounts.create(account: other_account) }
 
+    before do
+      third_account = create :account
+      logged_user.user_accounts.create(account: third_account)
+    end
+
     it 'redirects to switcher' do
       get '/u/cosas'
       expect(response).to redirect_to users_account_switcher_path
       follow_redirect!
-      expect(response.body).to include 'Switcher'
+      expect(response.body).to include 'Cambiar a otra cuenta'
       post "/u/switcher/#{other_user_account.to_param}"
       expect(response).to redirect_to(root_path)
       follow_redirect!
+      get '/u/cosas'
+      expect(response).to have_http_status(:ok)
       expect(response.body).to include other_account.to_s
+      expect(response.body).to include 'No hay cosos que mostrar'
       other_user_account.destroy!
-      get '/'
+      get '/u/cosas'
       expect(response).to redirect_to users_account_switcher_path
     end
   end

data/pg_engine/spec/system/tenants_spec.rb

@@ -35,7 +35,7 @@ describe 'Tenants' do
       it 'shows the switcher' do
         visitar
 
-        expect(page).to have_text 'Switcher'
+        expect(page).to have_text 'Cambiar a otra cuenta'
       end
 
       it 'switches to account' do

data/pg_layout/app/views/devise/sessions/new.html.erb

@@ -32,7 +32,7 @@
   <br>
   <br>
   <ul style="max-width: 500px">
-    <% User.order(:id).each do |user| %>
+    <% User.kept.order(:id).each do |user| %>
       <li><%= link_to user, login_as_path(id: user.id) %></li>
     <% end %>
   </ul>

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

@@ -5,13 +5,20 @@
     </div>
     <% if user_signed_in? %>
       <span class="d-inline-block px-3 text-end text-light"><%= Current.user %></span>
-      <%= link_to users_account_switcher_path do %>
-        <% if Rails.env.development? %>
-          <span class="d-block px-3 text-secondary">Tenant: <%= ActsAsTenant.current_tenant || 'Global' %></span>
+      <span class="d-block px-3 text-secondary">
+        <% if Current.user.user_accounts.count > 1 %>
+          <%= link_to ActsAsTenant.current_tenant, [:users, ActsAsTenant.current_tenant] if ActsAsTenant.current_tenant.present? %>
+          <%= link_to users_account_switcher_path do %>
+            <% if ActsAsTenant.current_tenant.present? %>
+              (Cambiar)
+            <% else %>
+              Elegir cuenta
+            <% end %>
+          <% end %>
         <% else %>
-          <span class="d-block px-3 text-secondary"><%= ActsAsTenant.current_tenant %></span>
+          <%= link_to ActsAsTenant.current_tenant, [:users, ActsAsTenant.current_tenant] if ActsAsTenant.current_tenant.present? %>
         <% end %>
-      <% end %>
+      </span>
       <hr>
     <% end %>
     <ul class="list-unstyled ps-0">

data/pg_rails/lib/pg_rails/current_attributes_support.rb

@@ -1,3 +1,9 @@
+pg_deprecation(
+  'requiring current_attributes_support',
+  'instead use "include ActiveSupport::CurrentAttributes::TestHelper" when necessary',
+  deprecator: PgEngine.deprecator
+)
+
 RSpec.configure do |config|
   config.before(:each) do
     Current.user = nil

data/pg_rails/lib/pg_rails/rspec_logger_matchers.rb

@@ -33,6 +33,18 @@ module PgEngine
           end
         end
 
+        def failure_message_when_negated
+          msg = "expected not to #{@level || log}"
+          msg << "with text: #{@text}" if @text.present?
+          return msg unless @new_messages.any?
+
+          msg << "\nLogged messages:"
+          @new_messages.each do |level, message|
+            msg << "\n  #{level}: #{message[0..500]}"
+          end
+          msg
+        end
+
         def failure_message
           msg = "expected to #{@level || log}"
           msg << "with text: #{@text}" if @text.present?
@@ -40,7 +52,7 @@ module PgEngine
 
           msg << "\nLogged messages:"
           @new_messages.each do |level, message|
-            msg << "\n  #{level}: #{message[0..200]}"
+            msg << "\n  #{level}: #{message[0..500]}"
           end
           msg
         end

data/pg_rails/lib/version.rb

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

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

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+# FIXME: reemplazar por requests spec
 # generado con pg_rails
 
 require 'rails_helper'

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

@@ -9,7 +9,7 @@ RSpec.describe "<%= ruta_vistas %>/edit", <%= type_metatag(:view) %> do
   helper <%= mountable_engine? %>::Engine.routes.url_helpers
 <% end -%>
 
-  let(:user) { create(:user, :admin) }
+  let(:user) { create(:user, :developer) }
 
   before(:each) do
     sign_in user

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

@@ -9,7 +9,7 @@ RSpec.describe "<%= ruta_vistas %>/index", <%= type_metatag(:view) %> do
   helper <%= mountable_engine? %>::Engine.routes.url_helpers
 <% end -%>
 
-  let(:user) { create(:user, :admin) }
+  let(:user) { create(:user, :developer) }
   let!(:<%= plural_name %>) { create_list(:<%= nombre_tabla_completo_singular %>, rand(10..20))}
 
   before(:each) do

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

@@ -9,7 +9,7 @@ RSpec.describe "<%= ruta_vistas %>/new", <%= type_metatag(:view) %> do
   helper <%= mountable_engine? %>::Engine.routes.url_helpers
 <% end -%>
 
-  let(:user) { create(:user, :admin) }
+  let(:user) { create(:user, :developer) }
 
   before(:each) do
     sign_in user

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

@@ -9,7 +9,7 @@ RSpec.describe "<%= ruta_vistas %>/show", <%= type_metatag(:view) %> do
   helper <%= mountable_engine? %>::Engine.routes.url_helpers
 <% end -%>
 
-  let(:user) { create(:user, :admin) }
+  let(:user) { create(:user, :developer) }
 
   before(:each) do
     sign_in user

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.5.2
+  version: 7.5.4
 platform: ruby
 authors:
 - Martín Rosso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-09-11 00:00:00.000000000 Z
+date: 2024-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -689,6 +689,7 @@ files:
 - pg_engine/app/controllers/public/mensaje_contactos_controller.rb
 - pg_engine/app/controllers/public/webhooks_controller.rb
 - pg_engine/app/controllers/users/account_switcher_controller.rb
+- pg_engine/app/controllers/users/accounts_controller.rb
 - pg_engine/app/controllers/users/confirmations_controller.rb
 - pg_engine/app/controllers/users/date_jumper_controller.rb
 - pg_engine/app/controllers/users/notifications_controller.rb
@@ -777,6 +778,7 @@ files:
 - pg_engine/app/views/public/mensaje_contactos/_gracias.html.slim
 - pg_engine/app/views/public/mensaje_contactos/new.html.slim
 - pg_engine/app/views/users/account_switcher/list.html.slim
+- pg_engine/app/views/users/accounts/show.html.slim
 - pg_engine/config/initializers/action_mailer.rb
 - pg_engine/config/initializers/active_admin.rb
 - pg_engine/config/initializers/acts_as_tenant.rb
@@ -876,6 +878,9 @@ files:
 - pg_engine/spec/pg_engine/pdf_preview_generator_spec.rb
 - pg_engine/spec/requests/admin/eventos_spec.rb
 - pg_engine/spec/requests/base_controller_requests_spec.rb
+- pg_engine/spec/requests/current_attributes_spec.rb
+- pg_engine/spec/requests/devise_spec.rb
+- pg_engine/spec/requests/users/accounts_spec.rb
 - pg_engine/spec/requests/users/base_controller_spec.rb
 - pg_engine/spec/requests/users/date_jumper_spec.rb
 - pg_engine/spec/requests/users/switcher_spec.rb