graphiti-activegraph 0.1.25 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91f9eb76f0b56c276cf1ec4fbef4d535e768c85dbee0d503c3bf9e47c492b509
-  data.tar.gz: 9ead092210d92a237fed63c396cf302730fffe601d1fcb0a00a1265563cc0c66
+  metadata.gz: ba0c3b914198cabc31276a535e428887a5ff15ff557d3dbf1f40f7ef63d463ce
+  data.tar.gz: 29c6bcff84e546779872c7cd197727f8ecaad1a12ece312a5032e93cd90c3060
 SHA512:
-  metadata.gz: 48334374bd34917e110d55156847d8cc3ba389e45dc76bb7d3db1df2ca8cc59cda5a46ff23c79aff298e0700201d743d3ca04d53b0bb4ae843a3db037c13bff9
-  data.tar.gz: cb3ee1de2754dcd3ddfcccc84970aaffc21fa8c2c05e6518299c6bd55c7a4f52830462a9a092152eeb93ece42e3476532094d41bf41d57683eb43d34cf9b1f64
+  metadata.gz: 5d930274a4203b73d77a50281c1091e4a4e5cf0bb0b467398dab4b3e2edd59daa60e63d31250941f1c373d04e9136a46bcb2c80b7cd2a0b29dfd685691e4c64f
+  data.tar.gz: bb3211192ac37a29c578ab71076e57995ddb7768f233a571428c9088989e8b773d36536f6a8f1d9f4d13154c0bfe53aedd3e5916507451641aded67b83f7d36a

data/.github/workflows/specs.yml

@@ -18,7 +18,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: [ jruby ]
+        ruby-version: [ jruby, ruby ]
     env:
       JRUBY_OPTS: --debug -J-Xmx1280m -Xcompile.invokedynamic=false -J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 -J-noverify -Xcompile.mode=OFF
     steps:

data/CHANGELOG.md

@@ -62,6 +62,17 @@ 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
+
 <!-- ### [version (DD-MM-YYYY)] -->
 <!-- Breaking changes:-->
 <!-- Features:-->

data/graphiti-activegraph.gemspec

@@ -1,36 +1,28 @@
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "graphiti/active_graph/version"
+require 'graphiti/active_graph/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "graphiti-activegraph"
+  spec.name          = 'graphiti-activegraph'
   spec.version       = Graphiti::ActiveGraph::VERSION
-  spec.authors       = ["Hardik Joshi"]
-  spec.email         = ["hardikjoshi1991@gmail.com"]
+  spec.authors       = ['Hardik Joshi']
+  spec.email         = ['hardikjoshi1991@gmail.com']
 
-  spec.summary       = "Easily build jsonapi.org-compatible APIs for GraphDB"
-  spec.homepage      = "https://github.com/mrhardikjoshi/graphiti-activegraph"
-  spec.license       = "MIT"
+  spec.summary       = 'Easily build jsonapi.org-compatible APIs for GraphDB'
+  spec.homepage      = 'https://github.com/mrhardikjoshi/graphiti-activegraph'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = "exe"
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_dependency "graphiti", ">= 1.2.0"
-  spec.add_dependency "activegraph", "~> 12.0.0.beta.4"
-  spec.add_dependency "activesupport", ">= 6.0"
-  spec.add_dependency "zeitwerk"
+  spec.add_dependency 'graphiti', '>= 1.6.4'
+  spec.add_dependency 'activegraph', '>= 12.0.0.beta.5'
 
-  spec.add_development_dependency "faraday", "~> 0.15"
-  spec.add_development_dependency "kaminari", "~> 0.17"
-  spec.add_development_dependency "bundler"
-  # dependency conflict introduced during runtime
-  # jar-dependencies is a default gem in JRuby and also a dependency in neo4j-ruby-driver
-  spec.add_development_dependency "jar-dependencies", "~> 0.4.1"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "graphiti_spec_helpers", "1.0.beta.4"
-  spec.add_development_dependency "standard"
-  spec.add_development_dependency "pry"
-  spec.add_development_dependency "rspec", "~> 3.9.0"
+  spec.add_development_dependency 'graphiti_spec_helpers', '>= 1.0.0'
+  spec.add_development_dependency 'standard'
+  spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'rake', '>= 10.0'
+  spec.add_development_dependency 'rspec', '>= 3.9.0'
 end

data/lib/graphiti/active_graph/adapters/active_graph/function_sideload.rb

