apollo-federation 3.5.2 → 3.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8674286a181f04894788b8e1b1ff064dfb2b7a9db566cff6ac31b770821342dc
-  data.tar.gz: 6405fb1eb377c4821f3528b7c69b4ab714564d6739f1020737a4de03e358e7b0
+  metadata.gz: 97086cad340406643d155dd88a41eb47961b98c8c3681153a1845b36c18d4eb6
+  data.tar.gz: 9d9eea749974ca35aade23e0091c655973bf7e3a4315c28f2094530e634a4c8e
 SHA512:
-  metadata.gz: 5799c75a497544ac66591c62020f340e7ca0c44617aefa3076118421d9b0a51eb9a57fafe0b67d3c6753ec9e6d904f2b8f069fc61387b25bf42562d81aeb3c50
-  data.tar.gz: 9929c3f176c3b33d94abdb09a777121909fa353019e0ad4ba2862176e35e77ca1f3fb74edf30b5c283f1f1f99ffadf6a70931e7c62c733a1623e32a051783e33
+  metadata.gz: b5c4ddc7850e680bc751a3ca02eaca4a351e6a32eb8d5abe57b5a0fe596f1fd4627c1370345037bc152c7a24ab22e9360b358e2ed95859336895136315103466
+  data.tar.gz: 30fa2aa83ec1fc4f701347e8c6157042d31283e81756117392a6988a79b95a9397079a36159b30348c678eb0c2d99e73ab163ce6f697a204780e9c489e82e71c

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [3.5.3](https://github.com/Gusto/apollo-federation-ruby/compare/v3.5.2...v3.5.3) (2023-03-17)
+
+
+### Bug Fixes
+
+* Inherit federation directives ([#94](https://github.com/Gusto/apollo-federation-ruby/issues/94)) ([822f92b](https://github.com/Gusto/apollo-federation-ruby/commit/822f92b229f3437c474721082033b74c8cc63553))
+
 ## [3.5.2](https://github.com/Gusto/apollo-federation-ruby/compare/v3.5.1...v3.5.2) (2023-03-08)
 
 

data/README.md

@@ -22,13 +22,21 @@ Or install it yourself as:
 
 ## Getting Started
 
-Include the `ApolloFederation::Field` module in your base field class:
+Include the `ApolloFederation::Argument` module in your base argument class:
 
 ```ruby
-require 'apollo-federation'
+class BaseArgument < GraphQL::Schema::Argument
+  include ApolloFederation::Argument
+end
+```
+
+Include the `ApolloFederation::Field` module in your base field class:
 
+```ruby
 class BaseField < GraphQL::Schema::Field
   include ApolloFederation::Field
+
+  argument_class BaseArgument
 end
 ```
 
@@ -53,6 +61,50 @@ module BaseInterface
 end
 ```
 
+Include the `ApolloFederation::Union` module in your base union class:
+
+```ruby
+class BaseUnion < GraphQL::Schema::Union
+  include ApolloFederation::Union
+end
+```
+
+Include the `ApolloFederation::EnumValue` module in your base enum value class:
+
+```ruby
+class BaseEnumValue < GraphQL::Schema::EnumValue
+  include ApolloFederation::EnumValue
+end
+```
+
+Include the `ApolloFederation::Enum` module in your base enum class:
+
+```ruby
+class BaseEnum < GraphQL::Schema::Enum
+  include ApolloFederation::Enum
+
+  enum_value_class BaseEnumValue
+end
+```
+
+Include the `ApolloFederation::InputObject` module in your base input object class:
+
+```ruby
+class BaseInputObject < GraphQL::Schema::InputObject
+  include ApolloFederation::InputObject
+
+  argument_class BaseArgument
+end
+```
+
+Include the `ApolloFederation::Scalar` module in your base scalar class:
+
+```ruby
+class BaseScalar < GraphQL::Schema::Scalar
+  include ApolloFederation::Scalar
+end
+```
+
 Finally, include the `ApolloFederation::Schema` module in your schema:
 
 ```ruby

data/lib/apollo-federation/argument.rb

@@ -6,7 +6,7 @@ module ApolloFederation
   module Argument
     include HasDirectives
 
-    VERSION_2_DIRECTIVES = %i[tags].freeze
+    VERSION_2_DIRECTIVES = %i[tags inaccessible].freeze
 
     def initialize(*args, **kwargs, &block)
       add_v2_directives(**kwargs)
@@ -22,7 +22,7 @@ module ApolloFederation
 
     private
 
-    def add_v2_directives(tags: [], **_kwargs)
+    def add_v2_directives(tags: [], inaccessible: nil, **_kwargs)
       tags.each do |tag|
         add_directive(
           name: 'tag',
@@ -32,6 +32,8 @@ module ApolloFederation
           ],
         )
       end
+
+      add_directive(name: 'inaccessible') if inaccessible
     end
   end
 end

data/lib/apollo-federation/enum.rb

@@ -14,6 +14,10 @@ module ApolloFederation
       def tag(name:)
         add_directive(name: 'tag', arguments: [name: 'name', values: name])
       end
+
+      def inaccessible
+        add_directive(name: 'inaccessible')
+      end
     end
   end
 end

data/lib/apollo-federation/enum_value.rb

@@ -6,7 +6,7 @@ module ApolloFederation
   module EnumValue
     include HasDirectives
 
-    VERSION_2_DIRECTIVES = %i[tags].freeze
+    VERSION_2_DIRECTIVES = %i[tags inaccessible].freeze
 
     def initialize(*args, **kwargs, &block)
       add_v2_directives(**kwargs)
@@ -22,7 +22,7 @@ module ApolloFederation
 
     private
 
-    def add_v2_directives(tags: [], **_kwargs)
+    def add_v2_directives(tags: [], inaccessible: nil, **_kwargs)
       tags.each do |tag|
         add_directive(
           name: 'tag',
@@ -32,6 +32,8 @@ module ApolloFederation
           ],
         )
       end
+
+      add_directive(name: 'inaccessible') if inaccessible
     end
   end
 end

data/lib/apollo-federation/has_directives.rb

@@ -2,11 +2,20 @@
 
 module ApolloFederation
   module HasDirectives
-    attr_reader :federation_directives
-
     def add_directive(name:, arguments: nil)
-      @federation_directives ||= []
-      @federation_directives << { name: name, arguments: arguments }
+      own_federation_directives << { name: name, arguments: arguments }
+    end
+
+    def federation_directives
+      if is_a?(Class)
+        own_federation_directives + find_inherited_value(:federation_directives, [])
+      else
+        own_federation_directives
+      end
+    end
+
+    def own_federation_directives
+      @own_federation_directives ||= []
     end
   end
 end

data/lib/apollo-federation/input_object.rb

@@ -14,6 +14,10 @@ module ApolloFederation
       def tag(name:)
         add_directive(name: 'tag', arguments: [name: 'name', values: name])
       end
+
+      def inaccessible
+        add_directive(name: 'inaccessible')
+      end
     end
   end
 end

data/lib/apollo-federation/scalar.rb

@@ -14,6 +14,10 @@ module ApolloFederation
       def tag(name:)
         add_directive(name: 'tag', arguments: [name: 'name', values: name])
       end
+
+      def inaccessible
+        add_directive(name: 'inaccessible')
+      end
     end
   end
 end

data/lib/apollo-federation/schema.rb

@@ -22,7 +22,7 @@ module ApolloFederation
       end
 
       def federation_version
-        @federation_version || '1.0'
+        @federation_version || find_inherited_value(:federation_version, '1.0')
       end
 
       def federation_2?
@@ -38,7 +38,7 @@ module ApolloFederation
       end
 
       def link_namespace
-        @link[:as]
+        @link ? @link[:as] : find_inherited_value(:link_namespace)
       end
 
       def query(new_query_object = nil)

data/lib/apollo-federation/union.rb

@@ -14,6 +14,10 @@ module ApolloFederation
       def tag(name:)
         add_directive(name: 'tag', arguments: [name: 'name', values: name])
       end
+
+      def inaccessible
+        add_directive(name: 'inaccessible')
+      end
     end
   end
 end

data/lib/apollo-federation/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apollo-federation
 version: !ruby/object:Gem::Version
-  version: 3.5.2
+  version: 3.5.3
 platform: ruby
 authors:
 - Noa Elad
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-08 00:00:00.000000000 Z
+date: 2023-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql