apollo-federation 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d3f90f1f5c832b3a29e663d64e80cc410b410c7c38dc04bf1eb7feb1d8bb5fa
-  data.tar.gz: 28da5806afb3b73b607ad6e3e4fa949c9e81e3a3984d2a1e402bac97429dc209
+  metadata.gz: 9162a13344ba2374500711c42e7a3ae210bc12ba29747ab421e7b8bb2a8c36e4
+  data.tar.gz: 963f3b9efabca3efb67617598be416b6a0f6aa15bd630b25749093bf40b0bd6e
 SHA512:
-  metadata.gz: b4748b68638d6051d49a78659a9a568b3bca5f4ac98d8628ff6e4edba281a0aaf5d6baef21f215f6d93e6dd3e2948b9826ca35495de64fdf10a59b745b26ed4c
-  data.tar.gz: 1512dc028abf4cb815566b44ac1183081c872bfc7e4e50411a10fdc3fb9e9e8bfb949b5399884766defdd602220d5f248051f8fa478af90ce73fbbda77b31dcd
+  metadata.gz: 7a6a6ed04335cf873ba2a8589058d6960a4e1be29cc97deafab809c6bce682d7c66256290d56663b2e2f7bd5215e405f3c1a655f723494dfd1e39a9b97ded380
+  data.tar.gz: 0bcceb1c673ecbb8c1d934219f29364433b7bd4208bf6b9a69bfe465f732cb531680637dd7258f7e6f948527f5c8f8cd24b6a75f6f49d75918013db4e9ec929d

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [1.0.4](https://github.com/Gusto/apollo-federation-ruby/compare/v1.0.3...v1.0.4) (2020-04-06)
+
+
+### Bug Fixes
+
+* Fix spec to account for breaking change to graphql-ruby 1.10.0 ([#62](https://github.com/Gusto/apollo-federation-ruby/issues/62)) ([a631441](https://github.com/Gusto/apollo-federation-ruby/commit/a631441))
+
 ## [1.0.3](https://github.com/Gusto/apollo-federation-ruby/compare/v1.0.2...v1.0.3) (2020-03-25)
 
 

data/lib/apollo-federation/schema.rb

@@ -15,38 +15,42 @@ module ApolloFederation
       def to_graphql
         orig_defn = super
 
-        if query.nil?
-          base = GraphQL::Schema::Object
-        else
-          base = query.metadata[:type_class]
-        end
-
-        federation_query = Class.new(base) do
-          graphql_name 'Query'
-
-          include EntitiesField
-          include ServiceField
-        end
-
         possible_entities = orig_defn.types.values.select do |type|
           !type.introspection? && !type.default_scalar? && type.is_a?(GraphQL::ObjectType) &&
             type.metadata[:federation_directives]&.any? { |directive| directive[:name] == 'key' }
         end
 
+        @query_object = federation_query
+
         if !possible_entities.empty?
           entity_type = Class.new(Entity) do
             possible_types(*possible_entities)
           end
           # TODO: Should/can we encapsulate all of this inside the module? What's the best/most Ruby
           # way to split this out?
-          federation_query.define_entities_field(entity_type)
+          @query_object.define_entities_field(entity_type)
         end
 
-        query(federation_query)
-
         super
       end
 
+      def federation_query
+        if query.nil?
+          base = GraphQL::Schema::Object
+        elsif Gem::Version.new(GraphQL::VERSION) >= Gem::Version.new('1.10.0')
+          base = query
+        else
+          base = query.metadata[:type_class]
+        end
+
+        Class.new(base) do
+          graphql_name 'Query'
+
+          include EntitiesField
+          include ServiceField
+        end
+      end
+
       def federation_sdl(context: nil)
         document_from_schema = FederatedDocumentFromSchemaDefinition.new(self, context: context)
         GraphQL::Language::Printer.new.print(document_from_schema.document)

data/lib/apollo-federation/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ApolloFederation
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apollo-federation
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Noa Elad
@@ -9,20 +9,20 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-25 00:00:00.000000000 Z
+date: 2020-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.9.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.9.8
 - !ruby/object:Gem::Dependency