graphiti-activegraph 0.1.17 → 0.1.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9b7ea2a6b4e70a83c4d19537bc4aaceca17366977698e36478b0e965b901a3e
-  data.tar.gz: 814010357e707ccd4c1bc7f0af3c954bbe37970aa17f842b32e421990af9e3c7
+  metadata.gz: 46a16074941e4ee029f645c51e1205ad85c47f2d5f68e28263cf8f6bb2d4dc1f
+  data.tar.gz: b769fe9d7c723b6388de46ea98d2d81b04784a00e43012141fe494ced7172171
 SHA512:
-  metadata.gz: 7c5ba76168e3614a3b4ba2c31b3385f39b1a835801f0191ddc9cdbbe53335510895d0faaa5d1427727c8a1f5c15b1164f64176fd890222b5f5efdb6adb46f486
-  data.tar.gz: 7b0187abf211beb954b6d76b915c4c5a678325c54b8a67469d2cacfb011e3c7ff4b42341c45b9b44cc40e6b79912a9a7f9121f9d3f08287b8f925c99fa6c4d94
+  metadata.gz: f08617d64f77129f273e42e26ad173858440e957427268155c6c470aff22131b8fdde701bb2d22e1c72e3cb6dce98f6c627397dae181416ed2a88ccd43382905
+  data.tar.gz: 312ed3bd2df8a475d3c35e1298498d4717f38ce4c6ca5312ecef80318e4d9ae9da2613f5b982057c1b6299db50a6656530214bbca6da9603a8d4e8038a3962e4

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

@@ -40,7 +40,7 @@ module Graphiti::ActiveGraph
         if extra_field
           scope.query.order("#{attribute} #{direction}").proxy_as(scope.model, scope.identity)
         else
-          scope.order(attribute => direction)
+          scope.send(resource.relation_resource? ? :rel_order : :order, attribute => direction)
         end
       end
 
@@ -58,8 +58,8 @@ module Graphiti::ActiveGraph
         model_instance
       end
 
-      def resolve(scope)
-        scope.to_a
+      def resolve(scope, resolve_to_rel = false)
+        resolve_to_rel ? scope.to_a(false, true) : scope.to_a
       end
 
       # def associate_all(parent, children, association_name, association_type)

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

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

data/lib/graphiti/active_graph/resource.rb

@@ -14,16 +14,11 @@ module Graphiti
         params[:filter] ||= {}
         params[:filter][:id] = id if id
 
-        validate!(params)
-        runner = ::Graphiti::Runner.new(self, params)
-        runner.proxy(nil, single: true, raise_on_missing: false, preloaded: obj, bypass_required_filters: true)
+        build(params, nil, raise_on_missing: false, preloaded: obj, bypass_required_filters: true)
       end
 
       def all_with_preloaded(obj_arr, params)
-        validate!(params)
-
-        runner = ::Graphiti::Runner.new(self, params)
-        runner.proxy(nil, raise_on_missing: false, preloaded: obj_arr)
+        build(params, nil, single: false, raise_on_missing: false, preloaded: obj_arr)
       end
 
       def guard_nil_id!(params)
@@ -39,6 +34,10 @@ module Graphiti
         query.sideloads.keys.map(&:to_sym)
       end
 
+      def resolve(scope)
+        adapter.resolve(scope, relation_resource?)
+      end
+
       def typecast(name, value, flag)
         att = get_attr!(name, flag, request: true)
 

data/lib/graphiti/active_graph/runner.rb

@@ -22,8 +22,8 @@ module Graphiti::ActiveGraph
         :parent,
         :params,
         :preloaded).merge(unpaginated_query: params[:unpaginated_query])
-      scope = jsonapi_scope(base, scope_opts) unless jsonapi_resource.relation_resource?
-      preloaded = opts[:preloaded] || (jsonapi_resource.relation_resource? && jsonapi_resource.base_scope)
+      scope = jsonapi_scope(base, scope_opts)
+      preloaded = opts[:preloaded]
       options = { payload: deserialized_payload,
         single: opts[:single],
         raise_on_missing: opts[:raise_on_missing],

data/lib/graphiti/active_graph/version.rb

@@ -1,5 +1,5 @@
 module Graphiti
   module ActiveGraph
-    VERSION = '0.1.17'
+    VERSION = '0.1.19'
   end
 end

data/lib/graphiti-activegraph.rb

@@ -10,6 +10,7 @@ module Graphiti
 end
 require 'graphiti/scoping/filterable'
 require 'graphiti/resource/persistence'
+require 'graphiti/resource/interface'
 # End workaround for jruby prepend issue
 
 loader = Zeitwerk::Loader.for_gem(warn_on_extra_files: false)
@@ -19,6 +20,7 @@ loader.setup
 
 Graphiti::Scoping::Filterable.prepend Graphiti::ActiveGraph::Scoping::Filterable
 Graphiti::Resource::Persistence.prepend Graphiti::ActiveGraph::Resource::Persistence
+Graphiti::Resource::Interface::ClassMethods.prepend Graphiti::ActiveGraph::Resource::Interface::ClassMethods
 require 'graphiti'
 Graphiti::Scoping::Filter.prepend Graphiti::ActiveGraph::Scoping::Filter
 Graphiti::Util::SerializerRelationship.prepend Graphiti::ActiveGraph::Util::SerializerRelationship

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphiti-activegraph
 version: !ruby/object:Gem::Version
-  version: 0.1.17
+  version: 0.1.19
 platform: ruby
 authors:
 - Hardik Joshi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-23 00:00:00.000000000 Z
+date: 2022-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphiti
@@ -174,6 +174,7 @@ files:
 - lib/graphiti/active_graph/jsonapi_ext/serializable/resource_ext.rb
 - lib/graphiti/active_graph/query.rb
 - lib/graphiti/active_graph/resource.rb
+- lib/graphiti/active_graph/resource/interface.rb
 - lib/graphiti/active_graph/resource/persistence.rb
 - lib/graphiti/active_graph/resource_proxy.rb
 - lib/graphiti/active_graph/runner.rb