shark-permissions-core 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8fe97d4806a76b363e8b8654cda1df78b26c2a81272d8592f2e457e203a2b34
-  data.tar.gz: 7e50f496ab65ca30fabbea8f2bf69b3a98ca65f0ec2a159ae353075a5cddd36e
+  metadata.gz: aa785346b047b8a08e057ecdd18d197e5d308b478fadb7515507f6c86e8e6cd1
+  data.tar.gz: a543fe0cf713c913755cfc68a51018dedb5ff8178c9243bd3151df00b111c484
 SHA512:
-  metadata.gz: 24a28fc4b1420a52f9b0083b92b704c28cb957f23248014d1f989385e5c97569373d902477f80924e819439e388bfa2cbeff238feb3de40f3ca391493a222de2
-  data.tar.gz: 9ae791ae0f3766df9a0d0e96839104ce10097b70f002fe8e5ad6d5f53d8fa56483b6a1cfcb0c649f68634317cf5f00c1ecd364815368a33c1c1060fd9a9850ae
+  metadata.gz: 34898960845052d163f20a0816f5de43155a622c0d6c215670caa73388328eaa124f1aa480fb0313d9877c07a3bfbbab21643410d4954d7f2a0c7df2016f5e23
+  data.tar.gz: 3613657948b015a35f3b5da853b48ac60f40e63c7ce7e91ce5376ef7f36d8086cca26df4e72b95db5dd0ca3db21a18dbbc61dfc99ca99cdb5ba91c30aa2c889c

data/CHANGELOG.md

@@ -1,4 +1,8 @@
 ## Changelog
 
+#### 0.2.0
+- [fix] `Permissions::List`: rename `#merge!` to `Permissions::List#update`
+- [fix] `Permissions::List`: add original `#merge!` implementation from `bima-doorkeeper-rails`
+
 #### 0.1.0
 - initial

data/lib/shark/permissions/changes.rb

@@ -24,8 +24,16 @@ module Shark
         @privileges[:new][key] = new_value
       end
 
+      # @return [Boolean]
+      # @api public
+      def empty?
+        effect.empty? && privileges.empty?
+      end
+
+      # @return [Boolean]
+      # @api public
       def present?
-        @effect.present? || privileges.present?
+        !empty?
       end
     end
   end

data/lib/shark/permissions/list.rb

@@ -107,14 +107,42 @@ module Shark
         self.class.new(filtered_rules)
       end
 
+      # @param other_list [Shark::Permissions::List]
+      # @return [Hash]
+      # @api public
       def merge(other_list)
         clone.merge!(other_list)
       end
 
+      # Merges another list into this list. Allowed privileges are not removed.
+      # Changes are not tracked.
+      #
+      # @param other_list [Shark::Permissions::List]
+      # @return [Hash]
+      # @api public
       def merge!(other_list)
-        other_list.each do |key, other_rule|
-          rules[key] = Permissions::Rule.new(resource: key) unless rules.key?(key)
-          rules[key].update(other_rule)
+        other_list.each do |resource, rule|
+          if rules.key?(resource)
+            privileges = rules[resource].privileges
+            rule.privileges.each { |k, v| privileges[k] = privileges[k] || v }
+          else
+            rules[resource] = rule.clone
+          end
+        end
+
+        self
+      end
+
+      # Updates this list with rules from another list.
+      # All affected rules are updated and changes are tracked.
+      #
+      # @param other_list [Shark::Permissions::List]
+      # @return [Hash]
+      # @api public
+      def update(other_list)
+        other_list.each do |resource, other_rule|
+          rules[resource] = Permissions::Rule.new(resource: resource) unless rules.key?(resource)
+          rules[resource].update(other_rule)
         end
 
         self

data/lib/shark/permissions/rule.rb

@@ -62,9 +62,7 @@ module Shark
       # @return Boolean
       # @api public
       def ==(other)
-        resource == other.resource &&
-          effect == other.effect &&
-          privileges == other.privileges
+        resource == other.resource && effect == other.effect && privileges == other.privileges
       end
 
       def as_json(*_args)

data/lib/shark/version.rb

@@ -3,7 +3,7 @@
 module Shark
   module Permissions
     module Core
-      VERSION = '0.1.0'
+      VERSION = '0.2.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shark-permissions-core
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Joergen Dahlke
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-02 00:00:00.000000000 Z
+date: 2021-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport