pg_rails 7.0.8.pre.alpha.51 → 7.0.8.pre.alpha.53

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12e2f8570100688111978d151d42a814178f2382d18b373455535f7b5d625216
-  data.tar.gz: e867b8911a1a67781515d30efbf3facf6ad31cb27c296444327016c3ad2fdbca
+  metadata.gz: bc65c537b0f07c6659a716cf31aca506a9da7d7ee43f6bbaa425a756864875ef
+  data.tar.gz: ba019b72eb7fac96fc364396da6890040a86b7743e2532e73c677a20809c546d
 SHA512:
-  metadata.gz: e7bc0a0f4e182d2f0fc451278e779acb22c31de3e7939de6d9feeb5047590b972586a70c8f03823b648c1e298bfa9ca7cc9609748175f8de941bc03658e42476
-  data.tar.gz: e5b2f79ca65227fdf85761af0a96629405c0904c6f0027b3f16e001648470c375920c8b5eb2d550ae0b697e4784b95f791ec4d073d4d22ebb37f6d8ea73e9dd9
+  metadata.gz: 46fe858cbdfde69a00935a3e92aa2524729a030217629556a3f4a6717b7f873c80ccf72fee9698f0599b0b7768ddd27b392273b01685eb556c46c236a1eb1450
+  data.tar.gz: 3be35c7a9db5507e1c84f62e3b405772986ffb3fd63a09b5a93f5fd54128fca897da7f707437e66556a5aee9f6d26bfe639bdf51dceac99f210730cfd089134d

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

@@ -32,11 +32,15 @@ module Admin
 
     # :nocov:
     def login_as
-      if dev_user_or_env?
-        usuario = User.find(params[:id])
+      return unless dev_user_or_env?
+
+      usuario = User.find(params[:id])
+      if usuario.confirmed_at.present?
         sign_in(:user, usuario)
+        redirect_to after_sign_in_path_for(usuario)
+      else
+        go_back('No está confirmado')
       end
-      redirect_to after_sign_in_path_for(usuario)
     end
     # :nocov:
 

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

@@ -49,8 +49,7 @@ module PgEngine
     end
 
     def destroy
-      url = namespaced_path(@clase_modelo)
-      pg_respond_destroy(instancia_modelo, url)
+      pg_respond_destroy(instancia_modelo, params[:redirect_to])
     end
     # End public endpoints
 
@@ -150,15 +149,21 @@ module PgEngine
 
     def pg_respond_destroy(model, redirect_url = nil)
       if destroy_model(model)
+        msg = "#{model.model_name.human} #{model.gender == 'f' ? 'borrada' : 'borrado'}"
         respond_to do |format|
-          format.html do
-            if redirect_url.present?
-              redirect_to redirect_url, notice: 'Elemento borrado.', status: :see_other
-            else
-              redirect_back(fallback_location: root_path, notice: 'Elemento borrado.', status: 303)
+          if redirect_url.present?
+            format.html do
+              redirect_to redirect_url, notice: msg, status: :see_other
+            end
+          else
+            format.turbo_stream do
+              render turbo_stream: turbo_stream.remove(model)
+            end
+            format.html do
+              redirect_back(fallback_location: root_path, notice: msg, status: 303)
             end
+            format.json { head :no_content }
           end
-          format.json { head :no_content }
         end
       else
         respond_to do |format|
@@ -168,11 +173,7 @@ module PgEngine
               render destroy_error_details_view
             else
               flash[:alert] = @error_message
-              # if redirect_url.present?
-              #   redirect_to redirect_url
-              # else
               redirect_back(fallback_location: root_path, status: 303)
-              # end
             end
           end
           format.json { render json: { error: @error_message }, status: :unprocessable_entity }
@@ -273,7 +274,8 @@ module PgEngine
 
     def do_sort(scope, field, direction)
       # TODO: restringir ciertos campos?
-      unless scope.model.column_names.include? field.to_s
+      unless scope.model.column_names.include?(field.to_s) ||
+             scope.model.respond_to?("order_by_#{field}")
         PgLogger.warn("No existe el campo \"#{field}\"", :warn)
         return scope
       end
@@ -281,7 +283,11 @@ module PgEngine
         PgLogger.warn("Direction not valid: \"#{direction}\"", :warn)
         return scope
       end
-      scope = scope.order(field => direction)
+      scope = if scope.model.respond_to? "order_by_#{field}"
+                scope.send "order_by_#{field}", direction
+              else
+                scope.order(field => direction)
+              end
       instance_variable_set(:@field, field)
       instance_variable_set(:@direction, direction)
       scope

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

@@ -99,16 +99,16 @@ module PgEngine
     def not_authorized
       respond_to do |format|
         format.json do
-          render json: { error: 'Not authorized' },
+          render json: { error: 'Acceso no autorizado' },
                  status: :unprocessable_entity
         end
         format.html do
           if request.path == root_path
             # TODO!: renderear un 500.html y pg_err
             sign_out(Current.user) if Current.user.present?
-            render plain: 'Not authorized'
+            render plain: 'Acceso no autorizado'
           else
-            go_back('Not authorized')
+            go_back('Acceso no autorizado')
           end
         end
       end

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

@@ -12,6 +12,10 @@ module Public
 
     before_action :set_instancia_modelo, only: %i[new create]
 
+    layout 'pg_layout/container_logo'
+
+    def new; end
+
     def create
       if @mensaje_contacto.save
         render turbo_stream: turbo_stream.update('mensaje_contacto', partial: 'gracias')

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

@@ -1,9 +1,7 @@
 module Users
   class RegistrationsController < Devise::RegistrationsController
-    # POST /resource
-
     before_action do
-      authorize User
+      authorize resource, nil, policy_class: UserRegistrationPolicy
     end
 
     def create

data/pg_engine/app/decorators/pg_engine/base_decorator.rb

@@ -31,12 +31,17 @@ module PgEngine
     end
     # rubocop:enable Style/MissingRespondToMissing
 
-    def destroy_link(confirm_text: '¿Estás seguro?', klass: 'btn-light')
+    def destroy_link_redirect
+      destroy_link(redirect_to: helpers.url_for(target_index))
+    end
+
+    def destroy_link(confirm_text: '¿Estás seguro?', klass: 'btn-light', redirect_to: nil)
       return unless Pundit.policy!(Current.user, object).destroy?
 
       helpers.content_tag :span, rel: :tooltip, title: 'Eliminar' do
-        helpers.link_to object_url, data: { 'turbo-confirm': confirm_text, 'turbo-method': :delete },
-                                    class: "btn btn-sm #{klass}" do
+        helpers.link_to object_url + (redirect_to.present? ? "?redirect_to=#{redirect_to}" : ''),
+                        data: { 'turbo-confirm': confirm_text, 'turbo-method': :delete },
+                        class: "btn btn-sm #{klass}" do
           helpers.content_tag :span, nil, class: clase_icono('trash-fill')
         end
       end

data/pg_engine/app/helpers/pg_engine/index_helper.rb

@@ -3,6 +3,8 @@
 module PgEngine
   module IndexHelper
     def encabezado(campo, options = {})
+      campo = campo.to_s.sub(/_f\z/, '')
+      campo = campo.to_s.sub(/_text\z/, '')
       clase = options[:clase] || @clase_modelo
       if options[:ordenable]
         field = controller.instance_variable_get(:@field)

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

@@ -23,6 +23,10 @@ module PgEngine
       authorizable_ransackable_attributes
     end
 
+    def gender
+      self.class.model_name.human.downcase.ends_with?('a') ? 'f' : 'm'
+    end
+
     def self.nombre_plural
       model_name.human(count: 2)
     end
@@ -43,6 +47,15 @@ module PgEngine
       end
     end
 
+    # Para el dom_id (index.html)
+    def to_key
+      if respond_to? :hashid
+        [hashid]
+      else
+        super
+      end
+    end
+
     def to_s
       %i[nombre name].each do |campo|
         return "#{send(campo)} ##{to_param}" if try(campo).present?

data/pg_engine/app/policies/user_policy.rb

@@ -13,7 +13,19 @@ class UserPolicy < ApplicationPolicy
     # end
   end
 
-  def acceso_total?
-    true
-  end
+  # def puede_editar?
+  #   acceso_total? && !record.readonly?
+  # end
+
+  # def puede_crear?
+  #   acceso_total? || user.asesor?
+  # end
+
+  # def puede_borrar?
+  #   acceso_total? && !record.readonly?
+  # end
+
+  # def acceso_total?
+  #   user.developer?
+  # end
 end

data/pg_engine/app/policies/user_registration_policy.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+class UserRegistrationPolicy
+  attr_reader :user, :record
+
+  def initialize(user, record)
+    @user = user
+    @record = record
+  end
+
+  def new?
+    create?
+  end
+
+  def create?
+    user.blank?
+  end
+
+  def edit?
+    update?
+  end
+
+  def update?
+    user == record
+  end
+end

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

@@ -1,7 +1,7 @@
 - content_for :title do
   = @account.to_s
 - content_for :actions do
-  = @account.destroy_link
+  = @account.destroy_link_redirect
   .ms-1
   = @account.edit_link
 

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

@@ -1,7 +1,7 @@
 - content_for :title do
   = @user_account.to_s
 - content_for :actions do
-  = @user_account.destroy_link
+  = @user_account.destroy_link_redirect
   .ms-1
   = @user_account.edit_link
 

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

@@ -1,9 +1,13 @@
 - content_for :title do
   = @user.to_s
 - content_for :actions do
-  = @user.destroy_link
+  = @user.destroy_link_redirect
   .ms-1
   = @user.edit_link
+  .ms-1
+  = link_to admin_login_as_path(id: @user.id), class: 'btn btn-light btn-sm' do
+    span.bi.bi-arrow-right
+    |  Login as
 
 table.table.table-borderless.table-sm.w-auto.mb-0.m-3
   - atributos_para_mostrar.each do |att|

data/pg_engine/app/views/public/mensaje_contactos/new.html.slim

@@ -0,0 +1,21 @@
+/ # locals: (object: nil, asociable: false)
+.text-center
+  #mensaje_contacto
+    h2 Ponete en contacto
+    .d-inline-block style="width: 30em; max-width: 100%"
+      div data-controller="pg_form"
+        = pg_form_for(@mensaje_contacto || object, asociable:) do |f|
+          = f.mensajes_de_error
+
+          = hidden_field_tag :asociable, true if asociable
+          = f.input :nombre, input_html: { style: 'max-width: 22em' }
+          = f.input :email, input_html: { style: 'max-width: 23em' }
+          = f.input :telefono, hint: '(Opcional)', input_html: { style: 'max-width: 15em' }
+          = f.input :mensaje, as: :text, input_html: { rows: 5 }
+          .mt-2
+          = f.button :submit, value: 'Enviar'
+
+css:
+  form input {
+    margin: auto;
+  }

data/pg_engine/config/initializers/active_admin.rb

@@ -1,3 +1,9 @@
+class MyAdapter < ActiveAdmin::AuthorizationAdapter
+  def authorized?(action, subject = nil)
+    user.developer?
+  end
+end
+
 ActiveAdmin.setup do |config|
   # == Site Title
   #
@@ -79,7 +85,7 @@ ActiveAdmin.setup do |config|
   # method in a before filter of all controller actions to
   # ensure that there is a user with proper rights. You can use
   # CanCanAdapter or make your own. Please refer to documentation.
-  # config.authorization_adapter = ActiveAdmin::CanCanAdapter
+  config.authorization_adapter = MyAdapter
 
   # In case you prefer Pundit over other solutions you can here pass
   # the name of default policy class. This policy will be used in every

data/pg_engine/config/initializers/devise.rb

@@ -164,7 +164,7 @@ Devise.setup do |config|
 
   # ==> Configuration for :rememberable
   # The time the user will be remembered without asking for credentials again.
-  # config.remember_for = 2.weeks
+  config.remember_for = 60.days
 
   # Invalidates all the remember me tokens when the user signs out.
   config.expire_all_remember_me_on_sign_out = true
@@ -188,7 +188,7 @@ Devise.setup do |config|
   # ==> Configuration for :timeoutable
   # The time you want to timeout the user session without activity. After this
   # time the user will be asked for credentials again. Default is 30 minutes.
-  # config.timeout_in = 30.minutes
+  config.timeout_in = 14.days
 
   # ==> Configuration for :lockable
   # Defines which strategy will be used to lock an account.

data/pg_engine/config/locales/es.yml

@@ -77,7 +77,10 @@ es:
         sign_up: Crear una cuenta
         forgot_your_password: ¿Olvidaste tu contraseña?
         didn_t_receive_confirmation_instructions: ¿No recibiste las instrucciones para confirmar tu cuenta?
-
+  activerecord:
+    attributes:
+      user:
+        remember_me: Mantener sesión abierta
 
 
 

data/pg_engine/config/simple_form/simple_form_bootstrap.rb

@@ -92,7 +92,7 @@ SimpleForm.setup do |config|
   config.wrappers :vertical_form, class: 'mb-3', &control_wrapper
 
   # vertical input for boolean
-  config.wrappers :vertical_boolean, tag: 'fieldset', class: 'mb-3' do |b|
+  config.wrappers :vertical_boolean, tag: 'fieldset', class: 'mb-3 d-flex justify-content-center' do |b|
     b.use :html5
     b.optional :readonly
     b.wrapper :form_check_wrapper, class: 'form-check' do |bb|

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

@@ -184,10 +184,12 @@ RSpec.describe Admin::AccountsController do
 
   describe 'DELETE #destroy' do
     subject do
-      delete :destroy, params: { id: account.to_param }
+      request.headers['Accept'] = 'text/vnd.turbo-stream.html,text/html'
+      delete :destroy, params: { id: account.to_param, redirect_to: redirect_url }
     end
 
     let!(:account) { create :account }
+    let(:redirect_url) { nil }
 
     it 'destroys the requested account' do
       expect { subject }.to change(Account.kept, :count).by(-1)
@@ -198,9 +200,18 @@ RSpec.describe Admin::AccountsController do
       expect(account.reload.discarded_at).to be_present
     end
 
-    it 'redirects to the accounts list' do
+    it 'quita el elemento de la lista' do
       subject
-      expect(response).to redirect_to(admin_accounts_url)
+      expect(response.body).to include('turbo-stream action="remove"')
+    end
+
+    context 'si hay redirect_to' do
+      let(:redirect_url) { admin_accounts_url }
+
+      it 'redirects to the accounts list' do
+        subject
+        expect(response).to redirect_to(admin_accounts_url)
+      end
     end
   end
 end

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

@@ -172,18 +172,29 @@ RSpec.describe Admin::UserAccountsController do
 
   describe 'DELETE #destroy' do
     subject do
-      delete :destroy, params: { id: user_account.to_param }
+      request.headers['Accept'] = 'text/vnd.turbo-stream.html,text/html'
+      delete :destroy, params: { id: user_account.to_param, redirect_to: redirect_url }
     end
 
     let!(:user_account) { create :user_account }
+    let(:redirect_url) { nil }
 
     it 'destroys the requested user_account' do
       expect { subject }.to change(UserAccount, :count).by(-1)
     end
 
-    it 'redirects to the user_accounts list' do
+    it 'quita el elemento de la lista' do
       subject
-      expect(response).to redirect_to(admin_user_accounts_url)
+      expect(response.body).to include('turbo-stream action="remove"')
+    end
+
+    context 'si hay redirect_to' do
+      let(:redirect_url) { admin_user_accounts_url }
+
+      it 'redirects to the user_accounts list' do
+        subject
+        expect(response).to redirect_to(admin_user_accounts_url)
+      end
     end
   end
 end

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

@@ -158,10 +158,12 @@ RSpec.describe Admin::UsersController do
 
   describe 'DELETE #destroy' do
     subject do
-      delete :destroy, params: { id: user.to_param }
+      request.headers['Accept'] = 'text/vnd.turbo-stream.html,text/html'
+      delete :destroy, params: { id: user.to_param, redirect_to: redirect_url }
     end
 
     let!(:user) { create :user }
+    let(:redirect_url) { nil }
 
     it 'destroys the requested user' do
       expect { subject }.to change(User.kept, :count).by(-1)
@@ -172,9 +174,18 @@ RSpec.describe Admin::UsersController do
       expect(user.reload.discarded_at).to be_present
     end
 
-    it 'redirects to the users list' do
+    it 'quita el elemento de la lista' do
       subject
-      expect(response).to redirect_to(admin_users_url)
+      expect(response.body).to include('turbo-stream action="remove"')
+    end
+
+    context 'si hay redirect_to' do
+      let(:redirect_url) { admin_users_url }
+
+      it 'redirects to the users list' do
+        subject
+        expect(response).to redirect_to(admin_users_url)
+      end
     end
   end
 end

data/pg_engine/spec/controllers/concerns/pg_engine/resource_helper_spec.rb

@@ -34,9 +34,9 @@ describe PgEngine::Resource do
       instancia.send(:do_sort, scope, param, direction)
     end
 
-    let!(:categoria_de_cosa_ult) { create :categoria_de_cosa, nombre: 'Z' }
-    let!(:categoria_de_cosa_pri) { create :categoria_de_cosa, nombre: 'a' }
-    let(:scope) { CategoriaDeCosa.all }
+    let!(:cosa_ult) { create :cosa, nombre: 'Z' }
+    let!(:cosa_pri) { create :cosa, nombre: 'a' }
+    let(:scope) { Cosa.all }
     let(:param) { :nombre }
     let(:direction) { :desc }
 
@@ -44,7 +44,7 @@ describe PgEngine::Resource do
       let(:direction) { :asc }
 
       it do
-        expect(subject.to_a).to eq [categoria_de_cosa_pri, categoria_de_cosa_ult]
+        expect(subject.to_a).to eq [cosa_pri, cosa_ult]
       end
     end
 
@@ -52,7 +52,7 @@ describe PgEngine::Resource do
       let(:direction) { :desc }
 
       it do
-        expect(subject.to_a).to eq [categoria_de_cosa_ult, categoria_de_cosa_pri]
+        expect(subject.to_a).to eq [cosa_ult, cosa_pri]
       end
     end
 
@@ -60,7 +60,32 @@ describe PgEngine::Resource do
       let(:param) { :inexistente }
 
       it do
-        expect(subject.to_a).to eq [categoria_de_cosa_ult, categoria_de_cosa_pri]
+        expect(subject.to_a).to eq [cosa_ult, cosa_pri]
+      end
+    end
+
+    context 'cuando ordeno por categoria' do
+      let(:param) { :categoria_de_cosa }
+
+      before do
+        cosa_pri.categoria_de_cosa.update_column(:nombre, 'a') # rubocop:disable Rails/SkipsModelValidations
+        cosa_ult.categoria_de_cosa.update_column(:nombre, 'z') # rubocop:disable Rails/SkipsModelValidations
+      end
+
+      context 'si es asc' do
+        let(:direction) { :asc }
+
+        it do
+          expect(subject.to_a).to eq [cosa_pri, cosa_ult]
+        end
+      end
+
+      context 'si es desc' do
+        let(:direction) { :desc }
+
+        it do
+          expect(subject.to_a).to eq [cosa_ult, cosa_pri]
+        end
       end
     end
   end

data/pg_engine/spec/controllers/pg_engine/base_controller_spec.rb

@@ -42,7 +42,7 @@ describe DummyBaseController do
     it do
       subject
       expect(response).to redirect_to root_path
-      expect(flash[:alert]).to eq 'Not authorized'
+      expect(flash[:alert]).to eq 'Acceso no autorizado'
       expect(controller).to be_user_signed_in
     end
 
@@ -54,7 +54,7 @@ describe DummyBaseController do
       it do
         subject
         expect(response).to have_http_status(:ok)
-        expect(response.body).to eq 'Not authorized'
+        expect(response.body).to eq 'Acceso no autorizado'
         expect(controller).not_to be_user_signed_in
       end
     end

data/pg_engine/spec/features/destroy_spec.rb

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'Sign in', :js do
+  include ActionView::RecordIdentifier
+
+  shared_examples 'destroy from index' do
+    subject do
+      accept_confirm do
+        find("##{dom_id(cosa)} span[title=Eliminar] a").click
+      end
+      sleep 1
+    end
+
+    let(:user) { create :user, :developer }
+    let!(:cosa) { create :cosa }
+
+    before do
+      create_list :cosa, 5
+      login_as user
+      visit '/frontend/cosas'
+    end
+
+    it do
+      expect { subject }.to change { page.find_all('tbody tr').length }.from(6).to(5)
+    end
+  end
+
+  shared_examples 'destroy from show' do
+    subject do
+      accept_confirm do
+        find('.btn-toolbar span[title=Eliminar] a').click
+      end
+      sleep 1
+    end
+
+    let(:user) { create :user, :developer }
+    let!(:cosa) { create :cosa }
+
+    before do
+      login_as user
+      visit "/frontend/cosas/#{cosa.to_param}"
+    end
+
+    it do # rubocop:disable RSpec/MultipleExpectations
+      subject
+      expect(page).to have_current_path('/frontend/cosas')
+      expect(page).to have_text('Coso borrado')
+    end
+  end
+
+  # Capybara.drivers.keys
+  drivers = %i[
+    selenium_headless
+    selenium_chrome_headless
+    selenium_chrome_headless_notebook
+    selenium_chrome_headless_iphone
+  ]
+  # drivers = %i[selenium_chrome_headless_notebook]
+  # drivers = %i[selenium_chrome_debugger]
+  # drivers = %i[selenium]
+  # drivers = %i[selenium_chrome]
+  drivers = [ENV['DRIVER'].to_sym] if ENV['DRIVER'].present?
+
+  drivers.each do |driver|
+    context("with driver '#{driver}'", driver:) do
+      it_behaves_like 'destroy from index'
+      it_behaves_like 'destroy from show'
+    end
+  end
+end

data/pg_engine/spec/features/login_spec.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'Sign in', :js do
+  shared_examples 'sign_in' do
+    subject do
+      visit '/users/sign_in'
+      fill_in 'user_email', with: user.email
+      fill_in 'user_password', with: password
+      find('input[type=submit]').click
+    end
+
+    let(:password) { 'pass1234' }
+    let!(:user) { create :user, password: }
+
+    it do
+      subject
+      expect(page).to have_text :all, 'No hay categorías de cosas aún'
+    end
+  end
+
+  # Capybara.drivers.keys
+  drivers = %i[
+    selenium_headless
+    selenium_chrome_headless
+    selenium_chrome_headless_notebook
+    selenium_chrome_headless_iphone
+  ]
+  # drivers = %i[selenium_chrome_headless_notebook]
+  # drivers = %i[selenium_chrome_debugger]
+  # drivers = %i[selenium]
+  # drivers = %i[selenium_chrome]
+  drivers = [ENV['DRIVER'].to_sym] if ENV['DRIVER'].present?
+
+  drivers.each do |driver|
+    context("with driver '#{driver}'", driver:) do
+      include_examples 'sign_in'
+    end
+  end
+end

data/pg_engine/spec/features/signup_spec.rb

@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'Al Registrarse', :js do
+  include ActiveJob::TestHelper
+
+  find_scroll = proc do |selector, options = {}|
+    elem = find(selector, **options.merge(visible: :all))
+    script = 'arguments[0].scrollIntoView({ behavior: "instant", block: "start", inline: "nearest" });'
+    page.execute_script(script, elem)
+    sleep 0.5
+    elem
+  end
+
+  shared_examples 'sign_up' do
+    subject do
+      perform_enqueued_jobs do
+        visit '/users/sign_up'
+        fill_in 'user_email', with: Faker::Internet.email
+        fill_in 'user_nombre', with: Faker::Name.name
+        fill_in 'user_apellido', with: Faker::Name.name
+        fill_in 'user_password', with: 'admin123'
+        fill_in 'user_password_confirmation', with: 'admin123'
+        instance_exec('input[type=submit]', &find_scroll).click
+        expect(page).to have_text('Se ha enviado un mensaje con un enlace')
+      end
+    end
+
+    it 'guarda el user' do
+      expect { subject }.to change(User, :count).by(1)
+    end
+  end
+
+  shared_examples 'edit user' do
+    subject 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' }
+    let(:nombre) { 'antes' }
+    let!(:user) { create :user, password:, nombre: }
+
+    before do
+      login_as user
+      visit '/users/edit'
+    end
+
+    it do # rubocop:disable RSpec/MultipleExpectations
+      expect { subject }.to change { user.reload.nombre }.to('despues')
+      expect(page).to have_text('Tu cuenta se ha actualizado')
+    end
+  end
+
+  # Capybara.drivers.keys
+  drivers = %i[
+    selenium_headless
+    selenium_chrome_headless
+    selenium_chrome_headless_notebook
+    selenium_chrome_headless_iphone
+  ]
+  # drivers = %i[selenium_chrome_headless_notebook]
+  # drivers = %i[selenium_chrome_debugger]
+  # drivers = %i[selenium]
+  # drivers = %i[selenium_chrome]
+  drivers = [ENV['DRIVER'].to_sym] if ENV['DRIVER'].present?
+
+  drivers.each do |driver|
+    context("with driver '#{driver}'", driver:) do
+      it_behaves_like 'sign_up'
+      it_behaves_like 'edit user'
+    end
+  end
+end

data/pg_layout/app/javascript/controllers/navbar_controller.js

@@ -1,15 +1,24 @@
 import { Controller } from '@hotwired/stimulus'
 import Cookies from './../utils/cookies'
