pg_rails 7.0.8.pre.alpha.84 → 7.0.8.pre.alpha.86

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c61900d2d0b3a827718b84a3cab67f4851b2eb3087e7fbc1d313f0acf163bf3
-  data.tar.gz: bfca92cbb58ba292877ccb61b15b08049a0d800fdc13408f82647e9ea7c66ee9
+  metadata.gz: 777adfba6510fb280d827dab94dc0a924f851608924a38e16eeedc43c3bba896
+  data.tar.gz: 9d099949a82596a82e8c2d62e71aaef3bda568cfc3a58793daaa2ab4d53f1d1b
 SHA512:
-  metadata.gz: 2282deaa98881e20bd0b754c6496fc9da679214760ea45fd5f8c2f0b64a0903e1557cffb2f8d4c13b156d46e62b237113bf8f24bdba676436a404eb1e57e37c5
-  data.tar.gz: d9ece2e6b39c53169548c253afdb18fb9707d76bc762b0b86b7cc2656e563a4efea6d303f51814aac22926effd37ef1ec1d6c6a6d00bded153476864586f6b14
+  metadata.gz: 142b66b567ed6f4aa81666b04f7157bb327af673420d4a3a333c723ffb2aa85895e6c80acbfa826a4f81b1db363f025a46d2d850b9dc6b399b4fad281caffa42
+  data.tar.gz: 8317ed39418fe41a693810801ed8fdd5936d3b3dd4670f6247e92575c3a566962e61565c388cced8f5f8512a5910be7b06ca7d9d4b58ffe155168eca61f28749

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

@@ -17,7 +17,7 @@ module Admin
     private
 
     def atributos_permitidos
-      %i[from_address from_name reply_to to subject body_input associated_id associated_type]
+      %i[status from_address from_name reply_to to subject body_input associated_id associated_type]
     end
 
     def atributos_para_buscar

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

@@ -28,6 +28,7 @@ module Admin
       pg_respond_update
     end
 
+    # TODO: sacar este método a otro lado, que no sea AdminController
     skip_before_action :authenticate_user!, only: [:login_as]
 
     # :nocov:

data/pg_engine/app/controllers/concerns/pg_engine/resource.rb

@@ -229,7 +229,9 @@ module PgEngine
         instancia_modelo.assign_attributes(modelo_params) if action_name.in? %w[update]
       end
 
-      authorize instancia_modelo
+      # FIXME: estaría bueno delegar directamente a pundit, pero habría que
+      # arreglar tema policies
+      Current.user&.developer? || authorize(instancia_modelo)
 
       # TODO: problema en create y update cuando falla la validacion
       # Reproducir el error antes de arreglarlo

data/pg_engine/app/controllers/public/webhooks_controller.rb

@@ -4,8 +4,8 @@ module Public
 
     before_action :verify_signature, only: :mailgun
 
-    rescue_from StandardError do
-      pg_err 'webhook internal server error', request.body.read
+    rescue_from StandardError do |err|
+      pg_err err, 'webhook internal server error', request.body.read
       head :internal_server_error
     end
 
@@ -21,7 +21,7 @@ module Public
         # Si no se guardó el log es porque ya existía un log con ese ID
         # Mando :not_acceptable (406) para que Mailgun no vuelva a intentar
         # https://documentation.mailgun.com/docs/mailgun/user-manual/tracking-messages
-        pg_warn 'ya existía un log con ese id, raaaaro', params
+        pg_warn 'ya existía un log con ese id, raaaaro', request.body.read
         head :not_acceptable
       end
     end
@@ -34,7 +34,7 @@ module Public
 
     def not_used_token(token)
       if used_tokens.elements.include?(token)
-        pg_warn 'Mailgun Webhook: refusing used token'
+        pg_warn 'Mailgun Webhook: refusing used token', request.body.read
         head :ok
 
         false
@@ -46,7 +46,7 @@ module Public
 
     def timestamp_not_too_far(timestamp)
       if (Time.zone.at(timestamp.to_i) - Time.zone.now).abs > 1.hour
-        pg_warn 'Mailgun Webhook: refusing due to timestamp too far'
+        pg_warn 'Mailgun Webhook: refusing due to timestamp too far', request.body.read
         head :ok
 
         false
@@ -65,12 +65,13 @@ module Public
       return unless timestamp_not_too_far(timestamp)
       return unless hexdigest != signature
 
-      pg_warn 'Mailgun Webhook: refusing invalid signature'
+      pg_warn 'Mailgun Webhook: refusing invalid signature', request.body.read
       head :ok
     end
 
     def encode(data)
       webhook_secret_key = Rails.application.credentials.dig(:mailgun, :webhook_secret_key)
+      # TODO: raise if nil
       OpenSSL::HMAC.hexdigest('sha256', webhook_secret_key, data)
     end
   end

data/pg_engine/app/decorators/email_decorator.rb

@@ -14,9 +14,39 @@ class EmailDecorator < PgEngine::BaseRecordDecorator
   #     end
   #   end
 
+  def status_f
+    klass = "badge align-content-center #{status_badge_class}"
+    content_tag :span, id: dom_id(object, :status), class: klass do
+      status_text
+    end
+  end
+
+  def status_text
+    {
+      'pending' => 'Enviando',
+      'failed' => 'Falló',
+      'sent' => 'Enviando',
+      'accepted' => 'Enviando',
+      'delivered' => 'Entregado',
+      'rejected' => 'Falló'
+    }[object.status]
+  end
+
+  def status_badge_class
+    {
+      'pending' => 'text-bg-warning',
+      'failed' => 'text-bg-danger',
+      'sent' => 'text-bg-warning',
+      'accepted' => 'text-bg-warning',
+      'delivered' => 'text-bg-success',
+      'rejected' => 'text-bg-danger'
+    }[object.status]
+  end
+
   def encoded_eml_link
     return if object.encoded_eml.blank?
 
-    link_to 'Download', helpers.rails_blob_path(object.encoded_eml), target: :_blank, rel: :noopener
+    link_to 'Download', helpers.rails_blob_path(object.encoded_eml),
+            target: :_blank, rel: :noopener
   end
 end

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

@@ -21,6 +21,7 @@ module PgEngine
 
     rescue_from StandardError do |err|
       pg_err err
+      # TODO: agregar un backtrace
       @email_object.update_columns(status: :failed, status_detail: err.to_s) if @email_object.present?
     end
 

data/pg_engine/app/models/email.rb

@@ -36,6 +36,10 @@ class Email < ApplicationRecord
   include Hashid::Rails
   audited
 
+  after_commit do
+    associated.email_updated(self) if associated.respond_to? :email_updated
+  end
+
   attr_accessor :require_body_input
 
   has_one_attached :encoded_eml
@@ -63,7 +67,6 @@ class Email < ApplicationRecord
   validates :from_name, length: { within: 0..80 }
   validates :to, length: { within: 3..200 }
 
-  validates :body_input, length: { minimum: 10 }, if: -> { require_body_input }
   validates :body_input, presence: true, if: -> { require_body_input }
 
   validates :from_name, :subject, :to,

data/pg_engine/app/policies/mensaje_contacto_policy.rb

@@ -25,7 +25,7 @@ class MensajeContactoPolicy < ApplicationPolicy
   #   acceso_total? && !record.readonly?
   # end
 
-  def acceso_total?
+  def puede_crear?
     true
   end
 end

data/pg_engine/app/policies/pg_engine/{application_policy.rb → base_policy.rb}

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module PgEngine
-  class ApplicationPolicy
+  class BasePolicy
     attr_reader :user, :record
 
     def initialize(user, record)
@@ -9,19 +9,12 @@ module PgEngine
       @record = record
     end
 
-    def editar_en_lugar?
-      puede_editar?
-    end
-
     def index?
-      raise "esta policy se llama con la clase modelo y no con #{record.class}" unless record.class
-
-      acceso_total? || Pundit.policy_scope!(user, record).any?
+      base_access_to_collection?
     end
 
     def show?
-      # scope.where(id: record.id).exists?
-      acceso_total?
+      base_access_to_record?
     end
 
     def create?
@@ -57,7 +50,7 @@ module PgEngine
       end
 
       def resolve
-        if policy.acceso_total?
+        if policy.base_access_to_collection?
           scope.all
         else
           scope.none
@@ -72,29 +65,31 @@ module PgEngine
     end
 
     def puede_editar?
-      acceso_total?
+      base_access_to_record?
     end
 
     def puede_crear?
-      acceso_total?
+      base_access_to_collection?
     end
 
     def puede_borrar?
-      acceso_total?
+      base_access_to_record?
     end
 
     def export?
-      acceso_total?
+      base_access_to_collection?
+    end
+
+    def base_access_to_record?
+      user&.developer?
     end
 
-    def acceso_total?
+    def base_access_to_collection?
       user&.developer?
     end
 
     def objeto_borrado?
-      if record.respond_to?(:deleted?)
-        record.deleted?
-      elsif record.respond_to?(:discarded?)
+      if record.respond_to?(:discarded?)
         record.discarded?
       else
         false

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

@@ -4,13 +4,14 @@ div style="max-width: 22em" data-controller="pg_form"
   = pg_form_for(@email || object, asociable:) do |f|
     = f.mensajes_de_error
 
-    = hidden_field_tag :asociable, true if asociable
-    = f.input :from_address
-    = f.input :from_name
-    = f.input :reply_to
-    = f.input :to
-    = f.input :subject
-    = f.input :body_input, as: :text
+    / = hidden_field_tag :asociable, true if asociable
+    / = f.input :from_address
+    / = f.input :from_name
+    / = f.input :reply_to
+    / = f.input :to
+    / = f.input :subject
+    / = f.input :body_input, as: :text
+    = f.input :status
 
     .mt-2
     = f.button :submit

data/pg_engine/config/locales/es.yml

@@ -11,8 +11,15 @@ es:
     confirmed_at: Fecha de confirmación
     actualizado_por: Actualizado por
     creado_por: Creado por
-  ancestry:
-    exclude_self: No puede ser hijx de si mismx
+  enumerize:
+    email:
+      status:
+        pending: Enviando
+        failed: Falló
+        sent: Enviando
+        accepted: Aceptado
+        delivered: Entregado
+        rejected: Rechazado
   simple_form:
     "yes": 'Sí'
     "no": 'No'

data/pg_engine/lib/pg_engine/utils/check_invalid_records.rb

@@ -20,15 +20,23 @@ module PgEngine
       end
 
       def classes
-        ActiveRecord::Base.descendants - ignored_classes
+        all = ActiveRecord::Base.descendants.select { |m| m.table_name.present? }
+        all - ignored_classes
       end
 
       def ignored_classes
         [
+          ActionText::Record,
+          ActionMailbox::Record,
+          ActiveAdmin::Comment,
           ActiveStorage::Record,
           PgEngine::BaseRecord,
-          ActiveAdmin::Comment,
           Audited::Audit,
+          ActionText::RichText,
+          ActionText::EncryptedRichText,
+          ActionMailbox::InboundEmail,
+          ActiveStorage::VariantRecord,
+          ActiveStorage::Attachment,
           ActiveStorage::Blob,
           ApplicationRecord
         ]

data/pg_engine/lib/pg_engine.rb

@@ -90,4 +90,10 @@ module PgEngine
       yield(configuracion)
     end
   end
+
+  def self.redis_url
+    env_value = ENV.fetch('TEST_ENV_NUMBER', nil)
+    db = (env_value.nil? ? 1 : (env_value.presence || 1)).to_i - 1
+    "redis://127.0.0.1:6379/#{db}"
+  end
 end

data/pg_engine/spec/controllers/public/mensaje_contactos_controller_spec.rb

@@ -42,12 +42,6 @@ RSpec.describe Public::MensajeContactosController do
     }
   end
 
-  let(:logged_user) { create :user, :developer }
-
-  before do
-    sign_in logged_user if logged_user.present?
-  end
-
   describe 'routing' do
     it 'routes GET index correctly' do
       route = { get: '/contacto/new' }

data/pg_engine/spec/decorators/email_decorator_spec.rb

@@ -0,0 +1,18 @@
+require 'rails_helper'
+
+describe EmailDecorator do
+  let(:email) { create :email, status: }
+  let(:decorator) { email.decorate }
+
+  describe '#status_f' do
+    subject { decorator.status_f }
+
+    context 'cuando está entregado' do
+      let(:status) { :delivered }
+
+      it 'tiene badge success' do
+        expect(subject).to include('text-bg-success').and(include('Entregado'))
+      end
+    end
+  end
+end

data/pg_engine/spec/factories/emails.rb

@@ -13,6 +13,7 @@ FactoryBot.define do
     to { Faker::Internet.email }
     subject { Faker::Lorem.sentence }
     body_input { Faker::Lorem.sentence }
+    status { Email.status.values.sample }
     # tags { Faker::Lorem.sentence }
     # associated
     # message_id { Faker::Lorem.sentence }

data/pg_engine/spec/lib/pg_engine/mailgun/log_sync_spec.rb

