pg_rails 7.6.22.pre.3 → 7.6.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e11eaaf87267c270b7a5dc436af8bc9408b06c98f576f83131e1f0dc8bc90fd1
-  data.tar.gz: 102b832b63cefc8ad4036af4fbbf4737fb3b7bffba8a3c265e9bad027a91ff46
+  metadata.gz: 97cc9ad4a85c63b07fdec127479fad2481b4b0e6bfd132ea2a88248f26469b22
+  data.tar.gz: '033854a368aca25c8b76e811a1a83c05a23ce9ad071115da6e8513b82bc2261a'
 SHA512:
-  metadata.gz: 638c860b8f356d0fca74690f744f80ea103cfe637cb15e6619e49d98f70f4f9288d26cfcf17896211f656a707b6eab7565e0145e02f84ea260a5a39a8a0faade
-  data.tar.gz: 07e01cadab3025d652009783410535ccf47037a33d1f1cbb26e9f18020e36b6c34ba05886d78d5112ac95cbd1e885515a7f3c3a2be4333b61bfa75955964c7ea
+  metadata.gz: f94452ac22cfd17e8891af82d0412fe45b5acbbdc26d0870a61458098b5f59f4d45787a56210dc5e2d785bf933ecd6121797eb2ace0e15eb958a1e1e7ad11259
+  data.tar.gz: 96686a8d9857eb288f035a1c489f4935a837c50dc44c020c3ef51d5c7c7343bf02c7b7cc710bedb7d8f6782d1bcfb9d26406da5680d3a42565eb3ab93cb800bd

data/pg_engine/app/controllers/pg_engine/base_controller.rb

@@ -2,7 +2,6 @@
 
 module PgEngine
   # rubocop:disable Rails/ApplicationController
-  # rubocop:disable Metrics/ClassLength
   class BaseController < ActionController::Base
     # Importante que esta línea esté al principio
     protect_from_forgery with: :exception
@@ -56,6 +55,7 @@ module PgEngine
     include RouteHelper
     include PgAssociable::Helpers
     include FrameHelper
+    include PgRailsHelper
 
     class Redirect < PgEngine::Error
       attr_accessor :url
@@ -126,16 +126,6 @@ module PgEngine
       render_my_component(InternalErrorComponent.new, :ok)
     end
 
-    helper_method :dev_user_or_env?
-    def dev_user_or_env?
-      Rails.env.development? || dev_user?
-    end
-
-    helper_method :dev_user?
-    def dev_user?
-      Current.user&.developer?
-    end
-
     helper_method :mobile_device?
 
     layout 'pg_layout/base'
@@ -231,5 +221,4 @@ module PgEngine
       redirect_back fallback_location: root_path
     end
   end
-  # rubocop:enable Metrics/ClassLength
 end

data/pg_engine/app/decorators/pg_engine/base_record_decorator.rb

@@ -4,6 +4,8 @@
 module PgEngine
   class BaseRecordDecorator < Draper::Decorator
     include ActionView::Helpers
+    include PgEngine::DefaultUrlOptions
+    include Rails.application.routes.url_helpers
     include PrintHelper
     include FormHelper
     include RouteHelper
@@ -173,7 +175,11 @@ module PgEngine
     end
 
     def object_url
-      helpers.url_for(target_object)
+      # FIXME: arreglar las urls generadas con "helpers"
+      # ver cómo se construye el view helper en los jobs
+      # y si se puede injectar el default url options ahí
+      # helpers.url_for(target_object)
+      url_for(target_object)
     end
 
     def nested_record

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

@@ -9,6 +9,14 @@ module PgEngine
       end
     end
 
+    def dev_user_or_env?
+      Rails.env.development? || dev_user?
+    end
+
+    def dev_user?
+      Current.user&.developer?
+    end
+
     private
 
     def do_placeholder(src = nil, width: '100%', height: '100%', **img_opts)

data/pg_engine/app/helpers/pg_engine/route_helper.rb

@@ -67,5 +67,13 @@ module PgEngine
     def path_for(array)
       url_for(array.push({ only_path: true }))
     end
+
+    def context_root_path
+      if Current.tid.present?
+        tenant_root_path(tid: Current.tid)
+      else
+        (Current.user.present? ? users_root_path : root_path)
+      end
+    end
   end
 end

data/pg_engine/app/views/layouts/_logo.html.slim

@@ -1,5 +1,4 @@
-- href = Current.tid.present? ? tenant_root_path(tid: Current.tid) : root_path
-a.navbar-brand href="#{ href }"
+a.navbar-brand href="#{ context_root_path }" data-turbo="false"
   = image_tag(PgEngine.site_brand.logo_navbar_url, alt: PgEngine.site_brand.name)
 
 css:

data/pg_engine/config/routes.rb

@@ -48,6 +48,7 @@ Rails.application.routes.draw do
   end
 
   # root to: 'users/accounts#index'
+  # FIXME: qué onda
   root to: redirect('/u')
 
   namespace :admin, path: 'a' do

data/pg_engine/lib/pg_engine/site_brand.rb

@@ -11,7 +11,7 @@ module PgEngine
     def value_for(key)
       options = @options[key.to_sym]
 
-      raise PgEngine::Error, 'Key not found' if options.nil?
+      raise PgEngine::Error, "Key not found: #{key}" if options.nil?
 
       if Current.app_name.present? && options.keys.include?(Current.app_name)
         options[Current.app_name]

data/pg_engine/lib/pg_engine/test/dummy_brand.rb

@@ -6,7 +6,6 @@ module PgEngine
 
         @default_site_brand = :factura
 
-        # FIXME: mover los pngs a pg_engine/ dentro de una carpeta test/
         @options = {
           landing_site_url: {
             procura: 'https://bien.com.ar/procura',
@@ -73,7 +72,7 @@ module PgEngine
         return :procura if request.host.match(/procura/)
         return :factura if request.host.match(/factura/)
 
-        pg_warn 'default site_brand assigned'
+        pg_warn 'default site_brand assigned' unless Rails.env.local?
 
         :factura
       end

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

@@ -8,7 +8,7 @@ html
     - if @turbo_page_requires_reload
       meta name="turbo-visit-control" content="reload"
 
-    - cache :title_icon
+    - cache [:title_icon, Current.app_name]
       title = PgEngine.site_brand.name
       - begin
         = render partial: 'layouts/favicon'
@@ -27,7 +27,10 @@ html
     meta name="turbo-prefetch" content="#{ENV.fetch('TURBO_PREFETCH_ENABLE', 'false')}"
     meta name="view-transition" content="same-origin"
     meta name="cable-history-timestamp" content="#{Time.now.to_i}"
-    = csrf_meta_tags
+
+    - unless @skip_csrf_meta_tags
+      = csrf_meta_tags
+
     = csp_meta_tag
     - if defined?(AnyCable::Rails)
       = action_cable_with_jwt_meta_tag
@@ -114,10 +117,11 @@ html
               = captured_content
 
           div style="width:100%; height: 10em"
-          .d-flex.gap-1.justify-content-center.opacity-50 data-controller="theme"
-            | (Beta) Tema:
-            = link_to 'Claro', 'javascript:void(0)', 'data-action': 'theme#light'
-            = link_to 'Oscuro', 'javascript:void(0)', 'data-action': 'theme#dark'
+          - if dev_user?
+            .d-flex.gap-1.justify-content-center.opacity-50 data-controller="theme"
+              | (Beta) Tema:
+              = link_to 'Claro', 'javascript:void(0)', 'data-action': 'theme#light'
+              = link_to 'Oscuro', 'javascript:void(0)', 'data-action': 'theme#dark'
           = render partial: 'layouts/footer'
           div style="width:100%; height: 10em"
     = render_turbo_stream_title

data/pg_rails/lib/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PgRails
-  VERSION = '7.6.22-3'
+  VERSION = '7.6.23'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.6.22.pre.3
+  version: 7.6.23
 platform: ruby
 authors:
 - Martín Rosso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-11-09 00:00:00.000000000 Z
+date: 2024-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails