pg_rails 7.6.21.pre.11 → 7.6.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f442d786ae4cf36b38c87e72307bb1fe1dfd4c77fb2e697566adfb1d48bbb1b6
-  data.tar.gz: d1028638b9acd8817adbc33a0680f270c46b96c1b9f96d66d6ac964d46b96eaf
+  metadata.gz: 3b28992b6ab1d70765599e7b9cb91d80c7205e4568a8d3de1bdab30b475c6e87
+  data.tar.gz: 3bcd1df50768a9d0a97e6e33f747e2fc9981d0b8ceedba6e63270be3d9ae35eb
 SHA512:
-  metadata.gz: 184210806bdd1ed1c9c4e4e6f2e4d481751cae4375f1cf5df01b74b66ff66bc685e8cb01ad5405ad63e6e147c9eebf68a5795851040612ee1c830d4f9acc2261
-  data.tar.gz: 44544f1fd6549dc40ca21b0666a500538567320bbb6170e29ffc0a1773ae31e8c2c5a9faf869137465dce6c12f29a8a42d765d4d00dd3cf9e34f4f852f2f9821
+  metadata.gz: ef507cf518054e617a1678d7b29df9dc3bf24b916c26475a835e168054fd1418d794a5210187c7604b018f0d070b016dcbaf88e8a259230db791015164a56b07
+  data.tar.gz: c8b47adeb7ee28e9da2efe5f61a1bd071de1e415654639b4a13d288becac7d752eea6b526a943342dcfde95fd0e323b1716ded877c9cf1e810136b3c40a6c7da

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

@@ -53,6 +53,7 @@ module PgAssociable
       reflect = associacion_for(atributo)
       fkid = object.send(reflect.foreign_key)
       if fkid
+        # FIXME: write some tests
         collection = collection.or(klass.where(id: fkid))
       end
 

data/pg_engine/app/controllers/pg_engine/base_controller.rb

@@ -16,6 +16,8 @@ module PgEngine
       Current.user = current_user
       Current.controller = self
 
+      Current.app_name = PgEngine.site_brand.detect(request)
+
       if Current.user.present?
         active_user_accounts = Current.user.user_accounts.ua_active.to_a
         if ActsAsTenant.current_tenant.present? && !Rails.env.test?

data/pg_engine/app/controllers/pg_engine/base_users_controller.rb

@@ -6,6 +6,8 @@ module PgEngine
       # TODO!: requisito que esto esté seteado
       Current.namespace = :users
 
+      # FIXME: ver que esto esté en todas las pantallas en que esté signed in, ej: en la home y en mi perfil
+      # desduplicar en tenant controller
       @other_active_accounts = ActsAsTenant.without_tenant do
         Current.user.user_accounts.ua_active.to_a
       end

data/pg_engine/app/controllers/tenant/user_accounts_controller.rb

@@ -12,24 +12,11 @@ module Tenant
     before_action do
       @sidebar = false
       unless modal_targeted? || frame_embedded?
-        add_breadcrumb Account.model_name.human(count: 2), ->(h) { h.users_accounts_path(tid: nil) }
+        add_breadcrumb Account.nombre_plural, ->(h) { h.users_accounts_path(tid: nil) }
         add_breadcrumb ActsAsTenant.current_tenant, users_account_path(Current.account, tid: nil)
       end
       unless modal_targeted?
-        add_breadcrumb 'Usuarios', tenant_user_accounts_path
-      end
-      @actions = [
-        [
-          'Agregar usuario',
-          new_user_invitation_path(tid: Current.tid),
-          { class: 'me-1 btn btn-warning btn-sm', 'data-turbo-frame': :_top }
-        ]
-      ]
-    end
-
-    before_action do
-      unless modal_targeted?
-        # add_breadcrumb @user_account.account, users_account_path(@user_account.account, tid: nil)
+        add_breadcrumb UserAccount.nombre_plural, tenant_user_accounts_path
       end
     end
 
@@ -50,7 +37,11 @@ module Tenant
     end
 
     def atributos_para_listar
-      %i[user user_email_f profiles_f estado_f]
+      if Current.user_account_owner?
+        %i[user user_email_f profiles_f estado_f]
+      else
+        %i[user user_email_f]
+      end
     end
   end
 end

data/pg_engine/app/controllers/users/accounts_controller.rb

@@ -15,7 +15,7 @@ module Users
     self.clase_modelo = Account
     self.skip_default_breadcrumb = true
 
-    add_breadcrumb Account.model_name.human(count: 2), ->(h) { h.users_accounts_path(tid: nil) }
+    add_breadcrumb Account.nombre_plural, ->(h) { h.users_accounts_path(tid: nil) }
 
     layout :set_layout
     def set_layout

data/pg_engine/app/controllers/users/invitations_controller.rb

@@ -1,14 +1,20 @@
 module Users
   class InvitationsController < Devise::InvitationsController
     include PgEngine::TenantHelper
+
     before_action only: %i[new create] do
       set_tenant_from_params_or_fail!
 
-      add_breadcrumb Account.model_name.human(count: 2), ->(h) { h.users_accounts_path(tid: nil) }
+      authorize UserAccount
+
+      add_breadcrumb Account.nombre_plural, users_accounts_path(tid: nil)
       add_breadcrumb ActsAsTenant.current_tenant, users_account_path(ActsAsTenant.current_tenant)
-      add_breadcrumb 'Usuarios'
-      add_breadcrumb 'Agregar usuario'
-      @sidebar = false
+      add_breadcrumb UserAccount.nombre_plural
+      add_breadcrumb UserAccount.new.decorate.submit_default_value
+
+      # Porque el link for new no tiene turbo-frame="_top"
+      @turbo_page_requires_reload = true
+
       @no_main_frame = true
       @container_class = 'container border pb-3 my-3'
       @container_style = 'max-width: 50em; xborder-left: 1px solid grey'

data/pg_engine/app/controllers/users/registrations_controller.rb

@@ -1,7 +1,6 @@
 module Users
   class RegistrationsController < Devise::RegistrationsController
     before_action do
-      @sidebar = false
       authorize resource, nil, policy_class: UserRegistrationPolicy
     end
 
@@ -12,7 +11,6 @@ module Users
         resource.save
         yield resource if block_given?
         if resource.persisted?
-          # FIXME: no va más
           create_account_for(resource) if ActsAsTenant.current_tenant.blank?
 
           expire_data_after_sign_in!

data/pg_engine/app/decorators/account_decorator.rb

@@ -22,9 +22,11 @@ class AccountDecorator < PgEngine::BaseRecordDecorator
      ua.reject_invitation_link].compact.join.html_safe
   end
 
-  def show_link(text: 'Usuarios', klass: 'btn-secondary')
+  def show_link(text: nil, klass: 'btn-secondary')
     return unless Pundit.policy!(Current.user, object).show?
 
+    text = 'Usuarios' # rubocop:disable Lint/ShadowedArgument
+
     helpers.content_tag :span do
       helpers.link_to object_url, class: "btn btn-sm #{klass}" do
         helpers.content_tag(:span, nil, class: clase_icono('person')) + text

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

@@ -27,10 +27,11 @@ module PgEngine
       truncate(object.to_s)
     end
 
+    # Texto para la opción de crear en los pg_associables
     def text_for_new
       klass = object.class
       verb = klass.gender == 'f' ? 'Nueva' : 'Nuevo'
-      "#{verb} #{klass.model_name.human.downcase}"
+      "#{verb} #{klass.nombre_singular.downcase}"
     end
 
     # rubocop:disable Style/MissingRespondToMissing
@@ -200,7 +201,7 @@ module PgEngine
     # actionview-7.1.3.2/lib/action_view/helpers/form_helper.rb
     def submit_default_value
       key = :create
