pg_rails 7.0.8.pre.alpha.9 → 7.0.8.pre.alpha.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55efac7692668130210916f2d27c9d5f649660dc6a7341ea615fcfe66b263909
-  data.tar.gz: 1827e613adbfbaed350d8d84f69131c302a14ef9b7f7cef0c2fc030171b13261
+  metadata.gz: d3efd952ef548d103ed1c4aea21b903f039792ed601fc66e93fb5b84dce4d39d
+  data.tar.gz: 148ae25de52ab06846c1b7b313f6f87db0d6d6ba502a9186104559e0e37ec114
 SHA512:
-  metadata.gz: ca7acd8b6732ba7e5fb832b443a32d74d12490d013d1c0a72ed7bfbd499ce959f458815c22a980f9b94f81cdbddfa4e024e4b8de5533ab0f637ec7ed6c1de735
-  data.tar.gz: 4335852cf4c82da4e90504ed5872472f5612378fb92b674bb3da4185c26fb040e81b55522bcf67dfe71db81c36fec146c112f4ff14bbc02832eb01dc481a03ee
+  metadata.gz: 68b63352e0ac30ff6f3c7a22e3a2fb73f8918ee91dfefe51b2c8371915c9d7adde99eb114c1ba935387182fa10966d0c5776c672e477486cff17a82993ff68fb
+  data.tar.gz: 1fda6ee9f5416f813e811268f307b87638b69de4a3db4659a7259c6101dc6b8281d9b351e92998e517a0d492cc39eea71780add28b2c240c4971aa26f87a2000

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

@@ -26,22 +26,34 @@ module Admin
       pg_respond_update
     end
 
+    skip_before_action :authenticate_user!, only: [:login_as]
+
+    # :nocov:
+    def login_as
+      if current_user&.developer? || Rails.env.development?
+        usuario = User.find(params[:id])
+        sign_in(:user, usuario)
+      end
+      redirect_to '/'
+    end
+    # :nocov:
+
     private
 
     def atributos_permitidos
-      %i[email password developer]
+      %i[email nombre apellido password developer]
     end
 
     def atributos_para_buscar
-      %i[email developer]
+      %i[email nombre apellido developer]
     end
 
     def atributos_para_listar
-      %i[email developer]
+      %i[email nombre apellido developer]
     end
 
     def atributos_para_mostrar
-      %i[email developer]
+      %i[email nombre apellido developer]
     end
   end
 end

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

@@ -74,8 +74,8 @@ module PgEngine
       end
     end
 
-    def go_back(message)
-      flash[:alert] = message
+    def go_back(message = nil, type: :alert)
+      flash[type] = message if message.present?
       redirect_back fallback_location: root_path
     end
   end

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

@@ -1,9 +1,22 @@
 module PgEngine
   class DeviseController < ApplicationController
-    layout 'pg_layout/devise'
+    before_action :configure_permitted_parameters
 
-    before_action do
-      render(layout: 'pg_layout/layout') if controller_name == 'registrations' && action_name == 'edit'
+    layout :layout_by_resource
+
+    def layout_by_resource
+      if controller_name == 'registrations' && action_name.in?(%w[edit update])
+        'pg_layout/layout'
+      else
+        'pg_layout/devise'
+      end
+    end
+
+    protected
+
+    def configure_permitted_parameters
+      devise_parameter_sanitizer.permit(:sign_up, keys: %i[nombre apellido])
+      devise_parameter_sanitizer.permit(:account_update, keys: %i[nombre apellido])
     end
   end
 end

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

@@ -34,9 +34,12 @@ module PgEngine
     end
 
     def self.human_attribute_name(attribute, options = {})
-      # Si es un enumerized
       if attribute.to_s.ends_with?('_text')
+        # Si es un enumerized
         super(attribute[0..-6], options)
+      elsif attribute.to_s.ends_with?('_f')
+        # Si es un decorated method
+        super(attribute[0..-3], options)
       else
         super(attribute, options)
       end

data/pg_engine/app/models/user.rb

@@ -36,10 +36,9 @@ class User < ApplicationRecord
   # ApplicationRecord should be defined on Application
 
   # Include default devise modules. Others available are:
-  # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
   devise :database_authenticatable, :registerable,
          :recoverable, :rememberable, :validatable,
-         :confirmable, :lockable, :timeoutable, :trackable
+         :lockable, :timeoutable, :trackable, :confirmable
 
   audited
   include Discard::Model
@@ -47,12 +46,16 @@ class User < ApplicationRecord
   has_many :user_accounts
   has_many :accounts, through: :user_accounts
 
-  validates :email, presence: true
+  validates :email, :nombre, :apellido, presence: true
 
   scope :query, ->(param) { where('email ILIKE ?', "%#{param}%") }
 
   def to_s
-    email
+    nombre_completo
+  end
+
+  def nombre_completo
+    "#{nombre} #{apellido}"
   end
 
   def current_account

data/pg_engine/app/views/pg_engine/base/edit.html.slim

@@ -0,0 +1,5 @@
+- content_for :title do
+  | Modificar #{@clase_modelo.nombre_singular.downcase}
+
+.p-3
+  = render 'form'

data/pg_engine/app/views/pg_engine/base/new.html.slim

@@ -0,0 +1,5 @@
+- content_for :title do
+  | Crear #{@clase_modelo.nombre_singular.downcase}
+
+.p-3
+  = render 'form'

data/pg_engine/config/routes.rb

@@ -6,6 +6,7 @@ Rails.application.routes.draw do
     pg_resource(:users)
     pg_resource(:accounts)
     pg_resource(:user_accounts)
+    get 'login_as', to: 'users#login_as'
   end
   ActiveAdmin.routes(self)
 end

data/pg_engine/db/migrate/20240305200900_nombre_user.rb

@@ -0,0 +1,6 @@
+class NombreUser < ActiveRecord::Migration[7.1]
+  def change
+    add_column :users, :nombre, :string, null: false
+    add_column :users, :apellido, :string, null: false
+  end
+end

data/pg_engine/db/seeds.rb

@@ -3,6 +3,6 @@ DatabaseCleaner.clean_with(:truncation, except: %w(ar_internal_metadata users ac
 MAIL = 'mrosso10@gmail.com'
 
 unless User.where(email: MAIL).exists?
-  FactoryBot.create :user, email: MAIL, password: 'admin123',
+  FactoryBot.create :user, email: MAIL, nombre: 'Martín', apellido: 'Rosso', password: 'admin123',
                            confirmed_at: Time.now, developer: true
 end

data/pg_engine/lib/tasks/auto_anotar_modelos.rake

@@ -21,7 +21,8 @@ if Rails.env.development?
       'show_complete_foreign_keys'  => 'false',
       'show_indexes'                => 'false',
       'simple_indexes'              => 'true',
-      'model_dir'                   => 'app/models',
+      'model_dir'                   => ['app/models', 'app/overrides'],
+      # 'model_dir'                   => 'app/models',
       'root_dir'                    => '',
       'include_version'             => 'false',
       'require'                     => '',

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

@@ -0,0 +1,33 @@
+require 'rails_helper'
+
+describe Devise::RegistrationsController do
+  before do
+    # rubocop:disable RSpec/InstanceVariable
+    @request.env['devise.mapping'] = Devise.mappings[:user]
+    # rubocop:enable RSpec/InstanceVariable
+  end
+
+  describe '#new' do
+    subject { get :new }
+
+    it do
+      subject
+      expect(response).to have_http_status(:ok)
+    end
+  end
+
+  describe '#edit' do
+    subject { get :edit }
+
+    let(:logger_user) { create :user, :admin }
+
+    before do
+      sign_in logger_user
+    end
+
+    it do
+      subject
+      expect(response).to have_http_status(:ok)
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+require 'rails_helper'
+
+describe Devise::SessionsController do
+  before do
+    # rubocop:disable RSpec/InstanceVariable
+    @request.env['devise.mapping'] = Devise.mappings[:user]
+    # rubocop:enable RSpec/InstanceVariable
+  end
+
+  describe '#new' do
+    subject { get :new }
+
+    it do
+      subject
+      expect(response).to have_http_status(:ok)
+    end
+  end
+end

data/pg_engine/spec/factories/users.rb

@@ -37,6 +37,8 @@
 
 FactoryBot.define do
   factory :orphan_user, class: 'User' do
+    nombre { Faker::Name.name }
+    apellido { Faker::Name.name }
     email { Faker::Internet.email }
     password { "password#{rand(99_999)}" }
     confirmed_at { Faker::Date.backward }

data/pg_engine/spec/models/pg_engine/base_record_spec.rb

@@ -2,12 +2,14 @@ require 'rails_helper'
 
 describe PgEngine::BaseRecord do
   describe '#human_attribute_name' do
-    subject do
-      described_class.human_attribute_name('bla_text')
+    it do
+      obj = described_class.human_attribute_name('bla_text')
+      expect(obj).to eq described_class.human_attribute_name('bla')
     end
 
     it do
-      expect(subject).to eq described_class.human_attribute_name('bla')
+      obj = described_class.human_attribute_name('bla_f')
+      expect(obj).to eq described_class.human_attribute_name('bla')
     end
   end
 end

data/pg_layout/app/lib/navbar.rb

@@ -5,15 +5,25 @@ class Navbar
     @user = user
   end
 
+  def topbar
+    bar('topbar')
+  end
+
   def sidebar
+    bar('sidebar')
+  end
+
+  def bar(key)
     yaml_data = YAML.load_file("#{Rails.application.root}/config/pg_rails.yml")
-    sidebar = ActiveSupport::HashWithIndifferentAccess.new(yaml_data)['sidebar']
+    bar_data = ActiveSupport::HashWithIndifferentAccess.new(yaml_data)[key]
+    return [] if bar_data.blank?
+
     # rubocop:disable Security/Eval
-    sidebar.map do |item|
+    bar_data.map do |item|
       {
         title: item['name'],
         path: eval(item['path']),
-        show: true
+        show: item['policy'] ? eval(item['policy']) : true
       }
     end
     # rubocop:enable Security/Eval

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

@@ -5,6 +5,8 @@
 
   <div class="form-inputs">
     <%= f.input :email, required: true, autofocus: true %>
+    <%= f.input :nombre, required: true %>
+    <%= f.input :apellido, required: true %>
 
     <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>
       <p><%= t(".currently_waiting_confirmation_for_email", email: resource.unconfirmed_email) %></p>

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

@@ -8,6 +8,8 @@
                 required: true,
                 autofocus: true ,
                 input_html: { autocomplete: "email" }%>
+    <%= f.input :nombre, required: true %>
+    <%= f.input :apellido, required: true %>
     <%= f.input :password,
                 required: true,
                 hint: (t('devise.shared.minimum_password_length', count: @minimum_password_length) if @minimum_password_length),

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

@@ -18,3 +18,14 @@
 <% end %>
 
 <%= render "devise/shared/links" %>
+
+<% if Rails.env.development? %>
+  <br>
+  <br>
+  <br>
+  <ul>
+    <% User.all.each do |user| %>
+      <li><%= link_to user, admin_login_as_path(id: user.id) %></li>
+    <% end %>
+  </ul>
+<% end %>

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

@@ -3,8 +3,9 @@
 - flash_to_show = flash.select { |flash_message| flash_message[0].to_sym.in? ApplicationController._flash_types }
 / slim-lint:enable LineLength
 
+/ TODO: data-turbo-temporary, setear al activar toast?
 - 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-turbo-temporary="true" aria-live="assertive" aria-atomic="true")
+         data-xturbo-temporary="true" aria-live="assertive" aria-atomic="true")
     .toast-body
       = message

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

@@ -9,16 +9,25 @@
       <!-- <span class="navbar-toggler-icon"></span> -->
     </button>
     <div class="collapse navbar-collapse" id="navbarSupportedContent">
-      <ul class="navbar-nav me-auto mb-2 mb-lg-0">
+      <ul class="navbar-nav xme-auto mb-2 mb-lg-0">
         <% if user_signed_in? %>
           <li class="nav-item dropdown">
             <a class="nav-link dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" aria-expanded="false">
-              <%= current_user.email %>
+              <%= current_user %>
             </a>
             <ul class="dropdown-menu">
               <li>
                 <%= link_to "Mi perfil", edit_user_registration_path, class: 'dropdown-item' %>
               </li>
+              <% @navbar.topbar.each do |entry| %>
+                <% next if @navbar.hide_entry?(entry) %>
+                <li>
+                  <a class="dropdown-item" href="<%= entry[:path] %>">
+                    <%= entry[:title] %>
+                  </a>
+                </li>
+              <% end %>
+
               <li>
                 <%= link_to "Cerrar sesión", destroy_user_session_path, data: { 'turbo-method': 'delete' }, class: 'dropdown-item' %>
               </li>
@@ -40,6 +49,8 @@
           </li>
         <% end %>
       </ul>
+      <%= content_for :navbar_ext %>
+
     </div>
   </div>
 </nav>

data/pg_rails/lib/version.rb

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

data/pg_scaffold/lib/generators/pg_slim/pg_slim_generator.rb

@@ -23,9 +23,9 @@ class PgSlimGenerator < Slim::Generators::ScaffoldGenerator
 
   def available_views
     if options[:index_file]
-      %w[index edit show new _form]
+      %w[index show _form]
     else
-      %w[edit show new _form]
+      %w[show _form]
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.0.8.pre.alpha.9
+  version: 7.0.8.pre.alpha.10
 platform: ruby
 authors:
 - Martín Rosso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-01 00:00:00.000000000 Z
+date: 2024-03-05 00:00:00.000000000 Z
 dependencies: []
 description: Rails goodies.
 email:
@@ -84,7 +84,9 @@ files:
 - pg_engine/app/views/admin/users/new.html.slim
 - pg_engine/app/views/admin/users/show.html.slim
 - pg_engine/app/views/pg_engine/base/download.xlsx.axlsx
+- 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/config/initializers/active_admin.rb
 - pg_engine/config/initializers/devise.rb
 - pg_engine/config/locales/devise.en.yml
@@ -99,6 +101,7 @@ files:
 - pg_engine/db/migrate/20240211152951_create_accounts.rb
 - pg_engine/db/migrate/20240211153049_create_user_accounts.rb
 - pg_engine/db/migrate/20240222115722_create_active_storage_tables.active_storage.rb
+- pg_engine/db/migrate/20240305200900_nombre_user.rb
 - pg_engine/db/seeds.rb
 - pg_engine/lib/pg_engine.rb
 - pg_engine/lib/pg_engine/configuracion.rb
@@ -112,6 +115,8 @@ files:
 - pg_engine/spec/controllers/admin/user_accounts_controller_spec.rb
 - pg_engine/spec/controllers/admin/users_controller_spec.rb
 - pg_engine/spec/controllers/concerns/pg_engine/error_helper_spec.rb
+- pg_engine/spec/controllers/devise/registrations_controller_spec.rb
+- pg_engine/spec/controllers/devise/sessions_controller_spec.rb
 - pg_engine/spec/factories/accounts.rb
 - pg_engine/spec/factories/user_accounts.rb
 - pg_engine/spec/factories/users.rb