pg_rails 7.0.3 → 7.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8cb512a5e5483d9560982aebe0f68c8934f7c6fa63497a2e3701adf7b33ac7b
-  data.tar.gz: ce68d888d08bdbab4ed1e537d1f5d40b94d45c5a2f4d89f0ce99f65e3b9760ad
+  metadata.gz: d63547ea3619de2194b7906e2344df8fe1ff049cd3b066ba1adcb61cf1ae8102
+  data.tar.gz: 5845c9d534c94be6ddb71823271d21f3d2c28615ba5d70d5a874478799d48eeb
 SHA512:
-  metadata.gz: 3fb3e9557497c249a2960b61996a8e76e5075fab812753d6c09f7215b6155a928d6914a49b431c05a0869a3bc0cc78cfece7f895a4c6f47112a853834b77a122
-  data.tar.gz: 1aa9067316fa32c9aab7cec6aece106e5dbc5f7f89c257d27ccc003c7d497f11fb0af275ca6e3b254d545da261d160876b54486bf429350e29e7d78e1860a1e0
+  metadata.gz: b7611fd24a756c4a7c6e8573f67b48dd0e9598839065feef9ac6345e8e09e0b71087db795647524f6f8bd9734fe67c6da54d4305391306441eddcaf6b0120937
+  data.tar.gz: 204dc0788a96e724b67038d0c89e1a8cecf69a1a4fd8f8ada7d105289ed0615641eed73e8353cf85acea3be573332d05583070650740c37ed53d891c2ec30579

data/pg_associable/app/assets/js/asociable_controller.js

@@ -26,21 +26,20 @@ export default class extends Controller {
       }
     }
     const input = this.element.querySelector('input[type=text]')
-    if(input.value) {
+    if (input.value) {
       this.element.classList.add('filled')
     }
-
   }
 
-
   selectItem (e) {
     // TODO: text en data
     this.completarCampo(e.target.dataset.id, e.target.text)
   }
+
   completarCampo (id, text) {
     const textField = this.element.querySelector('input[type=text]')
     const hiddenField = this.element.querySelector('input[type=hidden]')
-    if( id === undefined ) {
+    if (id === undefined) {
       id = null
     }
     hiddenField.value = id

data/pg_associable/app/assets/js/asociable_inline_controller.js

@@ -22,86 +22,88 @@ export default class extends Controller {
     this.element.querySelector('.pencil').onclick = (e) => {
       that.input.focus()
     }
-    if(this.input.value) {
+    if (this.input.value) {
       this.element.classList.add('filled')
     }
 
-    let debounce = function(callback, wait) {
-      let timerId;
+    const debounce = function (callback, wait) {
+      let timerId
       return (...args) => {
-        clearTimeout(timerId);
+        clearTimeout(timerId)
         timerId = setTimeout(() => {
-          callback(...args);
-        }, wait);
-      };
+          callback(...args)
+        }, wait)
+      }
     }
     const doSearchBounce = debounce((force) => {
       that.doSearch(force)
     }, 200)
 
     this.input.addEventListener('blur', (e) => {
-      this.input.placeholder = ""
+      this.input.placeholder = ''
     })
     this.input.onfocus = (e) => {
       this.input.select()
-      if(this.input.value.length == 0) {
+      if (this.input.value.length === 0) {
         this.escribiAlgo()
       }
     }
     this.input.onkeyup = (e) => {
-      if(this.input.value.length == 0) {
+      if (this.input.value.length === 0) {
         this.escribiAlgo()
       }
-      if(e.keyCode == 13) {
+      if (e.keyCode === 13) {
         doSearchBounce(true)
       } else {
         doSearchBounce()
       }
     }
     this.input.onkeydown = (e) => {
-      if(e.keyCode == 13) {
-        e.preventDefault();
-        return false;
+      if (e.keyCode === 13) {
+        e.preventDefault()
+        return false
       }
     }
   }
-  buscando() {
+
+  buscando () {
     this.result.innerHTML = `
 <div class="resultados" tabindex="-1">
   <div class="fst-italic text-secondary">Buscando...</div>
 </div>
 `
   }
-  escribiAlgo() {
-    this.input.placeholder = "Escribí algo para buscar"
+
+  escribiAlgo () {
+    this.input.placeholder = 'Escribí algo para buscar'
   }
 
-  doSearch(force = false) {
-    if(!force && this.input.value.length < 3) {
+  doSearch (force = false) {
+    if (!force && this.input.value.length < 3) {
       return
     }
-    if(!force && this.input.value == this.lastValue) {
+    if (!force && this.input.value === this.lastValue) {
       return
     }
     this.lastValue = this.input.value
 
-    let timerId = setTimeout(() => {
+    const timerId = setTimeout(() => {
       this.buscando()
     }, 200)
-    document.addEventListener("turbo:before-stream-render", function(e) {
+    document.addEventListener('turbo:before-stream-render', function (e) {
       clearTimeout(timerId)
     })
-    let url = `${this.input.dataset.url}?id=${this.elemId}`
+    const url = `${this.input.dataset.url}?id=${this.elemId}`
     const form = document.createElement('form')
     form.setAttribute('method', 'post')
     form.setAttribute('action', url)
     form.setAttribute('data-turbo-stream', true)
-    let partial = document.createElement('input')
+    const partial = document.createElement('input')
     partial.setAttribute('type', 'hidden')
     partial.setAttribute('name', 'partial')
     partial.setAttribute('value', 'pg_associable/resultados_inline')
     form.appendChild(partial)
-    let query = document.createElement('input')
+    const query = document.createElement('input')
     query.setAttribute('type', 'hidden')
     query.setAttribute('name', 'query')
     query.setAttribute('value', this.input.value)
@@ -114,7 +116,7 @@ export default class extends Controller {
   completarCampo (id, text) {
     const textField = this.element.querySelector('input[type=text]')
     const hiddenField = this.element.querySelector('input[type=hidden]')
-    if( id === undefined ) {
+    if (id === undefined) {
       id = null
     }
     hiddenField.value = id
@@ -134,7 +136,6 @@ export default class extends Controller {
     this.result.innerHTML = ''
   }
 
-
   disconnect (e) {
     console.log('disconnect asociable_inline')
   }

data/pg_associable/app/assets/js/modal_controller.js

@@ -3,10 +3,9 @@ import * as bootstrap from 'bootstrap'
 
 export default class extends Controller {
   static outlets = ['asociable']
-  static targets = ['response', 'result']
+  static targets = ['response', 'result', 'searchInput', 'searchForm']
 
   modalPuntero = null
-  input = null
   lastValue = ''
 
   connect (e) {
@@ -15,28 +14,33 @@ export default class extends Controller {
     this.modalPuntero = new bootstrap.Modal(modal)
     this.modalPuntero.show()
 
-    this.input = this.element.querySelector('input[type=text]')
+    if (this.searchInputTargets.length > 0) {
+      this.bindSearchInput()
+    }
+  }
 
-    let debounce = function(callback, wait) {
-      let timerId;
-      return (...args) => {
-        clearTimeout(timerId);
-        timerId = setTimeout(() => {
-          callback(...args);
-        }, wait);
-      };
+  debounce (callback, wait) {
+    let timerId
+    return (...args) => {
+      clearTimeout(timerId)
+      timerId = setTimeout(() => {
+        callback(...args)
+      }, wait)
     }
-    const doSearchBounce = debounce((force) => {
+  }
+
+  bindSearchInput () {
+    const doSearchBounce = this.debounce((force) => {
       this.doSearch(force)
     }, 200)
-    this.input.onkeydown = (e) => {
-      if(e.keyCode == 13) {
-        e.preventDefault();
-        return false;
+    this.searchInputTarget.onkeydown = (e) => {
+      if (e.keyCode === 13) {
+        e.preventDefault()
+        return false
       }
     }
-    this.input.onkeyup = (e) => {
-      if(e.keyCode == 13) {
+    this.searchInputTarget.onkeyup = (e) => {
+      if (e.keyCode === 13) {
         doSearchBounce(true)
       } else {
         doSearchBounce()
@@ -44,7 +48,7 @@ export default class extends Controller {
     }
   }
 
-  buscando() {
+  buscando () {
     this.resultTarget.innerHTML = `
 <ul class="resultados list-group list-group-flush" tabindex="-1">
   <li class="list-group-item">
@@ -53,40 +57,23 @@ export default class extends Controller {
 </ul>
 `
   }
-  doSearch(force = false) {
-    if(!force && this.input.value.length < 3) {
+
+  doSearch (force = false) {
+    if (!force && this.searchInputTarget.value.length < 3) {
       return
     }
-    if(!force && this.input.value == this.lastValue) {
+    if (!force && this.searchInputTarget.value === this.lastValue) {
       return
     }
-    this.lastValue = this.input.value
+    this.lastValue = this.searchInputTarget.value
 
-    let timerId = setTimeout(() => {
+    const timerId = setTimeout(() => {
       this.buscando()
     }, 200)
-    document.addEventListener("turbo:before-stream-render", function(e) {
+    document.addEventListener('turbo:before-stream-render', function (e) {
       clearTimeout(timerId)
     })
-    this.element.querySelector('form').requestSubmit()
-    // let url = `${this.input.dataset.url}?id=${this.elemId}`
-    // const form = document.createElement('form')
-    // form.setAttribute('method', 'post')
-    // form.setAttribute('action', url)
-    // form.setAttribute('data-turbo-stream', true)
-    // let partial = document.createElement('input')
-    // partial.setAttribute('type', 'hidden')
-    // partial.setAttribute('name', 'partial')
-    // partial.setAttribute('value', 'pg_associable/resultados_inline')
-    // form.appendChild(partial)
-    // let query = document.createElement('input')
-    // query.setAttribute('type', 'hidden')
-    // query.setAttribute('name', 'query')
-    // query.setAttribute('value', this.input.value)
-    // form.appendChild(query)
-    // document.body.prepend(form)
-    // form.requestSubmit()
-    // form.remove()
+    this.searchFormTarget.requestSubmit()
   }
 
   selectItem (e) {

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

@@ -10,7 +10,7 @@ module PgAssociable
 
     def pg_respond_buscar
       partial = params[:partial] || 'pg_associable/resultados'
-      @collection = policy_scope(@clase_modelo).query(params[:query]).limit(6)
+      @collection = policy_scope(@clase_modelo).kept.query(params[:query]).limit(6)
       render turbo_stream:
         turbo_stream.update("resultados-#{params[:id]}",
                             partial:, locals: { collection: @collection })

data/pg_associable/app/views/pg_engine/base/_pg_associable_modal.html.slim

@@ -11,17 +11,19 @@
         a.btn-close[type="button" data-bs-dismiss="modal" aria-label="Close"]
       .modal-body
         .show-on-select-item
-          - if @clase_modelo.count.zero?
+          - if policy_scope(@clase_modelo).kept.count.zero?
             p No hay #{@clase_modelo.nombre_plural.downcase} aún
             = link_to "Crear el primer #{@clase_modelo.nombre_singular.downcase}",
                       'javascript:void(0)', data: { action: 'modal#toggleCrearElegir' }
           - else
             = form_tag namespaced_path(@clase_modelo, prefix: :buscar),
+                       data: { 'modal-target': 'searchForm' },
                        method: :post, class: 'pg-form buscar' do
               = hidden_field_tag :id, params[:id]
               = text_field_tag :query, '', class: 'form-control',
                                            placeholder: 'Escribí algo para buscar',
-                                           autocomplete: 'off'
+                                           autocomplete: 'off',
+                                           data: { 'modal-target': 'searchInput' }
               / = button_tag 'Buscar'
             .resultados-wrapper id="resultados-#{params[:id]}" data-modal-target="result"
         #pg-associable-form.show-on-new-item

data/pg_engine/lib/tasks/auto_anotar_modelos.rake

@@ -1,34 +1,59 @@
-# frozen_string_literal: true
-
-# # frozen_string_literal: true
-
+# NOTE: only doing this in development as some production environments (Heroku)
+# NOTE: are sensitive to local FS writes, and besides -- it's just not proper
+# NOTE: to have a dev-mode tool do its thing in production.
 if Rails.env.development?
-  Annotate.set_defaults(
-    # 'show_migration' => 'true',
-    'show_foreign_keys' => 'true',
-    'show_indexes' => 'true',
-    'exclude_controllers' => 'true',
-    'exclude_helpers' => 'true',
-    'exclude_tests' => 'true',
-    'classified_sort' => 'true',
-    'with_comment' => 'true',
-
-    'models' => 'true'
-  )
-
-  # Annotate models
-  task annotate: :environment do
-    puts 'Annotating models...'
-    system 'bundle exec annotate'
+  require 'annotate'
+  task :set_annotation_options do
+    # You can override any of these by setting an environment variable of the
+    # same name.
+    Annotate.set_defaults(
+      'active_admin'                => 'false',
+      'additional_file_patterns'    => [],
+      'routes'                      => 'true',
+      'models'                      => 'true',
+      'position_in_routes'          => 'before',
+      'position_in_class'           => 'before',
+      'position_in_test'            => 'before',
+      'position_in_fixture'         => 'before',
+      'position_in_factory'         => 'before',
+      'position_in_serializer'      => 'before',
+      'show_foreign_keys'           => 'true',
+      'show_complete_foreign_keys'  => 'false',
+      'show_indexes'                => 'true',
+      'simple_indexes'              => 'false',
+      'model_dir'                   => 'app/models',
+      'root_dir'                    => '',
+      'include_version'             => 'false',
+      'require'                     => '',
+      'exclude_tests'               => 'true',
+      'exclude_fixtures'            => 'true',
+      'exclude_factories'           => 'true',
+      'exclude_serializers'         => 'true',
+      'exclude_scaffolds'           => 'true',
+      'exclude_controllers'         => 'true',
+      'exclude_helpers'             => 'true',
+      'exclude_sti_subclasses'      => 'false',
+      'ignore_model_sub_dir'        => 'false',
+      'ignore_columns'              => nil,
+      'ignore_routes'               => nil,
+      'ignore_unknown_models'       => 'false',
+      # 'hide_limit_column_types'     => '<%= AnnotateModels::NO_LIMIT_COL_TYPES.join(",") %>',
+      # 'hide_default_column_types'   => '<%= AnnotateModels::NO_DEFAULT_COL_TYPES.join(",") %>',
+      'skip_on_db_migrate'          => 'false',
+      'format_bare'                 => 'true',
+      'format_rdoc'                 => 'false',
+      'format_yard'                 => 'false',
+      'format_markdown'             => 'false',
+      'sort'                        => 'false',
+      'force'                       => 'false',
+      'frozen'                      => 'false',
+      'classified_sort'             => 'true',
+      'trace'                       => 'false',
+      'wrapper_open'                => nil,
+      'wrapper_close'               => nil,
+      'with_comment'                => 'true'
+    )
   end
 
-  # Run annotate task after db:migrate
-  #  and db:rollback tasks
-  Rake::Task['db:migrate'].enhance do
-    Rake::Task['annotate'].invoke
-  end
-
-  Rake::Task['db:rollback'].enhance do
-    Rake::Task['annotate'].invoke
-  end
+  Annotate.load_tasks
 end

data/pg_layout/index.js

@@ -1,9 +1,10 @@
 // Controllers
 import NavbarController from './app/javascript/navbar_controller'
-window.Stimulus.register('navbar', NavbarController)
-
 // Bootstrap's toasts
 import * as bootstrap from 'bootstrap'
+
+window.Stimulus.register('navbar', NavbarController)
+
 document.addEventListener('turbo:load', function () {
   const toastElList = document.querySelectorAll('.toast:not(.hide):not(.show)')
   Array.from(toastElList).map(toastEl => new bootstrap.Toast(toastEl).show())

data/pg_rails/lib/version.rb

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

data/pg_scaffold/lib/generators/pg_resource_route/pg_resource_route_generator.rb

@@ -20,7 +20,7 @@ class PgResourceRouteGenerator < Rails::Generators::NamedBase
     return if options[:actions].present?
 
     route_s = <<~RUBY
-      PgEngine.resource_route(self, :#{file_name.pluralize})
+      pg_resource(:#{file_name.pluralize})
     RUBY
     route route_s, namespace: regular_class_path
   end

data/pg_scaffold/lib/generators/pg_scaffold/pg_scaffold_generator.rb

@@ -57,9 +57,11 @@ class PgScaffoldGenerator < Rails::Generators::NamedBase
 
   def parent_controller
     parts = controller_class_name.split('::')
-    return "#{parts.first}Controller" if parts.length > 1 && (get_class "#{parts.first}Controller")
+    namesp = namespace.present? ? "#{namespace}::" : ''
+    cont_name = "#{namesp}#{parts.first}Controller"
+    return cont_name if parts.length > 1 && get_class(cont_name)
 
-    raise "#{parts.first}Controller not exists"
+    raise "#{cont_name} not exists"
   end
 
   def atributos_a_filtrar

data/pg_scaffold/lib/generators/pg_scaffold/templates/controller.rb

@@ -2,19 +2,20 @@
 
 # generado con pg_rails
 
-<% if namespaced? -%>
+<% if false && namespaced? -%>
 require_dependency "<%= namespaced_path %>/application_controller"
 
 <% end -%>
+<% module_namespacing do -%>
 <% module_namespacing_2 do -%>
 class <%= controller_class_name.split('::').last %>Controller < <%= parent_controller %>
-  before_action { @clase_modelo = <%= class_name %> }
+  before_action { @clase_modelo = <%= class_name.split('::').last %> }
 
-  before_action(only: :index) { authorize <%= class_name %> }
+  before_action(only: :index) { authorize <%= class_name.split('::').last %> }
 
   before_action :set_instancia_modelo, only: %i[new create show edit update destroy]
 
-  add_breadcrumb <%= class_name %>.nombre_plural, :<%= plural_route_name %>_path
+  add_breadcrumb <%= class_name.split('::').last %>.nombre_plural, :<%= plural_route_name %>_path
 
   private
 
@@ -35,3 +36,4 @@ class <%= controller_class_name.split('::').last %>Controller < <%= parent_contr
   end
 end
 <% end -%>
+<% end -%>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.0.3
+  version: 7.0.5
 platform: ruby
 authors:
 - Martín Rosso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-02-08 00:00:00.000000000 Z
+date: 2024-02-10 00:00:00.000000000 Z
 dependencies: []
 description: Rails goodies.
 email: