graphql 1.5.14 → 1.5.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52c3a037cffdd261304a07f17e427b35de5d7806
-  data.tar.gz: '081c7064bb76ddb0b3829a4efb3f0c3c6a91337c'
+  metadata.gz: 75e66219aaa22753f69fb7bef629535bd80e987e
+  data.tar.gz: dac5274307d3d472f739daf07c9daca74f010af4
 SHA512:
-  metadata.gz: e579bc6f36376d75b2760de68da8dd7d22623993977d295d6656021dda740a02df6241e32c04c71ff2c18963b16a183c3f3dc286628ca414a800d3d619bc0947
-  data.tar.gz: 90096a42e99d15a6a492b93a8ebb65bf01bf213335950c8c13274f356715ab1fac8958b06dc562f6a0dae857ffabdb2c9976f0b43eec741aa449925f32107071
+  metadata.gz: 5161c7c97fc9ffe14db133ad61099addfea4ccf94eba8bc0f2ff56e1e6cb541740018fed81644292915a76ccebd9640f2b22d7a81fb3a41d60c6a7a377b45a9a
+  data.tar.gz: 4ec7454191f5c7bf67aef5459bcfaeae1184c5968265a5f15b3e453827586b9a61d9783059aefcfc3df6285dec3ca7eb2445399123f9c9fee26012fb5a9621f2

data/lib/graphql.rb

@@ -3,9 +3,26 @@ require "delegate"
 require "json"
 require "set"
 require "singleton"
-require "forwardable"
 
 module GraphQL
+  # Ruby stdlib was pretty busted until this fix:
+  # https://github.com/ruby/ruby/commit/46c0e79bb5b96c45c166ef62f8e585f528862abb#diff-43adf0e587a50dbaf51764a262008d40
+  module Delegate
+    def def_delegators(accessor, *method_names)
+      method_names.each do |method_name|
+        class_eval <<-RUBY
+        def #{method_name}(*args)
+          if block_given?
+            #{accessor}.#{method_name}(*args, &Proc.new)
+          else
+            #{accessor}.#{method_name}(*args)
+          end
+        end
+        RUBY
+      end
+    end
+  end
+
   class Error < StandardError
   end
 

data/lib/graphql/analysis/query_complexity.rb

@@ -70,7 +70,7 @@ module GraphQL
       # Find the maximum possible complexity among those combinations.
       class TypeComplexity
         def initialize
-          @types = Hash.new { |h, k| h[k] = 0 }
+          @types = Hash.new(0)
         end
 
         # Return the max possible complexity for types in this selection

data/lib/graphql/execution/lazy.rb

@@ -40,9 +40,9 @@ module GraphQL
       end
 
       # @return [Lazy] A {Lazy} whose value depends on another {Lazy}, plus any transformations in `block`
-      def then(&block)
+      def then
         self.class.new {
-          block.call(value)
+          yield(value)
         }
       end
     end

data/lib/graphql/execution/lazy/resolve.rb

@@ -14,8 +14,10 @@ module GraphQL
 
         def self.resolve_in_place(value)
           lazies = []
+          acc = []
+          each_lazy(acc, value)
 
-          each_lazy(value) do |field_result|
+          acc.each do |field_result|
             inner_lazy = field_result.value.then do |inner_v|
               field_result.value = inner_v
               resolve_in_place(inner_v)
@@ -26,25 +28,26 @@ module GraphQL
           Lazy.new { lazies.map(&:value) }
         end
 
-        # If `value` is a collection, call `block`
-        # with any {Lazy} instances in the collection
+        # If `value` is a collection,
+        # add any {Lazy} instances in the collection
+        # to `acc`
         # @return [void]
-        def self.each_lazy(value, &block)
+        def self.each_lazy(acc, value)
           case value
           when SelectionResult
             value.each do |key, field_result|
-              each_lazy(field_result, &block)
+              each_lazy(acc, field_result)
             end
           when Array
             value.each do |field_result|
-              each_lazy(field_result, &block)
+              each_lazy(acc, field_result)
             end
           when FieldResult
             field_value = value.value
             if field_value.is_a?(Lazy)
-              yield(value)
+              acc << value
             else
-              each_lazy(field_value, &block)
+              each_lazy(acc, field_value)
             end
           end
         end

data/lib/graphql/internal_representation/node.rb

@@ -2,6 +2,8 @@
 module GraphQL
   module InternalRepresentation
     class Node
+      # @api private
+      DEFAULT_TYPED_CHILDREN = Proc.new { |h, k| h[k] = {} }
       # @return [String] the name this node has in the response
       attr_reader :name
 
@@ -15,7 +17,7 @@ module GraphQL
       # @return [Hash<GraphQL::ObjectType, Hash<String => Node>>]
       def typed_children
         @typed_childen ||= begin
-          new_tc = Hash.new { |h, k| h[k] = {} }
+          new_tc = Hash.new(&DEFAULT_TYPED_CHILDREN)
           if @scoped_children.any?
             all_object_types = Set.new
             scoped_children.each_key { |t| all_object_types.merge(@query.possible_types(t)) }

data/lib/graphql/query.rb

@@ -14,7 +14,7 @@ require "graphql/query/validation_pipeline"
 module GraphQL
   # A combination of query string and {Schema} instance which can be reduced to a {#result}.
   class Query
-    extend Forwardable
+    extend GraphQL::Delegate
 
     class OperationNameMissingError < GraphQL::ExecutionError
       def initialize(name)

data/lib/graphql/query/arguments.rb

@@ -5,7 +5,7 @@ module GraphQL
     #
     # {Arguments} recursively wraps the input in {Arguments} instances.
     class Arguments
-      extend Forwardable
+      extend GraphQL::Delegate
 
       def initialize(values, argument_definitions:)
         @original_values = values
@@ -22,13 +22,15 @@ module GraphQL
       # @param key [String, Symbol] name or index of value to access
       # @return [Object] the argument at that key
       def [](key)
-        @argument_values.fetch(key.to_s, NULL_ARGUMENT_VALUE).value
+        key_s = key.is_a?(String) ? key : key.to_s
+        @argument_values.fetch(key_s, NULL_ARGUMENT_VALUE).value
       end
 
       # @param key [String, Symbol] name of value to access
       # @return [Boolean] true if the argument was present in this field
       def key?(key)
-        @argument_values.key?(key.to_s)
+        key_s = key.is_a?(String) ? key : key.to_s
+        @argument_values.key?(key_s)
       end
 
       # Get the original Ruby hash

data/lib/graphql/query/arguments_cache.rb

@@ -5,11 +5,14 @@ module GraphQL
       # @return [Hash<InternalRepresentation::Node, GraphQL::Language::NodesDirectiveNode => Hash<GraphQL::Field, GraphQL::Directive => GraphQL::Query::Arguments>>]
       def self.build(query)
         Hash.new do |h1, irep_or_ast_node|
-          Hash.new do |h2, definition|
+          h1[irep_or_ast_node] = Hash.new do |h2, definition|
             ast_node = irep_or_ast_node.is_a?(GraphQL::InternalRepresentation::Node) ? irep_or_ast_node.ast_node : irep_or_ast_node
             ast_arguments = ast_node.arguments
-            if ast_arguments.none?
-              definition.default_arguments
+
+            h2[definition] = if ast_arguments.none?
+                definition.default_arguments
+            elsif definition.arguments.none?
+              GraphQL::Query::Arguments::NO_ARGS
             else
               GraphQL::Query::LiteralInput.from_arguments(
                 ast_arguments,

data/lib/graphql/query/context.rb

@@ -72,7 +72,7 @@ module GraphQL
       end
 
       class FieldResolutionContext
-        extend Forwardable
+        extend GraphQL::Delegate
 
         attr_reader :path, :selection, :field, :parent_type
 

data/lib/graphql/query/variables.rb

@@ -3,7 +3,7 @@ module GraphQL
   class Query
     # Read-only access to query variables, applying default values if needed.
     class Variables
-      extend Forwardable
+      extend GraphQL::Delegate
 
       # @return [Array<GraphQL::Query::VariableValidationError>]  Any errors encountered when parsing the provided variables and literal values
       attr_reader :errors

data/lib/graphql/relay/base_connection.rb

@@ -26,16 +26,14 @@ module GraphQL
         # @return [subclass of BaseConnection] a connection Class for wrapping `nodes`
         def connection_for_nodes(nodes)
           # Check for class _names_ because classes can be redefined in Rails development
-          ancestor_names = nodes.class.ancestors.map(&:name)
-          implementation_class_name = ancestor_names.find do |ancestor_class_name|
-            CONNECTION_IMPLEMENTATIONS.include? ancestor_class_name
-          end
-
-          if implementation_class_name.nil?
-            raise("No connection implementation to wrap #{nodes.class} (#{nodes})")
-          else
-            CONNECTION_IMPLEMENTATIONS[implementation_class_name]
+          nodes.class.ancestors.each do |ancestor|
+            conn_impl = CONNECTION_IMPLEMENTATIONS[ancestor.name]
+            if conn_impl
+              return conn_impl
+            end
           end
+          # Should have found a connection during the loop:
+          raise("No connection implementation to wrap #{nodes.class} (#{nodes})")
         end
 
         # Add `connection_class` as the connection wrapper for `nodes_class`

data/lib/graphql/schema/middleware_chain.rb

@@ -5,7 +5,7 @@ module GraphQL
     #
     # Steps should call `next_step.call` to continue the chain, or _not_ call it to stop the chain.
     class MiddlewareChain
-      extend Forwardable
+      extend GraphQL::Delegate
 
       # @return [Array<#call(*args)>] Steps in this chain, will be called with arguments and `next_middleware`
       attr_reader :steps, :final_step

data/lib/graphql/schema/type_map.rb

@@ -8,7 +8,7 @@ module GraphQL
     #
     # If you want a type, but want to handle the undefined case, use {#fetch}.
     class TypeMap
-      extend Forwardable
+      extend GraphQL::Delegate
       def_delegators :@storage, :key?, :keys, :values, :to_h, :fetch, :each, :each_value
 
       def initialize

data/lib/graphql/static_validation/definition_dependencies.rb

@@ -103,7 +103,7 @@ module GraphQL
       end
 
       class NodeWithPath
-        extend Forwardable
+        extend GraphQL::Delegate
         attr_reader :node, :path
         def initialize(node, path)
           @node = node

data/lib/graphql/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 1.5.14
+  version: 1.5.15
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-27 00:00:00.000000000 Z
+date: 2017-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: benchmark-ips