graphiti-activegraph 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99c8c00fe58ed3146c7feae681bac89ec82989b09f88dfa97aa6a54ef7e9930b
-  data.tar.gz: c21e632e4fa1a4f6b24315c01c76d89f91158ae9996a73cdf6da83e97805e2ce
+  metadata.gz: a63f1b1a90940e2048db02a4230724f8f6d1f058b2a282223ea3603d71573ed2
+  data.tar.gz: b48f9232554ac22a93f02ab64067ca03e5d0a4543e50dde6247cce96efed0487
 SHA512:
-  metadata.gz: 8942c7a92552d7554cdc78e5183b970bab9c6d9cee23e5d21e23244c84c45491bbd5a3085671cde7919ca3f7e531cd2e7c6388f0ad367cecc430b77597c0db9c
-  data.tar.gz: e31a9631f62d743899851ea815c2158c801f550a5d7ec86eafab260045441fbbd84813f0c5511f9cadc3ad2a7fe8b750d315effc65cbc46866235d31f136731a
+  metadata.gz: a226d733cfa0cae9b61d8289cf0d611b319138a942d9aa80592d51931ce412e389d25fc373541e3769bd89a7f022630453ee27d68d6285508ade6b9e9ab60276
+  data.tar.gz: a7a33a9e87f699b26e2a3703f4c827e100dd1a2d59ac1551f929e67798659f20ab88e5b5718fc1dedbdeca130d86babb506215525ad194db4da2352e7e32c28a

data/.github/workflows/specs.yml

@@ -1,59 +1,58 @@
-name: Specs
-
-on:
-  push:
-    branches: [ "master" ]
-  pull_request:
-    branches: [ "master" ]
-
-  # Allows you to run this workflow manually from the Actions tab
-  workflow_dispatch:
-
-permissions:
-  actions: write
-  contents: read
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    permissions:
-      id-token: write
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby-version: [ ruby-3.4.2, ruby-3.3.7, ruby-3.2.7 ] # Removed 'jruby' till https://github.com/jruby/jruby/issues/8642 is fixed
-        neo4j: [ 5.23.0 ]
-        include:
-          - ruby: jruby
-            java-version: 17
-    env:
-      JRUBY_OPTS: --debug -J-Xmx1280m -Xcompile.invokedynamic=false -J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 -J-noverify -Xcompile.mode=OFF
-    steps:
-      - name: Start neo4j
-        run: docker run --name neo4j --env NEO4J_AUTH=neo4j/password --env NEO4J_ACCEPT_LICENSE_AGREEMENT=yes --env NEO4J_dbms_directories_import= -p7687:7687 -p7474:7474 -v `pwd`/tmp:/var/lib/neo4j/import --rm neo4j:${{ matrix.neo4j }}-enterprise &
-
-      - uses: actions/checkout@v3
-
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby-version }}
-          bundler-cache: true
-
-      - name: Set up Java
-        uses: actions/setup-java@v4
-        if: matrix.java-version
-        with:
-          distribution: 'temurin'
-          java-version: ${{ matrix.java-version }}
-
-      - name: Wait for neo4j
-        run: while [ $((curl localhost:7474/ > /dev/null 2>&1); echo $?) -ne 0 ]; do sleep 1; done
-
-      - name: Run tests
-        run: bundle exec rspec
-
-      - uses: qltysh/qlty-action/coverage@v1
-        with:
-          oidc: true
-          files: coverage/coverage.json
+name: Specs
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+permissions:
+  actions: write
+  contents: read
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby-version: [ '3.4'] # Removed 'jruby' till https://github.com/jruby/jruby/issues/8642 is fixed
+        neo4j: [ '5.26.0', '5.23.0' ]
+        include:
+          - ruby: jruby
+            java-version: 17
+    env:
+      JRUBY_OPTS: --debug -J-Xmx1280m -Xcompile.invokedynamic=false -J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 -J-noverify -Xcompile.mode=OFF
+    steps:
+      - name: Start neo4j
+        run: docker run --name neo4j --env NEO4J_AUTH=neo4j/password --env NEO4J_ACCEPT_LICENSE_AGREEMENT=yes --env NEO4J_dbms_directories_import= -p7687:7687 -p7474:7474 -v `pwd`/tmp:/var/lib/neo4j/import --rm neo4j:${{ matrix.neo4j }}-enterprise &
+
+      - uses: actions/checkout@v3
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true
+
+      - name: Set up Java
+        uses: actions/setup-java@v4
+        if: matrix.java-version
+        with:
+          distribution: 'temurin'
+          java-version: ${{ matrix.java-version }}
+
+      - name: Wait for neo4j
+        run: while [ $((curl localhost:7474/ > /dev/null 2>&1); echo $?) -ne 0 ]; do sleep 1; done
+
+      - name: Run tests
+        run: bundle exec rspec
+
+      - name: Upload coverage reports to Codecov
+        uses: codecov/codecov-action@v5
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}

data/.gitignore

@@ -1,59 +1,59 @@
-*.gem
-*.rbc
-/.config
-/coverage/
-/InstalledFiles
-/pkg/
-/spec/reports/
-/spec/examples.txt
-/test/tmp/
-/test/version_tmp/
-/tmp/
-
-# Used by dotenv library to load environment variables.
-# .env
-
-# Ignore Byebug command history file.
-.byebug_history
-
-## Specific to RubyMotion:
-.dat*
-.repl_history
-build/
-*.bridgesupport
-build-iPhoneOS/
-build-iPhoneSimulator/
-
-## Specific to RubyMotion (use of CocoaPods):
-#
-# We recommend against adding the Pods directory to your .gitignore. However
-# you should judge for yourself, the pros and cons are mentioned at:
-# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
-#
-# vendor/Pods/
-
-## Documentation cache and generated files:
-/.yardoc/
-/_yardoc/
-/doc/
-/rdoc/
-
-## Environment normalization:
-/.bundle/
-/vendor/bundle
-/lib/bundler/man/
-
-# for a library or gem, you might want to ignore these files since the code is
-# intended to run in multiple environments; otherwise, check them in:
-/Gemfile.lock
-# .ruby-version
-# .ruby-gemset
-
-# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
-.rvmrc
-
-# RubyMine project files
-.idea
-
-# Used by RuboCop. Remote config files pulled in from inherit_from directive.
-# .rubocop-https?--*
+*.gem
+*.rbc
+/.config
+/coverage/
+/InstalledFiles
+/pkg/
+/spec/reports/
+/spec/examples.txt
+/test/tmp/
+/test/version_tmp/
+/tmp/
+
+# Used by dotenv library to load environment variables.
+# .env
+
+# Ignore Byebug command history file.
+.byebug_history
+
+## Specific to RubyMotion:
+.dat*
+.repl_history
+build/
+*.bridgesupport
+build-iPhoneOS/
+build-iPhoneSimulator/
+
+## Specific to RubyMotion (use of CocoaPods):
+#
+# We recommend against adding the Pods directory to your .gitignore. However
+# you should judge for yourself, the pros and cons are mentioned at:
+# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
+#
+# vendor/Pods/
+
+## Documentation cache and generated files:
+/.yardoc/
+/_yardoc/
+/doc/
+/rdoc/
+
+## Environment normalization:
+/.bundle/
+/vendor/bundle
+/lib/bundler/man/
+
+# for a library or gem, you might want to ignore these files since the code is
+# intended to run in multiple environments; otherwise, check them in:
+/Gemfile.lock
+# .ruby-version
+# .ruby-gemset
+
+# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
+.rvmrc
+
+# RubyMine project files
+.idea
+
+# Used by RuboCop. Remote config files pulled in from inherit_from directive.
+# .rubocop-https?--*

data/.hound.yml

@@ -0,0 +1,4 @@
+rubocop:
+  enabled: true
+
+fail_on_violations: true

data/.rspec

@@ -1 +1 @@
---require spec_helper
+--require spec_helper

data/.rubocop.yml

@@ -0,0 +1,3 @@
+require: standard
+inherit_gem:
+  standard: config/base.yml

data/CHANGELOG.md

