cancancan-neo4j 1.0.3 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc6540031583b7f96c4143b5536b303ac76f0c21
-  data.tar.gz: 3a1f772cec756e1ddf03039fc164a5a3814dc3a6
+  metadata.gz: c3b85a803fa71306a5981e5c4088db18f510fe9f
+  data.tar.gz: 6fc3de2b840ebd7bb26e979aed7956d1499231ba
 SHA512:
-  metadata.gz: d81cd6bd8f6edceb1277134351fc34d9c1af8cedbed19c1bfcea2e41ea26dcc463b696d6bb8371f604c1300afd2237b9f338c798924233266f7aa534a91acf0d
-  data.tar.gz: 593f125d2bdefa76bca27dcf00fd318a220c200df7990742cf5e84ce85140cf9f1ed8a54bfa306f3e4c8694c41932e91e747d8fc858534aa213657c507f3940b
+  metadata.gz: 4afcef739b4b5f44864656692d6da844b0bac734534e7ac18d8cc1355e9ccd00776d7d6292888eb9db5bebab46c59df0bd5a16ffaddfb39925886b2b7109230c
+  data.tar.gz: f3dd00a1d6fbbd64aeb9e249b73cd4a3e047f6c355c6d94b9807133dcaa4fa5ca91f5011faaeca4c85b00f9ac6cb958f53ac2c127ead78c047fb03fa66deeeb2

data/lib/cancancan/model_adapters/neo4j_adapter.rb

@@ -65,7 +65,8 @@ module CanCan
       def self.associations_conditions_match?(conditions, subject, base_class)
         return true if conditions.blank?
         conditions.all? do |association, conditions_hash|
-          current_subject = subject.send(association)
+          rel_length = conditions_hash.delete(:rel_length)
+          current_subject = subject.send(association, rel_length: rel_length)
           return false unless current_subject
           current_model = base_class.associations[association].target_class
           all_conditions_match?(current_subject, conditions_hash, current_model)

data/lib/cancancan/neo4j/association_conditions.rb

@@ -17,7 +17,8 @@ module CanCanCan
         @options[:asso_conditions].each do |association, conditions|
           relationship = association_relation(association)
           associations_conditions, model_conditions = CypherConstructorHelper.bifurcate_conditions(conditions)
-          current_path = append_path_to_conditions(relationship, model_conditions)
+          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)
         end
@@ -35,13 +36,14 @@ module CanCanCan
         @cypher_matches += asso_conditions_obj.cypher_matches
       end
 
-      def append_path_to_conditions(relationship, model_conditions)
+      def append_path_to_conditions(relationship, model_conditions, rel_length)
         target_class = relationship.target_class
         model_attr_exists = model_conditions.any? do |key, _|
           !target_class.associations_keys.include?(key)
         end
         end_node = model_attr_exists ? CypherConstructorHelper.match_node_cypher(target_class) : '()'
-        current_path = @options[:path] + relationship.arrow_cypher + end_node
+        arrow_cypher = relationship.arrow_cypher(nil, {}, false, false, rel_length)
+        current_path = @options[:path] + arrow_cypher + end_node
         if model_attr_exists
           append_matches(relationship)
           append_and_to_conditions_string

data/lib/cancancan/neo4j/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cancancan-neo4j
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.2.0
 platform: ruby
 authors:
 - Amit Suryavanshi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-04-26 00:00:00.000000000 Z
+date: 2018-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement