graphiform 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d348d5da31c862403a9127ada31cbb135e892c21928ca48b8ccfb5eb2d64d047
-  data.tar.gz: 73db372bee299b12a56e219218d04c4977436f3457379def8d0dd952a5e97aec
+  metadata.gz: d6bde49d1fc203265aee73785f6ff23308b5d2098259dd7bbc762dc0a8c16322
+  data.tar.gz: 061af2e25afdf9dad9fdedab5847212e3b7005c36290dfcbccdc73b085dd1588
 SHA512:
-  metadata.gz: b22a9b8d9e6b612406ab06a1d8fc86e8ad9e6305a8f1d222d7dc36a08f72cf95d911445ab5e2c1d852714f565b8d8758b6f3c2b3a1ebb1e62199a11f1a4880cb
-  data.tar.gz: c5766eb8d166b5311189ede79a26e21b5d55155199f24f995a763c9ddcc6540a5973bf360e1f5edb6ed75959085661f597e81946102a04b9022ad2ada48f5a61
+  metadata.gz: 0df7c307f8fbaa68fa1a33ee60d9c364603dbd911cb3726fc20073cf1bb9decaf1809387f5048fa080cd4abb6908f51fd744c769cbbb5f8c1e88db7fe631a7a7
+  data.tar.gz: df1bc69c8e412ae66be318d65c5574fef2cf1d5d2371a98ddd1293a6ceea9e7b4ac6e3bcd794b1660e8c7a6e7fbe26aa97737b723e5f4d3d5b22ad256e42e8ee

data/lib/graphiform/core.rb

@@ -130,7 +130,7 @@ module Graphiform
         end
       end
 
-      def graphql_create_resolver(method_name, resolver_type = graphql_type)
+      def graphql_create_resolver(method_name, resolver_type = graphql_type, read_prepare: nil, **_options)
         Class.new(graphql_base_resolver) do
           type resolver_type, null: false
 
@@ -140,6 +140,7 @@ module Graphiform
             val = super(**args)
 
             val = val.public_send(method_name) if val.respond_to? method_name
+            val = instance_exec(val, context, &read_prepare) if read_prepare
 
             return val.apply_filters(where_hash) if val.respond_to? :apply_filters
 

data/lib/graphiform/fields.rb

@@ -93,6 +93,8 @@ module Graphiform
       end
 
       def graphql_resolve_argument_type(name, type)
+        type = graphql_create_enum(name) if type.blank? && enum_attribute?(name)
+
         return Helpers.graphql_type(type) if type.present?
 
         column_def = column(name)
@@ -203,19 +205,28 @@ module Graphiform
         graphql_type.class_eval do
           added_field = field(field_name, **field_options)
 
-          define_method(added_field.method_sym, -> { read_prepare.call(object.public_send(added_field.method_sym)) }) if read_prepare
+          if read_prepare
+            define_method(
+              added_field.method_sym,
+              -> { instance_exec(object.public_send(added_field.method_sym), context, &read_prepare) }
+            )
+          end
         end
       end
 
       def graphql_add_column_field(field_name, column_def, type: nil, null: nil, **options)
-        type = :string if type.blank? && enum_attribute?(field_name)
+        is_enum = type.blank? && enum_attribute?(field_name)
+        if is_enum
+          enum = graphql_create_enum(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)
       end
 
-      def graphql_add_association_field(field_name, association_def, type: nil, null: nil, **options)
+      def graphql_add_association_field(field_name, association_def, type: nil, null: nil, include_connection: true, read_prepare: 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"
@@ -231,19 +242,23 @@ module Graphiform
         has_many = association_def.macro == :has_many
         klass = association_def.klass
 
-        if has_many
+        if include_connection && has_many
           graphql_add_field_to_type(
             "#{field_name}_connection",
-            klass.graphql_create_resolver(association_def.name, graphql_connection),
+            klass.graphql_create_resolver(association_def.name, klass.graphql_connection, read_prepare: read_prepare),
             false,
             **options
           )
         end
 
-        type = has_many ? klass.graphql_create_resolver(association_def.name, [klass.graphql_type]) : klass.graphql_type if type.nil?
+        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
+        end
+
         null = association_def.macro != :has_many if null.nil?
 
-        graphql_add_field_to_type(field_name, type, null, **options)
+        graphql_add_field_to_type(field_name, type, null, read_prepare: read_prepare, **options)
       end
 
       def graphql_add_method_field(field_name, type:, null: true, **options)

data/lib/graphiform/version.rb

@@ -1,3 +1,3 @@
 module Graphiform
-  VERSION = '0.1.2'.freeze
+  VERSION = '0.1.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphiform
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - jayce.pulsipher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-18 00:00:00.000000000 Z
+date: 2020-03-19 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.0
+        version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.2
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement