pg_rails 7.0.8.pre.alpha.84 → 7.0.8.pre.alpha.85

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c61900d2d0b3a827718b84a3cab67f4851b2eb3087e7fbc1d313f0acf163bf3
-  data.tar.gz: bfca92cbb58ba292877ccb61b15b08049a0d800fdc13408f82647e9ea7c66ee9
+  metadata.gz: a8e7f1383530ebb81fee806358820682f5296214306d3e7a31e552f977f84e08
+  data.tar.gz: c824d6e755c9048e05f30cb628ab21d991b9a737f754e5be17fc915c273d9446
 SHA512:
-  metadata.gz: 2282deaa98881e20bd0b754c6496fc9da679214760ea45fd5f8c2f0b64a0903e1557cffb2f8d4c13b156d46e62b237113bf8f24bdba676436a404eb1e57e37c5
-  data.tar.gz: d9ece2e6b39c53169548c253afdb18fb9707d76bc762b0b86b7cc2656e563a4efea6d303f51814aac22926effd37ef1ec1d6c6a6d00bded153476864586f6b14
+  metadata.gz: e96376b503168349f4383a6f12a9b617c0da2454b3a03e490e48bebe5bb4ee7732581fd8b9757e2ade08559c5a3d9b2b189f23b2d095740a318cd5964fa3dab2
+  data.tar.gz: f2f9f557c97be28535b81cc28efcf6aca1e306ef3aa22e1b97941161f468bf2381038c4c952bdd9da56ea233fe04e36e1f206baf424711b6596c83457d711328

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

@@ -229,7 +229,7 @@ module PgEngine
         instancia_modelo.assign_attributes(modelo_params) if action_name.in? %w[update]
       end
 
-      authorize instancia_modelo
+      Current.user&.developer? || authorize(instancia_modelo)
 
       # TODO: problema en create y update cuando falla la validacion
       # Reproducir el error antes de arreglarlo

data/pg_engine/app/mailers/pg_engine/base_mailer.rb

@@ -21,6 +21,7 @@ module PgEngine
 
     rescue_from StandardError do |err|
       pg_err err
+      # TODO: agregar un backtrace
       @email_object.update_columns(status: :failed, status_detail: err.to_s) if @email_object.present?
     end
 

data/pg_engine/app/policies/mensaje_contacto_policy.rb

@@ -25,7 +25,7 @@ class MensajeContactoPolicy < ApplicationPolicy
   #   acceso_total? && !record.readonly?
   # end
 
-  def acceso_total?
+  def puede_crear?
     true
   end
 end

data/pg_engine/app/policies/pg_engine/{application_policy.rb → base_policy.rb}

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module PgEngine
-  class ApplicationPolicy
+  class BasePolicy
     attr_reader :user, :record
 
     def initialize(user, record)
@@ -9,19 +9,13 @@ module PgEngine
       @record = record
     end
 
-    def editar_en_lugar?
-      puede_editar?
-    end
-
     def index?
-      raise "esta policy se llama con la clase modelo y no con #{record.class}" unless record.class
-
-      acceso_total? || Pundit.policy_scope!(user, record).any?
+      base_access_to_collection?
     end
 
     def show?
       # scope.where(id: record.id).exists?
-      acceso_total?
+      base_access_to_record?
     end
 
     def create?
@@ -57,7 +51,7 @@ module PgEngine
       end
 
       def resolve
-        if policy.acceso_total?
+        if policy.base_access_to_collection?
           scope.all
         else
           scope.none
@@ -72,29 +66,31 @@ module PgEngine
     end
 
     def puede_editar?
-      acceso_total?
+      base_access_to_record?
     end
 
     def puede_crear?
-      acceso_total?
+      base_access_to_collection?
     end
 
     def puede_borrar?
-      acceso_total?
+      base_access_to_record?
     end
 
     def export?
-      acceso_total?
+      base_access_to_collection?
+    end
+
+    def base_access_to_record?
+      user&.developer?
     end
 
-    def acceso_total?
+    def base_access_to_collection?
       user&.developer?
     end
 
     def objeto_borrado?
-      if record.respond_to?(:deleted?)
-        record.deleted?
-      elsif record.respond_to?(:discarded?)
+      if record.respond_to?(:discarded?)
         record.discarded?
       else
         false

data/pg_engine/lib/pg_engine/utils/check_invalid_records.rb

@@ -20,15 +20,23 @@ module PgEngine
       end
 
       def classes
-        ActiveRecord::Base.descendants - ignored_classes
+        all = ActiveRecord::Base.descendants.select { |m| m.table_name.present? }
+        all - ignored_classes
       end
 
       def ignored_classes
         [
+          ActionText::Record,
+          ActionMailbox::Record,
+          ActiveAdmin::Comment,
           ActiveStorage::Record,
           PgEngine::BaseRecord,
-          ActiveAdmin::Comment,
           Audited::Audit,
+          ActionText::RichText,
+          ActionText::EncryptedRichText,
+          ActionMailbox::InboundEmail,
+          ActiveStorage::VariantRecord,
+          ActiveStorage::Attachment,
           ActiveStorage::Blob,
           ApplicationRecord
         ]

data/pg_engine/spec/controllers/public/mensaje_contactos_controller_spec.rb

@@ -42,12 +42,6 @@ RSpec.describe Public::MensajeContactosController do
     }
   end
 
-  let(:logged_user) { create :user, :developer }
-
-  before do
-    sign_in logged_user if logged_user.present?
-  end
-
   describe 'routing' do
     it 'routes GET index correctly' do
       route = { get: '/contacto/new' }

data/pg_rails/lib/version.rb

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

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

@@ -10,7 +10,7 @@ require_dependency "<%= namespaced_path %>/application_policy"
 class <%= class_name %>Policy < ApplicationPolicy
   class Scope < ApplicationPolicy::Scope
     # def resolve
-    #   if policy.acceso_total?
+    #   if policy.base_access_to_collection?
     #     scope.all
     #   else
     #     scope.none
@@ -19,19 +19,23 @@ class <%= class_name %>Policy < ApplicationPolicy
   end
 
   # def puede_editar?
-  #   acceso_total? && !record.readonly?
+  #   base_access_to_record?
   # end
 
   # def puede_crear?
-  #   acceso_total? || user.asesor?
+  #   base_access_to_collection?
   # end
 
   # def puede_borrar?
-  #   acceso_total? && !record.readonly?
+  #   base_access_to_record?
   # end
 
-  # def acceso_total?
-  #   user.developer?
+  # def base_access_to_record?
+  #   base_access_to_collection? && record.account == Current.account
+  # end
+
+  # def base_access_to_collection?
+  #   user.present?
   # end
 end
 <% end -%>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.0.8.pre.alpha.84
+  version: 7.0.8.pre.alpha.85
 platform: ruby
 authors:
 - Martín Rosso
@@ -1002,7 +1002,7 @@ files:
 - pg_engine/app/policies/email_log_policy.rb
 - pg_engine/app/policies/email_policy.rb
 - pg_engine/app/policies/mensaje_contacto_policy.rb
-- pg_engine/app/policies/pg_engine/application_policy.rb
+- pg_engine/app/policies/pg_engine/base_policy.rb
 - pg_engine/app/policies/user_account_policy.rb
 - pg_engine/app/policies/user_policy.rb
 - pg_engine/app/policies/user_registration_policy.rb