pg_rails 7.0.8.pre.alpha.10 → 7.0.8.pre.alpha.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3efd952ef548d103ed1c4aea21b903f039792ed601fc66e93fb5b84dce4d39d
-  data.tar.gz: 148ae25de52ab06846c1b7b313f6f87db0d6d6ba502a9186104559e0e37ec114
+  metadata.gz: 84eace9e9d023c54401e822df64d253dd94dcdf3831fd19ce1c77bb0ad674541
+  data.tar.gz: 3c1b74610da49e737f4fba5d9b89737a529650831278f95fcfc4c66ebd32a1f6
 SHA512:
-  metadata.gz: 68b63352e0ac30ff6f3c7a22e3a2fb73f8918ee91dfefe51b2c8371915c9d7adde99eb114c1ba935387182fa10966d0c5776c672e477486cff17a82993ff68fb
-  data.tar.gz: 1fda6ee9f5416f813e811268f307b87638b69de4a3db4659a7259c6101dc6b8281d9b351e92998e517a0d492cc39eea71780add28b2c240c4971aa26f87a2000
+  metadata.gz: 2c350c91dc1f91c4eb6c2b7ad866296d1057c89637ec3b45922ec89a0720d7942a4706a0ab3659adabb34da2a8f681d56367a722b5d7d4f1595210bb3bda12dc
+  data.tar.gz: '0806e415216083b9afe67adb247328764964cd537351a4406e88c7768946b71fe661de0a469f3d61af215d85706312d772e12cf52b03f65c083cb773cf06d687'

data/pg_associable/app/javascript/modal_controller.js

@@ -23,7 +23,7 @@ export default class extends Controller {
   }
 
   disconnect (e) {
+    this.modalPuntero.hide()
     this.modalPuntero.dispose()
-    document.querySelectorAll('.modal-backdrop').forEach(e => { e.remove() })
   }
 }

data/pg_engine/app/admin/accounts.rb

@@ -1,24 +1,21 @@
 ActiveAdmin.register Account do
-  permit_params :plan, :nombre, :hashid
+  permit_params :plan, :nombre
 
   index do
     selectable_column
     id_column
     column :plan
     column :nombre
-    column :hashid
     actions
   end
 
   filter :plan
   filter :nombre
-  filter :hashid
 
   form do |f|
     f.inputs do
       f.input :plan
       f.input :nombre
-      f.input :hashid
     end
     f.actions
   end

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

@@ -15,19 +15,19 @@ module Admin
     private
 
     def atributos_permitidos
-      %i[plan nombre hashid]
+      %i[plan nombre]
     end
 
     def atributos_para_buscar
-      %i[plan nombre hashid]
+      %i[plan nombre]
     end
 
     def atributos_para_listar
-      %i[plan nombre hashid]
+      %i[plan nombre]
     end
 
     def atributos_para_mostrar
-      %i[plan nombre hashid]
+      %i[plan nombre]
     end
   end
 end

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

@@ -210,6 +210,8 @@ module PgEngine
     def buscar_instancia
       if Object.const_defined?('FriendlyId') && @clase_modelo.is_a?(FriendlyId)
         @clase_modelo.friendly.find(params[:id])
+      elsif @clase_modelo.respond_to? :find_by_hashid
+        @clase_modelo.find_by!(hashid: params[:id])
       else
         @clase_modelo.find(params[:id])
       end

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

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

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

@@ -98,10 +98,10 @@ module PgEngine
       'No'
     end
 
-    def print_currency(number, simbolo: '$')
+    def print_currency(number, simbolo: '$', precision: nil)
       return if number.blank?
 
-      precision = (number % 1).positive? ? 2 : 0
+      precision ||= (number % 1).positive? ? 2 : 0
       "#{simbolo} #{number_with_precision(number, delimiter: '.', separator: ',',
                                                   precision:)}"
     end

data/pg_engine/app/lib/pg_form_builder.rb

@@ -4,6 +4,27 @@ class PgFormBuilder < SimpleForm::FormBuilder
   include PgAssociable::FormBuilderMethods
   include PgEngine::ErrorHelper
 
+  def default_prefix(attribute_name)
+    at_name = object.class.human_attribute_name(attribute_name.to_s).downcase
+    "#{articulo(attribute_name)} #{at_name}"
+  end
+
+  def articulo(attribute_name)
+    gender = I18n.t("gender.#{attribute_name}", default: nil)
+    if gender.present?
+      gender == 'f' ? 'La' : 'El'
+    else
+      at_name = object.class.human_attribute_name(attribute_name.to_s).downcase
+      at_name.ends_with?('a') ? 'La' : 'El'
+    end
+  end
+
+  def input(attribute_name, options = {}, &)
+    options[:error_prefix] ||= default_prefix(attribute_name)
+
+    super(attribute_name, options, &)
+  end
+
   def mensajes_de_error
     base_errors = object.errors[:base]
     base_message = (base_errors.map(&:to_s).join('<br>') if base_errors.present?)

