graphiti_gql 0.2.10 → 0.2.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8778ea5c62ff7c2eb9f32d674ece0a9b0c87ee30f57417fe02e61e2ed8c75e8
-  data.tar.gz: a80c2443b2c13cbd0d36d7160f8b2e3bde75ac97d87b4d58278440fab0e8426e
+  metadata.gz: 5a4faaf029a4624626f9bfa68815734bc6571381fa6b2d153830df1825c2d61f
+  data.tar.gz: 2f73a19e8b84280c83bc7d6ab0f574ffb5d4b2fb6b7328ca75de6d47a145ecc0
 SHA512:
-  metadata.gz: cad6708ae17b85ec5010245978d2f1dae7077fbbcc7d1303241ac1798a110b58638e68ab4d66ffab73a285f5a6ea5d8bc92b2cc347e2bd49c87d3b74fe96dcd7
-  data.tar.gz: '09d2dc8810af44fca96160ab941cca950dd35779b7659b30882cd3e2ec3a40a9551055c5cc585ff6c9514a3c3952491c986225f8ede57e915dc64af0901df739'
+  metadata.gz: d00b4b5b4e2314efd6e1d4ff6b72a357ba582a045dcab28214596130054fc8e15b22b8267fa1157e1746ddceda7c0b25602a0441ccaa82b4bda29fa27aab412c
+  data.tar.gz: 7a6d2a5ee610af959d292e87c492aa770ff2ab2d0546339dc3f30236811a3b44ab7edf9110773c457707d19bb0d06c9b62884a69ea94c13ad90d227eb8540bce

data/lib/graphiti_gql/active_resource.rb

@@ -13,10 +13,14 @@ module GraphitiGql
             if (sideload = resource.sideload(key))
               if value.key?(:edges) 
                 @edges[key] = value[:edges].map do |edge|
-                  node_id = edge[:node][:id]
+                  node_id = edge[:node][:id] if edge[:node]
                   Node.new(edge.except(:node).merge(node_id: node_id))
                 end
-                hash[key] = value[:edges].map { |v| Node.new(v[:node], sideload.resource.class) }
+                if value[:edges].any? { |e| e[:node] }
+                  hash[key] = value[:edges].map { |v| Node.new(v[:node], sideload.resource.class) }
+                else
+                  hash[key] = value[:edges]
+                end
               elsif value.key?(:nodes)
                 hash[key] = value[:nodes].map { |n| Node.new(n, sideload.resource.class) }
               else
@@ -47,7 +51,7 @@ module GraphitiGql
     end
 
     class Proxy
-      def initialize(resource, params, ctx, query)
+      def initialize(resource, params, ctx, query, options = {})
         @query = query
         @resource = resource
         @ctx = ctx
@@ -56,17 +60,22 @@ module GraphitiGql
           sort[:att] = sort[:att].to_s.camelize(:lower)
           sort[:dir] = sort[:dir].to_s
         end
+        @with_pagination = !!options[:with_pagination]
       end
 
-      def to_h(symbolize_keys: true)
+      def run!(symbolize_keys: true)
         result = GraphitiGql.run(query, @params, @ctx)
         result = result.deep_symbolize_keys if symbolize_keys
         @response = result
         result
       end
 
-      def node(id)
-        nodes.find { |n| n.id == id.to_s }
+      def node(id = nil)
+        if @resource.singular
+          Node.new(underscore(data[data.keys.first]), @resource)
+        else
+          nodes.find { |n| n.id == id.to_s }
+        end
       end
 
       def nodes
@@ -76,12 +85,12 @@ module GraphitiGql
         else
           data[data.keys.first][:nodes] || []
         end
-        elements.map { |n| Node.new(underscore(n), @resource) }
+        elements.compact.map { |n| Node.new(underscore(n), @resource) }
       end
       alias :to_a :nodes
 
       def response
-        @response ||= to_h
+        @response ||= run!
       end
 
       def data
@@ -207,15 +216,18 @@ module GraphitiGql
           end
         end
   
-        q << %|
-                }
-              }
-              pageInfo {
-                startCursor
-                endCursor
-                hasNextPage
-                hasPreviousPage
-              }|
+          q << %|
+                  }
+                }|
+        if @with_pagination
+          q << %|
+                pageInfo {
+                  startCursor
+                  endCursor
+                  hasNextPage
+                  hasPreviousPage
+                }|
+        end
 
         if @params[:stats]
           q << %|
@@ -251,8 +263,8 @@ module GraphitiGql
     end
 
     class_methods do
-      def gql(params = {}, ctx = {}, query = nil)
-        Proxy.new(self, params, ctx, query)
+      def gql(params = {}, ctx = {}, query = nil, opts = {})
+        Proxy.new(self, params, ctx, query, opts)
       end
     end
   end

data/lib/graphiti_gql/graphiti_hax.rb

@@ -2,15 +2,40 @@
 # Ideally we eventually rip out the parts of Graphiti we need and roll this into
 # that effort.
 module GraphitiGql
+  module RunnerExtras
+    def jsonapi_resource
+      @jsonapi_resource ||= begin
+        r = @resource_class.new
+        r.instance_variable_set(:@params, @params)
+        r
+      end
+    end
+  end
+  Graphiti::Runner.send(:prepend, RunnerExtras)
+
   module ResourceExtras
     extend ActiveSupport::Concern
 
     included do
       class << self