@@ -1,54 +1,58 @@
-# Changelog
-
-All notable changes to this project will be documented in this file.
-
-The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
-and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
-
-## [Unreleased]
-
-## [1.3.1] - 2025-11-5
-### Added
-- **Deserializer: relationship id(s) helpers**: introduced `relationship_id` and `relationship_ids` methods in `Deserializer` to fetch relationship id(s) by association name from request payload. (PR #49)
-
-## [1.3.0] - 2025-10-13
-### Added
-- **Extra fields preloading in main query**: Support preloading associations for `extra_fields` for main and sideloaded records. Adds `preload` option to `extra_attribute` in resource classes. Example: `extra_attribute :full_post_title, :string, preload: :author`. (PR #45)
-- **Extra fields preloading in separate query**: Collect IDs from the main query result and run a single separate query to load and calculate `extra_fields` values for all records. does not support preloading for deep sideloads. (PR #47)
-
-## [1.2.0] - 2025-05-20
-
-### Added
-
-- **Graphiti Compatibility**: Added support for Graphiti versions up to 1.8.x, fixing previously broken sideloading behavior.
-
-### Fixed
-
-- **Serializer**: Resolved an issue where polymorphic resources were not functioning correctly in serializers.
-
-## [1.1.0] - 2025-05-2
-
-### Added
-
-- **Deep sideloading**: introduced Include scoping class to support deep sideloading using single query (e.g. include='author.posts')
-- **Deep sorting**: added SortNormalizer to support sorting by deep sideloaded resource's attribute (e.g. sort='author.posts.title')
-- **Links control**: Control the links(pagination and resource) in response via request query params (pagination_links=true|false, links=true|false)
-
-## [1.0.0] - 2025-03-18
-
-### Added
-
-- **MRI Support**: Introduced compatibility with MRI (Matz's Ruby Interpreter), expanding the gem's usability beyond JRuby (#38).
-- **Documentation Updates**: Expanded the README to provide clearer guidance on gem usage and integration (#38).
-- **Sideloading Workflow**: Enhanced scoping mechanisms and added support for eager loading associations to improve data retrieval efficiency and flexibility (#38).
-
-### Changed
-- **Resource Class**: Instead of modifying the `Graphiti::Resource` class, we now define `Graphiti::ActiveGraph::Resource`,  
-  which must be inherited in all resource classes to enable ActiveGraph support (#38).
-
----
-
-*Note: For details on changes prior to version 1.0.0, please refer to the [`CHANGELOG_PRE_1.0.0.md`](CHANGELOG_PRE_1.0.0.md) file.*
-
-[unreleased]: https://github.com/mrhardikjoshi/graphiti-activegraph/compare/v1.0.0...master
-[1.0.0]: https://github.com/mrhardikjoshi/graphiti-activegraph/compare/9f837108ae57287c65b0f6fd2609dd56a95cd461...v1.0.0
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+## [1.3.2] - 2026-02-11
+### Changed
+- **Grouping criteria**: parsing improved to ignore commas inside parentheses, allowing for more complex grouping criteria (e.g. group_by='custom_function(arg1,arg2),another_value'). Previous implementation would split the criteria at the comma inside the parentheses, leading to inability to pass the function call. (PR #51)
+
+## [1.3.1] - 2025-11-5
+### Added
+- **Deserializer: relationship id(s) helpers**: introduced `relationship_id` and `relationship_ids` methods in `Deserializer` to fetch relationship id(s) by association name from request payload. (PR #49)
+
+## [1.3.0] - 2025-10-13
+### Added
+- **Extra fields preloading in main query**: Support preloading associations for `extra_fields` for main and sideloaded records. Adds `preload` option to `extra_attribute` in resource classes. Example: `extra_attribute :full_post_title, :string, preload: :author`. (PR #45)
+- **Extra fields preloading in separate query**: Collect IDs from the main query result and run a single separate query to load and calculate `extra_fields` values for all records. does not support preloading for deep sideloads. (PR #47)
+
+## [1.2.0] - 2025-05-20
+
+### Added
+
+- **Graphiti Compatibility**: Added support for Graphiti versions up to 1.8.x, fixing previously broken sideloading behavior.
+
+### Fixed
+
+- **Serializer**: Resolved an issue where polymorphic resources were not functioning correctly in serializers.
+
+## [1.1.0] - 2025-05-2
+
+### Added
+
+- **Deep sideloading**: introduced Include scoping class to support deep sideloading using single query (e.g. include='author.posts')
+- **Deep sorting**: added SortNormalizer to support sorting by deep sideloaded resource's attribute (e.g. sort='author.posts.title')
+- **Links control**: Control the links(pagination and resource) in response via request query params (pagination_links=true|false, links=true|false)
+
+## [1.0.0] - 2025-03-18
+
+### Added
+
+- **MRI Support**: Introduced compatibility with MRI (Matz's Ruby Interpreter), expanding the gem's usability beyond JRuby (#38).
+- **Documentation Updates**: Expanded the README to provide clearer guidance on gem usage and integration (#38).
+- **Sideloading Workflow**: Enhanced scoping mechanisms and added support for eager loading associations to improve data retrieval efficiency and flexibility (#38).
+
+### Changed
+- **Resource Class**: Instead of modifying the `Graphiti::Resource` class, we now define `Graphiti::ActiveGraph::Resource`,  
+  which must be inherited in all resource classes to enable ActiveGraph support (#38).
+
+---
+
+*Note: For details on changes prior to version 1.0.0, please refer to the [`CHANGELOG_PRE_1.0.0.md`](CHANGELOG_PRE_1.0.0.md) file.*
+
+[unreleased]: https://github.com/mrhardikjoshi/graphiti-activegraph/compare/v1.0.0...master
+[1.0.0]: https://github.com/mrhardikjoshi/graphiti-activegraph/compare/9f837108ae57287c65b0f6fd2609dd56a95cd461...v1.0.0

data/CHANGELOG_PRE_1.0.0.md

@@ -1,70 +1,70 @@
-## 0.1.8 (09-06-2021)
-
-Features:
-
-- Added support for polymorphic relationship.
-
-## 0.1.13 (21-12-2021)
-
-Features:
-
-- Supports Jruby-9.3.2.0
-
-## 0.1.14 (21-12-2021)
-
-Features:
-
-- Adding unpaginated query to resource proxy with preloaded records. This will help in getting count on API.
-
-## 0.1.15 (21-06-2022)
-
-Features:
-
-- Relationships mentioned in sparse field param (and not in include), will now be returned in relationship block of response
-
-## 0.1.20
-
-Features:
-
-- With graphiti config variable "allow_sidepost" you can allow/disallow sideposting, by default it is allowed.
-
-## 0.1.21
-
-Fixes:
-
-- Runner#proxy keyword arguments
-
-## 0.1.22
-
-Fixes:
-
-- when rendering preloaded resources, we were not applying scoping. Now we are skipping around_scoping callback too.
-
-## 0.1.23 (29-04-2024)
-
-Features:
-
-- Added support for UUID
-
-## 0.1.24 (18-06-2024)
-
-Features:
-
-- Added preliminary support for Sideload backed by function instead of model association
-
-## 0.1.25 (04-12-2024)
-
-Features:
-
-- Added support to preload extra_fields for the main resource, replacing N+1 queries with a single query. This does not apply to sideloaded resources.
-
-## 0.2.0 (01-24-2025)
-
-Features:
-
-- Added MRI support
-- Added support for rails 8
-
-Breaking changes:
-
-- Removed support for graphiti <= 1.6.3
+## 0.1.8 (09-06-2021)
+
+Features:
+
+- Added support for polymorphic relationship.
+
+## 0.1.13 (21-12-2021)
+
+Features:
+
+- Supports Jruby-9.3.2.0
+
+## 0.1.14 (21-12-2021)
+
+Features:
+
+- Adding unpaginated query to resource proxy with preloaded records. This will help in getting count on API.
+
+## 0.1.15 (21-06-2022)
+
+Features:
+
+- Relationships mentioned in sparse field param (and not in include), will now be returned in relationship block of response
+
+## 0.1.20
+
+Features:
+
+- With graphiti config variable "allow_sidepost" you can allow/disallow sideposting, by default it is allowed.
+
+## 0.1.21
+
+Fixes:
+
+- Runner#proxy keyword arguments
+
+## 0.1.22
+
+Fixes:
+
+- when rendering preloaded resources, we were not applying scoping. Now we are skipping around_scoping callback too.
+
+## 0.1.23 (29-04-2024)
+
+Features:
+
+- Added support for UUID
+
+## 0.1.24 (18-06-2024)
+
+Features:
+
+- Added preliminary support for Sideload backed by function instead of model association
+
+## 0.1.25 (04-12-2024)
+
+Features:
+
+- Added support to preload extra_fields for the main resource, replacing N+1 queries with a single query. This does not apply to sideloaded resources.
+
+## 0.2.0 (01-24-2025)
+
+Features:
+
+- Added MRI support
+- Added support for rails 8
+
+Breaking changes:
+
+- Removed support for graphiti <= 1.6.3

data/Gemfile

@@ -1,3 +1,3 @@
-source "https://rubygems.org"
-
-gemspec
+source "https://rubygems.org"
+
+gemspec

data/LICENSE.txt

@@ -1,21 +1,21 @@
-The MIT License (MIT)
-
-Copyright (c) 2020 Hardik Joshi
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+The MIT License (MIT)
+
+Copyright (c) 2020 Hardik Joshi
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.