pg_rails 7.6.15 → 7.6.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3db6eee59bbd35a8a834cb9d09b7a6a1d04fe49026661b4dba7d66dd02580484
-  data.tar.gz: e4aca63a466bba3b75d01db82a4146b79d7f25de228afcede2568c072edd3808
+  metadata.gz: a05ebc7aa2578ab2c32a72e68dc56b958aa0787216c6703764af4d906eba4aff
+  data.tar.gz: 43e3d8a43d5d4b6b490de9aec4f1b122051905c81c40f699868e2015b2db314f
 SHA512:
-  metadata.gz: a8b824b4d410a79f47b13696748dcbcfc051a762a6b9e2a0a400f33d58f1ed6db699e4bbcb6c77c1920f5f5601c0e81caa4c161487e6dc274388ba154af5a22c
-  data.tar.gz: a7f81b4a9bdc9e86ee4595b5d64af8f11992f09e089c14f0e9468a41cd982b6f5106b382c05051986689504bc8156ab46f7cee9ce5397972f74ed14c5a83d39c
+  metadata.gz: 2c9d7e326b078d50d6b5e7b8ac04f8aecfbe6217d6eb5d6984139cf1a9a9ab4f8f06e423e2b2babbfbd51266100bdd6191960a79d4b7a9a2c351f8647d3493a4
+  data.tar.gz: dea6b0686fe63c661a129b17a880d4158fec6fcc0430e96aaaace4444fddffd84818dabd164dee2523906824babded554cb0a10c49ed419da73b8d2c4a44baff

data/pg_engine/app/controllers/admin/simple_user_notifiers_controller.rb

@@ -0,0 +1,76 @@
+module Admin
+  class SimpleUserNotifiersController < AdminController
+    include PgEngine::Resource
+
+    self.clase_modelo = SimpleUserNotifier
+
+    before_action :set_instancia_modelo, only: %i[new create show edit update destroy]
+
+    def column_options_for(object, attribute)
+      case attribute
+      when :message
+        { class: 'column-truncate-30', title: object.send(attribute).to_s }
+      else
+        super
+      end
+    end
+
+    # rubocop:disable Metrics/MethodLength
+    def create
+      @simple_user_notifier = SimpleUserNotifier.new(modelo_params)
+      # @simple_user_notifier.message.save!
+      unless @simple_user_notifier.valid?
+        render :new, status: :unprocessable_entity
+        return
+      end
+      json_params_for_event = {
+        message: @simple_user_notifier.message,
+        tooltip: @simple_user_notifier.tooltip
+      }
+      notifier = SimpleUserNotifier.with(json_params_for_event)
+
+      case @simple_user_notifier.target
+      when 'todos'
+        notifier.deliver(User.all)
+      when 'devs'
+        notifier.deliver(User.where(developer: true))
+      when 'user_ids'
+        notifier.deliver(User.where(email: @simple_user_notifier.user_ids.split(',')))
+      else
+        # :nocov:
+        'shouldnt happen'
+        # :nocov:
+      end
+
+      redirect_to admin_simple_user_notifiers_path
+    rescue StandardError => e
+      # :nocov:
+      flash.now[:alert] = e.to_s
+      # @simple_user_notifier = @simple_user_notifier.decorate
+      render :new, status: :unprocessable_entity
+      # :nocov:
+    end
+    # rubocop:enable Metrics/MethodLength
+
+    private
+
+    def atributos_permitidos
+      %i[
+        type message tooltip record_type record_id target subject
+        user_ids message_text
+      ]
+    end
+
+    def atributos_para_buscar
+      %i[]
+    end
+
+    def atributos_para_listar
+      %i[message tooltip created_at notifications_count]
+    end
+
+    def atributos_para_mostrar
+      %i[tooltip]
+    end
+  end
+end

data/pg_engine/app/models/concerns/pg_engine/naming.rb

@@ -0,0 +1,50 @@
+module PgEngine
+  module Naming
+    def gender
+      self.class.model_name.human.downcase.ends_with?('a') ? 'f' : 'm'
+    end
+
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+
+    module ClassMethods
+      # This is a per class variable, all subclasses of BaseRecord inherit it
+      # BUT **the values are independent between all of them**
+      attr_accessor :default_modal, :inline_editable_fields
+
+      def inline_editable?(attribute)
+        inline_editable_fields.present? && inline_editable_fields.include?(attribute.to_sym)
+      end
+
+      def ransackable_associations(_auth_object = nil)
+        authorizable_ransackable_associations
+      end
+
+      def ransackable_attributes(_auth_object = nil)
+        authorizable_ransackable_attributes
+      end
+
+      def nombre_plural
+        model_name.human(count: 2)
+      end
+
+      def nombre_singular
+        model_name.human(count: 1)
+      end
+
+      def human_attribute_name(attribute, options = {})
+        # Remove suffixes
+        if attribute.to_s.ends_with?('_text')
+          # Si es un enumerized
+          super(attribute[0..-6], options)
+        elsif attribute.to_s.ends_with?('_f')
+          # Si es un decorated method
+          super(attribute[0..-3], options)
+        else
+          super
+        end
+      end
+    end
+  end
+end

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

