pg_rails 7.4.3 → 7.5.1

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

@@ -130,7 +130,7 @@ RSpec.describe Admin::AccountsController do
 
       it 'redirects to the created account' do
         post :create, params: { account: valid_attributes }
-        expect(response).to redirect_to(Account.last.decorate.target_object)
+        expect(response).to redirect_to([:admin, Account.last])
       end
     end
 
@@ -163,7 +163,7 @@ RSpec.describe Admin::AccountsController do
       it 'redirects to the account' do
         account = create(:account)
         put :update, params: { id: account.to_param, account: valid_attributes }
-        expect(response).to redirect_to(account.decorate.target_object)
+        expect(response).to redirect_to([:admin, Account.last])
       end
     end
 

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

@@ -31,7 +31,7 @@ RSpec.describe Admin::UserAccountsController do
   render_views
   let!(:user) { create :user }
 
-  let!(:account) { create :account }
+  let!(:account) { ActsAsTenant.current_tenant }
 
   # This should return the minimal set of attributes required to create a valid
   # UserAccount. As you add validations to UserAccount, be sure to
@@ -125,7 +125,7 @@ RSpec.describe Admin::UserAccountsController do
 
       it 'redirects to the created user_account' do
         post :create, params: { user_account: valid_attributes }
-        expect(response).to redirect_to(UserAccount.last.decorate.target_object)
+        expect(response).to redirect_to([:admin, UserAccount.last])
       end
     end
 
@@ -151,7 +151,8 @@ RSpec.describe Admin::UserAccountsController do
       it 'redirects to the user_account' do
         user_account = create(:user_account)
         put :update, params: { id: user_account.to_param, user_account: valid_attributes }
-        expect(response).to redirect_to(user_account.decorate.target_object)
+
+        expect(response).to redirect_to([:admin, UserAccount.last])
       end
     end
 

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

@@ -99,12 +99,18 @@ RSpec.describe Admin::UsersController do
       it 'creates a new User' do
         expect do
           post :create, params: { user: valid_attributes }
-        end.to change(User, :count).by(1)
+        end.to change(User.unscoped, :count).by(1)
+      end
+
+      it 'dont creates a new account' do
+        expect do
+          post :create, params: { user: valid_attributes }
+        end.not_to change(Account.unscoped, :count)
       end
 
       it 'redirects to the created user' do
         post :create, params: { user: valid_attributes }
-        expect(response).to redirect_to(User.last.decorate.target_object)
+        expect(response).to redirect_to([:admin, User.unscoped.last])
       end
     end
 
@@ -137,7 +143,7 @@ RSpec.describe Admin::UsersController do
       it 'redirects to the user' do
         user = create(:user)
         put :update, params: { id: user.to_param, user: valid_attributes }
-        expect(response).to redirect_to(user.decorate.target_object)
+        expect(response).to redirect_to([:admin, user.decorate])
       end
     end
 

data/pg_engine/spec/models/user_spec.rb

@@ -12,7 +12,7 @@ RSpec.describe User do
   end
 
   it do
-    expect(user.current_account).to be_present
+    expect(user.default_account).to be_present
   end
 
   context 'si es orphan' do
@@ -23,11 +23,18 @@ RSpec.describe User do
     end
 
     it do
-      expect { user.current_account }.to raise_error(User::Error)
+      expect { user.default_account }.to raise_error(User::Error)
     end
   end
 
   context 'Si falla la creación de cuenta, que rollbackee la transaction de create user' do
+    # rubocop:disable Lint/SuppressedException
+    subject do
+      user.save
+    rescue User::Error
+    end
+    # rubocop:enable Lint/SuppressedException
+
     let(:user) do
       build(:user)
     end
@@ -41,11 +48,11 @@ RSpec.describe User do
     end
 
     it do
-      expect { user.save }.not_to change(described_class, :count)
+      expect { subject }.not_to change(described_class, :count)
     end
 
     it do
-      user.save
+      subject
       expect(user).not_to be_persisted
     end
   end

data/pg_engine/spec/requests/base_controller_requests_spec.rb

@@ -13,7 +13,7 @@ describe 'Base requests' do
   end
 
   describe 'invalid authenticity token' do
-    subject { get '/admin/cosas', headers: }
+    subject { get '/a/cosas', headers: }
 
     before do
       sign_in create(:user, :developer)

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

@@ -0,0 +1,15 @@
+require 'rails_helper'
+
+describe 'redirection' do
+  context 'when public controller raises no tenant set' do
+    before do
+      allow(MensajeContacto).to receive(:new).and_raise(ActsAsTenant::Errors::NoTenantSet)
+    end
+
+    it 'shows the error' do
+      get '/contacto'
+
+      expect(response).to have_http_status(:internal_server_error)
+    end
+  end
+end

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

@@ -0,0 +1,60 @@
+require 'rails_helper'
+
+describe 'redirection' do
+  let(:logged_user) { create :user }
+
+  before do
+    sign_in logged_user
+  end
+
+  context 'when switcher controller raises no tenant set' do
+    # This is to prevent a redirect loop
+    before do
+      allow_any_instance_of(User).to receive(:user_accounts).and_raise(ActsAsTenant::Errors::NoTenantSet)
+    end
+
+    it 'shows the error' do
+      get '/u/switcher'
+
+      expect(response).to have_http_status(:internal_server_error)
+    end
+  end
+
+  it do
+    get '/u/cosas'
+
+    expect(response).to have_http_status(:ok)
+  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) }
+
+    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'
+      post "/u/switcher/#{other_user_account.to_param}"
+      expect(response).to redirect_to(root_path)
+      follow_redirect!
+      expect(response.body).to include other_account.to_s
+      other_user_account.destroy!
+      get '/'
+      expect(response).to redirect_to users_account_switcher_path
+    end
+  end
+
+  context 'when belongs to other account' do
+    before do
+      create :account, subdomain: 'other'
+      host! 'other.example.com'
+    end
+
+    it do
+      get '/u/cosas'
+
+      expect(response).to redirect_to new_user_session_path
+    end
+  end
+end

data/pg_engine/spec/system/breadcrumbs_spec.rb

@@ -12,7 +12,7 @@ describe 'Breadcrumbs' do
     visit path
   end
 
-  let(:path) { "/admin/cosas/#{cosa.id}" }
+  let(:path) { "/a/cosas/#{cosa.id}" }
   let(:cosa) { create :cosa }
   let(:logged_user) { create :user, :developer }
   let(:account) { logged_user.current_account }
@@ -25,20 +25,20 @@ describe 'Breadcrumbs' do
     it do
       visitar
 
-      expect(page).to have_css('nav ol.breadcrumb li').exactly(2)
+      expect(page).to have_css('nav ol.breadcrumb li').exactly(3)
       expect(page).to have_css('nav ol.breadcrumb li a').exactly(1)
     end
 
     context 'cuando es con nested' do
       let(:path) do
         hashid = cosa.categoria_de_cosa.hashid
-        "/admin/categoria_de_cosas/#{hashid}/cosas/#{cosa.id}"
+        "/a/categoria_de_cosas/#{hashid}/cosas/#{cosa.id}"
       end
 
       it do
         visitar
 
-        expect(page).to have_css('nav ol.breadcrumb li').exactly(3)
+        expect(page).to have_css('nav ol.breadcrumb li').exactly(4)
         expect(page).to have_css('nav ol.breadcrumb li a').exactly(1)
       end
     end
@@ -46,14 +46,14 @@ describe 'Breadcrumbs' do
     context 'cuando es con nested y modal' do
       let(:path) do
         hashid = cosa.categoria_de_cosa.hashid
-        "/admin/categoria_de_cosas/#{hashid}"
+        "/a/categoria_de_cosas/#{hashid}"
       end
 
       it do
         visitar
         find('td span[title=Ver] a').click
 