-      model = object.model_name.human.downcase
+      model = object.class.nombre_singular.downcase
       defaults = []
       defaults << :"helpers.submit.#{object.model_name.i18n_key}.#{key}"
       defaults << :"helpers.submit.#{key}"

data/pg_engine/app/decorators/user_account_decorator.rb

@@ -4,6 +4,9 @@
 
 class UserAccountDecorator < PgEngine::BaseRecordDecorator
   delegate_all
+  def new_object_url
+    helpers.new_user_invitation_path
+  end
 
   def ingresar_link
     return unless Pundit.policy!(Current.user, object).ingresar?
@@ -44,7 +47,7 @@ class UserAccountDecorator < PgEngine::BaseRecordDecorator
     h.link_to [:update_invitation, :users, account, { sign_off: 1 }].flatten,
               'data-turbo-method': :put,
               class: 'btn btn-sm btn-outline-danger' do
-      'Dejar la cuenta'
+      I18n.t('pg_engine.leave_account', model: Account)
     end
   end
 

data/pg_engine/app/helpers/pg_engine/flash_helper.rb

@@ -10,7 +10,7 @@ module PgEngine
 
     def render_turbo_stream_title
       title = [breadcrumbs.last&.name, ActsAsTenant.current_tenant,
-               I18n.t(Current.app_name, scope: 'app_name')].compact.join(' - ')
+               PgEngine.site_brand.name].compact.join(' - ')
       turbo_stream.update_all 'title', title
     end
   end

data/pg_engine/app/lib/pg_engine/default_url_options.rb

@@ -1,21 +1,25 @@
 module PgEngine
+  # Setea el tid
+  #
+  # Se usa en controllers, y en todo contexto dentro de la webapp
+  # NO se usa en Mailers, ya que no requieren tid
   module DefaultUrlOptions
-    # Aunque parece intuitivo que se podría definir solamente url_options,
-    # es importante que default_url_options también esté definido
+    # Aparentemente es necesario definir url_options cuando los parámetros
+    # pueden cambiar a lo largo del lifecycle de la request
     def url_options
-      if Current.active_user_account
-        super.merge(tid: Current.active_user_account.to_param)
-      else
-        super.merge(tid: nil)
-      end
+      super.merge(PgEngine.site_brand.default_url_options).merge(tid: _current_tid)
     end
 
+    # Aunque parece intuitivo que se podría definir solamente url_options,
+    # es importante que default_url_options también esté definido
     def default_url_options
-      if Current.active_user_account
-        { tid: Current.active_user_account.to_param }
-      else
-        { tid: nil }
-      end
+      PgEngine.site_brand.default_url_options.merge(tid: _current_tid)
+    end
+
+    def _current_tid
+      return unless Current.active_user_account
+
+      Current.active_user_account.to_param
     end
   end
 end

data/pg_engine/app/mailers/pg_engine/base_devise_mailer.rb

@@ -1,5 +1,9 @@
 module PgEngine
   class BaseDeviseMailer < ApplicationMailer
     layout 'pg_layout/devise_mailer'
+
+    def logo_footer_name
+      PgEngine.site_brand.mailer_devise_footer_image_src
+    end
   end
 end

data/pg_engine/app/mailers/pg_engine/base_mailer.rb

@@ -2,13 +2,28 @@ module PgEngine
   class BaseMailer < ActionMailer::Base # rubocop:disable Rails/ApplicationMailer
     class MailNotDelivered < StandardError; end
 
+    def default_url_options
+      super.merge(PgEngine.site_brand.default_url_options)
+    end
+
     before_action { @email_object = params[:email_object] }
 
+    before_action do
+      png_data = File.read(File.expand_path("app/assets/images/#{logo_footer_name}", Rails.root))
+      attachments.inline[logo_footer_name] = png_data
+      @footer_image_src = attachments[logo_footer_name].url
+    end
+
+    def logo_footer_name
+      PgEngine.site_brand.mailer_base_footer_image_src
+    end
+
     default from: lambda { |_mailer|
                     if @email_object.present?
                       email_address_with_name(@email_object.from_address, @email_object.from_name)
                     else
-                      email_address_with_name(ENV.fetch('DEFAULT_MAIL_FROM'), ENV.fetch('DEFAULT_MAIL_FROM_NAME'))
+                      email_address_with_name(PgEngine.site_brand.default_mail_from,
+                                              PgEngine.site_brand.default_mail_from_name)
                     end
                   },
             reply_to: ->(_mailer) { @email_object.reply_to if @email_object.present? },

data/pg_engine/app/models/account.rb

@@ -30,7 +30,7 @@ class Account < ApplicationRecord
   belongs_to :creado_por, optional: true, class_name: 'User'
   belongs_to :actualizado_por, optional: true, class_name: 'User'
 
-  enumerize :plan, in: { factura: 0, procura: 1 }
+  enumerize :plan, in: PgEngine.site_brand.account_plan_options
 
   validates :plan, :nombre, presence: true
 
@@ -56,10 +56,6 @@ class Account < ApplicationRecord
     self.plan = 0 if plan.blank?
   end
 
-  def self.gender
-    'm'
-  end
-
   def to_s
     # TODO: nombre_in_database?
     nombre
@@ -71,7 +67,7 @@ class Account < ApplicationRecord
       user_accounts.ua_active.owners.first&.user
     end
 
-    raise PgEngine::Error, 'orphan account' if @owner.nil?
+    raise PgEngine::Error, 'orphan account' if @owner.nil? && Current.namespace != :admin
 
     @owner
   end

data/pg_engine/app/models/current.rb

@@ -1,6 +1,5 @@
 class Current < ActiveSupport::CurrentAttributes
-  attribute :user, :namespace, :controller, :active_user_account
-  attribute :app_name, default: :procura
+  attribute :user, :namespace, :controller, :active_user_account, :app_name
   # attribute :request_id, :user_agent, :ip_address
 
   # resets { Time.zone = nil }

data/pg_engine/app/models/email.rb

@@ -77,7 +77,7 @@ class Email < ApplicationRecord
             format: { with: /\A[^\n<>&]*\z/, message: 'contiene caracteres inválidos' }
 
   after_initialize do
-    self.from_address = ENV.fetch('DEFAULT_MAIL_FROM') if from_address.blank?
+    self.from_address = PgEngine.site_brand.default_mail_from if from_address.blank?
   end
 
   # validates_format_of :subject, with: /\A[[[:alpha:]]\(\)\w\s.,;!¡?¿-]+\z/

data/pg_engine/app/models/user.rb

@@ -89,14 +89,6 @@ class User < ApplicationRecord
     user_accounts.first.invitation_status = :ist_invited
   end
 
-  def invited_to_app
-    user_accounts.first.account.plan || 'procura'
-  rescue StandardError => e
-    pg_err(e)
-
-    'procura'
-  end
-
   attr_accessor :orphan
 
   def active_for_authentication?
@@ -140,6 +132,12 @@ class User < ApplicationRecord
 
   def first_first_name
     nombre.strip.split.first.presence || to_s
+  rescue StandardError => e
+    # :nocov:
+    pg_warn(e)
+
+    to_s
+    # :nocov:
   end
 
   class Error < PgEngine::Error; end

data/pg_engine/app/models/user_account.rb

@@ -32,10 +32,6 @@ class UserAccount < ApplicationRecord
 
   acts_as_tenant :account
 
-  def self.gender
-    'f'
-  end
-
   belongs_to :creado_por, optional: true, class_name: 'User'
   belongs_to :actualizado_por, optional: true, class_name: 'User'
 

data/pg_engine/app/policies/account_policy.rb

@@ -37,7 +37,7 @@ class AccountPolicy < ApplicationPolicy
   end
 
   def show?
-    base_access_to_record?
+    Current.namespace == :admin || (base_access_to_record? && !user_account.ua_invite_pending?)
   end
 
   def index?
@@ -49,11 +49,16 @@ class AccountPolicy < ApplicationPolicy
   end
 
   def base_access_to_record?
-    ua = user.user_account_for(record)
-    Current.namespace == :admin || (ua.present? && !ua.ua_invite_pending?)
+    Current.namespace == :admin || user_belongs_to_account?
   end
 
   def user_belongs_to_account?
-    user.user_account_for(record).present?
+    user_account.present?
+  end
+
+  private
+
+  def user_account
+    @user_account ||= user.user_account_for(record)
   end
 end

data/pg_engine/app/policies/user_account_policy.rb

@@ -17,10 +17,6 @@ class UserAccountPolicy < ApplicationPolicy
     end
   end
 
-  def index?
-    super && (Current.namespace == :admin || Current.active_user_account.present?)
-  end
-
   def sign_off?
     user_is_user_account_user? &&
       !record.ua_invite_pending? &&
@@ -28,7 +24,7 @@ class UserAccountPolicy < ApplicationPolicy
   end
 
   def puede_crear?
-    Current.namespace == :admin
+    Current.namespace == :admin || Current.user_account_owner?
   end
 
   def accept_invitation_link?

data/pg_engine/app/views/layouts/_logo.html.slim

@@ -0,0 +1,8 @@
+- href = Current.tid.present? ? tenant_root_path(tid: Current.tid) : root_path
+a.navbar-brand href="#{ href }"
+  = image_tag(PgEngine.site_brand.logo_navbar_url, alt: PgEngine.site_brand.name)
+
+css:
+  a.navbar-brand img {
+    max-height: 31px;
+  }

data/pg_engine/app/views/users/accounts/show.html.slim

@@ -19,6 +19,7 @@
 - if @user_account.membership_status.ms_disabled?
   p.text-danger Deshabilitado
 
-- if @account.owner == Current.user
-  = turbo_frame_tag 'embedded__user_accounts',
-      src: tenant_user_accounts_path(tid: Current.user.user_account_for(@account).to_param)
+- ActsAsTenant.with_tenant(@account) do
+  - if policy(UserAccount).index?
+    = turbo_frame_tag 'embedded__user_accounts',
+        src: tenant_user_accounts_path(tid: Current.user.user_account_for(@account).to_param)

data/pg_engine/config/locales/es.rb

@@ -18,6 +18,8 @@ end
 {
   :es => {
     pg_engine: {
+      leave_account: PgEngine::I18nRules.rule('Dejar %{genderize(la,el)} %{singular_model}'),
+
       resource_destroyed: PgEngine::I18nRules.rule("Se eliminó %{genderize(la,el)} %{singular_model}"),
       resource_not_destroyed: PgEngine::I18nRules.rule("Hubo un error al intentar eliminar %{genderize(la,el)} %{singular_model}"),
       resource_not_updated: PgEngine::I18nRules.rule("Hubo un error al intentar actualizar %{genderize(la,el)} %{singular_model}"),

data/pg_engine/config/locales/es.yml

@@ -1,4 +1,9 @@
 es:
+  helpers:
+    # submit_default_value
+    submit:
+      user_account:
+        create: Agregar %{model}
   profile_group:
     account: Cuenta
     user_accounts: Usuarios
@@ -170,8 +175,8 @@ es:
   activerecord:
     models:
       user_account:
-        one: Cuenta de usuario
-        other: Cuentas de usuario
+        one: Usuario
+        other: Usuarios
       account:
         one: Espacio
         other: Espacios

data/pg_engine/lib/pg_engine/active_job_extensions.rb

@@ -0,0 +1,15 @@
+module PgEngine
+  module ActiveJobExtensions
+    def serialize
+      super.merge(
+        'app_name' => ::Current.app_name
+      )
+    end
+
+    def deserialize(job_data)
+      ::Current.app_name = job_data.delete('app_name')
+
+      super
+    end
+  end
+end

data/pg_engine/lib/pg_engine/configuracion.rb

@@ -34,9 +34,11 @@ module PgEngine
 
       return unless defined? UserAccount
 
+      # :nocov:
       UserAccount.class_eval do
         enumerize :profiles, in: PgEngine.configuracion.user_profiles, multiple: true
       end
+      # :nocov:
     end
 
     def profile_groups_options

data/pg_engine/lib/pg_engine/engine.rb

@@ -53,9 +53,6 @@ module PgEngine
     end
 
     initializer 'configurar_pg_rails' do
-      # Ensure required env variables are set
-      ENV.fetch('DEFAULT_MAIL_FROM')
-      ENV.fetch('DEFAULT_MAIL_FROM_NAME')
       # SimpleForm
       require "#{PgEngine::Engine.root}/config/simple_form/simple_form"
       require "#{PgEngine::Engine.root}/config/simple_form/simple_form_bootstrap"

data/pg_engine/lib/pg_engine/site_brand.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module PgEngine
+  class SiteBrand
+    attr_accessor :default_site_brand
+
+    def initialize
+      @options = {}
+    end
+
+    def value_for(key)
+      options = @options[key.to_sym]
+
+      raise PgEngine::Error, 'Key not found' if options.nil?
+
+      if Current.app_name.present? && options.keys.include?(Current.app_name)
+        options[Current.app_name]
+      elsif options.keys.include?(:default)
+        options[:default]
+      elsif default_site_brand.present? && options.keys.include?(default_site_brand)
+        pg_warn('Default site brand chosen')
+
+        options[default_site_brand]
+      else
+        # :nocov:
+        raise PgEngine::Error, 'No site brand found'
+        # :nocov:
+      end
+    end
+
+    def method_missing(method)
+      value_for(method)
+    end
+
+    def respond_to_missing?(method, include_private)
+      @options.key?(method.to_sym) or super
+    end
+  end
+end

data/pg_engine/lib/pg_engine/test/dummy_brand.rb

@@ -0,0 +1,81 @@
+module PgEngine
+  module Test
+    class DummyBrand < PgEngine::SiteBrand
+      def initialize(include_all: false) # rubocop:disable Metrics/MethodLength
+        super()
+
+        @default_site_brand = :factura
+
+        @options = {
+          landing_site_url: {
+            procura: 'https://bien.com.ar/procura',
+            factura: 'https://bien.com.ar/factura'
+          },
+          logo_navbar_url: {
+            procura: 'procura-logo-navbar-1.png',
+            factura: 'logo-navbar-1.png'
+          },
+          logo_xl_url: {
+            procura: 'procura-logo-xl-light.png',
+            factura: 'logo-xl-light.png'
+          },
+          favicon_prefix: {
+            procura: 'procura-favicon',
+            factura: 'favicon'
+          },
+          mailer_devise_footer_image_src: {
+            factura: 'mail-footer-lg.png',
+            procura: 'procura-mail-footer-lg.png'
+          },
+          mailer_base_footer_image_src: {
+            factura: 'footer-mail-dark-light.png',
+            procura: 'procura-mail-footer-sm.png'
+          },
+          default_mail_from: {
+            procura: 'noreply@procura',
+            factura: 'noreply@factura'
+          },
+          name: {
+            procura: 'Procura Bien',
+            factura: 'Factura Bien'
+          },
+          default_mail_from_name: {
+            procura: 'Procura Bien',
+            factura: 'Factura Bien'
+          },
+          default_url_options: {
+            default: {}
+          }
+        }
+
+        return unless Rails.env.development? || include_all
+
+        @options.merge!({
+                          default_url_options: {
+                            procura: {
+                              host: 'procura.localhost',
+                              port: '3000'
+                            },
+                            factura: {
+                              host: 'factura.localhost',
+                              port: '3000'
+                            }
+                          }
+                        })
+      end
+
+      def account_plan_options
+        { factura: 0, procura: 1 }
+      end
+
+      def detect(request)
+        return :procura if request.host.match(/procura/)
+        return :factura if request.host.match(/factura/)
+
+        pg_warn 'default site_brand assigned'
+
+        :factura
+      end
+    end
+  end
+end