graphql 0.14.0 → 0.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3686533835888eeb91ed91024ede7ea3f2937d5c
-  data.tar.gz: 767760791707ac1722002fc7e8b6b182686abeaa
+  metadata.gz: fb9a61168074bd76592f38e2eced93e30a79bcbd
+  data.tar.gz: 4533e8af54fb08af8ec72012fb20d5be69f544e9
 SHA512:
-  metadata.gz: 514195ebd2aff35a181e013af868e78af66fa0ca5cceaafe318c92d30d200241f9531cd630d6c36155dd521cab3cf1f7a4b8fee600dc6bbbd8c8f6430d3dd47f
-  data.tar.gz: 3f5018af47c4e5225eb5f2c00ba8e4a1335e0ac56723908bb7bf8feffde7e567d7ac51f8eca8153249ec56a377b94ac257754694533727537b9d22403a3f12d9
+  metadata.gz: 4c02839e76d229ac5f886544c03711a7d515209a280ac2629ecc79645182fc8e134a02a9f257c4ee3393e23e0d273fe3f2462ba1616f70d09d1ab70a147f7953
+  data.tar.gz: d235b4fe8ad2500e21f0da5b0a4102e916fa2575815ac7f9601c9d5febbcef91a0fa00c093b0239d982c8a60b7319a962d8026ea51ecf5f684eff0633006f17e

data/lib/graphql/define/assign_object_field.rb

@@ -2,7 +2,7 @@ module GraphQL
   module Define
     # Turn field configs into a {GraphQL::Field} and attach it to a {GraphQL::ObjectType} or {GraphQL::InterfaceType}
     module AssignObjectField
-      def self.call(fields_type, name, type = nil, desc = nil, field: nil, property: nil, &block)
+      def self.call(fields_type, name, type = nil, desc = nil, field: nil, deprecation_reason: nil, property: nil, &block)
         if block_given?
           field = GraphQL::Field.define(&block)
         else
@@ -11,6 +11,7 @@ module GraphQL
         type && field.type = type
         desc && field.description = desc
         property && field.property = property
+        deprecation_reason && field.deprecation_reason = deprecation_reason
         field.name ||= name.to_s
         fields_type.fields[name.to_s] = field
       end

data/lib/graphql/directive.rb

@@ -30,6 +30,18 @@ module GraphQL
     def to_s
       "<GraphQL::Directive #{name}>"
     end
+
+    def on_field?
+      locations.include?(FIELD)
+    end
+
+    def on_fragment?
+      locations.include?(FRAGMENT_SPREAD) && locations.include?(INLINE_FRAGMENT)
+    end
+
+    def on_operation?
+      locations.include?(QUERY) && locations.include?(MUTATION) && locations.include?(SUBSCRIPTION)
+    end
   end
 end
 

data/lib/graphql/enum_type.rb

@@ -67,6 +67,7 @@ module GraphQL
     # @param value_name [String] the string representation of this enum value
     # @return [Object] the underlying value for this enum value
     def coerce_non_null_input(value_name)
+      return nil unless @values_by_name.key?(value_name)
       @values_by_name.fetch(value_name).value
     end
 

data/lib/graphql/introspection/directive_type.rb

@@ -5,4 +5,7 @@ GraphQL::Introspection::DirectiveType = GraphQL::ObjectType.define do
   field :description, types.String, "The description for this type"
   field :args, field: GraphQL::Introspection::ArgumentsField
   field :locations, !types[!GraphQL::Introspection::DirectiveLocationEnum]
+  field :onOperation, !types.Boolean, "Does this directive apply to operations?", deprecation_reason: "Moved to 'locations' field", property: :on_operation?
+  field :onFragment, !types.Boolean, "Does this directive apply to fragments?", deprecation_reason: "Moved to 'locations' field", property: :on_fragment?
+  field :onField, !types.Boolean, "Does this directive apply to fields?", deprecation_reason: "Moved to 'locations' field", property: :on_field?
 end

data/lib/graphql/query.rb

@@ -15,15 +15,21 @@ module GraphQL
     # @param query_string [String]
     # @param context [#[]] an arbitrary hash of values which you can access in {GraphQL::Field#resolve}
     # @param variables [Hash] values for `$variables` in the query
-    # @param debug [Boolean] if true, errors are raised, if false, errors are put in the `errors` key
+    # @param debug [Boolean] DEPRECATED if true, errors are raised, if false, errors are put in the `errors` key
     # @param validate [Boolean] if true, `query_string` will be validated with {StaticValidation::Validator}
     # @param operation_name [String] if the query string contains many operations, this is the one which should be executed
     # @param root_value [Object] the object used to resolve fields on the root type
-    def initialize(schema, query_string = nil, document: nil, context: nil, variables: {}, debug: false, validate: true, operation_name: nil, root_value: nil, max_depth: nil)
+    def initialize(schema, query_string = nil, document: nil, context: nil, variables: {}, debug: nil, validate: true, operation_name: nil, root_value: nil, max_depth: nil)
       fail ArgumentError, "a query string or document is required" unless query_string || document
 
       @schema = schema
-      @debug = debug
+      if debug == false
+        warn("Muffling errors with `debug: false` is deprecated and will be removed. For a similar behavior, use `MySchema.middleware << GraphQL::Schema::CatchallMiddleware`.")
+      elsif debug == true
+        warn("`debug:` will be removed from a future GraphQL version (and raising errors will be the default behavior, like `debug: true`)")
+      end
+      @debug = debug || false
+
       @max_depth = max_depth || schema.max_depth
       @context = Context.new(query: self, values: context)
       @root_value = root_value

data/lib/graphql/query/literal_input.rb

@@ -21,7 +21,7 @@ module GraphQL
             arg_value = coerce(arg_defn.type, ast_arg.value, variables)
           end
           if arg_value.nil?
-            arg_value = arg_defn.default_value
+            arg_value = arg_defn.type.coerce_input(arg_defn.default_value)
           end
           values_hash[arg_name] = arg_value
         end

data/lib/graphql/schema.rb

@@ -1,3 +1,4 @@
+require "graphql/schema/catchall_middleware"
 require "graphql/schema/invalid_type_error"
 require "graphql/schema/middleware_chain"
 require "graphql/schema/rescue_middleware"
@@ -51,7 +52,7 @@ module GraphQL
     # @return [GraphQL::Schema::TypeMap] `{ name => type }` pairs of types in this schema
     def types
       @types ||= begin
-        all_types = @orphan_types + [query, mutation, GraphQL::Introspection::SchemaType]
+        all_types = @orphan_types + [query, mutation, subscription, GraphQL::Introspection::SchemaType]
         GraphQL::Schema::ReduceTypes.reduce(all_types.compact)
       end
     end

data/lib/graphql/schema/catchall_middleware.rb

@@ -0,0 +1,34 @@
+module GraphQL
+  class Schema
+    # In early GraphQL versions, errors would be "automatically"
+    # rescued and replaced with `"Internal error"`. That behavior
+    # was undesirable but this middleware is offered for people who
+    # want to preserve it.
+    #
+    # It has a couple of differences from the previous behavior:
+    #
+    # - Other parts of the query _will_ be run (previously,
+    #   execution would stop when the error was raised and the result
+    #   would have no `"data"` key at all)
+    # - The entry in {Query::Context#errors} is a {GraphQL::ExecutionError}, _not_
+    #   the originally-raised error.
+    # - The entry in the `"errors"` key includes the location of the field
+    #   which raised the errors.
+    #
+    # @example Use CatchallMiddleware with your schema
+    #     # All errors will be suppressed and replaced with "Internal error" messages
+    #     MySchema.middleware << GraphQL::Schema::CatchallMiddleware
+    #
+    module CatchallMiddleware
+      MESSAGE = "Internal error"
+
+      # Rescue any error and replace it with a {GraphQL::ExecutionError}
+      # whose message is {MESSAGE}
+      def self.call(parent_type, parent_object, field_definition, field_args, query_context, next_middleware)
+        next_middleware.call
+      rescue StandardError => err
+        GraphQL::ExecutionError.new(MESSAGE)
+      end
+    end
+  end
+end

data/lib/graphql/version.rb

@@ -1,3 +1,3 @@
 module GraphQL
-  VERSION = "0.14.0"
+  VERSION = "0.14.1"
 end

data/spec/graphql/enum_type_spec.rb

@@ -8,6 +8,10 @@ describe GraphQL::EnumType do
     assert_equal(1, enum.coerce_input("COW"))
   end
 
+  it "coerces invalid names to nil" do
+    assert_equal(nil, enum.coerce_input("YAKKITY"))
+  end
+
   it "coerces result values to value's value" do
     assert_equal("YAK", enum.coerce_result("YAK"))
     assert_equal("COW", enum.coerce_result(1))

data/spec/graphql/introspection/directive_type_spec.rb

@@ -4,7 +4,15 @@ describe GraphQL::Introspection::DirectiveType do
   let(:query_string) {%|
     query getDirectives {
       __schema {
-        directives { name, args { name, type { name, ofType { name } } }, locations }
+        directives {
+          name,
+          args { name, type { name, ofType { name } } },
+          locations
+          # Deprecated fields:
+          onField
+          onFragment
+          onOperation
+        }
       }
     }
   |}
@@ -20,6 +28,9 @@ describe GraphQL::Introspection::DirectiveType do
               {"name"=>"if", "type"=>{"name"=>"Non-Null", "ofType"=>{"name"=>"Boolean"}}}
             ],
             "locations"=>["FIELD", "FRAGMENT_SPREAD", "INLINE_FRAGMENT"],
+            "onField" => true,
+            "onFragment" => true,
+            "onOperation" => false,
           },
           {
             "name" => "include",
@@ -27,6 +38,9 @@ describe GraphQL::Introspection::DirectiveType do
               {"name"=>"if", "type"=>{"name"=>"Non-Null", "ofType"=>{"name"=>"Boolean"}}}
             ],
             "locations"=>["FIELD", "FRAGMENT_SPREAD", "INLINE_FRAGMENT"],
+            "onField" => true,
+            "onFragment" => true,
+            "onOperation" => false,
           },
         ]
       }

data/spec/graphql/query_spec.rb

@@ -217,7 +217,9 @@ describe GraphQL::Query do
         variableDefault: searchDairy(product: $searchWithDefault) {
           ... cheeseFields
         }
-
+        convertedDefault: fromSource {
+          ... cheeseFields
+        }
       }
       fragment cheeseFields on Cheese { flavor }
     |}
@@ -244,6 +246,12 @@ describe GraphQL::Query do
         assert_equal("Brie", result["data"]["variableDefault"]["flavor"])
       end
     end
+
+    describe "when the variable has a default needing conversion" do
+      it "uses the converted variable default" do
+        assert_equal([{"flavor" => "Brie"}, {"flavor" => "Gouda"}], result["data"]["convertedDefault"])
+      end
+    end
   end
 
   describe "query variables" do

data/spec/graphql/schema/catchall_middleware_spec.rb

@@ -0,0 +1,32 @@
+require "spec_helper"
+
+describe GraphQL::Schema::CatchallMiddleware do
+  let(:result) { DummySchema.execute(query_string) }
+  let(:query_string) {%| query noMilk { error }|}
+
+  before do
+    DummySchema.middleware << GraphQL::Schema::CatchallMiddleware
+  end
+
+  after do
+    DummySchema.middleware.delete(GraphQL::Schema::CatchallMiddleware)
+  end
+
+  describe "rescuing errors" do
+    let(:errors) { query.context.errors }
+
+    it "turns into error messages" do
+      expected = {
+        "data" => { "error" => nil },
+        "errors"=> [
+          {
+            "message"=>"Internal error",
+            "locations"=>[{"line"=>1, "column"=>17}],
+          },
+        ]
+      }
+      assert_equal(expected, result)
+    end
+  end
+
+end

data/spec/graphql/schema/printer_spec.rb

@@ -71,6 +71,9 @@ type __Directive {
   description: String
   args: [__InputValue!]!
   locations: [__DirectiveLocation!]!
+  onOperation: Boolean!
+  onFragment: Boolean!
+  onField: Boolean!
 }
 
 enum __DirectiveLocation {

data/spec/support/dairy_app.rb

@@ -185,7 +185,7 @@ end
 SourceFieldDefn = Proc.new {
   type GraphQL::ListType.new(of_type: CheeseType)
   description "Cheese from source"
-  argument :source, !DairyAnimalEnum
+  argument :source, DairyAnimalEnum, default_value: "COW"
   resolve -> (target, arguments, context) {
     CHEESES.values.select{ |c| c.source == arguments["source"] }
   }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.14.1
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-31 00:00:00.000000000 Z
+date: 2016-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
@@ -262,6 +262,7 @@ files:
 - lib/graphql/query/variables.rb
 - lib/graphql/scalar_type.rb
 - lib/graphql/schema.rb
+- lib/graphql/schema/catchall_middleware.rb
 - lib/graphql/schema/invalid_type_error.rb
 - lib/graphql/schema/middleware_chain.rb
 - lib/graphql/schema/possible_types.rb
@@ -334,6 +335,7 @@ files:
 - spec/graphql/query/variables_spec.rb
 - spec/graphql/query_spec.rb
 - spec/graphql/scalar_type_spec.rb
+- spec/graphql/schema/catchall_middleware_spec.rb
 - spec/graphql/schema/middleware_chain_spec.rb
 - spec/graphql/schema/printer_spec.rb
 - spec/graphql/schema/reduce_types_spec.rb
@@ -426,6 +428,7 @@ test_files:
 - spec/graphql/query/variables_spec.rb
 - spec/graphql/query_spec.rb
 - spec/graphql/scalar_type_spec.rb
+- spec/graphql/schema/catchall_middleware_spec.rb
 - spec/graphql/schema/middleware_chain_spec.rb
 - spec/graphql/schema/printer_spec.rb
 - spec/graphql/schema/reduce_types_spec.rb