activegraph-extensions 0.0.1-java → 0.0.3-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c33fee6eede1db2664a17ae82a9f7dcb0d3611b2665605a024fd184a2695fa9
-  data.tar.gz: ea57d1a76c541d3b5c8c655f1b4cea22142917c83500a2275f4f2fc177f120af
+  metadata.gz: fbb2be9a5d8f1afc55b3888e1afc33940a2eb709de5afae7144f25992d2d0873
+  data.tar.gz: 23a259b8d2dffd7e6f73e552275fe0d9b9849bfcb80bc437be21c6e32944d5fe
 SHA512:
-  metadata.gz: dc88d9b5d715d803ede073cfd97f60bdbb4b1efe93231416a95ba3963d5831af872bf7e55e53906061693009f9e052e725dea8e80bd8a1a5e44864221659b4ad
-  data.tar.gz: d0b79494bac58f25b9c972951c7bce4d27beb33c5bdcbf865905a81401375b344ab9b9cb101360e93aa1db9bfcc14015ecc1b7a853623e90f9a6a7ca59ff67a0
+  metadata.gz: 55a7e0e10065e825acef207348a9277162af5d6ec81b158b957b266e37ba0fa98c6aa620cca84a31b253a58574880742a13d7f7f7cda576fd1f7dab3e60eda15
+  data.tar.gz: 679aa1b9d1ad94633506b1938cb3d50ea3bd2af2bd9392f352370f5d4410476cabf1a327bae1d6cafdbd18f5b62650b94584c826ea65cb4bb61be1a035eaa57a

data/CHANGELOG.md

@@ -1 +1,7 @@
-# Change Log
+# Change Log
+
+## [0.0.3] 2023-02-23
+
+## Fixed
+
+- Fixed issue where there was 500 error when we are eagerloding relations with multiple optional matches and some privious match was haveing authorization and next one was skipping authorization for those same nodes. This would result in a collection of related nodes where some nodes were null and corresponding next optional match nodes on path had values.

data/README.md

@@ -1 +1 @@
-# Extensions to activegraph gem.
+# Extensions to activegraph gem.

data/activegraph-extensions.gemspec

@@ -33,7 +33,6 @@ DESCRIPTION
   s.add_development_dependency('guard-rspec')
   s.add_development_dependency('guard-rubocop')
   s.add_development_dependency('neo4j-rake_tasks', '>= 0.3.0')
-  # s.add_development_dependency("neo4j-#{ENV['driver'] == 'java' ? 'java' : 'ruby'}-driver", '~> 4.1.0.beta.1')
   s.add_development_dependency('os')
   s.add_development_dependency('pry')
   s.add_development_dependency('railties', '>= 4.0')

data/lib/active_graph_extensions/node/query/query_proxy_eager_loading/association_limiting.rb

@@ -45,8 +45,9 @@ module ActiveGraphExtensions
           end
 
           def limit_node_in_where_clause(query, path)
-            root_path = path[0..0]
-            query.where("`#{path_name(root_path)}` in [i IN #{node_from_collection(root_path)} | i[1]]")
+            (path.length - 1).times.inject(query) do |query_with_where, index|
+              query_with_where.where("`#{path_name(path[0..index])}` in [i IN #{node_from_collection(path[0..index])} | i[1]]")
+            end
           end
 
           def node_from_collection(path_step)

data/lib/active_graph_extensions/node/query/query_proxy_eager_loading/enhanced_tree.rb

@@ -35,20 +35,10 @@ module ActiveGraphExtensions
           end
 
           def process_string(str)
-            # head, rest = str.split('.', 2)
-            # head, association_limit = extract_assoc_limit(head)
-            # k, length = head.split('*', -2)
-            # length = { max: length } if length
-            #add_nested(k.to_sym, rest, length, association_limit)
             map = StringParsers::RelationParser.new.parse(str)
             add_nested(map[:rel_name].to_sym, map[:rest_str].to_s.presence, map[:length_part], map[:limit_digit])
           end
 
-          # def extract_assoc_limit(str)
-          #   transformer = StringParsers::RelationParamTransformer.new(str)
-          #   [transformer.rel_name_n_length, transformer.rel_limit_number]
-          # end
-
           def process_hash(spec)
             spec = spec.dup
             @options = spec.delete(:_options)

data/lib/active_graph_extensions/node/query/query_proxy_eager_loading/scope_eager_loading.rb

@@ -10,10 +10,8 @@ module ActiveGraphExtensions
             rel_model = relationship_model(path)
             return {} if @opts.blank? || !(auth_scope = authorized_scope(rel_model, path))
             conf = { rels: [], chain: {} }
-            proxy = auth_scope.call(var, "#{var}_rel", user: @opts[:user],
-                                                       properties: properties_for(rel_model),
-                                                       privileges: @opts[:privileges],
-                                                       rel_length: path.last.rel_length)
+            proxy = auth_scope.call(var, "#{var}_rel", @opts.merge(properties: properties_for(rel_model),
+                                                                   rel_length: path.last.rel_length))
             proxy_rel_parts(proxy.instance_variable_get(:@break_proxy) || proxy, conf)
             conf
           end

data/lib/active_graph_extensions/node/query/query_proxy_eager_loading.rb

@@ -57,7 +57,7 @@ module ActiveGraphExtensions
 
         def optional_match_with_where(query, path, vars)
           computed_query = super
-          computed_query = limit_node_in_where_clause(computed_query, path) if multipath_with_sideload_limit?(path)
+          computed_query = limit_node_in_where_clause(computed_query, path) if multipath?(path)
           skip_order? && !path.last.rel_length ? computed_query : optional_order(computed_query, path, vars)
         end
 

data/lib/active_graph_extensions/string_parsers/relation_parser.rb

@@ -4,20 +4,19 @@ module ActiveGraphExtensions
   module StringParsers
     # Parsing relationships with length
     class RelationParser < ::Parslet::Parser
-      rule(:asterix)   { str('*') }
-      rule(:digit)     { match('[\d]').repeat }
-      rule(:range)     { str('..') }
-      rule(:dot)       { str('.') }
-      rule(:zero)      { str('0') }
-      rule(:length_1)  { zero.as(:min) >> range >> digit.maybe.as(:max) }
-      rule(:length_2)  { digit.maybe.as(:max) }
-      rule(:length)    { asterix >> (length_1 | length_2) }
-      rule(:rel)       { match('[a-z,_]').repeat.as(:rel_name) }
-      rule(:limit)     { digit.as(:limit_digit) >> asterix }
-      rule(:key)       { limit.maybe >> rel >> length.as(:length_part).maybe }
-      rule(:anything)  { match('.').repeat }
-      rule(:root)      { key >> dot.maybe >> anything.maybe.as(:rest_str) }
+      include SharedRules
 
+      # TODO: It is very bad to build a grammar with none terminals. Please note that none here are necessary to
+      # mimic the previous behavior of `repeat` which is `repeat(0)` which effectively allows empty strings as
+      # identifiers
+      rule(:zero) { str('0') }
+      rule(:length_1) { zero.as(:min) >> range >> number?.maybe.as(:max) }
+      rule(:length_2) { number?.maybe.as(:max) }
+      rule(:length) { asterisk >> (length_1 | length_2) }
+      rule(:limit) { number?.as(:limit_digit) >> asterisk }
+      rule(:key) { limit.maybe >> rel >> length.as(:length_part).maybe }
+      rule(:anything) { match('.').repeat }
+      rule(:root) { key >> dot.maybe >> anything.maybe.as(:rest_str) }
       rule(:rel_sequence) { infix_expression(key, [dot, 1, :left]) }
     end
   end

data/lib/active_graph_extensions/string_parsers/shared_rules.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module ActiveGraphExtensions
+  module StringParsers
+    module SharedRules
+      extend ActiveSupport::Concern
+      VAR_CHAR = 'a-z_'
+      included do
+        rule(:asterisk) { str('*') }
+        rule(:number) { match('[\d]').repeat(1) }
+        rule(:none) { str('') }
+        rule(:number?) { number | none }
+        rule(:range) { str('..') }
+        rule(:dot) { str('.') }
+        rule(:identifier) { match("[#{VAR_CHAR}]") >> match("[#{VAR_CHAR}0-9]").repeat(0) }
+        rule(:identifier?) { identifier | none }
+        rule(:rel) { identifier?.as(:rel_name) }
+      end
+    end
+  end
+end

data/lib/active_graph_extensions/version.rb

@@ -1,3 +1,3 @@
 module ActiveGraphExtensions
-  VERSION = '0.0.1'
+  VERSION = '0.0.3'
 end

data/lib/{activegraph-extensions.rb → active_graph_extensions.rb}

@@ -4,10 +4,7 @@ require 'parslet'
 module ActiveGraphExtensions
 end
 
-loader = Zeitwerk::Loader.for_gem
-loader.inflector.inflect 'version' => 'VERSION'
-loader.ignore(File.expand_path('activegraph-extensions.rb', __dir__))
-loader.setup
+Zeitwerk::Loader.for_gem.setup
 
 ActiveGraph::Node::Query::QueryProxy.include ActiveGraphExtensions::Node::Query::QueryProxyEagerLoading
 ActiveGraph::Node::Query::QueryProxy.prepend ActiveGraphExtensions::Node::Query::QueryProxy

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activegraph-extensions
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: java
 authors:
 - Amit Suryavanshi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-17 00:00:00.000000000 Z
+date: 2023-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -218,8 +218,7 @@ files:
 - Gemfile
 - README.md
 - activegraph-extensions.gemspec
-- lib/active_graph_extensions/node.rb
-- lib/active_graph_extensions/node/query.rb
+- lib/active_graph_extensions.rb
 - lib/active_graph_extensions/node/query/query_proxy.rb
 - lib/active_graph_extensions/node/query/query_proxy_eager_loading.rb
 - lib/active_graph_extensions/node/query/query_proxy_eager_loading/association_eager_load.rb
@@ -227,10 +226,9 @@ files:
 - lib/active_graph_extensions/node/query/query_proxy_eager_loading/eager_loading_order.rb
 - lib/active_graph_extensions/node/query/query_proxy_eager_loading/enhanced_tree.rb
 - lib/active_graph_extensions/node/query/query_proxy_eager_loading/scope_eager_loading.rb
-- lib/active_graph_extensions/string_parsers.rb
 - lib/active_graph_extensions/string_parsers/relation_parser.rb
+- lib/active_graph_extensions/string_parsers/shared_rules.rb
 - lib/active_graph_extensions/version.rb
-- lib/activegraph-extensions.rb
 homepage: https://github.com/neo4jrb/activegraph-extensions/
 licenses:
 - MIT

data/lib/active_graph_extensions/node/query.rb

@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-module ActiveGraphExtensions
-  module Node
-    module Query
-    end
-  end
-end

data/lib/active_graph_extensions/node.rb

@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-
-module ActiveGraphExtensions
-  module Node
-  end
-end

data/lib/active_graph_extensions/string_parsers.rb

@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-
-module ActiveGraphExtensions
-  module StringParsers
-  end
-end