gql 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe2deb60572972e21f7f7371dd4437cd87532043
-  data.tar.gz: 502022ff7d90578776e50bcb84b9d19deddbbd8f
+  metadata.gz: 96bce7d738e7b21e2253ec10315f64b4fb33408e
+  data.tar.gz: c28e4961a061063f51703cd714eb646efb8465ff
 SHA512:
-  metadata.gz: b865d13e6b65926e4dad2e418d8cc49882a168e809eeaa372987123714aa6ad761e84f73abef746835fc9964e3683ef6de8f1ea4a91ed8c6b3ce0a0484eeac73
-  data.tar.gz: d1e7b56cd2d314de5a175c19a7f4bde686d0a907c144a6650d2a271876bde255a1e8b1b9ee6b5d8a8ebd7962d9eb81321fed1b9f4b38edbc16800ed87b5f7e10
+  metadata.gz: 8069bf344b4c87f43b718f4b0b0a8ad2c30be35f186bf4d1f1e2f1119f356feef3c8a126982a177c860817d32dfa5b1c63d4268c96486f2272691e7f1593f59c
+  data.tar.gz: 18e1efe2c211f3579b12b808fdd842eb938c8f45f2b0b50049582e819adb6fe4f99eb33a2c0e6bb6a642b69acd20a04deb72f7054edc96001821f940cb2e237d

data/README.md

@@ -1,4 +1,4 @@
-# GQL
+# gql
 
 An attempted implementation of Facebook's yet-to-be-released GraphQL specification, heavily inspired by [graphql-ruby](https://github.com/rmosolgo/graphql-ruby), but with other/more/less features/bugs.
 

data/lib/gql.rb

@@ -11,7 +11,7 @@ module GQL
 
   module Errors
     autoload :InvalidNodeClass,   'gql/errors'
-    autoload :ParseError,         'gql/errors'
+    autoload :SyntaxError,        'gql/errors'
     autoload :UndefinedCall,      'gql/errors'
     autoload :UndefinedField,     'gql/errors'
     autoload :UndefinedNodeClass, 'gql/errors'
@@ -29,6 +29,15 @@ module GQL
     autoload :String,       'gql/fields/string'
   end
 
+  module Schema
+    autoload :Call,         'gql/schema/call'
+    autoload :Connection,   'gql/schema/connection'
+    autoload :Field,        'gql/schema/field'
+    autoload :Node,         'gql/schema/node'
+    autoload :Parameter,    'gql/schema/parameter'
+    autoload :Placeholder,  'gql/schema/placeholder'
+  end
+
   extend(Module.new {
     def config
       Thread.current[:gql_config] ||= Config.new
@@ -69,9 +78,14 @@ module GQL
       tokenizer = Tokenizer.new
       tokenizer.scan_setup input
 
+      result = []
+
       while token = tokenizer.next_token
-        yield token
+        result << token
+        yield token if block_given?
       end
+
+      result
     end
   })
 

data/lib/gql/call.rb

@@ -12,10 +12,10 @@ module GQL
       end
     end
 
-    class_attribute :method, :result_class, instance_accessor: false, instance_predicate: false
+    class_attribute :id, :result_class, :method, instance_accessor: false, instance_predicate: false
 
     class << self
-      def build_class(result_class, method)
+      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
@@ -27,12 +27,13 @@ module GQL
           end
 
           options = { connection_class: connection_class, node_class: node_class }
-          result_class = field_type_class.build_class(nil, options)
+          result_class = field_type_class.build_class(:result, nil, options)
         elsif result_class && !(result_class <= Node)
           raise Errors::InvalidNodeClass.new(result_class, Node)
         end
 
         Class.new(self).tap do |call_class|
+          call_class.id = id.to_s
           call_class.method = method
           call_class.result_class = result_class
         end

data/lib/gql/config.rb

@@ -9,6 +9,10 @@ module GQL
         raise Errors::InvalidNodeClass.new(value, Node)
       end
 
+      if ENV['DEBUG']
+        value.call :_schema, Schema::Node, -> { context[:_schema_root] }
+      end
+
       @@root_node_class = value
     end
 

data/lib/gql/errors.rb

@@ -25,35 +25,35 @@ module GQL
     end
 
     class UndefinedFieldType < Error
-      def initialize(name)
-        types = GQL.field_types.keys.sort.map { |name| "`#{name}`" }
+      def initialize(id)
+        types = GQL.field_types.keys.sort.map { |id| "`#{id}`" }
         types = types.size > 0 ? " Available types: #{types.to_sentence}." : ''
 
-        super("The field type `#{name}` is undefined. Define it with `GQL.field_types[:#{name}] = My#{name.to_s.camelize}`.#{types}")
+        super("The field type `#{id}` is undefined. Define it with `GQL.field_types[:#{id}] = My#{id.to_s.camelize}`.#{types}")
       end
     end
 
     class UndefinedCall < Error
-      def initialize(name, node_class)
-        calls = node_class.call_classes.keys.sort.map { |name| "`#{name}`" }
+      def initialize(id, node_class)
+        calls = node_class.calls.keys.sort.map { |id| "`#{id}`" }
         calls = calls.size > 0 ? " Available calls: #{calls.to_sentence}." : ''
 
-        super("#{node_class} has no call named `#{name}`.#{calls}")
+        super("#{node_class} has no call named `#{id}`.#{calls}")
       end
     end
 
     class UndefinedField < Error
-      def initialize(name, node_class)
-        fields = node_class.field_classes.keys.sort.map { |name| "`#{name}`" }
+      def initialize(id, node_class)
+        fields = node_class.fields.keys.sort.map { |id| "`#{id}`" }
         fields = fields.size > 0 ? " Available fields: #{fields.to_sentence}." : ''
 
-        super("#{node_class} has no field named `#{name}`.#{fields}")
+        super("#{node_class} has no field named `#{id}`.#{fields}")
       end
     end
 
-    class ParseError < Error
+    class SyntaxError < Error
       def initialize(value, token)
-        token = 'value' if token == 'error'
+        token = 'character' if token == 'error' || token == %Q{"#{value}"}
 
         super("Unexpected #{token}: `#{value}`.")
       end

data/lib/gql/executor.rb

@@ -12,6 +12,8 @@ module GQL
 
       raise Errors::UndefinedRoot if node_class.nil?
 
+      context[:_schema_root] = node_class if ENV['DEBUG']
+
       node = node_class.new(ast_node, nil, variables, context)
       node.value
     end

data/lib/gql/field.rb

@@ -14,11 +14,12 @@ module GQL
       end
     end
 
-    class_attribute :method, instance_accessor: false, instance_predicate: false
+    class_attribute :id, :method, instance_accessor: false, instance_predicate: false
 
     class << self
-      def build_class(method, options = {})
+      def build_class(id, method, options = {})
         Class.new(self).tap do |field_class|
+          field_class.id = id.to_s
           field_class.method = method
         end
       end

data/lib/gql/fields/array.rb

@@ -6,7 +6,7 @@ module GQL
       class_attribute :node_class, instance_accessor: false, instance_predicate: false
 
       class << self
-        def build_class(method, options = {})
+        def build_class(id, method, options = {})
           node_class = options[:node_class] || self.node_class
 
           if node_class.nil?
@@ -18,12 +18,15 @@ module GQL
           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)

data/lib/gql/fields/connection.rb

@@ -7,7 +7,7 @@ module GQL
       self.connection_class = GQL::Connection
 
       class << self
-        def build_class(method, options = {})
+        def build_class(id, method, options = {})
           connection_class = options[:connection_class] || self.connection_class
 
           if connection_class.nil?
@@ -19,6 +19,7 @@ module GQL
           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

data/lib/gql/fields/integer.rb

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

data/lib/gql/fields/object.rb

@@ -6,7 +6,7 @@ module GQL
       class_attribute :node_class, instance_accessor: false, instance_predicate: false
 
       class << self
-        def build_class(method, options = {})
+        def build_class(id, method, options = {})
           node_class = options[:node_class] || self.node_class
 
           if node_class.nil?
@@ -18,6 +18,7 @@ module GQL
           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

data/lib/gql/fields/string.rb

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

data/lib/gql/node.rb

@@ -4,59 +4,57 @@ require 'active_support/core_ext/array/extract_options'
 
 module GQL
   class Node
-    class_attribute :call_classes, :field_classes, instance_accessor: false, instance_predicate: false
+    class_attribute :calls, :fields, instance_accessor: false, instance_predicate: false
 
-    self.call_classes = {}
-    self.field_classes = {}
+    self.calls = {}
+    self.fields = {}
 
     class << self
-      def call(*names, &block)
-        names_with_result_class = names.extract_options!
-
-        names.each do |name|
-          names_with_result_class[name] = nil
+      def call(id, result_class = nil, body = nil)
+        if body.nil? && result_class.is_a?(Proc)
+          body = result_class
+          result_class = nil
         end
 
-        names_with_result_class.each do |name, result_class|
-          method = block || lambda { |*args| target.public_send(name, *args) }
-          call_class = Call.build_class(result_class, method)
+        body ||= lambda { |*args| target.public_send(id, *args) }
 
-          self.const_set "#{name.to_s.camelize}Call", call_class
-          self.call_classes = call_classes.merge(name => call_class)
-        end
+        call_class = Call.build_class(id, result_class, body)
+
+        self.const_set "#{id.to_s.camelize}Call", call_class
+        self.calls = calls.merge(id.to_sym => call_class)
       end
 
-      def field(*names, &block)
-        options = names.extract_options!
+      def field(*ids, &block)
+        options = ids.extract_options!
 
-        names.each do |name|
-          method = block || lambda { target.public_send(name) }
+        ids.each do |id|
+          method = block || lambda { target.public_send(id) }
           field_type_class = options.delete(:field_type_class) || Field
 
           unless field_type_class <= Field
             raise Errors::InvalidNodeClass.new(field_type_class, Field)
           end
 
-          field_class = field_type_class.build_class(method, options)
+          field_class = field_type_class.build_class(id, method, options)
 
-          self.const_set "#{name.to_s.camelize}Field", field_class
-          self.field_classes = field_classes.merge(name => field_class)
+          self.const_set "#{id.to_s.camelize}Field", field_class
+          self.fields = fields.merge(id.to_sym => field_class)
         end
       end
 
-      def cursor(name = nil, &block)
-        if name
-          field :cursor, &-> { target.public_send(name) }
+      def cursor(id = nil, &block)
+        if id
+          field :cursor, &-> { target.public_send(id) }
         elsif block_given?
           field :cursor, &block
         end
       end
 
-      def method_missing(method, *names, &block)
+      def method_missing(method, *ids, &block)
         if field_type_class = GQL.field_types[method]
-          options = names.extract_options!
+          options = ids.extract_options!
 
-          field(*names, options.merge(field_type_class: field_type_class), &block)
+          field(*ids, options.merge(field_type_class: field_type_class), &block)
         else
           super
         end
@@ -83,10 +81,10 @@ module GQL
     end
 
     def value_of_call(ast_call)
-      call_class = self.class.call_classes[ast_call.name]
+      call_class = self.class.calls[ast_call.id]
 
       if call_class.nil?
-        raise Errors::UndefinedCall.new(ast_call.name, self.class.superclass)
+        raise Errors::UndefinedCall.new(ast_call.id, self.class)
       end
 
       call = call_class.new(self, ast_call, target, variables, context)
@@ -95,28 +93,28 @@ module GQL
 
     def value_of_fields(ast_fields)
       ast_fields.reduce({}) do |memo, ast_field|
-        key = ast_field.alias_name || ast_field.name
+        key = ast_field.alias_id || ast_field.id
 
         memo.merge key => value_of_field(ast_field)
       end
     end
 
     def value_of_field(ast_field)
-      case ast_field.name
+      case ast_field.id
       when :node
         field = self.class.new(ast_field, target, variables, context)
         field.value
       else
-        method = Field::Method.new(target, context)
-        field_class = self.class.field_classes[ast_field.name]
+        field_class = self.class.fields[ast_field.id]
 
         if field_class.nil?
-          raise Errors::UndefinedField.new(ast_field.name, self.class.superclass)
+          raise Errors::UndefinedField.new(ast_field.id, self.class)
         end
 
-        next_target = method.execute(field_class.method)
+        method = Field::Method.new(target, context)
+        target = method.execute(field_class.method)
 
-        field = field_class.new(ast_field, next_target, variables, context)
+        field = field_class.new(ast_field, target, variables, context)
         field.value
       end
     end

data/lib/gql/parser.rb

@@ -21,10 +21,10 @@ module_eval(<<'...end parser.y/module_eval...', 'parser.y', 133)
   class Node < Struct.new(:call, :fields)
   end
 
-  class Field < Struct.new(:name, :alias_name, :call, :fields)
+  class Field < Struct.new(:id, :alias_id, :call, :fields)
   end
 
-  class Call < Struct.new(:name, :arguments, :call, :fields)
+  class Call < Struct.new(:id, :arguments, :call, :fields)
   end
 
   UNESCAPE_MAP = Hash.new { |h, k| h[k] = k.chr }
@@ -62,7 +62,7 @@ module_eval(<<'...end parser.y/module_eval...', 'parser.y', 133)
   end
 
   def on_error(token, value, vstack)
-    raise Errors::ParseError.new(value, token_to_str(token))
+    raise Errors::SyntaxError.new(value, token_to_str(token))
   end
 
   private

data/lib/gql/parser.y

@@ -137,10 +137,10 @@ require 'active_support/core_ext/object/blank'
   class Node < Struct.new(:call, :fields)
   end
 
-  class Field < Struct.new(:name, :alias_name, :call, :fields)
+  class Field < Struct.new(:id, :alias_id, :call, :fields)
   end
 
-  class Call < Struct.new(:name, :arguments, :call, :fields)
+  class Call < Struct.new(:id, :arguments, :call, :fields)
   end
 
   UNESCAPE_MAP = Hash.new { |h, k| h[k] = k.chr }
@@ -178,7 +178,7 @@ require 'active_support/core_ext/object/blank'
   end
 
   def on_error(token, value, vstack)
-    raise Errors::ParseError.new(value, token_to_str(token))
+    raise Errors::SyntaxError.new(value, token_to_str(token))
   end
 
   private

data/lib/gql/schema/call.rb

@@ -0,0 +1,20 @@
+module GQL
+  module Schema
+    class Call < GQL::Node
+      cursor :id
+      string :id
+
+      array :parameters, :node_class => Parameter do
+        target.method.parameters
+      end
+
+      string :type do
+        target.name
+      end
+
+      object :result_class, :node_class => Node do
+        target.result_class || Placeholder
+      end
+    end
+  end
+end

data/lib/gql/schema/connection.rb

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

data/lib/gql/schema/field.rb

@@ -0,0 +1,20 @@
+module GQL
+  module Schema
+    class Field < GQL::Node
+      cursor :id
+      string :id
+
+      string :type do
+        target.name
+      end
+
+      connection :calls, :connection_class => Connection, :node_class => Call do
+        target.calls.values
+      end
+
+      connection :fields, :connection_class => Connection, :node_class => Field do
+        target.fields.values
+      end
+    end
+  end
+end

data/lib/gql/schema/node.rb

@@ -0,0 +1,17 @@
+module GQL
+  module Schema
+    class Node < GQL::Node
+      string :type do
+        target.name
+      end
+
+      connection :calls, :connection_class => Connection, :node_class => Call do
+        target.calls.values
+      end
+
+      connection :fields, :connection_class => Connection, :node_class => Field do
+        target.fields.values
+      end
+    end
+  end
+end

data/lib/gql/schema/parameter.rb

@@ -0,0 +1,32 @@
+module GQL
+  module Schema
+    class Parameter < GQL::Node
+      cursor { target[1].to_s }
+
+      string :id do
+        target[1].to_s
+      end
+
+      string :mode do
+        case target[0]
+        when :req
+          'required'
+        when :opt
+          'optional'
+        when :rest
+          'rest'
+        when :keyreq
+          'required keyword'
+        when :key
+          'optional keyword'
+        when :keyrest
+          'keyword rest'
+        when :block
+          'block'
+        else
+          target[0].to_s
+        end
+      end
+    end
+  end
+end

data/lib/gql/schema/placeholder.rb

@@ -0,0 +1,6 @@
+module GQL
+  module Schema
+    class Placeholder < GQL::Node
+    end
+  end
+end

data/lib/gql/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gql
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Martin Andert
@@ -126,6 +126,12 @@ files:
 - lib/gql/node.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/node.rb
+- lib/gql/schema/parameter.rb
+- lib/gql/schema/placeholder.rb
 - lib/gql/tokenizer.rb
 - lib/gql/tokenizer.rex
 - lib/gql/version.rb