pg_rails 7.0.8.pre.alpha.14 → 7.0.8.pre.alpha.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a52205bc09a4d6de1b93e6a4272110bc740bfc72a1bb9cb306d0e4f3d7684e19
-  data.tar.gz: 49606131fec5b3933957c43d8ab29cf853a0b1a8944a27fa7527c8669a3ca46c
+  metadata.gz: 917b686081345cf1d79fb59f3d05a3d288f71f6a9ac223cfa40100a5e897b1c3
+  data.tar.gz: c21bd06ca22bbabf0701fe3450c09e034d037b7fad3d4bddf4dd6fbd748f6c8d
 SHA512:
-  metadata.gz: b8beb180af71e265ec1d027666267628fa699904a560ed6e224deaf3009b7230f8b72520799e2b8465ed709b92f33f0eac81f4e61cd2777489e2a59f5a6e25cc
-  data.tar.gz: 5e4b1e3869550430832bae5bd5f0c205a94a5a16a41dd898e14f47fd9b786fa4c7d097f9c94a771379757b5b85752cc3adf823e7b294a74e51321f58a779124c
+  metadata.gz: ac9c3923a030194773608e8c1231b20044b835aed08b4d9e45705828de5dee18bd770f5736b1525044f0e8da7144ae210552ac5c4f475dea8f4e2e40d2ea4a9c
+  data.tar.gz: cf395aec16915d30e753bebe8120f8ee9255c8bcd8631b621b72bb12622a94aa26b9aa8e09cabce2d6990a6829e87695d946b1a7af7ce8443dcffd689fd40c83

data/pg_engine/app/controllers/concerns/pg_engine/resource.rb

@@ -272,10 +272,15 @@ module PgEngine
     end
 
     def do_sort(scope, field, direction)
+      # TODO: restringir ciertos campos?
       unless scope.model.column_names.include? field.to_s
         PgLogger.warn("No existe el campo \"#{field}\"", :warn)
         return scope
       end
+      unless direction.to_sym.in? %i[asc desc]
+        PgLogger.warn("Direction not valid: \"#{direction}\"", :warn)
+        return scope
+      end
       scope = scope.order(field => direction)
       instance_variable_set(:@field, field)
       instance_variable_set(:@direction, direction)

data/pg_engine/app/helpers/pg_engine/pg_rails_helper.rb

@@ -8,7 +8,7 @@ module PgEngine
       current_user&.current_account
     end
 
-    def img_placeholder(src = nil, width: '100%', height: '100%', fade_in: false, **img_opts)
+    def img_placeholder(src: nil, width: '100%', height: '100%', fade_in: false, **img_opts)
       if fade_in || src.nil?
         img_opts = img_opts.merge(style: [img_opts[:style], 'display:none'].compact.join(';'))
         do_placeholder(src, width:, height:, **img_opts)
@@ -20,8 +20,8 @@ module PgEngine
     private
 
     def do_placeholder(src = nil, width: '100%', height: '100%', **img_opts)
-      content_tag('div', class: 'placeholder-glow') do
-        content_tag('div', class: 'placeholder', style: "width: #{width}; height: #{height}") do
+      content_tag('div', class: 'placeholder-glow', style: "width: #{width}; height: #{height}") do
+        content_tag('div', class: 'placeholder w-100 h-100') do
           if src.present?
             image_tag src,
                       'data-controller': 'fadein_onload',

data/pg_engine/config/initializers/anycable.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+# Add Warden middleware to AnyCable stack to allow accessing
+# Devise current user via `env["warden"].user`.
+#
+# See https://docs.anycable.io/ruby/authentication
+#
+# NOTE: This is only needed in environments where you use AnyCable.
+if defined?(AnyCable::Rails)
+  AnyCable::Rails::Rack.middleware.use Warden::Manager do |config|
+    Devise.warden_config = config
+  end
+end

data/pg_engine/config/initializers/cable_ready.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+Dotenv.load
+
+CableReady.configure do |config|
+  # Enable/disable exiting / warning when the sanity checks fail options:
+  # `:exit` or `:warn` or `:ignore`
+  #
+  # config.on_failed_sanity_checks = :exit
+
+  # Enable/disable assets compilation
+  # `true` or `false`
+  #
+  # config.precompile_assets = true
+
+  # Define your own custom operations
+  # https://cableready.stimulusreflex.com/customization#custom-operations
+  #
+  # config.add_operation_name :jazz_hands
+
+  # Change the default Active Job queue used for broadcast_later and broadcast_later_to
+  #
+  # config.broadcast_job_queue = :default
+
+  # Specify a default debounce time for CableReady::Updatable callbacks
+  # Doing so is a best practice to avoid heavy ActionCable traffic
+  #
+  # config.updatable_debounce_time = 0.1.seconds
+  config.verifier_key = ENV.fetch('ANYCABLE_CABLE_READY_KEY')
+end

data/pg_engine/lib/pg_engine/error.rb

@@ -0,0 +1,4 @@
+module PgEngine
+  class Error < StandardError
+  end
+end

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

@@ -2,10 +2,20 @@
 
 require 'rainbow'
 
+# TODO: poder pasar blocks
+
+def pg_err(obj)
+  PgEngine::PgLogger.error(obj)
+end
+
 def pg_warn(obj, type = :error)
   PgEngine::PgLogger.warn(obj, type)
 end
 
+def pg_log(obj, type = :debug)
+  PgEngine::PgLogger.warn("#{obj.inspect} (#{obj.class})", type)
+end
+
 module PgEngine
   class PgLogger
     class << self
@@ -18,9 +28,22 @@ module PgEngine
       #   Rollbar.warning("#{mensaje}\n\n#{caller.join("\n")}")
       # end
 
+      def error(obj)
+        # TODO: arreglar
+        # Si es dev o test lanzo el error y si no, lo logueo para que no le salte al usuario
+        # raise obj if Rails.env.local? && ENV.fetch('RAISE_ERRORS', nil).present?
+
+        mensaje = if obj.is_a?(Exception) && obj.backtrace.present?
+                    "#{obj.inspect}\nBacktrace:\n#{cleaner.clean(obj.backtrace).join("\n")}"
+                  else
+                    obj
+                  end
+        notify(mensaje, :error)
+      end
+
       def warn(obj, type = :error)
-        mensaje = if obj.is_a? Exception
-                    obj.full_message.lines.first
+        mensaje = if obj.is_a?(Exception) && obj.backtrace.present?
+                    "#{obj.inspect}\nBacktrace:\n#{cleaner.clean(obj.backtrace).join("\n")}"
                   else
                     obj
                   end
@@ -37,18 +60,22 @@ module PgEngine
       end
 
       def titulo(mensaje, type)
-        Rainbow(mensaje).bold.send(color_for(type))
+        Rainbow("#{type.to_s.upcase}: #{mensaje}").bold.send(color_for(type))
       end
 
       def detalles(type)
-        Rainbow("#{type.to_s.upcase} logueado en #{bktrc[0]}").send(color_for(type))
+        Rainbow("  called in #{bktrc[0]}").send(color_for(type))
       end
 
-      def bktrc
+      def cleaner
         bc = ActiveSupport::BacktraceCleaner.new
         bc.add_filter   { |line| line.gsub(%r{.*pg_rails/}, '') }
         bc.add_silencer { |line| /pg_logger/.match?(line) }
-        bc.clean(caller)
+        bc
+      end
+
+      def bktrc
+        cleaner.clean(caller)
       end
 
       def color_for(type)
@@ -57,6 +84,8 @@ module PgEngine
           :blue
         when :warn
           :yellow
+        when :debug
+          :orange
         else # :error
           :red
         end

data/pg_engine/lib/pg_engine.rb

@@ -2,6 +2,7 @@
 
 require_relative 'pg_engine/engine'
 require_relative 'pg_engine/core_ext'
+require_relative 'pg_engine/error'
 require_relative 'pg_engine/configuracion'
 require_relative 'pg_engine/route_helpers'
 require_relative 'pg_engine/utils/pg_logger'

data/pg_engine/spec/helpers/pg_engine/pg_rails_helper_spec.rb

@@ -3,7 +3,7 @@ require 'rails_helper'
 describe PgEngine::PgRailsHelper do
   describe '#img_placeholder' do
     it 'si no es fade_in' do
-      asd = img_placeholder('bla', fade_in: false, class: 'img-fluid', style: 'color:red')
+      asd = img_placeholder(src: 'bla', fade_in: false, class: 'img-fluid', style: 'color:red')
       expectation = <<~HTML
         <img class="img-fluid" style="color:red" src="/images/bla" />
       HTML
@@ -11,10 +11,10 @@ describe PgEngine::PgRailsHelper do
     end
 
     it 'si tiene style' do
-      asd = img_placeholder('bla', fade_in: true, class: 'img-fluid', style: 'color:red')
+      asd = img_placeholder(src: 'bla', fade_in: true, class: 'img-fluid', style: 'color:red')
       expectation = <<~HTML
-        <div class="placeholder-glow">
-          <div class="placeholder" style="width: 100%; height: 100%">
+        <div class="placeholder-glow" style="width: 100%; height: 100%">
+          <div class="placeholder w-100 h-100">
           <img data-controller="fadein_onload" class="img-fluid" style="color:red;display:none" src="/images/bla" />
           </div>
         </div>
@@ -23,10 +23,10 @@ describe PgEngine::PgRailsHelper do
     end
 
     it 'si no tiene style' do
-      asd = img_placeholder('bla', fade_in: true, class: 'img-fluid')
+      asd = img_placeholder(src: 'bla', fade_in: true, class: 'img-fluid')
       expectation = <<~HTML
-        <div class="placeholder-glow">
-          <div class="placeholder" style="width: 100%; height: 100%">
+        <div class="placeholder-glow" style="width: 100%; height: 100%">
+          <div class="placeholder w-100 h-100">
           <img data-controller="fadein_onload" class="img-fluid" style="display:none" src="/images/bla" />
           </div>
         </div>

data/pg_engine/spec/lib/pg_engine/utils/pg_engine/pg_logger_spec.rb

@@ -1,8 +1,43 @@
 require 'rails_helper'
 
-TYPES = %i[error warn info].freeze
+TYPES = %i[error warn info debug].freeze
 
 describe PgEngine::PgLogger do
+  describe '#pg_err' do
+    before do
+      TYPES.each do |type|
+        allow(Rails.logger).to receive(type)
+        allow(Rollbar).to receive(type)
+      end
+    end
+
+    shared_examples 'logger' do |type|
+      it do
+        expect(Rails.logger).to have_received(type).twice
+      end
+
+      it do
+        expect(Rollbar).to have_received(type).once
+      end
+    end
+
+    context 'con string' do
+      before { pg_err('bla') }
+
+      it_behaves_like 'logger', :error
+    end
+
+    context 'con exception' do
+      before do
+        raise StandardError, 'bla'
+      rescue StandardError => e
+        pg_err(e)
+      end
+
+      it_behaves_like 'logger', :error
+    end
+  end
+
   describe '#pg_warn' do
     before do
       TYPES.each do |type|
@@ -30,9 +65,40 @@ describe PgEngine::PgLogger do
     end
 
     context 'con exception' do
-      before { pg_warn(StandardError.new('bla')) }
+      before do
+        raise StandardError, 'bla'
+      rescue StandardError => e
+        pg_warn(e)
+      end
 
       it_behaves_like 'logger', :error
     end
   end
+
+  describe '#pg_log' do
+    before do
+      TYPES.each do |type|
+        allow(Rails.logger).to receive(type)
+        allow(Rollbar).to receive(type)
+      end
+    end
+
+    shared_examples 'logger' do |type|
+      it do
+        expect(Rails.logger).to have_received(type).twice
+      end
+
+      it do
+        expect(Rollbar).to have_received(type).once
+      end
+    end
+
+    TYPES.each do |type|
+      context "con type #{type}" do
+        before { pg_log('bla', type) }
+
+        it_behaves_like 'logger', type
+      end
+    end
+  end
 end

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

@@ -11,6 +11,10 @@
   visibility: hidden;
 }
 
+.init-visible {
+  visibility: visible;
+}
+
 .animation-long {
   animation-duration: 1s;
 }

data/pg_layout/{index.js → app/javascript/application.js}

@@ -1,16 +1,10 @@
-// Controllers
-import NavbarController from './app/javascript/navbar_controller'
-import NestedController from './app/javascript/nested_controller'
-import PgFormController from './app/javascript/pg_form_controller'
-import FadeinOnloadController from './app/javascript/fadein_onload_controller'
+import './config'
+import './channels'
+import './controllers'
+
 // Bootstrap's toasts
 import * as bootstrap from 'bootstrap'
 
