hq-graphql 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a158f615a83d3743a038f248bc82c04285631e6575f62b5124bbb5767ab6ede9
-  data.tar.gz: 630bea394ce6e073b1f4ee2bd62047fcf46ba433357d1c759b99d7ecf350bfec
+  metadata.gz: '08dfdf7baf4c44a54bdb3ecb9e0e89baacfaab9e6dda53525a0f8dded456a8c9'
+  data.tar.gz: 2b12d46d565e00710f49618e603c6a88f7fd09cc753d82cb8395b8e2d7f36447
 SHA512:
-  metadata.gz: b6076f33bc12f04a7e701f2deeb7420fc44792af3e99727029196d24d68280276a15c7c8d70d875de82c3ec48e41afdc13b5578a45fbcff2ddcc0edfa8971628
-  data.tar.gz: c85f1b1af47ddee4f049a431277ca63bb1728ab74738fe8bc1bbc0f7b31f9dedd14f12fb850045f82ff301d83729d3f896628154e0fcaecea17c117dfd6140d5
+  metadata.gz: 157d2faad665955ce59916bf809e265ff95f3910c8f2999fb88d697f9b1e8bacf624ee3750a90cdaf38d1777b848659ded147da5669c46b60febe6c5c05e4679
+  data.tar.gz: 2fa8a1a3b59f900553eb91673dc5b86daf9e25ad35d45ada3ee0cb8799882a4de9da7a3f5e59e82ebd24570f1eb86cb0813ebea959462fd3248495eb61538f13

data/lib/hq/graphql/comparator.rb

@@ -13,26 +13,32 @@ module HQ
         non_breaking: 2
       }
 
-      class << self
-        def compare(old_schema, new_schema, criticality: :breaking)
-          old_schema.load_types! if old_schema < ::GraphQL::Schema
-          new_schema.load_types! if old_schema < ::GraphQL::Schema
-          level = CRITICALITY[criticality]
-          raise ::ArgumentError, "Invalid criticality. Possible values are #{CRITICALITY.keys.join(", ")}" unless level
+      def self.compare(old_schema, new_schema, criticality: :breaking)
+        level = CRITICALITY[criticality]
+        raise ::ArgumentError, "Invalid criticality. Possible values are #{CRITICALITY.keys.join(", ")}" unless level
+
+        result = ::GraphQL::SchemaComparator.compare(prepare_schema(old_schema), prepare_schema(new_schema))
+        return if result.identical?
+        changes = {}
+        changes[:breaking] = result.breaking_changes
+        if level >= CRITICALITY[:dangerous]
+          changes[:dangerous] = result.dangerous_changes
+        end
+        if level >= CRITICALITY[:non_breaking]
+          changes[:non_breaking] = result.non_breaking_changes
+        end
+        return unless changes.values.flatten.any?
 
-          result = ::GraphQL::SchemaComparator.compare(old_schema, new_schema)
-          return nil if result.identical?
-          changes = {}
-          changes[:breaking] = result.breaking_changes
-          if level >= CRITICALITY[:dangerous]
-            changes[:dangerous] = result.dangerous_changes
-          end
-          if level >= CRITICALITY[:non_breaking]
-            changes[:non_breaking] = result.non_breaking_changes
-          end
-          return nil unless changes.values.flatten.any?
+        changes
+      end
+
+      class << self
+        private
 
-          changes
+        def prepare_schema(schema)
+          schema = ::GraphQL::Schema.from_definition(schema) if schema.is_a?(String)
+          schema.load_types!
+          schema
         end
       end
     end

data/lib/hq/graphql/ext/schema_extensions.rb

@@ -5,8 +5,8 @@ module HQ
     module Ext
       module SchemaExtensions
         def self.prepended(klass)
-          klass.alias_method :add_type_without_lazyload, :add_type
-          klass.alias_method :add_type, :add_type_with_lazyload
+          klass.alias_method :add_type_and_traverse_without_types, :add_type_and_traverse
+          klass.alias_method :add_type_and_traverse, :add_type_and_traverse_with_types
         end
 
         def execute(*args, **options)
@@ -30,17 +30,17 @@ module HQ
 
         def load_types!
           ::HQ::GraphQL.load_types!
-          return if @add_type_with_lazyload.blank?
-          while (args, options = @add_type_with_lazyload.shift)
-            add_type_without_lazyload(*args, **options)
+          return if @add_type_and_traverse_with_types.blank?
+          while (args, options = @add_type_and_traverse_with_types.shift)
+            add_type_and_traverse_without_types(*args, **options)
           end
         end
 
         # Defer adding types until first schema execution
-        # https://github.com/rmosolgo/graphql-ruby/blob/792f276444e1dd6004fcafe3820d65fdbbe285f0/lib/graphql/schema.rb#L1888-L1980
-        def add_type_with_lazyload(*args, **options)
-          @add_type_with_lazyload ||= []
-          @add_type_with_lazyload.push([args, options])
+        # https://github.com/rmosolgo/graphql-ruby/blob/345ebb2e3833909963067d81e0e8378717b5bdbf/lib/graphql/schema.rb#L1792
+        def add_type_and_traverse_with_types(*args, **options)
+          @add_type_and_traverse_with_types ||= []
+          @add_type_and_traverse_with_types.push([args, options])
         end
       end
     end

data/lib/hq/graphql/version.rb

@@ -2,6 +2,6 @@
 
 module HQ
   module GraphQL
-    VERSION = "2.2.0"
+    VERSION = "2.2.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hq-graphql
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Danny Jones
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-01 00:00:00.000000000 Z
+date: 2021-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails