graphql 1.7.4 → 1.7.5

data/spec/graphql/execution/multiplex_spec.rb

@@ -132,4 +132,52 @@ describe GraphQL::Execution::Multiplex do
       ], checks
     end
   end
+
+  describe "after_query when errors are raised" do
+    class InspectQueryInstrumentation
+      class << self
+        attr_reader :last_json
+        def before_query(query)
+        end
+
+        def after_query(query)
+          @last_json = query.result.to_json
+        end
+      end
+    end
+
+    InspectQueryType = GraphQL::ObjectType.define do
+      name "Query"
+
+      field :raiseExecutionError, types.String do
+        resolve ->(object, args, ctx) {
+          raise GraphQL::ExecutionError, "Whoops"
+        }
+      end
+
+      field :raiseError, types.String do
+        resolve ->(object, args, ctx) {
+          raise GraphQL::Error, "Crash"
+        }
+      end
+    end
+
+    InspectSchema = GraphQL::Schema.define do
+      query InspectQueryType
+      instrument(:query, InspectQueryInstrumentation)
+    end
+
+    it "can access the query results" do
+      InspectSchema.execute("{ raiseExecutionError }")
+      handled_err_json = '{"data":{"raiseExecutionError":null},"errors":[{"message":"Whoops","locations":[{"line":1,"column":3}],"path":["raiseExecutionError"]}]}'
+      assert_equal handled_err_json, InspectQueryInstrumentation.last_json
+
+
+      assert_raises(GraphQL::Error) do
+        InspectSchema.execute("{ raiseError }")
+      end
+      unhandled_err_json = 'null'
+      assert_equal unhandled_err_json, InspectQueryInstrumentation.last_json
+    end
+  end
 end

data/spec/graphql/field_spec.rb

@@ -225,10 +225,22 @@ describe GraphQL::Field do
 
   describe "#resolve_proc" do
     it "ensures the definition was called" do
-      field = GraphQL::Field.define do
+      class SimpleResolver
+        def self.call(*args)
+          :whatever
+        end
+      end
+
+      field_with_proc = GraphQL::Field.define do
         resolve ->(o, a, c) { :whatever }
       end
-      assert_instance_of Proc, field.resolve_proc
+
+      field_with_class = GraphQL::Field.define do
+        resolve SimpleResolver
+      end
+
+      assert_respond_to field_with_proc.resolve_proc, :call
+      assert_respond_to field_with_class.resolve_proc, :call
     end
   end
 end

data/spec/graphql/static_validation/rules/variable_names_are_unique_spec.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+require "spec_helper"
+
+describe GraphQL::StaticValidation::VariableNamesAreUnique do
+  include StaticValidationHelpers
+
+  let(:query_string) { <<-GRAPHQL
+  query GetStuff($var1: Int!, $var2: Int!, $var1: Int!, $var2: Int!, $var3: Int!) {
+    c1: cheese(id: $var1) { flavor }
+    c2: cheese(id: $var2) { flavor }
+    c3: cheese(id: $var3) { flavor }
+  }
+  GRAPHQL
+  }
+
+  it "finds duplicate variable names" do
+    assert_equal 2, errors.size
+
+    last_err = errors.last
+    assert_equal 'There can only be one variable named "var2"', last_err["message"]
+    assert_equal 2, last_err["locations"].size
+  end
+end

data/spec/graphql/subscriptions/serialize_spec.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+require "spec_helper"
+
+if defined?(GlobalID)
+  GlobalID.app = "graphql-ruby-test"
+
+  class GlobalIDUser
+    include GlobalID::Identification
+
+    attr_reader :id
+
+    def initialize(id)
+      @id = id
+    end
+
+    def self.find(id)
+      GlobalIDUser.new(id)
+    end
+
+    def ==(that)
+      self.id == that.id
+    end
+  end
+end
+
+describe GraphQL::Subscriptions::Serialize do
+  if defined?(GlobalID)
+    it "should serialize GlobalID::Identification in Array/Hash" do
+      user_a = GlobalIDUser.new("a")
+      user_b = GlobalIDUser.new("b")
+
+      str_a = GraphQL::Subscriptions::Serialize.dump(["first", 2, user_a])
+      str_b = GraphQL::Subscriptions::Serialize.dump({first: 'first', second: 2, user: user_b})
+
+      assert_equal str_a, '["first",2,{"__gid__":"Z2lkOi8vZ3JhcGhxbC1ydWJ5LXRlc3QvR2xvYmFsSURVc2VyL2E"}]'
+      assert_equal str_b, '{"first":"first","second":2,"user":{"__gid__":"Z2lkOi8vZ3JhcGhxbC1ydWJ5LXRlc3QvR2xvYmFsSURVc2VyL2I"}}'
+    end
+
+    it "should deserialize GlobalID::Identification in Array/Hash" do
+      user_a = GlobalIDUser.new("a")
+      user_b = GlobalIDUser.new("b")
+
+      str_a = '["first",2,{"__gid__":"Z2lkOi8vZ3JhcGhxbC1ydWJ5LXRlc3QvR2xvYmFsSURVc2VyL2E"}]'
+      str_b = '{"first":"first","second":2,"user":{"__gid__":"Z2lkOi8vZ3JhcGhxbC1ydWJ5LXRlc3QvR2xvYmFsSURVc2VyL2I"}}'
+
+      parsed_obj_a = GraphQL::Subscriptions::Serialize.load(str_a)
+      parsed_obj_b = GraphQL::Subscriptions::Serialize.load(str_b)
+
+      assert_equal parsed_obj_a, ["first", 2, user_a]
+      assert_equal parsed_obj_b, {'first' => 'first', 'second' => 2, 'user' => user_b}
+    end
+  end
+end

data/spec/graphql/subscriptions_spec.rb

@@ -133,7 +133,7 @@ class InMemoryBackend
   Schema.get_field("Subscription", "myEvent").subscription_scope = :me
 end
 
-if rails_should_be_installed? && defined?(GlobalID)
+if defined?(GlobalID)
   GlobalID.app = "graphql-ruby-test"
 
   class GlobalIDUser
@@ -308,7 +308,7 @@ describe GraphQL::Subscriptions do
       assert_equal [3], deliveries["3"].map { |d| d["data"]["myEvent"]["int"] }
     end
 
-    if rails_should_be_installed? && defined?(GlobalID)
+    if defined?(GlobalID)
       it "allows complex object subscription scopes" do
         query_str = <<-GRAPHQL
           subscription($type: PayloadType) {
@@ -384,4 +384,11 @@ describe GraphQL::Subscriptions do
       assert_equal 123, schema.subscriptions.extra
     end
   end
+
+  describe "#build_id" do
+    it "returns a unique ID string" do
+      assert_instance_of String, schema.subscriptions.build_id
+      refute_equal schema.subscriptions.build_id, schema.subscriptions.build_id
+    end
+  end
 end

data/spec/graphql/tracing/scout_tracing_spec.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe GraphQL::Tracing::ScoutTracing do
+  class ScoutApm
+    module Tracer
+    end
+  end
+
+  describe "Initializing" do
+    it "should include the module only after initilization" do
+      refute GraphQL::Tracing::ScoutTracing.included_modules.include?(ScoutApm::Tracer)
+      assert GraphQL::Tracing::ScoutTracing.new.class.included_modules.include?(ScoutApm::Tracer)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 1.7.4
+  version: 1.7.5
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-09 00:00:00.000000000 Z
+date: 2017-11-07 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: algoliasearch-jekyll
+  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
@@ -504,6 +518,7 @@ files:
 - lib/graphql/static_validation/rules/subscription_root_exists.rb
 - lib/graphql/static_validation/rules/unique_directives_per_location.rb
 - lib/graphql/static_validation/rules/variable_default_values_are_correctly_typed.rb
+- lib/graphql/static_validation/rules/variable_names_are_unique.rb
 - lib/graphql/static_validation/rules/variable_usages_are_allowed.rb
 - lib/graphql/static_validation/rules/variables_are_input_types.rb
 - lib/graphql/static_validation/rules/variables_are_used_and_defined.rb
@@ -941,15 +956,18 @@ files:
 - spec/graphql/static_validation/rules/subscription_root_exists_spec.rb
 - spec/graphql/static_validation/rules/unique_directives_per_location_spec.rb
 - spec/graphql/static_validation/rules/variable_default_values_are_correctly_typed_spec.rb
+- spec/graphql/static_validation/rules/variable_names_are_unique_spec.rb
 - spec/graphql/static_validation/rules/variable_usages_are_allowed_spec.rb
 - spec/graphql/static_validation/rules/variables_are_input_types_spec.rb
 - spec/graphql/static_validation/rules/variables_are_used_and_defined_spec.rb
 - spec/graphql/static_validation/type_stack_spec.rb
 - spec/graphql/static_validation/validator_spec.rb
 - spec/graphql/string_type_spec.rb
+- spec/graphql/subscriptions/serialize_spec.rb
 - spec/graphql/subscriptions_spec.rb
 - spec/graphql/tracing/active_support_notifications_tracing_spec.rb
 - spec/graphql/tracing/platform_tracing_spec.rb
+- spec/graphql/tracing/scout_tracing_spec.rb
 - spec/graphql/tracing_spec.rb
 - spec/graphql/union_type_spec.rb
 - spec/rails_dependency_sanity_spec.rb
@@ -1403,15 +1421,18 @@ test_files:
 - spec/graphql/static_validation/rules/subscription_root_exists_spec.rb
 - spec/graphql/static_validation/rules/unique_directives_per_location_spec.rb
 - spec/graphql/static_validation/rules/variable_default_values_are_correctly_typed_spec.rb
+- spec/graphql/static_validation/rules/variable_names_are_unique_spec.rb
 - spec/graphql/static_validation/rules/variable_usages_are_allowed_spec.rb
 - spec/graphql/static_validation/rules/variables_are_input_types_spec.rb
 - spec/graphql/static_validation/rules/variables_are_used_and_defined_spec.rb
 - spec/graphql/static_validation/type_stack_spec.rb
 - spec/graphql/static_validation/validator_spec.rb
 - spec/graphql/string_type_spec.rb
+- spec/graphql/subscriptions/serialize_spec.rb
 - spec/graphql/subscriptions_spec.rb
 - spec/graphql/tracing/active_support_notifications_tracing_spec.rb
 - spec/graphql/tracing/platform_tracing_spec.rb
+- spec/graphql/tracing/scout_tracing_spec.rb
 - spec/graphql/tracing_spec.rb
 - spec/graphql/union_type_spec.rb
 - spec/rails_dependency_sanity_spec.rb