-window.Stimulus.register('navbar', NavbarController)
-window.Stimulus.register('nested', NestedController)
-window.Stimulus.register('pg_form', PgFormController)
-window.Stimulus.register('fadein_onload', FadeinOnloadController)
-
 document.addEventListener('turbo:load', function () {
   const toastElList = document.querySelectorAll('.toast:not(.hide):not(.show)')
   Array.from(toastElList).map(toastEl => new bootstrap.Toast(toastEl).show())
@@ -25,11 +19,11 @@ document.addEventListener('turbo:load', function () {
   const callback = (mutationList, observer) => {
     for (const mutation of mutationList) {
       if (mutation.type === 'childList') {
-        console.log('A child node has been added or removed.')
+        // console.log('A child node has been added or removed.')
         const toastElList = document.querySelectorAll('.toast:not(.hide):not(.show)')
         Array.from(toastElList).map(toastEl => new bootstrap.Toast(toastEl).show())
       } else if (mutation.type === 'attributes') {
-        console.log(`The ${mutation.attributeName} attribute was modified.`)
+        // console.log(`The ${mutation.attributeName} attribute was modified.`)
       }
     }
   }

data/pg_layout/app/javascript/channels/consumer.js

@@ -0,0 +1,8 @@
+// Action Cable provides the framework to deal with WebSockets in Rails.
+// You can generate new channels where WebSocket features live using the `bin/rails generate channel` command.
+
+import { createConsumer } from '@anycable/web'
+
+export default createConsumer({
+  protocol: 'actioncable-v1-ext-json'
+})

data/pg_layout/app/javascript/channels/index.js

@@ -0,0 +1,4 @@
+// Load all the channels within this directory and all subdirectories.
+// Channel files must be named *_channel.js.
+
+// import './**/*_channel.js'

data/pg_layout/app/javascript/config/cable_ready.js

@@ -0,0 +1,24 @@
+import consumer from '../channels/consumer'
+import CableReady from 'cable_ready'
+
+const anycable = consumer.cable
+
+if (anycable) {
+  anycable.on('connect', ev => {
+    if (ev.reconnect) {
+      console.log('Welcome back!')
+    } else {
+      console.log('Welcome!')
+    }
+  })
+
+  anycable.on('disconnect', ev => {
+    if (ev.reason) {
+      console.log(`Disconnected because: ${ev.reason}`)
+    } else {
+      console.log('Disconnected')
+    }
+  })
+}
+
+CableReady.initialize({ consumer })

data/pg_layout/app/javascript/config/index.js

@@ -0,0 +1 @@
+import './cable_ready'

data/pg_layout/app/javascript/controllers/application.js

@@ -0,0 +1,4 @@
+// TODO: si no existe la aplicacion mostrar error
+const application = window.Stimulus
+
+export { application }

data/pg_layout/app/javascript/controllers/index.js

@@ -0,0 +1,11 @@
+import { application } from './application'
+
+import NavbarController from './navbar_controller'
+import NestedController from './nested_controller'
+import PgFormController from './pg_form_controller'
+import FadeinOnloadController from './fadein_onload_controller'
+
+application.register('navbar', NavbarController)
+application.register('nested', NestedController)
+application.register('pg_form', PgFormController)
+application.register('fadein_onload', FadeinOnloadController)

data/pg_layout/app/javascript/{navbar_controller.js → controllers/navbar_controller.js}

@@ -1,5 +1,5 @@
 import { Controller } from '@hotwired/stimulus'
-import Cookies from './cookies'
+import Cookies from './../utils/cookies'
 
 export default class extends Controller {
   expandNavbar (e) {

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

@@ -5,7 +5,8 @@ html
     meta name="viewport" content="width=device-width,initial-scale=1"
     = csrf_meta_tags
     = csp_meta_tag
-
+    meta name="cable-history-timestamp" content="#{Time.now.to_i}"
+    = action_cable_with_jwt_meta_tag
     = stylesheet_link_tag 'application', 'data-turbo-track': 'reload'
     = javascript_include_tag 'application', 'data-turbo-track': 'reload', type: 'module'
   body

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

@@ -3,13 +3,16 @@ 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"
+    - if @turbo_no_cache
+      meta name="turbo-cache-control" content="no-cache"
     / meta name="turbo-refresh-method" content="morph"
     / meta name="turbo-refresh-scroll" content="preserve"
     / meta name="turbo-prefetch" content="true"
     meta name="view-transition" content="same-origin"
+    meta name="cable-history-timestamp" content="#{Time.now.to_i}"
     = csrf_meta_tags
     = csp_meta_tag
+    = action_cable_with_jwt_meta_tag
 
     = stylesheet_link_tag 'application', 'data-turbo-track': 'reload'
     = javascript_include_tag 'application', 'data-turbo-track': 'reload', type: 'module'

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

@@ -9,3 +9,5 @@
          data-xturbo-temporary="true" aria-live="assertive" aria-atomic="true")
     .toast-body
       = message
+
+/ TODO: centrar texto

data/pg_rails/js/index.js

@@ -1,2 +1,2 @@
 import './../../pg_associable'
-import './../../pg_layout'
+import './../../pg_layout/app/javascript/application'

data/pg_rails/lib/pg_rails/vcr_support.rb

@@ -9,6 +9,13 @@ VCR.configure do |config|
   }
   config.hook_into :webmock
   config.configure_rspec_metadata!
+
+  # * `ignore_localhost = true` is equivalent to `ignore_hosts 'localhost',
+  #   '127.0.0.1', '0.0.0.0'`. It is particularly useful for when you use
+  #   VCR with a javascript-enabled capybara driver, since capybara boots
+  #   your rack app and makes localhost requests to it to check that it has
+  #   booted.
+  config.ignore_localhost = true
 end
 
 RSpec.configure do |config|

data/pg_rails/lib/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.0.8.pre.alpha.14
+  version: 7.0.8.pre.alpha.15
 platform: ruby
 authors:
 - Martín Rosso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-19 00:00:00.000000000 Z
+date: 2024-03-27 00:00:00.000000000 Z
 dependencies: []
 description: Rails goodies.
 email:
@@ -89,6 +89,8 @@ files:
 - pg_engine/app/views/pg_engine/base/index.html.slim
 - pg_engine/app/views/pg_engine/base/new.html.slim
 - pg_engine/config/initializers/active_admin.rb
+- pg_engine/config/initializers/anycable.rb
+- pg_engine/config/initializers/cable_ready.rb
 - pg_engine/config/initializers/devise.rb
 - pg_engine/config/initializers/rollbar.rb
 - pg_engine/config/initializers/simple_form_monkey_patch.rb
@@ -111,6 +113,7 @@ files:
 - pg_engine/lib/pg_engine/configuracion.rb
 - pg_engine/lib/pg_engine/core_ext.rb
 - pg_engine/lib/pg_engine/engine.rb
+- pg_engine/lib/pg_engine/error.rb
 - pg_engine/lib/pg_engine/route_helpers.rb
 - pg_engine/lib/pg_engine/utils/pdf_preview_generator.rb
 - pg_engine/lib/pg_engine/utils/pg_logger.rb
@@ -136,12 +139,19 @@ files:
 - pg_engine/spec/pg_engine/pdf_preview_generator_spec.rb
 - pg_layout/app/assets/stylesheets/animations.scss
 - pg_layout/app/assets/stylesheets/sidebar.scss
-- pg_layout/app/javascript/cookies.js
-- pg_layout/app/javascript/fadein_onload_controller.js
-- pg_layout/app/javascript/navbar_controller.js
-- pg_layout/app/javascript/nested_controller.js
-- pg_layout/app/javascript/pg_form_controller.js
-- pg_layout/app/javascript/utils.ts
+- pg_layout/app/javascript/application.js
+- pg_layout/app/javascript/channels/consumer.js
+- pg_layout/app/javascript/channels/index.js
+- pg_layout/app/javascript/config/cable_ready.js
+- pg_layout/app/javascript/config/index.js
+- pg_layout/app/javascript/controllers/application.js
+- pg_layout/app/javascript/controllers/fadein_onload_controller.js
+- pg_layout/app/javascript/controllers/index.js
+- pg_layout/app/javascript/controllers/navbar_controller.js
+- pg_layout/app/javascript/controllers/nested_controller.js
+- pg_layout/app/javascript/controllers/pg_form_controller.js
+- pg_layout/app/javascript/utils/cookies.js
+- pg_layout/app/javascript/utils/utils.ts
 - pg_layout/app/lib/navbar.rb
 - pg_layout/app/views/devise/confirmations/new.html.erb
 - pg_layout/app/views/devise/mailer/confirmation_instructions.html.erb
@@ -170,7 +180,6 @@ files:
 - pg_layout/app/views/pg_layout/_navbar.html.erb
 - pg_layout/app/views/pg_layout/_rollbar.html.erb
 - pg_layout/app/views/pg_layout/_sidebar.html.erb
-- pg_layout/index.js
 - pg_layout/lib/pg_layout.rb
 - pg_layout/lib/pg_layout/engine.rb
 - pg_rails/js/index.js