simple-navigation-acl 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fdb8332bcf728cb3dc6929fd66efc3c14c9ae075
-  data.tar.gz: f2f2f3bf37a53df4b321bf7c6c4e02148f7e390b
+  metadata.gz: dc76fec314ad4e65a068e25567468ad9b33492c7
+  data.tar.gz: 9eb44ab803b6bd46c7526590d7099f94e2b48a12
 SHA512:
-  metadata.gz: 676dccb0ab8b820259e1f4cc73bfb35573edc5fefcbad4f22ed2a2265bc76d84d3b582829e9985102c9288916ac76a47d7166212704608adb4944ca7e7c3335b
-  data.tar.gz: ec854928da332e87c2c61a65c3eb8a7a4cb975e2167250e19279d9ff2e2a4a41410bc5dbcac3b6a3cf2e5b1117659a34a05f88b0cfd9d39d92207db91fddfcc4
+  metadata.gz: db3f4d7001860ff867b590ea9343adbe1984034cbab9fbe03d7b4b3bae89424a97bdc440be24ad7d32a1fccb5028ad7f197d47e8a1dfb5ead8b5abfdb13254c4
+  data.tar.gz: 82e5032ca4a93d7a9ccd9c5e72e8fb52444d4b5e557882f794999cd7d5707d0d733c1fae25008bdcd0da35a43d8c6b3791b98546af64b22e4a32feb6a11cd111

data/lib/simple_navigation_acl/base.rb

@@ -35,21 +35,22 @@ module SimpleNavigationAcl
 
       def apply_acl(navigation, id, context)
         context=:default if context.nil?
-        rules_keys = SimpleNavigationAcl::AclRule.where(context: context)
-        rules_keys = rules_keys.where(id: id) unless id==:all
+        rules_keys = id==:all ? :all : SimpleNavigationAcl::AclRule.where(context: context).where(id: id).pluck(:key)
         container = navigation.is_a?(SimpleNavigation::Configuration) ? navigation.instance_variable_get(:@primary_navigation) : navigation
-        filter_simple_navigation_with_rules!(container, rules_keys.pluck(:key))
+        filter_simple_navigation_with_rules!(container, rules_keys)
         true
       end
 
       def filter_simple_navigation_with_rules!(simple_navigation_item_container, keys)
-        simple_navigation_item_container.items.delete_if do |simple_navigation_item|
-          if keys.include?(simple_navigation_item.key.to_s)
-            sub_navigation = simple_navigation_item.sub_navigation
-            filter_simple_navigation_with_rules!(sub_navigation, keys) if sub_navigation
-            false
-          else
-            true
+        unless keys==:all
+          simple_navigation_item_container.items.delete_if do |simple_navigation_item|
+            if keys.include?(simple_navigation_item.key.to_s)
+              sub_navigation = simple_navigation_item.sub_navigation
+              filter_simple_navigation_with_rules!(sub_navigation, keys) if sub_navigation
+              false
+            else
+              true
+            end
           end
         end
       end

data/lib/simple_navigation_acl/version.rb

@@ -1,3 +1,3 @@
 module SimpleNavigationAcl
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple-navigation-acl
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Bruno Porto