graphql 0.14.2 → 0.15.0

data/lib/graphql/language/parser.y

@@ -13,7 +13,7 @@ rule
     | fragment_definition
 
   operation_definition:
-      operation_type operation_name_opt variable_definitions_opt directives_list_opt selection_set {
+      name operation_name_opt variable_definitions_opt directives_list_opt selection_set {
         return  make_node(
           :OperationDefinition, {
             operation_type: val[0],
@@ -34,11 +34,6 @@ rule
         )
       }
 
-  operation_type:
-      QUERY
-    | MUTATION
-    | SUBSCRIPTION
-
   operation_name_opt:
       /* none */ { return nil }
     | name
@@ -121,9 +116,6 @@ rule
     | FRAGMENT
     | TRUE
     | FALSE
-    | QUERY
-    | MUTATION
-    | SUBSCRIPTION
 
   arguments_opt:
       /* none */                    { return [] }

data/lib/graphql/query.rb

@@ -8,28 +8,20 @@ module GraphQL
       end
     end
 
-    attr_reader :schema, :document, :context, :fragments, :operations, :debug, :root_value, :max_depth
+    attr_reader :schema, :document, :context, :fragments, :operations, :root_value, :max_depth
 
     # Prepare query `query_string` on `schema`
     # @param schema [GraphQL::Schema]
     # @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] 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: nil, validate: true, operation_name: nil, root_value: nil, max_depth: nil)
+    def initialize(schema, query_string = nil, document: nil, context: nil, variables: {}, 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
-      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/executor.rb

@@ -8,19 +8,14 @@ module GraphQL
         @query = query
       end
 
-      # Evalute {operation_name} on {query}. Handle errors by putting them in the "errors" key.
-      # (Or, if `query.debug`, by re-raising them.)
+      # Evalute {operation_name} on {query}.
+      # Handle {GraphQL::ExecutionError}s by putting them in the "errors" key.
       # @return [Hash] A GraphQL response, with either a "data" key or an "errors" key
       def result
         execute
       rescue GraphQL::ExecutionError => err
         query.context.errors << err
         {"errors" => [err.to_h]}
-      rescue StandardError => err
-        query.context.errors << err
-        query.debug && raise(err)
-        message = "Internal error" # : #{err} \n#{err.backtrace.join("\n  ")}"
-        {"errors" => [{"message" => message}]}
       end
 
       private
@@ -30,8 +25,8 @@ module GraphQL
         return {} if operation.nil?
 
         op_type = operation.operation_type
-        root_type = query.schema.root_type_for_operation(op_type)
-        execution_strategy_class = query.schema.execution_strategy_for_operation(op_type)
+        root_type = query.schema.public_send(op_type)
+        execution_strategy_class = query.schema.public_send("#{op_type}_execution_strategy")
         execution_strategy = execution_strategy_class.new
 
         query.context.execution_strategy = execution_strategy

data/lib/graphql/query/serial_execution/field_resolution.rb

@@ -22,11 +22,7 @@ module GraphQL
 
         def result
           result_name = ast_node.alias || ast_node.name
-          raw_value = begin
-            get_raw_value
-          rescue GraphQL::ExecutionError => err
-            err
-          end
+          raw_value = get_raw_value
           { result_name => get_finished_value(raw_value) }
         end
 
@@ -49,15 +45,17 @@ module GraphQL
         # Get the result of:
         # - Any middleware on this schema
         # - The field's resolve method
+        # If the middleware chain returns a GraphQL::ExecutionError, its message
+        # is added to the "errors" key.
         def get_raw_value
           steps = execution_context.query.schema.middleware + [get_middleware_proc_from_field_resolve]
           chain = GraphQL::Schema::MiddlewareChain.new(
             steps: steps,
             arguments: [parent_type, target, field, arguments, execution_context.query.context]
           )
-          value = chain.call
-          raise value if value.instance_of?(GraphQL::ExecutionError)
-          value
+          chain.call
+        rescue GraphQL::ExecutionError => err
+          err
         end
 
 

data/lib/graphql/schema.rb

@@ -92,31 +92,5 @@ module GraphQL
       @interface_possible_types ||= GraphQL::Schema::PossibleTypes.new(self)
       @interface_possible_types.possible_types(type_defn)
     end
-
-    def root_type_for_operation(operation)
-      case operation
-      when "query"
-        query
-      when "mutation"
-        mutation
-      when "subscription"
-        subscription
-      else
-        raise ArgumentError, "unknown operation type: #{operation}"
-      end
-    end
-
-    def execution_strategy_for_operation(operation)
-      case operation
-      when "query"
-        query_execution_strategy
-      when "mutation"
-        mutation_execution_strategy
-      when "subscription"
-        subscription_execution_strategy
-      else
-        raise ArgumentError, "unknown operation type: #{operation}"
-      end
-    end
   end
 end

data/lib/graphql/static_validation/type_stack.rb

@@ -76,7 +76,7 @@ module GraphQL
       class OperationDefinitionStrategy
         def push(stack, node)
           # eg, QueryType, MutationType
-          object_type = stack.schema.root_type_for_operation(node.operation_type)
+          object_type = stack.schema.public_send(node.operation_type)
           stack.object_types.push(object_type)
         end
 

data/lib/graphql/version.rb

@@ -1,3 +1,3 @@
 module GraphQL
-  VERSION = "0.14.2"
+  VERSION = "0.15.0"
 end

data/readme.md

@@ -120,8 +120,7 @@ If you're building a backend for [Relay](http://facebook.github.io/relay/), you'
 ## To Do
 
 - __1.0 items:__
-  - Support type name for field types
-  - Revisit error handling & `debug:` option
+  - Support type name for field types?
 - Add a complexity validator (reject queries if they're too big)
 - Add docs for shared behaviors & DRY code
 - __Subscriptions__

data/spec/graphql/query/executor_spec.rb

@@ -1,7 +1,6 @@
 require "spec_helper"
 
 describe GraphQL::Query::Executor do
-  let(:debug) { true }
   let(:operation_name) { nil }
   let(:schema) { DummySchema }
   let(:variables) { {"cheeseId" => 2} }
@@ -9,7 +8,6 @@ describe GraphQL::Query::Executor do
     schema,
     query_string,
     variables: variables,
-    debug: debug,
     operation_name: operation_name,
   )}
   let(:result) { query.result }
@@ -118,25 +116,8 @@ describe GraphQL::Query::Executor do
   describe "runtime errors" do
     let(:query_string) {%| query noMilk { error }|}
 
-    describe "if debug: false" do
-      let(:debug) { false }
-      let(:errors) { query.context.errors }
-
-      it "turns into error messages" do
-        expected = {"errors"=>[
-          {"message"=>"Internal error"}
-        ]}
-        assert_equal(expected, result)
-        assert_equal([RuntimeError], errors.map(&:class))
-        assert_equal("This error was raised on purpose", errors.first.message)
-      end
-    end
-
-    describe "if debug: true" do
-      let(:debug) { true }
-      it "raises error" do
-        assert_raises(RuntimeError) { result }
-      end
+    it "raises error" do
+      assert_raises(RuntimeError) { result }
     end
 
     describe "if nil is given for a non-null field" do

data/spec/graphql/query/serial_execution/execution_context_spec.rb

@@ -7,7 +7,6 @@ describe GraphQL::Query::SerialExecution::ExecutionContext do
     }
     fragment cheeseFields on Cheese { flavor }
   |}
-  let(:debug) { false }
   let(:operation_name) { nil }
   let(:query_variables) { {"cheeseId" => 2} }
   let(:schema) { DummySchema }
@@ -15,7 +14,6 @@ describe GraphQL::Query::SerialExecution::ExecutionContext do
     schema,
     query_string,
     variables: query_variables,
-    debug: debug,
     operation_name: operation_name,
   )}
   let(:execution_context) {

data/spec/graphql/query/serial_execution/value_resolution_spec.rb

@@ -1,7 +1,6 @@
 require "spec_helper"
 
 describe GraphQL::Query::SerialExecution::ValueResolution do
-  let(:debug) { false }
   let(:query_root) {
     day_of_week_enum = GraphQL::EnumType.define do
       name "DayOfWeek"
@@ -34,7 +33,6 @@ describe GraphQL::Query::SerialExecution::ValueResolution do
   let(:schema) { GraphQL::Schema.new(query: query_root) }
   let(:result) { schema.execute(
     query_string,
-    debug: debug,
   )}
 
   describe "enum resolution" do
@@ -55,7 +53,6 @@ describe GraphQL::Query::SerialExecution::ValueResolution do
   end
 
   describe "interface type resolution" do
-    let(:debug) { true }
     let(:query_string) { %|
       {
         misbehavedInterface { someField }

data/spec/graphql/query_spec.rb

@@ -28,7 +28,6 @@ describe GraphQL::Query do
        ... on Milk   { source }
     }
   |}
-  let(:debug) { false }
   let(:operation_name) { nil }
   let(:max_depth) { nil }
   let(:query_variables) { {"cheeseId" => 2} }
@@ -39,7 +38,6 @@ describe GraphQL::Query do
     schema,
     query_string,
     variables: query_variables,
-    debug: debug,
     operation_name: operation_name,
     max_depth: max_depth,
   )}
@@ -51,7 +49,6 @@ describe GraphQL::Query do
         GraphQL::Query.new(
           schema,
           variables: query_variables,
-          debug: debug,
           operation_name: operation_name,
           max_depth: max_depth,
         )
@@ -64,7 +61,6 @@ describe GraphQL::Query do
       schema,
       document: document,
       variables: query_variables,
-      debug: debug,
       operation_name: operation_name,
       max_depth: max_depth,
     )}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 0.14.2
+  version: 0.15.0
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-15 00:00:00.000000000 Z
+date: 2016-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter