gql 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40a578a7c57911bdf4d1b7c062259f3e47bfee30
-  data.tar.gz: 8dbc6b5ddf034a2fa5f939aa401c1ea2c031412a
+  metadata.gz: e3b82548839c3920e499f9256cab69aa5ba31081
+  data.tar.gz: c1631dc4bac082ad2086eadbe816791971f45b57
 SHA512:
-  metadata.gz: f13475e99d0efe4cac42faecb6d8128d861dbb74bd89ae971adf2613d17d47a5d8108be0bcf412eb8b00fbdfd41e1deae26a0291c5424012a1518df73929f0d2
-  data.tar.gz: b47a428fd3e2235fb38c81434651ffa06195f8b98c40abb0215b0e1d039a02346c7e0153a4735f2de09a5d23db6f04e0cac9793d5b69ffa42540cc9730196356
+  metadata.gz: 71d53e0856f5c0937d980deb1e1f27351dd9f76c84a6a9f449d23a26483bfd2745323c5d39fde5a480783f052389daf9ee5f690fc071f3eabc3bed3ebe308f8b
+  data.tar.gz: 0247f336c99c7365ebe800e1df5213cbdc9d525d1f4cf9ceb44b689b60547fe99a7126a9ed7ebc59400b6264a6af0397a505808f8ee8f2e03e31de3300f15c20

data/lib/gql/call.rb

@@ -2,21 +2,24 @@ module GQL
   class Call
     attr_reader :target, :context
 
-    def initialize(caller, ast_node, target, definition, variables, context)
+    def initialize(caller, ast_node, target, variables, context)
       @caller, @ast_node, @target = caller, ast_node, target
-      @definition, @variables, @context = definition, variables, context
+      @variables, @context = variables, context
     end
 
     def execute
-      args = @ast_node.arguments.map { |arg| arg.is_a?(Symbol) ? @variables[arg] : arg }
-      target = instance_exec(*args, &@definition[:body])
+      args = substitute_variables(@ast_node.arguments)
+      target = instance_exec(*args, &self.class.const_get(:Function))
 
-      node_class = @definition[:returns] || @caller.class
+      result_class = self.class.const_get(:Result) || @caller.class
 
-      raise Errors::InvalidNodeClass.new(node_class, Node) unless node_class < Node
-
-      node = node_class.new(@ast_node, target, @variables, context)
-      node.__value
+      result = result_class.new(@ast_node, target, @variables, context)
+      result.__value
     end
+
+    private
+      def substitute_variables(args)
+        args.map { |arg| arg.is_a?(Symbol) ? @variables[arg] : arg }
+      end
   end
 end

data/lib/gql/connection.rb

@@ -25,7 +25,11 @@ module GQL
 
     EdgesField.class_eval do
       def __value
-        __target
+        if @ast_node.fields
+          __target
+        else
+          nil
+        end
       end
     end
   end

data/lib/gql/errors.rb

@@ -23,7 +23,7 @@ module GQL
     class UndefinedType < SchemaError
       def initialize(name)
         types = Schema.fields.keys.sort.map { |name| "`#{name}`" }
-        types = types.size > 0 ? " Available types are #{types.to_sentence}." : ''
+        types = types.size > 0 ? " Available types: #{types.to_sentence}." : ''
 
         super("The field type `#{name}` is not known to the schema. Define it with `GQL::Schema.fields[my_type] = MyFieldType`.#{types}")
       end
@@ -31,8 +31,8 @@ module GQL
 
     class UndefinedCall < SchemaError
       def initialize(name, node_class)
-        calls = node_class.call_definitions.keys.sort.map { |name| "`#{name}`" }
-        calls = calls.size > 0 ? " Available calls are #{calls.to_sentence}." : ''
+        calls = node_class.call_classes.keys.sort.map { |name| "`#{name}`" }
+        calls = calls.size > 0 ? " Available calls: #{calls.to_sentence}." : ''
 
         super("#{node_class} has no call named `#{name}`.#{calls}")
       end
@@ -41,7 +41,7 @@ module GQL
     class UndefinedField < SchemaError
       def initialize(name, node_class)
         fields = node_class.field_classes.keys.sort.map { |name| "`#{name}`" }
-        fields = fields.size > 0 ? " Available fields are #{fields.to_sentence}." : ''
+        fields = fields.size > 0 ? " Available fields: #{fields.to_sentence}." : ''
 
         super("#{node_class} has no field named `#{name}`.#{fields}")
       end

data/lib/gql/fields/connection.rb

@@ -10,20 +10,14 @@ module GQL
       end
 
       def __raw_value
