pundit_can 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a70b76f365ad9d949e7db20d9fd1eebc689915d18c835801fb2078d98628b3b
-  data.tar.gz: b30f0f0ce6095d46818f7d47bbe3f95b8e7df58664929d0aa1e1e4a93122ab7e
+  metadata.gz: e3dcf9c896cd377f57e774b151b78781f14209ce6f9654ad789186df724c6aaf
+  data.tar.gz: d0123ce7e4c05b6b30269b278c3603464af966b285de4ef4f03f4654edfd096f
 SHA512:
-  metadata.gz: a96f83508916a9650fe4f14c24f0ff13d0d730cf14558e764070da4ec1eaf215c4ef1e06a91adaf09f0d013fb9e07193243a080b9bc737ea3e48dbcc866ed3c8
-  data.tar.gz: e755108ea59470ed01e17a81a8522657b787032c8a2c7fe50459f1353389f47ba9aa2700f6517ee094788a90771e0777fe630fa3f4d5a375edd7b37af8419758
+  metadata.gz: 471b1dd95884dd65e71d18f8fe7e5a2284b428e298ffdbd04c0e0829305a65ecad744c44a14287d659e4550747d6479d71b2589758e8d8f341a18a0dbd0e6a98
+  data.tar.gz: 87f824a1f3c2c61e6f412a07ef86a4bd81f335cc8135accea067fe57864bb906e0d2059d1241cfe7958d0bf2689ed3697553b0561e4ecca0f7c9eceba4f2720d

data/Rakefile

@@ -1,3 +1,13 @@
 require "bundler/setup"
 
 require "bundler/gem_tasks"
+
+require "rake/testtask"
+
+Rake::TestTask.new do |t|
+  t.test_files = FileList["test/*_test.rb"] + FileList["test/pundit_can/*_test.rb"]
+  t.libs << "test"
+end
+
+desc "Run tests"
+task default: :test

data/lib/pundit_can/load_and_authorize.rb

@@ -7,7 +7,14 @@ module PunditCan
 
     included do
       after_action :verify_authorized, unless: -> { respond_to?(:devise_controller?) && devise_controller? }
-      after_action :verify_policy_scoped, except: [:new, :create], unless: -> { respond_to?(:devise_controller?) && devise_controller? }
+
+      except_actions = []
+      except_actions << :new if respond_to?(:new)
+      except_actions << :create if respond_to?(:create)
+
+      after_action :verify_policy_scoped, except: except_actions, unless: lambda {
+                                                                            respond_to?(:devise_controller?) && devise_controller?
+                                                                          }
     end
 
     class_methods do
@@ -22,9 +29,9 @@ module PunditCan
       # @param [*Symbol] actions
       #
       def skip_authorized_check *actions
-        if actions.any?
-          skip_after_action :verify_authorized, only: actions
-        end
+        return unless actions.any?
+
+        skip_after_action :verify_authorized, only: actions
       end
 
       # skip_scoped_check
@@ -38,9 +45,9 @@ module PunditCan
       # @param [*Symbol] actions
       #
       def skip_scoped_check *actions
-        if actions.any?
-          skip_after_action :verify_policy_scoped, only: actions
-        end
+        return unless actions.any?
+
+        skip_after_action :verify_policy_scoped, only: actions
       end
 
       # load_resource
@@ -86,16 +93,18 @@ module PunditCan
       param_key = get_param_key(options, instance_name, model_class)
 
       loaded = if options[:parent]
-        load_parent_instance_var(model_class, param_key, options.extract!(:policy_class), options.extract!(:policy_scope_class))
+        load_parent_instance_var(model_class, param_key, options.extract!(:policy_class),
+          options.extract!(:policy_scope_class))
       else
-        load_instance_var(model_class, param_key, options.extract!(:policy_class), options.extract!(:policy_scope_class))
+        load_instance_var(model_class, param_key, options.extract!(:policy_class),
+          options.extract!(:policy_scope_class))
       end
 
       instance_name = instance_name.pluralize unless loaded.is_a?(model_class)
       instance_variable_set("@#{instance_name}", loaded)
     end
 
-    def get_param_key options, instance_name, model_class
+    def get_param_key(options, instance_name, model_class)
       if options[:parent]
         options.fetch(:param_key, :"#{instance_name || model_class&.name&.underscore}_id")
       else
@@ -105,11 +114,11 @@ module PunditCan
 
     # if a model_name option is given use that otherwise nil
     # and is parent
-    def model_instance_name options
+    def model_instance_name(options)
       options[:model_class].name.underscore if options[:model_class].present? && options[:parent]
     end
 
-    def load_instance_var model_class, param_key, policy_kwopts, policy_scope_kwopts
+    def load_instance_var(model_class, param_key, policy_kwopts, policy_scope_kwopts)
       case params[:action]
       when "index"
         load_scope(model_class, policy_kwopts, policy_scope_kwopts)
@@ -128,17 +137,17 @@ module PunditCan
       end
     end
 
-    def load_parent_instance_var model_class, param_key, policy_kwopts, policy_scope_kwopts
-      if params[param_key]
-        load_model(model_class, param_key, policy_kwopts, policy_scope_kwopts, :show?)
-      end
+    def load_parent_instance_var(model_class, param_key, policy_kwopts, policy_scope_kwopts)
+      return unless params[param_key]
+
+      load_model(model_class, param_key, policy_kwopts, policy_scope_kwopts, :show?)
     end
 
-    def load_model model_class, param_key, policy_kwopts, policy_scope_kwopts, query = nil
+    def load_model(model_class, param_key, policy_kwopts, policy_scope_kwopts, query = nil)
       authorize(policy_scope(model_class, **policy_scope_kwopts).find(params[param_key]), query, **policy_kwopts)
     end
 
-    def load_scope model_class, policy_kwopts, policy_scope_kwopts
+    def load_scope(model_class, policy_kwopts, policy_scope_kwopts)
       authorize(policy_scope(model_class, **policy_scope_kwopts), **policy_kwopts)
     end
   end

data/lib/pundit_can/version.rb

@@ -1,3 +1,3 @@
 module PunditCan
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: pundit_can
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - candland
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-09 00:00:00.000000000 Z
+date: 2023-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: pundit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.0.4.2
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.0.4.2
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
-  name: pundit
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 7.0.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 7.0.4.2
 - !ruby/object:Gem::Dependency
   name: rails-controller-testing
   requirement: !ruby/object:Gem::Requirement
@@ -89,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Add cancan like load and authorize to controllers.