graphiform 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4fc3e0cf5b5240d32be9aeb6d008bd81c56e8b5cee03e1bda37b080ad56fbf1f
-  data.tar.gz: cfaf0727fedb282ab4ee4bfb58c1fcb0529e0c3c48eb51331c18e76d05651870
+  metadata.gz: d348d5da31c862403a9127ada31cbb135e892c21928ca48b8ccfb5eb2d64d047
+  data.tar.gz: 73db372bee299b12a56e219218d04c4977436f3457379def8d0dd952a5e97aec
 SHA512:
-  metadata.gz: 04b52523d7a06c73d7241259053cb4a6e3c090d70878f4e30b598800cc02492f5eae4e1b70bb7801a29a419a725ce8196b03dbbc015c5fdc748a9ecba18aad22
-  data.tar.gz: 4c1cf12e92d5cc1c74b235a76baeb3b2be47044dd81c703e59fea199268094b34e98f85bb83d3c8b4e58ae98221bd7449e72e30f5392104e6ac0aaa72c75bccd
+  metadata.gz: b22a9b8d9e6b612406ab06a1d8fc86e8ad9e6305a8f1d222d7dc36a08f72cf95d911445ab5e2c1d852714f565b8d8758b6f3c2b3a1ebb1e62199a11f1a4880cb
+  data.tar.gz: c5766eb8d166b5311189ede79a26e21b5d55155199f24f995a763c9ddcc6540a5973bf360e1f5edb6ed75959085661f597e81946102a04b9022ad2ada48f5a61

data/lib/graphiform/fields.rb

@@ -26,6 +26,11 @@ module Graphiform
         name,
         type: nil,
         required: false,
+        write_prepare: nil,
+        prepare: nil,
+        description: nil,
+        default_value: ::GraphQL::Schema::Argument::NO_DEFAULT,
+        as: nil,
         **_options
       )
         name = name.to_sym
@@ -34,8 +39,17 @@ module Graphiform
 
         return Helpers.logger.warn "Graphiform: Missing `type` for argument #{name}" if argument_type.nil?
 
+        prepare = write_prepare || prepare
+
         graphql_input.class_eval do
-          argument argument_name, argument_type, required: required
+          argument \
+            argument_name,
+            argument_type,
+            required: required,
+            prepare: prepare,
+            description: description,
+            default_value: default_value,
+            as: as
         end
       end
 
@@ -79,7 +93,7 @@ module Graphiform
       end
 
       def graphql_resolve_argument_type(name, type)
-        return type if type.present?
+        return Helpers.graphql_type(type) if type.present?
 
         column_def = column(name)
 
@@ -160,9 +174,24 @@ module Graphiform
         end
       end
 
-      def graphql_add_field_to_type(field_name, type, null = nil)
+      def graphql_add_field_to_type(
+        field_name,
+        type,
+        null = nil,
+        description: nil,
+        deprecation_reason: nil,
+        method: nil,
+        read_prepare: nil,
+        **_options
+      )
         field_name = field_name.to_sym
-        field_options = {}
+        field_options = {
+          description: description,
+          deprecation_reason: deprecation_reason,
+          method: method,
+        }
+
+        type = Helpers.graphql_type(type)
 
         if Helpers.resolver?(type)
           field_options[:resolver] = type
@@ -172,19 +201,21 @@ module Graphiform
         end
 
         graphql_type.class_eval do
-          field(field_name, **field_options)
+          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
         end
       end
 
-      def graphql_add_column_field(field_name, column_def, type: nil, null: nil, **_options)
+      def graphql_add_column_field(field_name, column_def, type: nil, null: nil, **options)
         type = :string if type.blank? && enum_attribute?(field_name)
-        type = Helpers.graphql_type(type || column_def.type)
+        type ||= column_def.type
         null = column_def.null if null.nil?
 
-        graphql_add_field_to_type(field_name, type, null)
+        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, **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"
@@ -204,20 +235,21 @@ module Graphiform
           graphql_add_field_to_type(
             "#{field_name}_connection",
             klass.graphql_create_resolver(association_def.name, graphql_connection),
-            false
+            false,
+            **options
           )
         end
 
         type = has_many ? klass.graphql_create_resolver(association_def.name, [klass.graphql_type]) : klass.graphql_type if type.nil?
         null = association_def.macro != :has_many if null.nil?
 
-        graphql_add_field_to_type(field_name, type, null)
+        graphql_add_field_to_type(field_name, type, null, **options)
       end
 
-      def graphql_add_method_field(field_name, type:, null: true, **_options)
+      def graphql_add_method_field(field_name, type:, null: true, **options)
         return Helpers.logger.warn "Graphiform: Missing `type` for field `#{field_name}` in model `#{name}`" if type.nil?
 
-        graphql_add_field_to_type(field_name, type, null)
+        graphql_add_field_to_type(field_name, type, null, **options)
       end
     end
   end

data/lib/graphiform/skeleton.rb

@@ -3,8 +3,6 @@ require 'graphiform/helpers'
 
 module Graphiform
   def self.create_skeleton
-    return if defined? @skeleton_created
-
     # Types
     Helpers.get_const_or_create('Types') do
       Module.new
@@ -89,7 +87,5 @@ module Graphiform
         value 'DESC', 'Sort results in descending order'
       end
     end
-
-    @skeleton_created = true
   end
 end

data/lib/graphiform/version.rb

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

data/lib/graphiform.rb

@@ -8,9 +8,9 @@ require 'graphiform/fields'
 
 module Graphiform
   def self.included(base)
-    base.class_eval do
-      Graphiform.create_skeleton
+    Graphiform.create_skeleton
 
+    base.class_eval do
       include Scopiform
 
       include Graphiform::ActiveRecordHelpers

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphiform
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - jayce.pulsipher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-17 00:00:00.000000000 Z
+date: 2020-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: spy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement