pg_rails 7.6.0 → 7.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65d8b10e159a9378f670fed6dac91756cc87b27c66d3aa776803f010eff4fd34
-  data.tar.gz: e27911e05aa920930ef4a25a47f4a25d2d9dcd237b535e2b7ff35e1872464319
+  metadata.gz: 49f9abe4c2e4521dd99abe5a9220e3bece6ceb0e182c1a7d1fe252d836977bbf
+  data.tar.gz: 105da76663a6b29c338c45cb0e46d2663b99c7463a91beb734771f34dd668319
 SHA512:
-  metadata.gz: b9a503a2eebcce6024f305a06629deebf419beca24b2a2fb9e5e8b8f0fc7d071beb8175eabaa2da25cbe428dc141001f92dfaca71acdbf6d218062c81042aa01
-  data.tar.gz: d978b0345f61e377aa98ac94d194cdf9342ef6affd812b57300390cfc82a3c34dc7a11d32c4603026f286da6e3a43fb88f558a46774b7fb2c6e2a460a612bb3b
+  metadata.gz: 344c3c89251c75d50c9ace0a1dac02d69ecb1d04e1392d330225c4496e7bfc5c24718cfb98c0c6843c24e5402d22b399d203cdbd6c3826c6f2cb9b8271b7da9e
+  data.tar.gz: bb74de3073bb722ee4444a726306db6759c21e3ddc61e3f2a36e988b4ff688d72e31611d6168c2e936366d79c503924056da03ebd8f23dc7e07750cfb0ec2231

data/pg_engine/app/controllers/pg_engine/base_users_controller.rb

@@ -9,9 +9,5 @@ module PgEngine
 
       add_breadcrumb 'Inicio', :users_root_path unless using_modal2? || frame_embedded?
     end
-
-    def home
-      render html: '<h1>Inicio</h1>'.html_safe, layout: 'pg_layout/centered'
-    end
   end
 end

data/pg_engine/app/controllers/pg_engine/health_controller.rb

@@ -8,6 +8,7 @@ module PgEngine
     def show
       check_redis
       check_postgres
+      check_websocket
       render_up
     end
 
@@ -25,6 +26,35 @@ module PgEngine
       raise PgEngine::Error, 'redis is down'
     end
 
+    # rubocop:disable Metrics/MethodLength
+    def check_websocket
+      result = nil
+      begin
+        Timeout.timeout(5) do
+          EM.run do
+            url = Rails.application.config.action_cable.url
+            ws = Faye::WebSocket::Client.new(url)
+
+            ws.on :message do |event|
+              type = JSON.parse(event.data)['type']
+              if type == 'welcome'
+                result = :success
+                ws.close
+                EM.stop
+              end
+            end
+          end
+        end
+      rescue Timeout::Error
+        raise PgEngine::Error, 'websocket server is down'
+      end
+
+      return if result == :success
+
+      raise PgEngine::Error, 'websocket server is down'
+    end
+    # rubocop:enable Metrics/MethodLength
+
     def render_up
       render html: html_status(color: '#005500')
     end

data/pg_engine/app/controllers/users/dashboard_controller.rb

@@ -0,0 +1,9 @@
+module Users
+  class DashboardController < PgEngine.config.users_controller
+    layout 'pg_layout/containerized'
+
+    def dashboard
+      add_breadcrumb 'Resumen'
+    end
+  end
+end

data/pg_engine/app/controllers/users/registrations_controller.rb

@@ -11,7 +11,7 @@ module Users
         resource.save
         yield resource if block_given?
         if resource.persisted?
-          create_account_for(resource)
+          create_account_for(resource) if ActsAsTenant.current_tenant.blank?
 
           expire_data_after_sign_in!
           render_message

data/pg_engine/app/views/users/dashboard/dashboard.html.slim

@@ -0,0 +1 @@
+h1 Dashboard

data/pg_engine/config/locales/es.yml

@@ -16,6 +16,11 @@ es:
       index:
         empty: 'No hay %{model} que mostrar'
         empty_but_filtered: 'No hay %{model} para los filtros aplicados'
+  gender:
+    reset_password_token: m
+    confirmation_token: m
+    unlock_token: m
+    current_password: f
   attributes:
     external_labels: Etiquetas externas
     external_source: Fuente externa

data/pg_engine/config/routes.rb

@@ -21,6 +21,7 @@ Rails.application.routes.draw do
     registrations: 'users/registrations'
   }, failure_app: PgEngine::DeviseFailureApp
   namespace :users, path: 'u' do
+    get 'dashboard', to: 'dashboard#dashboard'
     post 'notifications/mark_as_seen', to: 'notifications#mark_as_seen'
     post 'notifications/mark_as_unseen', to: 'notifications#mark_as_unseen'
     get 'date_jumper/jump'
@@ -33,7 +34,7 @@ Rails.application.routes.draw do
     # get 'account', to: 'accounts#show'
   end
 
-  get '/u', to: 'users#home', as: :users_root
+  get '/u', to: 'users/dashboard#dashboard', as: :users_root
 
   namespace :admin, path: 'a' do
     pg_resource(:emails)

data/pg_engine/lib/pg_engine.rb

@@ -55,6 +55,8 @@ require 'noticed'
 require 'ransack'
 require 'ransack_memory'
 require 'holidays'
+require 'faye/websocket'
+require 'eventmachine'
 
 if Rails.env.local?
   require 'letter_opener'

data/pg_engine/spec/requests/users/dashboard_spec.rb

@@ -0,0 +1,19 @@
+require 'rails_helper'
+
+describe 'DASHBOARD' do
+  let(:logged_user) { create :user }
+
+  before do
+    sign_in logged_user
+  end
+
+  it 'when requesting /u' do
+    get '/u'
+    expect(response.body).to include '<h1>Dashboard</h1>'
+  end
+
+  it 'when requesting /u/dashboard' do
+    get '/u/dashboard'
+    expect(response.body).to include '<h1>Dashboard</h1>'
+  end
+end

data/pg_engine/spec/requests/users/registrations_spec.rb

@@ -69,6 +69,25 @@ describe 'registrations controller' do
         expect { subject }.not_to change(Account, :count)
       end
     end
+
+    context 'cuando hay tenant' do
+      before do
+        host! 'bien.localhost.com'
+        create :account, subdomain: 'bien'
+      end
+
+      it do
+        expect { subject }.to change(User, :count).by(1)
+      end
+
+      it do
+        expect { subject }.to change(UserAccount, :count).by(1)
+      end
+
+      it do
+        expect { subject }.not_to change(Account, :count)
+      end
+    end
   end
 
   describe '#edit' do

data/pg_engine/spec/system/noticed_spec.rb

@@ -8,7 +8,6 @@ describe 'Notifications' do
   let(:user) { create :user }
 
   before do
-    driven_by ENV['DRIVER']&.to_sym || :selenium_chrome_headless_iphone
     login_as user
   end
 

data/pg_rails/lib/pg_rails/capybara_support.rb

@@ -49,4 +49,4 @@ Capybara.register_driver :selenium_chrome_headless_iphone,
                          &chrome_driver_gen(headless: true, emulate_device: 'iPhone 6')
 Capybara.register_driver :selenium_chrome_debugger, &chrome_driver_gen(headless: false, debugger: true)
 
-Capybara.javascript_driver = ENV.fetch('WEBDRIVER') { 'selenium_chrome_notebook' }.to_sym
+Capybara.javascript_driver = ENV.fetch('DRIVER') { 'selenium_chrome_notebook' }.to_sym

data/pg_rails/lib/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.6.0
+  version: 7.6.2
 platform: ruby
 authors:
 - Martín Rosso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-09-29 00:00:00.000000000 Z
+date: 2024-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: faye-websocket
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.11'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: acts_as_tenant
   requirement: !ruby/object:Gem::Requirement
@@ -691,6 +705,7 @@ files:
 - pg_engine/app/controllers/users/account_switcher_controller.rb
 - pg_engine/app/controllers/users/accounts_controller.rb
 - pg_engine/app/controllers/users/confirmations_controller.rb
+- pg_engine/app/controllers/users/dashboard_controller.rb
 - pg_engine/app/controllers/users/date_jumper_controller.rb
 - pg_engine/app/controllers/users/notifications_controller.rb
 - pg_engine/app/controllers/users/registrations_controller.rb
@@ -779,6 +794,7 @@ files:
 - pg_engine/app/views/public/mensaje_contactos/new.html.slim
 - pg_engine/app/views/users/account_switcher/list.html.slim
 - pg_engine/app/views/users/accounts/show.html.slim
+- pg_engine/app/views/users/dashboard/dashboard.html.slim
 - pg_engine/config/initializers/action_controller.rb
 - pg_engine/config/initializers/action_mailer.rb
 - pg_engine/config/initializers/active_admin.rb
@@ -884,6 +900,7 @@ files:
 - pg_engine/spec/requests/public/webhooks_spec.rb
 - pg_engine/spec/requests/users/accounts_spec.rb
 - pg_engine/spec/requests/users/base_controller_spec.rb
+- pg_engine/spec/requests/users/dashboard_spec.rb
 - pg_engine/spec/requests/users/date_jumper_spec.rb
 - pg_engine/spec/requests/users/registrations_spec.rb
 - pg_engine/spec/requests/users/switcher_spec.rb