graphiti_gql 0.2.2 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 899580a6d3577a31dc7356d894eab26756c2c9876636db69ce5ece2d5eeee3ce
-  data.tar.gz: faf261a7614a0565c9dc3e45b4a9d14d75962aa6665b7302752733584abb5bdc
+  metadata.gz: b9a1b76315488d9389a214fc640f6029d9e1a05a08182ebbdb9ed7958565e4aa
+  data.tar.gz: e4d6952a6929bf8310a99ba5b2d40e3821fe8bad51e89b3012c041fed9f1c47a
 SHA512:
-  metadata.gz: becebe36d5aabea0a75ba3e617f9f62d0830d3f4a35e5becdacef1fbe10f4991621f061521f10bc4c0e527bdc834d5380e9f38ff0b9cc2388a66a7cf25bb33b8
-  data.tar.gz: 37a9a4221261f112100e32f06832a948c30cbef5a06ffcb786f080538c1b9f3894bd3f7f8fc32394f0c2cb122e94c1b1e58cd6b8c38b6e0feab08a30d55bbfb5
+  metadata.gz: 30cb9c3f67aa059d0e68845fc64aee6313d9f0d14d36e19024357c619ca15e176d4178ae2836055c22b407a53187038b21b8447007e37fbed04ab70330c12ff4
+  data.tar.gz: 6ece60976b6d36294e9ef01e8521efdf26d9637b28c6fcfec833e3f2a81d493eece073137071e3373f2ac948c786c18e79734904b62e369a1cc0c0353860d71d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    graphiti_gql (0.2.1)
+    graphiti_gql (0.2.2)
       graphiti (~> 1.3.9)
       graphql (~> 2.0)
       graphql-batch (~> 0.5)
@@ -47,7 +47,7 @@ GEM
       jsonapi-serializable (~> 0.3.0)
     graphiti_errors (1.1.2)
       jsonapi-serializable (~> 0.1)
-    graphql (2.0.7)
+    graphql (2.0.11)
     graphql-batch (0.5.1)
       graphql (>= 1.10, < 3)
       promise.rb (~> 0.7.2)

data/lib/graphiti_gql/graphiti_hax.rb

@@ -11,6 +11,27 @@ module GraphitiGql
       end
     end
 
+    def selections
+      return @selections if @selections
+      lookahead = context[:current_arguments]
+        .keyword_arguments[:lookahead]
+      nodes = lookahead.selection(:nodes)
+      if !nodes.selected?
+        nodes = lookahead
+          .selection(:edges)
+          .selection(:node)
+      end
+
+      if !nodes.selected?
+        nodes = lookahead
+      end
+
+      @selections = nodes
+        .selections
+        .map(&:name).map { |name| name.to_s.underscore.to_sym }
+      @selections
+    end
+
     class_methods do
       def attribute(*args)
         super(*args).tap do
@@ -159,7 +180,11 @@ module GraphitiGql
   end
 
   _in = definition.constructor do |input|
-    Time.zone.parse(input)
+    if input.is_a?(ActiveSupport::TimeWithZone)
+      input = input.utc.round(10).iso8601(6)
+    else
+      Time.zone.parse(input)
+    end
   end
 
   # Register it with Graphiti

data/lib/graphiti_gql/loaders/belongs_to.rb

@@ -53,7 +53,8 @@ module GraphitiGql
           end
         else
           params = {filter: {id: {eq: ids.join(",")}}}
-          records = @sideload.resource.class.all(params).data
+          resource = Schema.registry.get(@sideload.resource.class)[:resource]
+          records = resource.all(params).data
           map = records.index_by { |record| record.id }
           ids.each { |id| fulfill(id, map[id]) }
         end

data/lib/graphiti_gql/loaders/has_many.rb

@@ -1,12 +1,12 @@
 module GraphitiGql
   module Loaders
     class HasMany < Many
-      def assign(ids, proxy)
+      def assign(parent_records, proxy)
         records = proxy.data
         map = records.group_by { |record| record.send(@sideload.foreign_key) }
-        ids.each do |id|
-          data = [map[id] || [], proxy]
-          fulfill(id, data)
+        parent_records.each do |pr|
+          data = [map[pr.send(@sideload.primary_key)] || [], proxy]
+          fulfill(pr, data)
         end
       end
     end

data/lib/graphiti_gql/loaders/has_one.rb

@@ -0,0 +1,15 @@
+module GraphitiGql
+  module Loaders
+    class HasOne < Many
+      def assign(parent_records, proxy)
+        records = proxy.data
+        parent_records.each do |pr|
+          corresponding = records.find do |r|
+            r.send(@sideload.foreign_key) == pr.send(@sideload.primary_key)
+          end
+          fulfill(pr, corresponding)
+        end
+      end
+    end
+  end
+end

data/lib/graphiti_gql/loaders/many.rb

@@ -6,6 +6,8 @@ module GraphitiGql
           PolymorphicHasMany.for(sideload, params)
         elsif sideload.type == :many_to_many
           ManyToMany.for(sideload, params)
