activegraph-extensions 0.0.2-java → 0.0.4-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c32c0f026083ce5175029f15de509da256e64f55456d29ee5c26358a43694ac
-  data.tar.gz: 78ce8b9d21c30b326a4314487ac75d6d0b5e449dcf20fe3c9ef6da29f332ce9f
+  metadata.gz: 822c83b14e7ebc57f5b13232de171a80a1b954d1c1777853e73299950ddf94b8
+  data.tar.gz: 5dd31ca0ddf3cec93e366cab32fc026565045ce8d24680ff2aff10f4df24b4cb
 SHA512:
-  metadata.gz: 00bdc4fb09667e26efcc0f376c6e54d566dd2f3ab1fc804f6e24b95da84981060ca920163c9b7c550d2da1bc44a50137beb6be7dad0063bdc1d71581df57ad1c
-  data.tar.gz: 61f86edaea0e316af6a97190d16dd25d582e1cd96a0778547101db87c520fdff8973fc5e71a2901169eee0ce63730c810aa95a90281a9b9fb6cf680e36c34f8a
+  metadata.gz: 58f75afdac57dfe835551242707ba89d248de6f073052e0fb08edb4010e30f24d9f383613ff3c1aa46117a5b35448b5663914971e89cf2b3bb24b2763c3669b2
+  data.tar.gz: 9062f2a9c43e2da8b42178c36c6dba95a0b3946a94afbdc56908cd49673548864024e7885becffa6d8686a8798d2333a7d7d3ef858e179291335f35a80502533

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/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

@@ -6,25 +6,28 @@ module ActiveGraphExtensions
       module QueryProxyEagerLoading
         module AssociationLimiting
           def self.included(base)
-            base.attr_reader(:default_assoc_limit)
+            base.attr_reader(:max_page_size)
+            base.attr_reader(:paginate)
           end
 
           private
 
           def rel_collection_str(path)
-            limit = association_limit(path)
             collection_name = "[#{relationship_name(path)}, #{escape(path_name(path))}] "
-            collection = limit.present? ? "apoc.agg.slice(#{collection_name}, 0, #{limit})" : "collect(#{collection_name})"
+            collection = apply_limit?(path) ? "apoc.agg.slice(#{collection_name}, 0, #{association_limit(path)})" : "collect(#{collection_name})"
             "#{collection} AS #{escape("#{path_name(path)}_collection")}"
           end
 
-          def relationship_name(path)
-          if path.last.rel_length
-            "last(relationships(#{escape("#{path_name(path)}_path")}))"
-          else
-            escape("#{path_name(path)}_rel")
+          def apply_limit?(path)
+            !multipath?(path) && (path.last&.association_limit || paginate)
           end
 
+          def relationship_name(path)
+            if path.last.rel_length
+              "last(relationships(#{escape("#{path_name(path)}_path")}))"
+            else
+              escape("#{path_name(path)}_rel")
+            end
           end
 
           def convert_to_list(collection_name, limit)
@@ -32,10 +35,8 @@ module ActiveGraphExtensions
           end
 
           def association_limit(path)
-            return if multipath?(path)
-
             limit = path.last&.association_limit
-            limit.blank? || limit.to_i > default_assoc_limit ? default_assoc_limit : limit
+            limit.blank? || limit.to_i > max_page_size ? max_page_size : limit
           end
 
           def with_association_query_part(base_query, path, previous_with_vars)
@@ -45,8 +46,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

@@ -12,7 +12,8 @@ module ActiveGraphExtensions
         end
 
         def with_ordered_associations(spec, order, opts = {})
-          @default_assoc_limit = opts[:default_assoc_limit]
+          @max_page_size = opts[:max_page_size]
+          @paginate = opts[:paginate]
           @with_vars = opts[:with_vars]
           @order_spec = order.with_indifferent_access unless spec.empty?
           @opts = opts
@@ -57,7 +58,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/version.rb

@@ -1,3 +1,3 @@
 module ActiveGraphExtensions
-  VERSION = '0.0.2'
+  VERSION = '0.0.4'
 end

metadata

@@ -1,213 +1,213 @@
 --- !ruby/object:Gem::Specification
 name: activegraph-extensions
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: java
 authors:
 - Amit Suryavanshi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-23 00:00:00.000000000 Z
+date: 2023-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: parslet
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  name: parslet
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activegraph
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  name: activegraph
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  name: guard
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  name: guard-rspec
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard-rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  name: guard-rubocop
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: neo4j-rake_tasks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.0
-  type: :development
+  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: os
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  name: os
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  name: pry
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
-  type: :development
+  name: railties
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  name: rake
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.56.0
-  type: :development
+  name: rubocop
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.56.0
 - !ruby/object:Gem::Dependency
-  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  name: yard
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: dryspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  name: dryspec
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.10'
-  type: :development
+  name: rspec
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.10'
-description: "  Additional features to activegraph, like sideload limiting, authorizing
-  sideloads etc.\n"
+description: "  Additional features to activegraph, like sideload limiting, authorizing\
+  \ sideloads etc.\n"
 email: amitbsuryavabshi@mail.com
 executables: []
 extensions: []
@@ -255,7 +255,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.2.29
 signing_key:
 specification_version: 4
 summary: Additional features to activegraph