graphiform 0.2.1 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 526c94bd74004084cc768835a9053591a755f8eccfdebefae6ed4bd44a972399
-  data.tar.gz: 913464048608818458ede08de55cfdda5c8cc3cd4855ee98bbb44763d1c1423b
+  metadata.gz: 7499ef9e7181b749ac563666f65231e933d047bbdcc39dbe6f708bdb14e8eab9
+  data.tar.gz: 3fc690f7cb20996f420516cceb158ff9aa103b2b7ed1e7bae6ceead0864f4409
 SHA512:
-  metadata.gz: 0e8eb91cf3db0dd05c907b9e2d5cd31d5a262a939c491ae6d7b791b9ac4bee9853c80475d031ee2fdfb38e944ea35fa0d80c2af6bf15061045a9b0c3b674bbec
-  data.tar.gz: 9fc6e350f1b2603a3e8205e5ce4d762f7107959040ac9cee557e912c52891cca1e315ffe0a86847538ab14aaa659f9842bcaabde018915ed970240aab619125d
+  metadata.gz: 7037e930060d081d86091b0c023fb3b3813b6a487bbe19785ebde5f6824eae27210839eb4174e5ea47f3499464aa346609ffc76838ab5c814063b754fa44393b
+  data.tar.gz: b41292d3ab6b29c3ab9a2eaa8e02c1743f14095ccc88396e3e6602fb1d8e6964b8576885cb95d0006c88509a7befd54450415ce407e0ed31b4bc9f4eeaa38406

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,14 +161,15 @@ module Graphiform
         end
       end
 
-      def graphql_create_resolver(method_name, resolver_type = graphql_type, read_prepare: 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
 
-            @value = @value.public_send(method_name) if @value.respond_to?(method_name)
+            @value = instance_exec(@value, context, &read_resolve) if read_resolve
+            @value = @value.public_send(method_name) if !read_resolve && @value.respond_to?(method_name)
             @value = instance_exec(@value, context, &read_prepare) if read_prepare
 
             apply_built_ins(**args)

data/lib/graphiform/fields.rb

@@ -41,7 +41,7 @@ module Graphiform
         argument_type = graphql_resolve_argument_type(as || name, type)
         as = has_nested_attributes_method ? "#{as}_attributes".to_sym : as.to_sym if as
 
-        return Helpers.logger.warn "Graphiform: Missing `type` for argument #{name}" if argument_type.nil?
+        return Helpers.logger.warn "Graphiform: Missing `type` for argument `#{name}` in model `#{self.name}`" if argument_type.nil?
 
         prepare = write_prepare || prepare
 
@@ -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?
@@ -184,6 +184,7 @@ module Graphiform
         method: nil,
         as: nil,
         read_prepare: nil,
+        read_resolve: nil,
         **
       )
         type = Helpers.graphql_type(type)
@@ -206,10 +207,15 @@ module Graphiform
         graphql_type.class_eval do
           added_field = field(field_name, **field_options)
 
-          if read_prepare
+          if read_prepare || read_resolve
             define_method(
               added_field.method_sym,
-              -> { instance_exec(object.public_send(added_field.method_sym), context, &read_prepare) }
+              lambda do
+                value = read_resolve ? instance_exec(object, context, &read_resolve) : object.public_send(added_field.method_sym)
+                value = instance_exec(value, context, &read_prepare) if read_prepare
+
+                value
+              end
             )
           end
         end
@@ -227,7 +233,16 @@ module Graphiform
         graphql_add_field_to_type(field_name, type, null, as: as, **options)
       end
 
-      def graphql_add_association_field(field_name, association_def, type: nil, null: nil, include_connection: true, read_prepare: nil, **options)
+      def graphql_add_association_field(
+        field_name,
+        association_def,
+        type: nil,
+        null: nil,
+        include_connection: true,
+        read_prepare: nil,
+        read_resolve: nil,
+        **options
+      )
         unless association_def.klass.respond_to?(:graphql_type)
           return Helpers.logger.warn(
             "Graphiform: `#{name}` trying to add association `#{field_name}` - `#{association_def.klass.name}` does not include Graphiform"
@@ -246,20 +261,42 @@ module Graphiform
         if include_connection && has_many
           graphql_add_field_to_type(
             "#{field_name}_connection",
-            klass.graphql_create_resolver(association_def.name, klass.graphql_connection, read_prepare: read_prepare),
+            klass.graphql_create_resolver(
+              association_def.name,
+              klass.graphql_connection,
+              read_prepare: read_prepare,
+              read_resolve: read_resolve,
+              null: false
+            ),
             false,
             **options
           )
         end
 
         if type.nil?
-          type = has_many ? klass.graphql_create_resolver(association_def.name, [klass.graphql_type], read_prepare: read_prepare) : klass.graphql_type
-          read_prepare = nil if has_many
+          type = (
+            if has_many
+              klass.graphql_create_resolver(
+                association_def.name,
+                [klass.graphql_type],
+                read_prepare: read_prepare,
+                read_resolve: read_resolve,
+                null: false
+              )
+            else
+              klass.graphql_type
+            end
+          )
+
+          if has_many
+            read_prepare = nil
+            read_resolve = nil
+          end
         end
 
         null = association_def.macro != :has_many if null.nil?
 
-        graphql_add_field_to_type(field_name, type, null, read_prepare: read_prepare, **options)
+        graphql_add_field_to_type(field_name, type, null, read_prepare: read_prepare, read_resolve: read_resolve, **options)
       end
 
       def graphql_add_method_field(field_name, type: nil, null: true, **options)

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.1'.freeze
+  VERSION = '0.2.6'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphiform
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.6
 platform: ruby
 authors:
 - jayce.pulsipher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-15 00:00:00.000000000 Z
+date: 2020-11-03 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.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.2.3
 - !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