pg_rails 7.0.8.pre.alpha.16 → 7.0.8.pre.alpha.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f27fe3f2ee02b2a1654d32f0c37ed02d2310e9d44e0d3f93fc29eeb25ee27280
-  data.tar.gz: a7635ed50ab55e3c2d9d1251e94f20b910ae2310e49ce86d55bc56b9062368ac
+  metadata.gz: fe2517c50a77409c6c90dc4378588e7b5bfc8cfa227859bdd7a163979c1b8e0d
+  data.tar.gz: dd5da55fffc24abb9bbb4942a2e6de0a7e52184cca97e54ec16500afb556f043
 SHA512:
-  metadata.gz: 951befcf7f41a83899f89cc535b833f84466bfc218b7b285a4b5c6b5ad9862de37bfb6f69c0923b10cabfd30857671ec80050307ff8ee0f7dedd1ed6d3b9ac87
-  data.tar.gz: cb09bdadffa8d09251b24b10da5da7b02610feba9fb80079a078686f2ecaeddca78262f91d5d0317c13a7a3b7fc0f2bc0b4d878a0aafa13c827ca0c0102efd66
+  metadata.gz: c3d214ad9f2a591590582d92b8c409a593ef5d5a6b0a3bc207aca5dc37944ab0be4f72ad785d119beb1c56fc954ef74c43d7da8418b06a45688330127ff4c6ff
+  data.tar.gz: be03f50c19c74783a6c2bce2d371ed9b58a41eefa87addeecfddbb79e5999906a9e6456017b1a318e8d2c4f492d1b488e9f6d9aba9215f0a3eb9b31d4c183e38

data/pg_associable/app/javascript/modal_controller.js

@@ -10,7 +10,7 @@ export default class extends Controller {
   connect (e) {
     this.modalPuntero = new bootstrap.Modal(this.element)
     this.modalPuntero.show()
-    document.addEventListener("turbo:before-cache", () => {
+    document.addEventListener('turbo:before-cache', () => {
       this.element.remove()
     }, { once: true })
   }

data/pg_associable/index.js

@@ -1,5 +1,9 @@
 import AsociableController from './app/javascript/asociable_controller'
 import ModalController from './app/javascript/modal_controller'
 
-window.Stimulus.register('asociable', AsociableController)
-window.Stimulus.register('modal', ModalController)
+if (window.Stimulus) {
+  window.Stimulus.register('asociable', AsociableController)
+  window.Stimulus.register('modal', ModalController)
+} else {
+  console.error('window.Stimulus must be set')
+}

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

@@ -31,58 +31,62 @@ module PgEngine
     end
     # rubocop:enable Style/MissingRespondToMissing
 
-    def destroy_link(message = '¿Estás seguro?')
+    def destroy_link(confirm_text: '¿Estás seguro?', klass: 'btn-light')
       return unless Pundit.policy!(helpers.send(PgEngine.configuracion.current_user_method), object).destroy?
 
       helpers.content_tag :span, rel: :tooltip, title: 'Eliminar' do
-        helpers.link_to object_url, data: { 'turbo-confirm': message, 'turbo-method': :delete },
-                                    class: "btn #{_config.clase_botones_chicos} btn-#{_config.boton_destroy}" do
-          helpers.content_tag :span, nil, class: clase_icono(_config.icono_destroy).to_s
+        helpers.link_to object_url, 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(texto = '')
+    def edit_link(text: '', klass: 'btn-light')
       return unless Pundit.policy!(helpers.send(PgEngine.configuracion.current_user_method), object).edit?
 
       helpers.content_tag :span, rel: :tooltip, title: 'Editar' do
         helpers.link_to edit_object_url, data: { turbo_frame: :main },
-                                         class: "btn #{_config.clase_botones_chicos} btn-#{_config.boton_edit}" do
-          helpers.content_tag(:span, nil, class: clase_icono(_config.icono_edit).to_s) + texto
+                                         class: "btn btn-sm #{klass}" do
+          helpers.content_tag(:span, nil, class: clase_icono('pencil')) + text
         end
       end
     end
 
-    def show_link(texto = '')
+    def show_link(text: '', klass: 'btn-light')
       return unless Pundit.policy!(helpers.send(PgEngine.configuracion.current_user_method), object).show?
 
       helpers.content_tag :span, rel: :tooltip, title: 'Ver' do
         helpers.link_to object_url, data: { turbo_frame: :main },
-                                    class: "btn #{_config.clase_botones_chicos} btn-#{_config.boton_show}" do
-          helpers.content_tag(:span, nil, class: clase_icono(_config.icono_show).to_s) + texto
+                                    class: "btn btn-sm #{klass}" do
+          helpers.content_tag(:span, nil, class: clase_icono('eye-fill')) + text
         end
       end
     end
 
-    def export_link(url, texto = '')
-      return unless Pundit.policy!(helpers.send(PgEngine.configuracion.current_user_method), object).export?
+    def export_link(url, text: '', klass: 'btn-info')
+      return unless Pundit.policy!(helpers.current_user, object).export?
 
-      helpers.content_tag :span, rel: :tooltip, title: 'Exportar' do
+      helpers.content_tag :span, rel: :tooltip, title: 'Exportar en excel' do
         helpers.content_tag :a, target: '_blank',
-                                class: "btn #{_config.clase_botones_chicos} btn-#{_config.boton_export}", href: url_change_format(url, 'xlsx') do
-          "#{helpers.content_tag(:span, nil, class: clase_icono('file-earmark-excel-fill'))} #{texto}".html_safe
+                                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(options = {})
+    def new_link(remote: nil, klass: 'btn-warning')
       return unless Pundit.policy!(helpers.send(PgEngine.configuracion.current_user_method), object).new?
 
-      helpers.content_tag :span, rel: :tooltip, title: 'Crear' do
-        helpers.link_to new_object_url, class: "btn #{_config.clase_botones_chicos} btn-primary",
-                                        remote: options[:remote] do
+      word_to_create = I18n.t("form.#{object.class.nombre_singular.downcase}.create", default: :'form.create')
+
+      full_text = "#{word_to_create} #{object.class.nombre_singular.downcase}"
+
+      helpers.content_tag :span, rel: :tooltip, title: word_to_create 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'> Crear #{object.class.nombre_singular.downcase}</span>".html_safe
+                              class: clase_icono('plus').to_s) + "<span class='d-none d-sm-inline'> #{full_text}</span>".html_safe
         end
       end
     end
@@ -109,12 +113,8 @@ module PgEngine
 
     private
 
-    def _config
-      PgEngine.configuracion
-    end
-
     def clase_icono(icono)
-      "#{_config.sistema_iconos} #{_config.sistema_iconos}-#{icono}"
+      "bi bi-#{icono}"
     end
   end
 end

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

@@ -1,14 +1,13 @@
 - content_for(:title, @clase_modelo.nombre_plural)
 - content_for :actions do
-  button.btn.btn-sm.btn-primary[type="button" data-bs-toggle="collapse"
+  button.btn.btn-sm.btn-outline-primary[type="button" data-bs-toggle="collapse"
                                 data-bs-target="#filtros" aria-expanded="false"
                                 aria-controls="filtros"]
     span.bi.bi-funnel-fill
     span.d-none.d-sm-inline  Filtrar
   .ms-1
   = @clase_modelo.new.decorate.new_link
-  .ms-1
-  = @clase_modelo.new.decorate.export_link(request.url)
+
 .collapse.border-bottom#filtros class="#{ 'show' if any_filter? }"
   .d-flex.align-items-center.p-2
     .px-2.d-none.d-sm-inline-block
@@ -33,7 +32,7 @@ div
           tr
             - atributos_para_listar.each do |att|
               th = encabezado att, ordenable: true
-            th
+            th.text-end = @clase_modelo.new.decorate.export_link(request.url)
         tbody
           - @collection.each do |object|
             - object = object.decorate

data/pg_engine/config/locales/es.yml

@@ -5,6 +5,8 @@ es:
     discarded_at: Fecha de borrado
     actualizado_por: Actualizado por
     creado_por: Creado por
+  form:
+    create: Crear
   ancestry:
     exclude_self: No puede ser hijx de si mismx
   simple_form:

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

@@ -18,20 +18,15 @@ end
 
 module PgEngine
   class PgLogger
+    # Generalmente en local queremos que se lancen los errores, salvo
+    # cuando estamos testeando casos de error puntuales.
+    @raise_errors = Rails.env.local?
+
     class << self
-      # 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
+      attr_accessor :raise_errors
 
       def error(obj)
-        # TODO: arreglar
-        # Si es dev o test lanzo el error y si no, lo logueo para que no le salte al usuario
-        # raise obj if Rails.env.local? && ENV.fetch('RAISE_ERRORS', nil).present?
+        raise obj if raise_errors
 
         mensaje = if obj.is_a?(Exception) && obj.backtrace.present?
                     "#{obj.inspect}\nBacktrace:\n#{cleaner.clean(obj.backtrace).join("\n")}"
@@ -93,3 +88,12 @@ module PgEngine
     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/lib/pg_engine/utils/pg_engine/pg_logger_spec.rb

@@ -11,6 +11,12 @@ describe PgEngine::PgLogger do
       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

data/pg_layout/app/javascript/controllers/application.js

@@ -1,4 +1,7 @@
-// TODO: si no existe la aplicacion mostrar error
+if (!window.Stimulus) {
+  console.error('window.Stimulus must be set')
+}
+
 const application = window.Stimulus
 
 export { application }

data/pg_rails/lib/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.0.8.pre.alpha.16
+  version: 7.0.8.pre.alpha.18
 platform: ruby
 authors:
 - Martín Rosso