RubyGems - pg_rails - Versions diffs - 7.5.3 → 7.5.4 - Mend

pg_rails 7.5.3 → 7.5.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (32) hide show

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b312261e863e04fcc457b8b773531325d1c69f9b4ef0ca1269b39853f737844a
-  data.tar.gz: 641bbe1b7b128e67ec7ffb874765dfeae35aac6dadf917fcbe4367b3c98939cb
+  metadata.gz: 0f12846cd393967f0aac07acebf37b6799a9e67983da3ee892311aac4fd8a93b
+  data.tar.gz: dc6a9d65a1454b891de4bcd751f5f74f1b51a27d2fdc46c0baaf216db28a9306
 SHA512:
-  metadata.gz: 66f4093830e6a889cf66cfc39e6b0bfb015e93ad8e48c0e33a2c3292363f7511dbc1062b7b9993d0e0e2277ae49986c9eb0390572d63a2100a6057fb6b20e213
-  data.tar.gz: dc1b35305080b8bd01dbafeea7453bcf8f7bd85fe4609ee7657f18985402b86f755c170b39ce28b55e5c3939a2f5659f57e9ba3ee8336877ef8c18712fcf01be
+  metadata.gz: a832616bb110d3662bc1b2f07991f4dc9015ba95a0e17584b749c36058cea9d87928ca7403cc3c46a62789f13abdaff3c827be6bce8d3468420861380bddff3b
+  data.tar.gz: 3c103db1aa747b5fd09757c680505d203d06afad591b46ee1903d36037a35de5b2b02ef0475f15f4f8e222accfafb21a8f75a2932b83e93f7fa6c2a82eb763b7

data/pg_associable/spec/pg_associable/helpers_spec.rb CHANGED Viewed

@@ -1,6 +1,20 @@
 require 'rails_helper'
 describe PgAssociable::Helpers 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

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

@@ -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/pg_engine/base_controller.rb CHANGED Viewed

@@ -17,18 +17,20 @@ 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 Current.user.user_accounts.count == 1
-                      Current.user.user_accounts.first.account
+          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
                     end

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

@@ -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 CHANGED Viewed

@@ -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/models/email.rb CHANGED Viewed

@@ -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/user.rb CHANGED Viewed

@@ -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

data/pg_engine/app/models/user_account.rb CHANGED Viewed

@@ -32,8 +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,
-    editor: 2
+    administracion: 1,
+    operacion: 2,
+    lectura: 3
   }, multiple: true
 end

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

@@ -1,20 +1,24 @@
 h1 Cambiar a otra cuenta
-- 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
+/ 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
+  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
-          |  (Actual)
-      - else
-        = link_to user_account.account, users_account_switch_path(user_account),
-                  'data-turbo-method': :post
+        - 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/config/initializers/acts_as_tenant.rb CHANGED Viewed

@@ -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/db/seeds.rb CHANGED Viewed

@@ -1,11 +1,10 @@
 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.user_accounts.create(user: rosso, profiles: [:admin])
+bien.user_accounts.create(user: rosso, profiles: [:administracion])
 racionalismo = FactoryBot.create(:account, nombre: 'Racionalismo', subdomain: 'racionalismo')
 baruch = FactoryBot.create(:user, email: 'baruch@bien.com', nombre: 'Baruch', apellido: 'Spinoza', password: 'admin123',
@@ -13,5 +12,5 @@ baruch = FactoryBot.create(:user, email: 'baruch@bien.com', nombre: 'Baruch', ap
 rené = FactoryBot.create(:user, email: 'rene@bien.com', nombre: 'René', apellido: 'Descartes', password: 'admin123',
                                 confirmed_at: Time.now, orphan: true)
-racionalismo.user_accounts.create(user: baruch, profiles: [:admin])
-racionalismo.user_accounts.create(user: rené, profiles: [:editor])
+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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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/requests/current_attributes_spec.rb ADDED Viewed

@@ -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 ADDED Viewed

@@ -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/switcher_spec.rb CHANGED Viewed

@@ -26,6 +26,16 @@ 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) }
@@ -48,7 +58,7 @@ describe 'redirection' do
       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_layout/app/views/devise/sessions/new.html.erb CHANGED Viewed

@@ -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_rails/lib/pg_rails/current_attributes_support.rb CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

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

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

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.5.3
+  version: 7.5.4
 platform: ruby
 authors:
 - Martín Rosso
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-12 00:00:00.000000000 Z
+date: 2024-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -878,6 +878,8 @@ 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