cancancan-neo4j 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3b85a803fa71306a5981e5c4088db18f510fe9f
-  data.tar.gz: 6fc3de2b840ebd7bb26e979aed7956d1499231ba
+  metadata.gz: 8e08a1d2366ed56a2098252068703e1038e44527
+  data.tar.gz: c83757e84d871344219d64e8d6739ac124091bc1
 SHA512:
-  metadata.gz: 4afcef739b4b5f44864656692d6da844b0bac734534e7ac18d8cc1355e9ccd00776d7d6292888eb9db5bebab46c59df0bd5a16ffaddfb39925886b2b7109230c
-  data.tar.gz: f3dd00a1d6fbbd64aeb9e249b73cd4a3e047f6c355c6d94b9807133dcaa4fa5ca91f5011faaeca4c85b00f9ac6cb958f53ac2c127ead78c047fb03fa66deeeb2
+  metadata.gz: 9d6d307fca81de261d85d3c0590e791520398dfd54f624edfffd56d8d3e5bd79e3b688fdfe6cb3dbdcaa4d35ba840caefcfd153877f58e83b7cd6197c2ef3781
+  data.tar.gz: cffd3d0cde2bf8999ce78fbdba0e179e35c989944a3d6da035fffde35b6ab393ad2f133410d4cadf5e65336e53c6fe2a45c24101ffc9c6197080847a3b819d06

data/lib/cancancan/model_adapters/neo4j_adapter.rb

@@ -78,6 +78,7 @@ module CanCan
       def records_for_multiple_rules
         base_query = base_query_proxy.query
         cypher_options = construct_cypher_options
+        cypher_options[:matches].reject! { |mt| mt.match(var_name(@model_class)) }
         match_string = cypher_options[:matches].uniq.join(', ')
         base_query = base_query.match(match_string) unless match_string.blank?
         base_query

data/lib/cancancan/neo4j/association_conditions.rb

@@ -20,7 +20,7 @@ module CanCanCan
           rel_length = associations_conditions.delete(:rel_length)
           current_path = append_path_to_conditions(relationship, model_conditions, rel_length)
           append_model_conditions(model_conditions, relationship, current_path)
-          append_association_conditions(associations_conditions, relationship)
+          append_association_conditions(associations_conditions, relationship, rel_length)
         end
       end
 
@@ -28,9 +28,9 @@ module CanCanCan
         @options[:parent_class].associations[association]
       end
 
-      def append_association_conditions(conditions, relationship)
+      def append_association_conditions(conditions, relationship, rel_length)
         return if conditions.blank?
-        asso_conditions_obj = AssociationConditions.new(asso_conditions: conditions, parent_class: relationship.target_class, path: path_with_relationship(relationship))
+        asso_conditions_obj = AssociationConditions.new(asso_conditions: conditions, parent_class: relationship.target_class, path: path_with_relationship(relationship, rel_length))
         append_and_to_conditions_string
         @conditions_string += asso_conditions_obj.conditions_string
         @cypher_matches += asso_conditions_obj.cypher_matches
@@ -68,8 +68,9 @@ module CanCanCan
         @conditions_string += con_string
       end
 
-      def path_with_relationship(relationship)
-        @options[:path] + relationship.arrow_cypher + '()'
+      def path_with_relationship(relationship, rel_length)
+        arrow_cypher = relationship.arrow_cypher(nil, {}, false, false, rel_length)
+        @options[:path] + arrow_cypher + '()'
       end
     end
   end

data/lib/cancancan/neo4j/version.rb

@@ -2,6 +2,6 @@ module CanCanCan
 end
 module CanCanCan
   module Neo4j
-    VERSION = '1.2.0'.freeze
+    VERSION = '1.2.1'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cancancan-neo4j
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Amit Suryavanshi