graphql 1.9.1 → 1.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31138f73214b24b895b8717ef50dcc39c61c6e45
-  data.tar.gz: 1c105034b3b21b0dd732e1143acbf54538fc54ef
+  metadata.gz: dfc72228ed2ce65697195792c7e58ff2c061435d
+  data.tar.gz: 2ab1fa5308bb89c21319558620a705f5e58fbbdb
 SHA512:
-  metadata.gz: fc6e63617dc34dd096a3b279ec3f2a2f476f3a8032bfcf4008bccc9e6c3f1c3f45e23d0d43e2dc0b7798376424e2f196ee71e65cd365cb89c9384a89b6e1c39e
-  data.tar.gz: 07cbfa84015057a980b90820470e721352db0f42f85ab985312e01787328f0fef448ac6d774e08a625c88388246f5276352da72514be18f1e24c6468f5438f9d
+  metadata.gz: 650ef5ae621e294c2a5242206a0158d58970d40dfe5bace0f863a15e59a533324e2b2c623b7df0b089c2ffa8ebcc0b445b43fe5e3b6c0bb018a9a5a732c74fa2
+  data.tar.gz: 66d3f0113edbcf6562f9a430c59ae569bff7a9f444ced9c5e6fa2eb11a9095f192d57016126c0a69334cf6c58c8f23bffa2a5bafd83214453c205876d8a8e9f9

data/lib/graphql/schema/field.rb

@@ -277,15 +277,6 @@ module GraphQL
           # Read the value
           @extensions
         else
-          if @resolve || @function
-            raise ArgumentError, <<-MSG
-Extensions are not supported with resolve procs or functions,
-but #{owner.name}.#{name} has: #{@resolve || @function}
-So, it can't have extensions: #{extensions}.
-Use a method or a Schema::Resolver instead.
-MSG
-          end
-
           # Normalize to a Hash of {name => options}
           extensions_with_options = if new_extensions.last.is_a?(Hash)
             new_extensions.pop
@@ -454,12 +445,16 @@ MSG
           # @see https://github.com/rmosolgo/graphql-ruby/issues/1990 before removing
           inner_obj = after_obj && after_obj.object
           if authorized?(inner_obj, query_ctx)
+            ruby_args = to_ruby_args(after_obj, args, ctx)
             # Then if it passed, resolve the field
             if @resolve_proc
               # Might be nil, still want to call the func in that case
-              @resolve_proc.call(inner_obj, args, ctx)
+              with_extensions(inner_obj, ruby_args, query_ctx) do |extended_obj, extended_args|
+                # Pass the GraphQL args here for compatibility:
+                @resolve_proc.call(extended_obj, args, ctx)
+              end
             else
-              public_send_field(after_obj, args, ctx)
+              public_send_field(after_obj, ruby_args, ctx)
             end
           else
             err = GraphQL::UnauthorizedFieldError.new(object: inner_obj, type: obj.class, context: ctx, field: self)
@@ -568,7 +563,13 @@ MSG
 
       NO_ARGS = {}.freeze
 
-      def public_send_field(obj, graphql_args, field_ctx)
+      # Convert a GraphQL arguments instance into a Ruby-style hash.
+      #
+      # @param obj [GraphQL::Schema::Object] The object where this field is being resolved
+      # @param graphql_args [GraphQL::Query::Arguments]
+      # @param field_ctx [GraphQL::Query::Context::FieldResolutionContext]
+      # @return [Hash<Symbol => Any>]
+      def to_ruby_args(obj, graphql_args, field_ctx)
         if graphql_args.any? || @extras.any?
           # Splat the GraphQL::Arguments to Ruby keyword arguments
           ruby_kwargs = graphql_args.to_kwargs
@@ -583,10 +584,14 @@ MSG
           @extras.each do |extra_arg|
             ruby_kwargs[extra_arg] = fetch_extra(extra_arg, field_ctx)
           end
+
+          ruby_kwargs
         else
-          ruby_kwargs = NO_ARGS
+          NO_ARGS
         end
+      end
 
+      def public_send_field(obj, ruby_kwargs, field_ctx)
         query_ctx = field_ctx.query.context
         with_extensions(obj, ruby_kwargs, query_ctx) do |extended_obj, extended_args|
           if @resolver_class

data/lib/graphql/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module GraphQL
-  VERSION = "1.9.1"
+  VERSION = "1.9.2"
 end

data/spec/graphql/execution/lazy_spec.rb

@@ -10,6 +10,13 @@ describe GraphQL::Execution::Lazy do
       assert_equal 3, res["data"]["int"]
     end
 
+    it "Works with Query.new" do
+      query_str = '{ int(value: 2, plus: 1) }'
+      query = GraphQL::Query.new(LazyHelpers::LazySchema, query_str)
+      res =  query.result
+      assert_equal 3, res["data"]["int"]
+    end
+
     it "can do nested lazy values" do
       res = run_query %|
       {

data/spec/graphql/schema/member/scoped_spec.rb

@@ -57,8 +57,17 @@ describe GraphQL::Schema::Member::Scoped do
         resolver_method: :items
       field :french_items, [FrenchItem], null: false,
         resolver_method: :items
-      field :items_connection, Item.connection_type, null: false,
-        resolver_method: :items
+      if TESTING_INTERPRETER
+        field :items_connection, Item.connection_type, null: false,
+          resolver_method: :items
+      else
+        field :items_connection, Item.connection_type, null: false, resolve: ->(obj, args, ctx) {
+          [
+            OpenStruct.new(name: "Trombone"),
+            OpenStruct.new(name: "Paperclip"),
+          ]
+        }
+      end
 
       def items
         [
@@ -67,9 +76,20 @@ describe GraphQL::Schema::Member::Scoped do
         ]
       end
 
-      field :things, [Thing], null: false
-      def things
-        items + [OpenStruct.new(name: "Turbine")]
+      if TESTING_INTERPRETER
+        field :things, [Thing], null: false
+        def things
+          items + [OpenStruct.new(name: "Turbine")]
+        end
+      else
+        # Make sure it works with resolve procs, too
+        field :things, [Thing], null: false, resolve: ->(obj, args, ctx) {
+          [
+            OpenStruct.new(name: "Trombone"),
+            OpenStruct.new(name: "Paperclip"),
+            OpenStruct.new(name: "Turbine"),
+          ]
+        }
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 1.9.1
+  version: 1.9.2
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-13 00:00:00.000000000 Z
+date: 2019-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: benchmark-ips