graphiti-activegraph 0.1.15 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2edafb17b2501ff89298dacbccad4dd910a4858dd745e72e13d22413fff516d
-  data.tar.gz: 8f673d1994493e1ddb9ac250e9d2525d63cf723008c8020c34cc45beeee097c0
+  metadata.gz: 9794607d787979d0f7569abd80b40212eec9aedaaa93f176561ff1aef80a914f
+  data.tar.gz: 5827cbf1af92884fcb487d799883b3e1df1ea9ef7081aab68c404c96f895338f
 SHA512:
-  metadata.gz: 71c4679cc8af12fa8a6300b5b931b2d3192fb2cf403aeb9bb83f3675d64bb27956f117bfbc09ead957285571a1b18ba4e5c069e3217aafe4f457601d780aa9d1
-  data.tar.gz: e5b6556f6fad1c08c4741c807431b39339daa2ec5e7ede0673188d362d44593d65d2e88060429dbf39c0c338a5098628c4228bfe02f1f255415a017ee321cbff
+  metadata.gz: a81ef5aff8b2dd3e4617ced5388014eb847c230dd34722c00f630cd7ba1cf81789eb16268bec8e5e446771ee68c79a0a06f9f9792579d7b4503657b4cd319a8e
+  data.tar.gz: 59cdd93ef290594ea2682bec8cf16da095ae534d9a027036409fde5dd817734e0ecfa10e7c9220121f78132659295893b857e476c5f2c6d0018319ab62b18047

data/.github/workflows/specs.yml

@@ -0,0 +1,31 @@
+name: Specs
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby-version: [ jruby, ruby ]
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true
+    - name: Run tests
+      run: bundle exec rspec

data/graphiti-activegraph.gemspec

@@ -16,18 +16,15 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-  spec.required_ruby_version = "~> 2.3"
 
-  spec.add_dependency "graphiti", "~> 1.2.0"
-  spec.add_dependency "concurrent-ruby", "~> 1.0"
-  spec.add_dependency "activesupport", ">= 4.1"
+  spec.add_dependency "graphiti", ">= 1.2.0"
+  spec.add_dependency "activegraph", ">= 11.1.0.alpha.1"
   spec.add_dependency "zeitwerk"
 
   spec.add_development_dependency "faraday", "~> 0.15"
   spec.add_development_dependency "kaminari", "~> 0.17"
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "activemodel", ">= 4.1"
   spec.add_development_dependency "graphiti_spec_helpers", "1.0.beta.4"
   spec.add_development_dependency "standard"
   spec.add_development_dependency "rspec", "~> 3.9.0"

data/lib/graphiti/active_graph/deserializer.rb

@@ -91,7 +91,7 @@ module Graphiti::ActiveGraph
       params[:data][:relationships] ||= {}
       params[:data][:relationships][rel_name] = {
         data: {
-          type: rel_name.to_s,
+          type: derive_resource_type(rel_name),
           id: path_value.to_i
         }
       }
@@ -122,7 +122,29 @@ module Graphiti::ActiveGraph
     end
 
     def detect_conflict(key, path_value, body_value)
-      raise Conflict.new(key, path_value, body_value) if body_value && body_value != path_value
+      raise Conflict.new(key, path_value, body_value) if path_value && body_value && body_value != path_value
+    end
+
+    private
+
+    def derive_resource_type(rel_name)
+      if @model.include?(ActiveGraph::Node)
+        @model.associations[rel_name].target_class.model_name.plural.to_s
+      else
+        # ApplicationRelationship resource doesn't have #associations or any other method to list all associations
+        # "from_class" and "to_class" methods can contain value "any". Which makes it unreliable to use here
+        # Using "rel_name.to_s.pluralize" as it works in most cases.
+        # User can define a method on controller "" which will override this behaviour
+        derive_resource_type_from_controller(rel_name) || rel_name.to_s.pluralize
+      end
+    end
+
+    def derive_resource_type_from_controller(rel_name)
+      controller_obj.derive_parent_resource_type(rel_name) if controller_obj.respond_to?(:derive_parent_resource_type)
+    end
+
+    def controller_obj
+      @controller_obj ||= Graphiti.context[:object]
     end
   end
 end

data/lib/graphiti/active_graph/version.rb

@@ -1,5 +1,5 @@
 module Graphiti
   module ActiveGraph
-    VERSION = '0.1.15'
+    VERSION = '0.1.16'
   end
 end

data/lib/graphiti-activegraph.rb

@@ -1,31 +1,18 @@
 require 'zeitwerk'
+require 'active_graph'
 
-# Workaround for missing zeitwerk support as of jruby-9.2.13.0
+# Workaround for jruby prepend issue https://github.com/jruby/jruby/issues/6971
 module Graphiti
-  module Scoping
-  end
   module ActiveGraph
-    module Scoping
-    end
-    module Adapters
-    end
-    module Util
-    end
-    module JsonapiExt
-      module Serializable
-      end
-    end
+  end
+  module Scoping
   end
 end
-# End workaround
-
-# Workaround for jruby prepend issue https://github.com/jruby/jruby/issues/6971
 require 'graphiti/scoping/filterable'
 require 'graphiti/resource/persistence'
 # End workaround for jruby prepend issue
 
-loader = Zeitwerk::Loader.for_gem
-loader.inflector.inflect 'version' => 'VERSION'
+loader = Zeitwerk::Loader.for_gem(warn_on_extra_files: false)
 loader.ignore(File.expand_path('graphiti-activegraph.rb', __dir__))
 loader.setup
 

metadata

@@ -1,57 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: graphiti-activegraph
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.16
 platform: ruby
 authors:
 - Hardik Joshi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-06-22 00:00:00.000000000 Z
+date: 2022-09-14 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
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.0
 - !ruby/object:Gem::Dependency
-  name: concurrent-ruby
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: activesupport
+  name: activegraph
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: 11.1.0.alpha.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: 11.1.0.alpha.1
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
@@ -122,20 +108,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: activemodel
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: graphiti_spec_helpers
   requirement: !ruby/object:Gem::Requirement
@@ -185,9 +157,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/specs.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -222,9 +194,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/.travis.yml

@@ -1,11 +0,0 @@
----
-dist: xenial
-language: ruby
-jdk:
-  - openjdk11
-cache: bundler
-rvm:
-  - 2.7.1
-  - jruby-9.2.16.0
-  - jruby-9.3.2.0
-script: 'bundle exec rspec'