-        expect(page).to have_css('.modal nav ol.breadcrumb li').exactly(3)
+        expect(page).to have_css('.modal nav ol.breadcrumb li').exactly(4)
         expect(page).to have_no_css('.modal nav ol.breadcrumb li a')
       end
     end

data/pg_engine/spec/system/date_selector_spec.rb

@@ -12,7 +12,7 @@ describe 'Date selector' do
     visit edit_admin_categoria_de_cosa_path(categoria_de_cosa)
   end
 
-  let(:logged_user) { create :user }
+  let(:logged_user) { create :user, :developer }
   let(:account) { logged_user.current_account }
   let(:categoria_de_cosa) { create :categoria_de_cosa, fecha: }
   let(:fecha) { Date.new(2024, 8, 12) }

data/pg_engine/spec/system/destroy_spec.rb

@@ -19,7 +19,7 @@ describe 'Sign in' do
     before do
       create_list :cosa, 5
       login_as user
-      visit '/frontend/cosas'
+      visit '/a/cosas'
     end
 
     it do
@@ -40,12 +40,12 @@ describe 'Sign in' do
 
     before do
       login_as user
-      visit "/frontend/cosas/#{cosa.to_param}"
+      visit "/a/cosas/#{cosa.to_param}"
     end
 
     it 'muestra el flash' do
       subject
-      expect(page).to have_current_path('/frontend/cosas')
+      expect(page).to have_current_path('/a/cosas')
       expect(page).to have_text('Coso borrado')
     end
   end

data/pg_engine/spec/system/modal_windows_spec.rb

@@ -9,7 +9,7 @@ require 'rails_helper'
 # DRIVER=selenium rspec
 describe 'Modal windows' do
   subject(:visitar) do
-    visit '/admin/cosas'
+    visit '/a/cosas'
   end
 
   let(:logged_user) { create :user, :developer }
@@ -38,7 +38,7 @@ describe 'Modal windows' do
     let!(:cosa) { create :cosa, categoria_de_cosa: }
 
     it do
-      visit '/admin/cosas/' + cosa.to_param
+      visit '/a/cosas/' + cosa.to_param
       click_on 'Ver categoría'
       expect(page).to have_css '.modal', text: categoria_de_cosa.nombre
     end
@@ -48,7 +48,7 @@ describe 'Modal windows' do
     let!(:cosa) { create :cosa, categoria_de_cosa: }
 
     it do
-      visit '/admin/cosas/' + cosa.to_param
+      visit '/a/cosas/' + cosa.to_param
       click_on 'Modificar'
       fill_in 'Nombre', with: ''
       find('.modal input[type=submit]').click
@@ -63,7 +63,7 @@ describe 'Modal windows' do
     before { create :cosa, categoria_de_cosa: }
 
     it do
-      visit '/admin/cosas'
+      visit '/a/cosas'
       find('span[title=Ver] a').click
       accept_confirm do
         find('.modal span[title=Eliminar] a').click
@@ -77,7 +77,7 @@ describe 'Modal windows' do
       end
 
       it do
-        visit '/admin/cosas'
+        visit '/a/cosas'
         find('span[title=Ver] a').click
         accept_confirm do
           find('.modal span[title=Eliminar] a').click

data/pg_engine/spec/system/page_sizes_spec.rb

@@ -17,9 +17,9 @@ describe 'Page sizes' do
 
   describe 'some case' do
     it do
-      visit '/admin/cosas?page_size=2'
+      visit '/a/cosas?page_size=2'
       expect(page).to have_css('.page-item', count: 6)
-      visit '/admin/cosas?page_size=5'
+      visit '/a/cosas?page_size=5'
       expect(page).to have_css('.page-item', count: 4)
     end
   end

data/pg_engine/spec/system/signup_spec.rb

@@ -34,8 +34,10 @@ describe 'Al Registrarse' do
         check 'user_accept_terms'
       end
 
