cancancan-neo4j 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e08a1d2366ed56a2098252068703e1038e44527
-  data.tar.gz: c83757e84d871344219d64e8d6739ac124091bc1
+  metadata.gz: f5213aae2b6c9b1dced0d36464e2ae1c458f9fc9
+  data.tar.gz: dcddcb66fef4186dc1a8ac08c4e11619982d645a
 SHA512:
-  metadata.gz: 9d6d307fca81de261d85d3c0590e791520398dfd54f624edfffd56d8d3e5bd79e3b688fdfe6cb3dbdcaa4d35ba840caefcfd153877f58e83b7cd6197c2ef3781
-  data.tar.gz: cffd3d0cde2bf8999ce78fbdba0e179e35c989944a3d6da035fffde35b6ab393ad2f133410d4cadf5e65336e53c6fe2a45c24101ffc9c6197080847a3b819d06
+  metadata.gz: '008f34d8928100cb0d40cd291f30567238007cdf3a3358766d6f2990244caf6bb76e9296ac35a5989f0a09830923c94e67d5dfb6e9f3a4e0e304cb4dcfb9c725'
+  data.tar.gz: 1a7a2ceff81a4038556862cff6281a05987286732395c4792701b53c23b2c8fb0452aa185d7d2635a8ee5d0b326077b773897108763dbccf61e6d0dc76a41571

data/lib/cancancan/neo4j/association_conditions.rb

@@ -41,9 +41,8 @@ module CanCanCan
         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) : '()'
-        arrow_cypher = relationship.arrow_cypher(nil, {}, false, false, rel_length)
-        current_path = @options[:path] + arrow_cypher + end_node
+        to_node = CypherConstructorHelper.match_node_cypher(target_class) if model_attr_exists
+        current_path = path_with_relationship(relationship, rel_length, to_node)
         if model_attr_exists
           append_matches(relationship)
           append_and_to_conditions_string
@@ -68,9 +67,10 @@ module CanCanCan
         @conditions_string += con_string
       end
 
-      def path_with_relationship(relationship, rel_length)
+      def path_with_relationship(relationship, rel_length, to_node = nil)
         arrow_cypher = relationship.arrow_cypher(nil, {}, false, false, rel_length)
-        @options[:path] + arrow_cypher + '()'
+        to_node_label = CypherConstructorHelper.path_end_node(relationship)
+        @options[:path] + arrow_cypher + (to_node || to_node_label)
       end
     end
   end

data/lib/cancancan/neo4j/cypher_constructor_helper.rb

@@ -35,7 +35,8 @@ module CanCanCan
 
         def condtion_for_path(path:, variable_name:, base_class:, key:)
           path = "(#{variable_name})" if path.blank?
-          path + base_class.associations[key].arrow_cypher + '()'
+          relationship = base_class.associations[key]
+          path + relationship.arrow_cypher + path_end_node(relationship)
         end
 
         def condition_for_id(base_class, variable_name, value)
@@ -65,6 +66,10 @@ module CanCanCan
           connector += 'NOT' if rule_cypher.append_not_to_conditions?
           cypher_options[:conditions] = conditions_string + connector
         end
+
+        def path_end_node(relationship)
+          '(' + relationship.target_class.mapped_label_names.map { |label_name| ":`#{label_name}`" }.join + ')'
+        end
       end
     end
   end

data/lib/cancancan/neo4j/version.rb

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

metadata

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