pg_rails 7.0.5 → 7.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d63547ea3619de2194b7906e2344df8fe1ff049cd3b066ba1adcb61cf1ae8102
-  data.tar.gz: 5845c9d534c94be6ddb71823271d21f3d2c28615ba5d70d5a874478799d48eeb
+  metadata.gz: c615490752a2afcaa4959f18c3b58bc214849a0912c308aea4b75a48122aa859
+  data.tar.gz: d4e8cc1fc2418a2691ef25607776de7ab1b6936367379cb4571c12925836933c
 SHA512:
-  metadata.gz: b7611fd24a756c4a7c6e8573f67b48dd0e9598839065feef9ac6345e8e09e0b71087db795647524f6f8bd9734fe67c6da54d4305391306441eddcaf6b0120937
-  data.tar.gz: 204dc0788a96e724b67038d0c89e1a8cecf69a1a4fd8f8ada7d105289ed0615641eed73e8353cf85acea3be573332d05583070650740c37ed53d891c2ec30579
+  metadata.gz: 3c7cad41dc0953598c49c7a48ca188e24a62d8dea1d1aed95f530e5eb92faa18bbf1033aac19c8adf963f759e7d0de52e905b4001354afb282373a257f8042be
+  data.tar.gz: 8ecd2f4a9617b57b3938f307502883681d70dab249a6f0fbb0789855b411465dac411ffe7dc3056ee0b49a40f84db8a77ce71739bd7dbc9ad81691b42c4de591

data/README.md

@@ -73,3 +73,16 @@ Acceder a la app en <http://localhost:3000/>.
 4. `bundle exec rails g pg_scaffold Admin/CategoriaDeCosa nombre:string{required} "tipo:integer{enum,required}" fecha:date tiempo:datetime --model-name=CategoriaDeCosa --discard --activeadmin`
 5. `bundle exec rails g pg_scaffold Admin/Cosa  nombre:string{required} "tipo:integer{enum,required}" categoria_de_cosa:references{required}  --model-name=Cosa --discard --activeadmin`
 6. Setup asociacion creable en cosas/_form
+
+
+
+be rake app:pg_engine_engine:install:migrations
+
+be rails pg_engine_engine:install:migrations
+
+
+    "build": "esbuild pg_rails/js/index.js --bundle --sourcemap --format=esm --outdir=pg_rails/builds --public-path=/assets",
+    "build:css:compile": "sass ./pg_rails/scss/pg_rails.scss:./pg_rails/builds/application.css --no-source-map --load-path=node_modules",
+    "build:css:prefix": "postcss ./pg_rails/builds/application.css --use=autoprefixer --output=./pg_rails/builds/application.css",
+    "build:css": "yarn build:css:compile && yarn build:css:prefix",
+

data/pg_associable/lib/pg_associable/engine.rb

@@ -1,9 +1,5 @@
-require "#{__dir__}/../../app/helpers/pg_associable/helpers"
-require "#{__dir__}/../../app/helpers/pg_associable/form_builder_methods"
-
 module PgAssociable
   class Engine < ::Rails::Engine
-    isolate_namespace PgAssociable
     # initializer 'configurar_simple_form', after: 'factory_bot.set_fixture_replacement' do
     initializer 'configurar_pg_scaffold' do
       require 'pg_associable/simple_form_initializer'

data/pg_associable/lib/pg_associable/simple_form_initializer.rb

@@ -3,7 +3,7 @@ SimpleForm.setup do |config|
                                   error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b|
     b.use :html5
     b.optional :readonly
-    b.use :label, class: 'form-control-label'
+    b.use :label, class: 'form-label'
     b.use :hidden_input
     b.wrapper tag: 'div', class: 'position-relative' do |ba|
       ba.use :input, class: 'form-control', disabled: true, placeholder: 'Clic para seleccionar...',
@@ -20,7 +20,7 @@ SimpleForm.setup do |config|
                                          error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b|
     b.use :html5
     b.optional :readonly
-    b.use :label, class: 'form-control-label'
+    b.use :label, class: 'form-label'
     b.use :hidden_input
     b.wrapper tag: 'div', class: 'search-box position-relative' do |ba|
       ba.use :search_form, error_class: 'is-invalid'

data/pg_associable/spec/pg_associable/helpers_spec.rb

