cancancan 3.5.0 → 3.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bebbba60e68460ec234fc11e8d3cf0414e578a56c0347862c673396eb917dff9
-  data.tar.gz: bb07244a17dcf45d1852cf6677864084c2f0db5630ea9b72bdcc0c6055b5c4b6
+  metadata.gz: e0d4a5b11aba155764cf54465d5d8bf88872fed61f4a33736d45a531c619ad6e
+  data.tar.gz: 12b3b41403f3fdaba3fdb97c30ce17e319d1bfdef05fcb7700d41ba754c75a55
 SHA512:
-  metadata.gz: be9f2b03ae43651ea70a451b97a44fd6ec6e0a09ca444ddf625b91ae3815a245e0669bb80b4d3b0687ca327bc0c4fe81028f7736cb6493ef636b43a4140f4f49
-  data.tar.gz: db75441929e737d12699f57324d031e894b5d2cdbe1555451857977c42b0ef28148cc63bb718981c32ac08bafd2873623d2151ba8e98c442f217b3f4affecda9
+  metadata.gz: beb6989dbb2554678fa17626b6138aab396419b6d01ed8ce3ee3781030086da48985837a01bef50ab111fb47273454df8c7e3d6ced11b10a036ffe2e494feb15
+  data.tar.gz: 405b0e6eb4ab73f04964651ab27e106701c014cd706f74012e5f30aada5796de6541f812593b57e058031af0991890884701136229f0405900e3bc99ce3747ee

data/lib/cancan/ability/strong_parameter_support.rb

@@ -31,7 +31,7 @@ module CanCan
         klass = subject_class?(subject) ? subject : subject.class
         # empty attributes is an 'all'
         if rule.attributes.empty? && klass < ActiveRecord::Base
-          klass.column_names.map(&:to_sym) - Array(klass.primary_key)
+          klass.attribute_names.map(&:to_sym) - Array(klass.primary_key)
         else
           rule.attributes
         end

data/lib/cancan/controller_additions.rb

@@ -171,6 +171,11 @@ module CanCan
       # [:+instance_name+]
       #   The name of the instance variable for this resource.
       #
+      # [:+id_param+]
+      #   Find using a param key other than :id. For example:
+      #
+      #     load_resource :id_param => :url # will use find(params[:url])
+      #
       # [:+through+]
       #   Authorize conditions on this parent resource when instance isn't available.
       #

data/lib/cancan/model_adapters/active_record_adapter.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+# rubocop:disable Metrics/AbcSize
+# rubocop:disable Metrics/CyclomaticComplexity
+# rubocop:disable Metrics/PerceivedComplexity
 module CanCan
   module ModelAdapters
     class ActiveRecordAdapter < AbstractAdapter
@@ -52,7 +55,7 @@ module CanCan
           # Search again in case of polymorphic associations, this time matching on the :has_many side
           # via the :as option, as well as klass
           foreign_key ||= parent_class.reflect_on_all_associations(:has_many).find do |has_many_assoc|
-            !matching_parent_child_polymorphic_association(has_many_assoc, child_class).nil?
+            matching_parent_child_polymorphic_association(has_many_assoc, child_class)
           end&.foreign_key&.to_sym
 
           foreign_key.nil? ? nil : all_conditions[foreign_key]
@@ -61,7 +64,7 @@ module CanCan
         def matching_parent_child_polymorphic_association(parent_assoc, child_class)
           return nil unless parent_assoc.klass == child_class
           return nil if parent_assoc&.options[:as].nil?
-  
+
           child_class.reflect_on_all_associations(:belongs_to).find do |child_assoc|
             # Only match this way for polymorphic associations
             child_assoc.polymorphic? && child_assoc.name == parent_assoc.options[:as]
@@ -72,12 +75,12 @@ module CanCan
           child_class = child.is_a?(Class) ? child : child.class
           parent_class = parent.is_a?(Class) ? parent : parent.class
 
-          association = child_class.reflect_on_all_associations(:belongs_to).find do |association|
+          association = child_class.reflect_on_all_associations(:belongs_to).find do |belongs_to_assoc|
             # Do not match on polymorphic associations or it will throw an error (klass cannot be determined)
-            !association.polymorphic? && association.klass == parent.class
+            !belongs_to_assoc.polymorphic? && belongs_to_assoc.klass == parent.class
           end
 
-          return association unless association.nil?
+          return association if association
 
           parent_class.reflect_on_all_associations(:has_many).each do |has_many_assoc|
             association ||= matching_parent_child_polymorphic_association(has_many_assoc, child_class)
@@ -217,6 +220,9 @@ module CanCan
     end
   end
 end
+# rubocop:enable Metrics/PerceivedComplexity
+# rubocop:enable Metrics/CyclomaticComplexity
+# rubocop:enable Metrics/AbcSize
 
 ActiveSupport.on_load(:active_record) do
   send :include, CanCan::ModelAdditions

data/lib/cancan/rules_compressor.rb

@@ -11,6 +11,7 @@ module CanCan
     end
 
     def compress(array)
+      array = simplify(array)
       idx = array.rindex(&:catch_all?)
       return array unless idx
 
@@ -19,5 +20,22 @@ module CanCan
         .drop_while { |n| n.base_behavior == value.base_behavior }
         .tap { |a| a.unshift(value) unless value.cannot_catch_all? }
     end
+
+    # If we have A OR (!A AND anything ), then we can simplify to A OR anything
+    # If we have A OR (A OR anything ), then we can simplify to A OR anything
+    # If we have !A AND (A OR something), then we can simplify it to !A AND something
+    # If we have !A AND (!A AND something), then we can simplify it to !A AND something
+    #
+    # So as soon as we see a condition that is the same as the previous one,
+    # we can skip it, no matter of the base_behavior
+    def simplify(rules)
+      seen = Set.new
+      rules.reverse_each.filter_map do |rule|
+        next if seen.include?(rule.conditions)
+
+        seen.add(rule.conditions)
+        rule
+      end.reverse
+    end
   end
 end

data/lib/cancan/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CanCan
-  VERSION = '3.5.0'.freeze
+  VERSION = '3.6.1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cancancan
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 3.6.1
 platform: ruby
 authors:
 - Alessandro Rodi (Renuo AG)
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-05 00:00:00.000000000 Z
+date: 2024-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal
@@ -172,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: Simple authorization solution for Rails.