gql 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb700c03e6fe7d133fe2bc42736b5908e66174ac
-  data.tar.gz: da41c9aefb85d60137e6fad700993632f66a5b06
+  metadata.gz: a62133987b6e3870e58eae49d16b0e9b7c71520d
+  data.tar.gz: d13a2cf25e549aa1ae11e5e0d4f0b5de924698f6
 SHA512:
-  metadata.gz: cf3fcd9f66515866b529288aacf23f31980c2e2acb6d49c0b558f9908de0b6912ebbccbfc24099b93cfd8566c0076b011bae32c10045acc889d03e89934fc924
-  data.tar.gz: fdfa1d2cb54671fb57c340beff95d43c3644874c46b35ff90d825362a8bb6616f6c5afe3981ca1dcb81affa20f9ffcb5c344a47ac16b6e42b69f4714e4c5840e
+  metadata.gz: d099ea7a0be26f2df9f0006224c9f92f3e958abcfd80104b1a4f332763cee38b5fd39549f125b68d5a3331f33a81e6975db3d0bcf1b3f546341d44b72eb124a5
+  data.tar.gz: 40936dedec0db03b6da4a80f80bd8329d66187a43c04628cd6a7f02591c456c1ac8e2de656d7651f897c2258e00402b2547be210efefffb095c5c8b58027f95a

data/lib/gql.rb

@@ -1,39 +1,48 @@
+require 'active_support/dependencies/autoload'
+require 'gql/version'
+
 module GQL
-  autoload :Array,      'gql/array'
-  autoload :Boolean,    'gql/boolean'
-  autoload :Call,       'gql/call'
-  autoload :Config,     'gql/config'
-  autoload :Connection, 'gql/connection'
-  autoload :Error,      'gql/errors'
-  autoload :Executor,   'gql/executor'
-  autoload :List,       'gql/list'
-  autoload :Node,       'gql/node'
-  autoload :Number,     'gql/number'
-  autoload :Object,     'gql/object'
-  autoload :Parser,     'gql/parser'
-  autoload :Raw,        'gql/raw'
-  autoload :String,     'gql/string'
-  autoload :TestCase,   'gql/test_case'
-  autoload :VERSION,    'gql/version'
+  extend ActiveSupport::Autoload
+
+  autoload :Array
+  autoload :Boolean
+  autoload :Call
+  autoload :Config
+  autoload :Connection
+  autoload :Error, 'gql/errors'
+  autoload :Executor
+  autoload :Node
+  autoload :Number
+  autoload :Object
+  autoload :Parser
+  autoload :Raw
+  autoload :String
+  autoload :TestCase
 
   module Errors
-    autoload :InvalidNodeClass,   'gql/errors'
-    autoload :ScanError,          'gql/errors'
-    autoload :SyntaxError,        'gql/errors'
-    autoload :UndefinedCall,      'gql/errors'
-    autoload :UndefinedField,     'gql/errors'
-    autoload :UndefinedNodeClass, 'gql/errors'
-    autoload :UndefinedRoot,      'gql/errors'
-    autoload :UndefinedFieldType, 'gql/errors'
+    extend ActiveSupport::Autoload
+
+    autoload_at 'gql/errors' do
+      autoload :InvalidNodeClass
+      autoload :ScanError
+      autoload :SyntaxError
+      autoload :UndefinedCall
+      autoload :UndefinedField
+      autoload :UndefinedNodeClass
+      autoload :UndefinedRoot
+      autoload :UndefinedFieldType
+    end
   end
 
   module Schema
-    autoload :Call,         'gql/schema/call'
-    autoload :Field,        'gql/schema/field'
-    autoload :List,         'gql/schema/list'
-    autoload :Parameter,    'gql/schema/parameter'
-    autoload :Placeholder,  'gql/schema/placeholder'
-    autoload :Root,         'gql/schema/root'
+    extend ActiveSupport::Autoload
+
+    autoload :Call
+    autoload :Field
+    autoload :List
+    autoload :Parameter
+    autoload :Placeholder
+    autoload :Root
   end
 
   extend(Module.new {
@@ -75,13 +84,4 @@ module GQL
       end
     end
   })
-
-  self.field_types.update(
-    array:      Array,
-    boolean:    Boolean,
-    connection: Connection,
-    number:     Number,
-    object:     Object,
-    string:     String
-  )
 end

data/lib/gql/array.rb

@@ -6,9 +6,16 @@ module GQL
 
     class << self
       def build_class(id, proc, options = {})
-        item_class = options[:item_class] || self.item_class
+        item_class = options.delete(:item_class) || self.item_class
 
-        Node.validate_is_subclass! item_class, 'item'
+        if item_class.is_a?(Hash)
+          item_class.values.each do |klass|
+            Node.validate_is_subclass! klass, 'item'
+          end
+        else
+          Node.validate_is_subclass! item_class, 'item'
+          item_class = Hash.new(item_class)
+        end
 
         Class.new(self).tap do |field_class|
           field_class.id = id.to_s
@@ -20,7 +27,7 @@ module GQL
 
     def value
       target.map do |item|
-        node = self.class.item_class.new(ast_node, item, variables, context)
+        node = self.class.item_class[item.class].new(ast_node, item, variables, context)
         node.value
       end
     end

data/lib/gql/call.rb

@@ -5,8 +5,17 @@ module GQL
     class_attribute :id, :result_class, :proc, instance_accessor: false, instance_predicate: false
 
     class << self
-      def returns(result_class)
-        self.result_class = result_class
+      def returns(result_class = nil, &block)
+        if result_class
+          self.result_class = result_class
+        elsif block_given?
+          Class.new(Node).tap do |result_class|
+            result_class.default_proc = -> id { -> { target[id] } }
+            result_class.class_eval(&block)
+
+            returns result_class
+          end
+        end
       end
 
       def execute(caller_class, ast_node, target, variables, context)

data/lib/gql/config.rb

@@ -17,7 +17,14 @@ module GQL
     end
 
     def field_types
-      @@field_types ||= {}
+      @@field_types ||= {
+        array:      Array,
+        boolean:    Boolean,
+        connection: Connection,
+        number:     Number,
+        object:     Object,
+        string:     String
+      }
     end
 
     def field_types=(value)
@@ -25,7 +32,7 @@ module GQL
     end
 
     def default_list_class
-      @@default_list_class ||= Connection
+      @@default_list_class ||= Node
     end
 
     def default_list_class=(value)

data/lib/gql/connection.rb

@@ -2,21 +2,14 @@ require 'active_support/core_ext/class/attribute'
 
 module GQL
   class Connection < Node
-    class_attribute :list_class, instance_accessor: false, instance_predicate: false
-    class_attribute :item_class, instance_accessor: false, instance_predicate: false
-
     class << self
       def build_class(id, proc, options = {})
-        list_class = options[:list_class] || self.list_class || GQL.default_list_class
-        item_class = options[:item_class] || self.item_class
-
-        Connection.validate_is_subclass! list_class, 'list'
-        Node.validate_is_subclass! item_class, 'item'
+        list_class = options.delete(:list_class) || GQL.default_list_class
+        item_class = options.delete(:item_class)
 
-        Class.new(list_class).tap do |field_class|
-          field_class.id = id.to_s
-          field_class.proc = proc
+        Node.validate_is_subclass! list_class, 'list'
 
+        list_class.build_class(id, proc, options).tap do |field_class|
           field_class.array :edges, -> { target }, item_class: item_class
         end
       end

data/lib/gql/node.rb

@@ -17,10 +17,11 @@ module GQL
       end
     end
 
-    class_attribute :id, :proc, :calls, :fields, instance_accessor: false, instance_predicate: false
+    class_attribute :id, :proc, :calls, :fields, :default_proc, instance_accessor: false, instance_predicate: false
 
     self.calls = {}
     self.fields = {}
+    self.default_proc = -> id { -> { target.public_send(id) } }
 
     class << self
       def build_class(id, proc, options = {})
@@ -82,7 +83,7 @@ module GQL
 
       def field(id, *args)
         options = args.extract_options!
-        proc    = args.shift || -> { target.public_send(id) }
+        proc    = args.shift || instance_exec(id, &default_proc)
         type    = options.delete(:type) || Node
 
         Node.validate_is_subclass! type, 'type'

data/lib/gql/object.rb

@@ -2,25 +2,14 @@ require 'active_support/core_ext/class/attribute'
 
 module GQL
   class Object < Node
-    class_attribute :node_class, instance_accessor: false, instance_predicate: false
-
     class << self
       def build_class(id, proc, options = {})
-        node_class = options[:node_class] || self.node_class
+        node_class = options.delete(:node_class)
 
         Node.validate_is_subclass! node_class, 'node'
 
-        Class.new(self).tap do |field_class|
-          field_class.id = id.to_s
-          field_class.proc = proc
-          field_class.node_class = node_class
-        end
+        node_class.build_class id, proc, options
       end
     end
-
-    def value
-      node = self.class.node_class.new(ast_node, target, variables, context)
-      node.value
-    end
   end
 end

data/lib/gql/version.rb

@@ -1,3 +1,3 @@
 module GQL
-  VERSION = '0.0.9'
+  VERSION = '0.0.10'
 end

metadata

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