graphql 1.5.8 → 1.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 96bef39c8a37b049f8843e78d2f15f1c10430d16
-  data.tar.gz: 23c0c140f6e0bba9fc17468b702102d61cd48044
+  metadata.gz: 0f7fde27f1042e7ab45a94bf130bd0bf6575fdde
+  data.tar.gz: 22ce0c200aafaf86c07305fc576629df0c739edb
 SHA512:
-  metadata.gz: f5e3451aa0669e2896255851dcfdae11fae11e190db815d2b322076915633f482eef27749374cdab094fdd456ba6420afce12b075f25a71aa709da57374184f3
-  data.tar.gz: 442f220e5edf3087e9bc4fed9fa263096a551c66d88d01f03d58fe431eee72a7fb9067a54569d4f33768a2ebb274f8ec91e4492223281febe29eb12164039c87
+  metadata.gz: 4977dac7e103cebfded6ce613df88651bc5f24a977067a432b3609bb0c3d3e8d7ea90bb161401c7de510cac552582c0c7a396945d8980b2af43e2178fca60e32
+  data.tar.gz: a18ad101dbc96bef323c38a2f07e92e1f46a7addbe5dcb0035db6995b4ce399d87acaf3b688b94742f572ee0c4abe20765afc09cfe623a6defc5318466fc9eff

data/lib/graphql/interface_type.rb

@@ -47,6 +47,8 @@ module GraphQL
       fields[field_name]
     end
 
+    # These fields don't have instrumenation applied
+    # @see [Schema#get_fields] Get fields with instrumentation
     # @return [Array<GraphQL::Field>] All fields on this type
     def all_fields
       fields.values

data/lib/graphql/object_type.rb

@@ -73,11 +73,15 @@ module GraphQL
       GraphQL::TypeKinds::OBJECT
     end
 
+    # This fields doesnt have instrumenation applied
+    # @see [Schema#get_field] Get field with instrumentation
     # @return [GraphQL::Field] The field definition for `field_name` (may be inherited from interfaces)
     def get_field(field_name)
       fields[field_name] || interface_fields[field_name]
     end
 
+    # These fields don't have instrumenation applied
+    # @see [Schema#get_fields] Get fields with instrumentation
     # @return [Array<GraphQL::Field>] All fields, including ones inherited from interfaces
     def all_fields
       interface_fields.merge(self.fields).values

data/lib/graphql/schema.rb

@@ -238,6 +238,12 @@ module GraphQL
       end
     end
 
+    # Fields for this type, after instrumentation is applied
+    # @return [Hash<String, GraphQL::Field>]
+    def get_fields(type)
+      @instrumented_field_map.get_all(type.name)
+    end
+
     def type_from_ast(ast_node)
       GraphQL::Schema::TypeExpression.build_type(self.types, ast_node)
     end

data/lib/graphql/schema/instrumented_field_map.rb

@@ -29,8 +29,11 @@ module GraphQL
       end
 
       def get(type_name, field_name)
-        type = @storage[type_name]
-        type && type[field_name]
+        @storage[type_name][field_name]
+      end
+
+      def get_all(type_name)
+        @storage[type_name]
       end
     end
   end

data/lib/graphql/schema/warden.rb

@@ -92,7 +92,7 @@ module GraphQL
       # @param type_defn [GraphQL::ObjectType, GraphQL::InterfaceType]
       # @return [Array<GraphQL::Field>] Fields on `type_defn`
       def fields(type_defn)
-        @visible_fields ||= read_through { |t| t.all_fields.select { |f| visible_field?(f) } }
+        @visible_fields ||= read_through { |t| @schema.get_fields(t).each_value.select { |f| visible_field?(f) } }
         @visible_fields[type_defn]
       end
 

data/lib/graphql/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module GraphQL
-  VERSION = "1.5.8"
+  VERSION = "1.5.9"
 end

data/spec/graphql/introspection/type_type_spec.rb

@@ -128,6 +128,28 @@ describe GraphQL::Introspection::TypeType do
           }}
         assert_equal(expected, result)
       end
+
+      it "includes Relay fields" do
+        res = StarWars::Schema.execute <<-GRAPHQL
+        {
+          __schema {
+            types {
+              name
+              fields {
+                name
+                args { name }
+              }
+            }
+          }
+        }
+        GRAPHQL
+
+        type_result = res["data"]["__schema"]["types"].find { |t| t["name"] == "Faction" }
+        field_result = type_result["fields"].find { |f| f["name"] == "bases" }
+        all_arg_names = ["first", "after", "last", "before", "nameIncludes"]
+        returned_arg_names = field_result["args"].map { |a| a["name"] }
+        assert_equal all_arg_names, returned_arg_names
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 1.5.8
+  version: 1.5.9
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-18 00:00:00.000000000 Z
+date: 2017-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: benchmark-ips