pg_rails 7.0.1 → 7.0.2

data/pg_engine/app/helpers/pg_engine/index_helper.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module PgEngine
+  module IndexHelper
+    def encabezado(campo, options = {})
+      clase = options[:clase] || @clase_modelo
+      if options[:ordenable]
+        field = controller.instance_variable_get(:@field)
+        direction = controller.instance_variable_get(:@direction)
+        uri = URI.parse(request.url)
+        cgi = if uri.query.present?
+                CGI.parse(uri.query)
+              else
+                {}
+              end
+        cgi['order_by'] = campo
+        cgi['order_direction'] =
+          if field.to_s == campo.to_s && direction.to_s == 'asc'
+            'desc'
+          else
+            'asc'
+          end
+
+        symbol = if field.to_s == campo.to_s
+                   if direction.to_s == 'asc'
+                     '<i class="bi bi-sort-down-alt" />'
+                   elsif direction.to_s == 'desc'
+                     '<i class="bi bi-sort-up" />'
+                   end
+                 else
+                   ''
+                 end
+
+        uri.query = cgi.transform_values { |b| (b.length == 1 ? b.first : b) }.to_query
+
+        link_to(clase.human_attribute_name(campo), uri.to_s) + " #{symbol}".html_safe
+      else
+        clase.human_attribute_name(campo)
+      end
+    end
+  end
+end

data/{app/helpers/pg_rails → pg_engine/app/helpers/pg_engine}/postgres_helper.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module PgRails
+module PgEngine
   module PostgresHelper
     # Le pone la timezone
     def add_timezone(field)

data/{app/helpers/pg_rails → pg_engine/app/helpers/pg_engine}/print_helper.rb

@@ -1,29 +1,20 @@
 # frozen_string_literal: true
 
-module PgRails
+module PgEngine
   module PrintHelper
     include ActionView::Helpers::NumberHelper
 
     class FechaInvalidaError < StandardError
     end
 
-    # Genera un falso link que al clickear carga la url por ajax
-    # Es igual a los links con remote: true, pero evita que abran el link en otra
-    # pestaña. Movido de probella
-    def pg_ajax_link(url, options = {})
-      content_tag :span, class: 'pg_ajax_link', data: options.merge(url: url) do
-        block_given? ? yield : ''
-      end
-    end
-
     def mostrar_con_link(objeto, options = {})
-      return unless objeto.present?
+      return if objeto.blank?
 
       if policy(objeto).show?
         content = truncate_title(block_given? ? yield : objeto)
         if options[:new_tab]
           content += "&nbsp;<i class='fa fa-external-link'>".html_safe
-          link_to content.html_safe, objeto, target: :_blank
+          link_to content.html_safe, objeto, target: :_blank, rel: :noopener
         else
           link_to content.html_safe, objeto
         end
@@ -36,7 +27,7 @@ module PgRails
       string = input.to_s
       if string.length > length
         content_tag :span, title: input, rel: :tooltip do
-          truncate string, length: length
+          truncate string, length:
         end
       else
         string
@@ -44,7 +35,7 @@ module PgRails
     end
 
     def print_cuit(cuit_number)
-      return '' unless cuit_number.present?
+      return '' if cuit_number.blank?
 
       str = cuit_number.to_s
       "#{str[0..1]}-#{str[2..9]}-#{str[10]}"
@@ -52,42 +43,42 @@ module PgRails
 
     def dmy_time(date)
       date = parsear_tiempo(date) if date.is_a? String
-      return unless date.present?
+      return if date.blank?
 
       date.strftime('%d/%m/%Y %H:%M')
     end
 
     def dmy(date)
       date = parsear_fecha(date) if date.is_a? String
-      return unless date.present?
+      return if date.blank?
 
       date.strftime('%d/%m/%Y')
     end
 
     def ymd(date)
       date = parsear_fecha(date) if date.is_a? String
-      return unless date.present?
+      return if date.blank?
 
       date.strftime('%Y/%m/%d')
     end
 
     def dmyg(date)
       date = parsear_fecha(date) if date.is_a? String
-      return unless date.present?
+      return if date.blank?
 
       date.strftime('%d-%m-%Y')
     end
 
     def ymdg(date)
       date = parsear_fecha(date) if date.is_a? String
-      return unless date.present?
+      return if date.blank?
 
       date.strftime('%Y-%m-%d')
     end
 
     def myg(date)
       date = parsear_fecha(date) if date.is_a? String
-      return unless date.present?
+      return if date.blank?
 
       date.strftime('%m-%Y')
     end
@@ -108,14 +99,7 @@ module PgRails
     end
 
     def print_currency(number, moneda = 'pesos')
-      return unless number.present?
-
-      "<span class='currency #{moneda}'>#{number_with_precision(number, delimiter: '.',
-                                                                        separator: ',', precision: 2)}</span>".html_safe
-    end
-
-    def print_currency2(number, moneda = 'pesos')
-      return unless number.present?
+      return if number.blank?
 
       "#{simbolo_moneda(moneda)} #{number_with_precision(number, delimiter: '.', separator: ',',
                                                                  precision: 2)}"
@@ -152,7 +136,7 @@ module PgRails
     end
 
     def parsear_tiempo(datetime)
-      return nil unless datetime.present?
+      return nil if datetime.blank?
 
       DateTime.parse(datetime)
     rescue ArgumentError
@@ -160,7 +144,7 @@ module PgRails
     end
 
     def parsear_fecha(date)
-      return nil unless date.present?
+      return nil if date.blank?
 
       Date.parse(date)
     rescue ArgumentError
@@ -168,7 +152,7 @@ module PgRails
     end
 
     def show_percentage(value)
-      return unless value.present?
+      return if value.blank?
 
       "#{value.round(2)} %"
     end

data/pg_engine/app/helpers/pg_engine/route_helper.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module PgEngine
+  module RouteHelper
+    class NamespaceDeductor
+      def self.request(context)
+        if context.respond_to?(:request) && context.request
+          # Controllers
+          context.request
+        elsif context.respond_to?(:helpers) && context.helpers
+          # Decorators
+          context.helpers.request
+        elsif context.respond_to?(:template) && context.template
+          # FormBuilders
+          context.template.request
+        end
+      end
+
+      def self.namespace(context)
+        req = request(context)
+        route = Rails.application.routes.recognize_path(req.path)
+        parts = route[:controller].split('/')
+        return unless parts.length > 1
+
+        parts.first.to_sym
+      end
+    end
+
+    def pg_namespace
+      NamespaceDeductor.namespace(self)
+    end
+
+    def namespaced_path(object, prefix: nil, suffix: nil)
+      target = [pg_namespace, object]
+      target.prepend prefix if prefix
+      target.append suffix if suffix
+      target = target.flatten.compact
+      polymorphic_url(target, only_path: true)
+    end
+  end
+end

data/pg_engine/app/inputs/pg_engine/fecha_input.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module PgEngine
+  class FechaInput < SimpleForm::Inputs::StringInput
+    def input(wrapper_options = nil)
+      # esto es porque si no Rails llama a value_before_type_cast
+      value = if object.is_a? Draper::Decorator
+                # Salteo el decorator para que me tome la fecha con formato inglés
+                object.object.public_send(attribute_name)
+              else
+                object.public_send(attribute_name)
+              end
+      @input_type = 'date'
+
+      options = merge_wrapper_options({ value:, class: '', autocomplete: 'off' },
+                                      wrapper_options)
+      super(options)
+    end
+  end
+end

data/{app/lib/pg_rails → pg_engine/app/lib/pg_engine}/filtros_builder.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module PgRails
+module PgEngine
   class FiltrosBuilder
     include ActionView::Helpers
     include ActionView::Context
@@ -40,22 +40,21 @@ module PgRails
     def filtrar(query, parametros = nil)
       parametros = parametros_controller if parametros.nil?
 
-      # Filtro soft deleted, y sea con paranoia o con discard
-      query = query.without_deleted if query.respond_to?(:without_deleted)
-      query = query.kept if query.respond_to?(:kept)
+      # Filtro soft deleted
+      query = query.kept if query.respond_to?(:kept) && parametros[:archived] != 'true'
 
-      @filtros.each do |campo, _opciones|
-        next unless parametros[campo].present?
+      @filtros.each_key do |campo|
+        next if parametros[campo].blank?
 
         if @filtros[campo.to_sym].present? && @filtros[campo.to_sym][:query].present?
           query = @filtros[campo.to_sym][:query].call(query, parametros[campo])
         elsif tipo(campo) == :enumerized
           columna = @clase_modelo.columns.find { |c| c.name == campo.to_s }
-          if columna.array
-            query = query.where("? = any(#{@clase_modelo.table_name}.#{campo})", parametros[campo])
-          else
-            query = query.where("#{@clase_modelo.table_name}.#{campo} = ?", parametros[campo])
-          end
+          query = if columna.array
+                    query.where("? = any(#{@clase_modelo.table_name}.#{campo})", parametros[campo])
+                  else
+                    query.where("#{@clase_modelo.table_name}.#{campo} = ?", parametros[campo])
+                  end
         elsif tipo(campo).in?(%i[integer float decimal])
           campo_a_comparar = "#{@clase_modelo.table_name}.#{sin_sufijo(campo)}"
           query = query.where("#{campo_a_comparar} #{comparador(campo)} ?", parametros[campo])
@@ -183,7 +182,7 @@ module PgRails
       @filtros.each do |campo, opciones|
         if opciones[:oculto] ||
            (options[:except].present? && options[:except].include?(campo.to_sym)) ||
-           (options[:only].present? && !options[:only].include?(campo.to_sym))
+           (options[:only].present? && options[:only].exclude?(campo.to_sym))
           next
         end
 
@@ -234,7 +233,7 @@ module PgRails
       nombre_clase = asociacion.options[:class_name]
       nombre_clase = asociacion.name.to_s.camelize if nombre_clase.nil?
       clase_asociacion = Object.const_get(nombre_clase)
-      scope = Pundit.policy_scope!(controller.send(PgRails.configuracion.current_user_method), clase_asociacion)
+      scope = Pundit.policy_scope!(controller.send(PgEngine.configuracion.current_user_method), clase_asociacion)
 
       # Filtro soft deleted, y sea con paranoia o con discard
       scope = scope.without_deleted if scope.respond_to?(:without_deleted)
@@ -300,7 +299,7 @@ module PgRails
       content_tag :div, class: 'col-auto' do
         content_tag :div, class: 'filter' do
           text_field_tag(
-            campo, parametros_controller[campo], class: 'form-control form-control-sm allow-enter-submit', placeholder: placeholder, autocomplete: 'off'
+            campo, parametros_controller[campo], class: 'form-control form-control-sm allow-enter-submit', placeholder:, autocomplete: 'off'
           )
         end
       end
@@ -324,9 +323,9 @@ module PgRails
       content_tag :div, class: 'col-auto' do
         content_tag :div, class: 'filter' do
           label_tag(nil, placeholder, class: 'text-muted') + \
-          date_field_tag(
-            campo, parametros_controller[campo], class: 'form-control form-control-sm d-inline-block w-auto ms-1', placeholder: placeholder, autocomplete: 'off'
-          )
+            date_field_tag(
+              campo, parametros_controller[campo], class: 'form-control form-control-sm d-inline-block w-auto ms-1', placeholder:, autocomplete: 'off'
+            )
         end
       end
     end

data/pg_engine/app/lib/pg_form_builder.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+class PgFormBuilder < SimpleForm::FormBuilder
+  include PgAssociable::FormBuilderMethods
+
+  def mensajes_de_error
+    errors_to_show = object.errors[:base]
+    message = (errors_to_show.map(&:to_s).join('<br>') if errors_to_show.present?)
+
+    error_notification(message:)
+  end
+
+  map_type :date, to: PgEngine::FechaInput
+  # map_type :datetime, to: PgEngine::FechaInput
+
+  def submit_button(*args, &)
+    options = args.extract_options!.dup
+    options[:class] = ['btn-primary', options[:class]].compact
+    args << options
+    send(:submit, *args, &)
+  end
+end

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

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+module PgEngine
+  # rubocop:disable Rails/ApplicationRecord
+  class BaseRecord < ActiveRecord::Base
+    # rubocop:enable Rails/ApplicationRecord
+    extend Enumerize
+    include PrintHelper
+    include PostgresHelper
+
+    self.abstract_class = true
+
+    attr_accessor :current_user
+
+    before_create :setear_creado_y_actualizado_por
+    before_update :setear_actualizado_por
+
+    scope :query, ->(param) { param.present? ? where(id: param) : all }
+
+    def self.ransackable_associations(_auth_object = nil)
+      authorizable_ransackable_associations
+    end
+
+    def self.ransackable_attributes(_auth_object = nil)
+      authorizable_ransackable_attributes
+    end
+
+    def self.nombre_plural
+      model_name.human(count: 2)
+    end
+
+    def self.nombre_singular
+      model_name.human(count: 1)
+    end
+
+    def to_s
+      %i[nombre name].each do |campo|
+        return "#{send(campo)} ##{id}" if try(campo).present?
+      end
+      if id.present?
+        "#{self.class.nombre_singular} ##{id}"
+      else
+        super
+      end
+    end
+
+    private
+
+    def setear_creado_y_actualizado_por
+      setear_si_existe :creado_por, current_user
+      setear_si_existe :actualizado_por, current_user
+    end
+
+    def setear_actualizado_por
+      setear_si_existe :actualizado_por, current_user
+    end
+
+    def setear_si_existe(campo, valor)
+      metodo = "#{campo}="
+      send(metodo, valor) if respond_to?(metodo) && valor.present?
+    end
+  end
+end

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module PgRails
+module PgEngine
   class ApplicationPolicy
     attr_reader :user, :record
 
@@ -88,7 +88,7 @@ module PgRails
     end
 
     def acceso_total?
-      user.admin?
+      user&.admin?
     end
 
     def objeto_borrado?

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

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+wb = xlsx_package.workbook
+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)
+    end
+    sheet.add_row array
+  end
+end

data/pg_engine/app/views/pg_engine/base/index.html.slim

@@ -0,0 +1,51 @@
+- content_for(:title, @clase_modelo.nombre_plural)
+- content_for :actions do
+  button.btn.btn-sm.btn-primary[type="button" data-bs-toggle="collapse"
+                                data-bs-target="#filtros" aria-expanded="false"
+                                aria-controls="filtros"]
+    span.bi.bi-funnel-fill
+    span.d-none.d-sm-inline  Filtrar
+  .ms-1
+  = @clase_modelo.new.decorate.new_link
+  .ms-1
+  = @clase_modelo.new.decorate.export_link(request.url)
+.collapse.p-2.border-bottom#filtros class="#{ 'show' if any_filter? }"
+  .d-flex.align-items-center
+    .px-2.d-none.d-sm-inline-block
+      span.bi.bi-funnel-fill
+    = form_tag nil, class: '', method: :get do
+      .row.g-1
+        = @filtros.filtros_html
+        .col-auto
+          = button_tag class: 'btn btn-sm btn-primary col-auto' do
+            span.bi.bi-search
+        .col-auto
+          = link_to namespaced_path(@clase_modelo),
+                    class: 'btn btn-sm btn-secondary col-auto' do
+            | Limpiar
+
+div
+  - if @collection.any?
+    .table-responsive
+      table.table.table-sm.listado.xpg-revert-width.xborder-end
+        caption.ps-3 = page_entries_info @collection
+        thead.table-light
+          tr
+            - atributos_para_listar.each do |att|
+              th = encabezado att, ordenable: true
+            th
+        tbody
+          - @collection.each do |object|
+            - object = object.decorate
+            tr id="#{dom_id(object)}"
+              - atributos_para_listar.each do |att|
+                th = object.send(att)
+              td.text-nowrap.text-end.ps-5
+                = object.show_link
+                = object.edit_link
+                = object.destroy_link
+
+    .ps-3.justify-content-center
+      = paginate(@collection)
+  - else
+    p.m-3 No hay #{@clase_modelo.nombre_plural.downcase} que mostrar

data/pg_engine/config/locales/es.yml

@@ -0,0 +1,48 @@
+es:
+  attributes:
+    created_at: Fecha de creación
+    updated_at: Fecha de actualización
+    discarded_at: Fecha de borrado
+    actualizado_por: Actualizado por
+    creado_por: Creado por
+  ancestry:
+    exclude_self: No puede ser hijx de si mismx
+  simple_form:
+    # labels:
+    #   user:
+    #     username: 'User name'
+    #     password: 'Password'
+    # hints:
+    error_notification:
+      default_message: "hubo algunos errores:"
+
+  simple_form:
+    "yes": 'Sí'
+    "no": 'No'
+    required:
+      text: 'required'
+      mark: '*'
+      # You can uncomment the line below if you need to overwrite the whole required html.
+      # When using html, text and mark won't be used.
+      # html: '<abbr title="required">*</abbr>'
+    error_notification:
+      default_message: "Por favor, revisá los errores debajo:"
+    # Examples
+    # labels:
+    #   defaults:
+    #     password: 'Password'
+    #   user:
+    #     new:
+    #       email: 'E-mail to sign in.'
+    #     edit:
+    #       email: 'E-mail.'
+    # hints:
+    #   defaults:
+    #     username: 'User name to sign in.'
+    #     password: 'No special characters, please.'
+    # include_blanks:
+    #   defaults:
+    #     age: 'Rather not say'
+    # prompts:
+    #   defaults:
+    #     age: 'Select your age'