pg_rails 7.6.35 → 7.6.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2749a5b4bfd158279a0e768b5a8e379302b2c71d0ace5e6162a2ad1eef01adc
-  data.tar.gz: 649a2ab01df77e08404832d84b17ae66fd64e383343a165e2c83d6856dd93467
+  metadata.gz: d78d6754e8cd67e2b293e26fa01585fefdefb68fd030a3ad00a420119ecdcdff
+  data.tar.gz: 62cf672c47ff40c4bb45d58880643955450d7db7069ebd4df92cffce4283bba8
 SHA512:
-  metadata.gz: 8b5a1340887f5c9be83055c40e2316741176aea1810fc28dfe77f3475cefebb557e07f6de6f2e081517fafc6d53a6f14106e9145101d8316b2b91421f114fdf3
-  data.tar.gz: 4b3974156468841816dddefa932d7f132448f3e3218e9a41f2911f646361e74bd4c7ed4a2bf6cd98e57cf6dc11f7383f2f98eec9d5107ed4dfe3213f306b1270
+  metadata.gz: 7443db791d97a49a3755d4922c855202522c4a1a980b4c66f44fa45733131827f5c88cc059a88ad2f21495d21e3f226d9fe39ad8af2d420bf2a28ee05f177924
+  data.tar.gz: 870d9f4006606617247fecd04e93a832ecd13da8d844e0f1086cc4dfdd9da735fd6508167a4e8e29f658ebb5763867a0e68c662d86a889c019f0d1f20d246851

data/pg_engine/app/assets/stylesheets/pg_engine.scss

@@ -45,6 +45,9 @@ nav[aria-label=breadcrumb] a {
 .trix-content figure a:hover {
   text-decoration: underline;
 }
+.trix-content .attachment--preview {
+  width: 100px;
+}
 
 input[disabled] {
   background-color: #e9e9ed;

data/pg_engine/app/controllers/pg_engine/require_sign_in.rb

@@ -5,7 +5,8 @@ module PgEngine
     def self.included(clazz)
       clazz.include RansackMemory::Concern
       clazz.prepend_before_action :authenticate_user!
-      clazz.before_action :save_and_load_filters
+      # dsfil: dont save filters
+      clazz.before_action :save_and_load_filters, unless: -> { params[:dsfil] == '1' }
     end
   end
 end

data/pg_engine/app/lib/pg_engine/filtros_builder.rb

@@ -51,11 +51,15 @@ module PgEngine
       @campos.each { |campo| @filtros[campo] = {} }
     end
 
-    def opciones(campo, opciones)
+    def configure(campo, config)
       # TODO: mergear
-      @filtros[campo] = opciones
+      @filtros[campo] = config
     end
 
+    # TODO: deprecar
+    alias opciones configure
+    deprecate :opciones, deprecator: PgEngine.deprecator
+
     # querys customizadas por campo
     def query(campo, &block)
       @filtros[campo] = {} if @filtros[campo].nil?
@@ -160,8 +164,8 @@ module PgEngine
       raise PgEngine::Error, 'se debe setear el form' if @form.blank?
 
       res = ''
-      @filtros.each do |campo, opciones|
-        if opciones[:oculto] ||
+      @filtros.each do |campo, config|
+        if config[:oculto] ||
            (options[:except].present? && options[:except].include?(campo.to_sym)) ||
            (options[:only].present? && options[:only].exclude?(campo.to_sym))
           next
@@ -249,10 +253,21 @@ module PgEngine
     end
 
     def filtro_select(campo, placeholder = '')
-      map = @clase_modelo.send(sin_sufijo(campo)).values.map do |key|
-        [I18n.t("#{@clase_modelo.to_s.underscore}.#{campo}.#{key}", default: key.humanize),
-         key.value]
-      end
+      config = @filtros[campo]
+
+      map = if config[:options].present?
+              if config[:options].first.is_a? Enumerize::Value
+                config[:options].map { |v| [v.text, v.value] }
+              else
+                config[:options]
+              end
+            else
+              @clase_modelo.send(sin_sufijo(campo)).values.map do |key|
+                [I18n.t("#{@clase_modelo.to_s.underscore}.#{sin_sufijo(campo)}.#{key}", default: key.text),
+                 key.value]
+              end
+            end
+
       content_tag :div, class: 'col-auto' do
         content_tag :div, class: "filter #{active_class(campo)}" do
           suf = extraer_sufijo(campo)

data/pg_engine/app/models/user.rb

@@ -146,7 +146,7 @@ class User < ApplicationRecord
   end
 
   def first_first_name
-    nombre.strip.split.first.presence || to_s
+    (nombre || '').strip.split.first.presence || to_s
   rescue StandardError => e
     # :nocov:
     pg_warn(e)

data/pg_engine/app/views/active_storage/blobs/_blob.html.erb

@@ -1,6 +1,6 @@
 <figure class="attachment attachment--<%= blob.representable? ? "preview" : "file" %> attachment--<%= blob.filename.extension %>">
   <% if blob.representable? %>
-    <%= image_tag blob.representation(resize_to_limit: local_assigns[:in_gallery] ? [ 800, 600 ] : [ 1024, 768 ]) %>
+    <%= image_tag blob.representation(resize_to_limit: local_assigns[:in_gallery] ? [ 400, 300 ] : [ 100, 75 ]) %>
   <% end %>
 
   <%= link_to rails_blob_path(blob) do %>

data/pg_engine/config/locales/es.rb

@@ -42,7 +42,7 @@ end
           back_to_index: 'Volver al listado principal',
           bulk_edit: {
             enqueue_update: "Modificación en proceso (podría demorar algunos segundos en completarse)",
-            blank_ids: PgEngine::I18nRules.rule("No hay %{genderize(ninguna,ningún)} %{singular_model} seleccionada"),
+            blank_ids: PgEngine::I18nRules.rule("No hay %{genderize(ninguna,ningún)} %{singular_model} %{genderize(seleccionada,seleccionado)}"),
             bulk_not_hash: "Debés seleccionar al menos un campo",
             title: PgEngine::I18nRules.rule("Modificación masiva de %{plural_model}"),
             link: PgEngine::I18nRules.rule("Modificar masivamente"),

data/pg_engine/config/routes.rb

@@ -4,7 +4,7 @@ Rails.application.routes.draw do
   get "pg_engine/health" => "pg_engine/health#show", as: :pg_engine_health_check
 
   get '404', to: 'application#page_not_found'
-  get '500', to: 'application#internal_error'
+  # get '500', to: 'application#handle_internal_error'
   get 'internal_error_but_with_status200', to: 'application#internal_error_but_with_status200'
 
   get 'contacto', to: 'public/mensaje_contactos#new'

data/pg_engine/spec/factories/users.rb

@@ -37,8 +37,8 @@
 
 FactoryBot.define do
   factory :user, class: 'User' do
-    nombre { '' }
-    apellido { '' }
+    nombre { nil }
+    apellido { nil }
     email { Faker::Internet.email }
     password { "password#{rand(99_999)}" }
     confirmed_at { Faker::Date.backward }

data/pg_engine/spec/models/user_spec.rb

@@ -19,4 +19,11 @@ RSpec.describe User do
       expect(results).to eq [user]
     end
   end
+
+  describe '#first_first_name' do
+    it do
+      user = create(:user, nombre: 'Juan Carlos')
+      expect(user.first_first_name).to eq 'Juan'
+    end
+  end
 end

data/pg_rails/lib/version.rb

@@ -2,6 +2,6 @@
 
 # :nocov:
 module PgRails
-  VERSION = '7.6.35'
+  VERSION = '7.6.37'
 end
 # :nocov:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.6.35
+  version: 7.6.37
 platform: ruby
 authors:
 - Martín Rosso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-03-11 00:00:00.000000000 Z
+date: 2025-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails