graphql-api 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d652e6c292fe53b4eaa24a3dfb39b249da991a2c
-  data.tar.gz: 3432f617ad13ad0ab88e9e97e9ffa9f4796646d9
+  metadata.gz: 477daabc28be110eb038b74769ba03c0aafa0362
+  data.tar.gz: fbe73ba70e1eaf7f31c3b6e63eeb6c3f0f0d5be2
 SHA512:
-  metadata.gz: f3e0045fa5285925525d48e3d5f33fdddb100add30c96dbb0165ce2da8f14d9a215d71edba21be5597302847339df686b75e6a378a37405771480919c212e487
-  data.tar.gz: 73bf40bf5b59c763b5c1906e5933d78a1ba9c357a4ee2c63296e90b2713f7f6c08d0c114d0eff119fca6c3a2a5f12faa470c4c331f8a5c37c706c7346a7b32d0
+  metadata.gz: ad96e49af75b0e1e957d681b07e0654da9f92bddcc9f191e373ac97cb80bc2398cdd346ef229e772a46210d0a176515cdfbe845e072fc9fbbba53cc10a212e55
+  data.tar.gz: 63d532a93ea3d90fe477d8111e257831ebbc25bce61b840208c8b313d75f13710dd01adba7feae304eceaa6ebc2156ffc34f9d6aa077869115a1e34719d85ca0

data/README.md

@@ -183,7 +183,35 @@ They take a set of inputs as well as a graphql context and provide a
 `perform` method that returns a Graphql understandable type. These objects
 give you an object oriented abstraction for handling mutations.
 
-Command objects must implement the interface defined in `GraphQL::Api::CommandType`
+Command objects must implement the interface defined in `GraphQL::Api::CommandType`.
+
+To better model controllers, you can define the commands `actions` this
+will allow a command to respond to multiple methods on the same class. For
+example, the following code will model a restful controller using commands.
+The mutation will be prefixed with the action name. For example, the code
+below will create a `updateBlogCommand` mutation as well as a `deleteBlogCommand`.
+
+```ruby
+class BlogCommand < GraphQL::Api::CommandType
+  inputs name: :string, tags: [:string], id: :integer
+  returns blog: Blog
+  
+  # this tells GraphQL-Api to make two mutations that call the below methods.
+  actions :update, :delete
+
+  def update
+    blog = Blog.find(inputs[:id])
+    blog.update!(inputs.to_h)
+    {blog: blog}
+  end
+
+  def delete
+    blog = Blog.find(inputs[:id]).destroy!
+    {blog: blog}
+  end
+
+end
+```
 
 ### Query Objects
 

data/lib/graphql/api/command_type.rb

@@ -17,6 +17,11 @@ module GraphQL::Api
       @returns || {}
     end
 
+    def self.actions(*actions)
+      @actions = actions if actions.any?
+      @actions || []
+    end
+
     def perform
     end
 

data/lib/graphql/api/resolvers/command_mutation.rb

@@ -0,0 +1,16 @@
+module GraphQL::Api
+  module Resolvers
+    class CommandMutation
+
+      def initialize(command, action)
+        @command = command
+        @action = action
+      end
+
+      def call(inputs, ctx)
+        @command.new(inputs, ctx).send(@action)
+      end
+
+    end
+  end
+end

data/lib/graphql/api/resolvers/field.rb

@@ -0,0 +1,20 @@
+module GraphQL::Api
+  module Resolvers
+    class Field
+
+      def initialize(model, name)
+        @model = model
+        @name = name
+      end
+
+      def call(obj, args, ctx)
+        if obj.respond_to?("access_#{@name}?")
+          obj.send(@name) if obj.send("access_#{@name}?", ctx)
+        else
+          obj.send(@name)
+        end
+      end
+
+    end
+  end
+end

data/lib/graphql/api/resolvers/model_create_mutation.rb

@@ -0,0 +1,16 @@
+module GraphQL::Api
+  module Resolvers
+    class ModelCreateMutation
+
+      def initialize(model)
+        @model = model
+      end
+
+      def call(inputs, ctx)
+        item = @model.create!(inputs.to_h)
+        {@model.name.underscore.to_sym => item}
+      end
+
+    end
+  end
+end

data/lib/graphql/api/resolvers/model_delete_mutation.rb

@@ -0,0 +1,17 @@
+module GraphQL::Api
+  module Resolvers
+    class ModelDeleteMutation
+
+      def initialize(model)
+        @model = model
+      end
+
+      def call(inputs, ctx)
+        item = @model.find(inputs[:id])
+        item.destroy!
+        {"#{@model.name.underscore.to_sym}_id".to_sym => inputs[:id]}
+      end
+
+    end
+  end
+end

