graphql-schema_comparator 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ae1770b6fad8e77502e03cb613fbc5bf5546bc96d535e2af0f622c2794102c0
-  data.tar.gz: 5edcad6f5ce2fea8a2e83c79279e4bee868d5e3507af254176931341d7d46506
+  metadata.gz: fbc98aaf530ce8c60dc291eac091f735180bedd7962f4229d6fc9ad19fcf02a9
+  data.tar.gz: e80de95b6b466297e8c69679cd2f4590f7bc77072573df004b0c8e266e06a9ef
 SHA512:
-  metadata.gz: e10aae6486a79da4eb4e9fb6e3787ac166d5d54848bf2eea37b8885839c83efe8de97af8dc84fa732d7c1582567050b0469fba5d546a85b9183b6ccdcb4582a2
-  data.tar.gz: 1a879654fecfb43824872cf9c4907d4edaa221645d6d91a062b7f933cb0cf0ce43587e6d840451f7027b9da8aed99c45fd8d0af84bc3403901c6a93eb2764cb4
+  metadata.gz: 22b0ef77facfe02f84f0d14004c4576d415d9b3c4b3fe46d06ed0a3750ea302180217c1aec1b54cdefd0517f66a0f89a61789643ad66031766205cc03e95459f
+  data.tar.gz: 4e2251295877a04cfa6e15654470db736a52bda927be70dc0d3846e358d6d6d7d11553a04bfff383eb460d62b466bcb7610d3bb84d16fb613418af8d7884df4c

data/.github/workflows/ci.yml

@@ -1,7 +1,8 @@
 name: Tests
 
 on:
-  push
+  - push
+  - pull_request
 
 jobs:
   test:
@@ -10,11 +11,13 @@ jobs:
       fail-fast: false
       matrix:
         ruby: [2.4, 2.7, '3.0']
+        gemfile: [graphql1.10, graphql1.13, graphql-head]
+    env:
+      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
     steps:
     - uses: actions/checkout@v2
     - uses: ruby/setup-ruby@v1
       with:
         bundler-cache: true
         ruby-version: ${{ matrix.ruby }}
-    - run: bundle install
     - run: bundle exec rake

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 1.1.0 (December 20 2021)
+
+### Bug Fix
+
+  - Adding non-null arguments with a default value should be non-breaking (#38)
+
+### New Features
+
+  - Remove legacy `graphql` gem API usage and support versions >= 1.13 (#46)
+
 ## 1.0.1 (May 26 2021)
 
 ### Bug Fix

data/README.md

@@ -1,6 +1,6 @@
 # GraphQL::SchemaComparator
 
-[![Build Status](https://travis-ci.org/xuorig/graphql-schema_comparator.svg?branch=master)](https://travis-ci.org/xuorig/graphql-schema_comparator)
+![Build status](https://github.com/xuorig/graphql-schema_comparator/actions/workflows/ci.yml/badge.svg)
 
 `GraphQL::SchemaComparator` is a GraphQL Schema comparator. What does that mean? `GraphQL::SchemaComparator` takes
 two GraphQL schemas and outputs a list of changes between versions. This is useful for many things:

data/gemfiles/graphql-head.gemfile

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gem "graphql", "~> 1.13", "< 3.0"
+
+gemspec path: "../"

data/gemfiles/graphql1.10.gemfile

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gem "graphql", "~> 1.10.0"
+
+gemspec path: "../"

data/gemfiles/graphql1.13.gemfile

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gem "graphql", "~> 1.13.0"
+
+gemspec path: "../"

data/graphql-schema_comparator.gemspec

@@ -8,20 +8,25 @@ Gem::Specification.new do |spec|
   spec.version       = GraphQL::SchemaComparator::VERSION
   spec.authors       = ["Marc-Andre Giroux"]
   spec.email         = ["mgiroux0@gmail.com"]
-
   spec.summary       = %q{Compare GraphQL schemas and get the changes that happened.}
-  spec.description   = %q{GraphQL::SchemaComparator compares two GraphQL schemas given their IDL and returns a list of changes.}
-  spec.homepage      = "http://mgiroux.me"
+  spec.description   = %q{GraphQL::SchemaComparator compares two GraphQL schemas given their SDL and returns a list of changes.}
+  spec.homepage      = "https://github.com/xuorig/graphql-schema_comparator"
   spec.license       = "MIT"
-
+  spec.metadata         = {
+    "homepage_uri"    => "https://github.com/xuorig/graphql-schema_comparator",
+    "changelog_uri"   => "https://github.com/xuorig/graphql-schema_comparator/blob/master/CHANGELOG.md",
+    "source_code_uri" => "https://github.com/xuorig/graphql-schema_comparator",
+    "bug_tracker_uri" => "https://github.com/xuorig/graphql-schema_comparator/issues",
+  }
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
+
   spec.bindir        = "bin"
   spec.executables   = ["graphql-schema", "schema_comparator"]
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "graphql", "~> 1.10"
+  spec.add_dependency "graphql", ">= 1.10", "< 3.0"
   spec.add_dependency "thor", ">= 0.19", "< 2.0"
   spec.add_dependency "bundler", ">= 1.14"
 

data/lib/graphql/schema_comparator/changes/criticality.rb

@@ -14,7 +14,7 @@ module GraphQL
         # these changes.
         DANGEROUS = 2
 
-        # Breaking criticality are changes that immediatly impact
+        # Breaking criticality are changes that immediately impact
         # clients usually causing queries not to be valid anymore.
         BREAKING = 3
 

data/lib/graphql/schema_comparator/changes.rb

@@ -51,11 +51,11 @@ module GraphQL
         end
 
         def message
-          "Type `#{removed_type.graphql_definition}` was removed"
+          "Type `#{removed_type.graphql_name}` was removed"
         end
 
         def path
-          removed_type.graphql_definition.to_s
+          removed_type.path
         end
       end
 
@@ -88,11 +88,11 @@ module GraphQL
         end
 
         def message
-          "`#{old_type.graphql_definition}` kind changed from `#{old_type.kind}` to `#{new_type.kind}`"
+          "`#{old_type.graphql_name}` kind changed from `#{old_type.kind}` to `#{new_type.kind}`"
         end
 
         def path
-          old_type.graphql_definition.to_s
+          old_type.path
         end
       end
 
@@ -108,11 +108,11 @@ module GraphQL
         end
 
         def message
-          "Enum value `#{enum_value.graphql_name}` was removed from enum `#{enum_type.graphql_definition}`"
+          "Enum value `#{enum_value.graphql_name}` was removed from enum `#{enum_type.graphql_name}`"
         end
 
         def path
-          [enum_type.graphql_definition, enum_value.graphql_name].join('.')
+          enum_value.path
         end
       end
 
@@ -128,11 +128,11 @@ module GraphQL
         end
 
         def message
-          "Union member `#{union_member.graphql_name}` was removed from Union type `#{union_type.graphql_definition}`"
+          "Union member `#{union_member.graphql_name}` was removed from Union type `#{union_type.graphql_name}`"
         end
 
         def path
-          union_type.graphql_definition.to_s
+          union_type.path
         end
       end
 
@@ -148,11 +148,11 @@ module GraphQL
         end
 
         def message
-          "Input field `#{field.graphql_name}` was removed from input object type `#{input_object_type.graphql_definition}`"
+          "Input field `#{field.graphql_name}` was removed from input object type `#{input_object_type.graphql_name}`"
         end
 
         def path
-          [input_object_type.graphql_definition, field.graphql_name].join('.')
+          field.path
         end
       end
 
@@ -169,11 +169,11 @@ module GraphQL
         end
 
         def message
-          "Argument `#{argument.graphql_name}: #{argument.type.graphql_definition}` was removed from field `#{object_type.graphql_definition}.#{field.graphql_name}`"
+          "Argument `#{argument.graphql_name}: #{argument.type.graphql_name}` was removed from field `#{object_type.graphql_name}.#{field.graphql_name}`"
         end
 
         def path
-          [object_type.graphql_definition, field.graphql_name, argument.graphql_name].join('.')
+          argument.path
         end
       end
 
@@ -233,11 +233,11 @@ module GraphQL
         end
 
         def message
-          "Field `#{field.graphql_name}` was removed from object type `#{object_type.graphql_definition}`"
+          "Field `#{field.graphql_name}` was removed from object type `#{object_type.graphql_name}`"
         end
 
         def path
-          [object_type.graphql_definition, field.graphql_name].join('.')
+          [object_type.graphql_name, field.graphql_name].join(".")
         end
       end
 
@@ -271,11 +271,11 @@ module GraphQL
         end
 
         def message
-          "`#{object_type.graphql_definition}` object type no longer implements `#{interface.graphql_name}` interface"
+          "`#{object_type.graphql_name}` object type no longer implements `#{interface.graphql_name}` interface"
         end
 
         def path
-          object_type.graphql_definition.to_s
+          object_type.path
         end
       end
 
@@ -291,7 +291,7 @@ module GraphQL
         end
 
         def message
-          "Field `#{type.graphql_definition}.#{old_field.graphql_name}` changed type from `#{old_field.type.graphql_definition}` to `#{new_field.type.graphql_definition}`"
+          "Field `#{old_field.path}` changed type from `#{old_field.type.to_type_signature}` to `#{new_field.type.to_type_signature}`"
         end
 
         def criticality
@@ -303,7 +303,7 @@ module GraphQL
         end
 
         def path
-          [type.graphql_definition, old_field.graphql_name].join('.')
+          old_field.path
         end
       end
 
@@ -329,11 +329,11 @@ module GraphQL
         end
 
         def message
-          "Input field `#{input_type.graphql_definition}.#{old_input_field.graphql_name}` changed type from `#{old_input_field.type.graphql_definition}` to `#{new_input_field.type.graphql_definition}`"
+          "Input field `#{path}` changed type from `#{old_input_field.type.to_type_signature}` to `#{new_input_field.type.to_type_signature}`"
         end
 
         def path
-          [input_type.graphql_definition, old_input_field.graphql_name].join('.')
+          old_input_field.path
         end
       end
 
@@ -360,12 +360,12 @@ module GraphQL
         end
 
         def message
-          "Type for argument `#{new_argument.graphql_name}` on field `#{type.graphql_definition}.#{field.graphql_definition.name}` changed"\
-            " from `#{old_argument.type.graphql_definition}` to `#{new_argument.type.graphql_definition}`"
+          "Type for argument `#{new_argument.graphql_name}` on field `#{field.path}` changed"\
+            " from `#{old_argument.type.to_type_signature}` to `#{new_argument.type.to_type_signature}`"
         end
 
         def path
-          [type.graphql_definition, field.graphql_definition.name, old_argument.graphql_name].join('.')
+          old_argument.path
         end
       end
 
@@ -390,7 +390,7 @@ module GraphQL
 
         def message
           "Type for argument `#{new_argument.graphql_name}` on directive `#{directive.graphql_name}` changed"\
-            " from `#{old_argument.type.graphql_definition}` to `#{new_argument.type.graphql_definition}`"
+            " from `#{old_argument.type.to_type_signature}` to `#{new_argument.type.to_type_signature}`"
         end
 
         def path
@@ -452,15 +452,15 @@ module GraphQL
 
         def message
           if old_argument.default_value.nil? || old_argument.default_value == :__no_default__
-            "Default value `#{new_argument.default_value}` was added to argument `#{new_argument.graphql_name}` on field `#{type.graphql_definition}.#{field.graphql_name}`"
+            "Default value `#{new_argument.default_value}` was added to argument `#{new_argument.graphql_name}` on field `#{field.path}`"
           else
-            "Default value for argument `#{new_argument.graphql_name}` on field `#{type.graphql_definition}.#{field.name}` changed"\
+            "Default value for argument `#{new_argument.graphql_name}` on field `#{field.path}` changed"\
               " from `#{old_argument.default_value}` to `#{new_argument.default_value}`"
           end
         end
 
         def path
-          [type.graphql_definition, field.graphql_name, old_argument.graphql_name].join('.')
+          old_argument.path
         end
       end
 
@@ -478,12 +478,12 @@ module GraphQL
         end
 
         def message
-          "Input field `#{input_type.graphql_definition}.#{old_field.graphql_name}` default changed"\
+          "Input field `#{path}` default changed"\
             " from `#{old_field.default_value}` to `#{new_field.default_value}`"
         end
 
         def path
-          [input_type.graphql_definition, old_field.graphql_name].join(".")
+          old_field.path
         end
       end
 
@@ -523,11 +523,11 @@ module GraphQL
         end
 
         def message
-          "Enum value `#{enum_value.graphql_name}` was added to enum `#{enum_type.graphql_definition}`"
+          "Enum value `#{enum_value.graphql_name}` was added to enum `#{enum_type.graphql_name}`"
         end
 
         def path
-          [enum_type.graphql_definition, enum_value.graphql_name].join(".")
+          enum_value.path
         end
       end
 
@@ -544,11 +544,11 @@ module GraphQL
         end
 
         def message
-          "Union member `#{union_member.graphql_name}` was added to Union type `#{union_type.graphql_definition}`"
+          "Union member `#{union_member.graphql_name}` was added to Union type `#{union_type.graphql_name}`"
         end
 
         def path
-          union_type.graphql_definition.to_s
+          union_type.path
         end
       end
 
@@ -565,11 +565,11 @@ module GraphQL
         end
 
         def message
-          "`#{object_type.graphql_definition}` object implements `#{interface.graphql_name}` interface"
+          "`#{object_type.graphql_name}` object implements `#{interface.graphql_name}` interface"
         end
 
         def path
-          object_type.graphql_definition.to_s
+          object_type.path
         end
       end
 
@@ -579,8 +579,8 @@ module GraphQL
         attr_reader :input_object_type, :field, :criticality
 
         def initialize(input_object_type, field)
-          @criticality = if field.type.non_null?
-            Changes::Criticality.breaking(reason: "Adding a non-null field to an existing input type will cause existing queries that use this input type to error because they will not provide a value for this new field.")
+          @criticality = if field.type.non_null? && !field.default_value?
+            Changes::Criticality.breaking(reason: "Adding a non-null input field without a default value to an existing input type will cause existing queries that use this input type to error because they will not provide a value for this new field.")
           else
             Changes::Criticality.non_breaking
           end
@@ -590,11 +590,11 @@ module GraphQL
         end
 
         def message
-          "Input field `#{field.graphql_name}` was added to input object type `#{input_object_type.graphql_definition}`"
+          "Input field `#{field.graphql_name}` was added to input object type `#{input_object_type.graphql_name}`"
         end
 
         def path
-          [input_object_type.graphql_definition, field.graphql_name].join(".")
+          field.path
         end
       end
 
@@ -602,8 +602,8 @@ module GraphQL
         attr_reader :type, :field, :argument, :criticality
 
         def initialize(type, field, argument)
-          @criticality = if argument.type.non_null?
-            Changes::Criticality.breaking(reason: "Adding a required argument to an existing field is a breaking change because it will cause existing uses of this field to error.")
+          @criticality = if argument.type.non_null? && !argument.default_value?
+            Changes::Criticality.breaking(reason: "Adding a required argument without a default value to an existing field is a breaking change because it will cause existing uses of this field to error.")
           else
             Changes::Criticality.non_breaking
           end
@@ -614,11 +614,11 @@ module GraphQL
         end
 
         def message
-          "Argument `#{argument.graphql_name}: #{argument.type.graphql_definition}` added to field `#{type.graphql_definition}.#{field.graphql_name}`"
+          "Argument `#{argument.graphql_name}: #{argument.type.graphql_name}` added to field `#{field.path}`"
         end
 
         def path
-          [type.graphql_definition, field.graphql_name, argument.graphql_name].join(".")
+          argument.path
         end
       end
 
@@ -631,11 +631,11 @@ module GraphQL
         end
 
         def message
-          "Type `#{type.graphql_definition}` was added"
+          "Type `#{type.graphql_name}` was added"
         end
 
         def path
-          type.graphql_definition.to_s
+          type.path
         end
       end
 
@@ -666,11 +666,11 @@ module GraphQL
         end
 
         def message
-          "Description `#{old_type.description}` on type `#{old_type.graphql_definition}` has changed to `#{new_type.description}`"
+          "Description `#{old_type.description}` on type `#{old_type.graphql_name}` has changed to `#{new_type.description}`"
         end
 
         def path
-          old_type.graphql_definition.to_s
+          old_type.path
         end
       end
 
@@ -685,12 +685,12 @@ module GraphQL
         end
 
         def message
-          "Description for enum value `#{enum.graphql_name}.#{new_enum_value.graphql_name}` changed from " \
+          "Description for enum value `#{new_enum_value.path}` changed from " \
             "`#{old_enum_value.description}` to `#{new_enum_value.description}`"
         end
 
         def path
-          [enum.graphql_name, old_enum_value.graphql_name].join(".")
+          old_enum_value.path
         end
       end
 
@@ -706,16 +706,15 @@ module GraphQL
 
         def message
           if old_enum_value.deprecation_reason
-            "Enum value `#{enum.graphql_name}.#{new_enum_value.graphql_name}` deprecation reason changed " \
+            "Enum value `#{new_enum_value.path}` deprecation reason changed " \
               "from `#{old_enum_value.deprecation_reason}` to `#{new_enum_value.deprecation_reason}`"
           else
-            "Enum value `#{enum.graphql_name}.#{new_enum_value.graphql_name}` was deprecated with reason" \
-              " `#{new_enum_value.deprecation_reason}`"
+            "Enum value `#{new_enum_value.path}` was deprecated with reason `#{new_enum_value.deprecation_reason}`"
           end
         end
 
         def path
-          [enum.graphql_name, old_enum_value.graphql_name].join(".")
+          old_enum_value.path
         end
       end
 
@@ -730,12 +729,12 @@ module GraphQL
         end
 
         def message
-          "Input field `#{input_type.graphql_definition}.#{old_field.graphql_name}` description changed"\
+          "Input field `#{old_field.path}` description changed"\
             " from `#{old_field.description}` to `#{new_field.description}`"
         end
 
         def path
-          [input_type.graphql_definition, old_field.graphql_name].join(".")
+          old_field.path
         end
       end
 
@@ -769,12 +768,12 @@ module GraphQL
         end
 
         def message
-          "Field `#{type.graphql_definition}.#{old_field.graphql_name}` description changed"\
+          "Field `#{old_field.path}` description changed"\
             " from `#{old_field.description}` to `#{new_field.description}`"
         end
 
         def path
-          [type.graphql_definition, old_field.graphql_name].join(".")
+          old_field.path
         end
       end
 
@@ -790,12 +789,12 @@ module GraphQL
         end
 
         def message
-          "Description for argument `#{new_argument.graphql_name}` on field `#{type.graphql_definition}.#{field.graphql_name}` changed"\
+          "Description for argument `#{new_argument.graphql_name}` on field `#{field.path}` changed"\
             " from `#{old_argument.description}` to `#{new_argument.description}`"
         end
 
         def path
-          [type.graphql_definition, field.graphql_name, old_argument.graphql_name].join(".")
+          old_argument.path
         end
       end
 
@@ -830,12 +829,12 @@ module GraphQL
         end
 
         def message
-          "Deprecation reason on field `#{type.graphql_definition}.#{new_field.graphql_name}` has changed "\
+          "Deprecation reason on field `#{new_field.path}` has changed "\
             "from `#{old_field.deprecation_reason}` to `#{new_field.deprecation_reason}`"
         end
 
         def path
-          [type.graphql_definition, old_field.graphql_name].join(".")
+          old_field.path
         end
       end
 
@@ -849,11 +848,11 @@ module GraphQL
         end
 
         def message
-          "Field `#{field.graphql_name}` was added to object type `#{object_type.graphql_definition}`"
+          "Field `#{field.graphql_name}` was added to object type `#{object_type.graphql_name}`"
         end
 
         def path
-          [object_type.graphql_definition, field.graphql_name].join(".")
+          [object_type.graphql_name, field.graphql_name].join(".")
         end
       end
 

data/lib/graphql/schema_comparator/diff/argument.rb

@@ -21,7 +21,7 @@ module GraphQL
             changes << Changes::FieldArgumentDefaultChanged.new(type, field, old_arg, new_arg)
           end
 
-          if old_arg.type.graphql_definition != new_arg.type.graphql_definition
+          if old_arg.type.to_type_signature != new_arg.type.to_type_signature
             changes << Changes::FieldArgumentTypeChanged.new(type, field, old_arg, new_arg)
           end
 

data/lib/graphql/schema_comparator/diff/directive.rb

@@ -39,11 +39,11 @@ module GraphQL
         end
 
         def removed_arguments
-          old_arguments.values.select { |arg| !new_arguments[arg.name] }
+          old_arguments.values.select { |arg| !new_arguments[arg.graphql_name] }
         end
 
         def added_arguments
-          new_arguments.values.select { |arg| !old_arguments[arg.name] }
+          new_arguments.values.select { |arg| !old_arguments[arg.graphql_name] }
         end
 
         def each_common_argument(&block)

data/lib/graphql/schema_comparator/diff/directive_argument.rb

@@ -19,7 +19,7 @@ module GraphQL
             changes << Changes::DirectiveArgumentDefaultChanged.new(directive, old_arg, new_arg)
           end
 
-          if old_arg.type.graphql_definition != new_arg.type.graphql_definition
+          if old_arg.type != new_arg.type
             changes << Changes::DirectiveArgumentTypeChanged.new(directive, old_arg, new_arg)
           end
 

data/lib/graphql/schema_comparator/diff/field.rb

@@ -24,7 +24,7 @@ module GraphQL
             changes << Changes::FieldDeprecationChanged.new(new_type, old_field, new_field)
           end
 
-          if old_field.type.graphql_definition != new_field.type.graphql_definition
+          if old_field.type.to_type_signature != new_field.type.to_type_signature
             changes << Changes::FieldTypeChanged.new(new_type, old_field, new_field)
           end
 
@@ -51,12 +51,12 @@ module GraphQL
         )
 
         def arg_removals
-          removed = old_arguments.values.select { |arg| !new_arguments[arg.name] }
+          removed = old_arguments.values.select { |arg| !new_arguments[arg.graphql_name] }
           removed.map { |arg| Changes::FieldArgumentRemoved.new(new_type, old_field, arg) }
         end
 
         def arg_additions
-          removed = new_arguments.values.select { |arg| !old_arguments[arg.name] }
+          removed = new_arguments.values.select { |arg| !old_arguments[arg.graphql_name] }
           removed.map { |arg| Changes::FieldArgumentAdded.new(new_type, new_field, arg) }
         end
 

data/lib/graphql/schema_comparator/diff/input_field.rb

@@ -21,7 +21,7 @@ module GraphQL
             changes << Changes::InputFieldDefaultChanged.new(old_type, old_field, new_field)
           end
 
-          if old_field.type.graphql_definition != new_field.type.graphql_definition
+          if old_field.type.to_type_signature != new_field.type.to_type_signature
             changes << Changes::InputFieldTypeChanged.new(old_type, old_field, new_field)
           end
 

data/lib/graphql/schema_comparator/diff/input_object.rb

@@ -39,11 +39,11 @@ module GraphQL
         end
 
         def removed_fields
-          old_fields.values.select { |field| !new_fields[field.name] }
+          old_fields.values.select { |field| !new_fields[field.graphql_name] }
         end
 
         def added_fields
-          new_fields.values.select { |field| !old_fields[field.name] }
+          new_fields.values.select { |field| !old_fields[field.graphql_name] }
         end
       end
     end

data/lib/graphql/schema_comparator/diff/interface.rb

@@ -2,12 +2,12 @@ module GraphQL
   module SchemaComparator
     module Diff
       class Interface
-        def initialize(old_iface, new_iface)
-          @old_iface = old_iface
-          @new_iface = new_iface
+        def initialize(old_interface, new_interface)
+          @old_interface = old_interface
+          @new_interface = new_interface
 
-          @old_fields = old_iface.fields
-          @new_fields = new_iface.fields
+          @old_fields = old_interface.fields
+          @new_fields = new_interface.fields
         end
 
         def diff
@@ -16,7 +16,7 @@ module GraphQL
           changes += field_additions
 
           each_common_field do |old_field, new_field|
-            changes += Diff::Field.new(old_iface, new_iface, old_field, new_field).diff
+            changes += Diff::Field.new(old_interface, new_interface, old_field, new_field).diff
           end
 
           changes
@@ -24,23 +24,23 @@ module GraphQL
 
         private
 
-        attr_reader :old_iface, :new_iface, :old_fields, :new_fields
+        attr_reader :old_interface, :new_interface, :old_fields, :new_fields
 
         def field_removals
-          removed = old_fields.values.select { |field| !new_fields[field.name] }
-          removed.map { |field| Changes::FieldRemoved.new(old_iface, field) }
+          removed = old_fields.values.select { |field| !new_fields[field.graphql_name] }
+          removed.map { |field| Changes::FieldRemoved.new(old_interface, field) }
         end
 
         def field_additions
-          added = new_fields.values.select { |field| !old_fields[field.name] }
-          added.map { |field| Changes::FieldAdded.new(new_iface, field) }
+          added = new_fields.values.select { |field| !old_fields[field.graphql_name] }
+          added.map { |field| Changes::FieldAdded.new(new_interface, field) }
         end
 
         def each_common_field(&block)
           intersection = old_fields.keys & new_fields.keys
           intersection.each do |common_field|
-            old_field = old_iface.fields[common_field]
-            new_field = new_iface.fields[common_field]
+            old_field = old_interface.fields[common_field]
+            new_field = new_interface.fields[common_field]
 
             block.call(old_field, new_field)
           end

data/lib/graphql/schema_comparator/diff/object_type.rb

@@ -3,8 +3,8 @@ module GraphQL
     module Diff
       class ObjectType
         def initialize(old_type, new_type)
-          @old_type = old_type.graphql_definition
-          @new_type = new_type.graphql_definition
+          @old_type = old_type
+          @new_type = new_type
 
           @old_fields = old_type.fields
           @new_fields = new_type.fields
@@ -41,25 +41,25 @@ module GraphQL
 
         def interface_removals
           removed = filter_interfaces(old_interfaces, new_interfaces)
-          removed.map { |iface| Changes::ObjectTypeInterfaceRemoved.new(iface, old_type) }
+          removed.map { |interface| Changes::ObjectTypeInterfaceRemoved.new(interface, old_type) }
         end
 
         def interface_additions
           added = filter_interfaces(new_interfaces, old_interfaces)
-          added.map { |iface| Changes::ObjectTypeInterfaceAdded.new(iface, new_type) }
+          added.map { |interface| Changes::ObjectTypeInterfaceAdded.new(interface, new_type) }
         end
 
         def filter_interfaces(interfaces, excluded_interfaces)
-          interfaces.select { |interface| !excluded_interfaces.map(&:graphql_definition).include?(interface.graphql_definition) }
+          interfaces.select { |interface| !excluded_interfaces.map(&:graphql_name).include?(interface.graphql_name) }
         end
 
         def field_removals
-          removed = old_fields.values.select { |field| !new_fields[field.name] }
+          removed = old_fields.values.select { |field| !new_fields[field.graphql_name] }
           removed.map { |field| Changes::FieldRemoved.new(old_type, field) }
         end
 
         def field_additions
-          added = new_fields.values.select { |field| !old_fields[field.name] }
+          added = new_fields.values.select { |field| !old_fields[field.graphql_name] }
           added.map { |field| Changes::FieldAdded.new(new_type, field) }
         end
 

data/lib/graphql/schema_comparator/diff/schema.rb

@@ -40,16 +40,16 @@ module GraphQL
           if old_type.kind != new_type.kind
             changes << Changes::TypeKindChanged.new(old_type, new_type)
           else
-            case old_type.graphql_definition
-            when GraphQL::EnumType
+            case old_type.kind.name
+            when "ENUM"
               changes += Diff::Enum.new(old_type, new_type).diff
-            when GraphQL::UnionType
+            when "UNION"
               changes += Diff::Union.new(old_type, new_type).diff
-            when GraphQL::InputObjectType
+            when "INPUT_OBJECT"
               changes += Diff::InputObject.new(old_type, new_type).diff
-            when GraphQL::ObjectType
+            when "OBJECT"
               changes += Diff::ObjectType.new(old_type, new_type).diff
-            when GraphQL::InterfaceType
+            when "INTERFACE"
               changes += Diff::Interface.new(old_type, new_type).diff
             end
           end
@@ -64,15 +64,15 @@ module GraphQL
         def changes_in_schema
           changes = []
 
-          if old_schema.query&.to_graphql != new_schema.query&.to_graphql
+          if old_schema.query&.graphql_name != new_schema.query&.graphql_name
             changes << Changes::SchemaQueryTypeChanged.new(old_schema, new_schema)
           end
 
-          if old_schema.mutation&.to_graphql != new_schema.mutation&.to_graphql
+          if old_schema.mutation&.graphql_name != new_schema.mutation&.graphql_name
             changes << Changes::SchemaMutationTypeChanged.new(old_schema, new_schema)
           end
 
-          if old_schema.subscription&.to_graphql != new_schema.subscription&.to_graphql
+          if old_schema.subscription&.graphql_name != new_schema.subscription&.graphql_name
             changes << Changes::SchemaSubscriptionTypeChanged.new(old_schema, new_schema)
           end
 

data/lib/graphql/schema_comparator/diff/union.rb

@@ -34,7 +34,7 @@ module GraphQL
         end
 
         def filter_types(types, exclude_types)
-          types.select { |type| !exclude_types.map(&:graphql_definition).include?(type.graphql_definition) }
+          types.select { |type| !exclude_types.map(&:graphql_name).include?(type.graphql_name) }
         end
       end
     end

data/lib/graphql/schema_comparator/version.rb

@@ -1,5 +1,5 @@
 module GraphQL
   module SchemaComparator
-    VERSION = "1.0.1"
+    VERSION = "1.1.0"
   end
 end

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: graphql-schema_comparator
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Marc-Andre Giroux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-26 00:00:00.000000000 Z
+date: 2021-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.10'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.10'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -100,7 +106,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
-description: GraphQL::SchemaComparator compares two GraphQL schemas given their IDL
+description: GraphQL::SchemaComparator compares two GraphQL schemas given their SDL
   and returns a list of changes.
 email:
 - mgiroux0@gmail.com
@@ -122,6 +128,9 @@ files:
 - bin/graphql-schema
 - bin/schema_comparator
 - bin/setup
+- gemfiles/graphql-head.gemfile
+- gemfiles/graphql1.10.gemfile
+- gemfiles/graphql1.13.gemfile
 - graphql-schema_comparator.gemspec
 - lib/graphql/schema_comparator.rb
 - lib/graphql/schema_comparator/changes.rb
@@ -132,7 +141,6 @@ files:
 - lib/graphql/schema_comparator/diff/directive_argument.rb
 - lib/graphql/schema_comparator/diff/enum.rb
 - lib/graphql/schema_comparator/diff/field.rb
-- lib/graphql/schema_comparator/diff/has_directives.rb
 - lib/graphql/schema_comparator/diff/input_field.rb
 - lib/graphql/schema_comparator/diff/input_object.rb
 - lib/graphql/schema_comparator/diff/interface.rb
@@ -142,10 +150,14 @@ files:
 - lib/graphql/schema_comparator/result.rb
 - lib/graphql/schema_comparator/version.rb
 - schema.graphql
-homepage: http://mgiroux.me
+homepage: https://github.com/xuorig/graphql-schema_comparator
 licenses:
 - MIT
-metadata: {}
+metadata:
+  homepage_uri: https://github.com/xuorig/graphql-schema_comparator
+  changelog_uri: https://github.com/xuorig/graphql-schema_comparator/blob/master/CHANGELOG.md
+  source_code_uri: https://github.com/xuorig/graphql-schema_comparator
+  bug_tracker_uri: https://github.com/xuorig/graphql-schema_comparator/issues
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -161,7 +173,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Compare GraphQL schemas and get the changes that happened.