gdpr_admin 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b1d58ff60fa19dc3b0a1fb067ae2ed0dfc96e8798257989534a39e8600ef878
-  data.tar.gz: b199dc1a90a1fab64a6b98bcde51dc656a8943f12381dcdbc275e51147997c92
+  metadata.gz: 99489f549c8f701322c68c19a73dad4796af585f7b981ac8680590b14e2b299e
+  data.tar.gz: c2918882ca853ded91dc6ecd8aa52ae95dd6c2a9cac99d6c829917693d7e96e5
 SHA512:
-  metadata.gz: b7813fc861f53e6d280369e403e9ece16484dfc433e2005b6c6eac739f91694d06169fcf0b60a3b1d1e32f65dcc45a44a8dee5446e89a35b90391070a42c0c96
-  data.tar.gz: 02a363b0a84f217aceeb3e19e2d0f53b09d7f5030e3dbf16abae8c92a8dc52cca9138c3fca55b6ce1014f639a915914e910c45e7538d5f24ecf79c005a3abb14
+  metadata.gz: 29c763ef8b44f45c56c63c4da8fc8b275dd2a2ce3f6bdb1c8808015543343bcafc1599450d74c2d54be74a8c2020c24649fd31f94d2f0188e38fcc19bc8b6637
+  data.tar.gz: b68927faf70d507c7992f7a64fc2a7eab37034533ebc492d93490179e6e0f276ece51ef2855b06ba938ef03fe974230a2770145a7a263a0fcf2baf181c588b19

data/lib/gdpr_admin/application_data_policy.rb

@@ -43,14 +43,18 @@ module GdprAdmin
     def process
       GdprAdmin.config.tenant_adapter.with_tenant(request.tenant) do
         run_preprocessors
-        scope.find_each do |record|
-          process_record(record)
-        end
+        process_scope(scope)
       rescue SkipDataPolicyError
         nil
       end
     end
 
+    def process_scope(scope)
+      scope.find_each do |record|
+        process_record(record)
+      end
+    end
+
     protected
 
     attr_reader :request
@@ -80,9 +84,13 @@ module GdprAdmin
     def call_hook(hook, value = nil)
       hook = method(hook) unless hook.respond_to?(:call)
 
-      arity = hook.arity
+      arity = arity_of(hook)
       args = [value].take(arity).reverse
       instance_exec(*args, &hook)
     end
+
+    def arity_of(method_or_proc)
+      defined?(T::Utils.arity) ? T::Utils.arity(method_or_proc) : method_or_proc.arity
+    end
   end
 end

data/lib/gdpr_admin/helpers/data_policy_helper.rb

@@ -10,6 +10,16 @@ module GdprAdmin
       def skip_record!
         raise SkipRecordError
       end
+
+      def model_data_policy_class(model)
+        model = model.constantize if model.is_a?(String)
+        return model.data_policy_class if model.respond_to?(:data_policy_class)
+
+        prefix = model.data_policy_prefix if model.respond_to?(:data_policy_prefix)
+        "#{prefix}#{model}DataPolicy".constantize
+      rescue NameError
+        nil
+      end
     end
   end
 end

data/lib/gdpr_admin/paper_trail/version_data_policy.rb

@@ -32,13 +32,7 @@ module GdprAdmin
       end
 
       def infer_data_policy_class(version)
-        model = version.item_type.constantize.new
-        return model.data_policy_class if model.respond_to?(:data_policy_class)
-
-        prefix = model.data_policy_prefix if model.respond_to?(:data_policy_prefix)
-        "#{prefix}#{version.item_type}DataPolicy".constantize
-      rescue NameError
-        nil
+        model_data_policy_class(version.item_type)
       end
     end
   end

data/lib/gdpr_admin/version.rb

@@ -2,6 +2,6 @@
 
 # :nocov:
 module GdprAdmin
-  VERSION = '1.4.0'
+  VERSION = '1.4.1'
 end
 # :nocov:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gdpr_admin
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Colex
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-30 00:00:00.000000000 Z
+date: 2023-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails