graphql 1.8.0.pre9 → 1.8.0.pre10

data/spec/graphql/schema/interface_spec.rb

@@ -11,6 +11,10 @@ describe GraphQL::Schema::Interface do
     end
 
     class NewInterface1 < Jazz::GloballyIdentifiableType
+      # TODO not great
+      module Implementation
+        include Jazz::GloballyIdentifiableType::Implementation
+      end
     end
 
     class NewInterface2 < Jazz::GloballyIdentifiableType
@@ -21,7 +25,6 @@ describe GraphQL::Schema::Interface do
     end
 
     it "can override Implementation" do
-
       new_object_1 = Class.new(GraphQL::Schema::Object) do
         implements NewInterface1
       end

data/spec/graphql/schema/mutation_spec.rb

@@ -0,0 +1,99 @@
+# frozen_string_literal: true
+require "spec_helper"
+
+# Make sure that `!` has no effect
+using GraphQL::DeprecatedDSL
+
+describe GraphQL::Schema::Mutation do
+  let(:mutation) { Jazz::AddInstrument }
+  after do
+    Jazz::Models.reset
+  end
+
+  it "Doesn't override !" do
+    assert_equal false, !mutation
+  end
+
+  describe "definition" do
+    it "passes along description" do
+      assert_equal "Register a new musical instrument in the database", mutation.graphql_field.description
+      assert_equal "Autogenerated return type of AddInstrument", mutation.payload_type.description
+    end
+  end
+
+  describe ".field" do
+    it "returns a GraphQL::Field instance, for backwards compat" do
+      field = mutation.field
+      assert_instance_of GraphQL::Field, field
+      assert_equal "addInstrument", field.name
+    end
+
+    it "has a reference to the mutation" do
+      f = mutation.field
+      assert_equal mutation, f.mutation
+
+      # Make sure it's also present in the schema
+      f2 = Jazz::Schema.find("Mutation.addInstrument")
+      assert_equal mutation, f2.mutation
+    end
+  end
+
+  describe ".payload_type" do
+    it "has a reference to the mutation" do
+      assert_equal mutation, mutation.payload_type.mutation
+    end
+  end
+
+  describe ".object_class" do
+    it "can override & inherit the parent class" do
+      obj_class = Class.new(GraphQL::Schema::Object)
+      mutation_class = Class.new(GraphQL::Schema::Mutation) do
+        object_class(obj_class)
+      end
+      mutation_subclass = Class.new(mutation_class)
+
+      assert_equal(GraphQL::Schema::Object, GraphQL::Schema::Mutation.object_class)
+      assert_equal(obj_class, mutation_class.object_class)
+      assert_equal(obj_class, mutation_subclass.object_class)    end
+  end
+
+  describe ".argument_class" do
+    it "can override & inherit the parent class" do
+      arg_class = Class.new(GraphQL::Schema::Argument)
+      mutation_class = Class.new(GraphQL::Schema::Mutation) do
+        argument_class(arg_class)
+      end
+
+      mutation_subclass = Class.new(mutation_class)
+
+      assert_equal(GraphQL::Schema::Argument, GraphQL::Schema::Mutation.argument_class)
+      assert_equal(arg_class, mutation_class.argument_class)
+      assert_equal(arg_class, mutation_subclass.argument_class)
+    end
+  end
+
+  describe "evaluation" do
+    it "runs mutations" do
+      query_str = <<-GRAPHQL
+      mutation {
+        addInstrument(name: "Trombone", family: BRASS) {
+          instrument {
+            name
+            family
+          }
+          entries {
+            name
+          }
+          ee
+        }
+      }
+      GRAPHQL
+
+      response = Jazz::Schema.execute(query_str)
+      assert_equal "Trombone", response["data"]["addInstrument"]["instrument"]["name"]
+      assert_equal "BRASS", response["data"]["addInstrument"]["instrument"]["family"]
+      assert_equal "GraphQL::Query::Context::ExecutionErrors", response["data"]["addInstrument"]["ee"]
+      assert_equal 7, response["data"]["addInstrument"]["entries"].size
+    end
+  end
+end

data/spec/graphql/schema/relay_classic_mutation_spec.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+require "spec_helper"
+
+describe GraphQL::Schema::RelayClassicMutation do
+  describe ".input_object_class" do
+    it "is inherited, with a default" do
+      custom_input = Class.new(GraphQL::Schema::InputObject)
+      mutation_base_class = Class.new(GraphQL::Schema::RelayClassicMutation) do
+        input_object_class(custom_input)
+      end
+      mutation_subclass = Class.new(mutation_base_class)
+
+      assert_equal GraphQL::Schema::InputObject, GraphQL::Schema::RelayClassicMutation.input_object_class
+      assert_equal custom_input, mutation_base_class.input_object_class
+      assert_equal custom_input, mutation_subclass.input_object_class
+    end
+  end
+
+  describe ".input_type" do
+    it "has a reference to the mutation" do
+      mutation = Class.new(GraphQL::Schema::RelayClassicMutation) do
+        graphql_name "Test"
+      end
+      assert_equal mutation, mutation.input_type.mutation
+      assert_equal mutation, mutation.input_type.graphql_definition.mutation
+    end
+  end
+end

data/spec/support/jazz.rb

@@ -328,7 +328,9 @@ module Jazz
         # Access by method
         input.string_value,
         # Access by key:
-        input["stringValue"],
+        input[:string_value],
+        input.key?(:string_value).to_s,
+        # Access by legacy key
         input[:stringValue],
       ]
     end
@@ -362,11 +364,33 @@ module Jazz
     argument :name, String, required: true
   end
 
+  class AddInstrument < GraphQL::Schema::Mutation
+    description "Register a new musical instrument in the database"
+
+    argument :name, String, required: true
+    argument :family, Family, required: true
+
+    field :instrument, InstrumentType, null: false
+    # This is meaningless, but it's to test the conflict with `Hash#entries`
+    field :entries, [InstrumentType], null: false
+    # Test `extras` injection
+
+    field :ee, String, null: false
+    extras [:execution_errors]
+    def resolve(name:, family:, execution_errors:)
+      instrument = Jazz::Models::Instrument.new(name, family)
+      Jazz::Models.data["Instrument"] << instrument
+      { instrument: instrument, entries: Jazz::Models.data["Instrument"], ee: execution_errors.class.name}
+    end
+  end
+
   class Mutation < BaseObject
     field :add_ensemble, Ensemble, null: false do
       argument :input, EnsembleInput, required: true
     end
 
+    field :add_instrument, mutation: AddInstrument
+
     def add_ensemble(input:)
       ens = Models::Ensemble.new(input.name)
       Models.data["Ensemble"] << ens

data/spec/support/star_wars/schema.rb

@@ -164,34 +164,21 @@ module StarWars
     field :basesWithCustomEdge, CustomEdgeBaseConnectionType, null: true, connection: true, resolve: ->(o, a, c) { LazyNodesWrapper.new(o.bases) }
   end
 
-  # Define a mutation. It will also:
-  #   - define a derived InputObjectType
-  #   - define a derived ObjectType (for return)
-  #   - define a field, accessible from {Mutation#field}
-  #
-  # The resolve proc takes `inputs, ctx`, where:
-  #   - `inputs` has the keys defined with `input_field`
-  #   - `ctx` is the Query context (like normal fields)
-  #
-  # Notice that you leave out clientMutationId.
-  IntroduceShipMutation = GraphQL::Relay::Mutation.define do
-    # Used as the root for derived types:
-    name "IntroduceShip"
+  class IntroduceShipMutation < GraphQL::Schema::RelayClassicMutation
     description "Add a ship to this faction"
 
     # Nested under `input` in the query:
-    input_field :shipName, types.String
-    input_field :factionId, !types.ID
+    argument :ship_name, String, required: false
+    argument :faction_id, ID, required: true
 
     # Result may have access to these fields:
-    return_field :shipEdge, Ship.edge_type
-    return_field :faction, Faction
-    return_field :aliasedFaction, Faction, property: :aliased_faction
+    field :ship_edge, Ship.edge_type, null: true
+    field :faction, Faction, null: true
+    field :aliased_faction, Faction, hash_key: :aliased_faction, null: true
 
-    # Here's the mutation operation:
-    resolve ->(root_obj, inputs, ctx) {
-      IntroduceShipFunction.new.call(root_obj, inputs, ctx)
-    }
+    def resolve(ship_name: nil, faction_id:)
+      IntroduceShipFunction.new.call(object, {ship_name: ship_name, faction_id: faction_id}, context)
+    end
   end
 
   class IntroduceShipFunction < GraphQL::Function
@@ -207,21 +194,24 @@ module StarWars
     end)
 
     def call(obj, args, ctx)
-      faction_id = args["factionId"]
-      if args["shipName"] == 'Millennium Falcon'
+      # support old and new args
+      ship_name = args["shipName"] || args[:ship_name]
+      faction_id = args["factionId"] || args[:faction_id]
+      if ship_name == 'Millennium Falcon'
         GraphQL::ExecutionError.new("Sorry, Millennium Falcon ship is reserved")
-      elsif args["shipName"] == 'Leviathan'
+      elsif ship_name == 'Leviathan'
         raise GraphQL::ExecutionError.new("🔥")
-      elsif args["shipName"] == "Ebon Hawk"
+      elsif ship_name == "Ebon Hawk"
         LazyWrapper.new { raise GraphQL::ExecutionError.new("💥")}
       else
-        ship = DATA.create_ship(args["shipName"], faction_id)
+        ship = DATA.create_ship(ship_name, faction_id)
         faction = DATA["Faction"][faction_id]
         connection_class = GraphQL::Relay::BaseConnection.connection_for_nodes(faction.ships)
         ships_connection = connection_class.new(faction.ships, args)
         ship_edge = GraphQL::Relay::Edge.new(ship, ships_connection)
         result = {
           shipEdge: ship_edge,
+          ship_edge: ship_edge, # support new-style, too
           faction: faction,
           aliased_faction: faction,
         }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 1.8.0.pre9
+  version: 1.8.0.pre10
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-19 00:00:00.000000000 Z
+date: 2018-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
@@ -525,15 +525,18 @@ files:
 - lib/graphql/schema/member.rb
 - lib/graphql/schema/member/accepts_definition.rb
 - lib/graphql/schema/member/build_type.rb
+- lib/graphql/schema/member/has_arguments.rb
 - lib/graphql/schema/member/has_fields.rb
 - lib/graphql/schema/member/instrumentation.rb
 - lib/graphql/schema/member/list_type_proxy.rb
 - lib/graphql/schema/member/non_null_type_proxy.rb
 - lib/graphql/schema/middleware_chain.rb
+- lib/graphql/schema/mutation.rb
 - lib/graphql/schema/null_mask.rb
 - lib/graphql/schema/object.rb
 - lib/graphql/schema/possible_types.rb
 - lib/graphql/schema/printer.rb
+- lib/graphql/schema/relay_classic_mutation.rb
 - lib/graphql/schema/rescue_middleware.rb
 - lib/graphql/schema/scalar.rb
 - lib/graphql/schema/timeout_middleware.rb
@@ -907,8 +910,12 @@ files:
 - spec/fixtures/upgrader/blame_range.transformed.rb
 - spec/fixtures/upgrader/date_time.original.rb
 - spec/fixtures/upgrader/date_time.transformed.rb
+- spec/fixtures/upgrader/delete_project.original.rb
+- spec/fixtures/upgrader/delete_project.transformed.rb
 - spec/fixtures/upgrader/gist_order_field.original.rb
 - spec/fixtures/upgrader/gist_order_field.transformed.rb
+- spec/fixtures/upgrader/increment_count.original.rb
+- spec/fixtures/upgrader/increment_count.transformed.rb
 - spec/fixtures/upgrader/release_order.original.rb
 - spec/fixtures/upgrader/release_order.transformed.rb
 - spec/fixtures/upgrader/starrable.original.rb
@@ -1013,8 +1020,10 @@ files:
 - spec/graphql/schema/loader_spec.rb
 - spec/graphql/schema/member/accepts_definition_spec.rb
 - spec/graphql/schema/middleware_chain_spec.rb
+- spec/graphql/schema/mutation_spec.rb
 - spec/graphql/schema/object_spec.rb
 - spec/graphql/schema/printer_spec.rb
+- spec/graphql/schema/relay_classic_mutation_spec.rb
 - spec/graphql/schema/rescue_middleware_spec.rb
 - spec/graphql/schema/scalar_spec.rb
 - spec/graphql/schema/timeout_middleware_spec.rb
@@ -1410,8 +1419,12 @@ test_files:
 - spec/fixtures/upgrader/blame_range.transformed.rb
 - spec/fixtures/upgrader/date_time.original.rb
 - spec/fixtures/upgrader/date_time.transformed.rb
+- spec/fixtures/upgrader/delete_project.original.rb
+- spec/fixtures/upgrader/delete_project.transformed.rb
 - spec/fixtures/upgrader/gist_order_field.original.rb
 - spec/fixtures/upgrader/gist_order_field.transformed.rb
+- spec/fixtures/upgrader/increment_count.original.rb
+- spec/fixtures/upgrader/increment_count.transformed.rb
 - spec/fixtures/upgrader/release_order.original.rb
 - spec/fixtures/upgrader/release_order.transformed.rb
 - spec/fixtures/upgrader/starrable.original.rb
@@ -1516,8 +1529,10 @@ test_files:
 - spec/graphql/schema/loader_spec.rb
 - spec/graphql/schema/member/accepts_definition_spec.rb
 - spec/graphql/schema/middleware_chain_spec.rb
+- spec/graphql/schema/mutation_spec.rb
 - spec/graphql/schema/object_spec.rb
 - spec/graphql/schema/printer_spec.rb
+- spec/graphql/schema/relay_classic_mutation_spec.rb
 - spec/graphql/schema/rescue_middleware_spec.rb
 - spec/graphql/schema/scalar_spec.rb
 - spec/graphql/schema/timeout_middleware_spec.rb