consent 2.5.0 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a7f3d0bface397869a595d46763a6c17aafa1563e074d7b658454fc0b1e4c2f
-  data.tar.gz: 301924b497164138ee60d4de3970caa9dee41ebb01697ecccf7ef9fc9202ee70
+  metadata.gz: a6c7e94dbb1d102068875abf44fd3cc46eca7e437eb6958a5523a2a044790e4d
+  data.tar.gz: 86424bc2149fcb347526554c9b4a82822f5f68c728031ae7313fb728efe55c08
 SHA512:
-  metadata.gz: 7fdc2b3e5ff872bdc11da1688fb362d360f33e217ea5d5ffe6e8a9e2e0438454e94a7402d8c0db32ca738524e690e007a14a9e2ccdc51401a13926887d44d949
-  data.tar.gz: 78e9b088d5e3dd9772944155ae8704f33a9b474c952c9513c78f73bff420871eee1352e8d692dd42b5a924e93bf4083023c34574300db6003adb4ad070f08224
+  metadata.gz: cfe9c13129199fdc7c6ae108646bbdd928e7879355896592fa97df8b41cd2039a8a5bbea9c0b44516c94055cb226bb75abf955c0fcb839d58a6f748306cfd039
+  data.tar.gz: ccd782f1aa33ff06111b8d0407e849ee4f99a2b610248a368c66f4a4ef9b9c4c45e9501a93109ef5dc29fc7801a2bc496c7c272e59a7e80078f47737f9ee54ac

data/Gemfile.lock

@@ -11,7 +11,7 @@ PATH
 PATH
   remote: .
   specs:
-    consent (2.5.0)
+    consent (2.6.0)
       cancancan (= 3.2.1)
 
 GEM

data/docs/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## [Unreleased]
 
+### [2.6.0] - 2026-06-15
+
+- Changed permission checksum calculation to use permission data rather than permission file contents. [#438](https://github.com/powerhome/power-tools/pull/438)
+
 ### [2.5.0] - 2026-05-27
 
 - Drop support for Ruby < 3.3 and Rails < 7.1 [#396](https://github.com/powerhome/power-tools/pull/396)

data/gemfiles/rails_7_1.gemfile.lock

@@ -11,7 +11,7 @@ PATH
 PATH
   remote: ..
   specs:
-    consent (2.5.0)
+    consent (2.6.0)
       cancancan (= 3.2.1)
 
 GEM

data/gemfiles/rails_7_2.gemfile.lock

@@ -11,7 +11,7 @@ PATH
 PATH
   remote: ..
   specs:
-    consent (2.5.0)
+    consent (2.6.0)
       cancancan (= 3.2.1)
 
 GEM

data/lib/consent/action.rb

@@ -22,12 +22,18 @@ module Consent
     end
 
     def to_permission_payload
+      views = self.views.values.sort
       {
         action: key,
         label: label,
-        views: views.values.map(&:to_permission_payload),
+        views: views.map(&:to_permission_payload),
+        options: options.except(:views),
         default_view: default_view&.to_permission_payload,
       }
     end
+
+    def <=>(other)
+      key <=> other.key
+    end
   end
 end

data/lib/consent/permission_definition_payload.rb

@@ -3,9 +3,10 @@
 module Consent
   class PermissionDefinitionPayload
     def self.generate
+      subjects = Consent.subjects.sort
       {
         consent_version: Consent::VERSION,
-        permissions: Consent.subjects.map(&:to_permission_payload),
+        permissions: subjects.map(&:to_permission_payload),
       }
     end
   end

data/lib/consent/subject.rb

@@ -12,12 +12,20 @@ module Consent
     end
 
     def to_permission_payload
+      actions = self.actions.sort
+      views = self.views.values.sort
       {
         subject: key,
         label: label,
         actions: actions.map(&:to_permission_payload),
-        views: views.values.map(&:to_permission_payload),
+        views: views.map(&:to_permission_payload),
       }
     end
+
+    def <=>(other)
+      key = Consent::SubjectCoder.dump(key)
+      other_key = Consent::SubjectCoder.dump(other.key)
+      key <=> other_key
+    end
   end
 end

data/lib/consent/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Consent
-  VERSION = "2.5.0"
+  VERSION = "2.6.0"
 end

data/lib/consent/view.rb

@@ -29,5 +29,9 @@ module Consent
         label: label,
       }
     end
+
+    def <=>(other)
+      key <=> other.key
+    end
   end
 end

data/lib/consent.rb

@@ -84,24 +84,14 @@ module Consent
     Dir[*permission_files].each { |file| Kernel.load(file) }
   end
 
-  # Returns the concatenated contents of all permission files
+  # Calculates a deterministic checksum of all permission definitions
   #
-  # @param paths [Array<String,#to_s>] paths where the ruby files are located
-  # @return [String] concatenated file contents
-  def self.subjects_content(paths)
-    permission_files = paths.map { |dir| File.join(dir, "*.rb") }
-    files = Dir[*permission_files].sort
-    files.map { |file| File.read(file) }.join
-  end
-
-  # Calculates a deterministic checksum of all permission files
-  #
-  # @param paths [Array<String,#to_s>] paths where the ruby files are located
-  # @return [String] SHA256 hexdigest of all permission file contents
-  def self.subjects_checksum(paths)
+  # @return [String] SHA256 hexdigest of all permission definitions
+  def self.subjects_checksum
     require "digest/sha2"
 
-    Digest::SHA256.hexdigest(subjects_content(paths))
+    subjects = Consent.subjects.sort
+    Digest::SHA256.hexdigest(subjects.map(&:to_permission_payload).to_json)
   end
 
   # Defines a subject with the given key, label and options

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: consent
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.6.0
 platform: ruby
 authors:
 - Carlos Palhares