-        attr_accessor :graphql_name
+        attr_accessor :graphql_name, :singular
+      end
+    end
+
+    def filterings
+      @filterings ||= begin
+        if @params.key?(:filter)
+          @params[:filter].keys
+        else
+          []
+        end
       end
     end
 
+    def parent_field
+      context[:current_arguments][:lookahead].field.owner
+    end
+
     def selections
       return @selections if @selections
       lookahead = context[:current_arguments]
@@ -42,6 +67,14 @@ module GraphitiGql
           att[:name] = args.first # for easier lookup
         end
       end
+
+      def filter_group(filter_names, *args)
+        if filter_names.blank?
+          config[:grouped_filters] = {}
+        else
+          super
+        end
+      end
     end
   end
   Graphiti::Resource.send(:include, ResourceExtras)
@@ -145,8 +178,10 @@ module GraphitiGql
   module ManyToManyExtras
     def self.prepended(klass)
       klass.class_eval do
+        attr_reader :join_table_alias, :edge_magic
+
         class << self
-          attr_accessor :edge_resource
+          attr_reader :edge_resource
 
           def attribute(*args, &blk)
             @edge_resource ||= Class.new(Graphiti::Resource) do
@@ -159,6 +194,12 @@ module GraphitiGql
         end
       end
     end
+    
+    def initialize(name, opts = {})
+      @join_table_alias = opts[:join_table_alias]
+      @edge_magic = opts[:edge_magic] == false ? false : true
+      super
+    end
 
     def apply_belongs_to_many_filter
       super

data/lib/graphiti_gql/loaders/belongs_to.rb

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

data/lib/graphiti_gql/loaders/has_many.rb

@@ -3,7 +3,14 @@ module GraphitiGql
     class HasMany < Many
       def assign(parent_records, proxy)
         records = proxy.data
-        map = records.group_by { |record| record.send(@sideload.foreign_key) }
+
+        foreign_key = @sideload.foreign_key
+        config = @sideload.resource.attributes[foreign_key]
+        if config && config[:alias]
+          foreign_key = config[:alias]
+        end
+
+        map = records.group_by { |record| record.send(foreign_key) }
         parent_records.each do |pr|
           data = [map[pr.send(@sideload.primary_key)] || [], proxy]
           fulfill(pr, data)

data/lib/graphiti_gql/loaders/many.rb

@@ -57,7 +57,7 @@ module GraphitiGql
         elsif @sideload.type == :many_to_many
           fk = @sideload.foreign_key.values.first
           @params[:filter].merge!(fk => { eq: ids.join(",") })
-        else
+        elsif !@sideload.parent_resource.class.singular
           @params[:filter].merge!(@sideload.foreign_key => { eq: ids.join(",") })
         end
 

data/lib/graphiti_gql/loaders/many_to_many.rb

@@ -17,14 +17,16 @@ module GraphitiGql
       private
 
       def add_join_table_magic(proxy)
+        return unless @sideload.edge_magic
         if defined?(ActiveRecord) && proxy.resource.model.ancestors.include?(ActiveRecord::Base)
           thru = @sideload.foreign_key.keys.first
           reflection = @sideload.parent_resource.model.reflect_on_association(thru)
           thru_model = reflection.klass
 
+          thru_table_name = @sideload.join_table_alias || thru_model.table_name
           names = thru_model.column_names.map do |n|
             next if n == :id
-            "#{thru_model.table_name}.#{n} as _edge_#{n}"
+            "#{thru_table_name}.#{n} as _edge_#{n}"
           end
           scope = proxy.scope.object
           scope = scope.select(["#{proxy.resource.model.table_name}.*"] + names)

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

@@ -11,7 +11,9 @@ module GraphitiGql
             @registered[:type],
             null: true,
             extras: [:lookahead]
-          field.argument(:id, String, required: true)
+          unless @registered[:resource].singular
+            field.argument(:id, String, required: true)
+          end
           _registered = @registered
           query.define_method name do |**arguments|
             params = Util.params_from_args(arguments)

data/lib/graphiti_gql/spec_helper.rb

@@ -69,13 +69,17 @@ module GraphitiGql
 
     def proxy
       q = defined?(query) ? query : nil
-      resource.gql(params.merge(fields: fields), ctx, q)
+      with_pagination = respond_to?(:with_pagination) ? send(:with_pagination) : false
+      opts = { with_pagination: with_pagination }
+      resource.gql(params.merge(fields: fields), ctx, q, opts)
     end
 
+
     def run
       lambda do
-        proxy.to_h
-        proxy
+        instance = proxy
+        instance.run!
+        instance
       end
     end
 
@@ -86,5 +90,9 @@ module GraphitiGql
     def result
       @result ||= run!
     end
+
+    def json
+      @json ||= result.response
+    end
   end
 end

data/lib/graphiti_gql/version.rb

@@ -1,3 +1,3 @@
 module GraphitiGql
-  VERSION = "0.2.10"
+  VERSION = "0.2.14"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphiti_gql
 version: !ruby/object:Gem::Version
-  version: 0.2.10
+  version: 0.2.14
 platform: ruby
 authors:
 - Lee Richmond
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-13 00:00:00.000000000 Z
+date: 2022-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql