graphql-rails-resolver 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4802edf51d5ea4c2043d10cc1e29ff9d930858dd
-  data.tar.gz: abf71b37eba930aa6bfefe4da6131f02bbb63778
+  metadata.gz: 4113268e7739312f6ac4f42a9eb6ae4b9f70684a
+  data.tar.gz: e2c711048172d3fdbe2260b236d09118f44c69b5
 SHA512:
-  metadata.gz: bab237537b6ea196e591814c9f3619f70e5bdad8f7add230d89044d48b3630fcbd77614e301f58763d0ab513a0412fba96ef73dfbf7f2eb5a3aa1099c6617ab1
-  data.tar.gz: 00dee9f38720c70838b5cf33309dfeb3dd11689988249967a16f7bfb1c2c90046c38a694dd2db5410ee50d69c528be6d3e7ab9719d3fbc8fa6080ea8a8f56f90
+  metadata.gz: 0bce6833bfc2057460610600a79f538e76b52d0340abf018ff3ace056a0bcf3e2f72d5b167d10903ae76139b9be6e1c714f6364dbe34b710988408ad3dd20f44
+  data.tar.gz: adf079f574b375f4ea02aa83b86191fb73748910cd24d14fbbe39651a3ee8b0f8607be5a4f0d6ca0c5b9bd20b71f01293affcc6a8bd44d062b8ab38cb23df8ab

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 # GraphQL::Rails::Resolver
 ## CHANGELOG
 
+### Version 0.2.4
+Adds ID resolution for non-primary ID field arguments
+Adds `get_field_args` to get type declarations for arguments
+Adds `get_arg_type`, `is_field_id_type?`, and `is_arg_id_type?`
+
 ### Version 0.2.2
 Fixed arguments to :scope resolution
 

data/lib/graphql/rails/resolver.rb

@@ -1,7 +1,7 @@
 module GraphQL
   module Rails
     class Resolver
-      VERSION = '0.2.3'
+      VERSION = '0.2.4'
 
       attr_accessor :resolvers
 
@@ -26,13 +26,13 @@ module GraphQL
         @result = @callable.call(obj, args, ctx)
 
         # If there's an ID type, offer ID resolution_strategy
-        if has_id_argument and args.key? @id_field
+        if has_id_argument? and args.key? @id_field
           @result = resolve_id(args[@id_field])
         end
 
-        @resolvers.each do |field,resolvers|
-          if args.key? field
-            value = args[field]
+        @resolvers.each do |arg,resolvers|
+          if args.key? arg
+            value = args[arg]
 
             resolvers.each do |method, params|
               # Match scopes
@@ -62,16 +62,20 @@ module GraphQL
                   raise ArgumentError, "Unable to resolve parameter of type #{method.class} in #{self}"
                 end
               elsif params.size < 1
-                if self.respond_to? field and params[:where].present? == false
-                  @result = send(field, value)
-                elsif @result.respond_to? field and params[:where].present? == false
-                  @result = @result.send(field, value)
+                if is_arg_id_type? arg
+                  value = resolve_id(value)
+                end
+
+                if self.respond_to? arg and params[:where].present? == false
+                  @result = send(arg, value)
+                elsif @result.respond_to? arg and params[:where].present? == false
+                  @result = @result.send(arg, value)
                 else
                   attribute =
                     if params[:where].present?
                       params[:where]
                     else
-                      field
+                      arg
                     end
 
                   hash = {}
@@ -79,7 +83,7 @@ module GraphQL
                   @result = @result.where(hash)
                 end
               else
-                raise ArgumentError, "Unable to resolve field #{field} in #{self}"
+                raise ArgumentError, "Unable to resolve argument #{arg} in #{self}"
               end
             end
           end
@@ -107,12 +111,11 @@ module GraphQL
         @ctx.ast_node.name
       end
 
-      def has_id_argument
+      def has_id_argument?
         @ctx.irep_node.definitions.any? do |type_defn, field_defn|
           if field_defn.name === field_name
             field_defn.arguments.any? do |k,v|
-              v.type == ::GraphQL::ID_TYPE or
-              (v.type.kind == ::GraphQL::TypeKinds::LIST and v.type.of_type == ::GraphQL::ID_TYPE)
+              is_field_id_type?(v.type)
             end
           else
             false
@@ -120,9 +123,14 @@ module GraphQL
         end
       end
 
+      def has_id_argument
+        warn "[DEPRECATION] `has_id_argument` is deprecated.  Please use `has_id_argument?` instead."
+        has_id_argument?
+      end
+
       def has_id_field
         warn "[DEPRECATION] `has_id_field` is deprecated.  Please use `has_id_argument` instead."
-        has_id_argument
+        has_id_argument?
       end
 
       def connection?
@@ -133,6 +141,24 @@ module GraphQL
         @ctx.irep_node.definitions.all? { |type_defn, field_defn| field_defn.type.kind.eql?(GraphQL::TypeKinds::LIST) }
       end
 
+      def get_field_args
+        @ctx.irep_node.parent.return_type.get_field(@ctx.irep_node.definition_name).arguments
+      end
+
+      def get_arg_type(key)
+        args = get_field_args
+        args[key].type
+      end
+
+      def is_field_id_type?(field)
+         field == ::GraphQL::ID_TYPE or
+              (field.kind == ::GraphQL::TypeKinds::LIST and field.of_type == ::GraphQL::ID_TYPE)
+      end
+
+      def is_arg_id_type?(key)
+         is_field_id_type?(get_arg_type(key))
+      end
+
       def model
         unless self.class < Resolvers::Base
           raise ArgumentError, "Cannot call `model` on BaseResolver"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql-rails-resolver
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Cole Turner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-06 00:00:00.000000000 Z
+date: 2016-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql