pg_rails 7.0.8.pre.alpha.24 → 7.0.8.pre.alpha.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1e89c3437921de83649c5499b972831fe8bc9f4dd9d14ff01555825d0513f74
-  data.tar.gz: 137eb256a8ee10a7692d9d41df0c29b9f955ab0cbfe18776e16087ba9baf0278
+  metadata.gz: 3ae98a9690f461cc9841e81d2eb82353e5e419db169fa3d7154d97761a1c2496
+  data.tar.gz: 342116ec92cd2f654cf6de83bee8ef4f9e9803ca66daba704e6884f98db06cec
 SHA512:
-  metadata.gz: d6b28222612e06a6007bde69fb0c85603a0f02281e18756e8371eb20aaf972d746886abb8077525f7bdf0a287879fe03f5ff1d0ffd77f035e4badef4ccb517f3
-  data.tar.gz: 8dce15fca468b6cd28c1254ccb05c5267e832f926c46c4b7b2ad49e4b03a2eb25e5202a7f9d6e2a1796abf885fb981dfe5c00410be0b6e57d0b7c5604eb169bf
+  metadata.gz: b8723ab5cb5ee56dc3e0e14019242a10376d7e804efb8467ba0e19f30273fdee2fb4c8281e077b4d0d9f7bac6e03d5ecdf3e6e39251d1ed31b48e0901f43ac6d
+  data.tar.gz: 62c6b62b972538b2db0df8065c93531b7ed018eaae5818ad9ac8500714bd7907e17451aa2d9e17f9191acd21db258c389eb14ff62411a12cf640fec8078708bd

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

@@ -32,7 +32,7 @@ module Admin
 
     # :nocov:
     def login_as
-      if current_user&.developer? || Rails.env.development?
+      if dev_user_or_env?
         usuario = User.find(params[:id])
         sign_in(:user, usuario)
       end

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

@@ -20,6 +20,7 @@ module PgEngine
     def index
       @collection = filtros_y_policy atributos_para_buscar
       @collection = sort_collection(@collection)
+      @records_filtered = policy_scope(clase_modelo).any? if @collection.empty?
       pg_respond_index
     end
 

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

@@ -11,10 +11,32 @@ module PgEngine
     include RouteHelper
     include PgAssociable::Helpers
 
+    class Redirect < PgEngine::Error
+      attr_accessor :url
+
+      def initialize(url)
+        @url = url
+        super
+      end
+    end
+
     protect_from_forgery with: :exception
 
     rescue_from PrintHelper::FechaInvalidaError, with: :fecha_invalida
     rescue_from Pundit::NotAuthorizedError, with: :not_authorized
+    rescue_from Redirect do |e|
+      redirect_to e.url
+    end
+
+    helper_method :dev_user_or_env?
+    def dev_user_or_env?
+      Rails.env.development? || dev_user?
+    end
+
+    helper_method :dev_user?
+    def dev_user?
+      current_user&.developer?
+    end
 
     helper_method :mobile_device?
 
@@ -49,6 +71,7 @@ module PgEngine
     #   end
     # end
 
+    # TODO!: ver qué onda esto, tiene sentido acá?
     def fecha_invalida
       respond_to do |format|
         format.json do

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

@@ -2,16 +2,12 @@ module PgEngine
   class DeviseController < ApplicationController
     before_action :configure_permitted_parameters
 
-    layout :layout_by_resource
+    layout :layout_by_user
 
     protected
 
-    def layout_by_resource
-      edit_registration? ? 'pg_layout/devise' : 'pg_layout/containerized'
-    end
-
-    def edit_registration?
-      !(controller_name == 'registrations' && action_name.in?(%w[edit update]))
+    def layout_by_user
+      user_signed_in? ? 'pg_layout/containerized' : 'pg_layout/devise'
     end
 
     def configure_permitted_parameters

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

@@ -1,6 +1,11 @@
 module Users
   class RegistrationsController < Devise::RegistrationsController
     # POST /resource
+
+    before_action do
+      authorize User
+    end
+
     def create
       build_resource(sign_up_params)
 

data/pg_engine/app/helpers/pg_engine/i18n_helper.rb

@@ -0,0 +1,7 @@
+module PgEngine
+  module I18nHelper
+    def controller_key
+      controller.class.to_s.underscore.sub(/_controller\z/, '')
+    end
+  end
+end

data/pg_engine/app/helpers/pg_engine/pg_rails_helper.rb

@@ -1,9 +1,5 @@
 module PgEngine
   module PgRailsHelper
-    def dev?
-      Rails.env.development? || current_user&.developer?
-    end
-
     def current_account
       current_user&.current_account
     end

data/pg_engine/app/helpers/pg_engine/print_helper.rb

@@ -4,7 +4,7 @@ module PgEngine
   module PrintHelper
     include ActionView::Helpers::NumberHelper
 
-    class FechaInvalidaError < StandardError
+    class FechaInvalidaError < PgEngine::Error
     end
 
     def mostrar_con_link(objeto, options = {})

data/pg_engine/app/models/user.rb

@@ -76,7 +76,7 @@ class User < ApplicationRecord
     "#{nombre} #{apellido}"
   end
 
-  class Error < StandardError; end
+  class Error < PgEngine::Error; end
 
   def current_account
     raise Error, 'El usuario debe tener cuenta' if accounts.empty?

data/pg_engine/app/policies/user_policy.rb

@@ -13,19 +13,7 @@ class UserPolicy < ApplicationPolicy
     # end
   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
+  def acceso_total?
+    true
+  end
 end

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

@@ -48,5 +48,14 @@ div
 
     .ps-3.justify-content-center
       = paginate(@collection)
+  - elsif @records_filtered
+    - i18n_key = "#{controller_key}.#{action_name}.index.empty_but_filtered"
+    p.m-3
+      = t(i18n_key, default: :'.empty_but_filtered', model: @clase_modelo.nombre_plural.downcase)
+      | :
+      span.ms-2
+      = link_to namespaced_path(@clase_modelo, clean: true) do
+        | Limpiar búsqueda
   - else
-    p.m-3 No hay #{@clase_modelo.nombre_plural.downcase} que mostrar
+    - i18n_key = "#{controller_key}.#{action_name}.index.empty"
+    p.m-3 = t(i18n_key, default: :'.empty', model: @clase_modelo.nombre_plural.downcase)

data/pg_engine/config/initializers/action_mailer.rb

@@ -1,4 +1,4 @@
-class MailDeliveryTemporalError < StandardError; end
+class MailDeliveryTemporalError < PgEngine::Error; end
 
 ActionMailer::MailDeliveryJob.rescue_from EOFError,
                                       IOError,

data/pg_engine/config/locales/es.yml

@@ -1,4 +1,9 @@
 es:
+  pg_engine:
+    base:
+      index:
+        empty: 'No hay %{model} aún'
+        empty_but_filtered: 'No hay %{model} para los filtros aplicados'
   attributes:
     created_at: Fecha de creación
     updated_at: Fecha de actualización
@@ -47,6 +52,9 @@ es:
       blank: ''
       empty: ''
   devise:
+    sign_in: ¿Ya tenés una cuenta? Iniciar sesión
+    sign_out: Cerrar sesión
+    sign_up: Crear una cuenta
     registrations:
       new:
         sign_up: Crear una cuenta
@@ -56,7 +64,7 @@ es:
         forgot_your_password: ¿Olvidaste tu contraseña?
     shared:
       links:
+        sign_in: ¿Ya tenés una cuenta? Iniciar sesión
         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?
+        didn_t_receive_confirmation_instructions: ¿No recibiste las instrucciones para confirmar tu cuenta?

data/pg_engine/lib/pg_engine/utils/pg_logger.rb

@@ -47,6 +47,7 @@ module PgEngine
 
       private
 
+      # TODO: loguear time
       def notify(mensaje, type)
         Rails.logger.send(type, titulo(mensaje, type))
         Rails.logger.send(type, detalles(type))

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

@@ -0,0 +1,52 @@
+require 'rails_helper'
+
+class DummyBaseController < PgEngine::BaseController
+  def action_with_redirect
+    raise PgEngine::BaseController::Redirect, '/some_path'
+  end
+
+  def check_dev_user
+    @dev_user_or_env = dev_user_or_env?
+    @dev_user = dev_user?
+    head :ok
+  end
+end
+
+# rubocop:disable RSpec/MultipleExpectations
+# rubocop:disable RSpec/FilePath
+# rubocop:disable RSpec/SpecFilePathFormat
+describe DummyBaseController do
+  describe 'PgEngine::BaseController::Redirect' do
+    before { get :action_with_redirect }
+
+    it do
+      expect(response).to redirect_to '/some_path'
+    end
+  end
+
+  describe '#dev_user_or_env?' do
+    let(:user) { create :user, :developer }
+
+    before do
+      sign_in user if user.present?
+      get :check_dev_user
+    end
+
+    it do
+      expect(assigns(:dev_user_or_env)).to be_truthy
+      expect(assigns(:dev_user)).to be_truthy
+    end
+
+    context 'when not signed in' do
+      let(:user) { nil }
+
+      it do
+        expect(assigns(:dev_user_or_env)).to be_falsey
+        expect(assigns(:dev_user)).to be_falsey
+      end
+    end
+  end
+end
+# rubocop:enable RSpec/MultipleExpectations
+# rubocop:enable RSpec/FilePath
+# rubocop:enable RSpec/SpecFilePathFormat

data/pg_layout/app/lib/navbar.rb

@@ -1,21 +1,26 @@
 class Navbar
   include Rails.application.routes.url_helpers
 
+  attr_reader :extensiones
+
   def initialize(user)
     @user = user
+    @yaml_data = YAML.load_file("#{Rails.application.root}/config/pg_rails.yml")
+    @yaml_data = ActiveSupport::HashWithIndifferentAccess.new(@yaml_data)
+    @extensiones = []
   end
 
-  def topbar
-    bar('topbar')
+  def add_html(html)
+    @extensiones << html
   end
 
-  def sidebar
-    bar('sidebar')
+  def add_item(key, obj)
+    @yaml_data[key] ||= []
+    @yaml_data[key] << ActiveSupport::HashWithIndifferentAccess.new(obj)
   end
 
   def bar(key)
-    yaml_data = YAML.load_file("#{Rails.application.root}/config/pg_rails.yml")
-    bar_data = ActiveSupport::HashWithIndifferentAccess.new(yaml_data)[key]
+    bar_data = @yaml_data[key]
     return [] if bar_data.blank?
 
     # rubocop:disable Security/Eval

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

@@ -20,13 +20,15 @@
 
 <%= render "devise/shared/links" %>
 
-<% if Rails.env.development? %>
+<% if dev_user_or_env? %>
+  <div class="text-end" style="margin-top: 500px">
   <br>
   <br>
   <br>
-  <ul>
-    <% User.all.each do |user| %>
+  <ul style="max-width: 500px">
+    <% User.order(:id).each do |user| %>
       <li><%= link_to user, admin_login_as_path(id: user.id) %></li>
     <% end %>
   </ul>
+  </div>
 <% end %>

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

@@ -7,7 +7,7 @@ html
       meta name="turbo-cache-control" content="no-cache"
     / meta name="turbo-refresh-method" content="morph"
     / meta name="turbo-refresh-scroll" content="preserve"
-    / meta name="turbo-prefetch" content="true"
+    meta name="turbo-prefetch" content="false"
     meta name="view-transition" content="same-origin"
     meta name="cable-history-timestamp" content="#{Time.now.to_i}"
     = csrf_meta_tags
@@ -27,7 +27,7 @@ html
             = render partial: 'pg_layout/flash'
         = render partial: 'pg_layout/navbar'
         div
-          - if user_signed_in? && @breadcrumb != false
+          - if user_signed_in? && breadcrumbs.any?
             .d-flex.align-items-center.justify-content-between.px-3.py-1.d-print-none[
               style="min-height: 2.5em;"]
               nav aria-label="breadcrumb"

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

@@ -11,17 +11,26 @@
       <!-- <span class="navbar-toggler-icon"></span> -->
     </button>
     <div class="collapse navbar-collapse" id="navbarSupportedContent">
-      <ul class="navbar-nav xme-auto mb-2 mb-lg-0">
+      <ul class="navbar-nav mb-2 mb-lg-0">
+        <% @navbar.bar('topbar.before').each do |entry| %>
+          <li class="nav-item">
+            <a class="nav-link" href="<%= entry[:path] %>">
+              <%= entry[:title] %>
+            </a>
+          </li>
+        <% end %>
         <% 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 %>
             </a>
             <ul class="dropdown-menu">
-              <li>
-                <%= link_to "Mi perfil", edit_user_registration_path, class: 'dropdown-item' %>
-              </li>
-              <% @navbar.topbar.each do |entry| %>
+              <% if policy(current_user).edit? %>
+                <li>
+                  <%= link_to "Mi perfil", edit_user_registration_path, class: 'dropdown-item' %>
+                </li>
+              <% end %>
+              <% @navbar.bar('topbar.dropdown_user').each do |entry| %>
                 <% next if @navbar.hide_entry?(entry) %>
                 <li>
                   <a class="dropdown-item" href="<%= entry[:path] %>">
@@ -31,11 +40,12 @@
               <% end %>
 
               <li>
-                <%= link_to t("devise.shared.links.sign_out"), destroy_user_session_path, data: { 'turbo-method': 'delete' }, class: 'dropdown-item' %>
+                <%= link_to t("devise.sign_out"), destroy_user_session_path, data: { 'turbo-method': 'delete' }, class: 'dropdown-item' %>
               </li>
             </ul>
           </li>
-          <% @navbar.sidebar.each do |entry| %>
+          <%# Los item de sidebar en mobile %>
+          <% @navbar.bar('sidebar').each do |entry| %>
             <% next if @navbar.hide_entry?(entry) %>
             <% random_id = rand(99999).to_s %>
             <li class="nav-item d-md-none">
@@ -47,15 +57,16 @@
 
         <% else %>
           <li class="nav-item">
-            <%= link_to t("devise.shared.links.sign_in"), new_user_session_path, class: 'nav-link' %>
+            <%= link_to t("devise.sign_up"), new_user_registration_path, class: 'btn btn-success' %>
           </li>
           <li class="nav-item">
-            <%= link_to t("devise.shared.links.sign_up"), new_user_registration_path, class: 'nav-link' %>
+            <%= link_to t("devise.sign_in"), new_user_session_path, class: 'nav-link' %>
           </li>
         <% end %>
       </ul>
-      <%= @navbar_ext %>
-
+      <% @navbar.extensiones.each do |extension| %>
+        <%= extension %>
+      <% end %>
     </div>
   </div>
 </nav>

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

@@ -13,7 +13,7 @@
       </div> %>
       <div class="sidebar--large-items">
         <ul class="list-unstyled ps-0">
-          <% @navbar.sidebar.each do |entry| %>
+          <% @navbar.bar('sidebar').each do |entry| %>
             <% next if @navbar.hide_entry?(entry) %>
             <% random_id = rand(99999).to_s %>
             <li class="mb-1">

data/pg_layout/spec/lib/navbar_spec.rb

@@ -0,0 +1,32 @@
+require 'rails_helper'
+
+describe Navbar do
+  let(:user) { create :user }
+  let(:instancia) { described_class.new(user) }
+
+  describe '#add_html' do
+    subject { instancia.add_html(some_html) }
+
+    let(:some_html) { '<p>Hola</p>' }
+
+    it do
+      expect { subject }.to(change(instancia, :extensiones))
+    end
+  end
+
+  describe '#add_item' do
+    subject { instancia.add_item('key', some_item) }
+
+    let(:some_item) do
+      {
+        name: 'Título',
+        path: 'root_path',
+        policy: 'true'
+      }
+    end
+
+    it do
+      expect { subject }.to(change { instancia.bar('key') })
+    end
+  end
+end

data/pg_rails/lib/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.0.8.pre.alpha.24
+  version: 7.0.8.pre.alpha.25
 platform: ruby
 authors:
 - Martín Rosso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-03 00:00:00.000000000 Z
+date: 2024-04-05 00:00:00.000000000 Z
 dependencies: []
 description: Rails goodies.
 email:
@@ -54,6 +54,7 @@ files:
 - pg_engine/app/decorators/user_decorator.rb
 - pg_engine/app/helpers/pg_engine/flash_helper.rb
 - pg_engine/app/helpers/pg_engine/form_helper.rb
+- pg_engine/app/helpers/pg_engine/i18n_helper.rb
 - pg_engine/app/helpers/pg_engine/index_helper.rb
 - pg_engine/app/helpers/pg_engine/pg_rails_helper.rb
 - pg_engine/app/helpers/pg_engine/postgres_helper.rb
@@ -126,6 +127,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/pg_engine/base_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
@@ -188,6 +190,7 @@ files:
 - pg_layout/app/views/pg_layout/_sidebar.html.erb
 - pg_layout/lib/pg_layout.rb
 - pg_layout/lib/pg_layout/engine.rb
+- pg_layout/spec/lib/navbar_spec.rb
 - pg_rails/js/index.js
 - pg_rails/lib/pg_rails.rb
 - pg_rails/lib/pg_rails/capybara_support.rb