gql 0.0.2 → 0.0.3

data/lib/gql/parser.y

@@ -1,18 +1,20 @@
 class GQL::Parser
 token STRING NUMBER TRUE FALSE NULL AS IDENT
 rule
-  query
-    : variables call variables    {  result = QueryNode.new(val[1], convert_variables(val[0], val[2]))  }
+  root
+    : variables node variables    {  result = Root.new(val[1],             val[0].merge(val[2]))  }
+    | variables                   {  result = Root.new(Node.new(nil, nil), val[0]              )  }
     ;
 
-  call
-    : identifier arguments fields       {   result = CallNode.new(val[0], val[1], nil, val[2].presence)   }
-    | identifier arguments sub_call     {   result = CallNode.new(val[0], val[1], val[2], nil)            }
-    | identifier arguments              {   result = CallNode.new(val[0], val[1], nil, nil)               }
+  node
+    : call          {  result = Node.new(val[0], nil            )  }
+    | fields        {  result = Node.new(nil,    val[0].presence)  }
     ;
 
-  sub_call
-    : '.' call    {   result = val[1]   }
+  call
+    : identifier arguments fields       {   result = Call.new(val[0], val[1], nil,    val[2].presence)   }
+    | identifier arguments '.' call     {   result = Call.new(val[0], val[1], val[3], nil            )   }
+    | identifier arguments              {   result = Call.new(val[0], val[1], nil,    nil            )   }
     ;
 
   arguments
@@ -28,7 +30,7 @@ rule
 
   argument
     : variable_identifier
-    | json_text
+    | json_value
     ;
 
   fields
@@ -42,30 +44,30 @@ rule
     ;
 
   field
-    : identifier fields alias_identifier      {   result = FieldNode.new(val[0], val[2], nil,    val[1].presence)   }
-    | identifier sub_call alias_identifier    {   result = FieldNode.new(val[0], val[2], val[1], nil)               }
-    | identifier alias_identifier             {   result = FieldNode.new(val[0], val[1], nil,    nil)               }
-    | identifier fields                       {   result = FieldNode.new(val[0], nil,    nil,    val[1].presence)   }
-    | identifier sub_call                     {   result = FieldNode.new(val[0], nil,    val[1], nil)               }
-    | identifier                              {   result = FieldNode.new(val[0], nil,    nil,    nil)               }
+    : identifier fields alias_identifier      {   result = Field.new(val[0], val[2], nil,    val[1].presence)   }
+    | identifier '.' call alias_identifier    {   result = Field.new(val[0], val[3], val[2], nil            )   }
+    | identifier alias_identifier             {   result = Field.new(val[0], val[1], nil,    nil            )   }
+    | identifier fields                       {   result = Field.new(val[0], nil,    nil,    val[1].presence)   }
+    | identifier '.' call                     {   result = Field.new(val[0], nil,    val[2], nil            )   }
+    | identifier                              {   result = Field.new(val[0], nil,    nil,    nil            )   }
     ;
 
   alias_identifier
-    : AS identifier             {   result = val[1]       }
+    : AS identifier             {   result = val[1]   }
     ;
 
   variables
-    : /* empty */               {   result = []           }
-    | variable_list             {   result = val[0]       }
+    : /* empty */               {   result = {}   }
+    | variable_list
     ;
 
   variable_list
-    : variable                  {   result = val }
-    | variable_list variable    {   result.push val[1]    }
+    : variable
+    | variable_list variable    {   result.update val[1]    }
     ;
 
   variable
-    : variable_identifier '=' variable_value    {   result = [val[0], val[2]]     }
+    : variable_identifier '=' variable_value    {   result = { val[0] => val[2] }     }
     ;
 
   variable_identifier
@@ -73,12 +75,9 @@ rule
     ;
 
   variable_value
-    : json_text
+    : json_value
     ;
 
-  json_text
-    : json_value     {   result = @json.result   }
-
   json_value
     : object
     | array
@@ -86,51 +85,40 @@ rule
     ;
 
   object
-    : start_object end_object
-    | start_object pairs end_object
+    : '{' '}'         {   result = {}       }
+    | '{' pairs '}'   {   result = val[1]   }
     ;
 
-  start_object : '{'    {   @json.start_object    } ;
-  end_object   : '}'    {   @json.end_object      } ;
-
   pairs
-    : pairs ',' pair
+    : pairs ',' pair    {   result.update val[2]    }
     | pair
     ;
 
   pair
-    : string ':' json_value
+    : string ':' json_value   {   result = { val[0] => val[2] }    }
     ;
 
   array
-    : start_array end_array
-    | start_array values end_array
+    : '[' ']'          {   result = []       }
+    | '[' values ']'   {   result = val[1]   }
     ;
 
-  start_array  : '['    {   @json.start_array     } ;
-  end_array    : ']'    {   @json.end_array       } ;
-
   values
-    : values ',' json_value
-    | json_value
+    : values ',' json_value   {   result.push val[2]    }
+    | json_value              {   result = val          }
     ;
 
   scalar
     : string
-    | literal     {   @json.scalar val[0]   }
-    ;
-
-  string
-    : STRING      {   @json.scalar unescape_string(val[0])   }
-    ;
-
-  literal
-    : NUMBER      {   result = convert_number(val[0])   }
+    | NUMBER      {   result = convert_number(val[0])   }
     | TRUE        {   result = true                     }
     | FALSE       {   result = false                    }
     | NULL        {   result = nil                      }
     ;
 
+  string
+    : STRING      {   result = unescape_string(val[0])  }
+
   identifier
     : IDENT       {   result = val[0].to_sym    }
     ;
@@ -143,69 +131,16 @@ require 'active_support/core_ext/object/blank'
 
 ---- inner
 
-  class QueryNode < Struct.new(:call, :variables)
+  class Root < Struct.new(:node, :variables)
   end
 
-  class FieldNode < Struct.new(:name, :alias_name, :call, :fields)
+  class Node < Struct.new(:call, :fields)
   end
 
-  class CallNode < Struct.new(:name, :arguments, :call, :fields)
+  class Field < Struct.new(:name, :alias_name, :call, :fields)
   end
 
-  class JSONHandler
-    attr_reader :stack
-
-    def initialize
-      clear
-    end
-
-    def start_object
-      push [:hash]
-    end
-
-    def start_array
-      push [:array]
-    end
-
-    def end_array
-      @stack.pop
-    end
-
-    alias :end_object :end_array
-
-    def scalar(s)
-      @stack.last << [:scalar, s]
-    end
-
-    def push(o)
-      @stack.last << o
-      @stack << o
-    end
-
-    def result
-      root = @stack.first.last
-      value = process(root.first, root.drop(1))
-      clear
-      value
-    end
-
-    private
-      def clear
-        @stack = [[:json]]
-      end
-
-      def process(type, rest)
-        case type
-        when :array
-          rest.map { |x| process(x.first, x.drop(1)) }
-        when :hash
-          Hash[rest.map { |x|
-            process(x.first, x.drop(1))
-          }.each_slice(2).to_a]
-        when :scalar
-          rest.first
-        end
-      end
+  class Call < Struct.new(:name, :arguments, :call, :fields)
   end
 
   UNESCAPE_MAP = Hash.new { |h, k| h[k] = k.chr }
@@ -239,7 +174,6 @@ require 'active_support/core_ext/object/blank'
   end
 
   def parse
-    @json = JSONHandler.new
     do_parse
   end
 
@@ -275,7 +209,3 @@ require 'active_support/core_ext/object/blank'
     def convert_number(str)
       str.count('.') > 0 ? str.to_f : str.to_i
     end
-
-    def convert_variables(arr1, arr2)
-      Hash[*arr1.flatten(1)].merge Hash[*arr2.flatten(1)]
-    end

data/lib/gql/version.rb

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

data/lib/gql.rb

@@ -1,21 +1,22 @@
 module GQL
   autoload :Call,       'gql/call'
+  autoload :Config,     'gql/config'
   autoload :Connection, 'gql/connection'
   autoload :Executor,   'gql/executor'
   autoload :Field,      'gql/field'
   autoload :Node,       'gql/node'
   autoload :Parser,     'gql/parser'
-  autoload :Schema,     'gql/schema'
   autoload :Tokenizer,  'gql/tokenizer'
   autoload :VERSION,    'gql/version'
 
   module Errors
-    autoload :InvalidNodeClass, 'gql/errors'
-    autoload :ParseError,       'gql/errors'
-    autoload :UndefinedCall,    'gql/errors'
-    autoload :UndefinedField,   'gql/errors'
-    autoload :UndefinedRoot,    'gql/errors'
-    autoload :UndefinedType,    'gql/errors'
+    autoload :InvalidNodeClass,   'gql/errors'
+    autoload :ParseError,         'gql/errors'
+    autoload :UndefinedCall,      'gql/errors'
+    autoload :UndefinedField,     'gql/errors'
+    autoload :UndefinedNodeClass, 'gql/errors'
+    autoload :UndefinedRoot,      'gql/errors'
+    autoload :UndefinedFieldType, 'gql/errors'
   end
 
   module Fields
@@ -27,16 +28,23 @@ module GQL
     autoload :String,       'gql/fields/string'
   end
 
-  Schema.fields.update(
-    boolean:    Fields::Boolean,
-    connection: Fields::Connection,
-    float:      Fields::Float,
-    integer:    Fields::Integer,
-    object:     Fields::Object,
-    string:     Fields::String
-  )
-
   extend(Module.new {
+    def config
+      Thread.current[:gql_config] ||= Config.new
+    end
+
+    %w(root_node_class field_types).each do |method|
+      module_eval <<-DELEGATORS, __FILE__, __LINE__ + 1
+        def #{method}
+          config.#{method}
+        end
+
+        def #{method}=(value)
+          config.#{method} = (value)
+        end
+      DELEGATORS
+    end
+
     def execute(input, context = {})
       ast = parse(input)
 
@@ -65,4 +73,13 @@ module GQL
       end
     end
   })
+
+  self.field_types.update(
+    boolean:    Fields::Boolean,
+    connection: Fields::Connection,
+    float:      Fields::Float,
+    integer:    Fields::Integer,
+    object:     Fields::Object,
+    string:     Fields::String
+  )
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gql
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Martin Andert
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-03-03 00:00:00.000000000 Z
+date: 2015-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -111,6 +111,7 @@ files:
 - gql.gemspec
 - lib/gql.rb
 - lib/gql/call.rb
+- lib/gql/config.rb
 - lib/gql/connection.rb
 - lib/gql/errors.rb
 - lib/gql/executor.rb
@@ -124,7 +125,6 @@ files:
 - lib/gql/node.rb
 - lib/gql/parser.rb
 - lib/gql/parser.y
-- lib/gql/schema.rb
 - lib/gql/tokenizer.rb
 - lib/gql/tokenizer.rex
 - lib/gql/version.rb

data/lib/gql/schema.rb

@@ -1,21 +0,0 @@
-require 'singleton'
-require 'forwardable'
-
-module GQL
-  class Schema
-    include Singleton
-
-    class << self
-      extend Forwardable
-
-      delegate [:root, :root=, :fields] => :instance
-    end
-
-    attr_accessor :root
-    attr_reader :fields
-
-    def initialize
-      @fields = {}
-    end
-  end
-end