@@ -7,58 +7,17 @@ module PgEngine
     extend Enumerize
     include PrintHelper
     include PostgresHelper
+    include Naming
 
     self.abstract_class = true
 
     before_create :setear_creado_y_actualizado_por
     before_update :setear_actualizado_por
 
-    class << self
-      # This is a per class variable, all subclasses of BaseRecord inherit it
-      # BUT **the values are independent between all of them**
-      attr_accessor :default_modal, :inline_editable_fields
-
-      def inline_editable?(attribute)
-        inline_editable_fields.present? && inline_editable_fields.include?(attribute.to_sym)
-      end
-    end
-
     # ransacker :search do |parent|
     #   parent.table[:nombre]
     # end
 
-    def self.ransackable_associations(_auth_object = nil)
-      authorizable_ransackable_associations
-    end
-
-    def self.ransackable_attributes(_auth_object = nil)
-      authorizable_ransackable_attributes
-    end
-
-    def gender
-      self.class.model_name.human.downcase.ends_with?('a') ? 'f' : 'm'
-    end
-
-    def self.nombre_plural
-      model_name.human(count: 2)
-    end
-
-    def self.nombre_singular
-      model_name.human(count: 1)
-    end
-
-    def self.human_attribute_name(attribute, options = {})
-      if attribute.to_s.ends_with?('_text')
-        # Si es un enumerized
-        super(attribute[0..-6], options)
-      elsif attribute.to_s.ends_with?('_f')
-        # Si es un decorated method
-        super(attribute[0..-3], options)
-      else
-        super
-      end
-    end
-
     def actions_component
       ActionsComponent.new(self)
     end

data/pg_engine/app/notifiers/simple_user_notifier.rb

@@ -29,4 +29,25 @@ class SimpleUserNotifier < ApplicationNotifier
   # Add required params
   #
   required_param :message
+
+  attr_accessor :target, :user_ids
+
+  enumerize :target, in: { todos: 0, devs: 1, user_ids: 2 }
+
+  %i[message message_text tooltip subject].each do |field|
+    define_method :"#{field}" do
+      params[field]
+    end
+    define_method :"#{field}=" do |value|
+      params[field] = value
+    end
+  end
+
+  def self.policy_class
+    ApplicationPolicy
+  end
+
+  def self.decorator_class
+    PgEngine::BaseRecordDecorator
+  end
 end

data/pg_engine/app/views/admin/simple_user_notifiers/_form.html.slim

@@ -0,0 +1,14 @@
+= pg_form_for @simple_user_notifier.decorate do |f|
+  - if params[:plain_text]
+    = link_to 'Change to rich text', url_for
+    = f.input :message, as: :text
+  - else
+    = link_to 'Change to plain text', url_for(plain_text: true)
+    = f.rich_text_area :message
+  = f.input :tooltip
+  / = f.input :record_type
+  / = f.input :record_id
+  - unless @simple_user_notifier.persisted?
+    = f.input :target
+    = f.input :user_ids, label: 'User emails'
+  = f.submit

data/pg_engine/app/views/admin/simple_user_notifiers/show.html.slim

@@ -0,0 +1,29 @@
+- content_for :actions do
+  = @simple_user_notifier.destroy_link_redirect
+  .ms-1
+  = @simple_user_notifier.edit_link
+
+table.table.table-borderless.table-sm.w-auto.mb-0.m-3
+  - atributos_para_mostrar.each do |att|
+    tr
+      th = @clase_modelo.human_attribute_name(att)
+      td = render InlineShowComponent.new(@simple_user_notifier.object, att)
+  tr
+    th = t('attributes.created_at')
+    td = @simple_user_notifier.created_at
+  tr
+    th = t('attributes.updated_at')
+    td = @simple_user_notifier.updated_at
+
+.bg-secondary-subtle.p-4.mt-3.trix-content
+  = @simple_user_notifier.message.html_safe
+
+div style="max-width: 30em"
+  table.table.table-sm
+    tr
+      th Destinatario
+      th Visto
+    - @simple_user_notifier.notifications.order('seen_at desc nulls last').each do |notification|
+      tr
+        td = notification.recipient
+        td = dmy_time notification.seen_at

data/pg_engine/config/routes.rb

@@ -42,7 +42,7 @@ Rails.application.routes.draw do
 
   namespace :admin, path: 'a' do
     pg_resource(:emails)
-    pg_resource(:eventos)
+    pg_resource(:simple_user_notifiers)
     pg_resource(:email_logs) do
       collection do
         post :mailgun_sync

data/pg_engine/lib/pg_engine/engine.rb

@@ -27,6 +27,10 @@ module PgEngine
           ActsAsTenant.without_tenant(&)
         end
       end
+      Noticed::ApplicationRecord.class_eval do
+        extend Enumerize
+        include PgEngine::Naming
+      end
     end
 
     initializer 'pg_engine.set_exceptions_app' do

data/pg_engine/lib/pg_engine/navigator.rb

@@ -39,7 +39,7 @@ module PgEngine
 
       navbar.add_item('sidebar.signed_in', {
                         name: 'Eventos',
-                        path: 'admin_eventos_path'
+                        path: 'admin_simple_user_notifiers_path'
                       })
       navbar.add_item('sidebar.signed_in', {
                         name: 'Emails',

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

@@ -12,4 +12,16 @@ describe PgEngine::BaseRecord do
       expect(obj).to eq described_class.human_attribute_name('bla')
     end
   end
+
+  describe '#default_modal' do
+    it 'the values are independent from each class' do
+      model_class = Class.new(described_class)
+      another_model_class = Class.new(described_class)
+      model_class.default_modal = true
+      another_model_class.default_modal = false
+      expect(model_class.default_modal).to be true
+      expect(another_model_class.default_modal).to be false
+      expect(described_class.default_modal).to be_nil
+    end
+  end
 end

data/pg_engine/spec/requests/admin/eventos_spec.rb

@@ -16,28 +16,23 @@ describe 'Eventos' do
   end
 
   it 'renders the event index' do
-    get '/a/eventos'
+    get '/a/simple_user_notifiers'
 
-    expect(response.body).to include 'New post'
+    expect(response.body).to include 'Crear simple user notifier'
   end
 
   describe 'posting events' do
     subject do
-      get '/a/eventos/new'
+      get '/a/simple_user_notifiers/new'
       expect(response.body).to include 'Tooltip'
-      post '/a/eventos', params: {
-        evento: {
-          type:,
+      post '/a/simple_user_notifiers', params: {
+        simple_user_notifier: {
           message: 'hola',
-          message_text:,
-          subject: asunto,
           user_ids:,
-          record_type: 'User',
-          record_id:,
           target:
         }
       }
-      get "/a/eventos/new?event_id=#{Noticed::Event.last.id}"
+      # get "/a/eventos/new?event_id=#{Noticed::Event.last.id}"
     end
 
     let(:record_id) { nil }
@@ -83,10 +78,9 @@ describe 'Eventos' do
 
     context 'cuando hay error' do
       subject do
-        post '/a/eventos', params: {
-          evento: {
-            type:,
-            message: 'hola',
+        post '/a/simple_user_notifiers', params: {
+          simple_user_notifier: {
+            message: nil,
             target:
           }
         }

data/pg_rails/lib/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PgRails
-  VERSION = '7.6.15'
+  VERSION = '7.6.17'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.6.15
+  version: 7.6.17
 platform: ruby
 authors:
 - Martín Rosso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-10-11 00:00:00.000000000 Z
+date: 2024-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -693,7 +693,7 @@ files:
 - pg_engine/app/controllers/admin/accounts_controller.rb
 - pg_engine/app/controllers/admin/email_logs_controller.rb
 - pg_engine/app/controllers/admin/emails_controller.rb
-- pg_engine/app/controllers/admin/eventos_controller.rb
+- pg_engine/app/controllers/admin/simple_user_notifiers_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/require_tenant_set.rb
@@ -743,10 +743,10 @@ files:
 - pg_engine/app/mailers/pg_engine/base_mailer.rb
 - pg_engine/app/mailers/pg_engine/user_mailer.rb
 - pg_engine/app/models/account.rb
+- pg_engine/app/models/concerns/pg_engine/naming.rb
 - pg_engine/app/models/current.rb
 - pg_engine/app/models/email.rb
 - pg_engine/app/models/email_log.rb
-- pg_engine/app/models/evento.rb
 - pg_engine/app/models/mensaje_contacto.rb
 - pg_engine/app/models/pg_engine/base_record.rb
 - pg_engine/app/models/user.rb
@@ -776,8 +776,8 @@ files:
 - pg_engine/app/views/admin/emails/_form.html.slim
 - pg_engine/app/views/admin/emails/_send.html.slim
 - pg_engine/app/views/admin/emails/show.html.slim
-- pg_engine/app/views/admin/eventos/index.html.slim
-- pg_engine/app/views/admin/eventos/new.html.slim
+- pg_engine/app/views/admin/simple_user_notifiers/_form.html.slim
+- pg_engine/app/views/admin/simple_user_notifiers/show.html.slim
 - pg_engine/app/views/admin/user_accounts/_form.html.slim
 - pg_engine/app/views/admin/user_accounts/_user_account.html.slim
 - pg_engine/app/views/admin/user_accounts/edit.html.slim

data/pg_engine/app/controllers/admin/eventos_controller.rb

@@ -1,83 +0,0 @@
-module Admin
-  class EventosController < AdminController
-    layout 'pg_layout/containerized'
-
-    add_breadcrumb 'Eventos'
-
-    before_action do
-      @notifier_types = %w[
-        EmailUserNotifier
-        SimpleUserNotifier
-      ]
-    end
-
-    def index
-      @events = Noticed::Event.order(id: :desc)
-    end
-
-    # rubocop:disable Metrics/AbcSize
-    def new
-      @event = Evento.new(type: 'SimpleUserNotifier')
-      return if params[:event_id].blank?
-
-      reference = Noticed::Event.find(params[:event_id])
-      @event.type = reference.type
-      @event.message = reference.params[:message]
-      @event.message_text = reference.params[:message_text]
-      @event.tooltip = reference.params[:tooltip]
-      @event.subject = reference.params[:subject]
-      @event.record_type = reference.record_type
-      @event.record_id = reference.record_id
-    end
-    # rubocop:enable Metrics/AbcSize
-
-    # rubocop:disable Metrics/MethodLength
-    def create # rubocop:disable Metrics/AbcSize
-      @event = Evento.new(event_params)
-      # @event.message.save!
-      unless @event.valid?
-        render :new, status: :unprocessable_entity
-        return
-      end
-      json_params_for_event = {
-        record: @event.record,
-        message: @event.message,
-        message_text: @event.message_text,
-        tooltip: @event.tooltip,
-        subject: @event.subject
-      }
-      notifier_class = @event.type.constantize
-      notifier = notifier_class.with(json_params_for_event)
-
-      case @event.target
-      when 'todos'
-        notifier.deliver(User.all)
-      when 'devs'
-        notifier.deliver(User.where(developer: true))
-      when 'user_ids'
-        notifier.deliver(User.where(email: @event.user_ids.split(',')))
-      else
-        # :nocov:
-        'shouldnt happen'
-        # :nocov:
-      end
-
-      redirect_to admin_eventos_path
-    rescue StandardError => e
-      # :nocov:
-      flash.now[:alert] = e.to_s
-      render :new, status: :unprocessable_entity
-      # :nocov:
-    end
-    # rubocop:enable Metrics/MethodLength
-
-    private
-
-    def event_params
-      params.require(:evento).permit(
-        :type, :message, :tooltip, :record_type, :record_id, :target, :subject,
-        :user_ids, :message_text
-      )
-    end
-  end
-end

data/pg_engine/app/models/evento.rb

@@ -1,27 +0,0 @@
-class Evento
-  include ActiveModel::API
-  include ActionText::Attribute
-  extend Enumerize
-
-  attr_accessor :tooltip, :target, :message, :message_text, :type,
-                :record_type, :record_id,
-                :subject, :user_ids
-
-  validates :target, :type, :message, presence: true
-
-  enumerize :target, in: { todos: 0, devs: 1, user_ids: 2 }
-
-  validates :message_text, :subject, presence: true, if: lambda {
-    type == 'EmailUserNotifier'
-  }
-
-  validates :user_ids, presence: true, if: lambda {
-    target == 'user_ids'
-  }
-
-  def record
-    return if record_id.blank?
-
-    record_type.constantize.find(record_id)
-  end
-end

data/pg_engine/app/views/admin/eventos/index.html.slim

@@ -1,6 +0,0 @@
-- content_for :actions do
-  = link_to 'Nuevo', new_admin_evento_path
-h1 Eventos
-
-- @events.each do |event|
-  pre.mb-5 = JSON.pretty_generate event.as_json

data/pg_engine/app/views/admin/eventos/new.html.slim

@@ -1,16 +0,0 @@
-= pg_form_for @event, url: admin_eventos_path do |f|
-  = f.input :type, as: :select, collection: @notifier_types
-  - if params[:plain_text]
-    = link_to 'Change to rich text', url_for
-    = f.input :message, as: :text
-  - else
-    = link_to 'Change to plain text', url_for(plain_text: true)
-    = f.rich_text_area :message
-  = f.input :message_text, as: :text, hint: 'Solo para emails, para la plain/text part'
-  = f.input :tooltip
-  = f.input :subject
-  = f.input :record_type
-  = f.input :record_id
-  = f.input :target
-  = f.input :user_ids, label: 'User emails'
-  = f.submit