@@ -2,10 +2,11 @@ require 'rails_helper'
 
 describe PgAssociable::Helpers do
   describe '#pg_respond_buscar' do
-    let(:user) { create :user }
+    let(:user) { create :user, :developer }
     let(:ctrl) do
-      clazz = Class.new(PgEngine::BaseController)
-      clazz.new
+      # clazz = Class.new(Admin::CosasController)
+      # clazz.new
+      Admin::CosasController.new
     end
     let!(:cosa) { create :cosa }
 

data/pg_engine/app/admin/accounts.rb

@@ -0,0 +1,25 @@
+ActiveAdmin.register Account do
+  permit_params :plan, :nombre, :hashid
+
+  index do
+    selectable_column
+    id_column
+    column :plan
+    column :nombre
+    column :hashid
+    actions
+  end
+
+  filter :plan
+  filter :nombre
+  filter :hashid
+
+  form do |f|
+    f.inputs do
+      f.input :plan
+      f.input :nombre
+      f.input :hashid
+    end
+    f.actions
+  end
+end

data/pg_engine/{lib/templates/activeadmin → app/admin}/audits.rb

@@ -1,7 +1,7 @@
 ActiveAdmin.register Audited::Audit do
-  permit_params [:auditable_id, :auditable_type, :associated_id, :associated_type, :user_id,
-                 :user_type, :username, :action, :audited_changes, :version, :comment,
-                 :remote_address, :request_uuid, :created_at]
+  permit_params %i[auditable_id auditable_type associated_id associated_type user_id
+                   user_type username action audited_changes version comment
+                   remote_address request_uuid created_at]
 
   # :id
   # :discarded_at, :fecha, :nombre, :tiempo, :tipo, :created_at, :updated_at, :actualizado_por_id, :creado_por_id

data/pg_engine/app/admin/dashboard.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+ActiveAdmin.register_page 'Dashboard' do
+  menu priority: 1, label: proc { I18n.t('active_admin.dashboard') }
+
+  content title: proc { I18n.t('active_admin.dashboard') } do
+    div class: 'blank_slate_container', id: 'dashboard_default_message' do
+      span class: 'blank_slate' do
+        span I18n.t('active_admin.dashboard_welcome.welcome')
+        small I18n.t('active_admin.dashboard_welcome.call_to_action')
+      end
+    end
+
+    # Here is an example of a simple dashboard with columns and panels.
+    #
+    # columns do
+    #   column do
+    #     panel "Recent Posts" do
+    #       ul do
+    #         Post.recent(5).map do |post|
+    #           li link_to(post.title, admin_post_path(post))
+    #         end
+    #       end
+    #     end
+    #   end
+
+    #   column do
+    #     panel "Info" do
+    #       para "Welcome to ActiveAdmin."
+    #     end
+    #   end
+    # end
+  end
+end

data/pg_engine/app/admin/user_accounts.rb

@@ -0,0 +1,26 @@
+ActiveAdmin.register UserAccount do
+  decorate_with UserAccountDecorator
+  permit_params :user_id, :account_id, profiles: []
+
+  index do
+    selectable_column
+    id_column
+    column :user
+    column :account
+    column :profiles
+    actions
+  end
+
+  filter :user
+  filter :account
+  filter :profiles
+
+  form do |f|
+    f.inputs do
+      f.input :user
+      f.input :account
+      f.input :profiles, as: :select
+    end
+    f.actions
+  end
+end

data/pg_engine/{lib/templates/activeadmin → app/admin}/users.rb

@@ -1,6 +1,6 @@
 ActiveAdmin.register User do
   decorate_with UserDecorator
-  permit_params :email, :password, :password_confirmation, :confirmed_at, profiles: []
+  permit_params :email, :password, :password_confirmation, :confirmed_at
 
   index do
     selectable_column
@@ -19,7 +19,6 @@ ActiveAdmin.register User do
       else
         f.input :email
         f.input :password unless f.object.persisted?
-        f.input :profiles, as: :select
       end
     end
     f.actions

data/pg_engine/app/assets/javascripts/active_admin.js

@@ -0,0 +1 @@
+//= require active_admin/base

data/pg_engine/app/assets/stylesheets/active_admin.scss

@@ -0,0 +1,17 @@
+// Sass variable overrides must be declared before loading up Active Admin's styles.
+//
+// To view the variables that Active Admin provides, take a look at
+// `app/assets/stylesheets/active_admin/mixins/_variables.scss` in the
+// Active Admin source.
+//
+// For example, to change the sidebar width:
+// $sidebar-width: 242px;
+
+// Active Admin's got SASS!
+@import "active_admin/mixins";
+@import "active_admin/base";
+
+// Overriding any non-variable Sass must be done after the fact.
+// For example, to change the default status-tag color:
+//
+//   .status_tag { background: #6090DB; }

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

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+# generado con pg_rails
+
+module Admin
+  class AccountsController < AdminController
+    before_action { @clase_modelo = Account }
+
+    before_action(only: :index) { authorize Account }
+
+    before_action :set_instancia_modelo, only: %i[new create show edit update destroy]
+
+    add_breadcrumb Account.nombre_plural, :admin_accounts_path
+
+    private
+
+    def atributos_permitidos
+      %i[plan nombre hashid]
+    end
+
+    def atributos_para_buscar
+      %i[plan nombre hashid]
+    end
+
+    def atributos_para_listar
+      %i[plan nombre hashid]
+    end
+
+    def atributos_para_mostrar
+      %i[plan nombre hashid]
+    end
+  end
+end

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

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+# generado con pg_rails
+
+module Admin
+  class UserAccountsController < AdminController
+    before_action { @clase_modelo = UserAccount }
+
+    before_action(only: :index) { authorize UserAccount }
+
+    before_action :set_instancia_modelo, only: %i[new create show edit update destroy]
+
+    add_breadcrumb UserAccount.nombre_plural, :admin_user_accounts_path
+
+    private
+
+    def atributos_permitidos
+      %i[user_id account_id profiles]
+    end
+
+    def atributos_para_buscar
+      %i[user account profiles]
+    end
+
+    def atributos_para_listar
+      %i[user account profiles]
+    end
+
+    def atributos_para_mostrar
+      %i[user account profiles]
+    end
+  end
+end

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

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+# generado con pg_rails
+
+module Admin
+  class UsersController < AdminController
+    before_action { @clase_modelo = User }
+
+    before_action(only: :index) { authorize User }
+
+    before_action only: %i[update] do
+      params[:user].delete(:password) if params[:user][:password].blank?
+    end
+
+    before_action :set_instancia_modelo, only: %i[new create show edit update destroy]
+
+    add_breadcrumb User.nombre_plural, :admin_users_path
+
+    def create
+      @user.skip_confirmation!
+      pg_respond_create
+    end
+
+    def update
+      @user.skip_reconfirmation!
+      pg_respond_update
+    end
+
+    private
+
+    def atributos_permitidos
+      %i[email password developer]
+    end
+
+    def atributos_para_buscar
+      %i[email developer]
+    end
+
+    def atributos_para_listar
+      %i[email developer]
+    end
+
+    def atributos_para_mostrar
+      %i[email developer]
+    end
+  end
+end

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

@@ -30,7 +30,7 @@ module PgEngine
     end
 
     def new
-      add_breadcrumb "Crear #{@clase_modelo.nombre_singular.downcase}"
+      add_breadcrumb 'Crear'
     end
 
     def edit
@@ -71,21 +71,23 @@ module PgEngine
       session[:page_size].present? ? session[:page_size].to_i : 10
     end
 
-    def pg_respond_update(object: nil)
-      object ||= instancia_modelo
+    def pg_respond_update
+      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
+          # TODO: esto solucionaría el problema?
+          # self.instancia_modelo = instancia_modelo.decorate
           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
+    def pg_respond_create
+      object = instancia_modelo
       respond_to do |format|
         if (@saved = object.save)
           if params[:asociable]
@@ -107,6 +109,8 @@ module PgEngine
           end
           format.json { render json: object.decorate }
         else
+          # TODO: esto solucionaría el problema?
+          # self.instancia_modelo = instancia_modelo.decorate
           if params[:asociable]
             format.turbo_stream do
               render turbo_stream:
@@ -221,6 +225,7 @@ module PgEngine
       authorize instancia_modelo
 
       # TODO: problema en create y update cuando falla la validacion
+      # Reproducir el error antes de arreglarlo
       self.instancia_modelo = instancia_modelo.decorate if action_name.in? %w[show edit new]
     end
 

data/pg_engine/app/decorators/account_decorator.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+# generado con pg_rails
+
+class AccountDecorator < PgEngine::BaseDecorator
+  delegate_all
+
+  # Define presentation-specific methods here. Helpers are accessed through
+  # `helpers` (aka `h`). You can override attributes, for example:
+  #
+  #   def created_at
+  #     helpers.content_tag :span, class: 'time' do
+  #       object.created_at.strftime("%a %m/%d/%y")
+  #     end
+  #   end
+end

data/pg_engine/app/decorators/pg_engine/base_decorator.rb

@@ -16,18 +16,20 @@ module PgEngine
       object.as_json.tap { |o| o[:to_s] = to_s }
     end
 
-    # def method_missing(method_name, *args, &block)
-    #   valor = object.attributes[method_name.to_s]
-    #   return super unless valor.present?
-
-    #   if valor.instance_of?(Date)
-    #     dmy(valor)
-    #   # elsif valor.class == ActiveSupport::TimeWithZone
-    #   #   dmy_time(valor)
-    #   else
-    #     super
-    #   end
-    # end
+    # rubocop:disable Style/MissingRespondToMissing
+    def method_missing(method_name, *args, &)
+      valor = object.attributes[method_name.to_s]
+      return super if valor.blank?
+
+      if valor.instance_of?(Date)
+        dmy(valor)
+      elsif valor.instance_of?(ActiveSupport::TimeWithZone)
+        dmy_time(valor)
+      else
+        super
+      end
+    end
+    # rubocop:enable Style/MissingRespondToMissing
 
     def destroy_link(message = '¿Estás seguro?')
       return unless Pundit.policy!(helpers.send(PgEngine.configuracion.current_user_method), object).destroy?

data/pg_engine/app/decorators/user_account_decorator.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+# generado con pg_rails
+
+class UserAccountDecorator < PgEngine::BaseDecorator
+  delegate_all
+
+  def profiles
+    object.profiles.join(', ')
+  end
+  # Define presentation-specific methods here. Helpers are accessed through
+  # `helpers` (aka `h`). You can override attributes, for example:
+  #
+  #   def created_at
+  #     helpers.content_tag :span, class: 'time' do
+  #       object.created_at.strftime("%a %m/%d/%y")
+  #     end
+  #   end
+end

data/pg_engine/app/decorators/user_decorator.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+# generado con pg_rails
+
+class UserDecorator < PgEngine::BaseDecorator
+  delegate_all
+
+  def default_module
+    :admin
+  end
+
+  # Define presentation-specific methods here. Helpers are accessed through
+  # `helpers` (aka `h`). You can override attributes, for example:
+  #
+  #   def created_at
+  #     helpers.content_tag :span, class: 'time' do
+  #       object.created_at.strftime("%a %m/%d/%y")
+  #     end
+  #   end
+end

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

@@ -1,7 +1,7 @@
 module PgEngine
   module FlashHelper
     def render_turbo_stream_flash_messages
-      turbo_stream.prepend 'flash', partial: 'layouts/flash'
+      turbo_stream.prepend 'flash', partial: 'pg_layout/flash'
     end
 
     def render_turbo_stream_title

data/pg_engine/app/models/account.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+# == Schema Information
+#
+# Table name: accounts
+#
+#  id                 :bigint           not null, primary key
+#  discarded_at       :datetime
+#  hashid             :string
+#  nombre             :string           not null
+#  plan               :integer          not null
+#  created_at         :datetime         not null
+#  updated_at         :datetime         not null
+#  actualizado_por_id :bigint
+#  creado_por_id      :bigint
+#
+# Indexes
+#
+#  index_accounts_on_actualizado_por_id  (actualizado_por_id)
+#  index_accounts_on_creado_por_id       (creado_por_id)
+#
+# Foreign Keys
+#
+#  fk_rails_...  (actualizado_por_id => users.id)
+#  fk_rails_...  (creado_por_id => users.id)
+#
+# generado con pg_rails
+
+class Account < ApplicationRecord
+  audited
+  include Discard::Model
+
+  belongs_to :creado_por, optional: true, class_name: 'User'
+  belongs_to :actualizado_por, optional: true, class_name: 'User'
+
+  enumerize :plan, in: { completar: 0, los: 1, valores: 2 }
+
+  validates :plan, :nombre, presence: true
+end

data/pg_engine/app/models/user.rb

@@ -0,0 +1,61 @@
+# == Schema Information
+#
+# Table name: users
+#
+#  id                     :bigint           not null, primary key
+#  confirmation_sent_at   :datetime
+#  confirmation_token     :string
+#  confirmed_at           :datetime
+#  current_sign_in_at     :datetime
+#  current_sign_in_ip     :string
+#  developer              :boolean          default(FALSE), not null
+#  discarded_at           :datetime
+#  email                  :string           default(""), not null
+#  encrypted_password     :string           default(""), not null
+#  failed_attempts        :integer          default(0), not null
+#  last_sign_in_at        :datetime
+#  last_sign_in_ip        :string
+#  locked_at              :datetime
+#  remember_created_at    :datetime
+#  reset_password_sent_at :datetime
+#  reset_password_token   :string
+#  sign_in_count          :integer          default(0), not null
+#  unconfirmed_email      :string
+#  unlock_token           :string
+#  created_at             :datetime         not null
+#  updated_at             :datetime         not null
+#
+# Indexes
+#
+#  index_users_on_confirmation_token    (confirmation_token) UNIQUE
+#  index_users_on_email                 (email) UNIQUE
+#  index_users_on_reset_password_token  (reset_password_token) UNIQUE
+#  index_users_on_unlock_token          (unlock_token) UNIQUE
+#
+class User < ApplicationRecord
+  # ApplicationRecord should be defined on Application
+
+  # Include default devise modules. Others available are:
+  # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
+  devise :database_authenticatable, :registerable,
+         :recoverable, :rememberable, :validatable,
+         :confirmable, :lockable, :timeoutable, :trackable
+
+  audited
+  include Discard::Model
+
+  has_many :user_accounts
+  has_many :accounts, through: :user_accounts
+
+  validates :email, presence: true
+
+  scope :query, ->(param) { where('email ILIKE ?', "%#{param}%") }
+
+  def to_s
+    email
+  end
+
+  def current_account
+    accounts.first
+  end
+end

data/pg_engine/app/models/user_account.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+# == Schema Information
+#
+# Table name: user_accounts
+#
+#  id                 :bigint           not null, primary key
+#  profiles           :integer          default([]), not null, is an Array
+#  created_at         :datetime         not null
+#  updated_at         :datetime         not null
+#  account_id         :bigint           not null
+#  actualizado_por_id :bigint
+#  creado_por_id      :bigint
+#  user_id            :bigint           not null
+#
+# Indexes
+#
+#  index_user_accounts_on_account_id          (account_id)
+#  index_user_accounts_on_actualizado_por_id  (actualizado_por_id)
+#  index_user_accounts_on_creado_por_id       (creado_por_id)
+#  index_user_accounts_on_user_id             (user_id)
+#
+# Foreign Keys
+#
+#  fk_rails_...  (account_id => accounts.id)
+#  fk_rails_...  (actualizado_por_id => users.id)
+#  fk_rails_...  (creado_por_id => users.id)
+#  fk_rails_...  (user_id => users.id)
+#
+# generado con pg_rails
+
+class UserAccount < ApplicationRecord
+  audited
+
+  belongs_to :user
+  belongs_to :account
+
+  belongs_to :creado_por, optional: true, class_name: 'User'
+  belongs_to :actualizado_por, optional: true, class_name: 'User'
+
+  enumerize :profiles, in: {
+    admin: 1,
+    dueño: 2,
+    invitado: 3
+  }, multiple: true
+end

data/pg_engine/app/policies/account_policy.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+# generado con pg_rails
+
+class AccountPolicy < ApplicationPolicy
+  class Scope < ApplicationPolicy::Scope
+    # def resolve
+    #   if policy.acceso_total?
+    #     scope.all
+    #   else
+    #     scope.none
+    #   end
+    # end
+  end
+
+  # def puede_editar?
+  #   acceso_total? && !record.readonly?
+  # end
+
+  # def puede_crear?
+  #   acceso_total? || user.asesor?
+  # end
+
+  # def puede_borrar?
+  #   acceso_total? && !record.readonly?
+  # end
+
+  # def acceso_total?
+  #   user.developer?
+  # end
+end

data/pg_engine/app/policies/pg_engine/application_policy.rb

@@ -88,7 +88,7 @@ module PgEngine
     end
 
     def acceso_total?
-      user&.admin?
+      user&.developer?
     end
 
     def objeto_borrado?