graphiform 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6bde49d1fc203265aee73785f6ff23308b5d2098259dd7bbc762dc0a8c16322
-  data.tar.gz: 061af2e25afdf9dad9fdedab5847212e3b7005c36290dfcbccdc73b085dd1588
+  metadata.gz: 5ad540c4e174f075ab85b85f40e4dd63ebb4568ff0617b3c5dd6785410f55c63
+  data.tar.gz: a6b5a49c31a806ff942a87fef6ef4d1554f2cb9fc9867ad442f99501fc736025
 SHA512:
-  metadata.gz: 0df7c307f8fbaa68fa1a33ee60d9c364603dbd911cb3726fc20073cf1bb9decaf1809387f5048fa080cd4abb6908f51fd744c769cbbb5f8c1e88db7fe631a7a7
-  data.tar.gz: df1bc69c8e412ae66be318d65c5574fef2cf1d5d2371a98ddd1293a6ceea9e7b4ac6e3bcd794b1660e8c7a6e7fbe26aa97737b723e5f4d3d5b22ad256e42e8ee
+  metadata.gz: 2bb21cd22cdcecb06d9ff58c32ba0697cecf604bc8a0eb162fe846d0cd37dec604c082bd3d39bc744f8f418372629b7883d71da2e8cf5fc35bfe68e8a26b2639
+  data.tar.gz: d2abcff1ee1e4dd8e2b7703b5d73864082ce554895e0b6d34fc118afb2b11d942789de11af26410b6c82230dcfd71a1a96d22f7503dd3f3d7b46dc5a209bd324

data/lib/graphiform/core.rb

@@ -76,8 +76,38 @@ module Graphiform
         unless defined? @base_resolver
           @base_resolver = Helpers.get_const_or_create(demodulized_name, ::Resolvers) do
             Class.new(::Resolvers::BaseResolver) do
-              # Default resolver just returns the object to prevent exceptions
-              define_method :resolve do |**_args|
+              attr_reader :value
+
+              class << self
+                attr_accessor :addon_resolve_blocks
+              end
+
+              def self.addon_resolve(&block)
+                @addon_resolve_blocks ||= []
+                @addon_resolve_blocks << block
+              end
+
+              def resolve(**args)
+                @value = base_resolve(**args)
+
+                if self.class.addon_resolve_blocks.present? && !self.class.addon_resolve_blocks.empty?
+                  self.class.addon_resolve_blocks.each do |addon_resolve_block|
+                    @value = instance_exec(**args, &addon_resolve_block)
+                  end
+                end
+
+                @value
+              end
+
+              def apply_built_ins(where: nil, sort: nil, **)
+                @value = @value.apply_filters(where.to_h) if where.present? && @value.respond_to?(:apply_filters)
+                @value = @value.apply_sorts(sort.to_h) if sort.present? && @value.respond_to?(:apply_sorts)
+
+                @value
+              end
+
+              # Default resolver - meant to be overridden
+              def base_resolve(**)
                 object
               end
             end
@@ -86,7 +116,14 @@ module Graphiform
           local_graphql_filter = graphql_filter
           local_graphql_sort = graphql_sort
 
+          model = self
           @base_resolver.class_eval do
+            unless respond_to?(:model)
+              define_method :model do
+                model
+              end
+            end
+
             argument :where, local_graphql_filter, required: false
             argument :sort, local_graphql_sort, required: false unless local_graphql_sort.arguments.empty?
           end
@@ -97,16 +134,14 @@ module Graphiform
 
       def graphql_query
         Helpers.get_const_or_create(demodulized_name, ::Resolvers::Queries) do
-          model = self
           local_graphql_type = graphql_type
           Class.new(graphql_base_resolver) do
             type local_graphql_type, null: false
 
-            define_method :resolve do |where: nil|
-              val = model.all
-              val = val.apply_filters(where.to_h) if where.present? && val.respond_to?(:apply_filters)
-
-              val.first
+            def base_resolve(**args)
+              @value = model.all
+              apply_built_ins(**args)
+              @value.first
             end
           end
         end
@@ -114,37 +149,29 @@ module Graphiform
 
       def graphql_connection_query
         Helpers.get_const_or_create(demodulized_name, ::Resolvers::ConnectionQueries) do
-          model = self
           connection_type = graphql_connection
           Class.new(graphql_base_resolver) do
             type connection_type, null: false
 
-            define_method :resolve do |where: nil, sort: nil|
-              val = model.all
-              val = val.apply_filters(where.to_h) if where.present? && val.respond_to?(:apply_filters)
-              val = val.apply_sorts(sort.to_h) if sort.present? && val.respond_to?(:apply_sorts)
-
-              val
+            def base_resolve(**args)
+              @value = model.all
+              apply_built_ins(**args)
             end
           end
         end
       end
 
-      def graphql_create_resolver(method_name, resolver_type = graphql_type, read_prepare: nil, **_options)
+      def graphql_create_resolver(method_name, resolver_type = graphql_type, read_prepare: nil, **)
         Class.new(graphql_base_resolver) do
           type resolver_type, null: false
 
-          define_method :resolve do |where: nil, **args|
-            where_hash = where.to_h
-
-            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
+          define_method :base_resolve do |**args|
+            @value = object
 
-            return val.apply_filters(where_hash) if val.respond_to? :apply_filters
+            @value = @value.public_send(method_name) if @value.respond_to?(method_name)
+            @value = instance_exec(@value, context, &read_prepare) if read_prepare
 
-            val
+            apply_built_ins(**args)
           end
         end
       end

data/lib/graphiform/fields.rb

@@ -261,7 +261,7 @@ module Graphiform
         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)
+      def graphql_add_method_field(field_name, type: nil, 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, **options)

data/lib/graphiform/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphiform
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - jayce.pulsipher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-19 00:00:00.000000000 Z
+date: 2020-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord