pg_rails 7.0.8.pre.alpha.8 → 7.0.8.pre.alpha.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b3571f15d522de34ce58f735dd40b7dd3b44bc2f8292233dbcc5e451dd49f7a
-  data.tar.gz: 315e2de0d4c61085eaf12fb48bc2298d928e1909c2546a9bfda57e8e3e9c88ed
+  metadata.gz: 55efac7692668130210916f2d27c9d5f649660dc6a7341ea615fcfe66b263909
+  data.tar.gz: 1827e613adbfbaed350d8d84f69131c302a14ef9b7f7cef0c2fc030171b13261
 SHA512:
-  metadata.gz: 305ac09bdf7ac2a6172f71979253e8dbf90123d5c4218d5ffda7ab7a035052271ea9c6c9f3f182a7b76064075294ba2e71e3b157b49461753b954a762f9d1de4
-  data.tar.gz: 7d4744860de97968cd3e67710bd859a64e4610dcca69439daba8a05422fd6b8d092fbf56ef55eddee79aacc9a43154d7545b481bde7060c492694bdefebfb843
+  metadata.gz: ca7acd8b6732ba7e5fb832b443a32d74d12490d013d1c0a72ed7bfbd499ce959f458815c22a980f9b94f81cdbddfa4e024e4b8de5533ab0f637ec7ed6c1de735
+  data.tar.gz: 4335852cf4c82da4e90504ed5872472f5612378fb92b674bb3da4185c26fb040e81b55522bcf67dfe71db81c36fec146c112f4ff14bbc02832eb01dc481a03ee

data/README.md

@@ -89,3 +89,5 @@ be rails pg_engine_engine:install:migrations
 
 ruby-vips
 pdftoppm
+
+atributos no pueden terminar en _text

data/pg_engine/app/controllers/{pg_engine/resource_helper.rb → concerns/pg_engine/resource.rb}

@@ -1,5 +1,5 @@
 module PgEngine
-  module ResourceHelper
+  module Resource
     def self.included(clazz)
       clazz.before_action :authenticate_user!
       clazz.helper_method :atributos_para_listar

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

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

data/pg_engine/app/lib/pg_engine/error_helper.rb

@@ -0,0 +1,37 @@
+module PgEngine
+  module ErrorHelper
+    extend ActiveSupport::Concern
+
+    def merge_association_errors(object, details, assoc_key)
+      details = details.except(assoc_key)
+      assoc_items = object.send(assoc_key).map(&:errors).map(&:details)
+      merged = assoc_items.inject({}) { |acc, el| acc.merge(el) }
+      merged = merged.transform_values { |errs| errs.pluck(:error) }
+      details.merge(merged)
+    end
+
+    def error_types(object, associations: [])
+      details = object.errors.details.transform_values do |errs|
+        errs.pluck(:error)
+      end
+      associations.each do |assoc_key|
+        next unless details.key? assoc_key
+
+        details = merge_association_errors(object, details, assoc_key)
+      end
+      details.values.flatten.uniq
+    end
+
+    def error_message_for(object, associations: [])
+      types = error_types(object, associations:)
+
+      if types == [:blank]
+        :only_presence_errors
+      elsif types.include? :blank
+        :multiple_error_types
+      elsif types.present?
+        :not_presence_errors
+      end
+    end
+  end
+end

data/pg_engine/app/lib/pg_form_builder.rb

@@ -2,12 +2,27 @@
 
 class PgFormBuilder < SimpleForm::FormBuilder
   include PgAssociable::FormBuilderMethods
+  include PgEngine::ErrorHelper
 
   def mensajes_de_error
-    errors_to_show = object.errors[:base]
-    message = (errors_to_show.map(&:to_s).join('<br>') if errors_to_show.present?)
+    base_errors = object.errors[:base]
+    base_message = (base_errors.map(&:to_s).join('<br>') if base_errors.present?)
+    title = error_notification(message: mensaje, class: 'text-danger mb-2') if mensaje
+    base_tag = error_notification(message: base_message, class: 'alert alert-danger') if base_message
+    (title || '') + (base_tag || '')
+  end
+
+  def mensaje
+    scope = error_message_for(object, associations:)
+    return if scope.blank?
+
+    I18n.t("simple_form.error_notification.#{scope}")
+  end
 
-    error_notification(message:)
+  def associations
+    object.class.reflect_on_all_associations
+          .select { |a| a.instance_of? ActiveRecord::Reflection::HasManyReflection }
+          .map(&:name)
   end
 
   map_type :date, to: PgEngine::FechaInput

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

@@ -33,6 +33,15 @@ module PgEngine
       model_name.human(count: 1)
     end
 
+    def self.human_attribute_name(attribute, options = {})
+      # Si es un enumerized
+      if attribute.to_s.ends_with?('_text')
+        super(attribute[0..-6], options)
+      else
+        super(attribute, options)
+      end
+    end
+
     def to_s
       %i[nombre name].each do |campo|
         return "#{send(campo)} ##{id}" if try(campo).present?

data/pg_engine/config/locales/es.yml

@@ -7,15 +7,6 @@ es:
     creado_por: Creado por
   ancestry:
     exclude_self: No puede ser hijx de si mismx
-  simple_form:
-    # labels:
-    #   user:
-    #     username: 'User name'
-    #     password: 'Password'
-    # hints:
-    error_notification:
-      default_message: "hubo algunos errores:"
-
   simple_form:
     "yes": 'Sí'
     "no": 'No'
@@ -26,7 +17,10 @@ es:
       # When using html, text and mark won't be used.
       # html: '<abbr title="required">*</abbr>'
     error_notification:
-      default_message: "Por favor, revisá los errores debajo:"
+      default_message: "Por favor, revisá los siguientes errores:"
+      not_presence_errors: "Por favor, revisá los siguientes errores:"
+      only_presence_errors: 'Por favor, revisá los campos obligatorios:'
+      multiple_error_types: 'Por favor, revisá los campos obligatorios y otros errores:'
     # Examples
     # labels:
     #   defaults:

data/pg_engine/config/simple_form/simple_form_bootstrap.rb

@@ -32,7 +32,7 @@ SimpleForm.setup do |config|
   config.include_default_input_wrapper_class = false
 
   # CSS class to add for error notification helper.
-  config.error_notification_class = 'alert alert-danger'
+  config.error_notification_class = ''
 
   # Method used to tidy up errors. Specify any Rails Array method.
   # :first lists the first message for each field.
@@ -57,6 +57,7 @@ SimpleForm.setup do |config|
     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 :hint, wrap_with: { class: 'form-text' }
   end
 
@@ -66,6 +67,7 @@ SimpleForm.setup do |config|
     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 :hint, wrap_with: { class: 'form-text' }
   end
 

data/pg_engine/lib/pg_engine/engine.rb

@@ -47,16 +47,20 @@ module PgEngine
     initializer 'byebug_bullet' do
       if Rails.env.local?
         # Byebug
-        require 'byebug/core'
-        begin
-          Byebug.start_server 'localhost', ENV.fetch('BYEBUG_SERVER_PORT', 8989).to_i
-          if ENV.fetch('SLEEP_AFTER_BYEBUG', false)
-            puts 'waiting 3 secs after starting byebug server for connections'
-            sleep 3
+        # :nocov:
+        if ENV['RUBY_DEBUG_OPEN']
+          require 'byebug/core'
+          begin
+            Byebug.start_server 'localhost', ENV.fetch('BYEBUG_SERVER_PORT', 8989).to_i
+            if ENV.fetch('SLEEP_AFTER_BYEBUG', false)
+              puts 'waiting 3 secs after starting byebug server for connections'
+              sleep 3
+            end
+          rescue Errno::EADDRINUSE
+            Rails.logger.debug 'Byebug server already running'
           end
-        rescue Errno::EADDRINUSE
-          Rails.logger.debug 'Byebug server already running'
         end
+        # :nocov:
 
         # Bullet
         Bullet.enable        = true

data/pg_engine/lib/tasks/auto_anotar_modelos.rake

@@ -19,8 +19,8 @@ if Rails.env.development?
       'position_in_serializer'      => 'before',
       'show_foreign_keys'           => 'true',
       'show_complete_foreign_keys'  => 'false',
-      'show_indexes'                => 'true',
-      'simple_indexes'              => 'false',
+      'show_indexes'                => 'false',
+      'simple_indexes'              => 'true',
       'model_dir'                   => 'app/models',
       'root_dir'                    => '',
       'include_version'             => 'false',

data/pg_engine/spec/controllers/concerns/pg_engine/error_helper_spec.rb

@@ -0,0 +1,62 @@
+require 'rails_helper'
+
+describe PgEngine::ErrorHelper do
+  let(:dummy) { Class.new { include PgEngine::ErrorHelper }.new }
+
+  describe '#error_message_for' do
+    subject do
+      categoria.validate
+      dummy.error_message_for(categoria, associations: [:cosas])
+    end
+
+    let!(:categoria) { create :categoria_de_cosa }
+
+    before { create_list :cosa, 2, categoria_de_cosa: categoria }
+
+    it do
+      expect(subject).to be_nil
+    end
+
+    context 'cuando solo tiene errores de presencia' do
+      before do
+        categoria.nombre = nil
+      end
+
+      it do
+        expect(subject).to eq :only_presence_errors
+      end
+    end
+
+    context 'cuando solo tiene otros errores' do
+      before do
+        categoria.validate_aux = true
+      end
+
+      it do
+        expect(subject).to eq :not_presence_errors
+      end
+    end
+
+    context 'cuando tiene multiples errores' do
+      before do
+        categoria.validate_aux = true
+        categoria.nombre = nil
+      end
+
+      it do
+        expect(subject).to eq :multiple_error_types
+      end
+    end
+
+    context 'cuando tiene errores anidados' do
+      before do
+        categoria.reload
+        categoria.cosas[0].nombre = nil
+      end
+
+      it do
+        expect(subject).to eq :only_presence_errors
+      end
+    end
+  end
+end

data/pg_engine/spec/lib/pg_form_builder_spec.rb

@@ -0,0 +1,32 @@
+require 'rails_helper'
+
+describe PgFormBuilder do
+  let(:categoria) { create :categoria_de_cosa }
+  let(:template) { double }
+  let(:instancia) { described_class.new('bla', categoria, template, {}) }
+
+  before { create_list :cosa, 2, categoria_de_cosa: categoria }
+
+  describe '#mensaje' do
+    subject { instancia.mensaje }
+
+    context 'cuando solo tiene errores de presencia' do
+      before do
+        categoria.nombre = nil
+        categoria.validate
+      end
+
+      it { expect(subject).to eq 'Por favor, revisá los campos obligatorios:' }
+    end
+
+    context 'cuando solo tiene errores de presencia en nested' do
+      before do
+        categoria.reload
+        categoria.cosas[0].nombre = nil
+        categoria.validate
+      end
+
+      it { expect(subject).to eq 'Por favor, revisá los campos obligatorios:' }
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+require 'rails_helper'
+
+describe PgEngine::BaseRecord do
+  describe '#human_attribute_name' do
+    subject do
+      described_class.human_attribute_name('bla_text')
+    end
+
+    it do
+      expect(subject).to eq described_class.human_attribute_name('bla')
+    end
+  end
+end

data/pg_layout/app/javascript/utils.ts

@@ -2,33 +2,15 @@ export function round (value) {
   return Math.round(value * 100) / 100
 }
 
-export function printCurrency (value, moneda) {
-  return monedaSimbolo(moneda) + numberWithDots(round(value).toFixed(2).replace('.', ','))
+export function printCurrency (value, simboloMoneda = '$') {
+  const decimals = (value % 1 > 0) ? 2 : 0
+  return simboloMoneda + ' ' + numberWithDots(value.toFixed(decimals).replace('.', ','))
 }
 
 export function showPercentage (value) {
   return '% ' + value
 }
 
-export function monedaSimbolo (moneda) {
-  switch (moneda) {
-    case 'pesos':
-      return '$ '
-    case 'dolares':
-      return 'U$S '
-    case 'euros':
-      return '€ '
-    case 'reales':
-      return 'R$ '
-    case 'pesos_chilenos':
-      return 'CLP '
-    case 'pesos_mexicanos':
-      return 'MXN '
-    default:
-      return '$ '
-  }
-}
-
 export function numberWithDots (x) {
   return x.toString().replace(/\B(?=(\d{3})+(?!\d))/g, '.')
 }

data/pg_rails/lib/version.rb

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

data/pg_scaffold/lib/generators/pg_slim/templates/_form.html.slim

@@ -1,7 +1,7 @@
 / # locals: (object: nil, asociable: false)
 
 div style="max-width: 22em" data-controller="pg_form"
-  = pg_form_for(@<%= singular_name %> || object, asociable:)) do |f|
+  = pg_form_for(@<%= singular_name %> || object, asociable:) do |f|
     = f.mensajes_de_error
 
     = hidden_field_tag :asociable, true if asociable

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.0.8.pre.alpha.8
+  version: 7.0.8.pre.alpha.9
 platform: ruby
 authors:
 - Martín Rosso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-02-28 00:00:00.000000000 Z
+date: 2024-03-01 00:00:00.000000000 Z
 dependencies: []
 description: Rails goodies.
 email:
@@ -42,10 +42,10 @@ files:
 - pg_engine/app/controllers/admin/accounts_controller.rb
 - pg_engine/app/controllers/admin/user_accounts_controller.rb
 - pg_engine/app/controllers/admin/users_controller.rb
+- pg_engine/app/controllers/concerns/pg_engine/resource.rb
 - 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/pg_engine/resource_helper.rb
 - pg_engine/app/decorators/account_decorator.rb
 - pg_engine/app/decorators/pg_engine/base_decorator.rb
 - pg_engine/app/decorators/user_account_decorator.rb
@@ -57,6 +57,7 @@ files:
 - pg_engine/app/helpers/pg_engine/print_helper.rb
 - pg_engine/app/helpers/pg_engine/route_helper.rb
 - pg_engine/app/inputs/pg_engine/fecha_input.rb
+- pg_engine/app/lib/pg_engine/error_helper.rb
 - pg_engine/app/lib/pg_engine/filtros_builder.rb
 - pg_engine/app/lib/pg_form_builder.rb
 - pg_engine/app/models/account.rb
@@ -110,11 +111,14 @@ files:
 - pg_engine/spec/controllers/admin/accounts_controller_spec.rb
 - 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/factories/accounts.rb
 - pg_engine/spec/factories/user_accounts.rb
 - pg_engine/spec/factories/users.rb
 - pg_engine/spec/fixtures/test.pdf
+- pg_engine/spec/lib/pg_form_builder_spec.rb
 - pg_engine/spec/models/account_spec.rb
+- pg_engine/spec/models/pg_engine/base_record_spec.rb
 - pg_engine/spec/models/user_account_spec.rb
 - pg_engine/spec/models/user_spec.rb
 - pg_engine/spec/pg_engine/pdf_preview_generator_spec.rb