graphql 1.5.15 → 1.6.0

data/spec/graphql/schema_spec.rb

@@ -228,6 +228,21 @@ type Query {
       end
     end
 
+    # Use this to assert instrumenters are called as a stack
+    class StackCheckInstrumenter
+      def initialize(counter)
+        @counter = counter
+      end
+
+      def before_query(query)
+        @counter.counts << :in
+      end
+
+      def after_query(query)
+        @counter.counts << :out
+      end
+    end
+
     let(:variable_counter) {
       VariableCountInstrumenter.new
     }
@@ -246,6 +261,7 @@ type Query {
       GraphQL::Schema.define do
         query(spec.query_type)
         instrument(:field, MultiplyInstrumenter.new(3))
+        instrument(:query, StackCheckInstrumenter.new(spec.variable_counter))
         instrument(:query, spec.variable_counter)
       end
     }
@@ -258,7 +274,7 @@ type Query {
     it "can wrap query execution" do
       schema.execute("query getInt($val: Int = 5){ int(value: $val) } ")
       schema.execute("query getInt($val: Int = 5, $val2: Int = 3){ int(value: $val) int2: int(value: $val2) } ")
-      assert_equal [1, :end, 2, :end], variable_counter.counts
+      assert_equal [:in, 1, :end, :out, :in, 2, :end, :out], variable_counter.counts
     end
 
     it "runs even when a runtime error occurs" do
@@ -266,7 +282,7 @@ type Query {
       assert_raises(RuntimeError) {
         schema.execute("query getInt($val: Int = 13){ int(value: $val) } ")
       }
-      assert_equal [1, :end, 1, :end], variable_counter.counts
+      assert_equal [:in, 1, :end, :out, :in, 1, :end, :out], variable_counter.counts
     end
 
     it "can be applied after the fact" do
@@ -336,4 +352,12 @@ type Query {
       assert_equal([], errors)
     end
   end
+
+  describe "#as_json / #to_json" do
+    it "returns the instrospection result" do
+      result = schema.execute(GraphQL::Introspection::INTROSPECTION_QUERY)
+      assert_equal result, schema.as_json
+      assert_equal result, JSON.parse(schema.to_json)
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -1,12 +1,14 @@
 # frozen_string_literal: true
 require "codeclimate-test-reporter"
 CodeClimate::TestReporter.start
+require "rake"
 require "rails/all"
 require "rails/generators"
 require "jdbc/sqlite3" if RUBY_ENGINE == 'jruby'
 require "sqlite3" if RUBY_ENGINE == 'ruby'
 require "sequel"
 require "graphql"
+require "graphql/rake_task"
 require "benchmark"
 require "minitest/autorun"
 require "minitest/focus"
@@ -37,6 +39,6 @@ end
 # Load support files
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
-def star_wars_query(string, variables={})
-  GraphQL::Query.new(StarWars::Schema, string, variables: variables).result
+def star_wars_query(string, variables={}, context: {})
+  GraphQL::Query.new(StarWars::Schema, string, variables: variables, context: context).result
 end

data/spec/support/lazy_helpers.rb

@@ -0,0 +1,152 @@
+# frozen_string_literal: true
+module LazyHelpers
+  class Wrapper
+    def initialize(item = nil, &block)
+      if block
+        @block = block
+      else
+        @item = item
+      end
+    end
+
+    def item
+      if @block
+        @item = @block.call()
+        @block = nil
+      end
+      @item
+    end
+  end
+
+  class SumAll
+    attr_reader :own_value
+    attr_accessor :value
+
+    def initialize(ctx, own_value)
+      @own_value = own_value
+      all << self
+    end
+
+    def value
+      @value ||= begin
+        total_value = all.map(&:own_value).reduce(&:+)
+        all.each { |v| v.value = total_value}
+        all.clear
+        total_value
+      end
+      @value
+    end
+
+    def all
+      self.class.all
+    end
+
+    def self.all
+      @all ||= []
+    end
+  end
+
+  LazySum = GraphQL::ObjectType.define do
+    name "LazySum"
+    field :value, types.Int do
+      resolve ->(o, a, c) { o == 13 ? nil : o }
+    end
+    field :nestedSum, !LazySum do
+      argument :value, !types.Int
+      resolve ->(o, args, c) {
+        if args[:value] == 13
+          Wrapper.new(nil)
+        else
+          SumAll.new(c, o + args[:value])
+        end
+      }
+    end
+
+    field :nullableNestedSum, LazySum do
+      argument :value, types.Int
+      resolve ->(o, args, c) {
+        if args[:value] == 13
+          Wrapper.new(nil)
+        else
+          SumAll.new(c, o + args[:value])
+        end
+      }
+    end
+  end
+
+  LazyQuery = GraphQL::ObjectType.define do
+    name "Query"
+    field :int, !types.Int do
+      argument :value, !types.Int
+      argument :plus, types.Int, default_value: 0
+      resolve ->(o, a, c) { Wrapper.new(a[:value] + a[:plus])}
+    end
+
+    field :nestedSum, !LazySum do
+      argument :value, !types.Int
+      resolve ->(o, args, c) { SumAll.new(c, args[:value]) }
+    end
+
+    field :nullableNestedSum, LazySum do
+      argument :value, types.Int
+      resolve ->(o, args, c) {
+        if args[:value] == 13
+          Wrapper.new { raise GraphQL::ExecutionError.new("13 is unlucky") }
+        else
+          SumAll.new(c, args[:value])
+        end
+      }
+    end
+
+    field :listSum, types[LazySum] do
+      argument :values, types[types.Int]
+      resolve ->(o, args, c) { args[:values] }
+    end
+  end
+
+  class SumAllInstrumentation
+    def initialize(counter:)
+      @counter = counter
+    end
+
+    def before_query(q)
+      add_check(q, "before #{q.selected_operation.name}")
+      # TODO not threadsafe
+      # This should use multiplex-level context
+      SumAll.all.clear
+    end
+
+    def after_query(q)
+      add_check(q, "after #{q.selected_operation.name}")
+    end
+
+    def before_multiplex(multiplex)
+      add_check(multiplex, "before multiplex #@counter")
+    end
+
+    def after_multiplex(multiplex)
+      add_check(multiplex, "after multiplex #@counter")
+    end
+
+    def add_check(obj, text)
+      checks = obj.context[:instrumentation_checks]
+      if checks
+        checks << text
+      end
+    end
+  end
+
+  LazySchema = GraphQL::Schema.define do
+    query(LazyQuery)
+    mutation(LazyQuery)
+    lazy_resolve(Wrapper, :item)
+    lazy_resolve(SumAll, :value)
+    instrument(:query, SumAllInstrumentation.new(counter: nil))
+    instrument(:multiplex, SumAllInstrumentation.new(counter: 1))
+    instrument(:multiplex, SumAllInstrumentation.new(counter: 2))
+  end
+
+  def run_query(query_str)
+    LazySchema.execute(query_str)
+  end
+end

data/spec/support/star_wars/schema.rb

@@ -309,6 +309,26 @@ module StarWars
     field :introduceShipFunction, IntroduceShipFunctionMutation.field
   end
 
+  class ClassNameRecorder
+    def initialize(context_key)
+      @context_key = context_key
+    end
+
+    def instrument(type, field)
+      inner_resolve = field.resolve_proc
+      key = @context_key
+      field.redefine {
+        resolve ->(o, a, c) {
+          res = inner_resolve.call(o, a, c)
+          if c[key]
+            c[key] << res.class.name
+          end
+          res
+        }
+      }
+    end
+  end
+
   Schema = GraphQL::Schema.define do
     query(QueryType)
     mutation(MutationType)
@@ -337,5 +357,8 @@ module StarWars
     end
 
     lazy_resolve(LazyWrapper, :value)
+
+    instrument(:field, ClassNameRecorder.new(:before_built_ins))
+    instrument(:field, ClassNameRecorder.new(:after_built_ins), after_built_ins: true)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 1.5.15
+  version: 1.6.0
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-09 00:00:00.000000000 Z
+date: 2017-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
@@ -276,6 +276,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A plain-Ruby implementation of GraphQL.
 email:
 - rdmosolgo@gmail.com
@@ -315,6 +329,7 @@ files:
 - lib/graphql/analysis/reducer_state.rb
 - lib/graphql/analysis_error.rb
 - lib/graphql/argument.rb
+- lib/graphql/backwards_compatibility.rb
 - lib/graphql/base_type.rb
 - lib/graphql/boolean_type.rb
 - lib/graphql/compatibility.rb
@@ -350,11 +365,13 @@ files:
 - lib/graphql/execution/lazy.rb
 - lib/graphql/execution/lazy/lazy_method_map.rb
 - lib/graphql/execution/lazy/resolve.rb
+- lib/graphql/execution/multiplex.rb
 - lib/graphql/execution/selection_result.rb
 - lib/graphql/execution/typecast.rb
 - lib/graphql/execution_error.rb
 - lib/graphql/field.rb
 - lib/graphql/field/resolve.rb
+- lib/graphql/filter.rb
 - lib/graphql/float_type.rb
 - lib/graphql/function.rb
 - lib/graphql/id_type.rb
@@ -419,6 +436,7 @@ files:
 - lib/graphql/query/validation_pipeline.rb
 - lib/graphql/query/variable_validation_error.rb
 - lib/graphql/query/variables.rb
+- lib/graphql/rake_task.rb
 - lib/graphql/relay.rb
 - lib/graphql/relay/array_connection.rb
 - lib/graphql/relay/base_connection.rb
@@ -441,13 +459,14 @@ files:
 - lib/graphql/schema.rb
 - lib/graphql/schema/base_64_encoder.rb
 - lib/graphql/schema/build_from_definition.rb
+- lib/graphql/schema/build_from_definition/resolve_map.rb
+- lib/graphql/schema/build_from_definition/resolve_map/default_resolve.rb
 - lib/graphql/schema/catchall_middleware.rb
 - lib/graphql/schema/default_parse_error.rb
 - lib/graphql/schema/default_type_error.rb
 - lib/graphql/schema/instrumented_field_map.rb
 - lib/graphql/schema/invalid_type_error.rb
 - lib/graphql/schema/loader.rb
-- lib/graphql/schema/mask.rb
 - lib/graphql/schema/middleware_chain.rb
 - lib/graphql/schema/null_mask.rb
 - lib/graphql/schema/possible_types.rb
@@ -529,6 +548,7 @@ files:
 - spec/graphql/execution/execute_spec.rb
 - spec/graphql/execution/lazy/lazy_method_map_spec.rb
 - spec/graphql/execution/lazy_spec.rb
+- spec/graphql/execution/multiplex_spec.rb
 - spec/graphql/execution/typecast_spec.rb
 - spec/graphql/execution_error_spec.rb
 - spec/graphql/field_spec.rb
@@ -562,6 +582,7 @@ files:
 - spec/graphql/query/serial_execution/value_resolution_spec.rb
 - spec/graphql/query/variables_spec.rb
 - spec/graphql/query_spec.rb
+- spec/graphql/rake_task_spec.rb
 - spec/graphql/relay/array_connection_spec.rb
 - spec/graphql/relay/base_connection_spec.rb
 - spec/graphql/relay/connection_instrumentation_spec.rb
@@ -618,6 +639,7 @@ files:
 - spec/support/base_generator_test.rb
 - spec/support/dummy/data.rb
 - spec/support/dummy/schema.rb
+- spec/support/lazy_helpers.rb
 - spec/support/minimum_input_object.rb
 - spec/support/star_wars/data.rb
 - spec/support/star_wars/schema.rb
@@ -676,6 +698,7 @@ test_files:
 - spec/graphql/execution/execute_spec.rb
 - spec/graphql/execution/lazy/lazy_method_map_spec.rb
 - spec/graphql/execution/lazy_spec.rb
+- spec/graphql/execution/multiplex_spec.rb
 - spec/graphql/execution/typecast_spec.rb
 - spec/graphql/execution_error_spec.rb
 - spec/graphql/field_spec.rb
@@ -709,6 +732,7 @@ test_files:
 - spec/graphql/query/serial_execution/value_resolution_spec.rb
 - spec/graphql/query/variables_spec.rb
 - spec/graphql/query_spec.rb
+- spec/graphql/rake_task_spec.rb
 - spec/graphql/relay/array_connection_spec.rb
 - spec/graphql/relay/base_connection_spec.rb
 - spec/graphql/relay/connection_instrumentation_spec.rb
@@ -765,6 +789,7 @@ test_files:
 - spec/support/base_generator_test.rb
 - spec/support/dummy/data.rb
 - spec/support/dummy/schema.rb
+- spec/support/lazy_helpers.rb
 - spec/support/minimum_input_object.rb
 - spec/support/star_wars/data.rb
 - spec/support/star_wars/schema.rb

data/lib/graphql/schema/mask.rb

@@ -1,55 +0,0 @@
-# frozen_string_literal: true
-module GraphQL
-  class Schema
-    # Tools for working with schema masks (`only` / `except`).
-    #
-    # In general, these are functions which, when they return `true`,
-    # the `member` is hidden for the current query.
-    #
-    # @api private
-    module Mask
-      module_function
-
-      # Combine a schema's default_mask with query-level masks.
-      def combine(default_mask, except:, only:)
-        query_mask = if except
-          except
-        elsif only
-          InvertedMask.new(only)
-        end
-
-        if query_mask && (default_mask != GraphQL::Schema::NullMask)
-          EitherMask.new(default_mask, query_mask)
-        else
-          query_mask || default_mask
-        end
-      end
-
-      # @api private
-      # Returns true when the inner mask returned false
-      # Returns false when the inner mask returned true
-      class InvertedMask
-        def initialize(inner_mask)
-          @inner_mask = inner_mask
-        end
-
-        def call(member, ctx)
-          !@inner_mask.call(member, ctx)
-        end
-      end
-
-      # Hides `member` if _either_ mask would hide the member.
-      # @api private
-      class EitherMask
-        def initialize(first_mask, second_mask)
-          @first_mask = first_mask
-          @second_mask = second_mask
-        end
-
-        def call(member, ctx)
-          @first_mask.call(member, ctx) || @second_mask.call(member, ctx)
-        end
-      end
-    end
-  end
-end