Skip to content

Commit

Permalink
Uses kwargs instead of defined args
Browse files Browse the repository at this point in the history
  • Loading branch information
Willianvdv authored and rmosolgo committed Jun 26, 2017
1 parent 7267e00 commit 6da5f3a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
4 changes: 2 additions & 2 deletions lib/graphql/execution/multiplex.rb
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ def initialize(schema:, queries:, context:)
end

class << self
def run_all(schema, query_options, context: {}, max_complexity: nil)
def run_all(schema, query_options, *args, **kwargs)
queries = query_options.map { |opts| GraphQL::Query.new(schema, nil, opts) }
run_queries(schema, queries, context: context, max_complexity: max_complexity)
run_queries(schema, queries, *args, **kwargs)
end

# @param schema [GraphQL::Schema]
Expand Down
9 changes: 4 additions & 5 deletions lib/graphql/schema.rb
Original file line number Diff line number Diff line change
Expand Up @@ -222,12 +222,11 @@ def types
# Execute a query on itself. Raises an error if the schema definition is invalid.
# @see {Query#initialize} for arguments.
# @return [Hash] query result, ready to be serialized as JSON
def execute(query_str = nil, max_complexity: nil, **kwargs)
def execute(query_str = nil, **kwargs)
if query_str
kwargs[:query] = query_str
kwargs[:max_complexity] = max_complexity
end
all_results = multiplex([kwargs], max_complexity: max_complexity)
all_results = multiplex([kwargs], max_complexity: kwargs[:max_complexity])
all_results[0]
end

Expand All @@ -249,9 +248,9 @@ def execute(query_str = nil, max_complexity: nil, **kwargs)
# @param queries [Array<Hash>] Keyword arguments for each query
# @param context [Hash] Multiplex-level context
# @return [Array<Hash>] One result for each query in the input
def multiplex(*args, max_complexity: nil, context: {})
def multiplex(*args, **kwargs)
with_definition_error_check {
GraphQL::Execution::Multiplex.run_all(self, *args, context: context, max_complexity: max_complexity)
GraphQL::Execution::Multiplex.run_all(self, *args, **kwargs)
}
end

Expand Down

0 comments on commit 6da5f3a

Please sign in to comment.