graphiti-activegraph 0.1.22 → 0.1.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19fc48bd574a47fdfb5d601d9781a70eab34e3acf7cb62a45143d9a99119feb2
-  data.tar.gz: 797493838affaa7c58e0ee8c03f50b17f37e8e443c4226b0948bdde4f03f020b
+  metadata.gz: d88ca37172c5b507a37ae3744f0a2ac86485b47f5494f0e080f6dbe7e7137738
+  data.tar.gz: b78b22b43bc9913ded8262a5d5d16fa2a6d6d5dbc0d8f4b0cfa094231289f858
 SHA512:
-  metadata.gz: b9825c5451ec0acdc0e5f94ee5fce3a13b4809b713e7ef2daaec506bedb73fe8b7a5ec70e70126e1cc54cb71cea28726a1c4b5f3bcae440118a3c76c8d49a4a5
-  data.tar.gz: b33db9527095d1c8c14d1706b37af78839bce57b3d90f4c27e01b161b0ee8161493a188d3b7294859aec85d948db310390105b22cdc93b44128e6021de4a87bc
+  metadata.gz: 663ff44a72d8f833f5156e3dd0d3a960c3c77220a0b9191b20afc15104013d267f92c9ff1ed22927f405199c3bc074fa92bbed4d5f57063150a778f7efe5dcc9
+  data.tar.gz: 9f19e81f5b2c7fd70585a3ef493a83c06080df69593ae23bd56fd723950ef87a2ecd4c05a6c475c87e1efc627a256aad4597a0c8b77fc731ad7a04b380030892

data/.github/workflows/specs.yml

@@ -18,14 +18,20 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: [ jruby-9.4.3.0, ruby ]
-
+        ruby-version: [ jruby ]
+    env:
+      JRUBY_OPTS: --debug -J-Xmx1280m -Xcompile.invokedynamic=false -J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 -J-noverify -Xcompile.mode=OFF
     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
+      - 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@v3
+        with:
+          distribution: 'temurin'
+          java-version: 17
+      - name: Run tests
+        run: bundle exec rspec

data/CHANGELOG.md

@@ -44,6 +44,12 @@ Fixes:
 
 - when rendering preloaded resources, we were not applying scoping. Now we are skipping around_scoping callback too.
 
+## 0.1.22 (29-04-2024)
+
+Features:
+
+- Added support for UUID
+
 <!-- ### [version (DD-MM-YYYY)] -->
 <!-- Breaking changes:-->
 <!-- Features:-->

data/Gemfile

@@ -1,13 +1,3 @@
 source "https://rubygems.org"
 
 gemspec
-
-gem "zeitwerk"
-
-group :test do
-  gem "pry"
-  gem "appraisal"
-  gem "guard"
-  gem "guard-rspec"
-  gem "rspec"
-end

data/graphiti-activegraph.gemspec

@@ -18,7 +18,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "graphiti", ">= 1.2.0"
-  spec.add_dependency "activegraph", ">= 11.1.0.alpha.1"
+  spec.add_dependency "activegraph", "~> 12.0.0.beta.4"
+  spec.add_dependency "activesupport", ">= 6.0"
   spec.add_dependency "zeitwerk"
 
   spec.add_development_dependency "faraday", "~> 0.15"
@@ -27,5 +28,6 @@ Gem::Specification.new do |spec|
   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"
 end

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

@@ -1,14 +1,6 @@
 class Graphiti::ActiveGraph::Adapters::ActiveGraph::HasManySideload < Graphiti::Sideload::HasMany
   include Graphiti::ActiveGraph::Adapters::ActiveGraph::Sideload
 
-  def default_base_scope
-    resource_class.model.all
-  end
-
-  def infer_foreign_key
-    association_name.to_sym
-  end
-
   def default_value_when_empty
     []
   end

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

@@ -1,14 +1,6 @@
 class Graphiti::ActiveGraph::Adapters::ActiveGraph::HasOneSideload < Graphiti::Sideload::HasOne
   include Graphiti::ActiveGraph::Adapters::ActiveGraph::Sideload
 
-  def default_base_scope
-    resource_class.model.all
-  end
-
-  def infer_foreign_key
-    association_name.to_sym
-  end
-
   def default_value_when_empty
     nil
   end

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

@@ -1,15 +1,11 @@
 class Graphiti::ActiveGraph::Adapters::ActiveGraph::PolymorphicBelongsTo < Graphiti::Sideload::PolymorphicBelongsTo
   include Graphiti::ActiveGraph::Adapters::ActiveGraph::Sideload
 
-  def default_base_scope
-    resource_class.model.all
-  end
-
-  def infer_foreign_key
-    association_name.to_sym
-  end
-
   def default_value_when_empty
     nil
   end
+
+  def polymorphic?
+    true
+  end
 end

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

@@ -12,57 +12,15 @@ module Graphiti::ActiveGraph::Adapters::ActiveGraph::Sideload
     end
   end
 
-  # def base_scope
-  #   if @base_scope
-  #     @base_scope.respond_to?(:call) ? @base_scope.call : @base_scope
-  #   else
-  #     resource.base_scope
-  #   end
-  # end
-
-  # def load(parents, query, graph_parent)
-  #   params, opts, proxy = nil, nil, nil
-
-  #   with_error_handling Errors::SideloadParamsError do
-  #     params = load_params(parents, query)
-  #     params_proc&.call(params, parents, context)
-  #     return [] if blank_query?(params)
-  #     opts = load_options(parents, query)
-  #     opts[:sideload] = self
-  #     opts[:parent] = graph_parent
-  #   end
-
-  #   with_error_handling(Errors::SideloadQueryBuildingError) do
-  #     proxy = resource.class._all(params, opts, base_scope)
-  #     pre_load_proc&.call(proxy, parents)
-  #   end
-
-  #   proxy.to_a
-  # end
-
-  # def load(parents, _, _)
-  #   child_arr = []
-  #   @child_map = resource_with_parent_assoc(parents).each_with_object({}) do |arr, hash|
-  #     child_obj = arr.first
-  #     parent_uuid = arr.last
-  #     hash[parent_uuid] ||= []
-  #     hash[parent_uuid] << child_obj
-  #     child_arr << child_obj
-  #   end
-
-  #   fire_assign(parents, child_arr)
-  #   child_arr
-  # end
+  def default_base_scope
+    resource_class.model.all
+  end
 
-  # def resource_with_parent_assoc(parents)
-  #   parent_ids = parents.pluck(:id)
-  #   proxy = parent_resource_class.model.as(:p).where(id: parent_ids)
-  #   scope = self.class.sideload_scope
+  def infer_foreign_key
+    association_name.to_sym
+  end
 
-  #   if scope.present?
-  #     scope.call(proxy)
-  #   else
-  #     proxy.send(association_name, :children)
-  #   end.query.pluck(:children, p: :neo_id)
-  # end
+  def polymorphic?
+    false
+  end
 end

data/lib/graphiti/active_graph/deserializer.rb

@@ -64,11 +64,11 @@ module Graphiti::ActiveGraph
 
     def add_path_id_to_relationships!(params)
       return params if path_relationships_updated?
-      detect_conflict(:id, @params[:id], attributes[:id])
+      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_i, body_value&.to_i)
+          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)
@@ -92,13 +92,13 @@ module Graphiti::ActiveGraph
       params[:data][:relationships][rel_name] = {
         data: {
           type: derive_resource_type(rel_name),
-          id: path_value.to_i
+          id: path_value
         }
       }
     end
 
     def update_realationships(rel_name, path_value)
-      relationships[rel_name] = { meta: {}, attributes: { id: path_value.to_i } }
+      relationships[rel_name] = { meta: {}, attributes: { id: path_value } }
     end
 
     def path_map

data/lib/graphiti/active_graph/version.rb

@@ -1,5 +1,5 @@
 module Graphiti
   module ActiveGraph
-    VERSION = '0.1.22'
+    VERSION = '0.1.23'
   end
 end

data/lib/graphiti-activegraph.rb

@@ -1,4 +1,4 @@
-require 'zeitwerk'
+require 'active_support'
 require 'active_graph'
 
 # Workaround for jruby prepend issue https://github.com/jruby/jruby/issues/6971
@@ -13,6 +13,7 @@ require 'graphiti/resource/persistence'
 require 'graphiti/resource/interface'
 # End workaround for jruby prepend issue
 
+require 'zeitwerk'
 loader = Zeitwerk::Loader.for_gem(warn_on_extra_files: false)
 loader.inflector.inflect 'version' => 'VERSION'
 loader.ignore(File.expand_path('graphiti-activegraph.rb', __dir__))

metadata

@@ -1,22 +1,22 @@
 --- !ruby/object:Gem::Specification
 name: graphiti-activegraph
 version: !ruby/object:Gem::Version
-  version: 0.1.22
+  version: 0.1.23
 platform: ruby
 authors:
 - Hardik Joshi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-09-07 00:00:00.000000000 Z
+date: 2024-04-29 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
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -25,26 +25,40 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.2.0
 - !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: 11.1.0.alpha.1
+        version: '6.0'
+  name: activesupport
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 11.1.0.alpha.1
+        version: '6.0'
 - !ruby/object:Gem::Dependency
-  name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  name: zeitwerk
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -53,12 +67,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.15'
+  name: faraday
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -67,12 +81,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.15'
 - !ruby/object:Gem::Dependency
-  name: kaminari
   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
@@ -81,12 +95,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.17'
 - !ruby/object:Gem::Dependency
-  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  name: bundler
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -95,12 +109,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
   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
@@ -109,12 +123,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: graphiti_spec_helpers
   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
@@ -123,12 +137,26 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.0.beta.4
 - !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   name: standard
+  type: :development
+  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'
+  name: pry
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -137,12 +165,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '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
@@ -205,7 +233,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Easily build jsonapi.org-compatible APIs for GraphDB