+        elsif sideload.type == :has_one
+          HasOne.for(sideload, params)
         else
           HasMany.for(sideload, params)
         end
@@ -16,13 +18,26 @@ module GraphitiGql
         @params = params
       end
 
-      def perform(ids)
-        raise ::Graphiti::Errors::UnsupportedPagination if paginating? && ids.length > 1
-        raise Errors::UnsupportedStats if requesting_stats? && ids.length > 1 && !can_group?
+      def perform(parent_records)
+        raise ::Graphiti::Errors::UnsupportedPagination if paginating? && parent_records.length > 1
+        raise Errors::UnsupportedStats if requesting_stats? && parent_records.length > 1 && !can_group?
 
-        build_params(ids)
-        proxy = @sideload.resource.class.all(@params)
-        assign(ids, proxy)
+        ids = parent_records.map do |pr|
+          pk = pr.send(@sideload.primary_key)
+          if @sideload.polymorphic_as
+            hash = {}
+            hash[@sideload.foreign_key] = pk
+            hash[:"#{@sideload.polymorphic_as}_type"] = pr.class.name
+            hash
+          else
+            pk
+          end
+        end
+
+        build_params(ids, parent_records)
+        resource = Schema.registry.get(@sideload.resource.class)[:resource]
+        proxy = resource.all(@params)
+        assign(parent_records, proxy)
       end
 
       def assign(ids, proxy)
@@ -31,7 +46,7 @@ module GraphitiGql
 
       private
 
-      def build_params(ids)
+      def build_params(ids, parent_records)
         @params[:filter] ||= {}
 
         if @sideload.polymorphic_as
@@ -59,6 +74,10 @@ module GraphitiGql
           @params[:page] ||= {}
           @params[:page][:size] = 999
         end
+
+        if @sideload.params_proc
+          @sideload.params_proc.call(@params, parent_records)
+        end
       end
 
       def paginating?

data/lib/graphiti_gql/loaders/many_to_many.rb

@@ -1,16 +1,16 @@
 module GraphitiGql
   module Loaders
     class ManyToMany < Many
-      def assign(ids, proxy)
+      def assign(parent_records, proxy)
         thru = @sideload.foreign_key.keys.first
         fk = @sideload.foreign_key[thru]
         add_join_table_magic(proxy)
         records = proxy.data
-        ids.each do |id|
+        parent_records.each do |pr|
           corresponding = records.select do |record|
-            record.send(:"_edge_#{fk}") == id
+            record.send(:"_edge_#{fk}") == pr.send(@sideload.primary_key)
           end
-          fulfill(id, [corresponding, proxy])
+          fulfill(pr, [corresponding, proxy])
         end
       end
 

data/lib/graphiti_gql/loaders/polymorphic_has_many.rb

@@ -1,15 +1,18 @@
 module GraphitiGql
   module Loaders
     class PolymorphicHasMany < Many
-      def assign(ids, proxy)
+      def assign(parent_records, proxy)
         records = proxy.data
-        ids.each do |id|
+        parent_records.each do |pr|
           corresponding = records.select do |record|
-            record.send("#{@sideload.polymorphic_as}_type") == id[:"#{@sideload.polymorphic_as}_type"] &&
-              record.send(@sideload.foreign_key) == id[@sideload.foreign_key]
+            child_ft = record.send("#{@sideload.polymorphic_as}_type")
+            child_fk = record.send(@sideload.foreign_key)
+            parent_ft = pr.class.name
+            parent_fk = pr.send(@sideload.primary_key)
+            child_ft == parent_ft && child_fk == parent_fk
           end
           data = [corresponding || [], proxy]
-          fulfill(id, data)
+          fulfill(pr, data)
         end
       end
     end

data/lib/graphiti_gql/schema/fields/to_many.rb

@@ -12,32 +12,31 @@ module GraphitiGql
         end
 
         def apply(type)
-          field = type.field @sideload.name,
-            @sideload_type.connection_type,
-            null: false,
+          opts = {
+            null: has_one?,
             connection: false,
-            extensions: [RelayConnectionExtension],
             extras: [:lookahead]
+          }
+          opts[:extensions] = [RelayConnectionExtension] unless has_one?
+          field_type = has_one? ? @sideload_type : @sideload_type.connection_type
+          field = type.field @sideload.name,
+            field_type,
+            **opts
           ListArguments.new(@sideload.resource.class, @sideload).apply(field)
           _sideload = @sideload
           type.define_method(@sideload.name) do |**arguments|
             Util.is_readable_sideload!(_sideload)
             params = Util.params_from_args(arguments)
-            pk = object.send(_sideload.primary_key)
-            id = if _sideload.polymorphic_as
-              hash = {}
-              hash[_sideload.foreign_key] = pk
-              hash[:"#{_sideload.polymorphic_as}_type"] = object.class.name
-              id = hash
-            else
-              id = pk
-            end
-            Loaders::Many.factory(_sideload, params).load(id)
+            Loaders::Many.factory(_sideload, params).load(object)
           end
         end
 
         private
 
+        def has_one?
+          @sideload.type == :has_one
+        end
+
         def customized_edge?
           @sideload.type == :many_to_many && @sideload.class.edge_resource
         end

data/lib/graphiti_gql/schema/fields/to_one.rb

@@ -19,7 +19,9 @@ module GraphitiGql
             if _sideload.type == :has_one
               id = object.send(_sideload.primary_key)
               params = { filter: { _sideload.foreign_key => { eq: id } } }
-              return _sideload.resource.class.all(params).data[0]
+
+              resource = Schema.registry.get(@sideload.resource.class)[:resource]
+              return resource.all(params).data[0]
             end
 
             lookahead = arguments[:lookahead]

data/lib/graphiti_gql/schema/query.rb

@@ -31,7 +31,7 @@ module GraphitiGql
 
       def add_relationships
         each_relationship do |type, sideload_type, sideload|
-          if [:has_many, :many_to_many].include?(sideload.type)
+          if [:has_many, :many_to_many, :has_one].include?(sideload.type)
             Fields::ToMany.new(sideload, sideload_type).apply(type)
           else
             Fields::ToOne.new(sideload, sideload_type).apply(type)

data/lib/graphiti_gql/spec_helper.rb

@@ -2,6 +2,21 @@ module GraphitiGql
   module SpecHelper
     extend ActiveSupport::Concern
 
+    module ScopeTrackable
+      def self.prepended(klass)
+        klass.class_eval do
+          class << self
+            attr_accessor :resolved_scope
+          end
+        end
+      end
+
+      def resolve(scope)
+        self.class.resolved_scope = scope
+        super
+      end
+    end
+
     included do
       extend Forwardable
       def_delegators :result,
@@ -11,13 +26,38 @@ module GraphitiGql
         :nodes,
         :stats
 
+      Graphiti::Resource.send(:prepend, ScopeTrackable)
+
       if defined?(RSpec)
         let(:params) { {} }
         let(:resource) { described_class }
         let(:ctx) { {} }
+        let(:only_fields) { [] }
+        let(:except_fields) { [] }
+
+        def self.only_fields(*fields)
+          let(:only_fields) { fields }
+        end
+
+        def self.except_fields(*fields)
+          let(:except_fields) { fields }
+        end
       end
     end
 
+    def fields
+      fields = []
+      resource.attributes.each_pair do |name, config|
+        (fields << name) if config[:readable]
+      end
+      if respond_to?(:only_fields) && only_fields.present?
+        fields.select! { |f| only_fields.include?(f) }
+      elsif respond_to?(:except_fields) && except_fields.present?
+        fields.reject! { |f| except_fields.include?(f) }
+      end
+      fields
+    end
+
     def gql_datetime(timestamp, precise = false)
       if precise
         timestamp.utc.round(10).iso8601(6)
@@ -26,9 +66,16 @@ module GraphitiGql
       end
     end
 
+    def proxy
+      resource.gql(params.merge(fields: fields), ctx)
+    end
+
+    def query
+      proxy.query
+    end
+
     def run
       lambda do
-        proxy = resource.gql(params, ctx)
         proxy.to_h
         proxy
       end

data/lib/graphiti_gql/version.rb

@@ -1,3 +1,3 @@
 module GraphitiGql
-  VERSION = "0.2.2"
+  VERSION = "0.2.5"
 end

data/lib/graphiti_gql.rb

@@ -9,6 +9,7 @@ require "graphiti_gql/loaders/has_many"
 require "graphiti_gql/loaders/many_to_many"
 require "graphiti_gql/loaders/polymorphic_has_many"
 require "graphiti_gql/loaders/belongs_to"
+require "graphiti_gql/loaders/has_one"
 require "graphiti_gql/response_shim"
 require "graphiti_gql/schema"
 require "graphiti_gql/schema/connection"
@@ -65,6 +66,9 @@ module GraphitiGql
   end
 
   def self.run(query_string, variables = {}, context = {})
+    if context.empty? && Graphiti.context[:object]
+      context = Graphiti.context[:object]
+    end
     Graphiti.with_context(context) do
       result = schema.execute query_string,
         variables: variables,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphiti_gql
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.5
 platform: ruby
 authors:
 - Lee Richmond
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-06-26 00:00:00.000000000 Z
+date: 2022-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
@@ -108,7 +108,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '7.0'
-description:
+description: 
 email:
 - richmolj@gmail.com
 executables: []
@@ -143,6 +143,7 @@ files:
 - lib/graphiti_gql/graphiti_hax.rb
 - lib/graphiti_gql/loaders/belongs_to.rb
 - lib/graphiti_gql/loaders/has_many.rb
+- lib/graphiti_gql/loaders/has_one.rb
 - lib/graphiti_gql/loaders/many.rb
 - lib/graphiti_gql/loaders/many_to_many.rb
 - lib/graphiti_gql/loaders/polymorphic_has_many.rb
@@ -168,7 +169,7 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://www.graphiti.dev
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -183,8 +184,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key:
+rubygems_version: 3.0.3.1
+signing_key: 
 specification_version: 4
 summary: GraphQL support for Graphiti
 test_files: []