iknow_view_models 3.6.3 → 3.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f71d69093b0d35214edcfe799aa3fc4493e0640a349e93c828e0158260d4b6c
-  data.tar.gz: 2c2368cd3b0bb27f37ef8e609eae6a396d4de12c4555b90c153386e8bd2a9998
+  metadata.gz: 31ecbd493e6716db0442e309c1566f38c13f676ef72a55ea9708f1537875331f
+  data.tar.gz: b03d5b1b1f0d3ba458f11f5575f379969eea72089f781ef65462ab47e181e158
 SHA512:
-  metadata.gz: c27c10d2940db8b9ed7f0ec512873053f4a2d94283d11004d68b4b70153f696fe3fd45aa103f7ee02ed75fbf3c5d0d8ac899b9df769196308cf67c32dbb3af35
-  data.tar.gz: 882931e849905b9caaf8af154725339b7cda761b1f3ad2deb4d93c4f489cb11c8699143df1e907e51d572ec0a93c07d2f960c86f3e6c35b844d2f86c2839eb66
+  metadata.gz: 06e8384611d8fe7e93ac6065c11aca651f15b717be02a0818106198b769fe6ea59c843a83fd7cd457089a44a98cda499e7f5a2ae905d6c4b46c04e18c68cd4af
+  data.tar.gz: 3c20e972b8a5011aeae40494bf8d271ec3ef5092bbccb7495ea435a7e99dbf45b89f632e868c56bdf681722251f4432e6bd426dba2bfd9d2ef93cce7fc71c066

data/lib/iknow_view_models/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module IknowViewModels
-  VERSION = '3.6.3'
+  VERSION = '3.6.4'
 end

data/lib/view_model/access_control/composed.rb

@@ -175,11 +175,10 @@ class ViewModel::AccessControl::Composed < ViewModel::AccessControl
     end
 
     def inspect
-      s = super + '('
-      s += inspect_checks.join(', ')
-      s += " includes checkers: #{@included_checkers.inspect}" if @included_checkers.present?
-      s += ')'
-      s
+      checks = inspect_checks
+      checks << "includes checkers: #{@included_checkers.inspect}" if @included_checkers.present?
+
+      super + '(' + checks.join(', ') + ')'
     end
 
     def inspect_checks

data/lib/view_model/access_control/tree.rb

@@ -192,8 +192,6 @@ class ViewModel::AccessControl::Tree < ViewModel::AccessControl
       def inspect_checks
         checks = super
         if root?
-          checks << 'no root checks'
-        else
           checks << "root_children_visible_if: #{root_children_visible_ifs.map(&:reason)}"            if root_children_visible_ifs.present?
           checks << "root_children_visible_unless: #{root_children_visible_unlesses.map(&:reason)}"   if root_children_visible_unlesses.present?
           checks << "root_children_editable_if: #{root_children_editable_ifs.map(&:reason)}"          if root_children_editable_ifs.present?
@@ -252,16 +250,16 @@ class ViewModel::AccessControl::Tree < ViewModel::AccessControl
 
     def save_root_visibility!(traversal_env)
       result = check_delegates(traversal_env,
-                               self.class.each_check(:root_children_visible_ifs,      ->(a) { a.is_a?(Node) }),
-                               self.class.each_check(:root_children_visible_unlesses, ->(a) { a.is_a?(Node) }))
+                               self.class.each_check(:root_children_visible_ifs,      ->(a) { a < Node }),
+                               self.class.each_check(:root_children_visible_unlesses, ->(a) { a < Node }))
 
       store_descendent_visibility(traversal_env.view, result)
     end
 
     def save_root_editability!(traversal_env)
       result = check_delegates(traversal_env,
-                               self.class.each_check(:root_children_editable_ifs,      ->(a) { a.is_a?(Node) }),
-                               self.class.each_check(:root_children_editable_unlesses, ->(a) { a.is_a?(Node) }))
+                               self.class.each_check(:root_children_editable_ifs,      ->(a) { a < Node }),
+                               self.class.each_check(:root_children_editable_unlesses, ->(a) { a < Node }))
 
       store_descendent_editability(traversal_env.view, result)
     end

data/test/unit/view_model/access_control_test.rb

@@ -319,6 +319,26 @@ class ViewModel::AccessControlTest < ActiveSupport::TestCase
       assert_serializes(Tree1View, make_tree('rule:visible_children', 'visible child', 'rule:visible_children', 'visible child'))
     end
 
+    def test_root_inheritance
+      parent_access_control = Class.new(ViewModel::AccessControl::Tree)
+      parent_access_control.view 'Tree1' do
+        visible_if!('true') { true }
+
+        root_children_visible_if!('root children visible') do
+          view.val == 'rule:visible_children'
+        end
+      end
+
+      TestAccessControl.include_from(parent_access_control)
+
+      refute_serializes(Tree1View, make_tree('arbitrary parent',      'invisible child'))
+      assert_serializes(Tree1View, make_tree('rule:visible_children', 'visible child'))
+
+      # nested root
+      refute_serializes(Tree1View, make_tree('rule:visible_children', 'visible child', 'arbitrary parent',      'invisible child'))
+      assert_serializes(Tree1View, make_tree('rule:visible_children', 'visible child', 'rule:visible_children', 'visible child'))
+    end
+
     def test_visibility_veto_from_root
       TestAccessControl.view 'Tree1' do
         root_children_visible_unless!('root children invisible') do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iknow_view_models
 version: !ruby/object:Gem::Version
-  version: 3.6.3
+  version: 3.6.4
 platform: ruby
 authors:
 - iKnow Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-23 00:00:00.000000000 Z
+date: 2022-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack