graphql 1.8.0.pre1 → 1.8.0.pre2

data/spec/graphql/upgrader/member_spec.rb

@@ -0,0 +1,222 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+require './lib/graphql/upgrader/member.rb'
+
+describe GraphQL::Upgrader::Member do
+  def upgrade(old)
+    GraphQL::Upgrader::Member.new(old).upgrade
+  end
+
+  describe 'field arguments' do
+    it 'upgrades' do
+      old = %{argument :status, !TodoStatus, "Restrict items to this status"}
+      new = %{argument :status, TodoStatus, "Restrict items to this status", null: false}
+
+      assert_equal upgrade(old), new
+    end
+  end
+
+  it 'upgrades the property definition to method' do
+    old = %{field :name, String, property: :name}
+    new = %{field :name, String, method: :name, null: false}
+
+    assert_equal upgrade(old), new
+  end
+
+  describe 'name' do
+    it 'removes the name field if it can be inferred from the class' do
+      old = %{
+        UserType = GraphQL::ObjectType.define do
+          name "User"
+        end
+      }
+      new = %{
+        class UserType < BaseObject
+        end
+      }
+      assert_equal upgrade(old), new
+    end
+
+    it 'upgrades the name into graphql_name if it can\'t be inferred from the class' do
+      old = %{
+        TeamType = GraphQL::ObjectType.define do
+          name "User"
+        end
+      }
+      new = %{
+        class TeamType < BaseObject
+          graphql_name "User"
+        end
+      }
+      assert_equal upgrade(old), new
+
+      old = %{
+        UserInterface = GraphQL::InterfaceType.define do
+          name "User"
+        end
+      }
+      new = %{
+        class UserInterface < BaseInterface
+          graphql_name "User"
+        end
+      }
+      assert_equal upgrade(old), new
+
+      old = %{
+        UserInterface = GraphQL::InterfaceType.define do
+          name "User"
+        end
+      }
+      new = %{
+        class UserInterface < BaseInterface
+          graphql_name "User"
+        end
+      }
+      assert_equal upgrade(old), new
+    end
+  end
+
+  describe 'definition' do
+    it 'upgrades the .define into class based definition' do
+      old = %{UserType = GraphQL::ObjectType.define do}
+      new = %{class UserType < BaseObject}
+      assert_equal upgrade(old), new
+
+      old = %{UserInterface = GraphQL::InterfaceType.define do}
+      new = %{class UserInterface < BaseInterface}
+      assert_equal upgrade(old), new
+
+      old = %{UserUnion = GraphQL::UnionType.define do}
+      new = %{class UserUnion < BaseUnion}
+      assert_equal upgrade(old), new
+
+      old = %{UserEnum = GraphQL::EnumType.define do}
+      new = %{class UserEnum < BaseEnum}
+      assert_equal upgrade(old), new
+    end
+
+    it 'upgrades including the module' do
+      old = %{Module::UserType = GraphQL::ObjectType.define do}
+      new = %{class Module::UserType < BaseObject}
+      assert_equal upgrade(old), new
+    end
+  end
+
+  describe 'fields' do
+    it 'upgrades to the new definition' do
+      old = %{field :name, !types.String}
+      new = %{field :name, String, null: false}
+      assert_equal upgrade(old), new
+
+      old = %{field :name, !types.String, "description", method: :name}
+      new = %{field :name, String, "description", method: :name, null: false}
+      assert_equal upgrade(old), new
+
+      old = %{field :name, -> { !types.String }}
+      new = %{field :name, -> { String }, null: false}
+      assert_equal upgrade(old), new
+
+      old = %{connection :name, Name.connection_type, "names"}
+      new = %{field :name, Name.connection_type, "names", null: false, connection: true}
+      assert_equal upgrade(old), new
+
+      old = %{connection :name, !Name.connection_type, "names"}
+      new = %{field :name, Name.connection_type, "names", null: false, connection: true}
+      assert_equal upgrade(old), new
+
+      old = %{field :names, types[types.String]}
+      new = %{field :names, [String], null: false}
+      assert_equal upgrade(old), new
+
+      old = %{field :names, !types[types.String]}
+      new = %{field :names, [String], null: false}
+      assert_equal upgrade(old), new
+
+      old = %{
+        field :name, types.String do
+        end
+      }
+      new = %{
+        field :name, String, null: false do
+        end
+      }
+      assert_equal upgrade(old), new
+
+      old = %{
+        field :name, !types.String do
+        end
+      }
+      new = %{
+        field :name, String, null: false do
+        end
+      }
+      assert_equal upgrade(old), new
+
+      old = %{
+        field :name, -> { !types.String } do
+        end
+      }
+      new = %{
+        field :name, -> { String }, null: false do
+        end
+      }
+      assert_equal upgrade(old), new
+
+      old = %{
+        field :name do
+          type -> { String }
+        end
+      }
+      new = %{
+        field :name, -> { String }, null: false do
+        end
+      }
+      assert_equal upgrade(old), new
+
+      old = %{
+        field :name do
+          type !String
+        end
+      }
+      new = %{
+        field :name, String, null: false do
+        end
+      }
+      assert_equal upgrade(old), new
+
+      old = %{
+        field :name, -> { types.String },
+          "newline description" do
+        end
+      }
+      new = %{
+        field :name, -> { String }, "newline description", null: false do
+        end
+      }
+      assert_equal upgrade(old), new
+
+      old = %{
+        field :name, -> { !types.String },
+          "newline description" do
+        end
+      }
+      new = %{
+        field :name, -> { String }, "newline description", null: false do
+        end
+      }
+      assert_equal upgrade(old), new
+
+      old = %{
+       field :name, String,
+         field: SomeField do
+       end
+      }
+      new = %{
+       field :name, String, field: SomeField, null: false do
+       end
+      }
+      assert_equal upgrade(old), new
+    end
+  end
+end