+      pending 'expect new account created also'
+
       it 'guarda el user' do
-        expect { subject }.to change(User, :count).by(1)
+        expect { subject }.to change(User.unscoped, :count).by(1)
         expect(page).to have_text('Te enviamos un correo electrónico con instrucciones')
       end
     end
@@ -57,8 +59,6 @@ describe 'Al Registrarse' do
       fill_in 'user_nombre', with: 'despues'
       fill_in 'user_current_password', with: password
       instance_exec('input[type=submit]', &find_scroll).click
-      # find('').click
-      sleep 1
     end
 
     let(:password) { 'pass1234' }
@@ -71,7 +71,7 @@ describe 'Al Registrarse' do
     end
 
     it do
-      expect { subject }.to change { user.reload.nombre }.to('despues')
+      subject
       expect(page).to have_text('Tu cuenta se ha actualizado')
     end
   end

data/pg_engine/spec/system/tenants_spec.rb

@@ -0,0 +1,55 @@
+# Initially generated with PgRails::SystemSpecGenerator
+# https://github.com/martin-rosso/pg_rails
+
+require 'rails_helper'
+
+# By default uses selenium_chrome_headless_iphone driver
+# run with DRIVER environment variable to override, eg:
+#
+# DRIVER=selenium rspec
+describe 'Tenants' do
+  subject(:visitar) do
+    visit '/u/cosas'
+  end
+
+  let(:logged_user) { create :user }
+
+  before do
+    login_as logged_user
+  end
+
+  describe 'switcher' do
+    it do
+      visitar
+
+      expect(page).to have_text 'No hay cosos que mostrar'
+    end
+
+    context 'when belongs to multiple accounts' do
+      let(:other_account) { create :account }
+
+      before do
+        logged_user.user_accounts.create!(account: other_account)
+      end
+
+      it 'shows the switcher' do
+        visitar
+
+        expect(page).to have_text 'Switcher'
+      end
+
+      it 'switches to account' do
+        visitar
+
+        click_on other_account.to_s
+        expect(page).to have_text 'No hay categorías de cosas que mostrar'
+      end
+
+      it 'shows the profile form' do
+        visit '/users/edit'
+
+        expect(page).to have_text 'Editar Usuario'
+      end
+    end
+  end
+end

data/pg_engine/spec/system/tooltips_spec.rb

@@ -3,7 +3,6 @@ require 'rails_helper'
 describe 'Tooltips' do
   context 'en desktop' do
     before do
-      # byebug
       driven_by :selenium_chrome_headless
       # Capybara.current_driver = :selenium_chrome
     end

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

@@ -1,3 +1,7 @@
+<% if ActsAsTenant.current_tenant %>
+  <h1><%= ActsAsTenant.current_tenant %><h1>
+<% end %>
+
 <h2><%= t(".sign_in") %></h2>
 
 <%= render FlashContainerComponent.new %>

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

@@ -5,6 +5,14 @@
     </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">Cuenta: <%= Current.account || 'Global' %></span>
+        <% elsif Current.account.present? %>
+          <span class="d-block px-3 text-secondary"><%= Current.account %></span>
+        <% end %>
+      <% end %>
       <hr>
     <% end %>
     <ul class="list-unstyled ps-0">

data/pg_rails/lib/version.rb

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

data/pg_scaffold/lib/generators/pg_pundit/templates/policy.rb

@@ -31,7 +31,7 @@ class <%= class_name %>Policy < ApplicationPolicy
   # end
 
   # def base_access_to_record?
-  #   base_access_to_collection? && record.account == Current.account
+  #   base_access_to_collection? && record.account == ActsAsTenant.current_tenant
   # end
 
   # def base_access_to_collection?

data/pg_scaffold/lib/generators/pg_rails/system_spec/templates/system_spec.rb

@@ -13,7 +13,7 @@ describe '<%= name %>' do
   end
 
   let(:logged_user) { create :user }