data/lib/graphql/api/resolvers/model_find_query.rb

@@ -0,0 +1,19 @@
+module GraphQL::Api
+  module Resolvers
+    class ModelFindQuery
+
+      def initialize(model)
+        @model = model
+      end
+
+      def call(obj, args, ctx)
+        if @model.respond_to?(:graph_find)
+          @model.graph_find(args, ctx)
+        else
+          @model.find_by!(args.to_h)
+        end
+      end
+
+    end
+  end
+end

data/lib/graphql/api/resolvers/model_list_query.rb

@@ -0,0 +1,29 @@
+module GraphQL::Api
+  module Resolvers
+    class ModelListQuery
+
+      def initialize(model)
+        @model = model
+      end
+
+      def call(obj, args, ctx)
+        if @model.respond_to?(:graph_where)
+          @model.graph_where(args, ctx)
+        else
+          eager_load = []
+          ctx.irep_node.children.each do |child|
+            eager_load << child[0] if @model.reflections.find { |name, _| name == child[0] }
+          end
+
+          query_args = args.to_h
+          query_args.delete('limit')
+
+          q = @model.where(query_args)
+          q.eager_load(*eager_load) if eager_load.any?
+          q.limit(args[:limit] || 30)
+        end
+      end
+
+    end
+  end
+end

data/lib/graphql/api/resolvers/model_update_mutation.rb

@@ -0,0 +1,17 @@
+module GraphQL::Api
+  module Resolvers
+    class ModelUpdateMutation
+
+      def initialize(model)
+        @model = model
+      end
+
+      def call(inputs, ctx)
+        item = @model.find(inputs[:id])
+        item.update!(inputs.to_h)
+        {@model.name.underscore.to_sym => item}
+      end
+
+    end
+  end
+end

data/lib/graphql/api/resolvers/query_object_query.rb

@@ -0,0 +1,15 @@
+module GraphQL::Api
+  module Resolvers
+    class QueryObjectQuery
+
+      def initialize(query_object)
+        @query_object = query_object
+      end
+
+      def call(obj, args, ctx)
+        @query_object.new(args, ctx).execute
+      end
+
+    end
+  end
+end

data/lib/graphql/api/schema.rb

@@ -2,6 +2,14 @@ require 'graphql/api/command_type'
 require 'graphql/api/query_type'
 require 'graphql/api/helpers'
 require 'graphql/api/schema_error'
+require 'graphql/api/resolvers/model_create_mutation'
+require 'graphql/api/resolvers/model_delete_mutation'
+require 'graphql/api/resolvers/model_update_mutation'
+require 'graphql/api/resolvers/model_find_query'
+require 'graphql/api/resolvers/model_list_query'
+require 'graphql/api/resolvers/query_object_query'
+require 'graphql/api/resolvers/command_mutation'
+require 'graphql/api/resolvers/field'
 require 'graphql'
 
 include GraphQL::Api::Helpers
@@ -45,7 +53,7 @@ module GraphQL::Api
           model_class.columns.each do |column|
             field column.name do
               type graphql_type(column)
-              resolve -> (obj, args, ctx) { graphql_fetch(obj, ctx, column.name) }
+              resolve Resolvers::Field.new(model_class, column.name)
             end
           end
         end
@@ -64,7 +72,7 @@ module GraphQL::Api
               else
                 type object_types[association.class_name.constantize]
               end
-              resolve -> (obj, args, ctx) { graphql_fetch(obj, ctx, name) }
+              resolve Resolvers::Field.new(model_class, name)
             end
           end
         end
@@ -72,12 +80,12 @@ module GraphQL::Api
       end
     end
 
-    def create_command_type(object_type)
+    def create_command_type(object_type, action)
       object_types = @types
 
       GraphQL::Relay::Mutation.define do
         name object_type.name
-        description "Command #{object_type.name}"
+        description "Command #{object_type.name} #{action}"
 
         object_type.inputs.each do |input, type|
           input_field input, graphql_type_of(type)
@@ -87,9 +95,7 @@ module GraphQL::Api
           return_field return_name, graphql_type_for_object(return_type, object_types)
         end
 
-        resolve -> (inputs, ctx) {
-          object_type.new(inputs, ctx).perform
-        }
+        resolve Resolvers::CommandMutation.new(object_type, action)
       end
     end
 
@@ -107,11 +113,7 @@ module GraphQL::Api
         end
 
         return_field model_class.name.underscore.to_sym, object_types[model_class]
-
-        resolve -> (inputs, ctx) {
-          item = model_class.create!(inputs.to_h)
-          {model_class.name.underscore.to_sym => item}
-        }
+        resolve Resolvers::ModelCreateMutation.new(model_class)
       end
     end
 
@@ -130,12 +132,7 @@ module GraphQL::Api
         end
 
         return_field model_class.name.underscore.to_sym, object_types[model_class]
-
-        resolve -> (inputs, ctx) {
-          item = model_class.find(inputs[:id])
-          item.update!(inputs.to_h)
-          {model_class.name.underscore.to_sym => item}
-        }
+        resolve Resolvers::ModelUpdateMutation.new(model_class)
       end
     end
 
@@ -149,18 +146,14 @@ module GraphQL::Api
         input_field :id, !types.ID
 
         return_field "#{model_class.name.underscore}_id".to_sym, types.ID
-
-        resolve -> (inputs, ctx) {
-          item = model_class.find(inputs[:id]).destroy!
-          {"#{model_class.name.underscore}_id".to_sym => item.id}
-        }
+        resolve Resolvers::ModelDeleteMutation.new(model_class)
       end
     end
 
     def query(&block)
       object_types = @types
 
-      @query ||= GraphQL::ObjectType.define do
+      GraphQL::ObjectType.define do
         name 'Query'
         description 'The query root for this schema'
 
@@ -179,13 +172,7 @@ module GraphQL::Api
                 end
               end
 
-              resolve -> (obj, args, ctx) {
-                if object_class.respond_to?(:graph_find)
-                  object_class.graph_find(args, ctx)
-                else
-                  object_class.find_by!(args.to_h)
-                end
-              }
+              resolve Resolvers::ModelFindQuery.new(object_class)
             end
 
             field(object_class.name.camelize(:lower).pluralize) do
@@ -198,23 +185,7 @@ module GraphQL::Api
                 end
               end
 
-              resolve -> (obj, args, ctx) {
-                if object_class.respond_to?(:graph_where)
-                  object_class.graph_where(args, ctx)
-                else
-                  eager_load = []
-                  ctx.irep_node.children.each do |child|
-                    eager_load << child[0] if object_class.reflections.find { |name, _| name == child[0] }
-                  end
-
-                  query_args = args.to_h
-                  query_args.delete('limit')
-
-                  q = object_class.where(query_args)
-                  q.eager_load(*eager_load) if eager_load.any?
-                  q.limit(args[:limit] || 30)
-                end
-              }
+              resolve Resolvers::ModelListQuery.new(object_class)
             end
 
           elsif object_class.respond_to?(:arguments) && object_class.respond_to?(:return_type)
@@ -226,9 +197,7 @@ module GraphQL::Api
                 argument argument_name, graphql_type_of(argument_type)
               end
 
-              resolve -> (obj, args, ctx) {
-                object_class.new(args, ctx).execute
-              }
+              resolve Resolvers::QueryObjectQuery.new(object_class)
             end
 
           end
@@ -240,7 +209,7 @@ module GraphQL::Api
     def mutation(&block)
       mutations = @mutations
 
-      @mutation ||= GraphQL::ObjectType.define do
+      GraphQL::ObjectType.define do
         name 'Mutation'
         instance_eval(&block) if block
 
@@ -274,9 +243,16 @@ module GraphQL::Api
       end
 
       all_commands.each do |command|
-        @mutations[command] = [
-            [command.name.camelize(:lower), create_command_type(command)]
-        ]
+        if command.respond_to?(:actions) && command.actions.any?
+          @mutations[command] = []
+          command.actions.each do |action|
+            @mutations[command] << ["#{action}#{command.name}", create_command_type(command, action)]
+          end
+        else
+          @mutations[command] = [
+              [command.name.camelize(:lower), create_command_type(command, :perform)]
+          ]
+        end
       end
     end
 

data/lib/graphql/api/version.rb

@@ -1,5 +1,5 @@
 module GraphQL
   module Api
-    VERSION = '0.1.3'
+    VERSION = '0.1.4'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql-api
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Colin Walker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-01 00:00:00.000000000 Z
+date: 2016-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -72,6 +72,14 @@ files:
 - lib/graphql/api/command_type.rb
 - lib/graphql/api/helpers.rb
 - lib/graphql/api/query_type.rb
+- lib/graphql/api/resolvers/command_mutation.rb
+- lib/graphql/api/resolvers/field.rb
+- lib/graphql/api/resolvers/model_create_mutation.rb
+- lib/graphql/api/resolvers/model_delete_mutation.rb
+- lib/graphql/api/resolvers/model_find_query.rb
+- lib/graphql/api/resolvers/model_list_query.rb
+- lib/graphql/api/resolvers/model_update_mutation.rb
+- lib/graphql/api/resolvers/query_object_query.rb
 - lib/graphql/api/schema.rb
 - lib/graphql/api/schema_error.rb
 - lib/graphql/api/version.rb