data/spec/graphql/upgrader/schema_spec.rb

@@ -0,0 +1,82 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+require './lib/graphql/upgrader/schema.rb'
+
+describe GraphQL::Upgrader::Schema do
+  def upgrade(old)
+    GraphQL::Upgrader::Schema.new(old).upgrade
+  end
+
+  it 'updates the definition' do
+    old = %{
+      StarWarsSchema = GraphQL::Schema.define do
+      end
+    }
+    new = %{
+      class StarWarsSchema < GraphQL::Schema
+      end
+    }
+
+    assert_equal upgrade(old), new
+  end
+
+  it 'updates the resolve_type' do
+    old = %{
+      StarWarsSchema = GraphQL::Schema.define do
+        resolve_type ->(obj, ctx) do
+          nil
+        end
+      end
+    }
+    new = %{
+      class StarWarsSchema < GraphQL::Schema
+        def self.resolve_type(obj, ctx)
+          nil
+        end
+      end
+    }
+
+    assert_equal upgrade(old), new
+  end
+
+  it 'updates the object_from_id' do
+    old = %{
+      StarWarsSchema = GraphQL::Schema.define do
+        object_from_id ->(id, ctx) do
+          nil
+        end
+      end
+    }
+    new = %{
+      class StarWarsSchema < GraphQL::Schema
+        def self.object_from_id(id, ctx)
+          nil
+        end
+      end
+    }
+
+    assert_equal upgrade(old), new
+  end
+
+  it 'updates the id_from_object' do
+    old = %{
+      StarWarsSchema = GraphQL::Schema.define do
+        id_from_object -> (object, type_definition, ctx) do
+          nil
+        end
+      end
+    }
+    new = %{
+      class StarWarsSchema < GraphQL::Schema
+        def self.id_from_object(object, type_definition, ctx)
+          nil
+        end
+      end
+    }
+
+    assert_equal upgrade(old), new
+  end
+
+
+end

data/spec/support/dummy/schema.rb

@@ -149,6 +149,15 @@ module Dummy
     field :cheese, CheeseType
   end
 
+  TracingScalarType = GraphQL::ObjectType.define do
+    name "TracingScalar"
+    description "An object which has traced scalars"
+
+    field :traceNil, types.Int
+    field :traceFalse, types.Int, trace: false
+    field :traceTrue, types.Int, trace: true
+  end
+
   DairyProductUnion = GraphQL::UnionType.define do
     name "DairyProduct"
     description "Kinds of food made from milk"
@@ -372,6 +381,16 @@ module Dummy
       resolve ->(t, a, c) { OpenStruct.new(cheese: nil) }
     end
 
+    field :tracingScalar, TracingScalarType do
+      resolve ->(o, a, c) do
+        OpenStruct.new(
+          traceNil: 2,
+          traceFalse: 3,
+          tracetrue: 5,
+        )
+      end
+    end
+
     field :deepNonNull, !DeepNonNullType do
       resolve ->(o, a, c) { :deepNonNull }
     end

data/spec/support/jazz.rb

@@ -110,7 +110,7 @@ module Jazz
   class GloballyIdentifiableType < BaseInterface
     description "A fetchable object in the system"
     field :id, ID, "A unique identifier for this object", null: false
-    field :upcasedId, ID, null: false, upcase: true, method: :id
+    field :upcased_id, ID, null: false, upcase: true, method: :id
 
     module Implementation
       def id
@@ -137,7 +137,7 @@ module Jazz
   # test field inheritance
   class ObjectWithUpcasedName < BaseObject
     # Test extra arguments:
-    field :upcaseName, String, null: false, upcase: true
+    field :upcase_name, String, null: false, upcase: true
 
     def upcase_name
       @object.name # upcase is applied by the superclass
@@ -198,7 +198,7 @@ module Jazz
     implements NamedEntity
     description "Someone who plays an instrument"
     field :instrument, InstrumentType, null: false
-    field :favoriteKey, Key, null: true
+    field :favorite_key, Key, null: true
   end
 
   LegacyInputType = GraphQL::InputObjectType.define do
@@ -207,9 +207,9 @@ module Jazz
   end
 
   class InspectableInput < GraphQL::Schema::InputObject
-    argument :stringValue, String, required: true
-    argument :nestedInput, InspectableInput, required: false
-    argument :legacyInput, LegacyInputType, required: false
+    argument :string_value, String, required: true
+    argument :nested_input, InspectableInput, required: false
+    argument :legacy_input, LegacyInputType, required: false
     def helper_method
       [
         # Context is available in the InputObject
@@ -226,8 +226,8 @@ module Jazz
 
   class InspectableKey < BaseObject
     field :root, String, null: false
-    field :isSharp, Boolean, null: false, method: :sharp
-    field :isFlat, Boolean, null: false, method: :flat
+    field :is_sharp, Boolean, null: false, method: :sharp
+    field :is_flat, Boolean, null: false, method: :flat
   end
 
   class PerformingAct < GraphQL::Schema::Union
@@ -246,20 +246,20 @@ module Jazz
   class Query < BaseObject
     field :ensembles, [Ensemble], null: false
     field :find, GloballyIdentifiableType, null: true do
-      argument :id, ID, required: true, custom: :ok
+      argument :id, ID, required: true
     end
     field :instruments, [InstrumentType], null: false do
       argument :family, Family, required: false
     end
-    field :inspectInput, [String], null: false do
-      argument :input, InspectableInput, required: true
+    field :inspect_input, [String], null: false do
+      argument :input, InspectableInput, required: true, custom: :ok
     end
-    field :inspectKey, InspectableKey, null: false do
+    field :inspect_key, InspectableKey, null: false do
       argument :key, Key, required: true
     end
     field :nowPlaying, PerformingAct, null: false, resolve: ->(o, a, c) { Models.data["Ensemble"].first }
     # For asserting that the object is initialized once:
-    field :objectId, Integer, null: false
+    field :object_id, Integer, null: false
 
     def ensembles
       Models.data["Ensemble"]
@@ -304,7 +304,7 @@ module Jazz
   end
 
   class Mutation < BaseObject
-    field :addEnsemble, Ensemble, null: false do
+    field :add_ensemble, Ensemble, null: false do
       argument :input, EnsembleInput, required: true
     end
 

data/spec/support/star_wars/data.rb

@@ -18,13 +18,12 @@ module StarWars
     'Executor',
   ]
 
-  # ActiveRecord::Base.logger = Logger.new(STDOUT)
   `rm -f ./_test_.db`
   # Set up "Bases" in ActiveRecord
 
   if jruby?
     ActiveRecord::Base.establish_connection(adapter: "jdbcsqlite3", database: "./_test_.db")
-    Sequel.connect('jdbc:sqlite:./_test_.db')
+    DB = Sequel.connect('jdbc:sqlite:./_test_.db')
   elsif ENV['DATABASE'] == 'POSTGRESQL'
     ActiveRecord::Base.establish_connection(
       adapter: "postgresql",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 1.8.0.pre1
+  version: 1.8.0.pre2
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-14 00:00:00.000000000 Z
+date: 2017-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
@@ -372,6 +372,7 @@ files:
 - lib/graphql/execution/directive_checks.rb
 - lib/graphql/execution/execute.rb
 - lib/graphql/execution/flatten.rb
+- lib/graphql/execution/instrumentation.rb
 - lib/graphql/execution/lazy.rb
 - lib/graphql/execution/lazy/lazy_method_map.rb
 - lib/graphql/execution/lazy/resolve.rb
@@ -419,6 +420,7 @@ files:
 - lib/graphql/language.rb
 - lib/graphql/language/comments.rb
 - lib/graphql/language/definition_slice.rb
+- lib/graphql/language/document_from_schema_definition.rb
 - lib/graphql/language/generation.rb
 - lib/graphql/language/lexer.rb
 - lib/graphql/language/lexer.rl
@@ -449,6 +451,7 @@ files:
 - lib/graphql/query/validation_pipeline.rb
 - lib/graphql/query/variable_validation_error.rb
 - lib/graphql/query/variables.rb
+- lib/graphql/railtie.rb
 - lib/graphql/rake_task.rb
 - lib/graphql/rake_task/validate.rb
 - lib/graphql/relay.rb
@@ -552,6 +555,7 @@ files:
 - lib/graphql/tracing.rb
 - lib/graphql/tracing/active_support_notifications_tracing.rb
 - lib/graphql/tracing/appsignal_tracing.rb
+- lib/graphql/tracing/data_dog_tracing.rb
 - lib/graphql/tracing/new_relic_tracing.rb
 - lib/graphql/tracing/platform_tracing.rb
 - lib/graphql/tracing/scout_tracing.rb
@@ -559,6 +563,8 @@ files:
 - lib/graphql/type_kinds.rb
 - lib/graphql/union_type.rb
 - lib/graphql/unresolved_type_error.rb
+- lib/graphql/upgrader/member.rb
+- lib/graphql/upgrader/schema.rb
 - lib/graphql/version.rb
 - readme.md
 - spec/dummy/Gemfile
@@ -891,6 +897,7 @@ files:
 - spec/graphql/directive_spec.rb
 - spec/graphql/enum_type_spec.rb
 - spec/graphql/execution/execute_spec.rb
+- spec/graphql/execution/instrumentation_spec.rb
 - spec/graphql/execution/lazy/lazy_method_map_spec.rb
 - spec/graphql/execution/lazy_spec.rb
 - spec/graphql/execution/multiplex_spec.rb
@@ -912,6 +919,7 @@ files:
 - spec/graphql/introspection/type_by_name_field_spec.rb
 - spec/graphql/introspection/type_type_spec.rb
 - spec/graphql/language/definition_slice_spec.rb
+- spec/graphql/language/document_from_schema_definition_spec.rb
 - spec/graphql/language/equality_spec.rb
 - spec/graphql/language/generation_spec.rb
 - spec/graphql/language/lexer_spec.rb
@@ -947,6 +955,7 @@ files:
 - spec/graphql/schema/enum_spec.rb
 - spec/graphql/schema/field_spec.rb
 - spec/graphql/schema/input_object_spec.rb
+- spec/graphql/schema/instrumentation_spec.rb
 - spec/graphql/schema/interface_spec.rb
 - spec/graphql/schema/loader_spec.rb
 - spec/graphql/schema/middleware_chain_spec.rb
@@ -997,6 +1006,8 @@ files:
 - spec/graphql/tracing/scout_tracing_spec.rb
 - spec/graphql/tracing_spec.rb
 - spec/graphql/union_type_spec.rb
+- spec/graphql/upgrader/member_spec.rb
+- spec/graphql/upgrader/schema_spec.rb
 - spec/rails_dependency_sanity_spec.rb
 - spec/spec_helper.rb
 - spec/support/base_generator_test.rb
@@ -1367,6 +1378,7 @@ test_files:
 - spec/graphql/directive_spec.rb
 - spec/graphql/enum_type_spec.rb
 - spec/graphql/execution/execute_spec.rb
+- spec/graphql/execution/instrumentation_spec.rb
 - spec/graphql/execution/lazy/lazy_method_map_spec.rb
 - spec/graphql/execution/lazy_spec.rb
 - spec/graphql/execution/multiplex_spec.rb
@@ -1388,6 +1400,7 @@ test_files:
 - spec/graphql/introspection/type_by_name_field_spec.rb
 - spec/graphql/introspection/type_type_spec.rb
 - spec/graphql/language/definition_slice_spec.rb
+- spec/graphql/language/document_from_schema_definition_spec.rb
 - spec/graphql/language/equality_spec.rb
 - spec/graphql/language/generation_spec.rb
 - spec/graphql/language/lexer_spec.rb
@@ -1423,6 +1436,7 @@ test_files:
 - spec/graphql/schema/enum_spec.rb
 - spec/graphql/schema/field_spec.rb
 - spec/graphql/schema/input_object_spec.rb
+- spec/graphql/schema/instrumentation_spec.rb
 - spec/graphql/schema/interface_spec.rb
 - spec/graphql/schema/loader_spec.rb
 - spec/graphql/schema/middleware_chain_spec.rb
@@ -1473,6 +1487,8 @@ test_files:
 - spec/graphql/tracing/scout_tracing_spec.rb
 - spec/graphql/tracing_spec.rb
 - spec/graphql/union_type_spec.rb
+- spec/graphql/upgrader/member_spec.rb
+- spec/graphql/upgrader/schema_spec.rb
 - spec/rails_dependency_sanity_spec.rb
 - spec/spec_helper.rb
 - spec/support/base_generator_test.rb