data/pg_engine/app/models/account.rb

@@ -6,25 +6,18 @@
 #
 #  id                 :bigint           not null, primary key
 #  discarded_at       :datetime
-#  hashid             :string
 #  nombre             :string           not null
 #  plan               :integer          not null
 #  created_at         :datetime         not null
 #  updated_at         :datetime         not null
-#  actualizado_por_id :bigint
-#  creado_por_id      :bigint
-#
-# Indexes
-#
-#  index_accounts_on_actualizado_por_id  (actualizado_por_id)
-#  index_accounts_on_creado_por_id       (creado_por_id)
+#  actualizado_por_id :bigint           indexed
+#  creado_por_id      :bigint           indexed
 #
 # Foreign Keys
 #
 #  fk_rails_...  (actualizado_por_id => users.id)
 #  fk_rails_...  (creado_por_id => users.id)
 #
-# generado con pg_rails
 
 class Account < ApplicationRecord
   audited

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

@@ -47,10 +47,10 @@ module PgEngine
 
     def to_s
       %i[nombre name].each do |campo|
-        return "#{send(campo)} ##{id}" if try(campo).present?
+        return "#{send(campo)} ##{to_param}" if try(campo).present?
       end
-      if id.present?
-        "#{self.class.nombre_singular} ##{id}"
+      if to_param.present?
+        "#{self.class.nombre_singular} ##{to_param}"
       else
         super
       end

data/pg_engine/app/models/user.rb

@@ -3,41 +3,36 @@
 # Table name: users
 #
 #  id                     :bigint           not null, primary key
+#  apellido               :string           not null
 #  confirmation_sent_at   :datetime
-#  confirmation_token     :string
+#  confirmation_token     :string           indexed
 #  confirmed_at           :datetime
 #  current_sign_in_at     :datetime
 #  current_sign_in_ip     :string
 #  developer              :boolean          default(FALSE), not null
 #  discarded_at           :datetime
-#  email                  :string           default(""), not null
+#  email                  :string           default(""), not null, indexed
 #  encrypted_password     :string           default(""), not null
 #  failed_attempts        :integer          default(0), not null
 #  last_sign_in_at        :datetime
 #  last_sign_in_ip        :string
 #  locked_at              :datetime
+#  nombre                 :string           not null
 #  remember_created_at    :datetime
 #  reset_password_sent_at :datetime
-#  reset_password_token   :string
+#  reset_password_token   :string           indexed
 #  sign_in_count          :integer          default(0), not null
 #  unconfirmed_email      :string
-#  unlock_token           :string
+#  unlock_token           :string           indexed
 #  created_at             :datetime         not null
 #  updated_at             :datetime         not null
 #
-# Indexes
-#
-#  index_users_on_confirmation_token    (confirmation_token) UNIQUE
-#  index_users_on_email                 (email) UNIQUE
-#  index_users_on_reset_password_token  (reset_password_token) UNIQUE
-#  index_users_on_unlock_token          (unlock_token) UNIQUE
-#
 class User < ApplicationRecord
   # ApplicationRecord should be defined on Application
 
   # Include default devise modules. Others available are:
   devise :database_authenticatable, :registerable,
-         :recoverable, :rememberable, :validatable,
+         :recoverable, :rememberable,
          :lockable, :timeoutable, :trackable, :confirmable
 
   audited
@@ -46,7 +41,19 @@ class User < ApplicationRecord
   has_many :user_accounts
   has_many :accounts, through: :user_accounts
 
-  validates :email, :nombre, :apellido, presence: true
+  validates :nombre, :apellido, presence: true
+
+  validates_presence_of   :email
+  validates_uniqueness_of :email, message: 'ya pertenece a un usuario'
+  validates_format_of     :email, with: /\A[^@\s]+@[^@\s]+\z/
+  validates_presence_of     :password, if: :password_required?
+  validates_confirmation_of :password, if: :password_required?, message: 'Las contraseñas no coinciden'
+  validates_length_of       :password, if: :password_required?, within: 6..128,
+                                       message: 'es demasiado corta (6 caracteres mínimo)'
+
+  def password_required?
+    !persisted? || !password.nil? || !password_confirmation.nil?
+  end
 
   scope :query, ->(param) { where('email ILIKE ?', "%#{param}%") }
 

data/pg_engine/app/models/user_account.rb

@@ -8,17 +8,10 @@
 #  profiles           :integer          default([]), not null, is an Array
 #  created_at         :datetime         not null
 #  updated_at         :datetime         not null
-#  account_id         :bigint           not null
-#  actualizado_por_id :bigint
-#  creado_por_id      :bigint
-#  user_id            :bigint           not null
-#
-# Indexes
-#
-#  index_user_accounts_on_account_id          (account_id)
-#  index_user_accounts_on_actualizado_por_id  (actualizado_por_id)
-#  index_user_accounts_on_creado_por_id       (creado_por_id)
-#  index_user_accounts_on_user_id             (user_id)
+#  account_id         :bigint           not null, indexed
+#  actualizado_por_id :bigint           indexed
+#  creado_por_id      :bigint           indexed
+#  user_id            :bigint           not null, indexed
 #
 # Foreign Keys
 #
@@ -27,7 +20,6 @@
 #  fk_rails_...  (creado_por_id => users.id)
 #  fk_rails_...  (user_id => users.id)
 #
-# generado con pg_rails
 
 class UserAccount < ApplicationRecord
   audited

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

@@ -7,6 +7,5 @@ div style="max-width: 22em"
     = hidden_field_tag :asociable, true if asociable
     = f.input :plan
     = f.input :nombre
-    = f.input :hashid
     .mt-2
     = f.button :submit

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

@@ -39,7 +39,7 @@ div
             - object = object.decorate
             tr id="#{dom_id(object)}"
               - atributos_para_listar.each do |att|
-                td = object.send(att)
+                td.text-nowrap = object.send(att)
               td.text-nowrap.text-end.ps-5
                 = object.show_link
                 = object.edit_link

data/pg_engine/config/initializers/simple_form_monkey_patch.rb

@@ -0,0 +1,12 @@
+module SimpleForm
+  module Components
+    module Errors
+      def error_text
+        text = has_custom_error? ? options[:error] : errors.reject(&:empty?).send(error_method)
+        return if text.blank?
+
+        "#{html_escape(options[:error_prefix])} #{html_escape(text)}".lstrip.html_safe
+      end
+    end
+  end
+end

data/pg_engine/config/locales/es.yml

@@ -40,3 +40,7 @@ es:
     # prompts:
     #   defaults:
     #     age: 'Select your age'
+  errors:
+    messages:
+      blank: ''
+      empty: ''

data/pg_engine/config/simple_form/simple_form_bootstrap.rb

@@ -56,8 +56,7 @@ SimpleForm.setup do |config|
     b.optional :readonly
     b.use :label, class: 'form-label'
     b.use :input, class: 'form-control', error_class: 'is-invalid'
-    b.use :full_error, wrap_with: { class: 'invalid-feedback' }
-    b.optional :error, wrap_with: { class: 'invalid-feedback' }
+    b.use :error, wrap_with: { class: 'invalid-feedback' }
     b.use :hint, wrap_with: { class: 'form-text' }
   end
 
@@ -66,8 +65,7 @@ SimpleForm.setup do |config|
     b.optional :readonly
     b.use :label, class: 'form-label'
     b.use :input, class: 'form-select', error_class: 'is-invalid'
-    b.use :full_error, wrap_with: { class: 'invalid-feedback' }
-    b.optional :error, wrap_with: { class: 'invalid-feedback' }
+    b.use :error, wrap_with: { class: 'invalid-feedback' }
     b.use :hint, wrap_with: { class: 'form-text' }
   end
 

data/pg_engine/db/migrate/20240314114503_remove_hash_ids.rb

@@ -0,0 +1,5 @@
+class RemoveHashIds < ActiveRecord::Migration[7.1]
+  def change
+    remove_column :accounts, :hashid
+  end
+end

data/pg_engine/lib/tasks/auto_anotar_modelos.rake

@@ -1,6 +1,8 @@
 # NOTE: only doing this in development as some production environments (Heroku)
 # NOTE: are sensitive to local FS writes, and besides -- it's just not proper
 # NOTE: to have a dev-mode tool do its thing in production.
+Dotenv.load
+
 if Rails.env.development?
   require 'annotate'
   task :set_annotation_options do
@@ -21,7 +23,8 @@ if Rails.env.development?
       'show_complete_foreign_keys'  => 'false',
       'show_indexes'                => 'false',
       'simple_indexes'              => 'true',
-      'model_dir'                   => ['app/models', 'app/overrides'],
+      'model_dir'                   => ENV['MODEL_PATHS'],
+      # 'model_dir'                   => ['app/models', 'app/overrides'],
       # 'model_dir'                   => 'app/models',
       'root_dir'                    => '',
       'include_version'             => 'false',

data/pg_engine/spec/factories/accounts.rb

@@ -6,6 +6,5 @@ FactoryBot.define do
   factory :account do
     plan { Account.plan.values.sample }
     nombre { Faker::Lorem.sentence }
-    hashid { Faker::Lorem.sentence }
   end
 end

data/pg_engine/spec/lib/pg_form_builder_spec.rb

@@ -29,4 +29,18 @@ describe PgFormBuilder do
       it { expect(subject).to eq 'Por favor, revisá los campos obligatorios:' }
     end
   end
+
+  describe '#default_prefix' do
+    context 'cuando el atributo es masculino' do
+      subject { instancia.default_prefix(:nombre) }
+
+      it { expect(subject).to eq 'El nombre' }
+    end
+
+    context 'cuando el atributo es femenino' do
+      subject { instancia.default_prefix(:fecha) }
+
+      it { expect(subject).to eq 'La fecha' }
+    end
+  end
 end

data/pg_layout/app/javascript/utils.ts

@@ -3,6 +3,9 @@ export function round (value) {
 }
 
 export function printCurrency (value, simboloMoneda = '$') {
+  if (typeof value === 'string') {
+    value = parseFloat(value)
+  }
   const decimals = (value % 1 > 0) ? 2 : 0
   return simboloMoneda + ' ' + numberWithDots(value.toFixed(decimals).replace('.', ','))
 }

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

@@ -1,15 +1,14 @@
 <h2><%= t(".sign_up") %></h2>
 
 <%= pg_form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
-  <%= f.error_notification %>
+  <%= 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,
-                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/layouts/pg_layout/layout.html.slim

@@ -14,15 +14,16 @@ html
     = stylesheet_link_tag 'application', 'data-turbo-track': 'reload'
     = javascript_include_tag 'application', 'data-turbo-track': 'reload', type: 'module'
   body
-    .with-sidebar
-      = render partial: 'pg_layout/sidebar'
+    div class="#{ @sidebar == false ? '' : 'with-sidebar' }"
+      - unless @sidebar == false
+        = render partial: 'pg_layout/sidebar'
       div
         .position-relative.d-flex.justify-content-around
           #flash.flash.position-absolute.z-1.mt-1
             = render partial: 'pg_layout/flash'
         = render partial: 'pg_layout/navbar'
         div
-          - if user_signed_in?
+          - if user_signed_in? && @breadcrumb != false
             .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

@@ -1,8 +1,10 @@
 <nav class="navbar navbar-expand-<%= @breakpoint_navbar_expand %> bg-light">
   <div class="container-fluid">
-    <button data-controller="navbar" data-action="navbar#expandNavbar" class="btn btn-outline-primary me-2 d-none d-<%= @breakpoint_navbar_expand %>-inline-block">
-      <i class="bi bi-list"></i>
-    </button>
+    <% unless @sidebar == false %>
+      <button data-controller="navbar" data-action="navbar#expandNavbar" class="btn btn-outline-primary me-2 d-none d-<%= @breakpoint_navbar_expand %>-inline-block">
+        <i class="bi bi-list"></i>
+      </button>
+    <% end %>
     <!-- <a class="navbar-brand" href="#">Navbar</a> -->
     <button class="navbar-toggler btn btn-outline-primary me-2" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
       <i class="bi bi-list"></i>

data/pg_rails/lib/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.0.8.pre.alpha.10
+  version: 7.0.8.pre.alpha.12
 platform: ruby
 authors:
 - Martín Rosso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-05 00:00:00.000000000 Z
+date: 2024-03-14 00:00:00.000000000 Z
 dependencies: []
 description: Rails goodies.
 email:
@@ -53,6 +53,7 @@ files:
 - pg_engine/app/helpers/pg_engine/flash_helper.rb
 - pg_engine/app/helpers/pg_engine/form_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
 - pg_engine/app/helpers/pg_engine/print_helper.rb
 - pg_engine/app/helpers/pg_engine/route_helper.rb
@@ -89,6 +90,7 @@ files:
 - 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/initializers/simple_form_monkey_patch.rb
 - pg_engine/config/locales/devise.en.yml
 - pg_engine/config/locales/es.yml
 - pg_engine/config/routes.rb
@@ -102,6 +104,7 @@ files:
 - 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/migrate/20240314114503_remove_hash_ids.rb
 - pg_engine/db/seeds.rb
 - pg_engine/lib/pg_engine.rb
 - pg_engine/lib/pg_engine/configuracion.rb