-  let(:account) { logged_user.current_account }
+  let(:account) { ActsAsTenant.current_tenant }
 
   before do
     login_as logged_user

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

@@ -170,7 +170,6 @@ RSpec.describe <%= controller_class_name %>Controller do
 <% else -%>
         post :create, params: { <%= nombre_tabla_completo_singular %>: valid_attributes }
 <% end -%>
-        # FIXME: redirect to target object
         expect(response).to redirect_to([:<%= ns_prefix.first %>, <%= class_name %>.last])
       end
     end
@@ -219,7 +218,6 @@ RSpec.describe <%= controller_class_name %>Controller do
 <% else -%>
         put :update, params: { id: <%= file_name %>.to_param, <%= nombre_tabla_completo_singular %>: valid_attributes }
 <% end -%>
-        # FIXME: redirect to target object
         expect(response).to redirect_to([:<%= ns_prefix.first %>, <%= file_name %>])
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.4.3
+  version: 7.5.1
 platform: ruby
 authors:
 - Martín Rosso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-09-04 00:00:00.000000000 Z
+date: 2024-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: acts_as_tenant
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: caxlsx_rails
   requirement: !ruby/object:Gem::Requirement
@@ -663,6 +677,7 @@ files:
 - pg_engine/app/controllers/admin/eventos_controller.rb
 - pg_engine/app/controllers/admin/user_accounts_controller.rb
 - pg_engine/app/controllers/admin/users_controller.rb
+- pg_engine/app/controllers/concerns/pg_engine/require_tenant_set.rb
 - pg_engine/app/controllers/concerns/pg_engine/resource.rb
 - pg_engine/app/controllers/pg_engine/base_controller.rb
 - pg_engine/app/controllers/pg_engine/devise_controller.rb
@@ -670,6 +685,7 @@ files:
 - pg_engine/app/controllers/pg_engine/require_sign_in.rb
 - 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/confirmations_controller.rb
 - pg_engine/app/controllers/users/date_jumper_controller.rb
 - pg_engine/app/controllers/users/notifications_controller.rb
@@ -756,8 +772,10 @@ files:
 - pg_engine/app/views/pg_engine/user_mailer/notification.text.slim
 - 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/config/initializers/action_mailer.rb
 - pg_engine/config/initializers/active_admin.rb
+- pg_engine/config/initializers/acts_as_tenant.rb
 - pg_engine/config/initializers/anycable.rb
 - pg_engine/config/initializers/cable_ready.rb
 - pg_engine/config/initializers/devise.rb
@@ -789,6 +807,7 @@ files:
 - pg_engine/db/migrate/20240611000219_create_noticed_tables.noticed.rb
 - pg_engine/db/migrate/20240611000220_add_notifications_count_to_noticed_event.noticed.rb
 - pg_engine/db/migrate/20240614130246_create_action_text_tables.action_text.rb
+- pg_engine/db/migrate/20240905154330_account_tenant_columns.rb
 - pg_engine/db/seeds.rb
 - pg_engine/lib/pg_engine.rb
 - pg_engine/lib/pg_engine/configuracion.rb
@@ -852,7 +871,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/users/base_controller_spec.rb
 - pg_engine/spec/requests/users/date_jumper_spec.rb
+- pg_engine/spec/requests/users/switcher_spec.rb
 - pg_engine/spec/system/alerts_spec.rb
 - pg_engine/spec/system/breadcrumbs_spec.rb
 - pg_engine/spec/system/date_selector_spec.rb
@@ -863,6 +884,7 @@ files:
 - pg_engine/spec/system/page_sizes_spec.rb
 - pg_engine/spec/system/send_mail_spec.rb
 - pg_engine/spec/system/signup_spec.rb
+- pg_engine/spec/system/tenants_spec.rb
 - pg_engine/spec/system/tooltips_spec.rb
 - pg_layout/app/assets/stylesheets/animations.scss
 - pg_layout/app/assets/stylesheets/sidebar.scss