graphql 0.18.1 → 0.18.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4320e19052975ac0ba38fac054d7d56d044657e1
-  data.tar.gz: 2045f552c2acd454a57f4c0ec80f9547f7c6b875
+  metadata.gz: c25c28ed78a94aead6ff0547d559c15b3c00c01f
+  data.tar.gz: 81c73c51e31e934391e9da8daa3d6915acaccb67
 SHA512:
-  metadata.gz: 0db74452c453b954039a685aaa25ad875325de13c0f7eb152dd4ff09a139048b73c83ce637cc84b7824ffb4311ce1de0041b671444a4a208131bb49ed71c6dc9
-  data.tar.gz: bf2b4faf5545b8d13ee5ab3b370e9ea4ab4954e40f458a87b2551bf666e97e4d27270b618b2644b1cdc56f48d7681b48edf3ac74171ce9cc37d113a6bff5d7d6
+  metadata.gz: 3189f4d3b79efdf1082168bcf338159f6a89f04ba0c51d78ca35e64a1284438b08b3424d181db23d8e01c3505fa83cb8c915dc9d8a419cb1d91dbe0af0166d06
+  data.tar.gz: f1a2c37b55214c42258b3f708d15a1dbe33d5bb0e01a8333d0818e494a96319f92d7e942c6efb71591596eafbd9c8e6f108042b928ea1c5631c295c483f86886

data/lib/graphql.rb

@@ -70,3 +70,4 @@ require "graphql/internal_representation"
 require "graphql/static_validation"
 require "graphql/version"
 require "graphql/relay"
+require "graphql/execution"

data/lib/graphql/analysis/query_complexity.rb

@@ -32,11 +32,11 @@ module GraphQL
             memo[:complexities_on_type].push(TypeComplexity.new)
           else
             type_complexities = memo[:complexities_on_type].pop
-            own_complexity = if GraphQL::Query::DirectiveResolution.include_node?(irep_node, memo[:query])
+            own_complexity = if GraphQL::Execution::DirectiveChecks.skip?(irep_node, memo[:query])
+              0
+            else
               child_complexity = type_complexities.max_possible_complexity
               get_complexity(irep_node, memo[:query], child_complexity)
-            else
-              0
             end
             memo[:complexities_on_type].last.merge(irep_node.definitions, own_complexity)
           end

data/lib/graphql/analysis/query_depth.rb

@@ -29,13 +29,13 @@ module GraphQL
               memo[:skip_current_scope] = true
             elsif memo[:skip_current_scope]
               # we're inside an introspection query
-            elsif GraphQL::Query::DirectiveResolution.include_node?(irep_node, memo[:query])
+            elsif GraphQL::Execution::DirectiveChecks.include?(irep_node, memo[:query])
               memo[:current_depth] += 1
             end
           else
             if GraphQL::Schema::DYNAMIC_FIELDS.include?(irep_node.definition_name)
               memo[:skip_current_scope] = false
-            elsif GraphQL::Query::DirectiveResolution.include_node?(irep_node, memo[:query])
+            elsif GraphQL::Execution::DirectiveChecks.include?(irep_node, memo[:query])
               if memo[:max_depth] < memo[:current_depth]
                 memo[:max_depth] = memo[:current_depth]
               end

data/lib/graphql/execution.rb

@@ -0,0 +1,2 @@
+require "graphql/execution/directive_checks"
+require "graphql/execution/typecast"

data/lib/graphql/execution/directive_checks.rb

@@ -0,0 +1,32 @@
+module GraphQL
+  module Execution
+    # Boolean checks for how an AST node's directives should
+    # influence its execution
+    module DirectiveChecks
+      SKIP = "skip"
+      INCLUDE = "include"
+
+      module_function
+
+      # This covers `@include(if:)` & `@skip(if:)`
+      # @return [Boolean] Should this node be skipped altogether?
+      def skip?(irep_node, query)
+        irep_node.directives.each do |directive_node|
+          if directive_node.name == SKIP || directive_node.name == INCLUDE
+            directive_defn = directive_node.definitions.first
+            args = query.arguments_for(directive_node, directive_defn)
+            if !directive_defn.include?(args)
+              return true
+            end
+          end
+        end
+        false
+      end
+
+      # @return [Boolean] Should this node be included in the query?
+      def include?(irep_node, query)
+        !skip?(irep_node, query)
+      end
+    end
+  end
+end

data/lib/graphql/execution/typecast.rb

@@ -0,0 +1,33 @@
+module GraphQL
+  module Execution
+    # GraphQL object `{value, type}` can be cast to `other_type` when:
+    # - `type == other_type`
+    # - `type` is a union and it resolves `value` to `other_type`
+    # - `other_type` is a union and `type` is a member
+    # - `type` is an interface and it resolves `value` to `other_type`
+    # - `other_type` is an interface and `type` implements that interface
+    module Typecast
+      # While `value` is exposed by GraphQL as an instance of `current_type`,
+      # should it _also_ be treated as an instance of `potential_type`?
+      #
+      # This is used for checking whether fragments apply to an object.
+      #
+      # @return [Boolean] Can `value` be evaluated as a `potential_type`?
+      def self.compatible?(value, current_type, potential_type, query_ctx)
+        if potential_type == current_type
+          true
+        elsif current_type.kind.union?
+          current_type.resolve_type(value, query_ctx) == potential_type
+        elsif potential_type.kind.union?
+          potential_type.include?(current_type)
+        elsif current_type.kind.interface?
+          current_type.resolve_type(value, query_ctx) == potential_type
+        elsif potential_type.kind.interface?
+          current_type.interfaces.include?(potential_type)
+        else
+          false
+        end
+      end
+    end
+  end
+end

data/lib/graphql/query.rb

@@ -1,3 +1,12 @@
+require "graphql/query/arguments"
+require "graphql/query/context"
+require "graphql/query/executor"
+require "graphql/query/literal_input"
+require "graphql/query/serial_execution"
+require "graphql/query/variables"
+require "graphql/query/input_validation_result"
+require "graphql/query/variable_validation_error"
+
 module GraphQL
   # A combination of query string and {Schema} instance which can be reduced to a {#result}.
   class Query
@@ -164,14 +173,3 @@ module GraphQL
     end
   end
 end
-
-require "graphql/query/arguments"
-require "graphql/query/context"
-require "graphql/query/directive_resolution"
-require "graphql/query/executor"
-require "graphql/query/literal_input"
-require "graphql/query/serial_execution"
-require "graphql/query/type_resolver"
-require "graphql/query/variables"
-require "graphql/query/input_validation_result"
-require "graphql/query/variable_validation_error"

data/lib/graphql/query/serial_execution.rb

@@ -1,3 +1,9 @@
+require "graphql/query/serial_execution/execution_context"
+require "graphql/query/serial_execution/value_resolution"
+require "graphql/query/serial_execution/field_resolution"
+require "graphql/query/serial_execution/operation_resolution"
+require "graphql/query/serial_execution/selection_resolution"
+
 module GraphQL
   class Query
     class SerialExecution
@@ -33,9 +39,3 @@ module GraphQL
     end
   end
 end
-
-require "graphql/query/serial_execution/execution_context"
-require "graphql/query/serial_execution/value_resolution"
-require "graphql/query/serial_execution/field_resolution"
-require "graphql/query/serial_execution/operation_resolution"
-require "graphql/query/serial_execution/selection_resolution"

data/lib/graphql/query/serial_execution/selection_resolution.rb

@@ -13,7 +13,7 @@ module GraphQL
 
         def result
           irep_node.children.each_with_object({}) do |(name, irep_node), memo|
-            if included_by_directives?(irep_node, execution_context.query) && applies_to_type?(irep_node, type, target)
+            if GraphQL::Execution::DirectiveChecks.include?(irep_node, execution_context.query) && applies_to_type?(irep_node, type, target)
               field_result = execution_context.strategy.field_resolution.new(
                 irep_node,
                 type,
@@ -27,13 +27,9 @@ module GraphQL
 
         private
 
-        def included_by_directives?(irep_node, query)
-          GraphQL::Query::DirectiveResolution.include_node?(irep_node, query)
-        end
-
         def applies_to_type?(irep_node, type, target)
           irep_node.definitions.any? { |child_type, field_defn|
-            GraphQL::Query::TypeResolver.new(target, child_type, type, execution_context.query.context).type
+            GraphQL::Execution::Typecast.compatible?(target, child_type, type, execution_context.query.context)
           }
         end
       end

data/lib/graphql/relay/base_connection.rb

@@ -53,17 +53,19 @@ module GraphQL
         deprecate(:connection_for_items, :connection_for_nodes, 2016, 9)
       end
 
-      attr_reader :nodes, :arguments, :max_page_size, :parent
+      attr_reader :nodes, :arguments, :max_page_size, :parent, :field
 
       # Make a connection, wrapping `nodes`
       # @param [Object] The collection of nodes
       # @param Query arguments
+      # @param field [Object] The underlying field
       # @param max_page_size [Int] The maximum number of results to return
       # @param parent [Object] The object which this collection belongs to
-      def initialize(nodes, arguments, max_page_size: nil, parent: nil)
+      def initialize(nodes, arguments, field:, max_page_size: nil, parent: nil)
         @nodes = nodes
         @arguments = arguments
         @max_page_size = max_page_size
+        @field = field
         @parent = parent
       end
 

data/lib/graphql/relay/connection_field.rb

@@ -33,7 +33,7 @@ module GraphQL
       def self.create(underlying_field, max_page_size: nil)
         underlying_field.arguments = DEFAULT_ARGUMENTS.merge(underlying_field.arguments)
         original_resolve = underlying_field.resolve_proc
-        underlying_field.resolve = GraphQL::Relay::ConnectionResolve.new(underlying_field.name, original_resolve, max_page_size: max_page_size)
+        underlying_field.resolve = GraphQL::Relay::ConnectionResolve.new(underlying_field, original_resolve, max_page_size: max_page_size)
         underlying_field
       end
     end

data/lib/graphql/relay/connection_resolve.rb

@@ -1,8 +1,8 @@
 module GraphQL
   module Relay
     class ConnectionResolve
-      def initialize(field_name, underlying_resolve, max_page_size: nil)
-        @field_name = field_name
+      def initialize(field, underlying_resolve, max_page_size: nil)
+        @field = field
         @underlying_resolve = underlying_resolve
         @max_page_size = max_page_size
       end
@@ -10,7 +10,7 @@ module GraphQL
       def call(obj, args, ctx)
         nodes = @underlying_resolve.call(obj, args, ctx)
         connection_class = GraphQL::Relay::BaseConnection.connection_for_nodes(nodes)
-        connection_class.new(nodes, args, max_page_size: @max_page_size, parent: obj)
+        connection_class.new(nodes, args, field: @field, max_page_size: @max_page_size, parent: obj)
       end
     end
   end

data/lib/graphql/schema/middleware.rb

@@ -0,0 +1,75 @@
+module GraphQL
+  class Schema
+    # - query_initialize
+    # - query_finalize
+    # - field_resolve
+    #
+    # @example Closing a socket when the query is finished
+    #   SocketClosingMiddleware = GraphQL::Schema::Middleware.define do
+    #     finalize_query -> (memo, env) {
+    #       query.context[:socket].close
+    #     }
+    #   end
+    #
+    # @example Timing a query
+    #   QueryTimerMiddleware = GraphQL::Schema::Middleware.define do
+    #     initialize_query -> (env) {
+    #       env.merge!({
+    #         query_start_time: Time.now,
+    #         field_times: [],
+    #       })
+    #     }
+    #
+    #     resolve_field -> (env) {
+    #       field_time = {
+    #         start_time: Time.now,
+    #         own_elapsed: nil,
+    #         child_elapsed: 0,
+    #       }
+    #
+    #       memo[:field_times] << field_time
+    #       memo
+    #     }
+    #
+    #     after_field { |memo, env|
+    #       field_time = memo[:field_times].pop
+    #       total_elapsed = Time.now - field_time[:start_time]
+    #       own_elapsed = total_elapsed - field_time[:child_elapsed]
+    #
+    #       field_name = "#{env[:parent_type].name}.#{env[:field_definition].name}(#{env[:arguments].to_h.to_json})"
+    #       Logger.info("[GraphQL Field] #{field_name} #{own_elapsed}")
+    #
+    #       parent_field_time = memo[:field_times].last
+    #       if parent_field_time
+    #         parent_field_time[:child_elapsed] += total_elapsed
+    #       end
+    #     }
+    #
+    #     after_query { |memo, env|
+    #       elapsed = Time.now - memo[:query_start_time]
+    #       Logger.info("[GraphQL Elapsed] #{elapsed}")
+    #     }
+    #   end
+    class Middleware
+      EVENTS = [:before_query, :after_query, :before_field, :after_field]
+      class << self
+        attr_reader :handlers
+        def handlers
+          @handlers ||= {}
+        end
+
+        def on(event_name, &handler)
+          if EVENTS.include?(event_name)
+            handlers[event_name] = handler
+          else
+            raise("Can't attach handler to #{event_name} (must be one of: #{EVENTS})")
+          end
+        end
+      end
+
+      def trigger(event_name, *args)
+        self.class.handlers[event_name].call(*args)
+      end
+    end
+  end
+end

data/lib/graphql/static_validation/rules/directives_are_defined.rb

@@ -15,6 +15,9 @@ module GraphQL
       def validate_directive(ast_directive, directive_names, context)
         if !directive_names.include?(ast_directive.name)
           context.errors << message("Directive @#{ast_directive.name} is not defined", ast_directive, context: context)
+          GraphQL::Language::Visitor::SKIP
+        else
+          nil
         end
       end
     end

data/lib/graphql/version.rb

@@ -1,3 +1,3 @@
 module GraphQL
-  VERSION = "0.18.1"
+  VERSION = "0.18.2"
 end

data/spec/graphql/relay/connection_type_spec.rb

@@ -8,6 +8,7 @@ describe GraphQL::Relay::ConnectionType do
           rebels {
             basesWithCustomEdge {
               totalCountTimes100
+              fieldName
               edges {
                 upcasedName
                 upcasedParentName
@@ -26,6 +27,7 @@ describe GraphQL::Relay::ConnectionType do
         result = query(query_string)
         bases = result["data"]["rebels"]["basesWithCustomEdge"]
         assert_equal 300, bases["totalCountTimes100"]
+        assert_equal 'basesWithCustomEdge', bases["fieldName"]
         assert_equal ["YAVIN", "ECHO BASE", "SECRET HIDEOUT"] , bases["edges"].map { |e| e["upcasedName"] }
         assert_equal ["Yavin", "Echo Base", "Secret Hideout"] , bases["edges"].map { |e| e["node"]["name"] }
         assert_equal ["CustomBaseEdge"] , bases["edges"].map { |e| e["edgeClassName"] }.uniq

data/spec/support/star_wars_schema.rb

@@ -77,6 +77,8 @@ CustomEdgeBaseConnectionType = BaseType.define_connection(edge_class: CustomBase
     type types.Int
     resolve -> (obj, args, ctx) { obj.nodes.count * 100 }
   end
+
+  field :fieldName, types.String, resolve: -> (obj, args, ctx) { obj.field.name }
 end
 
 Faction = GraphQL::ObjectType.define do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 0.18.1
+  version: 0.18.2
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-07 00:00:00.000000000 Z
+date: 2016-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
@@ -268,6 +268,9 @@ files:
 - lib/graphql/directive/include_directive.rb
 - lib/graphql/directive/skip_directive.rb
 - lib/graphql/enum_type.rb
+- lib/graphql/execution.rb
+- lib/graphql/execution/directive_checks.rb
+- lib/graphql/execution/typecast.rb
 - lib/graphql/execution_error.rb
 - lib/graphql/field.rb
 - lib/graphql/field/resolve.rb
@@ -315,7 +318,6 @@ files:
 - lib/graphql/query.rb
 - lib/graphql/query/arguments.rb
 - lib/graphql/query/context.rb
-- lib/graphql/query/directive_resolution.rb
 - lib/graphql/query/executor.rb
 - lib/graphql/query/input_validation_result.rb
 - lib/graphql/query/literal_input.rb
@@ -325,7 +327,6 @@ files:
 - lib/graphql/query/serial_execution/operation_resolution.rb
 - lib/graphql/query/serial_execution/selection_resolution.rb
 - lib/graphql/query/serial_execution/value_resolution.rb
-- lib/graphql/query/type_resolver.rb
 - lib/graphql/query/variable_validation_error.rb
 - lib/graphql/query/variables.rb
 - lib/graphql/relay.rb
@@ -345,6 +346,7 @@ files:
 - lib/graphql/schema.rb
 - lib/graphql/schema/catchall_middleware.rb
 - lib/graphql/schema/invalid_type_error.rb
+- lib/graphql/schema/middleware.rb
 - lib/graphql/schema/middleware_chain.rb
 - lib/graphql/schema/possible_types.rb
 - lib/graphql/schema/printer.rb
@@ -419,7 +421,6 @@ files:
 - spec/graphql/query/executor_spec.rb
 - spec/graphql/query/serial_execution/execution_context_spec.rb
 - spec/graphql/query/serial_execution/value_resolution_spec.rb
-- spec/graphql/query/type_resolver_spec.rb
 - spec/graphql/query/variables_spec.rb
 - spec/graphql/query_spec.rb
 - spec/graphql/relay/array_connection_spec.rb
@@ -525,7 +526,6 @@ test_files:
 - spec/graphql/query/executor_spec.rb
 - spec/graphql/query/serial_execution/execution_context_spec.rb
 - spec/graphql/query/serial_execution/value_resolution_spec.rb
-- spec/graphql/query/type_resolver_spec.rb
 - spec/graphql/query/variables_spec.rb
 - spec/graphql/query_spec.rb
 - spec/graphql/relay/array_connection_spec.rb

data/lib/graphql/query/directive_resolution.rb

@@ -1,16 +0,0 @@
-module GraphQL
-  class Query
-    module DirectiveResolution
-      def self.include_node?(irep_node, query)
-        irep_node.directives.each do |directive_node|
-          directive_defn = directive_node.definitions.first
-          args = query.arguments_for(directive_node, directive_defn)
-          if !directive_defn.include?(args)
-            return false
-          end
-        end
-        true
-      end
-    end
-  end
-end

data/lib/graphql/query/type_resolver.rb

@@ -1,25 +0,0 @@
-module GraphQL
-  class Query
-    # Given an object, a type name (from the query) and a type object,
-    # Return the type that should be used for `object`
-    # or Return `nil` if it's a mismatch
-    class TypeResolver
-      attr_reader :type
-      def initialize(target, child_type, parent_type, query_ctx)
-        @type = if child_type.nil?
-          nil
-        elsif parent_type.kind.union?
-          parent_type.resolve_type(target)
-        elsif child_type.kind.union? && child_type.include?(parent_type)
-          parent_type
-        elsif child_type.kind.interface?
-          child_type.resolve_type(target, query_ctx)
-        elsif child_type == parent_type
-          parent_type
-        else
-          nil
-        end
-      end
-    end
-  end
-end

data/spec/graphql/query/type_resolver_spec.rb

@@ -1,8 +0,0 @@
-require "spec_helper"
-
-describe GraphQL::Query::TypeResolver do
-  it "resolves correcty when child_type is UnionType" do
-    type = GraphQL::Query::TypeResolver.new(MILKS[1], DairyProductUnion, MilkType, nil).type
-    assert_equal(MilkType, type)
-  end
-end