@@ -75,7 +75,7 @@ describe PgEngine::Mailgun::LogSync, vcr: { cassette_name: 'mailgun/log_sync_dow
     end
 
     context 'cuando se asocia a un email' do
-      let!(:email) { create :email, message_id: 'msgid@fakeapp2024.mail' }
+      let!(:email) { create :email, status: :pending, message_id: 'msgid@fakeapp2024.mail' }
 
       it do
         expect(subject.email).to eq email

data/pg_engine/spec/models/email_spec.rb

@@ -5,7 +5,7 @@
 require 'rails_helper'
 
 RSpec.describe Email do
-  let(:email) { create(:email) }
+  let(:email) { create(:email, status: :pending) }
 
   it 'se persiste' do
     expect(email).to be_persisted

data/pg_engine/spec/{features → system}/destroy_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Sign in', :js do
+describe 'Sign in' do
   include ActionView::RecordIdentifier
 
   shared_examples 'destroy from index' do
@@ -50,21 +50,21 @@ describe 'Sign in', :js do
     end
   end
 
-  # Capybara.drivers.keys
-  drivers = %i[
-    selenium_headless
-    selenium_chrome_headless
-    selenium_chrome_headless_notebook
-    selenium_chrome_headless_iphone
-  ]
-  # drivers = %i[selenium_chrome_headless_notebook]
-  # drivers = %i[selenium_chrome_debugger]
-  # drivers = %i[selenium]
-  # drivers = %i[selenium_chrome]
+  # drivers = %i[
+  #   selenium_headless
+  #   selenium_chrome_headless
+  #   selenium_chrome_headless_notebook
+  #   selenium_chrome_headless_iphone
+  # ]
+  drivers = %i[selenium_chrome_headless_iphone]
   drivers = [ENV['DRIVER'].to_sym] if ENV['DRIVER'].present?
 
   drivers.each do |driver|
-    context("with driver '#{driver}'", driver:) do
+    context("with driver '#{driver}'") do
+      before do
+        driven_by driver
+      end
+
       it_behaves_like 'destroy from index'
       it_behaves_like 'destroy from show'
     end

data/pg_engine/spec/{features → system}/login_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Sign in', :js do
+describe 'Sign in' do
   shared_examples 'sign_in' do
     subject do
       visit '/users/sign_in'
@@ -20,22 +20,22 @@ describe 'Sign in', :js do
     end
   end
 
-  # Capybara.drivers.keys
-  drivers = %i[
-    selenium_headless
-    selenium_chrome_headless
-    selenium_chrome_headless_notebook
-    selenium_chrome_headless_iphone
-  ]
-  # drivers = %i[selenium_chrome_headless_notebook]
-  # drivers = %i[selenium_chrome_debugger]
-  # drivers = %i[selenium]
-  # drivers = %i[selenium_chrome]
+  # drivers = %i[
+  #   selenium_headless
+  #   selenium_chrome_headless
+  #   selenium_chrome_headless_notebook
+  #   selenium_chrome_headless_iphone
+  # ]
+  drivers = %i[selenium_chrome_headless_iphone]
   drivers = [ENV['DRIVER'].to_sym] if ENV['DRIVER'].present?
 
   drivers.each do |driver|
-    context("with driver '#{driver}'", driver:) do
-      include_examples 'sign_in'
+    context("with driver '#{driver}'") do
+      before do
+        driven_by driver
+      end
+
+      it_behaves_like 'sign_in'
     end
   end
 end

data/pg_engine/spec/{features → system}/signup_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Al Registrarse', :js do
+describe 'Al Registrarse' do
   include ActiveJob::TestHelper
 
   find_scroll = proc do |selector, options = {}|
@@ -56,21 +56,21 @@ describe 'Al Registrarse', :js do
     end
   end
 
-  # Capybara.drivers.keys
-  drivers = %i[
-    selenium_headless
-    selenium_chrome_headless
-    selenium_chrome_headless_notebook
-    selenium_chrome_headless_iphone
-  ]
-  # drivers = %i[selenium_chrome_headless_notebook]
-  # drivers = %i[selenium_chrome_debugger]
-  # drivers = %i[selenium]
-  # drivers = %i[selenium_chrome]
+  # drivers = %i[
+  #   selenium_headless
+  #   selenium_chrome_headless
+  #   selenium_chrome_headless_notebook
+  #   selenium_chrome_headless_iphone
+  # ]
+  drivers = %i[selenium_chrome_headless_iphone]
   drivers = [ENV['DRIVER'].to_sym] if ENV['DRIVER'].present?
 
   drivers.each do |driver|
-    context("with driver '#{driver}'", driver:) do
+    context("with driver '#{driver}'") do
+      before do
+        driven_by driver
+      end
+
       it_behaves_like 'sign_up'
       it_behaves_like 'edit user'
     end

data/pg_layout/app/javascript/application.js

@@ -1,94 +1,3 @@
-import Rollbar from 'rollbar'
-
 import './config'
 import './channels'
 import './controllers'
-
-// Bootstrap's toasts
-import * as bootstrap from 'bootstrap'
-
-let rollbarToken = document.head.querySelector('meta[name=rollbar-token]')
-rollbarToken = rollbarToken && rollbarToken.content
-
-let rollbarEnv = document.head.querySelector('meta[name=rollbar-env]')
-rollbarEnv = rollbarEnv && rollbarEnv.content
-rollbarEnv = rollbarEnv || 'unknown'
-
-window.Rollbar = Rollbar
-
-Rollbar.init()
-
-Rollbar.global({
-  itemsPerMinute: 2,
-  maxItems: 5
-})
-Rollbar.configure({
-  enabled: !!rollbarToken,
-  accessToken: rollbarToken,
-  captureUncaught: true,
-  captureUnhandledRejections: true,
-  reportLevel: 'warning',
-  payload: {
-    environment: rollbarEnv
-  }
-})
-
-document.addEventListener('turbo:load', bindAndObserveToasts)
-document.addEventListener('turbo:render', bindAndObserveToasts)
-
-document.addEventListener('turbo:before-cache', () => {
-  document.querySelectorAll('#flash .alert').forEach((el) => {
-    el.remove()
-  })
-  document.querySelectorAll('.offcanvas-backdrop').forEach((el) => {
-    el.remove()
-  })
-  document.querySelectorAll('.offcanvas').forEach((el) => {
-    el.classList.remove('show')
-  })
-})
-
-function bindToastElements () {
-  const toastQuery = '.pg-toast:not(.hide):not(.show)'
-
-  const toastElList = document.querySelectorAll(toastQuery)
-  Array.from(toastElList).map(toastEl => {
-    toastEl.addEventListener('hidden.bs.toast', () => {
-      toastEl.remove()
-    })
-    return new bootstrap.Toast(toastEl).show()
-  })
-}
-
-function bindAndObserveToasts () {
-  bindToastElements()
-
-  // Select the node that will be observed for mutations
-  const targetNode = document.getElementById('flash')
-
-  // Options for the observer (which mutations to observe)
-  const config = { attributes: true, childList: true, subtree: true }
-
-  // Callback function to execute when mutations are observed
-  const callback = (mutationList, observer) => {
-    for (const mutation of mutationList) {
-      if (mutation.type === 'childList') {
-        bindToastElements()
-      }
-    }
-  }
-
-  // Create an observer instance linked to the callback function
-  const observer = new MutationObserver(callback)
-
-  // Start observing the target node for configured mutations
-  observer.observe(targetNode, config)
-}
-
-// document.addEventListener('turbo:before-stream-render', function () { console.log('turbo:before-stream-render') })
-// document.addEventListener('turbo:render', function () { console.log('turbo:render') })
-// document.addEventListener('turbo:before-render', function () { console.log('turbo:before-render') })
-// document.addEventListener('turbo:before-frame-render', function () { console.log('turbo:before-frame-render') })
-// document.addEventListener('turbo:frame-load', function () { console.log('turbo:frame-load') })
-// document.addEventListener('turbo:before-fetch-request', function () { console.log('turbo:before-fetch-request') })
-// document.addEventListener('turbo:fetch-request-error', function () { console.log('turbo:fetch-request-error') })

data/pg_layout/app/javascript/channels/consumer.js

@@ -2,11 +2,46 @@
 // You can generate new channels where WebSocket features live using the `bin/rails generate channel` command.
 
 import { createConsumer } from '@anycable/web'
+import Rollbar from 'rollbar'
 
 let cableProtocol = document.head.querySelector('meta[name=actioncable-protocol]')
 cableProtocol = cableProtocol && cableProtocol.content
 cableProtocol = cableProtocol || 'actioncable-v1-ext-json'
 
-export default createConsumer({
+const consumer = createConsumer({
   protocol: cableProtocol
 })
+
+const anycable = consumer.cable
+
+if (anycable) {
+  anycable.on('connect', ev => {
+    document.head.dataset.cableConnected = true
+    if (ev.reconnect) {
+      console.log('Welcome back!')
+    } else {
+      console.log('Welcome!')
+    }
+  })
+
+  anycable.on('disconnect', ev => {
+    document.head.dataset.cableConnected = false
+    // document.head.dataset.cableDisconnectedEvent = ev
+    if (ev.reason) {
+      if (ev.reason === 'transport_closed') {
+        // no hago nada (?
+      } else {
+        Rollbar.warning(`Disconnected because: ${ev.reason}`)
+      }
+      console.log(`Disconnected because: ${ev.reason}`)
+    } else {
+      Rollbar.warning('Disconnected for unknown reason')
+      console.log('Disconnected for unknown reason')
+    }
+  })
+}
+
+// Para desconectar
+// anycable.disconnect()
+
+export default consumer

data/pg_layout/app/javascript/config/bootstrap.js

@@ -0,0 +1,42 @@
+import * as bootstrap from 'bootstrap'
+
+document.addEventListener('turbo:load', bindAndObserveToasts)
+document.addEventListener('turbo:render', bindAndObserveToasts)
+
+// TODO: testear con capybara
+function bindToastElements () {
+  const toastQuery = '.pg-toast:not(.hide):not(.show)'
+
+  const toastElList = document.querySelectorAll(toastQuery)
+  Array.from(toastElList).map(toastEl => {
+    toastEl.addEventListener('hidden.bs.toast', () => {
+      toastEl.remove()
+    })
+    return new bootstrap.Toast(toastEl).show()
+  })
+}
+
+function bindAndObserveToasts () {
+  bindToastElements()
+
+  // Select the node that will be observed for mutations
+  const targetNode = document.getElementById('flash')
+
+  // Options for the observer (which mutations to observe)
+  const config = { attributes: true, childList: true, subtree: true }
+
+  // Callback function to execute when mutations are observed
+  const callback = (mutationList, observer) => {
+    for (const mutation of mutationList) {
+      if (mutation.type === 'childList') {
+        bindToastElements()
+      }
+    }
+  }
+
+  // Create an observer instance linked to the callback function
+  const observer = new MutationObserver(callback)
+
+  // Start observing the target node for configured mutations
+  observer.observe(targetNode, config)
+}

data/pg_layout/app/javascript/config/cable_ready.js

@@ -1,30 +1,4 @@
 import consumer from '../channels/consumer'
 import CableReady from 'cable_ready'
-import Rollbar from 'rollbar'
-
-const anycable = consumer.cable
-
-if (anycable) {
-  anycable.on('connect', ev => {
-    document.head.dataset.cableConnected = true
-    if (ev.reconnect) {
-      console.log('Welcome back!')
-    } else {
-      console.log('Welcome!')
-    }
-  })
-
-  anycable.on('disconnect', ev => {
-    document.head.dataset.cableConnected = false
-    // document.head.dataset.cableDisconnectedEvent = ev
-    if (ev.reason) {
-      Rollbar.warning(`Disconnected because: ${ev.reason}`)
-      console.log(`Disconnected because: ${ev.reason}`)
-    } else {
-      Rollbar.warning('Disconnected for unknown reason')
-      console.log('Disconnected for unknown reason')
-    }
-  })
-}
 
 CableReady.initialize({ consumer })

data/pg_layout/app/javascript/config/index.js

@@ -1 +1,4 @@
 import './cable_ready'
+import './turbo_rails'
+import './rollbar'
+import './bootstrap'

data/pg_layout/app/javascript/config/rollbar.js

@@ -0,0 +1,28 @@
+import Rollbar from 'rollbar'
+
+// TODO: testear con capybara, si se puede
+let rollbarToken = document.head.querySelector('meta[name=rollbar-token]')
+rollbarToken = rollbarToken && rollbarToken.content
+
+let rollbarEnv = document.head.querySelector('meta[name=rollbar-env]')
+rollbarEnv = rollbarEnv && rollbarEnv.content
+rollbarEnv = rollbarEnv || 'unknown'
+
+window.Rollbar = Rollbar
+
+Rollbar.init()
+
+Rollbar.global({
+  itemsPerMinute: 2,
+  maxItems: 5
+})
+Rollbar.configure({
+  enabled: !!rollbarToken,
+  accessToken: rollbarToken,
+  captureUncaught: true,
+  captureUnhandledRejections: true,
+  reportLevel: 'warning',
+  payload: {
+    environment: rollbarEnv
+  }
+})

data/pg_layout/app/javascript/config/turbo_rails/index.js

@@ -0,0 +1,27 @@
+// Es necesario que el consumer se setee antes de cargar la librería
+// para que lo tomen los TurboCableStreamSourceElement's
+
+import './set_consumer'
+
+import '@hotwired/turbo-rails'
+
+// TODO: testear con capybara
+document.addEventListener('turbo:before-cache', () => {
+  document.querySelectorAll('#flash .alert').forEach((el) => {
+    el.remove()
+  })
+  document.querySelectorAll('.offcanvas-backdrop').forEach((el) => {
+    el.remove()
+  })
+  document.querySelectorAll('.offcanvas').forEach((el) => {
+    el.classList.remove('show')
+  })
+})
+
+// document.addEventListener('turbo:before-stream-render', function () { console.log('turbo:before-stream-render') })
+// document.addEventListener('turbo:render', function () { console.log('turbo:render') })
+// document.addEventListener('turbo:before-render', function () { console.log('turbo:before-render') })
+// document.addEventListener('turbo:before-frame-render', function () { console.log('turbo:before-frame-render') })
+// document.addEventListener('turbo:frame-load', function () { console.log('turbo:frame-load') })
+// document.addEventListener('turbo:before-fetch-request', function () { console.log('turbo:before-fetch-request') })
+// document.addEventListener('turbo:fetch-request-error', function () { console.log('turbo:fetch-request-error') })

data/pg_layout/app/javascript/config/turbo_rails/set_consumer.js

@@ -0,0 +1,4 @@
+import consumer from '../../channels/consumer'
+import { setConsumer } from '@hotwired/turbo-rails/app/javascript/turbo/cable.js'
+
+setConsumer(consumer)

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

@@ -1,7 +1,9 @@
-if (!window.Stimulus) {
-  console.error('window.Stimulus must be set')
-}
+import { Application } from '@hotwired/stimulus'
 
-const application = window.Stimulus
+const application = Application.start()
+
+// Configure Stimulus development experience
+application.debug = false
+window.Stimulus = application
 
 export { application }

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

@@ -15,3 +15,5 @@ application.register('fadein_onload', FadeinOnloadController)
 application.register('clear-timeout', ClearTimeoutController)
 application.register('switcher', SwitcherController)
 application.register('filtros', FiltrosController)
+
+// TODO: testear con capybara todo lo que se pueda

data/pg_layout/app/lib/navbar.rb

@@ -39,6 +39,7 @@ class Navbar
         show: item['policy'] ? eval(item['policy']) : true
       }
     rescue StandardError => e
+      # FIXME: que rompa los tests
       # TODO!: testear
       pg_err e, item
       return []

data/pg_layout/app/views/layouts/pg_layout/base.html.slim

@@ -36,7 +36,8 @@ html
 
     link rel="preconnect" href="https://fonts.googleapis.com"
     link rel="preconnect" href="https://fonts.gstatic.com" crossorigin="crossorigin"
-    link href="https://fonts.googleapis.com/css2?family=Ubuntu:ital,wght@0,300;0,400;0,500;0,700;1,300;1,400;1,500;1,700&display=swap" rel="stylesheet"
+    link href="https://fonts.googleapis.com/css2?family=Ubuntu:ital,wght@0,300;0,400; \
+               0,500;0,700;1,300;1,400;1,500;1,700&display=swap" rel="stylesheet"
     css:
       body {
         font-family: "Ubuntu", sans-serif;
@@ -59,7 +60,7 @@ html
               nav aria-label="breadcrumb"
                 = render_breadcrumbs
               / = render_breadcrumbs builder: ::Bootstrap4BreadcrumbsBuilder
-              .btn-toolbar
+              .btn-toolbar.gap-1
                 = yield(:actions)
             hr.my-0
           - content = content_for?(:content) ? yield(:content) : yield

data/pg_rails/js/index.js

@@ -1,2 +1,2 @@
-import './../../pg_associable'
 import './../../pg_layout/app/javascript/application'
+import './../../pg_associable'

data/pg_rails/lib/pg_rails/rspec_logger_matchers.rb

@@ -36,12 +36,13 @@ module PgEngine
         def failure_message
           msg = "expected to #{@level || log}"
           msg << "with text: #{@text}" if @text.present?
-          return unless @new_messages.any?
+          return msg unless @new_messages.any?
 
           msg << "\nLogged messages:"
           @new_messages.each do |level, message|
             msg << "\n  #{level}: #{message[0..200]}"
           end
+          msg
         end
 
         def supports_block_expectations?

data/pg_rails/lib/version.rb

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

data/pg_scaffold/lib/generators/pg_pundit/templates/policy.rb

@@ -10,7 +10,7 @@ require_dependency "<%= namespaced_path %>/application_policy"
 class <%= class_name %>Policy < ApplicationPolicy
   class Scope < ApplicationPolicy::Scope
     # def resolve
-    #   if policy.acceso_total?
+    #   if policy.base_access_to_collection?
     #     scope.all
     #   else
     #     scope.none
@@ -19,19 +19,23 @@ class <%= class_name %>Policy < ApplicationPolicy
   end
 
   # def puede_editar?
-  #   acceso_total? && !record.readonly?
+  #   base_access_to_record?
   # end
 
   # def puede_crear?
-  #   acceso_total? || user.asesor?
+  #   base_access_to_collection?
   # end
 
   # def puede_borrar?
-  #   acceso_total? && !record.readonly?
+  #   base_access_to_record?
   # end
 
-  # def acceso_total?
-  #   user.developer?
+  # def base_access_to_record?
+  #   base_access_to_collection? && record.account == Current.account
+  # end
+
+  # def base_access_to_collection?
+  #   user.present?
   # end
 end
 <% end -%>

data/pg_scaffold/spec/generators_spec.rb

@@ -4,7 +4,8 @@ require 'generators/pg_rspec/scaffold/scaffold_generator'
 require 'generators/pg_decorator/pg_decorator_generator'
 require 'generators/pg_active_record/model/model_generator'
 
-DESTINATION_PATH = File.expand_path('./../../tmp/generator_testing', __dir__)
+TEST_ENV_NUMBER = ENV.fetch('TEST_ENV_NUMBER', '')
+DESTINATION_PATH = File.expand_path("./../../tmp/generator_testing#{TEST_ENV_NUMBER}", __dir__)
 
 describe 'Generators', type: :generator do
   describe 'PgDecoratorGenerator' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.0.8.pre.alpha.84
+  version: 7.0.8.pre.alpha.86
 platform: ruby
 authors:
 - Martín Rosso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-27 00:00:00.000000000 Z
+date: 2024-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -1002,7 +1002,7 @@ files:
 - pg_engine/app/policies/email_log_policy.rb
 - pg_engine/app/policies/email_policy.rb
 - pg_engine/app/policies/mensaje_contacto_policy.rb
-- pg_engine/app/policies/pg_engine/application_policy.rb
+- pg_engine/app/policies/pg_engine/base_policy.rb
 - pg_engine/app/policies/user_account_policy.rb
 - pg_engine/app/policies/user_policy.rb
 - pg_engine/app/policies/user_registration_policy.rb
@@ -1082,15 +1082,13 @@ files:
 - pg_engine/spec/controllers/public/webhooks_controller_spec.rb
 - pg_engine/spec/controllers/users/confirmations_controller_spec.rb
 - pg_engine/spec/controllers/users/registrations_controller_spec.rb
+- pg_engine/spec/decorators/email_decorator_spec.rb
 - pg_engine/spec/factories/accounts.rb
 - pg_engine/spec/factories/email_logs.rb
 - pg_engine/spec/factories/emails.rb
 - pg_engine/spec/factories/mensaje_contactos.rb
 - pg_engine/spec/factories/user_accounts.rb
 - pg_engine/spec/factories/users.rb
-- pg_engine/spec/features/destroy_spec.rb
-- pg_engine/spec/features/login_spec.rb
-- pg_engine/spec/features/signup_spec.rb
 - pg_engine/spec/fixtures/test.pdf
 - pg_engine/spec/helpers/pg_engine/pg_rails_helper_spec.rb
 - pg_engine/spec/helpers/pg_engine/print_helper_spec.rb
@@ -1107,13 +1105,20 @@ files:
 - pg_engine/spec/models/user_account_spec.rb
 - pg_engine/spec/models/user_spec.rb
 - pg_engine/spec/pg_engine/pdf_preview_generator_spec.rb
+- pg_engine/spec/system/destroy_spec.rb
+- pg_engine/spec/system/login_spec.rb
+- pg_engine/spec/system/signup_spec.rb
 - pg_layout/app/assets/stylesheets/animations.scss
 - pg_layout/app/assets/stylesheets/sidebar.scss
 - pg_layout/app/javascript/application.js
 - pg_layout/app/javascript/channels/consumer.js
 - pg_layout/app/javascript/channels/index.js
+- pg_layout/app/javascript/config/bootstrap.js
 - pg_layout/app/javascript/config/cable_ready.js
 - pg_layout/app/javascript/config/index.js
+- pg_layout/app/javascript/config/rollbar.js
+- pg_layout/app/javascript/config/turbo_rails/index.js
+- pg_layout/app/javascript/config/turbo_rails/set_consumer.js
 - pg_layout/app/javascript/controllers/application.js
 - pg_layout/app/javascript/controllers/clear_timeout_controller.js
 - pg_layout/app/javascript/controllers/fadein_onload_controller.js