pg_rails 7.0.2 → 7.0.4

data/pg_engine/app/controllers/pg_engine/resource_helper.rb

@@ -0,0 +1,289 @@
+module PgEngine
+  module ResourceHelper
+    def self.included(clazz)
+      clazz.before_action :authenticate_user!
+      clazz.helper_method :atributos_para_listar
+      clazz.helper_method :atributos_para_mostrar
+      clazz.helper_method :current_page_size
+      clazz.helper_method :any_filter?
+    end
+
+    # Public endpoints
+    def abrir_modal
+      pg_respond_abrir_modal
+    end
+
+    def buscar
+      pg_respond_buscar
+    end
+
+    def index
+      @collection = filtros_y_policy atributos_para_buscar
+      @collection = sort_collection(@collection)
+      pg_respond_index
+    end
+
+    def show
+      add_breadcrumb instancia_modelo, instancia_modelo.target_object
+
+      pg_respond_show
+    end
+
+    def new
+      add_breadcrumb "Crear #{@clase_modelo.nombre_singular.downcase}"
+    end
+
+    def edit
+      add_breadcrumb instancia_modelo, instancia_modelo.target_object
+      add_breadcrumb 'Editando'
+    end
+
+    def create
+      pg_respond_create
+    end
+
+    def update
+      pg_respond_update
+    end
+
+    def destroy
+      url = namespaced_path(@clase_modelo)
+      pg_respond_destroy(instancia_modelo, url)
+    end
+    # End public endpoints
+
+    protected
+
+    def any_filter?
+      params.keys.reject { |a| a.in? %w[controller action page page_size order_by order_direction] }.any?
+    end
+
+    def current_page_size
+      if params[:page_size].present?
+        session[:page_size] = params[:page_size]
+        params[:page_size].to_i
+      else
+        default_page_size
+      end
+    end
+
+    def default_page_size
+      session[:page_size].present? ? session[:page_size].to_i : 10
+    end
+
+    def pg_respond_update(object: nil)
+      object ||= instancia_modelo
+      respond_to do |format|
+        if (@saved = object.save)
+          format.html { redirect_to object.decorate.target_object }
+          format.json { render json: object.decorate }
+        else
+          format.html { render :edit, status: :unprocessable_entity }
+          format.json { render json: object.errors, status: :unprocessable_entity }
+        end
+      end
+    end
+
+    def pg_respond_create(object: nil)
+      object ||= instancia_modelo
+      respond_to do |format|
+        if (@saved = object.save)
+          if params[:asociable]
+            format.turbo_stream do
+              render turbo_stream:
+                turbo_stream.update('pg-associable-form', <<~HTML
+                  <div data-modal-target="response" data-response='#{object.decorate.to_json}'></div>
+                HTML
+                )
+            end
+          end
+          format.html do
+            if params[:save_and_next] == 'true'
+              new_path = "#{url_for(@clase_modelo)}/new"
+              redirect_to new_path, notice: "#{@clase_modelo.nombre_singular} creado."
+            else
+              redirect_to object.decorate.target_object
+            end
+          end
+          format.json { render json: object.decorate }
+        else
+          if params[:asociable]
+            format.turbo_stream do
+              render turbo_stream:
+                turbo_stream.update('pg-associable-form', partial: 'form', locals: { asociable: true })
+            end
+          end
+          format.html { render :new, status: :unprocessable_entity }
+          format.json { render json: object.errors.full_messages, status: :unprocessable_entity }
+        end
+      end
+    end
+
+    def pg_respond_index
+      respond_to do |format|
+        format.json { render json: @collection }
+        format.html { render_listing }
+        format.xlsx do
+          render xlsx: 'download',
+                 filename: "#{@clase_modelo.nombre_plural.gsub(' ', '-').downcase}" \
+                           "-#{Time.zone.now.strftime('%Y-%m-%d-%H.%M.%S')}.xlsx"
+        end
+      end
+    end
+
+    def pg_respond_show(object = nil)
+      respond_to do |format|
+        format.json { render json: object || instancia_modelo }
+        format.html
+      end
+    end
+
+    def pg_respond_destroy(model, redirect_url = nil)
+      if destroy_model(model)
+        respond_to do |format|
+          format.html do
+            if redirect_url.present?
+              redirect_to redirect_url, notice: 'Elemento borrado.', status: :see_other
+            else
+              redirect_back(fallback_location: root_path, notice: 'Elemento borrado.', status: 303)
+            end
+          end
+          format.json { head :no_content }
+        end
+      else
+        respond_to do |format|
+          format.html do
+            if model.respond_to?(:associated_elements) && model.associated_elements.present?
+              @model = model
+              render destroy_error_details_view
+            else
+              flash[:alert] = @error_message
+              # if redirect_url.present?
+              #   redirect_to redirect_url
+              # else
+              redirect_back(fallback_location: root_path, status: 303)
+              # end
+            end
+          end
+          format.json { render json: { error: @error_message }, status: :unprocessable_entity }
+        end
+      end
+    end
+
+    # TODO: crear esta vista en pg_rails
+    def destroy_error_details_view
+      'destroy_error_details'
+    end
+
+    def destroy_model(model)
+      @error_message = 'No se pudo eliminar el registro'
+      begin
+        destroy_method = model.respond_to?(:discard) ? :discard : :destroy
+        return true if model.send(destroy_method)
+
+        @error_message = model.errors.full_messages.join(', ')
+        false
+      rescue ActiveRecord::InvalidForeignKey => e
+        # class_name = /from table \"(?<table_name>[\p{L}_]*)\"/.match(e.message)[:table_name].singularize.camelcase
+        # # pk_id = /from table \"(?<pk_id>[\p{L}_]*)\"/.match(e.message)[:pk_id].singularize.camelcase
+        # clazz = Object.const_get class_name
+        # objects = clazz.where(model.class.table_name.singularize => model)
+        model_name = t("activerecord.models.#{model.class.name.underscore}")
+        @error_message = "#{model_name} no se pudo borrar porque tiene elementos asociados."
+        logger.debug e.message
+      end
+      false
+    end
+
+    def render_listing
+      @collection = @collection.page(params[:page]).per(current_page_size)
+    end
+
+    def buscar_instancia
+      if Object.const_defined?('FriendlyId') && @clase_modelo.is_a?(FriendlyId)
+        @clase_modelo.friendly.find(params[:id])
+      else
+        @clase_modelo.find(params[:id])
+      end
+    end
+
+    def set_instancia_modelo
+      if action_name.in? %w[new create]
+        self.instancia_modelo = @clase_modelo.new(modelo_params)
+      else
+        self.instancia_modelo = buscar_instancia
+
+        instancia_modelo.assign_attributes(modelo_params) if action_name.in? %w[update]
+      end
+
+      instancia_modelo.current_user = send(PgEngine.configuracion.current_user_method)
+
+      authorize instancia_modelo
+
+      # TODO: problema en create y update cuando falla la validacion
+      self.instancia_modelo = instancia_modelo.decorate if action_name.in? %w[show edit new]
+    end
+
+    def instancia_modelo=(val)
+      instance_variable_set(:"@#{nombre_modelo}", val)
+    end
+
+    def instancia_modelo
+      instance_variable_get(:"@#{nombre_modelo}")
+    end
+
+    def modelo_params
+      if action_name == 'new'
+        params.permit(atributos_permitidos)
+      else
+        params.require(nombre_modelo).permit(atributos_permitidos)
+      end
+    end
+
+    def nombre_modelo
+      @clase_modelo.name.underscore
+    end
+
+    def clase_modelo
+      # agarro la variable o intento con el nombre del controller
+      @clase_modelo ||= self.class.name.singularize.gsub('Controller', '').constantize
+    end
+
+    def filtros_y_policy(campos)
+      @filtros = PgEngine::FiltrosBuilder.new(
+        self, clase_modelo, campos
+      )
+      scope = policy_scope(clase_modelo)
+
+      @filtros.filtrar(scope)
+    end
+
+    def do_sort(scope, field, direction)
+      unless scope.model.column_names.include? field.to_s
+        PgLogger.warning("No existe el campo \"#{field}\"")
+        return scope
+      end
+      scope = scope.order(field => direction)
+      instance_variable_set(:@field, field)
+      instance_variable_set(:@direction, direction)
+      scope
+    rescue ArgumentError => e
+      PgLogger.warning(e.to_s)
+      scope
+    end
+
+    def sort_collection(scope, options = {})
+      if params[:order_by].present?
+        field = params[:order_by]
+        direction = params[:order_direction]
+        do_sort(scope, field, direction)
+      elsif options[:default].present?
+        field = options[:default].first[0]
+        direction = options[:default].first[1]
+        do_sort(scope, field, direction)
+      else
+        scope
+      end
+    end
+  end
+end

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

@@ -5,7 +5,9 @@ module PgEngine
     end
 
     def render_turbo_stream_title
-      turbo_stream.update 'title', "#{breadcrumbs.last&.name} - #{Rails.application.class.module_parent_name}"
+      # rubocop:disable Rails/SkipsModelValidations
+      turbo_stream.update_all 'title', "#{breadcrumbs.last&.name} - #{Rails.application.class.module_parent_name}"
+      # rubocop:enable Rails/SkipsModelValidations
     end
 
     def flash_type_to_class(flash_type)

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

@@ -23,6 +23,8 @@ module PgEngine
         return unless parts.length > 1
 
         parts.first.to_sym
+      rescue ActionController::RoutingError
+        nil
       end
     end
 

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

@@ -39,7 +39,7 @@ div
             - object = object.decorate
             tr id="#{dom_id(object)}"
               - atributos_para_listar.each do |att|
-                th = object.send(att)
+                td = object.send(att)
               td.text-nowrap.text-end.ps-5
                 = object.show_link
                 = object.edit_link

data/pg_engine/lib/pg_engine/engine.rb

@@ -31,11 +31,15 @@ module PgEngine
     end
 
     initializer 'byebug_bullet' do
-      if Rails.env.development?
+      if Rails.env.local?
         # Byebug
         require 'byebug/core'
         begin
           Byebug.start_server 'localhost', ENV.fetch('BYEBUG_SERVER_PORT', 8989).to_i
+          if ENV.fetch('SLEEP_AFTER_BYEBUG', false)
+            puts 'waiting 3 secs after starting byebug server for connections'
+            sleep 3
+          end
         rescue Errno::EADDRINUSE
           Rails.logger.debug 'Byebug server already running'
         end

data/pg_engine/lib/pg_engine/route_helpers.rb

@@ -0,0 +1,12 @@
+module PgEngine
+  module RouteHelpers
+    def pg_resource(key)
+      resources(key) do
+        collection do
+          get :abrir_modal
+          post :buscar
+        end
+      end
+    end
+  end
+end

data/pg_engine/lib/pg_engine/utils/pg_logger.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require 'rainbow'
+
+module PgEngine
+  class PgLogger
+    class << self
+      def deprecated(mensaje)
+        titulo = Rainbow("  WARNING en #{caller[1]}").yellow.bold
+        detalles = Rainbow("  #{mensaje}").yellow
+        Rails.logger.warn("#{titulo}\n#{detalles}")
+        Rollbar.warning("#{mensaje}\n\n#{caller.join("\n")}")
+      end
+
+      def excepcion(exception)
+        titulo = Rainbow("  EXCEPCION #{exception.class} en #{caller.first}").red.bold
+        detalles = Rainbow("  #{exception.message}").red
+        Rails.logger.error("#{titulo}\n#{detalles}")
+        Rollbar.error(exception)
+      end
+
+      def error(mensaje)
+        titulo = Rainbow("  ERROR en #{caller.first}").red.bold
+        detalles = Rainbow("  #{mensaje}").red
+        Rails.logger.error("#{titulo}\n#{detalles}")
+        Rollbar.error("#{mensaje}\n\n#{caller.join("\n")}")
+      end
+
+      def warning(mensaje)
+        titulo = Rainbow("  WARNING en #{caller.first}").yellow.bold
+        detalles = Rainbow("  #{mensaje}").yellow
+        Rails.logger.warn("#{titulo}\n#{detalles}")
+        Rollbar.warning("#{mensaje}\n\n#{caller.join("\n")}")
+      end
+
+      def info(mensaje)
+        titulo = Rainbow("  INFO en #{caller.first}").blue.bold
+        detalles = Rainbow("  #{mensaje}").blue
+        Rails.logger.info("#{titulo}\n#{detalles}")
+        Rollbar.info("#{mensaje}\n\n#{caller.join("\n")}")
+      end
+    end
+  end
+end

data/pg_engine/lib/pg_engine.rb

@@ -3,7 +3,8 @@
 require_relative 'pg_engine/engine'
 require_relative 'pg_engine/core_ext'
 require_relative 'pg_engine/configuracion'
-require_relative 'pg_engine/utils/logueador'
+require_relative 'pg_engine/route_helpers'
+require_relative 'pg_engine/utils/pg_logger'
 
 module PgEngine
   class << self
@@ -20,16 +21,5 @@ module PgEngine
     def configurar
       yield(configuracion)
     end
-
-    def resource_route(rails_router, key)
-      rails_router.instance_eval do
-        resources(key) do
-          collection do
-            get :abrir_modal
-            post :buscar
-          end
-        end
-      end
-    end
   end
 end

data/pg_layout/app/assets/stylesheets/sidebar.scss

@@ -1,3 +1,7 @@
+html, body {
+  height: 100%;
+}
+
 .navbar {
   --#{$prefix}navbar-toggler-border-color: #{$primary};
 }

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

@@ -1,14 +1,13 @@
 doctype html
 html
   head
-    title#title PgRails
+    title = Rails.application.class.module_parent_name
     meta name="viewport" content="width=device-width,initial-scale=1"
     = csrf_meta_tags
     = csp_meta_tag
 
     = stylesheet_link_tag 'application', 'data-turbo-track': 'reload'
     = javascript_include_tag 'application', 'data-turbo-track': 'reload', type: 'module'
-
   body
     div
       .text-center
@@ -17,6 +16,7 @@ html
       .container.text-center
         = yield
       = render_turbo_stream_title
+
 css:
   .pg-form {
     max-width: 300px;

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

@@ -1,7 +1,7 @@
 doctype html
 html
   head
-    title PgRails
+    title = Rails.application.class.module_parent_name
     meta name="viewport" content="width=device-width,initial-scale=1"
     = csrf_meta_tags
     = csp_meta_tag
@@ -28,3 +28,4 @@ html
                 = yield(:actions)
             hr.my-0
           = yield
+    = render_turbo_stream_title

data/pg_layout/app/views/pg_layout/_navbar.html.erb

@@ -33,11 +33,3 @@
     </div>
   </div>
 </nav>
-<!-- <nav>
-  <ul>
-    <li>
-
-    </li>
-  </ul>
-</nav>
- -->

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.2'
+  VERSION = '7.0.4'
 end

data/pg_scaffold/lib/generators/pg_active_record/model/templates/admin.rb

@@ -1,5 +1,5 @@
 ActiveAdmin.register <%= class_name %> do
-  permit_params <%= attributes.map { |a| ":#{a.name}" }.join(', ') %>
+  permit_params <%= attributes_names.map { |a| ":#{a}" }.join(', ') %>
 
   index do
     selectable_column

data/pg_scaffold/lib/generators/pg_active_record/model/templates/model.rb

@@ -32,7 +32,6 @@ class <%= class_name %> < <%= parent_class_name.classify %>
   enumerize :<%= attribute.name %>, in: { completar: 0, los: 1, valores: 2 }
     <%- end -%>
   <%- end -%>
-
   <%- if attributes.any?(&:required?) -%>
 
   validates <%= attributes.select(&:required?).map { |at| ":#{at.name}" }.join(', ') %>, presence: true

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_rspec/scaffold/templates/controller_spec.rb

@@ -60,6 +60,13 @@ RSpec.describe <%= controller_class_name %>Controller do
     sign_in user if user.present?
   end
 
+  describe 'routing' do
+    it 'routes GET index correctly' do
+      route = { get: '/<%= controller_file_path %>' }
+      expect(route).to route_to(controller: '<%= controller_file_path %>', action: 'index')
+    end
+  end
+
 <% unless options[:singleton] -%>
   describe 'GET #index' do
     subject do

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

@@ -57,15 +57,11 @@ class PgScaffoldGenerator < Rails::Generators::NamedBase
 
   def parent_controller
     parts = controller_class_name.split('::')
-    if parts.length > 1
-      if get_class "#{parts.first}Controller"
-        "#{parts.first}Controller"
-      else
-        'PgEngine::SignedInController'
-      end
-    else
-      'PgEngine::SignedInController'
-    end
+    namesp = namespace.present? ? "#{namespace}::" : ''
+    cont_name = "#{namesp}#{parts.first}Controller"
+    return cont_name if parts.length > 1 && get_class(cont_name)
+
+    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 -%>

data/pg_scaffold/spec/generators_spec.rb

@@ -0,0 +1,55 @@
+require 'rails_helper'
+
+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__)
+
+describe 'Generators' do
+  describe 'PgDecoratorGenerator' do
+    destination DESTINATION_PATH
+    tests PgDecoratorGenerator
+
+    before { prepare_destination }
+
+    it do
+      run_generator(['Frontend/Modelo', 'bla:integer'])
+
+      my_assert_file 'app/decorators/modelo_decorator.rb' do |content|
+        assert_match(/delegate_all/, content)
+      end
+    end
+  end
+
+  describe 'ScaffoldGenerator' do
+    destination DESTINATION_PATH
+    tests PgRspec::Generators::ScaffoldGenerator
+
+    before { prepare_destination }
+
+    it 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 user/, content)
+      end
+    end
+  end
+
+  describe PgActiveRecord::ModelGenerator do
+    destination DESTINATION_PATH
+    tests described_class
+
+    before { prepare_destination }
+
+    it 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)
+      end
+    end
+  end
+end