pg_rails 7.6.16 → 7.6.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1be39ed176491e2f5da66a9a1764f6c2f8c8509c7510999f72007cd0a1bb0f7
-  data.tar.gz: 591fe03520a040b5651b3a8153d7bdc7bc42afd6c8b6b44cfbf5a6525d883e89
+  metadata.gz: a05ebc7aa2578ab2c32a72e68dc56b958aa0787216c6703764af4d906eba4aff
+  data.tar.gz: 43e3d8a43d5d4b6b490de9aec4f1b122051905c81c40f699868e2015b2db314f
 SHA512:
-  metadata.gz: 06c346252f40b648dc108ada25a3a4ab7dda9cb8ead20964d835aa19231063b165e56c2565d7b854ca8aa073245346c7b269852e4f392ae5d1139acef3cbe629
-  data.tar.gz: 619cc8ab8f5ef3ab61f8e825b9c3ca3ba8767a77ee35ebe7e0f6dc23add99b33075d8049f89f2022d42417a94b06ec19c81fc5b36fb8271d42132183d32fce08
+  metadata.gz: 2c9d7e326b078d50d6b5e7b8ac04f8aecfbe6217d6eb5d6984139cf1a9a9ab4f8f06e423e2b2babbfbd51266100bdd6191960a79d4b7a9a2c351f8647d3493a4
+  data.tar.gz: dea6b0686fe63c661a129b17a880d4158fec6fcc0430e96aaaace4444fddffd84818dabd164dee2523906824babded554cb0a10c49ed419da73b8d2c4a44baff

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

@@ -17,25 +17,25 @@ module Admin
 
     # rubocop:disable Metrics/MethodLength
     def create
-      @event = SimpleUserNotifier.new(modelo_params)
-      # @event.message.save!
-      unless @event.valid?
+      @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: @event.message,
-        tooltip: @event.tooltip
+        message: @simple_user_notifier.message,
+        tooltip: @simple_user_notifier.tooltip
       }
       notifier = SimpleUserNotifier.with(json_params_for_event)
 
-      case @event.target
+      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: @event.user_ids.split(',')))
+        notifier.deliver(User.where(email: @simple_user_notifier.user_ids.split(',')))
       else
         # :nocov:
         'shouldnt happen'
@@ -46,6 +46,7 @@ module Admin
     rescue StandardError => e
       # :nocov:
       flash.now[:alert] = e.to_s
+      # @simple_user_notifier = @simple_user_notifier.decorate
       render :new, status: :unprocessable_entity
       # :nocov:
     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

@@ -46,4 +46,8 @@ class SimpleUserNotifier < ApplicationNotifier
   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

@@ -1,4 +1,4 @@
-= pg_form_for @simple_user_notifier do |f|
+= 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

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/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.16'
+  VERSION = '7.6.17'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.6.16
+  version: 7.6.17
 platform: ruby
 authors:
 - Martín Rosso
@@ -743,6 +743,7 @@ 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