graphql 1.9.2 → 1.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dfc72228ed2ce65697195792c7e58ff2c061435d
-  data.tar.gz: 2ab1fa5308bb89c21319558620a705f5e58fbbdb
+  metadata.gz: fe0eb7f5a621028df479067eb72143c397f34ecd
+  data.tar.gz: db4afa75f08ba2a8a409837c962442b824779e05
 SHA512:
-  metadata.gz: 650ef5ae621e294c2a5242206a0158d58970d40dfe5bace0f863a15e59a533324e2b2c623b7df0b089c2ffa8ebcc0b445b43fe5e3b6c0bb018a9a5a732c74fa2
-  data.tar.gz: 66d3f0113edbcf6562f9a430c59ae569bff7a9f444ced9c5e6fa2eb11a9095f192d57016126c0a69334cf6c58c8f23bffa2a5bafd83214453c205876d8a8e9f9
+  metadata.gz: 9bccb51d411ce789817fa821216eae65c0e88faee075f3859c130ffb10a6c6c8fca7fd1a2455c8aff2d9ba7f7a378804528e4d3f5ea9a579167de10f77234e0a
+  data.tar.gz: dba82fb8a24a3b309701278db3f6d95818090f22f128d3a7ed57703fcef9826949a1eec7449afddc5892b24e08cc1172d3b98c88f80f092dbaf0a06a9674323e

data/lib/graphql/schema/field/scope_extension.rb

@@ -5,11 +5,15 @@ module GraphQL
     class Field
       class ScopeExtension < GraphQL::Schema::FieldExtension
         def after_resolve(value:, context:, **rest)
-          ret_type = @field.type.unwrap
-          if ret_type.respond_to?(:scope_items)
-            ret_type.scope_items(value, context)
-          else
+          if value.nil?
             value
+          else
+            ret_type = @field.type.unwrap
+            if ret_type.respond_to?(:scope_items)
+              ret_type.scope_items(value, context)
+            else
+              value
+            end
           end
         end
       end

data/lib/graphql/schema/subscription.rb

@@ -57,7 +57,7 @@ module GraphQL
       # `:no_response` to return nothing.
       #
       # The default is `:no_response`.
-      def subscribe(args)
+      def subscribe(args = {})
         :no_response
       end
 

data/lib/graphql/static_validation/rules/required_input_object_attributes_are_present.rb

@@ -12,7 +12,20 @@ module GraphQL
       private
 
       def get_parent_type(context, parent)
-        defn = context.field_definition
+        # If argument_definition is defined we're at nested object
+        # and need to refer to the containing input object type rather
+        # than the field_definition.
+        # h/t @rmosolgo
+        arg_defn = context.argument_definition
+
+        # Double checking that arg_defn is an input object as nested
+        # scalars, namely JSON, can make it to this branch
+        defn = if arg_defn && arg_defn.type.unwrap.kind.input_object?
+          arg_defn.type.unwrap
+        else
+          context.field_definition
+        end
+
         parent_type = context.warden.arguments(defn)
           .find{|f| f.name == parent_name(parent, defn) }
         parent_type ? parent_type.type.unwrap : nil

data/lib/graphql/subscriptions.rb

@@ -43,12 +43,12 @@ module GraphQL
       event_name = event_name.to_s
 
       # Try with the verbatim input first:
-      field = @schema.get_field("Subscription", event_name)
+      field = @schema.get_field(@schema.subscription, event_name)
 
       if field.nil?
         # And if it wasn't found, normalize it:
         normalized_event_name = normalize_name(event_name)
-        field = @schema.get_field("Subscription", normalized_event_name)
+        field = @schema.get_field(@schema.subscription, normalized_event_name)
         if field.nil?
           raise InvalidTriggerError, "No subscription matching trigger: #{event_name} (looked for #{@schema.subscription.graphql_name}.#{normalized_event_name})"
         end

data/lib/graphql/tracing/platform_tracing.rb

@@ -35,7 +35,8 @@ module GraphQL
             # Lots of duplicated work here, can this be done ahead of time?
             platform_key = platform_field_key(field.owner, field)
             return_type = field.type.unwrap
-            trace_field = if return_type.kind.scalar? || return_type.kind.enum?
+            # Handle LateBoundTypes, which don't have `#kind`
+            trace_field = if return_type.respond_to?(:kind) && (return_type.kind.scalar? || return_type.kind.enum?)
               (field.trace.nil? && @trace_scalars) || field.trace
             else
               true

data/lib/graphql/unauthorized_error.rb

@@ -15,7 +15,7 @@ module GraphQL
     attr_reader :context
 
     def initialize(message = nil, object: nil, type: nil, context: nil)
-      if message.nil? && object.nil?
+      if message.nil? && object.nil? && type.nil?
         raise ArgumentError, "#{self.class.name} requires either a message or keywords"
       end
 

data/lib/graphql/version.rb

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

data/spec/graphql/authorization_spec.rb

@@ -236,6 +236,10 @@ describe GraphQL::Authorization do
     end
 
     class Query < BaseObject
+      def self.authorized?(obj, ctx)
+        !ctx[:query_unauthorized]
+      end
+
       field :hidden, Integer, null: false
       field :unauthorized, Integer, null: true, method: :itself
       field :int2, Integer, null: true do
@@ -386,7 +390,7 @@ describe GraphQL::Authorization do
         elsif err.object == :replace
           33
         else
-          raise GraphQL::ExecutionError, "Unauthorized #{err.type.graphql_name}: #{err.object}"
+          raise GraphQL::ExecutionError, "Unauthorized #{err.type.graphql_name}: #{err.object.inspect}"
         end
       end
 
@@ -679,7 +683,7 @@ describe GraphQL::Authorization do
             it "adds the error to the errors key" do
               query = "{ unauthorized }"
               response = AuthTest::Schema.execute(query, root_value: :hide)
-              assert_equal ["Unauthorized Query: hide"], response["errors"].map { |e| e["message"] }
+              assert_equal ["Unauthorized Query: :hide"], response["errors"].map { |e| e["message"] }
             end
           end
         end
@@ -820,7 +824,7 @@ describe GraphQL::Authorization do
       assert_nil unauthorized_res["data"].fetch("a")
       assert_equal "b", unauthorized_res["data"]["b"]["value"]
       # Also, the custom handler was called:
-      assert_equal ["Unauthorized UnauthorizedCheckBox: a"], unauthorized_res["errors"].map { |e| e["message"] }
+      assert_equal ["Unauthorized UnauthorizedCheckBox: \"a\""], unauthorized_res["errors"].map { |e| e["message"] }
     end
 
     it "Works for lazy connections" do
@@ -885,7 +889,7 @@ describe GraphQL::Authorization do
 
       res = auth_execute(query)
       # An error from two, values from the others
-      assert_equal ["Unauthorized UnauthorizedCheckBox: a", "Unauthorized UnauthorizedCheckBox: a"], res["errors"].map { |e| e["message"] }
+      assert_equal ["Unauthorized UnauthorizedCheckBox: \"a\"", "Unauthorized UnauthorizedCheckBox: \"a\""], res["errors"].map { |e| e["message"] }
       assert_equal [{"value" => "z"}, {"value" => "z2"}, nil, nil], res["data"]["unauthorizedLazyListInterface"]
     end
 
@@ -897,5 +901,15 @@ describe GraphQL::Authorization do
       res = auth_execute(query, context: { replace_me: false })
       assert_equal false, res["data"]["replacedObject"]["replaced"]
     end
+
+    it "works when the query hook returns false and there's no root object" do
+      query = "{ __typename }"
+      res = auth_execute(query)
+      assert_equal "Query", res["data"]["__typename"]
+
+      unauth_res = auth_execute(query, context: { query_unauthorized: true })
+      assert_nil unauth_res["data"]
+      assert_equal [{"message"=>"Unauthorized Query: nil"}], unauth_res["errors"]
+    end
   end
 end

data/spec/graphql/schema/member/scoped_spec.rb

@@ -13,7 +13,8 @@ describe GraphQL::Schema::Member::Scoped do
         elsif context[:english]
           items.select { |i| i.name == "Paperclip" }
         else
-          []
+          # boot everything
+          items.reject { true }
         end
       end
 
@@ -55,6 +56,12 @@ describe GraphQL::Schema::Member::Scoped do
       field :unscoped_items, [Item], null: false,
         scope: false,
         resolver_method: :items
+
+      field :nil_items, [Item], null: true
+      def nil_items
+        nil
+      end
+
       field :french_items, [FrenchItem], null: false,
         resolver_method: :items
       if TESTING_INTERPRETER
@@ -122,6 +129,19 @@ describe GraphQL::Schema::Member::Scoped do
       assert_equal ["Trombone", "Paperclip"], get_item_names_with_context({}, field_name: "unscopedItems")
     end
 
+    it "returns null when the value is nil" do
+      query_str = "
+      {
+        nilItems {
+          name
+        }
+      }
+      "
+      res = ScopeSchema.execute(query_str)
+      refute res.key?("errors")
+      assert_nil res.fetch("data").fetch("nilItems")
+    end
+
     it "is inherited" do
       assert_equal ["Trombone"], get_item_names_with_context({}, field_name: "frenchItems")
     end

data/spec/graphql/schema/subscription_spec.rb

@@ -87,10 +87,18 @@ describe GraphQL::Schema::Subscription do
       end
     end
 
+    # Like above, but doesn't override #subscription,
+    # to make sure it works without arguments
+    class NewUsersJoined < BaseSubscription
+      field :users, [User], null: true,
+        description: "Includes newly-created users, or all users on the initial load"
+    end
+
     class Subscription < GraphQL::Schema::Object
       extend GraphQL::Subscriptions::SubscriptionRoot
       field :toot_was_tooted, subscription: TootWasTooted
       field :users_joined, subscription: UsersJoined
+      field :new_users_joined, subscription: NewUsersJoined
     end
 
     class Mutation < GraphQL::Schema::Object
@@ -294,6 +302,22 @@ describe GraphQL::Schema::Subscription do
       assert_equal({"data" => {}}, res)
       assert_equal 1, in_memory_subscription_count
     end
+
+    it "works when there are no arguments" do
+      assert_equal 0, in_memory_subscription_count
+
+      res = exec_query <<-GRAPHQL
+      subscription {
+        newUsersJoined {
+          users {
+            handle
+          }
+        }
+      }
+      GRAPHQL
+      assert_equal({"data" => {}}, res)
+      assert_equal 1, in_memory_subscription_count
+    end
   end
 
   describe "updates" do

data/spec/graphql/static_validation/rules/required_input_object_attributes_are_present_spec.rb

@@ -12,6 +12,7 @@ describe GraphQL::StaticValidation::RequiredInputObjectAttributesArePresent do
       yakSource: searchDairy(product: [{source: COW, fatContent: 1.1}]) { __typename }
       badSource: searchDairy(product: [{source: 1.1}]) { __typename }
       missingSource: searchDairy(product: [{fatContent: 1.1}]) { __typename }
+      missingNestedRequiredInputObjectAttribute: searchDairy(product: [{fatContent: 1.2, order_by: {}}]) { __typename }
       listCoerce: cheese(id: 1) { similarCheese(source: YAK) { __typename } }
       missingInputField: searchDairy(product: [{source: YAK, wacky: 1}]) { __typename }
     }
@@ -42,9 +43,21 @@ describe GraphQL::StaticValidation::RequiredInputObjectAttributesArePresent do
         "inputObjectType"=>"DairyProductInput"
       }
     }
+    missing_order_by_direction_error = {
+      "message"=>"Argument 'direction' on InputObject 'ResourceOrderType' is required. Expected type String!",
+      "locations"=>[{"line"=>8, "column"=>100}],
+      "path"=>["query getCheese", "missingNestedRequiredInputObjectAttribute", "product", "order_by", "direction"],
+      "extensions"=>{
+        "code"=>"missingRequiredInputObjectAttribute",
+        "argumentName"=>"direction",
+        "argumentType"=>"String!",
+        "inputObjectType"=>"ResourceOrderType"
+      }
+    }
     it "finds undefined or missing-required arguments to fields and directives" do
       without_error_bubbling(schema) do
         assert_includes(errors, missing_source_error)
+        assert_includes(errors, missing_order_by_direction_error)
         refute_includes(errors, missing_required_field_error)
       end
     end
@@ -52,6 +65,7 @@ describe GraphQL::StaticValidation::RequiredInputObjectAttributesArePresent do
       with_error_bubbling(schema) do
         assert_includes(errors, missing_required_field_error)
         assert_includes(errors, missing_source_error)
+        assert_includes(errors, missing_order_by_direction_error)
       end
     end
   end

data/spec/graphql/tracing/platform_tracing_spec.rb

@@ -37,6 +37,10 @@ describe GraphQL::Tracing::PlatformTracing do
       CustomPlatformTracer::TRACE.clear
     end
 
+    it "runs the introspection query (handles late-bound types)" do
+      assert schema.execute(GraphQL::Introspection::INTROSPECTION_QUERY)
+    end
+
     it "calls the platform's own method with its own keys" do
       schema.execute(" { cheese(id: 1) { flavor } }")
       # This is different because schema/member/instrumentation

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 1.9.2
+  version: 1.9.3
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-15 00:00:00.000000000 Z
+date: 2019-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: benchmark-ips