graphiti_gql 0.2.9 → 0.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 544e1209bfdf6e48d70a76490edec46bc04639d75d91bae2a35ab95ea8fb4530
-  data.tar.gz: '0688127e3a2ab48d4bdd3f7f70a4efd544dd4bb4c9a952c0c4302ede86c1c24a'
+  metadata.gz: 738c0d01e7e5491204399c4ddf9b0d346943555c49a1b64937e62c4503a23d9b
+  data.tar.gz: 80837b0265bcfda82c95bb498e262f52208a75a06b61670df342aea53d16ceb5
 SHA512:
-  metadata.gz: 67b52a3241814fd821cf23982ed55e02c1e0e171d41c5c3bb54cdcd53e04ea28a13fab327d86a5756dee7499f88d163316b93cfebf730a4681ab54a627693f9b
-  data.tar.gz: ce6ab0de40b33e0750f4eb33c63249c91a6b478503cce6fc0cc92081b18190346a9e4190027b940020f69459c40094a963b3a0d1e440e63ed4a2f47e1bd904cd
+  metadata.gz: 3ad649a5f015c967529be572ad5f586edbeeb83205aaf4421c0f8906099213565492ba54f871e141aee37a668d5255cfa7188429cbbb15484d11af20c2b70cbe
+  data.tar.gz: b1b6812f8e4f350682124de0dfefde997602ed41f6d7b5e704ae640d2e59636c789e1ba54c75a51ef5beea41fbd76d3213424736d7159f455aad27bd6323361d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    graphiti_gql (0.2.8)
+    graphiti_gql (0.2.11)
       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

@@ -47,7 +47,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,6 +56,7 @@ 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)
@@ -76,7 +77,7 @@ 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
 
@@ -118,7 +119,7 @@ module GraphitiGql
 
         name = Schema.registry.key_for(@resource)
         sortvar = "$sort: [#{name}Sort!]," if @resource.sorts.any?
-        filter_bang = "!" if @resource.filters.values.any? { |f| f[:required] }
+        filter_bang = "!" if @resource.grouped_filters.any? || @resource.filters.values.any? { |f| f[:required] }
         filtervar = "$filter: #{name}Filter#{filter_bang}," if @resource.filters.any?
 
         if !(fields = @params[:fields])
@@ -207,15 +208,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 +255,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/schema/list_arguments.rb

@@ -36,6 +36,7 @@ module GraphitiGql
             value
           end
         }
+        required = true if @resource.grouped_filters.any? && !@sideload
         field.argument :filter, filter_type, required: required
       end
     
@@ -46,11 +47,18 @@ module GraphitiGql
         end
         klass = Class.new(GraphQL::Schema::InputObject)
         klass.graphql_name type_name
+        required_via_group = []
+        if (group = @resource.grouped_filters).present?
+          if group[:required] == :all
+            required_via_group = group[:names].map(&:to_sym)
+          end
+        end
         @resource.filters.each_pair do |name, config|
           attr_type = generate_filter_attribute_type(type_name, name, config)
+          required = !!config[:required] || required_via_group.include?(name)
           klass.argument name.to_s.camelize(:lower),
             attr_type,
-            required: !!config[:required]
+            required: required
         end
         registry[type_name] = { type: klass }
         klass

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.to_h
+        instance
       end
     end
 

data/lib/graphiti_gql/version.rb

@@ -1,3 +1,3 @@
 module GraphitiGql
-  VERSION = "0.2.9"
+  VERSION = "0.2.12"
 end

metadata

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