graphql-rails 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1ed634405b822417ac8233e7142da5423577846
-  data.tar.gz: 23f85a17aa056fa70e98be01a10599185213e0a2
+  metadata.gz: 057f13274ec2fa2303ce2a0e8c9cfc5a9aa9be78
+  data.tar.gz: 0a33325845d6af90994ad94e164e6f1a56fa14c8
 SHA512:
-  metadata.gz: f61c5ffc5274b98cb37c88c33c9d7bfa79f812e8f0da07bd71e7a9473b0b7ebbb5e660d74a85898f42da042a508d73077d7c1203b776ba1fae4e9b9e2860888e
-  data.tar.gz: 61110d68962bba071490b8d86bfe7dc71675bab7aa35e0c3f1f6bb24827eb807ab917c27fac20e697384fa5e20f771dc518c752397725a82eb9507629dbd73a8
+  metadata.gz: 757acce6e810e6b54dfeb031803f1c84579fd5c628f85d95234b4a187e61333f4e08157fc3b2409be9c8868d09b4298d0c1dd57abe3f1bfa01e208a32a4132e2
+  data.tar.gz: 5b61fef40d244b6971086d7c431d640ed5fbc34c57886e1dd526a69140aee0edb2b77839efe106e82632bd5743d1fcb1aa9bb4cdee09c520d7c03b3390547d9d

data/lib/graphql/rails.rb

@@ -11,6 +11,7 @@ require 'graphql/rails/engine'
 
 require 'graphql/rails/dsl'
 require 'graphql/rails/types'
+require 'graphql/rails/fields'
 require 'graphql/rails/schema'
 require 'graphql/rails/callbacks'
 require 'graphql/rails/operations'

data/lib/graphql/rails/fields.rb

@@ -0,0 +1,11 @@
+module GraphQL
+  module Rails
+    # Object that transforms key lookups on an object to the active field
+    # naming convention, delegating all remaining methods as-is.
+    class Fields < SimpleDelegator
+      def [](key)
+        __getobj__[Types.to_field_name(key)]
+      end
+    end
+  end
+end

data/lib/graphql/rails/operations.rb

@@ -62,7 +62,7 @@ module GraphQL
       def self.mutation(hash, &block)
         hash = extract_pair(hash)
         unless hash[:type].is_a?(Hash)
-          raise 'Mutations must be specified with Hash results'
+          raise 'Mutation must be specified with a Hash result type'
         end
         Rails.logger.debug "Adding mutation: #{Types.to_field_name(hash[:name])}"
 
@@ -112,11 +112,11 @@ module GraphQL
         end
 
         def resolve(&block)
-          field.resolve = -> (obj, args, ctx) do
+          @field.resolve = -> (obj, args, ctx) do
             # Instantiate the Operations class with state on this query.
             instance = @klass.new({
               op: :query, name: @name, type: @type,
-              obj: obj, args: args, ctx: ctx, context: ctx
+              obj: obj, args: Fields.new(args), ctx: ctx, context: ctx
             })
 
             begin
@@ -165,8 +165,9 @@ module GraphQL
         end
 
         def field
+          # Build input object according to mutation specification.
           input = @input
-          input.name = "#{@field.name}Input"
+          input.name = "#{@name.to_s.camelize(:upper)}Input"
           input.description = "Generated input type for #{@field.name}"
           input.arguments['clientMutationId'] = ::GraphQL::Argument.define do
             name 'clientMutationId'
@@ -174,8 +175,9 @@ module GraphQL
             description 'Unique identifier for client performing mutation'
           end
 
+          # Build compound output object according to mutation specification.
           output = @output
-          output.name = "#{@field.name}Output"
+          output.name = "#{@name.to_s.camelize(:upper)}Output"
           output.description = "Generated output type for #{@field.name}"
           output.fields['clientMutationId'] = ::GraphQL::Field.define do
             name 'clientMutationId'
@@ -192,11 +194,11 @@ module GraphQL
         end
 
         def resolve(&block)
-          field.resolve = -> (obj, args, ctx) do
+          @field.resolve = -> (obj, args, ctx) do
             # Instantiate the Operations class with state on this query.
             instance = @klass.new({
               op: :mutation, name: @name, type: @type,
-              obj: obj, args: args[:input], ctx: ctx, context: ctx
+              obj: obj, args: Fields.new(args[:input]), ctx: ctx, context: ctx
             })
 
             begin
@@ -204,7 +206,18 @@ module GraphQL
               instance.run_callbacks(:perform_operation) do
                 # Call out to the app-defined resolver.
                 result = instance.instance_eval(&block)
-                result[:clientMutationId] = args[:clientMutationId]
+
+                # Transform the result keys to the expected convention.
+                unless result.is_a?(::Hash)
+                  raise 'Mutation must resolve to a Hash result'
+                end
+
+                result = result.inject({
+                  'clientMutationId' => args['clientMutationId']
+                }) do |hash, (key, value)|
+                  hash[Types.to_field_name(key)] = value
+                  hash
+                end
                 ::OpenStruct.new(result)
               end
             rescue => e

data/lib/graphql/rails/schema.rb

@@ -26,7 +26,6 @@ module GraphQL
         @schema ||= GraphQL::Schema.new begin
           TYPES.reduce({
             max_depth: Rails.config.max_depth,
-            types: [ExerciseTaskType]
           }) do |schema, type|
             fields = @fields[type]
             unless fields.empty?

data/lib/graphql/rails/version.rb

@@ -1,5 +1,5 @@
 module GraphQL
   module Rails
-    VERSION = '0.0.4'
+    VERSION = '0.0.5'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - James Reggio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-03 00:00:00.000000000 Z
+date: 2016-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -104,6 +104,7 @@ files:
 - lib/graphql/rails/engine.rb
 - lib/graphql/rails/extensions/cancan.rb
 - lib/graphql/rails/extensions/mongoid.rb
+- lib/graphql/rails/fields.rb
 - lib/graphql/rails/node_identification.rb
 - lib/graphql/rails/operations.rb
 - lib/graphql/rails/schema.rb