cancancan-neo4j 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31ad75503b290ec41b885373893ff02eb50ddc61
-  data.tar.gz: c2eb9df523dc767271588050c63461e23dc8b202
+  metadata.gz: b821f07db8166fa92473a7d8924c9470bad5b9db
+  data.tar.gz: 48e04822f77521760f66645710c6225239e1fcd1
 SHA512:
-  metadata.gz: d0fc036c41b50ae5fb1db57fe1cbadaccb108e62f785f81aac1e3bba3fb217625708bae18192c312173a5ed8dbd4f038199e82e9e9ca6f4c5816fc8c43bbd90c
-  data.tar.gz: 31fa5bc228d7b4855cf5da294aaa39cd625a1fcd12169334c947c2e42d2e71a638fcf825269cd82f17da9b4f11dc1ee27e8c86e154230996067cae4e5e7d9683
+  metadata.gz: b82da9b848670f03c1de9b948389c89b011788d108d800dc70fb335dee87b5ac277cb05fdcdf0692de785b1b4eab4b470936898b854463c82ff4f8baa4f488d9
+  data.tar.gz: 5e4446edc1a3278ecbf06e94f4d98cefe0bfb20482d663a0aff497bb02bd989c9bdaa538d784c823dfce4ffe0f42f19f092851f27b491722f94a4d91dd948afa

data/lib/cancancan/model_adapters/neo4j_adapter.rb

@@ -1,6 +1,7 @@
 require 'cancancan/neo4j/cypher_constructor_helper'
 require 'cancancan/neo4j/rule_cypher'
 require 'cancancan/neo4j/cypher_constructor'
+require 'cancancan/neo4j/single_rule_cypher'
 
 module CanCan
   module ModelAdapters
@@ -9,6 +10,9 @@ module CanCan
       def database_records
         return @model_class.where('false') if @rules.empty?
         override_scope
+        if (rule = logical_single_can_rule)
+          return records_for_single_rule(rule)
+        end
         records_for_multiple_rules.distinct
       end
 
@@ -54,6 +58,17 @@ module CanCan
 
       private
 
+      def logical_single_can_rule
+        return @rules.first if @rules.size == 1
+        return unless @rules.all?(&:base_behavior)
+        @rules.find { |rule| rule.conditions.blank? }
+      end
+
+      def records_for_single_rule(rule)
+        CanCanCan::Neo4j::SingleRuleCypher.new(rule, @model_class)
+                                          .records
+      end
+
       def records_for_multiple_rules
         con = CanCanCan::Neo4j::CypherConstructor.new(construct_cypher_options)
         if (scope = con.scope)

data/lib/cancancan/neo4j/cypher_constructor_helper.rb

@@ -22,11 +22,10 @@ module CanCanCan
                        .present?
         end
 
-        def path_end_node(relationship, conditions)
+        def path_end_var(relationship, conditions)
           with_var = variable_in_path?(relationship, conditions)
           target_class = relationship.target_class
-          var_label = with_var ? var_name(target_class) : ''
-          path_node(target_class, var_label)
+          with_var ? var_name(target_class) : ''
         end
       end
     end

data/lib/cancancan/neo4j/rule_cypher.rb

@@ -16,7 +16,7 @@ module CanCanCan
       def initialize_path
         model_class = @options[:model_class]
         var_label = CypherConstructorHelper.var_name(model_class)
-        var_label += ('_' + (@options[:index] + 1).to_s)
+        var_label += index_sub_str
         @options[:var_label] = var_label
         @path = CypherConstructorHelper.path_node(model_class, var_label)
       end
@@ -35,12 +35,18 @@ module CanCanCan
 
       private
 
+      def index_sub_str
+        index = @options[:index]
+        return '' unless index
+        ('_' + (index + 1).to_s)
+      end
+
       def rule_conditions_blank?
         @options[:rule].conditions.blank?
       end
 
       def condition_for_rule_without_conditions
-        @rule_conditions = @options[:rule].base_behavior ? '(true)' : '(false)'
+        @rule_conditions = @options[:rule].base_behavior ? '' : '(false)'
       end
 
       def construct_cypher_options
@@ -61,10 +67,17 @@ module CanCanCan
       def update_path_with_rel(conditions, rel)
         rel_length = conditions.delete(:rel_length) if conditions
         arrow_cypher = rel.arrow_cypher(nil, {}, false, false, rel_length)
-        node_label = CypherConstructorHelper.path_end_node(rel, conditions)
+        node_label = path_end_node(rel, conditions)
         @path += (arrow_cypher + node_label)
       end
 
+      def path_end_node(rel, conditions)
+        label = CypherConstructorHelper.path_end_var(rel, conditions)
+        label += '_01' if !label.blank? && @path.include?("#{label}:")
+        @options[:con_var_label] = label
+        CypherConstructorHelper.path_node(rel.target_class, label)
+      end
+
       def cypher_for_relation_conditions(conditions, relationship)
         if conditions.is_a?(Hash)
           conditions.each do |key, con|
@@ -81,7 +94,7 @@ module CanCanCan
       end
 
       def merge_conditions(key, value, base_class)
-        var_name = var_label_for_conditions(base_class, key)
+        var_name = var_label_for_conditions
         if key == :id
           merge_condition_for_id(var_name, base_class, value)
         else
@@ -89,10 +102,8 @@ module CanCanCan
         end
       end
 
-      def var_label_for_conditions(base_class, key)
-        condition_keys = @options[:rule].conditions.keys
-        return @options[:var_label] if condition_keys.include?(key)
-        CypherConstructorHelper.var_name(base_class)
+      def var_label_for_conditions
+        @options[:con_var_label] || @options[:var_label]
       end
 
       def merge_condition_for_id(var_name, base_class, value)

data/lib/cancancan/neo4j/single_rule_cypher.rb

@@ -0,0 +1,46 @@
+require 'cancancan/neo4j/cypher_constructor_helper'
+
+module CanCanCan
+  module Neo4j
+    # Return records for single cancan rule
+    class SingleRuleCypher
+      attr_reader :rule, :model_class
+      def initialize(rule, model_class)
+        @rule = rule
+        @model_class = model_class
+      end
+
+      def records
+        conds = rule.conditions
+        return conds if conds.is_a?(::Neo4j::ActiveNode::Query::QueryProxy)
+        return records_for_no_conditions if conds.blank?
+        records_for_hash_conditions
+      end
+
+      private
+
+      def records_for_no_conditions
+        if rule.base_behavior
+          model_class.all
+        else
+          model_class.where('false')
+        end
+      end
+
+      def records_for_hash_conditions
+        cypher = CanCanCan::Neo4j::RuleCypher.new(rule: rule,
+                                                  model_class: model_class,
+                                                  index: nil)
+        model_class.new_query
+                   .match(cypher.path)
+                   .where(cypher.rule_conditions)
+                   .proxy_as(model_class, var_lable)
+                   .distinct
+      end
+
+      def var_lable
+        CypherConstructorHelper.var_name(model_class)
+      end
+    end
+  end
+end

data/lib/cancancan/neo4j/version.rb

@@ -2,6 +2,6 @@ module CanCanCan
 end
 module CanCanCan
   module Neo4j
-    VERSION = '1.3.1'.freeze
+    VERSION = '1.3.2'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cancancan-neo4j
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Amit Suryavanshi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-07-24 00:00:00.000000000 Z
+date: 2018-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -152,6 +152,7 @@ files:
 - lib/cancancan/neo4j/cypher_constructor.rb
 - lib/cancancan/neo4j/cypher_constructor_helper.rb
 - lib/cancancan/neo4j/rule_cypher.rb
+- lib/cancancan/neo4j/single_rule_cypher.rb
 - lib/cancancan/neo4j/version.rb
 homepage: https://github.com/CanCanCommunity/cancancan-neo4j
 licenses: