pg_rails 7.0.8.pre.alpha.21 → 7.0.8.pre.alpha.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 242457a4da70f56123b7fd123f88c96a3b84aa25b958e2d49df70329b018a2f3
-  data.tar.gz: 4e8e95c37063829636412299ae87e7ee683e62977d0afa8dbec310b1492bd46f
+  metadata.gz: ae6d0cc93b3b684d8fa67dea343e3a27c6714a79ff127644be1a9418194286f9
+  data.tar.gz: 9fb6a2758a1429f13e6ba6bc9b23d7521d271008e1d22435a78d850565749ab6
 SHA512:
-  metadata.gz: 4ac18ede797969e3e60579bdb3b47494e7b34879a4446ce583fb282b8ea99644d5f6efc9617f853b46554aa83f853a0dd8b21e15edbed41f5fffacb927c66fe1
-  data.tar.gz: a425dda11bfe7c0ba6aa63ec71e81ad9bb42bad11991b3bba914e2dd5966f50bb613296c87eec92051a301330de07ec4a8d028796dac1077f958dc0fbb3c7ff7
+  metadata.gz: 3945bc32b4f8a937a8bc550b2059e40fced9fd08ec3f6bf1d8364774886a5da2184b9938d93441bc7d871492970371b243df8b13a9ba0553fd4de3a58c73cbc1
+  data.tar.gz: 43b6e055fbdc01855f360ee47aaa043cfd6f5ceb9fa03b22d8e9b12ad730323afbc32281d23ee5a1ba3746fc8f4593c5c2bed5fa677bd0edb63418217ba0a48d

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

@@ -36,7 +36,7 @@ module Admin
         usuario = User.find(params[:id])
         sign_in(:user, usuario)
       end
-      redirect_to '/'
+      redirect_to after_sign_in_path_for(usuario)
     end
     # :nocov:
 

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

@@ -18,7 +18,7 @@ module PgEngine
 
     helper_method :mobile_device?
 
-    layout 'pg_layout/layout'
+    layout 'pg_layout/base'
 
     # Los flash_types resultantes serían:
     # [:alert, :notice, :warning, :success]
@@ -67,6 +67,8 @@ module PgEngine
         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'
           else
             go_back('Not authorized')

data/pg_engine/app/controllers/pg_engine/devise_controller.rb

@@ -4,15 +4,15 @@ module PgEngine
 
     layout :layout_by_resource
 
+    protected
+
     def layout_by_resource
-      if controller_name == 'registrations' && action_name.in?(%w[edit update])
-        'pg_layout/layout'
-      else
-        'pg_layout/devise'
-      end
+      edit_registration? ? 'pg_layout/devise' : 'pg_layout/containerized'
     end
 
-    protected
+    def edit_registration?
+      !(controller_name == 'registrations' && action_name.in?(%w[edit update]))
+    end
 
     def configure_permitted_parameters
       devise_parameter_sanitizer.permit(:sign_up, keys: %i[nombre apellido])

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

@@ -0,0 +1,17 @@
+module Users
+  class ConfirmationsController < Devise::ConfirmationsController
+    # GET /resource/confirmation?confirmation_token=abcdef
+    def show # rubocop:disable Metrics/AbcSize
+      self.resource = resource_class.confirm_by_token(params[:confirmation_token])
+      yield resource if block_given?
+
+      if resource.errors.empty?
+        flash[:toast] = false
+        set_flash_message!(:notice, :confirmed)
+        respond_with_navigational(resource) { redirect_to after_confirmation_path_for(resource_name, resource) }
+      else
+        respond_with_navigational(resource.errors, status: :unprocessable_entity) { render :new }
+      end
+    end
+  end
+end

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

@@ -1,8 +1,28 @@
 module Users
   class RegistrationsController < Devise::RegistrationsController
-    def after_inactive_sign_up_path_for(resource)
-      flash[:toast] = false
-      super(resource)
+    # POST /resource
+    def create
+      build_resource(sign_up_params)
+
+      resource.save
+      yield resource if block_given?
+      if resource.persisted?
+        expire_data_after_sign_in!
+        render_message
+      else
+        clean_up_passwords resource
+        set_minimum_password_length
+        respond_with resource
+      end
+    end
+
+    def render_message
+      msg = <<~HTML
+        <div class="alert alert-info">
+          #{I18n.t 'devise.registrations.signed_up_but_unconfirmed'}
+        </div>
+      HTML
+      render turbo_stream: turbo_stream.update('form-signup', msg)
     end
   end
 end

data/pg_engine/config/initializers/rollbar.rb

@@ -2,10 +2,10 @@ Rollbar.configure do |config|
   # Without configuration, Rollbar is enabled in all environments.
   # To disable in specific environments, set config.enabled=false.
 
-  config.access_token = Rails.application.credentials.rollbar.access_token_server
+  config.access_token = Rails.application.credentials.rollbar&.access_token_server
 
   # Here we'll disable in 'test':
-  if Rails.env.test?
+  if Rails.env.local?
     config.enabled = false
   end
 

data/pg_engine/config/locales/es.yml

@@ -46,3 +46,17 @@ es:
     messages:
       blank: ''
       empty: ''
+  devise:
+    registrations:
+      new:
+        sign_up: Crear una cuenta
+    passwords:
+      new:
+        send_me_reset_password_instructions: Enviar instrucciones para restablecer contraseña
+        forgot_your_password: ¿Olvidaste tu contraseña?
+    shared:
+      links:
+        sign_up: Crear una cuenta
+        forgot_your_password: ¿Olvidaste tu contraseña?
+        sign_out: Cerrar sesión
+        didn_t_receive_confirmation_instructions: ¿No recibiste las instrucciones para confirmar tu cuenta?

data/pg_engine/config/routes.rb

@@ -1,7 +1,10 @@
 include PgEngine::RouteHelpers
 
 Rails.application.routes.draw do
-  devise_for :users, controllers: { registrations: 'users/registrations' }
+  devise_for :users, controllers: {
+    confirmations: 'users/confirmations',
+    registrations: 'users/registrations'
+  }
   namespace :admin, path: 'a' do
     pg_resource(:users)
     pg_resource(:accounts)

data/pg_engine/lib/pg_engine/engine.rb

@@ -13,12 +13,10 @@ module PgEngine
       g.fallbacks[:pg_active_record] = :active_record
     end
 
-    if Rails.env.local?
-      initializer 'pg_engine.set_factory_paths', after: 'factory_bot.set_factory_paths' do
-        # Para que tome las factories de pg_engine/spec/factories
-        # además de las de dummy/spec/factories
-        FactoryBot.definition_file_paths << "#{root}/spec/factories"
-      end
+    initializer 'pg_engine.set_factory_paths', after: 'factory_bot.set_factory_paths' do
+      # Para que tome las factories de pg_engine/spec/factories
+      # además de las de dummy/spec/factories
+      FactoryBot.definition_file_paths << "#{root}/spec/factories"
     end
 
     initializer 'configurar_pg_rails' do

data/pg_engine/lib/tasks/auto_anotar_modelos.rake

@@ -5,7 +5,7 @@ Dotenv.load
 
 model_paths = begin
                 JSON.parse(ENV['MODEL_PATHS'])
-              rescue JSON::ParserError
+              rescue StandardError
                 ENV['MODEL_PATHS'] || 'app/models'
               end
 

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

@@ -0,0 +1,33 @@
+require 'rails_helper'
+
+describe Users::ConfirmationsController do
+  render_views
+
+  before do
+    @request.env['devise.mapping'] = Devise.mappings[:user] # rubocop:disable RSpec/InstanceVariable
+  end
+
+  describe '#show sin el token' do
+    subject { get :show }
+
+    it do
+      subject
+      expect(response).to have_http_status(:ok)
+    end
+  end
+
+  describe '#show con el token' do
+    subject { get :show, params: { confirmation_token: 'bla' } }
+
+    let(:user) { create :user, confirmed_at: nil, confirmation_token: 'bla' }
+
+    it do
+      subject
+      expect(response).to have_http_status(:ok)
+    end
+
+    it do
+      expect { subject }.to change { user.reload.confirmed_at }.from(nil).to(be_present)
+    end
+  end
+end

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

@@ -1,6 +1,8 @@
 require 'rails_helper'
 
 describe Users::RegistrationsController do
+  render_views
+
   before do
     # rubocop:disable RSpec/InstanceVariable
     @request.env['devise.mapping'] = Devise.mappings[:user]
@@ -16,6 +18,36 @@ describe Users::RegistrationsController do
     end
   end
 
+  describe '#create' do
+    subject do
+      post :create, params: { user: { nombre:, apellido:, email:, password:, password_confirmation: } }
+    end
+
+    let(:nombre) { Faker::Name.first_name }
+    let(:apellido) { Faker::Name.last_name }
+    let(:email) { Faker::Internet.email }
+    let(:password) { '123123' }
+    let(:password_confirmation) { password }
+
+    it do
+      expect { subject }.to change(User, :count).by(1)
+    end
+
+    it do
+      subject
+      expect(response.body).to include I18n.t('devise.registrations.signed_up_but_unconfirmed')
+    end
+
+    context 'cuando no coinciden los passwords' do
+      let(:password_confirmation) { 'bla' }
+
+      it do
+        subject
+        expect(response).not_to be_successful
+      end
+    end
+  end
+
   describe '#edit' do
     subject { get :edit }
 

data/pg_layout/app/javascript/application.js

@@ -5,7 +5,10 @@ import './controllers'
 // Bootstrap's toasts
 import * as bootstrap from 'bootstrap'
 
-document.addEventListener('turbo:load', function () {
+document.addEventListener('turbo:load', bindToasts)
+document.addEventListener('turbo:render', bindToasts)
+
+function bindToasts () {
   const toastElList = document.querySelectorAll('.toast:not(.hide):not(.show)')
   Array.from(toastElList).map(toastEl => new bootstrap.Toast(toastEl).show())
 
@@ -33,4 +36,12 @@ document.addEventListener('turbo:load', function () {
 
   // Start observing the target node for configured mutations
   observer.observe(targetNode, config)
-})
+}
+
+// document.addEventListener('turbo:before-stream-render', function () { console.log('turbo:before-stream-render') })
+// document.addEventListener('turbo:render', function () { console.log('turbo:render') })
+// document.addEventListener('turbo:before-render', function () { console.log('turbo:before-render') })
+// document.addEventListener('turbo:before-frame-render', function () { console.log('turbo:before-frame-render') })
+// document.addEventListener('turbo:frame-load', function () { console.log('turbo:frame-load') })
+// document.addEventListener('turbo:before-fetch-request', function () { console.log('turbo:before-fetch-request') })
+// document.addEventListener('turbo:fetch-request-error', function () { console.log('turbo:fetch-request-error') })

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

@@ -35,3 +35,9 @@
 <div><%= t(".unhappy") %> <%= button_to t(".cancel_my_account"), registration_path(resource_name), data: { confirm: t(".are_you_sure"), turbo_confirm: t(".are_you_sure") }, method: :delete %></div>
 
 <%= link_to t("devise.shared.links.back"), :back %>
+
+<style type="text/css" media="screen">
+  form {
+    max-width: 22em;
+  }
+</style>

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

@@ -1,26 +1,28 @@
 <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| %>
+    <%= f.mensajes_de_error %>
 
-<%= pg_form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
-  <%= f.mensajes_de_error %>
+    <div class="form-inputs">
+      <%= f.input :nombre, required: true, autofocus: true %>
+      <%= f.input :apellido, required: true %>
+      <%= f.input :email,
+                  required: true,
+                  input_html: { autocomplete: "email" }%>
+      <%= f.input :password,
+                  required: true,
+                  hint: (t('devise.shared.minimum_password_length', count: @minimum_password_length) if @minimum_password_length),
+                  input_html: { autocomplete: "new-password" } %>
+      <%= f.input :password_confirmation,
+                  required: true,
+                  input_html: { autocomplete: "new-password" } %>
+    </div>
 
-  <div class="form-inputs">
-    <%= f.input :nombre, required: true, autofocus: true %>
-    <%= f.input :apellido, required: true %>
-    <%= f.input :email,
-                required: true,
-                input_html: { autocomplete: "email" }%>
-    <%= f.input :password,
-                required: true,
-                hint: (t('devise.shared.minimum_password_length', count: @minimum_password_length) if @minimum_password_length),
-                input_html: { autocomplete: "new-password" } %>
-    <%= f.input :password_confirmation,
-                required: true,
-                input_html: { autocomplete: "new-password" } %>
-  </div>
+    <div class="form-actions">
+      <%= f.button :submit, t(".sign_up") %>
+    </div>
+  <% end %>
 
-  <div class="form-actions">
-    <%= f.button :submit, t(".sign_up") %>
-  </div>
-<% end %>
+  <%= render "devise/shared/links" %>
+</div>
 
-<%= render "devise/shared/links" %>

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

@@ -9,7 +9,8 @@
     <%= f.input :password,
                 required: false,
                 input_html: { autocomplete: "current-password" } %>
-    <%= f.input :remember_me, as: :boolean if devise_mapping.rememberable? %>
+    <%# TODO!: corregir style de checkbox %>
+    <%#= f.input :remember_me, as: :boolean if devise_mapping.rememberable? %>
   </div>
 
   <div class="form-actions">

data/pg_layout/app/views/devise/shared/_links.html.erb

@@ -1,25 +1,36 @@
-<%- if controller_name != 'sessions' %>
-  <%= link_to t(".sign_in"), new_session_path(resource_name) %><br />
-<% end %>
+<div class="devise-links">
+  <%- if controller_name != 'sessions' %>
+    <%= link_to t(".sign_in"), new_session_path(resource_name) %>
+  <% end %>
 
-<%- if devise_mapping.registerable? && controller_name != 'registrations' %>
-  <%= link_to t(".sign_up"), new_registration_path(resource_name) %><br />
-<% end %>
+  <%- if devise_mapping.registerable? && controller_name != 'registrations' %>
+    <%= link_to t(".sign_up"), new_registration_path(resource_name) %>
+  <% end %>
 
-<%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %>
-  <%= link_to t(".forgot_your_password"), new_password_path(resource_name) %><br />
-<% end %>
+  <%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %>
+    <%= link_to t(".forgot_your_password"), new_password_path(resource_name) %>
+  <% end %>
 
-<%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
-  <%= link_to t('.didn_t_receive_confirmation_instructions'), new_confirmation_path(resource_name) %><br />
-<% end %>
+  <%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
+    <%= link_to t('.didn_t_receive_confirmation_instructions'), new_confirmation_path(resource_name) %>
+  <% end %>
 
-<%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %>
-  <%= link_to t('.didn_t_receive_unlock_instructions'), new_unlock_path(resource_name) %><br />
-<% end %>
+  <%- if false # devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %>
+    <%= link_to t('.didn_t_receive_unlock_instructions'), new_unlock_path(resource_name) %>
+  <% end %>
 
-<%- if devise_mapping.omniauthable? %>
-  <%- resource_class.omniauth_providers.each do |provider| %>
-    <%= button_to t('.sign_in_with_provider', provider: OmniAuth::Utils.camelize(provider)), omniauth_authorize_path(resource_name, provider), data: { turbo: false } %><br />
+  <%- if devise_mapping.omniauthable? %>
+    <%- resource_class.omniauth_providers.each do |provider| %>
+      <%= button_to t('.sign_in_with_provider', provider: OmniAuth::Utils.camelize(provider)), omniauth_authorize_path(resource_name, provider), data: { turbo: false } %>
+    <% end %>
   <% end %>
-<% end %>
+</div>
+<style type="text/css">
+  .devise-links {
+    margin-top: 3em;
+  }
+  .devise-links a {
+    display: block;
+    margin-top: 1em;
+  }
+</style>

data/pg_layout/app/views/layouts/pg_layout/{layout.html.slim → base.html.slim}

@@ -37,6 +37,6 @@ html
                 = yield(:actions)
             hr.my-0
           = render partial: 'pg_layout/flash_alert'
-          = yield
+          = content_for?(:content) ? yield(:content) : yield
           div style="width:100%; height: 10em"
     = render_turbo_stream_title

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

@@ -0,0 +1,5 @@
+- content_for :content do
+  .container-fluid.pt-3
+    = content_for?(:containerized_content) ? yield(:containerized_content) : yield
+
+= render template: 'layouts/pg_layout/base'

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

@@ -1,25 +1,11 @@
-doctype html
-html
-  head
-    title = Rails.application.class.module_parent_name
-    meta name="viewport" content="width=device-width,initial-scale=1"
-    = csrf_meta_tags
-    = csp_meta_tag
-    meta name="cable-history-timestamp" content="#{Time.now.to_i}"
-    = action_cable_with_jwt_meta_tag
-    = stylesheet_link_tag 'application', 'data-turbo-track': 'reload'
-    = javascript_include_tag 'application', 'data-turbo-track': 'reload', type: 'module'
-  body
-    div
-      .text-center
-        #flash.flash.d-inline-block
-          = render partial: 'pg_layout/flash'
-      .container.text-center
-        = yield
-      = render_turbo_stream_title
+- content_for :content do
+  .container.text-center
+    = yield
 
-css:
-  .pg-form {
-    max-width: 22em;
-    margin: auto;
-  }
+  css:
+    .pg-form {
+      max-width: 30em;
+      margin: auto;
+    }
+
+= render template: 'layouts/pg_layout/base'

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

@@ -8,6 +8,5 @@
   - flash_to_show.each do |flash_type, message|
     .toast(class="bg-#{flash_type_to_class(flash_type)}-subtle" role="alert" data-bs-autohide="true"
            data-xturbo-temporary="true" aria-live="assertive" aria-atomic="true")
-      .toast-body
+      .toast-body.text-center
         = message
-/ TODO: centrar texto

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

@@ -31,7 +31,7 @@
               <% end %>
 
               <li>
-                <%= link_to "Cerrar sesión", destroy_user_session_path, data: { 'turbo-method': 'delete' }, class: 'dropdown-item' %>
+                <%= link_to t("devise.shared.links.sign_out"), destroy_user_session_path, data: { 'turbo-method': 'delete' }, class: 'dropdown-item' %>
               </li>
             </ul>
           </li>
@@ -47,11 +47,14 @@
 
         <% else %>
           <li class="nav-item">
-            <%= link_to 'ingresar', new_user_session_path, class: 'nav-link' %>
+            <%= link_to t("devise.shared.links.sign_in"), new_user_session_path, class: 'nav-link' %>
+          </li>
+          <li class="nav-item">
+            <%= link_to t("devise.shared.links.sign_up"), new_user_registration_path, class: 'nav-link' %>
           </li>
         <% end %>
       </ul>
-      <%= content_for :navbar_ext %>
+      <%= @navbar_ext %>
 
     </div>
   </div>

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

@@ -1,11 +1,11 @@
-<% if Rails.application.credentials.rollbar.present? %>
+<% if Rollbar.configuration.enabled && Rails.application.credentials.rollbar.present? %>
 <script>
 var _rollbarConfig = {
     accessToken: '<%= Rails.application.credentials.rollbar.access_token_client %>',
     captureUncaught: true,
     captureUnhandledRejections: true,
     payload: {
-        environment: "production",
+        environment: <%= Rails.env %>,
         //trace_id: 'abc',
         client: {
             javascript: {

data/pg_rails/lib/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.0.8.pre.alpha.21
+  version: 7.0.8.pre.alpha.22
 platform: ruby
 authors:
 - Martín Rosso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-31 00:00:00.000000000 Z
+date: 2024-04-03 00:00:00.000000000 Z
 dependencies: []
 description: Rails goodies.
 email:
@@ -46,6 +46,7 @@ files:
 - pg_engine/app/controllers/pg_engine/base_controller.rb
 - pg_engine/app/controllers/pg_engine/devise_controller.rb
 - pg_engine/app/controllers/pg_engine/require_sign_in.rb
+- pg_engine/app/controllers/users/confirmations_controller.rb
 - pg_engine/app/controllers/users/registrations_controller.rb
 - pg_engine/app/decorators/account_decorator.rb
 - pg_engine/app/decorators/pg_engine/base_decorator.rb
@@ -125,6 +126,7 @@ files:
 - pg_engine/spec/controllers/admin/users_controller_spec.rb
 - pg_engine/spec/controllers/concerns/pg_engine/resource_helper_spec.rb
 - pg_engine/spec/controllers/devise/sessions_controller_spec.rb
+- pg_engine/spec/controllers/users/confirmations_controller_spec.rb
 - pg_engine/spec/controllers/users/registrations_controller_spec.rb
 - pg_engine/spec/factories/accounts.rb
 - pg_engine/spec/factories/user_accounts.rb
@@ -176,8 +178,9 @@ files:
 - pg_layout/app/views/kaminari/_page.html.slim
 - 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/containerized.html.slim
 - pg_layout/app/views/layouts/pg_layout/devise.html.slim
-- pg_layout/app/views/layouts/pg_layout/layout.html.slim
 - pg_layout/app/views/pg_layout/_flash.html.slim
 - pg_layout/app/views/pg_layout/_flash_alert.html.slim
 - pg_layout/app/views/pg_layout/_navbar.html.erb