graphql 1.8.1 → 1.8.2

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

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+require "spec_helper"
+
+describe GraphQL::StaticValidation::ArgumentNamesAreUnique do
+  include StaticValidationHelpers
+
+  describe "field arguments" do
+    let(:query_string) { <<-GRAPHQL
+    query GetStuff {
+      c1: cheese(id: 1, id: 2) { flavor }
+      c2: cheese(id: 2) { flavor }
+    }
+    GRAPHQL
+    }
+
+    it "finds duplicate names" do
+      assert_equal 1, errors.size
+
+      error = errors.first
+      assert_equal 'There can be only one argument named "id"', error["message"]
+      assert_equal [{ "line" => 2, "column" => 18}, { "line" => 2, "column" => 25 }], error["locations"]
+      assert_equal ["query GetStuff", "c1"], error["fields"]
+    end
+  end
+
+  describe "directive arguments" do
+    let(:query_string) { <<-GRAPHQL
+    query GetStuff {
+      c1: cheese(id: 1) @include(if: true, if: true) { flavor }
+      c2: cheese(id: 2) @include(if: true) { flavor }
+    }
+    GRAPHQL
+    }
+
+    it "finds duplicate names" do
+      assert_equal 1, errors.size
+
+      error = errors.first
+      assert_equal 'There can be only one argument named "if"', error["message"]
+      assert_equal [{ "line" => 2, "column" => 34}, { "line" => 2, "column" => 44 }], error["locations"]
+      assert_equal ["query GetStuff", "c1"], error["fields"]
+    end
+  end
+end

data/spec/graphql/subscriptions_spec.rb

@@ -132,6 +132,10 @@ class ClassBasedInMemoryBackend < InMemoryBackend
     def my_event(type: nil)
       object
     end
+
+    field :failed_event, Payload, null: false, resolve: ->(o, a, c) { raise GraphQL::ExecutionError.new("unauthorized") }  do
+      argument :id, ID, required: true
+    end
   end
 
   class Query < GraphQL::Schema::Object
@@ -151,6 +155,7 @@ class FromDefinitionInMemoryBackend < InMemoryBackend
     payload(id: ID!): Payload!
     event(stream: StreamInput): Payload
     myEvent(type: PayloadType): Payload
+    failedEvent(id: ID!): Payload!
   }
 
   type Payload {
@@ -180,6 +185,7 @@ class FromDefinitionInMemoryBackend < InMemoryBackend
       "payload" => ->(o,a,c) { o },
       "myEvent" => ->(o,a,c) { o },
       "event" => ->(o,a,c) { o },
+      "failedEvent" => ->(o,a,c) { raise GraphQL::ExecutionError.new("unauthorized") },
     },
   }
   Schema = GraphQL::Schema.from_definition(SchemaDefinition, default_resolve: Resolvers).redefine do
@@ -410,7 +416,21 @@ describe GraphQL::Subscriptions do
             end
           end
 
-          it "lets unhandled errors crash "do
+          it "avoid subscription on resolver error" do
+            res = schema.execute(<<-GRAPHQL, context: { socket: "1" }, variables: { "id" => "100" })
+          subscription ($id: ID!){
+            failedEvent(id: $id) { str, int }
+          }
+            GRAPHQL
+
+            assert_equal nil, res["data"]
+            assert_equal "unauthorized", res["errors"][0]["message"]
+
+            # this is to make sure nothing actually got subscribed.. but I don't have any idea better than checking its instance variable
+            assert_equal 0, schema.subscriptions.instance_variable_get(:@subscriptions).size
+          end
+
+          it "lets unhandled errors crash" do
             query_str = <<-GRAPHQL
           subscription($type: PayloadType) {
             myEvent(type: $type) { int }

data/spec/support/jazz.rb

@@ -45,9 +45,9 @@ module Jazz
   end
 
   class BaseArgument < GraphQL::Schema::Argument
-    def initialize(name, type, desc = nil, custom: nil, **kwargs)
+    def initialize(*args, custom: nil, **kwargs)
       @custom = custom
-      super(name, type, desc, **kwargs)
+      super(*args, **kwargs)
     end
 
     def to_graphql
@@ -446,12 +446,25 @@ module Jazz
     end
   end
 
+  class AddSitar < GraphQL::Schema::RelayClassicMutation
+    null true
+    description "Get Sitar to musical instrument"
+
+    field :instrument, InstrumentType, null: false
+
+    def resolve
+      instrument = Models::Instrument.new("Sitar", :str)
+      { instrument: instrument }
+    end
+  end
+
   class Mutation < BaseObject
     field :add_ensemble, Ensemble, null: false do
       argument :input, EnsembleInput, required: true
     end
 
     field :add_instrument, mutation: AddInstrument
+    field :add_sitar, mutation: AddSitar
 
     def add_ensemble(input:)
       ens = Models::Ensemble.new(input.name)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.8.2
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-01 00:00:00.000000000 Z
+date: 2018-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
@@ -315,14 +315,17 @@ files:
 - MIT-LICENSE
 - lib/generators/graphql/core.rb
 - lib/generators/graphql/enum_generator.rb
-- lib/generators/graphql/function_generator.rb
 - lib/generators/graphql/install_generator.rb
 - lib/generators/graphql/interface_generator.rb
 - lib/generators/graphql/loader_generator.rb
 - lib/generators/graphql/mutation_generator.rb
 - lib/generators/graphql/object_generator.rb
+- lib/generators/graphql/templates/base_enum.erb
+- lib/generators/graphql/templates/base_input_object.erb
+- lib/generators/graphql/templates/base_interface.erb
+- lib/generators/graphql/templates/base_object.erb
+- lib/generators/graphql/templates/base_union.erb
 - lib/generators/graphql/templates/enum.erb
-- lib/generators/graphql/templates/function.erb
 - lib/generators/graphql/templates/graphql_controller.erb
 - lib/generators/graphql/templates/interface.erb
 - lib/generators/graphql/templates/loader.erb
@@ -540,6 +543,7 @@ files:
 - lib/graphql/static_validation/literal_validator.rb
 - lib/graphql/static_validation/message.rb
 - lib/graphql/static_validation/rules/argument_literals_are_compatible.rb
+- lib/graphql/static_validation/rules/argument_names_are_unique.rb
 - lib/graphql/static_validation/rules/arguments_are_defined.rb
 - lib/graphql/static_validation/rules/directives_are_defined.rb
 - lib/graphql/static_validation/rules/directives_are_in_valid_locations.rb
@@ -942,7 +946,6 @@ files:
 - spec/fixtures/upgrader/type_x.original.rb
 - spec/fixtures/upgrader/type_x.transformed.rb
 - spec/generators/graphql/enum_generator_spec.rb
-- spec/generators/graphql/function_generator_spec.rb
 - spec/generators/graphql/install_generator_spec.rb
 - spec/generators/graphql/interface_generator_spec.rb
 - spec/generators/graphql/loader_generator_spec.rb
@@ -1056,6 +1059,7 @@ files:
 - spec/graphql/schema/warden_spec.rb
 - spec/graphql/schema_spec.rb
 - spec/graphql/static_validation/rules/argument_literals_are_compatible_spec.rb
+- spec/graphql/static_validation/rules/argument_names_are_unique_spec.rb
 - spec/graphql/static_validation/rules/arguments_are_defined_spec.rb
 - spec/graphql/static_validation/rules/directives_are_defined_spec.rb
 - spec/graphql/static_validation/rules/directives_are_in_valid_locations_spec.rb
@@ -1489,7 +1493,6 @@ test_files:
 - spec/fixtures/upgrader/type_x.original.rb
 - spec/fixtures/upgrader/type_x.transformed.rb
 - spec/generators/graphql/enum_generator_spec.rb
-- spec/generators/graphql/function_generator_spec.rb
 - spec/generators/graphql/install_generator_spec.rb
 - spec/generators/graphql/interface_generator_spec.rb
 - spec/generators/graphql/loader_generator_spec.rb
@@ -1603,6 +1606,7 @@ test_files:
 - spec/graphql/schema/warden_spec.rb
 - spec/graphql/schema_spec.rb
 - spec/graphql/static_validation/rules/argument_literals_are_compatible_spec.rb
+- spec/graphql/static_validation/rules/argument_names_are_unique_spec.rb
 - spec/graphql/static_validation/rules/arguments_are_defined_spec.rb
 - spec/graphql/static_validation/rules/directives_are_defined_spec.rb
 - spec/graphql/static_validation/rules/directives_are_in_valid_locations_spec.rb

data/lib/generators/graphql/function_generator.rb

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-require "rails/generators/named_base"
-require_relative "core"
-
-module Graphql
-  module Generators
-    class FunctionGenerator < Rails::Generators::NamedBase
-      include Core
-
-      desc "Create a GraphQL::Function by name"
-      source_root File.expand_path('../templates', __FILE__)
-
-      def create_function_file
-        template "function.erb", "#{options[:directory]}/functions/#{file_path}.rb"
-      end
-    end
-  end
-end

data/lib/generators/graphql/templates/function.erb

@@ -1,17 +0,0 @@
-class Functions::<%= class_name %> < GraphQL::Function
-  # Define `initialize` to store field-level options, eg
-  #
-  #     field :myField, function: Functions::<%= class_name %>.new(type: MyType)
-  #
-  # attr_reader :type
-  # def initialize(type:)
-  #   @type = type
-  # end
-
-  # add arguments by type:
-  # argument :id, !types.ID
-
-  # Resolve function:
-  def call(obj, args, ctx)
-  end
-end

data/spec/generators/graphql/function_generator_spec.rb

@@ -1,59 +0,0 @@
-# frozen_string_literal: true
-require "spec_helper"
-require "generators/graphql/function_generator"
-
-class GraphQLGeneratorsFunctionGeneratorTest < BaseGeneratorTest
-  tests Graphql::Generators::FunctionGenerator
-
-  test "it generates an empty function by name" do
-    run_generator(["FindRecord"])
-
-    expected_content = <<-RUBY
-class Functions::FindRecord < GraphQL::Function
-  # Define `initialize` to store field-level options, eg
-  #
-  #     field :myField, function: Functions::FindRecord.new(type: MyType)
-  #
-  # attr_reader :type
-  # def initialize(type:)
-  #   @type = type
-  # end
-
-  # add arguments by type:
-  # argument :id, !types.ID
-
-  # Resolve function:
-  def call(obj, args, ctx)
-  end
-end
-RUBY
-
-    assert_file "app/graphql/functions/find_record.rb", expected_content
-  end
-
-  test "it generates a namespaced function by name" do
-    run_generator(["finders::find_record"])
-
-    expected_content = <<-RUBY
-class Functions::Finders::FindRecord < GraphQL::Function
-  # Define `initialize` to store field-level options, eg
-  #
-  #     field :myField, function: Functions::Finders::FindRecord.new(type: MyType)
-  #
-  # attr_reader :type
-  # def initialize(type:)
-  #   @type = type
-  # end
-
-  # add arguments by type:
-  # argument :id, !types.ID
-
-  # Resolve function:
-  def call(obj, args, ctx)
-  end
-end
-RUBY
-
-    assert_file "app/graphql/functions/finders/find_record.rb", expected_content
-  end
-end