@@ -4,12 +4,4 @@ class Graphiti::ActiveGraph::Adapters::ActiveGraph::FunctionSideload < Graphiti:
   def association?
     false
   end
-
-  def self.function_proc(&blk)
-    self.function_proc = blk
-  end
-
-  def self.param_proc(&blk)
-    self.param_proc = blk
-  end
 end

data/lib/graphiti/active_graph/concerns/path_relationships.rb

@@ -0,0 +1,44 @@
+module Graphiti::ActiveGraph::Concerns
+  module PathRelationships
+    def add_path_id_to_relationships!(params)
+      return params if path_relationships_updated?
+      detect_conflict(:id, @params[:id]&.to_s, attributes[:id]&.to_s)
+      path_map.each do |rel_name, path_value|
+        body_value = relationships.dig(rel_name, :attributes, :id)
+        if body_value
+          detect_conflict(rel_name, path_value&.to_s, body_value&.to_s)
+        else
+          update_params(params, rel_name, path_value)
+          update_realationships(rel_name, path_value)
+        end
+      end
+      path_relationships_updated!
+      params
+    end
+
+    private
+
+    def path_relationships_updated!
+      @path_relationships_updated = true
+    end
+
+    def path_relationships_updated?
+      @path_relationships_updated.present?
+    end
+
+    def update_params(params, rel_name, path_value)
+      params[:data] ||= {}
+      params[:data][:relationships] ||= {}
+      params[:data][:relationships][rel_name] = {
+        data: {
+          type: derive_resource_type(rel_name),
+          id: path_value
+        }
+      }
+    end
+
+    def update_realationships(rel_name, path_value)
+      relationships[rel_name] = { meta: {}, attributes: { id: path_value } }
+    end
+  end
+end

data/lib/graphiti/active_graph/deserializer.rb

@@ -1,5 +1,7 @@
 module Graphiti::ActiveGraph
-  module Deserializer
+  class Deserializer < Graphiti::Deserializer
+    include Concerns::PathRelationships
+
     class Conflict < StandardError
       attr_reader :key, :path_value, :body_value
 
@@ -14,13 +16,33 @@ module Graphiti::ActiveGraph
       end
     end
 
-    def initialize(payload, env=nil, model=nil, parent_map=nil)
+    def initialize(payload, env = nil, model = nil, parent_map = nil)
       super(payload)
 
       @params = payload
       @model = model
       @parent_map = parent_map || {}
       @env = env
+
+      return unless data.blank? && env && parsable_content?
+
+      raise ArgumentError, "JSON API payload must contain the 'data' key" 
+    end
+
+    def process_relationship_datum(datum)
+      {
+        meta: {
+          jsonapi_type: datum[:type],
+          temp_id: datum[:'temp-id'],
+          method: datum[:method]&.to_sym
+        },
+        attributes: datum[:id] ? { id: datum[:id] } : {},
+        relationships: {}
+      }
+    end
+
+    def meta_params
+      data[:meta] || {}
     end
 
     def process_relationships(relationship_hash)
@@ -33,6 +55,10 @@ module Graphiti::ActiveGraph
       end
     end
 
+    def relationship?(name)
+      relationships[name.to_sym].present?
+    end
+
     # change empty relationship as `disassociate` hash so they will be removed
     def process_nil_relationship(name)
       attributes = {}
@@ -62,45 +88,6 @@ module Graphiti::ActiveGraph
       results
     end
 
-    def add_path_id_to_relationships!(params)
-      return params if path_relationships_updated?
-      detect_conflict(:id, @params[:id]&.to_s, attributes[:id]&.to_s)
-      path_map.each do |rel_name, path_value|
-        body_value = relationships.dig(rel_name, :attributes, :id)
-        if body_value
-          detect_conflict(rel_name, path_value&.to_s, body_value&.to_s)
-        else
-          update_params(params, rel_name, path_value)
-          update_realationships(rel_name, path_value)
-        end
-      end
-      path_relationships_updated!
-      params
-    end
-
-    def path_relationships_updated!
-      @path_relationships_updated = true
-    end
-
-    def path_relationships_updated?
-      @path_relationships_updated.present?
-    end
-
-    def update_params(params, rel_name, path_value)
-      params[:data] ||= {}
-      params[:data][:relationships] ||= {}
-      params[:data][:relationships][rel_name] = {
-        data: {
-          type: derive_resource_type(rel_name),
-          id: path_value
-        }
-      }
-    end
-
-    def update_realationships(rel_name, path_value)
-      relationships[rel_name] = { meta: {}, attributes: { id: path_value } }
-    end
-
     def path_map
       map = @params.select { |key, _| key =~ /_id$/ }.permit!.to_h
       map = filter_keys(map) { |key| key.gsub(/_id$/, '').to_sym }
@@ -127,6 +114,10 @@ module Graphiti::ActiveGraph
 
     private
 
+    def parsable_content?
+      true
+    end
+
     def derive_resource_type(rel_name)
       if @model.include?(ActiveGraph::Node)
         @model.associations[rel_name].target_class.model_name.plural.to_s

data/lib/graphiti/active_graph/extensions/grouping/params.rb

@@ -0,0 +1,52 @@
+module Graphiti::ActiveGraph::Extensions::Grouping
+  class Params
+    attr_reader :params, :grouping_criteria_list, :resource_class
+    def initialize(params, resource_class)
+      @params = params
+      @grouping_criteria_list = params.fetch(:group_by, nil)&.split(',') || []
+      @resource_class = resource_class
+    end
+
+    def single_grouping_criteria?
+      grouping_criteria_list.size < 2
+    end
+
+    def grouping_criteria_on_attribute?
+      grouping_criteria_list.any? { |criteria| ends_with_attribute?(resource_class.model, criteria) }
+    end
+
+    def empty?
+      grouping_criteria_list.empty?
+    end
+
+    def ends_with_attribute?(model, criteria)
+      return false if criteria.blank?
+
+      last_segment_attribute?(model, criteria.split('.'))
+    end
+
+    private
+
+    def last_segment_attribute?(model, segments)
+      last_segment = segments.last
+      intermediate_model = traverse_to_last_associated_model(model, segments[0...-1])
+
+      intermediate_model && attribute?(intermediate_model, last_segment)
+    end
+
+    def traverse_to_last_associated_model(model, intermediate_segments)
+      intermediate_segments.each do |segment|
+        return false unless(model = associated_model(model, segment))
+      end
+      model
+    end
+
+    def attribute?(model, segment)
+      model.attribute_names.include?(segment)
+    end
+
+    def associated_model(model, segment)
+      model.associations[segment.to_sym]&.target_class
+    end
+  end
+end

data/lib/graphiti/active_graph/extensions/query_params.rb

@@ -0,0 +1,27 @@
+module Graphiti::ActiveGraph::Extensions
+  class QueryParams
+    attr_reader :params, :grouping_extra_params, :resource_class
+
+    def initialize(params, resource_class, grouping_extra_params: {})
+      @params = params
+      @resource_class = resource_class
+      @grouping_extra_params = grouping_extra_params
+    end
+
+    def group_by
+      Grouping::Params.new(params, resource_class)
+    end
+
+    def group_by_params
+      group_by_params_hash unless group_by.empty?
+    end
+
+    def group_by_params_hash
+      { group_by: group_by.grouping_criteria_list }.merge(grouping_extra_params)
+    end
+
+    def extra_field?(type, name)
+      params.dig(:extra_fields, type)&.include?(name.to_s)
+    end
+  end
+end

data/lib/graphiti/active_graph/request_validators/validator.rb

@@ -0,0 +1,9 @@
+module Graphiti::ActiveGraph
+  module RequestValidators
+    module Validator
+      def deserialized_payload
+        @deserialized_payload ||= Graphiti::ActiveGraph::Deserializer.new(@params)
+      end
+    end
+  end
+end

data/lib/graphiti/active_graph/resource/interface.rb

@@ -4,7 +4,7 @@ module Graphiti::ActiveGraph
       extend ActiveSupport::Concern
       class_methods do
         def build(params, base_scope = nil, opts = {})
-          validate!(params)
+          validate_request!(params)
           runner = ::Graphiti::Runner.new(self, params)
           runner.proxy(base_scope, { single: true, raise_on_missing: true }.merge(opts) )
         end

data/lib/graphiti/active_graph/resource_proxy.rb

@@ -26,6 +26,8 @@ module Graphiti::ActiveGraph
       @single ? data_for_preloaded_record : data_for_preloaded_records
     end
 
+    alias_method :resolve_data, :data
+
     def data_for_preloaded_record
       @preloaded = @preloaded.is_a?(Array) ? @preloaded[0] : @preloaded
       @resource.decorate_record(@preloaded)

