graphql 0.15.0 → 0.15.1

data/lib/graphql/language/parser.y

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

data/lib/graphql/query/executor.rb

@@ -25,8 +25,8 @@ module GraphQL
         return {} if operation.nil?
 
         op_type = operation.operation_type
-        root_type = query.schema.public_send(op_type)
-        execution_strategy_class = query.schema.public_send("#{op_type}_execution_strategy")
+        root_type = query.schema.root_type_for_operation(op_type)
+        execution_strategy_class = query.schema.execution_strategy_for_operation(op_type)
         execution_strategy = execution_strategy_class.new
 
         query.context.execution_strategy = execution_strategy

data/lib/graphql/schema.rb

@@ -92,5 +92,31 @@ 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.public_send(node.operation_type)
+          object_type = stack.schema.root_type_for_operation(node.operation_type)
           stack.object_types.push(object_type)
         end
 

data/lib/graphql/version.rb

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

data/readme.md

@@ -123,6 +123,7 @@ If you're building a backend for [Relay](http://facebook.github.io/relay/), you'
   - Support type name for field types?
 - Add a complexity validator (reject queries if they're too big)
 - Add docs for shared behaviors & DRY code
+- Proper error on unknown directive
 - __Subscriptions__
   - This is a good chance to make an `Operation` abstraction of which `query`, `mutation` and `subscription` are members
   - For a subscription, `graphql` would send an outbound message to the system (allow the host application to manage its own subscriptions via Pusher, ActionCable, whatever)

metadata

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