pg_rails 7.0.6 → 7.0.8.pre.alpha

data/pg_engine/spec/controllers/admin/users_controller_spec.rb

@@ -0,0 +1,180 @@
+# frozen_string_literal: true
+
+# generado con pg_rails
+
+require 'rails_helper'
+
+# This spec was generated by rspec-rails when you ran the scaffold generator.
+# It demonstrates how one might use RSpec to specify the controller code that
+# was generated by Rails when you ran the scaffold generator.
+#
+# It assumes that the implementation code is generated by the rails scaffold
+# generator.  If you are using any extension libraries to generate different
+# controller code, this generated spec may or may not pass.
+#
+# It only uses APIs available in rails and/or rspec-rails.  There are a number
+# of tools you can use to make these specs even more expressive, but we're
+# sticking to rails and rspec-rails APIs to keep things simple and stable.
+#
+# Compared to earlier versions of this generator, there is very limited use of
+# stubs and message expectations in this spec.  Stubs are only used when there
+# is no simpler way to get a handle on the object needed for the example.
+# Message expectations are only used when there is no simpler way to specify
+# that an instance is receiving a specific message.
+#
+# Also compared to earlier versions of this generator, there are no longer any
+# expectations of assigns and templates rendered. These features have been
+# removed from Rails core in Rails 5, but can be added back in via the
+# `rails-controller-testing` gem.
+
+RSpec.describe Admin::UsersController do
+  render_views
+
+  # This should return the minimal set of attributes required to create a valid
+  # User. As you add validations to User, be sure to
+  # adjust the attributes here as well.
+  let(:valid_attributes) do
+    attributes_for(:user)
+  end
+
+  let(:invalid_attributes) do
+    {
+      email: nil
+    }
+  end
+
+  let(:logger_user) { create :user, :admin }
+
+  before do
+    sign_in logger_user
+  end
+
+  describe 'GET #index' do
+    subject do
+      get :index, params: {}
+    end
+
+    let!(:user) { create :user }
+
+    it 'returns a success response' do
+      subject
+      expect(response).to be_successful
+    end
+
+    context 'when está descartado' do
+      before { user.discard! }
+
+      it do
+        subject
+        expect(assigns(:collection)).to eq [logger_user]
+      end
+    end
+  end
+
+  describe 'GET #show' do
+    it 'returns a success response' do
+      user = create(:user)
+      get :show, params: { id: user.to_param }
+      expect(response).to be_successful
+    end
+  end
+
+  describe 'GET #new' do
+    it 'returns a success response' do
+      get :new, params: {}
+      expect(response).to be_successful
+    end
+  end
+
+  describe 'GET #edit' do
+    it 'returns a success response' do
+      user = create(:user)
+      get :edit, params: { id: user.to_param }
+      expect(response).to be_successful
+    end
+  end
+
+  describe 'POST #create' do
+    context 'with valid params' do
+      it 'creates a new User' do
+        expect do
+          post :create, params: { user: valid_attributes }
+        end.to change(User, :count).by(1)
+      end
+
+      it 'redirects to the created user' do
+        post :create, params: { user: valid_attributes }
+        expect(response).to redirect_to(User.last.decorate.target_object)
+      end
+    end
+
+    context 'with invalid params' do
+      it 'returns a unprocessable_entity response' do
+        post :create, params: { user: invalid_attributes }
+        expect(response).to have_http_status(:unprocessable_entity)
+      end
+
+      it 'renders the new template' do
+        post :create, params: { user: invalid_attributes }
+        expect(response).to render_template(:new)
+      end
+    end
+  end
+
+  describe 'PUT #update' do
+    context 'with valid params' do
+      let(:new_attributes) do
+        attributes_for(:user)
+      end
+
+      it 'updates the requested user' do
+        user = create(:user)
+        put :update, params: { id: user.to_param, user: new_attributes }
+        user.reload
+        expect(user.email).to eq new_attributes[:email]
+      end
+
+      it 'redirects to the user' do
+        user = create(:user)
+        put :update, params: { id: user.to_param, user: valid_attributes }
+        expect(response).to redirect_to(user.decorate.target_object)
+      end
+    end
+
+    context 'with invalid params' do
+      it 'returns a unprocessable_entity response' do
+        user = create(:user)
+        put :update, params: { id: user.to_param, user: invalid_attributes }
+        expect(response).to have_http_status(:unprocessable_entity)
+      end
+
+      it 'renders the edit template' do
+        user = create(:user)
+        put :update, params: { id: user.to_param, user: invalid_attributes }
+        expect(response).to render_template(:edit)
+      end
+    end
+  end
+
+  describe 'DELETE #destroy' do
+    subject do
+      delete :destroy, params: { id: user.to_param }
+    end
+
+    let!(:user) { create :user }
+
+    it 'destroys the requested user' do
+      expect { subject }.to change(User.kept, :count).by(-1)
+    end
+
+    it 'setea el discarded_at' do
+      subject
+      expect(user.reload.discarded_at).to be_present
+    end
+
+    it 'redirects to the users list' do
+      subject
+      expect(response).to redirect_to(admin_users_url)
+    end
+  end
+end

