pg_rails 7.0.8.pre.alpha.109 → 7.0.8.pre.alpha.111

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ea0a25a34ed115022c43283c50cd8678d9ebde034abbfcd65f149fa486d2004
-  data.tar.gz: 6ad0a841b8d2b3c73513c8890a7f2642598c78341ef1b79567a9e049b5cd8882
+  metadata.gz: 633b510e33807a5146da15616442bc144c78a7abd86bd617c2234362745c9251
+  data.tar.gz: a2d2830fedd674a54b8b527d4397c7035cec9be7dbeaf87dd2419a57b3b9103a
 SHA512:
-  metadata.gz: 7b24cbce39c6cce5ec0ed5d21dc45c61de0cb6986c40bcc04c5495ae2a5fa7cb12934a3609eec80d0008b860ed69a67c6f45df3969771907da4381258a26ac6f
-  data.tar.gz: e59deaa85466ff3e49dae7effe311fe77025b9bbdfc97c9667ce97f3ff48efdd20e6428d4e830993e895f0633b0144d6c6a73505a072f92f297972a2cd898b15
+  metadata.gz: 6f4e654ad40febd8919fc9bac6886242590e6b591d9e412b03043199a37536ce5a11c10ed540fb46c0e26f21efb3f0b77cacbb0bc74b4f79acd90b235b11637a
+  data.tar.gz: 6c91a9c7ff63cee85b00f041f9cbfa953c6ba49eae5eb447f90c2c45f4e43222ba54b2c4425407dab02b72d750b2d5da434861abb07d22f1dee50abfd144f3ee

data/pg_associable/app/javascript/asociable_controller.tsx

@@ -290,14 +290,20 @@ export default class extends Controller {
   }
 
   completarCampo (target) {
-    // FIXME: savedInputState = null
+    this.savedInputState = null
     const textField = this.element.querySelector('input[type=text]')
     const hiddenField = this.element.querySelector('input[type=hidden]')
 
-    if (target && target.dataset.fieldName) { hiddenField.name = target.dataset.fieldName }
-
     if (target) {
-      const object = JSON.parse(target.dataset.object)
+      let object = null
+      if (target.dataset) {
+        // cuando se selecciona un objeto existente
+        if (target.dataset.fieldName) { hiddenField.name = target.dataset.fieldName }
+        object = JSON.parse(target.dataset.object)
+      } else {
+        // cuando se crea un objeto desde el modal
+        object = target
+      }
       hiddenField.value = object.id
       textField.value = object.to_s
       textField.setAttribute('readonly', 'true')

data/pg_associable/spec/system/associable_spec.rb

@@ -0,0 +1,24 @@
+require 'rails_helper'
+
+describe 'Associable' do
+  let(:user) { create :user, :developer }
+
+  before do
+    login_as user
+    driven_by :selenium
+    visit '/admin/cosas/new'
+    fill_in 'cosa_nombre', with: 'La cosa'
+    select 'Los', from: 'cosa_tipo'
+    find('.cosa_categoria_de_cosa input[type=text]').click
+  end
+
+  it do
+    expect(page).to have_text :all, 'Nuevo'
+    find('.cosa_categoria_de_cosa .list-group-item').click
+    fill_in 'categoria_de_cosa_nombre', with: 'la categoría'
+    select 'Completar', from: 'categoria_de_cosa_tipo'
+    click_on 'Crear Categoría de cosa'
+    click_on 'Crear Coso'
+    expect(page).to have_text 'Creado por'
+  end
+end

data/pg_engine/app/lib/pg_engine/filtros_builder.rb

@@ -322,7 +322,7 @@ module PgEngine
     def filtro_fecha(campo, placeholder = '')
       content_tag :div, class: 'col-auto' do
         content_tag :div, class: 'filter' do
-          label_tag(nil, placeholder, class: 'text-body-secondary') + \
+          label_tag(nil, placeholder, class: 'text-body-secondary') +
             date_field_tag(
               campo, parametros_controller[campo], class: 'form-control form-control-sm d-inline-block w-auto ms-1', placeholder:, autocomplete: 'off'
             )

data/pg_engine/app/lib/pg_form_builder.rb

@@ -23,7 +23,7 @@ class PgFormBuilder < SimpleForm::FormBuilder
   def input(attribute_name, options = {}, &)
     options[:error_prefix] ||= default_prefix(attribute_name)
 
-    super(attribute_name, options, &)
+    super
   end
 
   def mensajes_de_error

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

@@ -28,7 +28,7 @@ module PgEngine
     protected
 
     def mail(*args)
-      super(*args).tap do |message|
+      super.tap do |message|
         # message.mailgun_options = {
         #   'tag' => email.tags,
         #   'tracking-opens' => true

data/pg_engine/app/mailers/pg_engine/user_mailer.rb

@@ -3,10 +3,15 @@ module PgEngine
     # default delivery_method: :smtp
 
     def notification
-      recipient = params[:notification].recipient
-      @html = params[:message].html_safe
-      @text = params[:message_text]
-      mail(to: recipient.email, subject: params[:subject])
+      @recipient = params[:notification].recipient
+      @html = replace_user(params[:message]).html_safe
+      @text = replace_user(params[:message_text])
+      mail(to: @recipient.email, subject: params[:subject])
+    end
+
+    def replace_user(input)
+      # reemplaza todas las ocurrencias de: %{user}
+      format(input, user: @recipient.nombre)
     end
   end
 end

data/pg_engine/app/models/account.rb

@@ -23,6 +23,9 @@ class Account < ApplicationRecord
   audited
   include Discard::Model
 
+  has_many :user_accounts
+  has_many :users, through: :user_accounts
+
   belongs_to :creado_por, optional: true, class_name: 'User'
   belongs_to :actualizado_por, optional: true, class_name: 'User'
 

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

@@ -43,7 +43,7 @@ module PgEngine
         # Si es un decorated method
         super(attribute[0..-3], options)
       else
-        super(attribute, options)
+        super
       end
     end
 

data/pg_engine/app/views/pg_engine/base/download.xlsx.axlsx

@@ -5,9 +5,8 @@ wb.add_worksheet(name: @clase_modelo.nombre_plural) do |sheet|
   sheet.add_row(atributos_para_listar.map { |a| @clase_modelo.human_attribute_name(a) })
 
   @collection.decorate.each do |object|
-    array = []
-    atributos_para_listar.each do |att|
-      array.push object.send(att)
+    array = atributos_para_listar.map do |att|
+      object.send(att)
     end
     sheet.add_row array
   end

data/pg_engine/config/locales/es.yml

@@ -11,7 +11,7 @@ es:
     confirmed_at: Fecha de confirmación
     actualizado_por: Actualizado por
     creado_por: Creado por
-    accept_terms: Acepto los <a href="/terminos_y_condiciones" target="_blank">Términos y condiciones</a>
+    accept_terms: Acepto los <a href="/terminos_y_condiciones" target="_blank">Términos y condiciones</a> y la <a href="/privacidad" target="_blank">Política de privacidad</a>
   enumerize:
     email:
       status:

data/pg_engine/config/routes.rb

@@ -7,6 +7,8 @@ Rails.application.routes.draw do
   get '500', to: 'application#internal_error'
   get 'internal_error_but_with_status200', to: 'application#internal_error_but_with_status200'
 
+  get 'contacto', to: 'public/mensaje_contactos#new'
+
   namespace :public, path: '' do
     pg_resource(:mensaje_contactos, only: [:new, :create], path: 'contacto')
     post 'webhook/mailgun', to: 'webhooks#mailgun'

data/pg_engine/spec/controllers/pg_engine/base_controller_spec.rb

@@ -20,7 +20,6 @@ class DummyBaseController < PgEngine::BaseController
   end
 end
 
-# rubocop:disable RSpec/FilePath
 # rubocop:disable RSpec/SpecFilePathFormat
 describe DummyBaseController do
   render_views
@@ -128,5 +127,4 @@ describe DummyBaseController do
   end
 end
 # rubocop:enable RSpec/MultipleExpectations
-# rubocop:enable RSpec/FilePath
 # rubocop:enable RSpec/SpecFilePathFormat

data/pg_layout/app/lib/navbar.rb

@@ -38,11 +38,6 @@ class Navbar
         path: eval(item['path']),
         show: item['policy'] ? eval(item['policy']) : true
       }
-    rescue StandardError => e
-      # FIXME: que rompa los tests
-      # TODO!: testear
-      pg_err e, item
-      return []
     end
     # rubocop:enable Security/Eval
   end

data/pg_rails/lib/version.rb

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

data/pg_scaffold/spec/generators_spec.rb

@@ -18,7 +18,7 @@ describe 'Generators', type: :generator do
       run_generator(['Frontend/Modelo', 'bla:integer'])
 
       my_assert_file 'app/decorators/modelo_decorator.rb' do |content|
-        assert_match(/delegate_all/, content)
+        expect(content).to match(/delegate_all/)
       end
     end
   end
@@ -33,8 +33,8 @@ describe 'Generators', type: :generator do
       run_generator(['Frontend/Modelo', 'bla:integer'])
 
       my_assert_file 'spec/controllers/frontend/modelos_controller_spec.rb' do |content|
-        assert_match(/routing/, content)
-        assert_match(/sign_in/, content)
+        expect(content).to match(/routing/)
+        expect(content).to match(/sign_in/)
       end
     end
   end
@@ -49,7 +49,7 @@ describe 'Generators', type: :generator do
       run_generator(['Frontend/Modelo', 'bla:integer', 'cosa:references', '--activeadmin'])
 
       my_assert_file 'app/admin/modelos.rb' do |content|
-        assert_match(/permit_params.*cosa_id/, content)
+        expect(content).to match(/permit_params.*cosa_id/)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.0.8.pre.alpha.109
+  version: 7.0.8.pre.alpha.111
 platform: ruby
 authors:
 - Martín Rosso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-07-02 00:00:00.000000000 Z
+date: 2024-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -702,42 +702,84 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.60.2
+        version: '1.64'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.60.2
+        version: '1.64'
 - !ruby/object:Gem::Dependency
   name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.23.1
+        version: '2.25'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.23.1
+        version: '2.25'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.26.1
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.26.1
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-capybara
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.21'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.21'
+- !ruby/object:Gem::Dependency
+  name: rubocop-factory_bot
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.26'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.26'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec_rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.30'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.30'
 - !ruby/object:Gem::Dependency
   name: slim_lint
   requirement: !ruby/object:Gem::Requirement
@@ -969,6 +1011,7 @@ files:
 - pg_associable/lib/pg_associable.rb
 - pg_associable/lib/pg_associable/engine.rb
 - pg_associable/spec/pg_associable/helpers_spec.rb
+- pg_associable/spec/system/associable_spec.rb
 - pg_engine/app/admin/accounts.rb
 - pg_engine/app/admin/audits.rb
 - pg_engine/app/admin/dashboard.rb