cancancan-neo4j 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 80f5ce945f4e2b8449a73be0c5d203c47899f2ce2d0332bfb9db82bff568e4c1
-  data.tar.gz: 9ac02736ba3b4ae898f67c954c45dac7059d9e4c867795699b1bc64a7036d965
+SHA1:
+  metadata.gz: 31ad75503b290ec41b885373893ff02eb50ddc61
+  data.tar.gz: c2eb9df523dc767271588050c63461e23dc8b202
 SHA512:
-  metadata.gz: f1f6de129648660e99814b2e3a2869f35d62d105879bc2d2b4e75e58c9e1a4ed0db2a15a688df731c11717dbef9db1ae1ee984a3c3d6c5155b0655b13d533c46
-  data.tar.gz: 26393b95bc052363bbc607e05ad740dead1bc8fc7829dd2705bdddcd21d491ae160084489b56c6520230d77ff5a26b8932dc95b4d63a6781d4c319d5da138b96
+  metadata.gz: d0fc036c41b50ae5fb1db57fe1cbadaccb108e62f785f81aac1e3bba3fb217625708bae18192c312173a5ed8dbd4f038199e82e9e9ca6f4c5816fc8c43bbd90c
+  data.tar.gz: 31fa5bc228d7b4855cf5da294aaa39cd625a1fcd12169334c947c2e42d2e71a638fcf825269cd82f17da9b4f11dc1ee27e8c86e154230996067cae4e5e7d9683

data/lib/cancancan/extensions/ability.rb

@@ -0,0 +1,24 @@
+module CanCanCan
+  module Extensions
+    # orverwriting .relevant_rules_for_match method from CanCan::Ability module
+    module Ability
+      # original method, to want to make scope work with rule like
+      # "can :read, Article, Article.where(secret: true)",
+      # we are skipping raising of error in case of rule being raw query
+      # def relevant_rules_for_match(action, subject)
+      #   relevant_rules(action, subject).each do |rule|
+      #     next unless rule.only_raw_sql?
+      #     raise Error,
+      #           "The can? and cannot? call cannot be used with a raw sql."
+      #   end
+      # end
+      def relevant_rules_for_match(action, subject)
+        relevant_rules(action, subject)
+      end
+    end
+  end
+end
+
+CanCan::Ability.module_eval do
+  include CanCanCan::Extensions::Ability
+end

data/lib/cancancan/extensions/conditions_matcher.rb

@@ -0,0 +1,15 @@
+CanCan::ConditionsMatcher.module_eval do
+  private
+
+  def matches_non_block_conditions(subject)
+    if @conditions.is_a?(Hash)
+      return nested_subject_matches_conditions?(subject) if subject.class == Hash
+      return matches_conditions_hash?(subject) unless subject_class?(subject)
+    end
+    if @conditions.is_a?(::Neo4j::ActiveNode::Query::QueryProxy)
+      return @conditions.where(id: subject.id).exists? unless subject_class?(subject)
+    end
+    # Don't stop at "cannot" definitions when there are conditions.
+    conditions_empty? ? true : @base_behavior
+  end
+end

data/lib/cancancan/model_adapters/neo4j_adapter.rb

@@ -8,8 +8,7 @@ module CanCan
     class Neo4jAdapter < AbstractAdapter
       def database_records
         return @model_class.where('false') if @rules.empty?
-        rule = @rules.first
-        return rule.conditions if override_scope
+        override_scope
         records_for_multiple_rules.distinct
       end
 
@@ -56,10 +55,11 @@ module CanCan
       private
 
       def records_for_multiple_rules
-        CanCanCan::Neo4j::CypherConstructor
-          .new(construct_cypher_options)
-          .query
-          .proxy_as(@model_class, var_name)
+        con = CanCanCan::Neo4j::CypherConstructor.new(construct_cypher_options)
+        if (scope = con.scope)
+          return scope
+        end
+        con.query.proxy_as(@model_class, var_name)
       end
 
       def construct_cypher_options
@@ -74,7 +74,8 @@ module CanCan
         return unless conditions.any? do |condition|
           condition.is_a?(Neo4j::ActiveNode::Query::QueryProxy)
         end
-        return conditions.first if conditions.size == 1
+        return if conditions.size == 1
+        return if conditions.select { |cn| cn.is_a?(Hash) && !cn.empty? }.empty?
         raise_override_scope_error
       end
 

data/lib/cancancan/neo4j.rb

@@ -5,3 +5,5 @@ require 'neo4j'
 require 'cancancan/neo4j/version'
 require 'cancancan/model_adapters/neo4j_adapter'
 require 'cancancan/neo4j/cypher_constructor_helper'
+require 'cancancan/extensions/ability'
+require 'cancancan/extensions/conditions_matcher'

data/lib/cancancan/neo4j/cypher_constructor.rb

@@ -4,7 +4,7 @@ module CanCanCan
   module Neo4j
     # Constructs cypher query from rule cypher options
     class CypherConstructor
-      attr_reader :query
+      attr_reader :query, :scope
 
       def initialize(rule_cyphers)
         @model_class = rule_cyphers.first.options[:model_class]
@@ -19,17 +19,26 @@ module CanCanCan
 
       def construct_cypher(rule_cyphers)
         rule_cyphers.each do |rule_cypher|
-          rule = rule_cypher.options[:rule]
-          reset_variables if rule.conditions.blank?
-          if rule.base_behavior
-            construct_can_cypher(rule_cypher)
-          else
-            construct_cannot_cypher(rule_cypher)
-          end
+          construct_cypher_for_rule(rule_cypher)
         end
         unwind_query_with_distinct
       end
 
+      def construct_cypher_for_rule(rule_cypher)
+        rule = rule_cypher.options[:rule]
+        return if update_scope(rule_cypher)
+        reset_variables if rule.conditions.blank?
+        if rule.base_behavior
+          construct_can_cypher(rule_cypher)
+        else
+          construct_cannot_cypher(rule_cypher)
+        end
+      end
+
+      def update_scope(rule_cypher)
+        @scope = rule_cypher.options[:scope]
+      end
+
       def unwind_query_with_distinct
         var = CanCanCan::Neo4j::CypherConstructorHelper.var_name(@model_class)
         @query = unwind_qeury("#{var}_can")

data/lib/cancancan/neo4j/rule_cypher.rb

@@ -22,7 +22,11 @@ module CanCanCan
       end
 
       def construct_cypher_conditions
-        if @options[:rule].conditions.blank?
+        conditions = @options[:rule].conditions
+        if conditions.is_a?(::Neo4j::ActiveNode::Query::QueryProxy)
+          return @options[:scope] = conditions
+        end
+        if conditions.blank?
           condition_for_rule_without_conditions
         else
           construct_cypher_options

data/lib/cancancan/neo4j/version.rb

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

metadata

@@ -1,122 +1,136 @@
 --- !ruby/object:Gem::Specification
 name: cancancan-neo4j
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Amit Suryavanshi
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-05-29 00:00:00.000000000 Z
+date: 2018-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: cancancan
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  name: cancancan
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: neo4j
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 9.0.0
-  type: :runtime
+  name: neo4j
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 9.0.0
 - !ruby/object:Gem::Dependency
-  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
-  type: :development
+  name: bundler
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: neo4j-rake_tasks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: '0'
+  name: neo4j-community
+  prerelease: false
   type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+  name: neo4j-rake_tasks
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.0
 - !ruby/object:Gem::Dependency
-  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.11.3
-  type: :development
+  name: pry
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.11.3
 - !ruby/object:Gem::Dependency
-  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '10.1'
-  type: :development
+  name: rake
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '10.1'
 - !ruby/object:Gem::Dependency
-  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
-  type: :development
+  name: rspec
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
-  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.48.1
-  type: :development
+  name: rubocop
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -130,6 +144,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - cancancan-neo4j.gemspec
+- lib/cancancan/extensions/ability.rb
+- lib/cancancan/extensions/conditions_matcher.rb
 - lib/cancancan/model_adapters/neo4j_adapter.rb
 - lib/cancancan/neo4j.rb
 - lib/cancancan/neo4j/active_record_disabler.rb
@@ -141,7 +157,7 @@ homepage: https://github.com/CanCanCommunity/cancancan-neo4j
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -156,9 +172,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.6.14
+signing_key:
 specification_version: 4
 summary: neo4j database adapter for CanCanCan.
 test_files: []