pg_rails 7.6.1 → 7.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e8749da8dcc608499fc64c9af83a9889069d9384e861508688c40e41b33ae52
-  data.tar.gz: 51fcd1231c11477379842419333ceda58bd14b1ca5d058fdf0775b92b6caf867
+  metadata.gz: 49f9abe4c2e4521dd99abe5a9220e3bece6ceb0e182c1a7d1fe252d836977bbf
+  data.tar.gz: 105da76663a6b29c338c45cb0e46d2663b99c7463a91beb734771f34dd668319
 SHA512:
-  metadata.gz: 06c02fbcf25d4eb7c34c8272d9b3e3f0af6a93052a882cdc8adb1f17452b39dc002145e19cd17321e6a273216393309e7b9d0efac307aa9fc33b9348fd9dc999
-  data.tar.gz: 2a3bc5f762458f385813fbba264e9644843680d6d924a77bbb671711bd6c3fe06adb14cae59453dc38f2614fbefda264101f12106f0720e12c66c8d2bd967c39
+  metadata.gz: 344c3c89251c75d50c9ace0a1dac02d69ecb1d04e1392d330225c4496e7bfc5c24718cfb98c0c6843c24e5402d22b399d203cdbd6c3826c6f2cb9b8271b7da9e
+  data.tar.gz: bb74de3073bb722ee4444a726306db6759c21e3ddc61e3f2a36e988b4ff688d72e31611d6168c2e936366d79c503924056da03ebd8f23dc7e07750cfb0ec2231

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/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/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/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/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_rails/lib/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.6.1
+  version: 7.6.2
 platform: ruby
 authors:
 - Martín Rosso
@@ -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