+import { fadeOut, fadeIn } from './../utils/utils'
 
 export default class extends Controller {
+  connect () {
+    if (document.getElementById('sidebar').classList.contains('opened')) {
+      document.querySelector('.navbar .navbar-brand').style.visibility = 'hidden'
+    }
+  }
+
   expandNavbar (e) {
     const icon = this.element.querySelector('i')
     if (document.getElementById('sidebar').classList.toggle('opened')) {
       icon.classList.add('bi-chevron-left')
       icon.classList.remove('bi-chevron-right')
+      fadeOut(document.querySelector('.navbar .navbar-brand'))
     } else {
       icon.classList.remove('bi-chevron-left')
       icon.classList.add('bi-chevron-right')
+      fadeIn(document.querySelector('.navbar .navbar-brand'))
     }
     const isOpened = document.getElementById('sidebar').classList.contains('opened')
     new Cookies().setCookie('navbar_expand', isOpened, 30)

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

@@ -1,9 +1,3 @@
-<% if @navbar.logo_xl_url.present? %>
-  <div class="mx-3 my-4 m-md-5">
-    <%= image_tag @navbar.logo_xl_url, class: 'img-fluid' %>
-  </div>
-<% end %>
-
 <h2><%= t(".sign_up") %></h2>
 <div id="form-signup" data-controller="pg_form">
   <%= pg_form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>

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

@@ -1,9 +1,3 @@
-<% if @navbar.logo_xl_url.present? %>
-  <div class="mx-3 my-4 m-md-5">
-    <%= image_tag @navbar.logo_xl_url, class: 'img-fluid' %>
-  </div>
-<% end %>
-
 <h2><%= t(".sign_in") %></h2>
 
 <%= render partial: 'pg_layout/flash_container' %>
@@ -16,7 +10,6 @@
     <%= f.input :password,
                 required: false,
                 input_html: { autocomplete: "current-password" } %>
-    <%# TODO!: corregir style de checkbox %>
     <%#= f.input :remember_me, as: :boolean if devise_mapping.rememberable? %>
   </div>
 

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

@@ -0,0 +1,10 @@
+- content_for :content do
+  .container-fluid.pt-4
+    .text-center
+      - if @navbar.logo_xl_url.present?
+        .mb-4
+          = image_tag @navbar.logo_xl_url, class: 'img-fluid', style: 'max-height: 4em'
+
+    = content_for?(:container_logo_content) ? yield(:container_logo_content) : yield
+
+= render template: 'layouts/pg_layout/base'

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

@@ -1,5 +1,5 @@
-- content_for :content do
-  .container.text-center.pt-4
+- content_for :container_logo_content do
+  .text-center
     = yield
 
   css:
@@ -8,4 +8,4 @@
       margin: auto;
     }
 
-= render template: 'layouts/pg_layout/base'
+= render template: 'layouts/pg_layout/container_logo'

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

@@ -5,13 +5,19 @@
         <i class="bi <%= @navbar_chevron_class %>"></i>
       </button>
 
-      <button class="btn btn-outline-light d-inline-block d-<%= @breakpoint_navbar_expand %>-none" type="button" data-bs-toggle="offcanvas" data-bs-target="#offcanvasExample" aria-controls="offcanvasExample">
-        <i class="bi bi-list"></i>
-      </button>
     <% end %>
     <% @navbar.extensiones.each do |extension| %>
       <%= extension %>
     <% end %>
     <%= @navbar.logo if @navbar.logo.present? %>
+    <button class="btn btn-outline-light d-inline-block d-<%= @breakpoint_navbar_expand %>-none" type="button" data-bs-toggle="offcanvas" data-bs-target="#offcanvasExample" aria-controls="offcanvasExample">
+      <i class="bi bi-list"></i>
+    </button>
   </div>
 </nav>
+
+<style type="text/css" media="(max-width: 767px)">
+  .navbar .navbar-brand {
+    visibility:visible!important;
+  }
+</style>

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

@@ -1,5 +1,8 @@
 <div id="sidebar" class="<%= @navbar_opened_class %> flex-shrink-0 d-none d-<%= @breakpoint_navbar_expand %>-block">
-  <div class="mt-4">
+  <div class="mt-1">
+    <div class="m-3">
+      <%= @navbar.logo if @navbar.logo.present? %>
+    </div>
     <% if user_signed_in? %>
       <span class="ms-3 text-light"><%= Current.user %></span>
       <hr>

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

@@ -1,4 +1,4 @@
-<div class="offcanvas offcanvas-start" tabindex="-1" id="offcanvasExample" aria-labelledby="offcanvasExampleLabel">
+<div class="offcanvas offcanvas-end" tabindex="-1" id="offcanvasExample" aria-labelledby="offcanvasExampleLabel">
   <div class="offcanvas-header" data-bs-theme="dark">
     <h5 class="offcanvas-title" id="offcanvasExampleLabel"></h5>
     <button type="button" class="btn-close" data-bs-dismiss="offcanvas" aria-label="Close"></button>

data/pg_rails/lib/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PgRails
-  VERSION = '7.0.8-alpha.51'
+  VERSION = '7.0.8-alpha.53'
 end

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

@@ -241,14 +241,12 @@ RSpec.describe <%= controller_class_name %>Controller do
 
   describe 'DELETE #destroy' do
     subject do
-<% if Rails::VERSION::STRING < '5.0' -%>
-      delete :destroy, { id: <%= file_name %>.to_param }
-<% else -%>
-      delete :destroy, params: { id: <%= file_name %>.to_param }
-<% end -%>
+      request.headers['Accept'] = "text/vnd.turbo-stream.html,text/html"
+      delete :destroy, params: { id: <%= file_name %>.to_param, redirect_to: redirect_url }
     end
 
     let!(:<%= nombre_tabla_completo_singular %>) { create :<%= nombre_tabla_completo_singular %> }
+    let(:redirect_url) { nil }
 
     it 'destroys the requested <%= nombre_tabla_completo_singular %>' do
 <% if options[:discard] -%>
@@ -267,9 +265,18 @@ RSpec.describe <%= controller_class_name %>Controller do
     end
 
 <% end -%>
-    it 'redirects to the <%= table_name %> list' do
+    it 'quita el elemento de la lista' do
       subject
-      expect(response).to redirect_to(<%= index_helper %>_url)
+      expect(response.body).to include('turbo-stream action="remove"')
+    end
+
+    context 'si hay redirect_to' do
+      let(:redirect_url) { <%= index_helper %>_url }
+
+      it 'redirects to the <%= table_name %> list' do
+        subject
+        expect(response).to redirect_to(<%= index_helper %>_url)
+      end
     end
   end
 end

data/pg_scaffold/lib/generators/pg_slim/templates/show.html.slim

@@ -1,7 +1,7 @@
 - content_for :title do
   = @<%= singular_name %>.to_s
 - content_for :actions do
-  = @<%= singular_name %>.destroy_link
+  = @<%= singular_name %>.destroy_link_redirect
   .ms-1
   = @<%= singular_name %>.edit_link
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.0.8.pre.alpha.51
+  version: 7.0.8.pre.alpha.53
 platform: ruby
 authors:
 - Martín Rosso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-28 00:00:00.000000000 Z
+date: 2024-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -890,6 +890,7 @@ files:
 - pg_engine/app/policies/pg_engine/application_policy.rb
 - pg_engine/app/policies/user_account_policy.rb
 - pg_engine/app/policies/user_policy.rb
+- pg_engine/app/policies/user_registration_policy.rb
 - pg_engine/app/views/admin/accounts/_account.html.slim
 - pg_engine/app/views/admin/accounts/_form.html.slim
 - pg_engine/app/views/admin/accounts/edit.html.slim
@@ -909,8 +910,8 @@ files:
 - pg_engine/app/views/pg_engine/base/edit.html.slim
 - pg_engine/app/views/pg_engine/base/index.html.slim
 - pg_engine/app/views/pg_engine/base/new.html.slim
-- pg_engine/app/views/public/mensaje_contactos/_form.html.slim
 - pg_engine/app/views/public/mensaje_contactos/_gracias.html.slim
+- pg_engine/app/views/public/mensaje_contactos/new.html.slim
 - pg_engine/config/initializers/action_mailer.rb
 - pg_engine/config/initializers/active_admin.rb
 - pg_engine/config/initializers/anycable.rb
@@ -956,6 +957,9 @@ files:
 - pg_engine/spec/factories/mensaje_contactos.rb
 - pg_engine/spec/factories/user_accounts.rb
 - pg_engine/spec/factories/users.rb
+- pg_engine/spec/features/destroy_spec.rb
+- pg_engine/spec/features/login_spec.rb
+- pg_engine/spec/features/signup_spec.rb
 - pg_engine/spec/fixtures/test.pdf
 - pg_engine/spec/helpers/pg_engine/pg_rails_helper_spec.rb
 - pg_engine/spec/lib/pg_engine/error_helper_spec.rb
@@ -1005,6 +1009,7 @@ files:
 - pg_layout/app/views/kaminari/_paginator.html.slim
 - pg_layout/app/views/kaminari/_prev_page.html.slim
 - pg_layout/app/views/layouts/pg_layout/base.html.slim
+- pg_layout/app/views/layouts/pg_layout/container_logo.html.slim
 - pg_layout/app/views/layouts/pg_layout/containerized.html.slim
 - pg_layout/app/views/layouts/pg_layout/devise.html.slim
 - pg_layout/app/views/pg_layout/_flash.html.slim

data/pg_engine/app/views/public/mensaje_contactos/_form.html.slim

@@ -1,14 +0,0 @@
-/ # locals: (object: nil, asociable: false)
-#mensaje_contacto.text-center
-  .d-inline-block style="width: 22em; max-width: 100%"
-    div data-controller="pg_form"
-      = pg_form_for(@mensaje_contacto || object, asociable:) do |f|
-        = f.mensajes_de_error
-
-        = hidden_field_tag :asociable, true if asociable
-        = f.input :nombre
-        = f.input :email
-        = f.input :telefono, hint: '(Opcional)'
-        = f.input :mensaje, as: :text
-        .mt-2
-        = f.button :submit, value: 'Enviar'