graphiti_gql 0.2.11 → 0.2.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71fdec4bf251efc22810991433ff68f9797cd347537e01a9cd309557c68567ea
-  data.tar.gz: 9b65200d9eb293333b3cb4727389bc4c51ebc46da014d12f478f95c75fc48b0b
+  metadata.gz: 36cf98699fc608187e70b321c60b32fc68989b5db05704fbd0f3adcdc3e7c947
+  data.tar.gz: 1ee21e3fcce82d24027172bd106f395a797dbb4e9de8b52cbb18caf3bb41f474
 SHA512:
-  metadata.gz: f6e7ad07688af72a5850d5a93338ebce34c224e54259fce30a32b51a5deb842a8e9b1f3f2779bcf21ca841bfc7e7a88206c63e5bd3cb56644c92612c626762ec
-  data.tar.gz: a18337b399b74f1389e43becffddff4119a0c07b6c53ddfc84a0e2d925d7b5339206823d6f366adf24484838b79dda45298b11cee785d258455cebd802c46c1a
+  metadata.gz: ca86b7bba1a1c1b8e1a086872278ce730ad4e696002d45b7ebc519668294e1a0129c52da060d1a1a8673cf561f0d9d01e9c7c622b4f218316c1703fea554a5a6
+  data.tar.gz: 2f1081e4677027d6c6bdb703c8eb59a0f702fa6e07bd0249e6f4f4ecb103bc53ae794c9025c1b8634dcb445c476fd8ce04648f841cfcf4fd4ef04667cc19800a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    graphiti_gql (0.2.9)
+    graphiti_gql (0.2.15)
       graphiti (~> 1.3.9)
       graphql (~> 2.0)
       graphql-batch (~> 0.5)
@@ -20,15 +20,11 @@ GEM
     coderay (1.1.3)
     concurrent-ruby (1.1.10)
     diff-lcs (1.5.0)
-    dry-configurable (0.15.0)
+    dry-container (0.10.0)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 0.6)
-    dry-container (0.9.0)
+    dry-core (0.8.0)
       concurrent-ruby (~> 1.0)
-      dry-configurable (~> 0.13, >= 0.13.0)
-    dry-core (0.7.1)
-      concurrent-ruby (~> 1.0)
-    dry-inflector (0.2.1)
+    dry-inflector (0.3.0)
     dry-logic (1.2.0)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.5, >= 0.5)

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/engine.rb

@@ -18,7 +18,6 @@ module GraphitiGql
     end
 
     initializer "graphiti_gql.define_controller" do
-      require "#{Rails.root}/app/controllers/application_controller"
       app_controller = GraphitiGql.config.application_controller || ::ApplicationController
       app_controller.send(:include, ControllerContext)
 

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,14 +69,16 @@ 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
         instance = proxy
-        instance.to_h
+        instance.run!
         instance
       end
     end
@@ -88,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.11"
+  VERSION = "0.2.15"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphiti_gql
 version: !ruby/object:Gem::Version
-  version: 0.2.11
+  version: 0.2.15
 platform: ruby
 authors:
 - Lee Richmond
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-16 00:00:00.000000000 Z
+date: 2022-07-26 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: []
@@ -170,7 +170,7 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://www.graphiti.dev
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -185,8 +185,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: GraphQL support for Graphiti
 test_files: []