pg_rails 7.0.8.pre.alpha.10 → 7.0.8.pre.alpha.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3efd952ef548d103ed1c4aea21b903f039792ed601fc66e93fb5b84dce4d39d
-  data.tar.gz: 148ae25de52ab06846c1b7b313f6f87db0d6d6ba502a9186104559e0e37ec114
+  metadata.gz: fd8e2d2862617656464a77ffbb81da7f6a4446d013905748392a062e8f3dab7c
+  data.tar.gz: '082f99be749adde90a68693ebfe00ee234c6a83429c18c0f02b9aff6b831ae53'
 SHA512:
-  metadata.gz: 68b63352e0ac30ff6f3c7a22e3a2fb73f8918ee91dfefe51b2c8371915c9d7adde99eb114c1ba935387182fa10966d0c5776c672e477486cff17a82993ff68fb
-  data.tar.gz: 1fda6ee9f5416f813e811268f307b87638b69de4a3db4659a7259c6101dc6b8281d9b351e92998e517a0d492cc39eea71780add28b2c240c4971aa26f87a2000
+  metadata.gz: d34c9e84d88801ea1b973b275ab94923fb0941bdf9e204fa2a3d76321f9bec079427e3df7d9fae905ef31e3144cda6d92c061ca510f108c66084ec68258de446
+  data.tar.gz: 18fed1f31567205e9ad8bff9e455f9c5e48bf0be4966e2ba9c08fca716995720934e0b8f0011ab1a2bcf7cd39edbd92fb708b296d926849cae2c815c5a1a4352

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/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/user.rb

@@ -37,7 +37,7 @@ class User < ApplicationRecord
 
   # Include default devise modules. Others available are:
   devise :database_authenticatable, :registerable,
-         :recoverable, :rememberable, :validatable,
+         :recoverable, :rememberable,
          :lockable, :timeoutable, :trackable, :confirmable
 
   audited
@@ -46,7 +46,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/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/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/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_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.11'
 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.11
 platform: ruby
 authors:
 - Martín Rosso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-05 00:00:00.000000000 Z
+date: 2024-03-06 00:00:00.000000000 Z
 dependencies: []
 description: Rails goodies.
 email:
@@ -89,6 +89,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