graphiform 0.2.0 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f568ee911e1cd7c4dc85decd8913292d3abcfb2d6038ff247e7a99b861168060
-  data.tar.gz: 74eef82837648da958be37d5bd8672a03e27b618321a9ef0ea6cf6ee440eb164
+  metadata.gz: 2f56c92956905df19b6e8a756b8826c63710619ab9c67f5e019280ccca4c0cd5
+  data.tar.gz: 6ac0fbb69feaa5d7a544dc1c5618f7c09b9cfd09fa6a0ad498e139e2c7539547
 SHA512:
-  metadata.gz: 6e42cf06adab34fb2db93633578b2418b8127749a16b25488fc9a8abd8ea3b2b529d49310b8cb2e437c7f04e1812242b40b530b443131dd8e489b6b85d79cb03
-  data.tar.gz: 656299a9d3c659197dc5650e93bea7f193043e1f6d2e0690a6e1c9e40a9b83111e3e20560fb8f57bde32860d91bdf63407a7b1ab9afff6a38be2b57fd6f2b916
+  metadata.gz: 8fe2ea6fc9d0c5bd906357d7571b2aa187c247a2fccd573716da623e22f784c3aaf4337fae660ec5b30061a40af57ac99f2cd1ec68b93c35cf06b8098196da3d
+  data.tar.gz: ee62442607c271725f12401d2d27f89667ef3992c41e7e09935809e5c2ee77c8aa99986d69a60ddacb7b0ab439717a47dd803a7579f3749514fca572fc440b15

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

@@ -9,17 +9,18 @@ module Graphiform
     module ClassMethods
       def graphql_readable_field(
         name,
+        as: nil,
         **options
       )
-        column_def = column(name)
-        association_def = association(name)
+        column_def = column(as || name)
+        association_def = association(as || name)
 
-        graphql_add_column_field(name, column_def, **options) if column_def.present?
-        graphql_add_association_field(name, association_def, **options) if association_def.present?
-        graphql_add_method_field(name, **options) unless column_def.present? || association_def.present?
+        graphql_add_column_field(name, column_def, as: as, **options) if column_def.present?
+        graphql_add_association_field(name, association_def, as: as, **options) if association_def.present?
+        graphql_add_method_field(name, as: as, **options) unless column_def.present? || association_def.present?
 
-        graphql_add_scopes_to_filter(name)
-        graphql_field_to_sort(name)
+        graphql_add_scopes_to_filter(name, as || name)
+        graphql_field_to_sort(name, as || name)
       end
 
       def graphql_writable_field(
@@ -31,25 +32,30 @@ module Graphiform
         description: nil,
         default_value: ::GraphQL::Schema::Argument::NO_DEFAULT,
         as: nil,
-        **_options
+        **
       )
         name = name.to_sym
-        argument_name = graphql_resolve_argument_name(name)
-        argument_type = graphql_resolve_argument_type(name, type)
+        has_nested_attributes_method = instance_methods.include?("#{as || name}_attributes=".to_sym)
+
+        argument_name = has_nested_attributes_method ? "#{name}_attributes".to_sym : name
+        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
 
         graphql_input.class_eval do
-          argument \
+          argument(
             argument_name,
             argument_type,
             required: required,
             prepare: prepare,
             description: description,
             default_value: default_value,
-            as: as
+            as: as,
+            method_access: false
+          )
         end
       end
 
@@ -84,14 +90,6 @@ module Graphiform
 
       private
 
-      def graphql_resolve_argument_name(name)
-        attributes_name = "#{name}_attributes"
-
-        return attributes_name.to_sym if instance_methods.include?("#{attributes_name}=".to_sym)
-
-        name
-      end
-
       def graphql_resolve_argument_type(name, type)
         type = graphql_create_enum(name) if type.blank? && enum_attribute?(name)
 
@@ -109,12 +107,12 @@ module Graphiform
         has_many ? [association_def.klass.graphql_input] : association_def.klass.graphql_input
       end
 
-      def graphql_add_scopes_to_filter(name)
-        added_scopes = auto_scopes_by_attribute(name)
+      def graphql_add_scopes_to_filter(name, as)
+        added_scopes = auto_scopes_by_attribute(as)
 
         return if added_scopes.empty?
 
-        association_def = association(name)
+        association_def = association(as)
 
         if association_def.present?
           return unless Helpers.association_arguments_valid?(association_def, :graphql_filter)
@@ -130,15 +128,15 @@ module Graphiform
             enum = graphql_create_enum(name)
             scope_argument_type = scope_argument_type.is_a?(Array) ? [enum] : enum
           end
-          add_scope_def_to_filter(added_scope, scope_argument_type)
+          add_scope_def_to_filter(name, added_scope, scope_argument_type)
         end
       end
 
-      def add_scope_def_to_filter(scope_def, argument_type)
+      def add_scope_def_to_filter(name, scope_def, argument_type)
         return unless argument_type
 
         argument_type = Helpers.graphql_type(argument_type)
-        argument_attribute = scope_def.attribute
+        argument_attribute = name
         argument_prefix = scope_def.prefix
         argument_suffix = scope_def.suffix == '_is' ? '' : scope_def.suffix
         argument_name = "#{argument_prefix}#{argument_attribute}#{argument_suffix}".underscore
@@ -149,14 +147,15 @@ module Graphiform
             argument_name,
             argument_type,
             required: false,
-            as: scope_name
+            as: scope_name,
+            method_access: false
           )
         end
       end
 
-      def graphql_field_to_sort(name)
-        column_def = column(name)
-        association_def = association(name)
+      def graphql_field_to_sort(name, as)
+        column_def = column(as || name)
+        association_def = association(as || name)
 
         type = ::Enums::Sort if column_def.present?
         type = association_def.klass.graphql_sort if Helpers.association_arguments_valid?(association_def, :graphql_sort)
@@ -169,7 +168,9 @@ module Graphiform
           argument(
             name,
             type,
-            required: false
+            required: false,
+            as: as,
+            method_access: false
           )
         end
       end
@@ -181,18 +182,21 @@ module Graphiform
         description: nil,
         deprecation_reason: nil,
         method: nil,
+        as: nil,
         read_prepare: nil,
-        **_options
+        read_resolve: nil,
+        **
       )
+        type = Helpers.graphql_type(type)
+        is_resolver = Helpers.resolver?(type)
+
         field_name = field_name.to_sym
         field_options = {
           description: description,
           deprecation_reason: deprecation_reason,
-          method: method,
+          method: is_resolver ? nil : method || as,
         }
 
-        type = Helpers.graphql_type(type)
-
         if Helpers.resolver?(type)
           field_options[:resolver] = type
         else
@@ -203,28 +207,42 @@ 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
       end
 
-      def graphql_add_column_field(field_name, column_def, type: nil, null: nil, **options)
-        is_enum = type.blank? && enum_attribute?(field_name)
+      def graphql_add_column_field(field_name, column_def, type: nil, null: nil, as: nil, **options)
+        is_enum = type.blank? && enum_attribute?(as || field_name)
         if is_enum
-          enum = graphql_create_enum(field_name)
+          enum = graphql_create_enum(as || field_name)
           type = enum
         end
         type ||= column_def.type
         null = column_def.null if null.nil?
 
-        graphql_add_field_to_type(field_name, type, null, **options)
+        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"
@@ -243,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/version.rb

@@ -1,3 +1,3 @@
 module Graphiform
-  VERSION = '0.2.0'.freeze
+  VERSION = '0.2.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphiform
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.5
 platform: ruby
 authors:
 - jayce.pulsipher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-30 00:00:00.000000000 Z
+date: 2020-08-02 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