activegraph 11.2.0 → 11.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b0ec846225c753d7a2dc2bc3923c95f52dec582324559df182f23df633f564c
-  data.tar.gz: 1205c8eaf374112629a173f55e2c9a5fae42324073b2f540815eb984cb87e324
+  metadata.gz: a1ae9faa69f9792692e849f1d3de64c0a22b8e5623302cde0b1e707bfb443bba
+  data.tar.gz: 57cb8e74aae28b60346bd7c908ed4e793df433c0722b3ab2322320d5a9bab217
 SHA512:
-  metadata.gz: '07091d4bf26b0b2bfb4d6313668e358eb78f8eb6afb7244063a2293a3596963687debf7fe6e72177ba388ac008a9452a8bd580fb48064575354e0e208765f475'
-  data.tar.gz: '09dc2f6eaf0126d26b76aba057b9b7e77e0b633f0b13ab99964ed64fd64e7421f22eaa470d9abd0fca4bd896e122ca938814683bc0c618e7d37d2ded400c00de'
+  metadata.gz: c5de6bb15067a8c93a14be2dd8949d70d0edcbc1bdabcab2c0880e11dda13f9bfcbdddc51c82438d7cd1642fafb841cbe6b03ca714d1633f3c8b09396531eb0c
+  data.tar.gz: 976b9fa40c5056de62e7dc9fc3437c107adf13b09f5d1b07b660b79f92f74c9434c18114e4bab1c16e845f529e145c4b337e461cf77b5a4f40d5255a9619103f

data/CHANGELOG.md

@@ -3,6 +3,22 @@ All notable changes to this project will be documented in this file.
 This file should follow the standards specified on [http://keepachangelog.com/]
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [11.3.1] 2023-02-12
+
+## Fixed
+
+- Fixed an issue with keyword arguments on jruby-9.3 when none were passed
+
+## [11.3.0] 2023-02-10
+
+## Added
+
+- support for keyword arguments in scopes
+
+## Fixed
+
+- Fixed issue with psych https://github.com/neo4jrb/activegraph/issues/1684 (Thanks @chytreg)
+
 ## [11.2.0] 2023-02-06
 
 ## Added

data/lib/active_graph/node/has_n.rb

@@ -155,14 +155,18 @@ module ActiveGraph::Node
 
       CACHED_RESULT_METHODS = []
 
-      def method_missing(method_name, *args, &block)
+      def method_missing(method_name, *args, **kwargs, &block)
         target = target_for_missing_method(method_name)
         super if target.nil?
 
         cache_query_proxy_result if !cached? && !target.is_a?(ActiveGraph::Node::Query::QueryProxy)
         clear_cache_result if target.is_a?(ActiveGraph::Node::Query::QueryProxy)
 
-        target.public_send(method_name, *args, &block)
+        if RUBY_VERSION < '3' && kwargs.empty?
+          target.public_send(method_name, *args, &block)
+        else
+          target.public_send(method_name, *args, **kwargs, &block)
+        end
       end
 
       def serializable_hash(options = {})

data/lib/active_graph/node/query/query_proxy.rb

@@ -243,9 +243,15 @@ module ActiveGraph
 
         # QueryProxy objects act as a representation of a model at the class level so we pass through calls
         # This allows us to define class functions for reusable query chaining or for end-of-query aggregation/summarizing
-        def method_missing(method_name, *args, &block)
+        def method_missing(method_name, *args, **kwargs, &block)
           if @model && @model.respond_to?(method_name)
-            scoping { @model.public_send(method_name, *args, &block) }
+            scoping do
+              if RUBY_VERSION < '3' && kwargs.empty?
+                @model.public_send(method_name, *args, &block)
+              else
+                @model.public_send(method_name, *args, **kwargs, &block)
+              end
+            end
           else
             super
           end

data/lib/active_graph/node/scope.rb

@@ -39,15 +39,15 @@ module ActiveGraph::Node
 
         klass = class << self; self; end
         klass.instance_eval do
-          define_method(name) do |*query_params|
+          define_method(name) do |*query_params, **kwargs|
             eval_context = ScopeEvalContext.new(self, current_scope || self.query_proxy)
             proc = full_scopes[name.to_sym]
-            _call_scope_context(eval_context, query_params, proc)
+            _call_scope_context(eval_context, *query_params, **kwargs, &proc)
           end
         end
 
-        define_method(name) do |*query_params|
-          as(:n).public_send(name, *query_params)
+        define_method(name) do |*query_params, **kwargs|
+          as(:n).public_send(name, *query_params, **kwargs)
         end
       end
 
@@ -76,8 +76,14 @@ module ActiveGraph::Node
         end
       end
 
-      def _call_scope_context(eval_context, query_params, proc)
-        eval_context.instance_exec(*query_params.fill(nil, query_params.length..proc.arity - 1), &proc)
+      def _call_scope_context(eval_context, *query_params, **kwargs, &proc)
+        last_vararg_index = proc.arity - (kwargs.empty? ? 1 : 2)
+        query_params.fill(nil, query_params.length..last_vararg_index)
+        if RUBY_VERSION < '3' && kwargs.empty?
+          eval_context.instance_exec(*query_params, &proc)
+        else
+          eval_context.instance_exec(*query_params, **kwargs, &proc)
+        end
       end
 
       def current_scope #:nodoc:
@@ -118,8 +124,12 @@ module ActiveGraph::Node
 
       # method_missing is not delegated to super class but to aggregated class
       # rubocop:disable Style/MethodMissingSuper
-      def method_missing(name, *params, &block)
-        query_proxy_or_target.public_send(name, *params, &block)
+      def method_missing(name, *params, **kwargs, &block)
+        if RUBY_VERSION < '3' && kwargs.empty?
+          query_proxy_or_target.public_send(name, *params, &block)
+        else
+          query_proxy_or_target.public_send(name, *params, **kwargs, &block)
+        end
       end
       # rubocop:enable Style/MethodMissingSuper
 

data/lib/active_graph/relationship/related_node.rb

@@ -61,8 +61,12 @@ module ActiveGraph::Relationship
       !@node.nil?
     end
 
-    def method_missing(*args, &block)
-      loaded.send(*args, &block)
+    def method_missing(*args, **kwargs, &block)
+      if RUBY_VERSION < '3' && kwargs.empty?
+        loaded.send(*args, &block)
+      else
+        loaded.send(*args, **kwargs, &block)
+      end
     end
 
     def respond_to_missing?(method_name, include_private = false)

data/lib/active_graph/shared/enum.rb

@@ -41,7 +41,7 @@ module ActiveGraph::Shared
       #   Media.enum type: { image: 1, video: 2, unknown: 3 }
       #
       # @see http://edgeapi.rubyonrails.org/classes/ActiveRecord/Enum.html
-      def enum(parameters = {})
+      def enum(**parameters)
         options, parameters = *split_options_and_parameters(parameters)
         parameters.each do |property_name, enum_keys|
           enum_keys = normalize_key_list enum_keys, options

data/lib/active_graph/tasks/migration.rake

@@ -83,7 +83,11 @@ COMMENT
 
       args.with_defaults(remove_missing: false)
 
-      schema_data = YAML.safe_load(File.read(SCHEMA_YAML_PATH), [Symbol])
+      schema_data = if Gem::Requirement.new('>= 4') =~ Gem::Version.new(Psych::VERSION)
+        YAML.safe_load(File.read(SCHEMA_YAML_PATH), permitted_classes: [Symbol])
+      else
+        YAML.safe_load(File.read(SCHEMA_YAML_PATH), [Symbol])
+      end
 
       ActiveGraph::Base.subscribe_to_query(&method(:puts))
 

data/lib/active_graph/version.rb

@@ -1,3 +1,3 @@
 module ActiveGraph
-  VERSION = '11.2.0'
+  VERSION = '11.3.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activegraph
 version: !ruby/object:Gem::Version
-  version: 11.2.0
+  version: 11.3.1
 platform: ruby
 authors:
 - Andreas Ronge, Brian Underwood, Chris Grigg, Heinrich Klobuczek
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-06 00:00:00.000000000 Z
+date: 2023-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -444,7 +444,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: A graph database for Ruby