-        raise Errors::InvalidNodeClass.new(__connection_class__, GQL::Connection) unless __connection_class__ < GQL::Connection
+        connection_class = self.class.const_get(:CONNECTION_CLASS)
+        node_class = self.class.const_get(:NODE_CLASS)
 
-        connection = __connection_class__.new(__node_class__, @ast_node, __target, @variables, __context)
+        raise Errors::InvalidNodeClass.new(connection_class, GQL::Connection) unless connection_class <= GQL::Connection
+
+        connection = connection_class.new(node_class, @ast_node, __target, @variables, __context)
         connection.__value
       end
-
-      private
-        def __connection_class__
-          self.class.const_get :CONNECTION_CLASS
-        end
-
-        def __node_class__
-          self.class.const_get :NODE_CLASS
-        end
     end
   end
 end

data/lib/gql/node.rb

@@ -3,8 +3,8 @@ require 'active_support/core_ext/string/inflections'
 
 module GQL
   class Node
-    class_attribute :call_definitions
-    self.call_definitions = {}
+    class_attribute :call_classes
+    self.call_classes = {}
 
     class_attribute :field_classes
     self.field_classes = {}
@@ -17,12 +17,30 @@ module GQL
       end
 
       def call(name, options = {}, &block)
-        definition = {
-          returns: options[:returns],
-          body: block || lambda { |*args| __target.public_send(name, *args) }
-        }
+        result_class = options[:returns]
+        function = block || lambda { |*args| target.public_send(name, *args) }
 
-        self.call_definitions = call_definitions.merge(name => definition)
+        if result_class.is_a? Array
+          result_class.unshift Connection if result_class.size == 1
+          result_class.unshift Fields::Connection if result_class.size == 2
+
+          field_class, connection_class, node_class = result_class
+
+          raise Errors::InvalidNodeClass.new(field_class, Fields::Connection) unless field_class <= Fields::Connection
+
+          result_class = Class.new(field_class)
+          result_class.const_set :NODE_CLASS, node_class
+          result_class.const_set :CONNECTION_CLASS, connection_class
+        else
+          raise Errors::InvalidNodeClass.new(result_class, Node) unless result_class.nil? || result_class < Node
+        end
+
+        call_class = Class.new(Call)
+        call_class.const_set :Function, function
+        call_class.const_set :Result, result_class
+
+        self.const_set "#{name.to_s.camelize}Call", call_class
+        self.call_classes = call_classes.merge(name => call_class)
       end
 
       def fields(&block)
@@ -31,8 +49,12 @@ module GQL
 
       def field(*names, base_class: nil, node_class: nil, connection_class: nil)
         classes = names.reduce({}) do |result, name|
-          field_class = Class.new(base_class || Field)
-          field_class.const_set :NAME, name
+          base_class ||= Field
+
+          raise Errors::InvalidNodeClass.new(base_class, Field) unless base_class <= Field
+
+          field_class = Class.new(base_class)
+
           field_class.const_set :NODE_CLASS, node_class
           field_class.const_set :CONNECTION_CLASS, connection_class
 
@@ -57,10 +79,6 @@ module GQL
       end
     end
 
-    call :_identity do
-      target
-    end
-
     attr_reader :__target, :__context
 
     def initialize(ast_node, target, variables, context)
@@ -70,11 +88,11 @@ module GQL
 
     def __value
       if ast_call = @ast_node.call
-        definition = self.class.call_definitions[ast_call.name]
+        call_class = self.class.call_classes[ast_call.name]
 
-        raise Errors::UndefinedCall.new(ast_call.name, self.class) if definition.nil?
+        raise Errors::UndefinedCall.new(ast_call.name, self.class.superclass) if call_class.nil?
 
-        call = Call.new(self, ast_call, __target, definition, @variables, __context)
+        call = call_class.new(self, ast_call, __target, @variables, __context)
         call.execute
       elsif ast_fields = @ast_node.fields
         ast_fields.reduce({}) do |memo, ast_field|
@@ -91,7 +109,8 @@ module GQL
               target = public_send(ast_field.name)
               field_class = self.class.field_classes[ast_field.name]
 
-              raise Errors::InvalidNodeClass.new(field_class.superclass, Field) unless field_class < Field
+              raise Errors::UndefinedField.new(ast_field.name, self.class) if field_class.nil?
+              raise Errors::InvalidNodeClass.new(field_class.superclass, Field) unless field_class <= Field
 
               field = field_class.new(ast_field, target, @variables, __context)
               field.__value

data/lib/gql/version.rb

@@ -1,3 +1,3 @@
 module GQL
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gql
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Martin Andert