gql 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 96bce7d738e7b21e2253ec10315f64b4fb33408e
-  data.tar.gz: c28e4961a061063f51703cd714eb646efb8465ff
+  metadata.gz: 20b402e587fe168bb43d6b683c6f41d5d313d828
+  data.tar.gz: 5b5a28f87cce7e5e72df1ef7d366ae06689b269a
 SHA512:
-  metadata.gz: 8069bf344b4c87f43b718f4b0b0a8ad2c30be35f186bf4d1f1e2f1119f356feef3c8a126982a177c860817d32dfa5b1c63d4268c96486f2272691e7f1593f59c
-  data.tar.gz: 18e1efe2c211f3579b12b808fdd842eb938c8f45f2b0b50049582e819adb6fe4f99eb33a2c0e6bb6a642b69acd20a04deb72f7054edc96001821f940cb2e237d
+  metadata.gz: 1ce7cd9bf3934dbc32adf6c6d1c69db6f1c8cbe78cdc8a0eb3aefcaa7a9f2511a385ffab599a2fe1bac156df59249fdcecaf73f40b2daf43ffd9e5fb5b5280ce
+  data.tar.gz: 910724d32eb06b282a067955789b2ff554dbe1034911a6e033e18720ab2b140126e85548e2d6c23e1b06fc1f48e77977d6384a712e8d70c0023f505de534f24e

data/lib/gql.rb

@@ -1,11 +1,19 @@
 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 :Field,      'gql/field'
+  autoload :List,       'gql/list'
   autoload :Node,       'gql/node'
+  autoload :Number,     'gql/number'
+  autoload :Object,     'gql/object'
   autoload :Parser,     'gql/parser'
+  autoload :Simple,     'gql/simple'
+  autoload :String,     'gql/string'
   autoload :Tokenizer,  'gql/tokenizer'
   autoload :VERSION,    'gql/version'
 
@@ -19,20 +27,10 @@ module GQL
     autoload :UndefinedFieldType, 'gql/errors'
   end
 
-  module Fields
-    autoload :Array,        'gql/fields/array'
-    autoload :Boolean,      'gql/fields/boolean'
-    autoload :Connection,   'gql/fields/connection'
-    autoload :Float,        'gql/fields/float'
-    autoload :Integer,      'gql/fields/integer'
-    autoload :Object,       'gql/fields/object'
-    autoload :String,       'gql/fields/string'
-  end
-
   module Schema
     autoload :Call,         'gql/schema/call'
-    autoload :Connection,   'gql/schema/connection'
     autoload :Field,        'gql/schema/field'
+    autoload :List,         'gql/schema/list'
     autoload :Node,         'gql/schema/node'
     autoload :Parameter,    'gql/schema/parameter'
     autoload :Placeholder,  'gql/schema/placeholder'
@@ -43,7 +41,7 @@ module GQL
       Thread.current[:gql_config] ||= Config.new
     end
 
-    %w(root_node_class field_types).each do |method|
+    %w(root_node_class field_types default_list_class).each do |method|
       module_eval <<-DELEGATORS, __FILE__, __LINE__ + 1
         def #{method}
           config.#{method}
@@ -78,24 +76,21 @@ module GQL
       tokenizer = Tokenizer.new
       tokenizer.scan_setup input
 
-      result = []
-
-      while token = tokenizer.next_token
-        result << token
-        yield token if block_given?
+      [].tap do |result|
+        while token = tokenizer.next_token
+          result << token
+          yield token if block_given?
+        end
       end
-
-      result
     end
   })
 
   self.field_types.update(
-    array:      Fields::Array,
-    boolean:    Fields::Boolean,
-    connection: Fields::Connection,
-    float:      Fields::Float,
-    integer:    Fields::Integer,
-    object:     Fields::Object,
-    string:     Fields::String
+    array:      Array,
+    boolean:    Boolean,
+    connection: Connection,
+    number:     Number,
+    object:     Object,
+    string:     String
   )
 end

data/lib/gql/array.rb

@@ -0,0 +1,36 @@
+require 'active_support/core_ext/class/attribute'
+
+module GQL
+  class Array < Field
+    class_attribute :item_class, instance_accessor: false, instance_predicate: false
+
+    class << self
+      def build_class(id, method, options = {})
+        item_class = options[:item_class] || self.item_class
+
+        if item_class.nil?
+          raise Errors::UndefinedNodeClass.new(self, 'item')
+        end
+
+        unless item_class <= Node
+          raise Errors::InvalidNodeClass.new(item_class, Node)
+        end
+
+        Class.new(self).tap do |field_class|
+          field_class.id = id.to_s
+          field_class.method = method
+          field_class.item_class = item_class
+        end
+      end
+    end
+
+    call :size, Number, -> { target.size }
+
+    def value
+      target.map do |item|
+        node = self.class.item_class.new(ast_node, item, variables, context)
+        node.value
+      end
+    end
+  end
+end

data/lib/gql/boolean.rb

@@ -0,0 +1,4 @@
+module GQL
+  class Boolean < Simple
+  end
+end

data/lib/gql/call.rb

@@ -16,18 +16,23 @@ module GQL
 
     class << self
       def build_class(id, result_class, method)
-        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
+        if result_class.is_a? ::Array
+          if result_class.size == 1
+            result_class.unshift GQL.default_list_class || Connection
+          end
+
+          list_class, item_class = result_class
 
-          field_type_class, connection_class, node_class = result_class
+          unless list_class <= Connection
+            raise Errors::InvalidNodeClass.new(list_class, Connection)
+          end
 
-          unless field_type_class <= Fields::Connection
-            raise Errors::InvalidNodeClass.new(field_type_class, Fields::Connection)
+          unless item_class <= Node
+            raise Errors::InvalidNodeClass.new(list_class, Node)
           end
 
-          options = { connection_class: connection_class, node_class: node_class }
-          result_class = field_type_class.build_class(:result, nil, options)
+          options = { list_class: list_class, item_class: item_class }
+          result_class = Connection.build_class(:result, nil, options)
         elsif result_class && !(result_class <= Node)
           raise Errors::InvalidNodeClass.new(result_class, Node)
         end
@@ -60,7 +65,7 @@ module GQL
 
     private
       def substitute_variables(args)
-        args.map { |arg| arg.is_a?(Symbol) ? variables[arg] : arg }
+        args.map { |arg| arg.is_a?(::Symbol) ? variables[arg] : arg }
       end
   end
 end

data/lib/gql/config.rb

@@ -23,5 +23,13 @@ module GQL
     def field_types=(value)
       @@field_types = value
     end
+
+    def default_list_class
+      @@default_list_class ||= Connection
+    end
+
+    def default_list_class=(value)
+      @@default_list_class = value
+    end
   end
 end

data/lib/gql/connection.rb

@@ -1,15 +1,36 @@
 require 'active_support/core_ext/class/attribute'
 
 module GQL
-  class Connection < Node
-    class_attribute :node_class, instance_accessor: false, instance_predicate: false
+  class Connection < Field
+    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(node_class)
-        node_class ||= self.node_class
+      def build_class(id, method, options = {})
+        list_class = options[:list_class] || self.list_class || GQL.default_list_class
+        item_class = options[:item_class] || self.item_class
 
-        Class.new(self).tap do |connection_class|
-          connection_class.array :edges, node_class: node_class do
+        if list_class.nil?
+          raise Errors::UndefinedNodeClass.new(self, 'list')
+        end
+
+        unless list_class <= Connection
+          raise Errors::InvalidNodeClass.new(list_class, Connection)
+        end
+
+        if item_class.nil?
+          raise Errors::UndefinedNodeClass.new(self, 'item')
+        end
+
+        unless item_class <= Node
+          raise Errors::InvalidNodeClass.new(item_class, Node)
+        end
+
+        Class.new(list_class).tap do |field_class|
+          field_class.id = id.to_s
+          field_class.method = method
+
+          field_class.array :edges, item_class: item_class do
             target
           end
         end

data/lib/gql/field.rb

@@ -24,9 +24,5 @@ module GQL
         end
       end
     end
-
-    def raw_value
-      target
-    end
   end
 end

data/lib/gql/node.rb

@@ -29,13 +29,13 @@ module GQL
 
         ids.each do |id|
           method = block || lambda { target.public_send(id) }
-          field_type_class = options.delete(:field_type_class) || Field
+          field_type = options.delete(:type) || Field
 
-          unless field_type_class <= Field
-            raise Errors::InvalidNodeClass.new(field_type_class, Field)
+          unless field_type <= Field
+            raise Errors::InvalidNodeClass.new(field_type, Field)
           end
 
-          field_class = field_type_class.build_class(id, method, options)
+          field_class = field_type.build_class(id, method, options)
 
           self.const_set "#{id.to_s.camelize}Field", field_class
           self.fields = fields.merge(id.to_sym => field_class)
@@ -43,18 +43,15 @@ module GQL
       end
 
       def cursor(id = nil, &block)
-        if id
-          field :cursor, &-> { target.public_send(id) }
-        elsif block_given?
-          field :cursor, &block
-        end
+        body = id ? -> { target.public_send(id) } : block
+        field :cursor, { type: Simple }, &body
       end
 
       def method_missing(method, *ids, &block)
-        if field_type_class = GQL.field_types[method]
+        if field_type = GQL.field_types[method]
           options = ids.extract_options!
 
-          field(*ids, options.merge(field_type_class: field_type_class), &block)
+          field(*ids, options.merge(type: field_type), &block)
         else
           super
         end

data/lib/gql/number.rb

@@ -0,0 +1,6 @@
+module GQL
+  class Number < Simple
+    # This is just an example call. Monkeypatch class to add your own.
+    call :is_zero, Boolean, -> { target.zero? }
+  end
+end

data/lib/gql/object.rb

@@ -0,0 +1,32 @@
+require 'active_support/core_ext/class/attribute'
+
+module GQL
+  class Object < Field
+    class_attribute :node_class, instance_accessor: false, instance_predicate: false
+
+    class << self
+      def build_class(id, method, options = {})
+        node_class = options[:node_class] || self.node_class
+
+        if node_class.nil?
+          raise Errors::UndefinedNodeClass.new(self, 'node')
+        end
+
+        unless node_class <= Node
+          raise Errors::InvalidNodeClass.new(node_class, Node)
+        end
+
+        Class.new(self).tap do |field_class|
+          field_class.id = id.to_s
+          field_class.method = method
+          field_class.node_class = node_class
+        end
+      end
+    end
+
+    def value
+      node = self.class.node_class.new(ast_node, target, variables, context)
+      node.value
+    end
+  end
+end

data/lib/gql/schema/call.rb

@@ -4,7 +4,7 @@ module GQL
       cursor :id
       string :id
 
-      array :parameters, :node_class => Parameter do
+      array :parameters, :item_class => Parameter do
         target.method.parameters
       end
 

data/lib/gql/schema/field.rb

@@ -8,11 +8,11 @@ module GQL
         target.name
       end
 
-      connection :calls, :connection_class => Connection, :node_class => Call do
+      connection :calls, :list_class => List, :item_class => Call do
         target.calls.values
       end
 
-      connection :fields, :connection_class => Connection, :node_class => Field do
+      connection :fields, :list_class => List, :item_class => Field do
         target.fields.values
       end
     end

data/lib/gql/schema/list.rb

@@ -0,0 +1,10 @@
+module GQL
+  module Schema
+    class List < GQL::Connection
+      number :count
+
+      call :reverse
+      call :first, -> size { target.first(size) }
+    end
+  end
+end

data/lib/gql/schema/node.rb

@@ -5,11 +5,11 @@ module GQL
         target.name
       end
 
-      connection :calls, :connection_class => Connection, :node_class => Call do
+      connection :calls, :list_class => List, :item_class => Call do
         target.calls.values
       end
 
-      connection :fields, :connection_class => Connection, :node_class => Field do
+      connection :fields, :list_class => List, :item_class => Field do
         target.fields.values
       end
     end

data/lib/gql/simple.rb

@@ -0,0 +1,7 @@
+module GQL
+  class Simple < Field
+    def raw_value
+      target
+    end
+  end
+end

data/lib/gql/string.rb

@@ -0,0 +1,8 @@
+module GQL
+  class String < Simple
+    # These are just example calls. Monkeypatch class to add your own.
+    call :upcase, -> { target.upcase }
+    call :downcase, -> { target.downcase }
+    call :length, Number, -> { target.size }
+  end
+end

data/lib/gql/version.rb

@@ -1,3 +1,3 @@
 module GQL
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gql
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Martin Andert
@@ -110,28 +110,27 @@ files:
 - bin/setup
 - gql.gemspec
 - lib/gql.rb
+- lib/gql/array.rb
+- lib/gql/boolean.rb
 - lib/gql/call.rb
 - lib/gql/config.rb
 - lib/gql/connection.rb
 - lib/gql/errors.rb
 - lib/gql/executor.rb
 - lib/gql/field.rb
-- lib/gql/fields/array.rb
-- lib/gql/fields/boolean.rb
-- lib/gql/fields/connection.rb
-- lib/gql/fields/float.rb
-- lib/gql/fields/integer.rb
-- lib/gql/fields/object.rb
-- lib/gql/fields/string.rb
 - lib/gql/node.rb
+- lib/gql/number.rb
+- lib/gql/object.rb
 - lib/gql/parser.rb
 - lib/gql/parser.y
 - lib/gql/schema/call.rb
-- lib/gql/schema/connection.rb
 - lib/gql/schema/field.rb
+- lib/gql/schema/list.rb
 - lib/gql/schema/node.rb
 - lib/gql/schema/parameter.rb
 - lib/gql/schema/placeholder.rb
+- lib/gql/simple.rb
+- lib/gql/string.rb
 - lib/gql/tokenizer.rb
 - lib/gql/tokenizer.rex
 - lib/gql/version.rb

data/lib/gql/fields/array.rb

@@ -1,42 +0,0 @@
-require 'active_support/core_ext/class/attribute'
-
-module GQL
-  module Fields
-    class Array < Field
-      class_attribute :node_class, instance_accessor: false, instance_predicate: false
-
-      class << self
-        def build_class(id, method, options = {})
-          node_class = options[:node_class] || self.node_class
-
-          if node_class.nil?
-            raise Errors::UndefinedNodeClass.new(self, 'node')
-          end
-
-          unless node_class <= GQL::Node
-            raise Errors::InvalidNodeClass.new(node_class, GQL::Node)
-          end
-
-          Class.new(self).tap do |field_class|
-            field_class.id = id.to_s
-            field_class.method = method
-            field_class.node_class = node_class
-          end
-        end
-      end
-
-      call :size, Integer, -> { target.size }
-
-      def value
-        target.map do |item|
-          node = self.class.node_class.new(ast_node, item, variables, context)
-          node.value
-        end
-      end
-
-      def raw_value
-        nil
-      end
-    end
-  end
-end

data/lib/gql/fields/boolean.rb

@@ -1,6 +0,0 @@
-module GQL
-  module Fields
-    class Boolean < Field
-    end
-  end
-end

data/lib/gql/fields/connection.rb

@@ -1,39 +0,0 @@
-require 'active_support/core_ext/class/attribute'
-
-module GQL
-  module Fields
-    class Connection < Field
-      class_attribute :connection_class, instance_accessor: false, instance_predicate: false
-      self.connection_class = GQL::Connection
-
-      class << self
-        def build_class(id, method, options = {})
-          connection_class = options[:connection_class] || self.connection_class
-
-          if connection_class.nil?
-            raise Errors::UndefinedNodeClass.new(self, 'connection')
-          end
-
-          unless connection_class <= GQL::Connection
-            raise Errors::InvalidNodeClass.new(connection_class, GQL::Connection)
-          end
-
-          Class.new(self).tap do |field_class|
-            field_class.id = id.to_s
-            field_class.method = method
-            field_class.connection_class = connection_class.build_class(options[:node_class])
-          end
-        end
-      end
-
-      def value_of_fields(*)
-        connection = self.class.connection_class.new(ast_node, target, variables, context)
-        connection.value
-      end
-
-      def raw_value
-        nil
-      end
-    end
-  end
-end

data/lib/gql/fields/float.rb

@@ -1,6 +0,0 @@
-module GQL
-  module Fields
-    class Float < Field
-    end
-  end
-end

data/lib/gql/fields/integer.rb

@@ -1,8 +0,0 @@
-module GQL
-  module Fields
-    class Integer < Field
-      # This is just an example call, monkeypatch to add your own.
-      call :is_zero, Boolean, -> { target.zero? }
-    end
-  end
-end

data/lib/gql/fields/object.rb

@@ -1,38 +0,0 @@
-require 'active_support/core_ext/class/attribute'
-
-module GQL
-  module Fields
-    class Object < Field
-      class_attribute :node_class, instance_accessor: false, instance_predicate: false
-
-      class << self
-        def build_class(id, method, options = {})
-          node_class = options[:node_class] || self.node_class
-
-          if node_class.nil?
-            raise Errors::UndefinedNodeClass.new(self, 'node')
-          end
-
-          unless node_class <= GQL::Node
-            raise Errors::InvalidNodeClass.new(node_class, GQL::Node)
-          end
-
-          Class.new(self).tap do |field_class|
-            field_class.id = id.to_s
-            field_class.method = method
-            field_class.node_class = node_class
-          end
-        end
-      end
-
-      def value
-        node = self.class.node_class.new(ast_node, target, variables, context)
-        node.value
-      end
-
-      def raw_value
-        nil
-      end
-    end
-  end
-end

data/lib/gql/fields/string.rb

@@ -1,11 +0,0 @@
-module GQL
-  module Fields
-    class String < Field
-      call :upcase, -> { target.upcase }
-      call :downcase, -> { target.downcase }
-      call :length, Integer, -> { target.size }
-
-      # These are just example calls, monkeypatch to add your own.
-    end
-  end
-end

data/lib/gql/schema/connection.rb

@@ -1,7 +0,0 @@
-module GQL
-  module Schema
-    class Connection < GQL::Connection
-      integer :count
-    end
-  end
-end