graphiform 0.2.2 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76a4ecba322d7e4c1f2486f621531307b184bf42f52827023ef5f11942b4bcbc
-  data.tar.gz: ed8815feff1a1eaba966dd44b5db53f1739fce88f0d0e9fb7a850dda522d74bc
+  metadata.gz: 6b651a58e445f5b88cfe6f183d6a53b2527106b463e078888b414c4bba7ea92a
+  data.tar.gz: c200079ab7fcb8524cc229125612cf2e998dbfc442f193c94b7fd335a1bde72f
 SHA512:
-  metadata.gz: 412b372b015026737c993a1990031222c066272c5b9aec2563cd95e1474f5d2637d0a0ede3d3e589982ccb161b4b62d18c8380b117548e33221172689e1a5a41
-  data.tar.gz: b2c489a6c8f250f535657b5324aed7aa341365fa39540908ce2eabb6c403b793f71863cabfa63b6313ce60aab43731c94fc82492f7105e00d162a5eca0e1c96e
+  metadata.gz: 76f70e1f4986cf0a525922df8d868e11439b4f41857d96c4cbc9a8cbf8df6da80304428258845e7fd35ebf2b743c4b9cf893fa41cbaa7480a5f475fbc75e04cd
+  data.tar.gz: 66b9f9fff6a8866250530a76db140bfe438d81037c5f3d26667035e920d374cd7c9d0a468ed1d93b39ca0e8f083a159e7bf708beeb35f8743a5989a2f73e5d5e

data/lib/graphiform.rb

@@ -5,6 +5,7 @@ require 'graphiform/skeleton'
 require 'graphiform/active_record_helpers'
 require 'graphiform/core'
 require 'graphiform/fields'
+require 'graphiform/sort_enum'
 
 module Graphiform
   def self.included(base)

data/lib/graphiform/core.rb

@@ -136,7 +136,7 @@ module Graphiform
         Helpers.get_const_or_create(demodulized_name, ::Resolvers::Queries) do
           local_graphql_type = graphql_type
           Class.new(graphql_base_resolver) do
-            type local_graphql_type, null: false
+            type local_graphql_type, null: true
 
             def base_resolve(**args)
               @value = model.all
@@ -161,9 +161,9 @@ module Graphiform
         end
       end
 
-      def graphql_create_resolver(method_name, resolver_type = graphql_type, read_prepare: nil, read_resolve: nil, **)
+      def graphql_create_resolver(method_name, resolver_type = graphql_type, read_prepare: nil, read_resolve: nil, null: true, **)
         Class.new(graphql_base_resolver) do
-          type resolver_type, null: false
+          type resolver_type, null: null
 
           define_method :base_resolve do |**args|
             @value = object

data/lib/graphiform/fields.rb

@@ -157,7 +157,7 @@ module Graphiform
         column_def = column(as || name)
         association_def = association(as || name)
 
-        type = ::Enums::Sort if column_def.present?
+        type = ::Graphiform::SortEnum if column_def.present?
         type = association_def.klass.graphql_sort if Helpers.association_arguments_valid?(association_def, :graphql_sort)
 
         return if type.blank?
@@ -212,7 +212,9 @@ module Graphiform
               added_field.method_sym,
               lambda do
                 value = read_resolve ? instance_exec(object, context, &read_resolve) : object.public_send(added_field.method_sym)
-                instance_exec(value, context, &read_prepare) if read_prepare
+                value = instance_exec(value, context, &read_prepare) if read_prepare
+
+                value
               end
             )
           end
@@ -263,7 +265,8 @@ module Graphiform
               association_def.name,
               klass.graphql_connection,
               read_prepare: read_prepare,
-              read_resolve: read_resolve
+              read_resolve: read_resolve,
+              null: false
             ),
             false,
             **options
@@ -277,7 +280,8 @@ module Graphiform
                 association_def.name,
                 [klass.graphql_type],
                 read_prepare: read_prepare,
-                read_resolve: read_resolve
+                read_resolve: read_resolve,
+                null: false
               )
             else
               klass.graphql_type

data/lib/graphiform/skeleton.rb

@@ -80,12 +80,5 @@ module Graphiform
     Helpers.get_const_or_create('BaseEnum', ::Enums) do
       Class.new(::GraphQL::Schema::Enum)
     end
-
-    Helpers.get_const_or_create('Sort', ::Enums) do
-      Class.new(::Enums::BaseEnum) do
-        value 'ASC', 'Sort results in ascending order'
-        value 'DESC', 'Sort results in descending order'
-      end
-    end
   end
 end

data/lib/graphiform/sort_enum.rb

@@ -0,0 +1,8 @@
+require 'graphql'
+
+module Graphiform
+  class SortEnum < ::GraphQL::Schema::Enum
+    value 'ASC', 'Sort results in ascending order'
+    value 'DESC', 'Sort results in descending order'
+  end
+end

data/lib/graphiform/version.rb

@@ -1,3 +1,3 @@
 module Graphiform
-  VERSION = '0.2.2'.freeze
+  VERSION = '0.2.7'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphiform
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.7
 platform: ruby
 authors:
 - jayce.pulsipher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-28 00:00:00.000000000 Z
+date: 2021-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.2.5
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -124,6 +124,7 @@ files:
 - lib/graphiform/fields.rb
 - lib/graphiform/helpers.rb
 - lib/graphiform/skeleton.rb
+- lib/graphiform/sort_enum.rb
 - lib/graphiform/version.rb
 - lib/tasks/graphiform_tasks.rake
 homepage: https://github.com/3-form/graphiform