data/lib/graphiti/active_graph/version.rb

@@ -1,5 +1,5 @@
 module Graphiti
   module ActiveGraph
-    VERSION = '0.1.25'
+    VERSION = '0.2.0'
   end
 end

data/lib/graphiti-activegraph.rb

@@ -27,7 +27,6 @@ Graphiti::Scoping::Filter.prepend Graphiti::ActiveGraph::Scoping::Filter
 Graphiti::Util::SerializerRelationship.prepend Graphiti::ActiveGraph::Util::SerializerRelationship
 Graphiti::Util::SerializerAttribute.prepend Graphiti::ActiveGraph::Util::SerializerAttribute
 Graphiti::Util::RelationshipPayload.prepend Graphiti::ActiveGraph::Util::RelationshipPayload
-Graphiti::Deserializer.prepend Graphiti::ActiveGraph::Deserializer
 Graphiti::Query.prepend Graphiti::ActiveGraph::Query
 Graphiti::Resource.prepend Graphiti::ActiveGraph::ResourceInstanceMethods
 Graphiti::Resource.extend Graphiti::ActiveGraph::Resource
@@ -35,6 +34,7 @@ Graphiti::ResourceProxy.prepend Graphiti::ActiveGraph::ResourceProxy
 Graphiti::Runner.prepend Graphiti::ActiveGraph::Runner
 Graphiti::Scope.prepend Graphiti::ActiveGraph::SideloadResolve
 Graphiti::Configuration.include Graphiti::SidepostConfiguration
+Graphiti::RequestValidators::Validator.prepend Graphiti::ActiveGraph::RequestValidators::Validator
 
 # JSONAPI extensions
 JSONAPI::Serializable::Resource.prepend Graphiti::ActiveGraph::JsonapiExt::Serializable::ResourceExt

metadata

@@ -1,106 +1,64 @@
 --- !ruby/object:Gem::Specification
 name: graphiti-activegraph
 version: !ruby/object:Gem::Version
-  version: 0.1.25
+  version: 0.2.0
 platform: ruby
 authors:
 - Hardik Joshi
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-12-05 00:00:00.000000000 Z
+date: 2025-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: graphiti
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
-  name: graphiti
+        version: 1.6.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.6.4
 - !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 12.0.0.beta.4
   name: activegraph
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 12.0.0.beta.4
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
-  name: activesupport
+        version: 12.0.0.beta.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: 12.0.0.beta.5
 - !ruby/object:Gem::Dependency
+  name: graphiti_spec_helpers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  name: zeitwerk
-  type: :runtime
-  prerelease: false
-  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.15'
-  name: faraday
+        version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.15'
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.17'
-  name: kaminari
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.17'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
+  name: standard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: bundler
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -109,54 +67,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.4.1
-  name: jar-dependencies
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.4.1
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  name: rake
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.0.beta.4
-  name: graphiti_spec_helpers
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.0.beta.4
-- !ruby/object:Gem::Dependency
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: standard
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -165,34 +81,34 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  name: pry
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.9.0
-  name: rspec
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.9.0
-description:
+description: 
 email:
 - hardikjoshi1991@gmail.com
 executables: []
@@ -213,9 +129,13 @@ files:
 - lib/graphiti/active_graph/adapters/active_graph/has_one_sideload.rb
 - lib/graphiti/active_graph/adapters/active_graph/polymorphic_belongs_to.rb
 - lib/graphiti/active_graph/adapters/active_graph/sideload.rb
+- lib/graphiti/active_graph/concerns/path_relationships.rb
 - lib/graphiti/active_graph/deserializer.rb
+- lib/graphiti/active_graph/extensions/grouping/params.rb
+- lib/graphiti/active_graph/extensions/query_params.rb
 - lib/graphiti/active_graph/jsonapi_ext/serializable/resource_ext.rb
 - lib/graphiti/active_graph/query.rb
+- lib/graphiti/active_graph/request_validators/validator.rb
 - lib/graphiti/active_graph/resource.rb
 - lib/graphiti/active_graph/resource/interface.rb
 - lib/graphiti/active_graph/resource/persistence.rb
@@ -233,7 +153,7 @@ homepage: https://github.com/mrhardikjoshi/graphiti-activegraph
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -248,8 +168,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
-signing_key:
+rubygems_version: 3.0.3.1
+signing_key: 
 specification_version: 4
 summary: Easily build jsonapi.org-compatible APIs for GraphDB
 test_files: []