pg_rails 7.0.8.pre.alpha.72 → 7.0.8.pre.alpha.74

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: adf65a3ea20e9eedfa39e8e9a2b97ae48c773b5031d5dcffa4df98f8aa3f236f
-  data.tar.gz: f966e9b52d9ac7f7021ff6f51f0a051397f3dc07dffd641c7cd75949c8d198a0
+  metadata.gz: 1be4c79ea65550474a25d90dfe6350776ee4729e1606fc4a33f9b2d510c00f6e
+  data.tar.gz: 2455fe21d800515773fc24a930e2ef78d79ce05ebda5e579ca900b7c6ab9e8c6
 SHA512:
-  metadata.gz: b0d877134bf17b9b0653104475e5af6471850f805eaf5822e703ec17dc544fabf939dfdb3c74044969ebb1de635283d8872ee24fb324670bba5411480b0a605a
-  data.tar.gz: 61af835abe1cde9a9edeab6565a6f61f6df641e2f6a3df8f4fedf869d252a7382ce6c8488bff4c080319a7eaa30c6ac40a3917f4e00bc3c77530b4920e8d11a3
+  metadata.gz: 5dec9355d0371042c062dd6b90ae6306196965ef7c41ed59e672dddd38f658b2428e230f1c3e6ed82b4cb1e82657f48b7372b1b05c7d7062ccbc07cac903c711
+  data.tar.gz: 135d91aed0d9fdfe6e7aaa61d98a8cc2773516a6649eca3a65ee5fe2b49b563879276143ee49f4228605fc7caea8bc9cb1ef5a25fed54624dad73c9ef7006aad

data/pg_associable/app/helpers/pg_associable/form_builder_methods.rb

@@ -9,6 +9,12 @@ module PgAssociable
     MAXIMO_PARA_SELECT = 10
     # TODO: si está entre 10 y 50, habilitar un buscador por js
 
+    def pg_associable_pro(atributo, options = {})
+      return input(atributo, options) if options[:disabled]
+
+      select_pro(atributo, options, nil)
+    end
+
     def pg_associable(atributo, options = {})
       return input(atributo, options) if options[:disabled]
 
@@ -50,6 +56,9 @@ module PgAssociable
 
     def clase_asociacion(atributo)
       asociacion = object.class.reflect_on_all_associations.find { |a| a.name == atributo.to_sym }
+
+      raise PgEngine::Error, "no existe la asociación para el atributo: #{atributo}" if asociacion.blank?
+
       nombre_clase = asociacion.options[:class_name]
       nombre_clase = asociacion.name.to_s.camelize if nombre_clase.nil?
       Object.const_get(nombre_clase)

data/pg_associable/app/helpers/pg_associable/helpers.rb

@@ -13,10 +13,11 @@ module PgAssociable
     def pg_respond_buscar
       partial = 'pg_associable/resultados_inline'
       resultados_prefix = 'resultados-inline'
-      @collection = policy_scope(@clase_modelo).kept.query(params[:query]).limit(MAX_RESULTS)
+      query = params[:query]
+      @collection = policy_scope(@clase_modelo).kept.query(query).limit(MAX_RESULTS)
       render turbo_stream:
         turbo_stream.update("#{resultados_prefix}-#{params[:id]}",
-                            partial:, locals: { collection: @collection })
+                            partial:, locals: { collection: @collection, query: })
     end
   end
 end

data/pg_associable/app/inputs/pg_associable_input.rb

@@ -15,8 +15,8 @@ class PgAssociableInput < SimpleForm::Inputs::StringInput
 
   def input(wrapper_options = nil)
     atributo = attribute_name.to_s.gsub('_id', '')
-    url_modal = namespaced_path(clase_asociacion(atributo), prefix: :abrir_modal)
-    url_search = namespaced_path(clase_asociacion(atributo), prefix: :buscar)
+    url_modal = options[:modal_url] || namespaced_path(clase_asociacion(atributo), prefix: :abrir_modal)
+    url_search = options[:buscar_url] || namespaced_path(clase_asociacion(atributo), prefix: :buscar)
 
     input_html_options[:data] = { url_search:, url_modal: }
     input_html_options[:type] = 'text'

data/pg_associable/app/javascript/asociable_controller.tsx

@@ -9,6 +9,7 @@ export default class extends Controller {
   subWrapper = null
   elemId = null
   input = null
+  originalPlaceholder = null
 
   connect () {
     // ID único para identificar el campo y el modal
@@ -29,9 +30,21 @@ export default class extends Controller {
     result.appendChild(this.subWrapper)
     this.input.parentNode.appendChild(result)
 
+    const callback = (mutationList) => {
+      for (const mutation of mutationList) {
+        if (mutation.type === 'childList') {
+          this.autoScroll()
+        }
+      }
+    }
+    const observer = new MutationObserver(callback)
+    const config = { attributes: false, childList: true, subtree: true }
+    observer.observe(this.subWrapper, config)
+
     this.resetResultados()
 
     const input = this.element.querySelector('input[type=text]')
+    this.originalPlaceholder = input.placeholder
     if (input.value) {
       this.element.classList.add('filled')
       input.setAttribute('readonly', 'true')
@@ -54,54 +67,68 @@ export default class extends Controller {
     }, 200)
 
     this.input.addEventListener('blur', () => {
-      this.input.placeholder = ''
-      setTimeout(() => {
-        if (!this.element.classList.contains('filled')) {
-          this.input.value = ''
-          this.resetResultados()
-        }
-      }, 200)
+      this.input.placeholder = this.originalPlaceholder
     })
     this.input.onfocus = () => {
       this.input.select()
       if (this.input.value.length === 0) {
         this.escribiAlgo()
       }
-
-      if (!this.element.closest('.modal')) {
-        const wHeight = window.visualViewport.height
-        const scrollTop = document.scrollingElement.scrollTop
-        const viewPortBottom = scrollTop + wHeight
-        const swHeight = parseInt(this.subWrapper.style.maxHeight) + 20
-        const elementTop = this.element.getBoundingClientRect().top + scrollTop
-        const inputBottom = this.input.getBoundingClientRect().bottom + scrollTop
-        const swBottom = inputBottom + swHeight
-
-        if (swBottom > viewPortBottom) {
-          document.scrollingElement.scroll({ top: elementTop })
-        }
-      }
+      this.autoScroll()
     }
     this.input.onkeyup = (e) => {
       if (this.input.value.length === 0) {
         this.escribiAlgo()
       }
-      if (e.keyCode === 13) {
-        doSearchBounce(true)
+
+      if ([37, 38, 39, 40].includes(e.keyCode)) {
+        // Arrow keys, do nothing
       } else {
-        doSearchBounce()
+        if ([27].includes(e.keyCode)) {
+          // ESC
+          document.activeElement?.blur && document.activeElement.blur()
+        } else {
+          if (e.keyCode === 13) { // Enter
+            doSearchBounce(true)
+          } else {
+            doSearchBounce()
+          }
+        }
       }
     }
     this.input.onkeydown = (e) => {
-      if (e.keyCode === 13) {
+      console.log(e.keyCode)
+      if (e.keyCode === 13) { // Enter
         e.preventDefault()
         return false
       }
+      if (this.element.classList.contains('filled')) {
+        if (e.keyCode === 8 || e.keyCode === 46) { // Supr or Backspace
+          this.completarCampo(null)
+        }
+      }
     }
     this.setMaxHeight()
   }
 
+  autoScroll () {
+    if (!this.element.closest('.modal')) {
+      const wHeight = window.visualViewport.height
+      const scrollTop = document.scrollingElement.scrollTop
+      const viewPortBottom = scrollTop + wHeight
+      const swHeight = parseInt(this.subWrapper.getBoundingClientRect().height) + 20
+      const inputBottom = this.input.getBoundingClientRect().bottom + scrollTop
+      const swBottom = inputBottom + swHeight
+
+      if (swBottom > viewPortBottom) {
+        const offset = swBottom - viewPortBottom
+        document.scrollingElement.scroll({ top: scrollTop + offset })
+      }
+    }
+  }
+
   resetResultados () {
+    this.lastValue = null
     const rows = []
     if (this.element.dataset.puedeCrear) {
       rows.push(
@@ -146,6 +173,9 @@ export default class extends Controller {
       if (maxHeight < 200) {
         maxHeight = 200
       }
+      if (maxHeight > 400) {
+        maxHeight = 400
+      }
       if (bodyHeight < inputY + maxHeight) {
         document.body.style.height = `${inputY + maxHeight}px`
       }
@@ -175,7 +205,7 @@ export default class extends Controller {
   }
 
   escribiAlgo () {
-    this.input.placeholder = 'Escribí algo para buscar'
+    this.input.placeholder = this.element.dataset.placeholder || 'Escribí algo para buscar'
   }
 
   buscando () {
@@ -207,13 +237,12 @@ export default class extends Controller {
     }
     this.lastValue = this.input.value
 
-    const timerId = setTimeout(() => {
-      this.buscando()
-    }, 200)
-    document.addEventListener('turbo:before-stream-render', function () {
-      clearTimeout(timerId)
-      // TODO: testear
-    }, { once: true })
+    this.buscando()
+    // TODO: hacer bien el clearTimeout con la respuesta del server, ya sea por turbo stream o por cable ready
+    // IMPORTANTE: además, un timeout por si nunca llega la respuesta
+    // const timerId = setTimeout(() => {
+    //   this.buscando()
+    // }, 200)
     const elem = (
       <form method="post" action={this.input.dataset.urlSearch} data-turbo-stream="true">
         <input type="hidden" name="id" value={this.elemId} />

data/pg_associable/app/views/pg_associable/_resultados_inline.html.slim

@@ -1,8 +1,6 @@
+/ # locals: (collection:, query:)
 .resultados.inline tabindex="-1"
   ul.list-group.list-group-flush
-    - if params[:puede_crear].present?
-      = link_to 'Nuevo', 'javascript:void(0)',
-                class: 'list-group-item', data: { action: 'asociable#crearItem' }
     - if collection.any?
       - collection.each do |object|
         = link_to object.to_s, 'javascript:void(0)',
@@ -10,4 +8,4 @@
                   data: { action: 'asociable#selectItem',
                           id: object.id, object: object.decorate.to_json }
     - else
-      li.list-group-item No hay resultados para "#{params[:query]}"
+      li.list-group-item No hay resultados para "#{query}"

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

@@ -281,11 +281,11 @@ module PgEngine
       # TODO: restringir ciertos campos?
       unless scope.model.column_names.include?(field.to_s) ||
              scope.model.respond_to?("order_by_#{field}")
-        PgLogger.warn("No existe el campo \"#{field}\"", :warn)
+        pg_warn("No existe el campo \"#{field}\"")
         return scope
       end
       unless direction.to_sym.in? %i[asc desc]
-        PgLogger.warn("Direction not valid: \"#{direction}\"", :warn)
+        pg_warn("Direction not valid: \"#{direction}\"")
         return scope
       end
       scope = if scope.model.respond_to? "order_by_#{field}"
@@ -297,7 +297,7 @@ module PgEngine
       instance_variable_set(:@direction, direction)
       scope
     rescue ArgumentError => e
-      PgLogger.warn(e, :warn)
+      pg_warn(e)
       scope
     end
 

data/pg_engine/app/decorators/account_decorator.rb

@@ -2,7 +2,7 @@
 
 # generado con pg_rails
 
-class AccountDecorator < PgEngine::BaseDecorator
+class AccountDecorator < PgEngine::BaseRecordDecorator
   delegate_all
 
   # Define presentation-specific methods here. Helpers are accessed through

data/pg_engine/app/decorators/email_decorator.rb

@@ -2,7 +2,7 @@
 
 # generado con pg_rails
 
-class EmailDecorator < PgEngine::BaseDecorator
+class EmailDecorator < PgEngine::BaseRecordDecorator
   delegate_all
 
   # Define presentation-specific methods here. Helpers are accessed through

data/pg_engine/app/decorators/mensaje_contacto_decorator.rb

@@ -2,7 +2,7 @@
 
 # generado con pg_rails
 
-class MensajeContactoDecorator < PgEngine::BaseDecorator
+class MensajeContactoDecorator < PgEngine::BaseRecordDecorator
   delegate_all
 
   # Define presentation-specific methods here. Helpers are accessed through

data/pg_engine/app/decorators/pg_engine/base_decorator.rb

@@ -1,132 +1,13 @@
-# frozen_string_literal: true
-
 module PgEngine
-  class BaseDecorator < Draper::Decorator
-    include ActionView::Helpers
-    include PrintHelper
-    include FormHelper
-    include RouteHelper
-    include Pundit::Authorization
-
-    attr_accessor :output_buffer
-
-    delegate_all
-
-    def as_json(options = {})
-      object.as_json(options).tap { |o| o[:to_s] = to_s }
-    end
-
-    # rubocop:disable Style/MissingRespondToMissing
-    def method_missing(method_name, *args, &)
-      valor = object.attributes[method_name.to_s]
-      return super if valor.blank?
-
-      if valor.instance_of?(Date)
-        dmy(valor)
-      elsif valor.instance_of?(ActiveSupport::TimeWithZone)
-        dmy_time(valor)
-      else
-        super
-      end
-    end
-    # rubocop:enable Style/MissingRespondToMissing
-
-    def destroy_link_redirect
-      destroy_link(redirect_to: helpers.url_for(target_index))
-    end
-
-    def destroy_link(confirm_text: '¿Estás seguro?', klass: 'btn-light', redirect_to: nil)
-      return unless Pundit.policy!(Current.user, object).destroy?
-
-      helpers.content_tag :span, rel: :tooltip, title: 'Eliminar' do
-        helpers.link_to object_url + (redirect_to.present? ? "?redirect_to=#{redirect_to}" : ''),
-                        data: { 'turbo-confirm': confirm_text, 'turbo-method': :delete },
-                        class: "btn btn-sm #{klass}" do
-          helpers.content_tag :span, nil, class: clase_icono('trash-fill')
-        end
-      end
-    end
-
-    def edit_link(text: '', klass: 'btn-light')
-      return unless Pundit.policy!(Current.user, object).edit?
-
-      helpers.content_tag :span, rel: :tooltip, title: 'Editar' do
-        helpers.link_to edit_object_url, data: { turbo_frame: :main },
-                                         class: "btn btn-sm #{klass}" do
-          helpers.content_tag(:span, nil, class: clase_icono('pencil')) + text
-        end
-      end
-    end
-
-    def show_link(text: '', klass: 'btn-light')
-      return unless Pundit.policy!(Current.user, object).show?
-
-      helpers.content_tag :span, rel: :tooltip, title: 'Ver' do
-        helpers.link_to object_url, data: { turbo_frame: :main },
-                                    class: "btn btn-sm #{klass}" do
-          helpers.content_tag(:span, nil, class: clase_icono('eye-fill')) + text
-        end
+  class BaseDecorator < PgEngine::BaseRecordDecorator
+    class Deprecator
+      def deprecation_warning(_deprecated_method_name, _message, _caller_backtrace = nil)
+        Kernel.warn 'DEPRECACION WARNING: PgEngine::BaseDecorator is deprecated, mejor usá BaseRecordDecorator'
       end
     end
 
-    def export_link(url, text: '', klass: 'btn-info')
-      return unless Pundit.policy!(Current.user, object).export?
-
-      helpers.content_tag :span, rel: :tooltip, title: 'Exportar en excel' do
-        helpers.content_tag :a, target: '_blank',
-                                class: "btn btn-sm #{klass}", href: url_change_format(url, 'xlsx') do
-          "#{helpers.content_tag(:span, nil, class: clase_icono('file-earmark-excel-fill'))} #{text}".html_safe
-        end
-      end
-    end
-
-    def new_link(remote: nil, klass: 'btn-warning')
-      return unless Pundit.policy!(Current.user, object).new?
-
-      helpers.content_tag :span, rel: :tooltip, title: submit_default_value do
-        helpers.link_to(new_object_url, class: "btn btn-sm #{klass}",
-                                        remote:) do
-          helpers.content_tag(:span, nil,
-                              class: clase_icono('plus').to_s) + "<span class='d-none d-sm-inline'> #{submit_default_value}</span>".html_safe
-        end
-      end
-    end
-
-    def edit_object_url
-      helpers.url_for([:edit, target_object].flatten)
-    end
-
-    def new_object_url
-      "#{helpers.url_for(target_index)}/new"
-    end
-
-    def object_url
-      helpers.url_for(target_object)
-    end
-
-    def target_object
-      pg_namespace.present? ? [pg_namespace, object] : object
-    end
-
-    def target_index
-      pg_namespace.present? ? [pg_namespace, object.class] : object.class
-    end
-
-    # actionview-7.1.3.2/lib/action_view/helpers/form_helper.rb
-    def submit_default_value
-      key = :create
-      model = object.model_name.human
-      defaults = []
-      defaults << :"helpers.submit.#{object.model_name.i18n_key}.#{key}"
-      defaults << :"helpers.submit.#{key}"
-      defaults << "#{key.to_s.humanize} #{model}"
-      I18n.t(defaults.shift, model:, default: defaults)
-    end
-
-    private
-
-    def clase_icono(icono)
-      "bi bi-#{icono}"
+    class << self
+      deprecate :decorate, deprecator: Deprecator.new
     end
   end
 end

data/pg_engine/app/decorators/pg_engine/base_record_decorator.rb

@@ -0,0 +1,138 @@
+# frozen_string_literal: true
+
+module PgEngine
+  class BaseRecordDecorator < Draper::Decorator
+    include ActionView::Helpers
+    include PrintHelper
+    include FormHelper
+    include RouteHelper
+    include Pundit::Authorization
+
+    attr_accessor :output_buffer
+
+    delegate_all
+
+    # Polemic, draper lo implementa con el propio decorator, pero necesito
+    # que sea el ActiveRecord para que funcione el dom_id
+    def to_model
+      object
+    end
+
+    def as_json(options = {})
+      object.as_json(options).tap { |o| o[:to_s] = to_s }
+    end
+
+    # rubocop:disable Style/MissingRespondToMissing
+    def method_missing(method_name, *args, &)
+      valor = object.attributes[method_name.to_s]
+      return super if valor.blank?
+
+      if valor.instance_of?(Date)
+        dmy(valor)
+      elsif valor.instance_of?(ActiveSupport::TimeWithZone)
+        dmy_time(valor)
+      else
+        super
+      end
+    end
+    # rubocop:enable Style/MissingRespondToMissing
+
+    def destroy_link_redirect
+      destroy_link(redirect_to: helpers.url_for(target_index))
+    end
+
+    def destroy_link(confirm_text: '¿Estás seguro?', klass: 'btn-light', redirect_to: nil)
+      return unless Pundit.policy!(Current.user, object).destroy?
+
+      helpers.content_tag :span, rel: :tooltip, title: 'Eliminar' do
+        helpers.link_to object_url + (redirect_to.present? ? "?redirect_to=#{redirect_to}" : ''),
+                        data: { 'turbo-confirm': confirm_text, 'turbo-method': :delete },
+                        class: "btn btn-sm #{klass}" do
+          helpers.content_tag :span, nil, class: clase_icono('trash-fill')
+        end
+      end
+    end
+
+    def edit_link(text: '', klass: 'btn-light')
+      return unless Pundit.policy!(Current.user, object).edit?
+
+      helpers.content_tag :span, rel: :tooltip, title: 'Editar' do
+        helpers.link_to edit_object_url, data: { turbo_frame: :main },
+                                         class: "btn btn-sm #{klass}" do
+          helpers.content_tag(:span, nil, class: clase_icono('pencil')) + text
+        end
+      end
+    end
+
+    def show_link(text: '', klass: 'btn-light')
+      return unless Pundit.policy!(Current.user, object).show?
+
+      helpers.content_tag :span, rel: :tooltip, title: 'Ver' do
+        helpers.link_to object_url, data: { turbo_frame: :main },
+                                    class: "btn btn-sm #{klass}" do
+          helpers.content_tag(:span, nil, class: clase_icono('eye-fill')) + text
+        end
+      end
+    end
+
+    def export_link(url, text: '', klass: 'btn-info')
+      return unless Pundit.policy!(Current.user, object).export?
+
+      helpers.content_tag :span, rel: :tooltip, title: 'Exportar en excel' do
+        helpers.content_tag :a, target: '_blank',
+                                class: "btn btn-sm #{klass}", href: url_change_format(url, 'xlsx') do
+          "#{helpers.content_tag(:span, nil, class: clase_icono('file-earmark-excel-fill'))} #{text}".html_safe
+        end
+      end
+    end
+
+    def new_link(remote: nil, klass: 'btn-warning')
+      return unless Pundit.policy!(Current.user, object).new?
+
+      helpers.content_tag :span, rel: :tooltip, title: submit_default_value do
+        helpers.link_to(new_object_url, class: "btn btn-sm #{klass}",
+                                        remote:) do
+          helpers.content_tag(:span, nil,
+                              class: clase_icono('plus').to_s) + "<span class='d-none d-sm-inline'> #{submit_default_value}</span>".html_safe
+        end
+      end
+    end
+
+    def edit_object_url
+      helpers.url_for([:edit, target_object].flatten)
+    end
+
+    def new_object_url
+      "#{helpers.url_for(target_index)}/new"
+    end
+
+    def object_url
+      helpers.url_for(target_object)
+    end
+
+    def target_object
+      pg_namespace.present? ? [pg_namespace, object] : object
+    end
+
+    def target_index
+      pg_namespace.present? ? [pg_namespace, object.class] : object.class
+    end
+
+    # actionview-7.1.3.2/lib/action_view/helpers/form_helper.rb
+    def submit_default_value
+      key = :create
+      model = object.model_name.human
+      defaults = []
+      defaults << :"helpers.submit.#{object.model_name.i18n_key}.#{key}"
+      defaults << :"helpers.submit.#{key}"
+      defaults << "#{key.to_s.humanize} #{model}"
+      I18n.t(defaults.shift, model:, default: defaults)
+    end
+
+    private
+
+    def clase_icono(icono)
+      "bi bi-#{icono}"
+    end
+  end
+end

data/pg_engine/app/decorators/user_account_decorator.rb

@@ -2,7 +2,7 @@
 
 # generado con pg_rails
 
-class UserAccountDecorator < PgEngine::BaseDecorator
+class UserAccountDecorator < PgEngine::BaseRecordDecorator
   delegate_all
 
   def profiles

data/pg_engine/app/decorators/user_decorator.rb

@@ -2,7 +2,7 @@
 
 # generado con pg_rails
 
-class UserDecorator < PgEngine::BaseDecorator
+class UserDecorator < PgEngine::BaseRecordDecorator
   delegate_all
 
   def default_module

data/pg_engine/app/helpers/pg_engine/form_helper.rb

@@ -4,11 +4,11 @@ module PgEngine
   module FormHelper
     def pg_form_for(object, *args, &)
       resource = object
-      if object.is_a? PgEngine::BaseDecorator
+      if object.is_a? PgEngine::BaseRecordDecorator
         object = object.target_object
       elsif object.is_a?(PgEngine::BaseRecord) &&
             object.decorator_class.present? &&
-            object.decorator_class < PgEngine::BaseDecorator
+            object.decorator_class <= PgEngine::BaseRecordDecorator
         object = object.decorate.target_object
       end
       # byebug

data/pg_engine/app/lib/pg_engine/devise_failure_app.rb

@@ -21,6 +21,7 @@ module PgEngine
     def render_unconfirmed
       self.content_type = 'text/vnd.turbo-stream.html'
       self.status = 200
+      # TODO: poner data-turbo-temporary?
       self.response_body = <<~HTML
         <turbo-stream action="update" target="flash">
           <template>

data/pg_engine/app/lib/pg_form_builder.rb

@@ -27,6 +27,7 @@ class PgFormBuilder < SimpleForm::FormBuilder
   end
 
   def mensajes_de_error
+    # TODO: poner data-turbo-temporary?
     title = error_notification(message: mensaje, class: 'text-danger mb-2 error-title') if mensaje
 
     base_errors = object.errors[:base]

data/pg_engine/db/migrate/20240517174821_pg_trgm.rb

@@ -0,0 +1,5 @@
+class PgTrgm < ActiveRecord::Migration[7.1]
+  def change
+    enable_extension "pg_trgm"
+  end
+end

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

@@ -4,78 +4,89 @@ require 'rainbow'
 
 # TODO: poder pasar blocks
 
-def pg_err(obj)
-  PgEngine::PgLogger.error(obj)
+def pg_err(*args)
+  pg_log(:error, *args)
 end
 
-def pg_warn(obj, type = :error)
-  PgEngine::PgLogger.warn(obj, type)
+def pg_warn(*args)
+  pg_log(:warn, *args)
 end
 
-def pg_log(obj, type = :debug)
-  PgEngine::PgLogger.warn("#{obj.inspect} (#{obj.class})", type)
+def pg_info(*args)
+  pg_log(:info, *args)
+end
+
+def pg_debug(*args)
+  pg_log(:debug, *args)
+end
+
+def pg_log(*args)
+  PgEngine::PgLogger.log(*args)
 end
 
 module PgEngine
   class PgLogger
-    # Generalmente en test queremos que se lancen los errores, salvo
-    # cuando estamos testeando casos de error puntuales.
-    @raise_errors = Rails.env.test?
-
     class << self
-      attr_accessor :raise_errors
+      def log(type, *args)
+        notify_all(build_msg(*args), type)
+      end
 
-      def error(obj)
-        raise obj if raise_errors
+      private
 
-        mensaje = if obj.is_a?(Exception) && obj.backtrace.present?
-                    "#{obj.inspect}\nBacktrace:\n#{cleaner.clean(obj.backtrace).join("\n")}"
-                  else
-                    obj
-                  end
-        notify(mensaje, :error)
-      rescue StandardError => e
-        Rails.logger.error("ERROR al loguear error: #{e}")
+      def notify_all(mensaje, type)
+        send_to_logger(mensaje, type)
+        send_to_rollbar(mensaje, type)
+        send_to_stdout(mensaje, type) if ENV.fetch('LOG_TO_STDOUT', nil)
+        nil
       end
 
-      def warn(obj, type = :error)
-        mensaje = if obj.is_a?(Exception) && obj.backtrace.present?
-                    "#{obj.inspect}\nBacktrace:\n#{cleaner.clean(obj.backtrace).join("\n")}"
-                  else
-                    obj
-                  end
-        notify(mensaje, type)
-      rescue StandardError => e
-        Rails.logger.error("ERROR al loguear error: #{e}")
-      end
+      # Senders
 
-      private
+      def send_to_stdout(mensaje, type)
+        puts rainbow_wrap(mensaje, type)
+      end
 
-      # TODO: loguear time
-      def notify(mensaje, type)
-        Rails.logger.send(type, titulo(mensaje, type))
-        Rails.logger.send(type, detalles(type))
-        Rollbar.send(type, "#{mensaje}\n\n#{bktrc.join("\n")}")
-        nil
+      def send_to_rollbar(mensaje, type)
+        Rollbar.send(type, mensaje)
+        # Rollbar.send(type, "#{mensaje}\n\n#{bktrc.join("\n")}")
+      rescue StandardError => e
+        send_to_logger("Error notifying Rollbar #{e}", :error)
       end
 
-      def titulo(mensaje, type)
-        Rainbow("#{type.to_s.upcase}: #{mensaje}").bold.send(color_for(type))
+      def send_to_logger(mensaje, type)
+        Rails.logger.send(type, rainbow_wrap(mensaje, type))
       end
 
-      def detalles(type)
-        Rainbow("  called in #{bktrc[0]}").send(color_for(type))
+      # Format
+
+      # TODO: loguear time
+      def build_msg(*args)
+        first = args.first
+        if first.is_a?(Exception) && first.backtrace.present?
+          <<~STR
+            #{titulo(*args)}
+            Exception Backtrace:
+              #{cleaner.clean(first.backtrace).join("\n")}
+            Caller Backtrace:
+              #{cleaner.clean(caller).join("\n")}
+          STR
+        else
+          <<~STR
+            #{titulo(*args)}
+            Caller Backtrace:
+              #{cleaner.clean(caller).join("\n")}
+          STR
+        end
+      rescue StandardError
+        send_to_logger('ERROR: PgLogger error building msg', :error)
       end
 
-      def cleaner
-        bc = ActiveSupport::BacktraceCleaner.new
-        bc.add_filter   { |line| line.gsub(%r{.*pg_rails/}, '') }
-        bc.add_silencer { |line| /pg_logger/.match?(line) }
-        bc
+      def titulo(*args)
+        args.map { |obj| "#{obj.inspect} (#{obj.class})" }.join("\n")
       end
 
-      def bktrc
-        cleaner.clean(caller)
+      def rainbow_wrap(mensaje, type)
+        Rainbow(mensaje).bold.send(color_for(type))
       end
 
       def color_for(type)
@@ -90,15 +101,15 @@ module PgEngine
           :red
         end
       end
+
+      # Backtrace helpers
+
+      def cleaner
+        bc = ActiveSupport::BacktraceCleaner.new
+        bc.add_filter   { |line| line.gsub(%r{.*pg_rails/}, '') }
+        bc.add_silencer { |line| /pg_logger/.match?(line) }
+        bc
+      end
     end
   end
 end
-
-# DEPRECATED
-# Muestro el caller[1] para saber dónde se llamó a la función deprecada
-# def deprecated(mensaje)
-#   titulo = Rainbow("  WARNING en #{caller[1]}").yellow.bold
-#   detalles = Rainbow("  #{mensaje}").yellow
-#   Rails.logger.warn("#{titulo}\n#{detalles}")
-#   Rollbar.warning("#{mensaje}\n\n#{caller.join("\n")}")
-# end

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

@@ -39,12 +39,6 @@ describe DummyBaseController do
       get :test_internal_error
     end
 
-    around do |example|
-      PgEngine::PgLogger.raise_errors = false
-      example.run
-      PgEngine::PgLogger.raise_errors = true
-    end
-
     it do
       subject
       expect(response).to have_http_status(:internal_server_error)

data/pg_engine/spec/lib/pg_engine/utils/pg_engine/pg_logger_spec.rb

@@ -3,108 +3,54 @@ require 'rails_helper'
 TYPES = %i[error warn info debug].freeze
 
 describe PgEngine::PgLogger do
-  describe '#pg_err' do
-    before do
-      TYPES.each do |type|
-        allow(Rails.logger).to receive(type)
-        allow(Rollbar).to receive(type)
-      end
-    end
-
-    around do |example|
-      described_class.raise_errors = false
-      example.run
-      described_class.raise_errors = true
-    end
-
-    shared_examples 'logger' do |type|
-      it do
-        expect(Rails.logger).to have_received(type).twice
-      end
-
-      it do
-        expect(Rollbar).to have_received(type).once
-      end
-    end
-
-    context 'con string' do
-      before { pg_err('bla') }
-
-      it_behaves_like 'logger', :error
-    end
-
-    context 'con exception' do
-      before do
-        raise StandardError, 'bla'
-      rescue StandardError => e
-        pg_err(e)
-      end
-
-      it_behaves_like 'logger', :error
+  before do
+    TYPES.each do |type|
+      allow(Rails.logger).to receive(type)
+      allow(Rollbar).to receive(type)
     end
   end
 
-  describe '#pg_warn' do
-    before do
-      TYPES.each do |type|
-        allow(Rails.logger).to receive(type)
-        allow(Rollbar).to receive(type)
-      end
+  shared_examples 'logger' do |type|
+    it do
+      expect(Rails.logger).to have_received(type).once
     end
 
-    shared_examples 'logger' do |type|
-      it do
-        expect(Rails.logger).to have_received(type).twice
-      end
-
-      it do
-        expect(Rollbar).to have_received(type).once
-      end
+    it do
+      expect(Rollbar).to have_received(type).once
     end
+  end
 
+  describe '#pg_log' do
     TYPES.each do |type|
       context "con type #{type}" do
-        before { pg_warn('bla', type) }
+        before { pg_log(type, 'bla') }
 
         it_behaves_like 'logger', type
       end
     end
+  end
 
-    context 'con exception' do
-      before do
-        raise StandardError, 'bla'
-      rescue StandardError => e
-        pg_warn(e)
-      end
+  describe '#pg_err' do
+    before { pg_err('bla') }
 
-      it_behaves_like 'logger', :error
-    end
+    it_behaves_like 'logger', :error
   end
 
-  describe '#pg_log' do
-    before do
-      TYPES.each do |type|
-        allow(Rails.logger).to receive(type)
-        allow(Rollbar).to receive(type)
-      end
-    end
+  describe '#pg_debug' do
+    before { pg_debug('bla') }
 
-    shared_examples 'logger' do |type|
-      it do
-        expect(Rails.logger).to have_received(type).twice
-      end
+    it_behaves_like 'logger', :debug
+  end
 
-      it do
-        expect(Rollbar).to have_received(type).once
-      end
-    end
+  describe '#pg_warn' do
+    before { pg_warn('bla') }
 
-    TYPES.each do |type|
-      context "con type #{type}" do
-        before { pg_log('bla', type) }
+    it_behaves_like 'logger', :warn
+  end
 
-        it_behaves_like 'logger', type
-      end
-    end
+  describe '#pg_info' do
+    before { pg_info('bla') }
+
+    it_behaves_like 'logger', :info
   end
 end

data/pg_rails/lib/version.rb

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

data/pg_scaffold/lib/generators/pg_decorator/pg_decorator_generator.rb

@@ -26,6 +26,6 @@ class PgDecoratorGenerator < Rails::Generators::DecoratorGenerator
   end
 
   def parent_class_name
-    'PgEngine::BaseDecorator'
+    'PgEngine::BaseRecordDecorator'
   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.72
+  version: 7.0.8.pre.alpha.74
 platform: ruby
 authors:
 - Martín Rosso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-15 00:00:00.000000000 Z
+date: 2024-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -514,6 +514,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.14
+- !ruby/object:Gem::Dependency
+  name: pg_search
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.3.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.3.6
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
@@ -927,6 +941,7 @@ files:
 - pg_engine/app/decorators/email_decorator.rb
 - pg_engine/app/decorators/mensaje_contacto_decorator.rb
 - pg_engine/app/decorators/pg_engine/base_decorator.rb
+- pg_engine/app/decorators/pg_engine/base_record_decorator.rb
 - pg_engine/app/decorators/user_account_decorator.rb
 - pg_engine/app/decorators/user_decorator.rb
 - pg_engine/app/helpers/pg_engine/flash_helper.rb
@@ -1003,6 +1018,7 @@ files:
 - pg_engine/db/migrate/20240314114503_remove_hash_ids.rb
 - pg_engine/db/migrate/20240428152916_create_mensaje_contactos.rb
 - pg_engine/db/migrate/20240506194106_create_emails.rb
+- pg_engine/db/migrate/20240517174821_pg_trgm.rb
 - pg_engine/db/seeds.rb
 - pg_engine/lib/pg_engine.rb
 - pg_engine/lib/pg_engine/configuracion.rb