data/pg_engine/spec/factories/accounts.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+# generado con pg_rails
+
+FactoryBot.define do
+  factory :account do
+    plan { Account.plan.values.sample }
+    nombre { Faker::Lorem.sentence }
+    hashid { Faker::Lorem.sentence }
+  end
+end

data/pg_engine/spec/factories/user_accounts.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+# generado con pg_rails
+
+FactoryBot.define do
+  factory :user_account do
+    association :user
+    association :account
+    profiles { [UserAccount.profiles.values.sample] }
+
+    trait :user_existente do
+      user { nil }
+      user_id { User.pluck(:id).sample }
+    end
+
+    trait :account_existente do
+      account { nil }
+      account_id { Account.pluck(:id).sample }
+    end
+  end
+end

data/pg_engine/spec/factories/users.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+# == 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
+#  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
+#  profiles               :integer          default([]), not null, is an Array
+#  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
+#
+
+FactoryBot.define do
+  factory :orphan_user, class: 'User' do
+    email { Faker::Internet.email }
+    password { "password#{rand(99_999)}" }
+    confirmed_at { Faker::Date.backward }
+
+    trait :admin do
+      developer { true }
+    end
+
+    trait :developer do
+      developer { true }
+    end
+
+    factory :user do
+      after(:create) do |user, _context|
+        account = create :account
+        create :user_account, user:, account:
+      end
+    end
+  end
+end

data/pg_engine/spec/models/account_spec.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+# generado con pg_rails
+
+require 'rails_helper'
+
+RSpec.describe Account do
+  let(:account) { create(:account) }
+
+  it 'se persiste' do
+    expect(account).to be_persisted
+  end
+end

data/pg_engine/spec/models/user_account_spec.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+# generado con pg_rails
+
+require 'rails_helper'
+
+RSpec.describe UserAccount do
+  let(:user_account) { create(:user_account) }
+
+  it 'se persiste' do
+    expect(user_account).to be_persisted
+  end
+end

data/pg_engine/spec/models/user_spec.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+# generado con pg_rails
+
+require 'rails_helper'
+
+RSpec.describe User do
+  let(:user) { create(:user) }
+
+  it 'se persiste' do
+    expect(user).to be_persisted
+  end
+end

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

@@ -3,6 +3,7 @@ html
   head
     title = Rails.application.class.module_parent_name
     meta name="viewport" content="width=device-width,initial-scale=1"
+    meta name="turbo-cache-control" content="no-cache"
     = csrf_meta_tags
     = csp_meta_tag
 

data/pg_layout/app/views/pg_layout/_flash.html.slim

@@ -5,6 +5,6 @@
 
 - flash_to_show.each do |flash_type, message|
   .toast(class="bg-#{flash_type_to_class(flash_type)}-subtle" role="alert"
-         aria-live="assertive" aria-atomic="true")
+         data-turbo-temporary="true" aria-live="assertive" aria-atomic="true")
     .toast-body
       = message

data/pg_layout/lib/pg_layout/engine.rb

@@ -2,6 +2,5 @@
 
 module PgLayout
   class Engine < ::Rails::Engine
-    isolate_namespace PgLayout
   end
 end

data/pg_rails/lib/version.rb

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

data/pg_rails/scss/pg_rails.scss

@@ -1,3 +1,3 @@
 @import './../../pg_engine/app/assets/stylesheets/pg_rails_b5';
-@import './../../pg_associable/app/assets/css/pg_associable';
+@import './../../pg_associable/app/assets/stylesheets/pg_associable';
 @import './../../pg_layout/app/assets/stylesheets/sidebar';

data/pg_scaffold/lib/generators/pg_pundit/templates/policy.rb

@@ -31,7 +31,7 @@ class <%= class_name %>Policy < ApplicationPolicy
   # end
 
   # def acceso_total?
-  #   user.admin?
+  #   user.developer?
   # end
 end
 <% end -%>

data/pg_scaffold/lib/generators/pg_rspec/scaffold/templates/controller_spec.rb

@@ -54,10 +54,10 @@ RSpec.describe <%= controller_class_name %>Controller do
   end
 <% end -%>
 
-  let(:user) { create :user, :admin }
+  let(:logged_user) { create :user, :developer }
 
   before do
-    sign_in user if user.present?
+    sign_in logged_user if logged_user.present?
   end
 
   describe 'routing' do
@@ -85,7 +85,7 @@ RSpec.describe <%= controller_class_name %>Controller do
     end
 
     context 'when user is not logged in' do
-      let(:user) { nil }
+      let(:logged_user) { nil }
 
       it 'redirects to login path' do
         subject
@@ -99,7 +99,7 @@ RSpec.describe <%= controller_class_name %>Controller do
 
       it do
         subject
-        expect(assigns(:collection)).to be_empty
+        expect(assigns(:collection)).not_to include(<%= nombre_tabla_completo_singular %>)
       end
     end
 <% end -%>

data/pg_scaffold/lib/generators/pg_slim/templates/_form.html.slim

@@ -6,7 +6,7 @@ div style="max-width: 300px"
 
     = hidden_field_tag :asociable, true if asociable
   <%- attributes.each do |attribute| -%>
-    = f.<%= attribute.reference? ? :pg_associable_inline : :input %> :<%= attribute.name %>
+    = f.<%= attribute.reference? ? :pg_associable : :input %> :<%= attribute.name %>
   <%- end -%>
     .mt-2
     = f.button :submit

data/pg_scaffold/spec/generators_spec.rb

@@ -33,7 +33,7 @@ describe 'Generators' do
 
       my_assert_file 'spec/controllers/frontend/modelos_controller_spec.rb' do |content|
         assert_match(/routing/, content)
-        assert_match(/sign_in user/, content)
+        assert_match(/sign_in/, content)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.0.6
+  version: 7.0.8.pre.alpha
 platform: ruby
 authors:
 - Martín Rosso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-02-10 00:00:00.000000000 Z
+date: 2024-02-19 00:00:00.000000000 Z
 dependencies: []
 description: Rails goodies.
 email:
@@ -19,29 +19,38 @@ extra_rdoc_files: []
 files:
 - MIT-LICENSE
 - README.md
-- pg_associable/app/assets/css/pg_associable.scss
-- pg_associable/app/assets/js/asociable_controller.js
-- pg_associable/app/assets/js/asociable_inline_controller.js
-- pg_associable/app/assets/js/modal_controller.js
+- pg_associable/app/assets/stylesheets/pg_associable.scss
 - pg_associable/app/helpers/pg_associable/form_builder_methods.rb
 - pg_associable/app/helpers/pg_associable/helpers.rb
-- pg_associable/app/inputs/pg_associable/pg_associable_inline_input.rb
-- pg_associable/app/inputs/pg_associable/pg_associable_input.rb
+- pg_associable/app/inputs/pg_associable_input.rb
+- pg_associable/app/javascript/asociable_controller.tsx
+- pg_associable/app/javascript/modal_controller.js
 - pg_associable/app/views/pg_associable/_resultados.html.slim
 - pg_associable/app/views/pg_associable/_resultados_inline.html.slim
 - pg_associable/app/views/pg_engine/base/_pg_associable_modal.html.slim
 - pg_associable/index.js
 - pg_associable/lib/pg_associable.rb
 - pg_associable/lib/pg_associable/engine.rb
-- pg_associable/lib/pg_associable/simple_form_initializer.rb
-- pg_associable/lib/tasks/pg_associable_tasks.rake
 - pg_associable/spec/pg_associable/helpers_spec.rb
+- pg_engine/app/admin/accounts.rb
+- pg_engine/app/admin/audits.rb
+- pg_engine/app/admin/dashboard.rb
+- pg_engine/app/admin/user_accounts.rb
+- pg_engine/app/admin/users.rb
+- pg_engine/app/assets/javascripts/active_admin.js
+- pg_engine/app/assets/stylesheets/active_admin.scss
 - pg_engine/app/assets/stylesheets/pg_rails_b5.scss
+- pg_engine/app/controllers/admin/accounts_controller.rb
+- pg_engine/app/controllers/admin/user_accounts_controller.rb
+- pg_engine/app/controllers/admin/users_controller.rb
 - pg_engine/app/controllers/pg_engine/base_controller.rb
 - pg_engine/app/controllers/pg_engine/devise_controller.rb
 - pg_engine/app/controllers/pg_engine/require_sign_in.rb
 - pg_engine/app/controllers/pg_engine/resource_helper.rb
+- pg_engine/app/decorators/account_decorator.rb
 - pg_engine/app/decorators/pg_engine/base_decorator.rb
+- pg_engine/app/decorators/user_account_decorator.rb
+- pg_engine/app/decorators/user_decorator.rb
 - pg_engine/app/helpers/pg_engine/flash_helper.rb
 - pg_engine/app/helpers/pg_engine/form_helper.rb
 - pg_engine/app/helpers/pg_engine/index_helper.rb
@@ -51,13 +60,45 @@ files:
 - pg_engine/app/inputs/pg_engine/fecha_input.rb
 - pg_engine/app/lib/pg_engine/filtros_builder.rb
 - pg_engine/app/lib/pg_form_builder.rb
+- pg_engine/app/models/account.rb
 - pg_engine/app/models/pg_engine/base_record.rb
+- pg_engine/app/models/user.rb
+- pg_engine/app/models/user_account.rb
+- pg_engine/app/policies/account_policy.rb
 - pg_engine/app/policies/pg_engine/application_policy.rb
+- pg_engine/app/policies/user_account_policy.rb
+- pg_engine/app/policies/user_policy.rb
+- pg_engine/app/views/admin/accounts/_account.html.slim
+- pg_engine/app/views/admin/accounts/_form.html.slim
+- pg_engine/app/views/admin/accounts/edit.html.slim
+- pg_engine/app/views/admin/accounts/new.html.slim
+- pg_engine/app/views/admin/accounts/show.html.slim
+- pg_engine/app/views/admin/user_accounts/_form.html.slim
+- pg_engine/app/views/admin/user_accounts/_user_account.html.slim
+- pg_engine/app/views/admin/user_accounts/edit.html.slim
+- pg_engine/app/views/admin/user_accounts/new.html.slim
+- pg_engine/app/views/admin/user_accounts/show.html.slim
+- pg_engine/app/views/admin/users/_form.html.slim
+- pg_engine/app/views/admin/users/_user.html.slim
+- pg_engine/app/views/admin/users/edit.html.slim
+- pg_engine/app/views/admin/users/new.html.slim
+- pg_engine/app/views/admin/users/show.html.slim
 - pg_engine/app/views/pg_engine/base/download.xlsx.axlsx
 - pg_engine/app/views/pg_engine/base/index.html.slim
+- pg_engine/config/initializers/active_admin.rb
+- pg_engine/config/initializers/devise.rb
+- pg_engine/config/locales/devise.en.yml
 - pg_engine/config/locales/es.yml
+- pg_engine/config/routes.rb
 - pg_engine/config/simple_form/simple_form.rb
 - pg_engine/config/simple_form/simple_form_bootstrap.rb
+- pg_engine/db/migrate/20240205194218_devise_create_users.rb
+- pg_engine/db/migrate/20240208234111_unaccent.rb
+- pg_engine/db/migrate/20240208234901_install_audited.rb
+- pg_engine/db/migrate/20240210025702_create_active_admin_comments.rb
+- pg_engine/db/migrate/20240211152951_create_accounts.rb
+- pg_engine/db/migrate/20240211153049_create_user_accounts.rb
+- pg_engine/db/seeds.rb
 - pg_engine/lib/pg_engine.rb
 - pg_engine/lib/pg_engine/configuracion.rb
 - pg_engine/lib/pg_engine/core_ext.rb
@@ -65,8 +106,15 @@ files:
 - pg_engine/lib/pg_engine/route_helpers.rb
 - pg_engine/lib/pg_engine/utils/pg_logger.rb
 - pg_engine/lib/tasks/auto_anotar_modelos.rake
-- pg_engine/lib/templates/activeadmin/audits.rb
-- pg_engine/lib/templates/activeadmin/users.rb
+- pg_engine/spec/controllers/admin/accounts_controller_spec.rb
+- pg_engine/spec/controllers/admin/user_accounts_controller_spec.rb
+- pg_engine/spec/controllers/admin/users_controller_spec.rb
+- pg_engine/spec/factories/accounts.rb
+- pg_engine/spec/factories/user_accounts.rb
+- pg_engine/spec/factories/users.rb
+- pg_engine/spec/models/account_spec.rb
+- pg_engine/spec/models/user_account_spec.rb
+- pg_engine/spec/models/user_spec.rb
 - pg_layout/app/assets/stylesheets/sidebar.scss
 - pg_layout/app/javascript/cookies.js
 - pg_layout/app/javascript/navbar_controller.js
@@ -168,9 +216,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.3.22
 signing_key: 

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

@@ -1,58 +0,0 @@
-import { Controller } from '@hotwired/stimulus'
-
-export default class extends Controller {
-  static outlets = ['modal']
-
-  lastValue = null
-
-  connect (e) {
-    console.log('connect asociable')
-
-    // ID único para identificar el campo y el modal
-    const elemId = Math.trunc(Math.random() * 1000000000)
-    this.element.setAttribute('data-asociable-modal-outlet', `.modal-${elemId}`)
-    this.element.classList.add(`asociable-${elemId}`)
-
-    const that = this
-    const modalLink = this.targets.element.querySelector('.modal-link')
-    const path = modalLink.attributes.href.value
-    modalLink.setAttribute('href', `${path}?id=${elemId}`)
-    modalLink.onclick = (e) => {
-      // Si ya hay un modal abierto lo abro y evito que se haga el get
-      // Si no, dejo que se ejecute el comportamiento por default
-      if (that.modalOutlets.length > 0) {
-        e.preventDefault()
-        that.modalOutlet.openModal()
-      }
-    }
-    const input = this.element.querySelector('input[type=text]')
-    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) {
-      id = null
-    }
-    hiddenField.value = id
-    if (id) {
-      textField.value = text
-      this.element.classList.add('filled')
-    } else {
-      textField.value = null
-      this.element.classList.remove('filled')
-    }
-  }
-
-  disconnect (e) {
-    console.log('disconnect asociable')
-  }
-}