gql 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 057b52e4c11305751f76664db776b55aca6ddc7c
-  data.tar.gz: 701c40c23c2a7d846dadf1620545851d9d31788e
+  metadata.gz: fd8a84ed2a267ac54920709090a7f462e68d3669
+  data.tar.gz: 4a3e5bec9744df6f0af716d1ac21bdb9dfe309cc
 SHA512:
-  metadata.gz: bb1b082c1cb33cdd35c951a29d44e480fa2e820b6116855df6326553ef678b4de9328a539f92e5d5b3d258be34288ad4f6c576de576ccef68315ee0fff68d435
-  data.tar.gz: 401ffa1b6ad1780498e360701a274348c09215d55929caa3abe971d11d17724505fffd69742672b1aac5db96e90d58bff162de64e65a40f2b7cfa427e5d1238d
+  metadata.gz: f35fc1eae1c53765b4c1f931bb12b2fd5f8325f470d9315e2ed26485cdb79fd6604413e127e096f6a475332b720fcc53238d068c1f11433e61ae3e5c4fb83b87
+  data.tar.gz: f76fd8dff372e093470a0dda9b5aac075ddfdfd17f9e8f83759a90748677a54542988491e84e1c024a71f49e3b83d88ebcf64bfa48d81b62a0cc0c1197ea57b4

data/lib/gql.rb

@@ -18,6 +18,7 @@ module GQL
   autoload :Raw
   autoload :String
   autoload :TestCase
+  autoload :Tokenizer
 
   module Errors
     extend ActiveSupport::Autoload
@@ -31,6 +32,7 @@ module GQL
       autoload :ScanError
       autoload :SyntaxError
       autoload :UndefinedNodeClass
+      autoload :VariableNotFound
     end
   end
 
@@ -41,8 +43,7 @@ module GQL
     autoload :Field
     autoload :List
     autoload :Parameter
-    autoload :Placeholder
-    autoload :Root
+    autoload :CallerClass
   end
 
   extend(Module.new {
@@ -56,7 +57,7 @@ module GQL
 
     %w(root_node_class root_target_proc field_types
        default_list_class default_field_proc
-       default_call_proc).each do |method|
+       default_call_proc debug).each do |method|
       module_eval <<-DELEGATORS, __FILE__, __LINE__ + 1
         def #{method}
           config.#{method}
@@ -68,11 +69,11 @@ module GQL
       DELEGATORS
     end
 
-    def execute(input, context = {})
+    def execute(input, context = {}, variables = {})
       query = parse(input)
 
       executor = Executor.new(query)
-      executor.execute context
+      executor.execute context, variables
     end
 
     def parse(input)
@@ -80,10 +81,11 @@ module GQL
     end
 
     def tokenize(input)
-      parser = Parser.new(input)
+      tokenizer = Tokenizer.new
+      tokenizer.scan_setup input
 
       [].tap do |result|
-        while token = parser.next_token
+        while token = tokenizer.next_token
           result << token
           yield token if block_given?
         end

data/lib/gql/call.rb

@@ -21,8 +21,14 @@ module GQL
 
       private
         def substitute_variables(args, variables)
-          return args unless variables.any?
-          args.map { |arg| arg.is_a?(::Symbol) ? variables[arg] : arg }
+          args.map { |arg| substitute_variable arg, variables }
+        end
+
+        def substitute_variable(arg, variables)
+          return arg unless arg.is_a?(::Symbol)
+          return variables[arg] if variables.has_key?(arg)
+
+          raise Errors::VariableNotFound, arg
         end
 
         def result_class_from_block(block)

data/lib/gql/config.rb

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/class/subclasses'
+
 module GQL
   class Config
     def root_node_class
@@ -9,10 +11,6 @@ module GQL
         raise Errors::InvalidNodeClass.new(value, Node)
       end
 
-      if value && ENV['DEBUG']
-        value.call :schema, -> { context[:__schema_root] }, returns: Schema::Root
-      end
-
       @@root_node_class = value
     end
 
@@ -66,5 +64,57 @@ module GQL
     def default_call_proc=(value)
       @@default_call_proc = value
     end
+
+    def debug
+      @@debug ||= ENV.has_key?('DEBUG')
+    end
+
+    def debug=(value)
+      value = !!value
+
+      return if value == debug
+
+      value ? switch_debug_on : switch_debug_off
+
+      @@debug = value
+    end
+
+    private
+      def switch_debug_on
+        switch_on_type_field
+        switch_on_execution_context
+      end
+
+      def switch_debug_off
+        switch_off_type_field
+        switch_off_execution_context
+      end
+
+      def switch_on_type_field
+        return if Node.fields.has_key? :__type__
+
+        [Node, *Node.descendants].each do |node_class|
+          node_class.object :__type__, -> { field_class }, node_class: Schema::Field
+        end
+      end
+
+      def switch_off_type_field
+        return unless Node.fields.has_key? :__type__
+
+        [Node, *Node.descendants].each do |node_class|
+          node_class.remove_field :__type__
+        end
+      end
+
+      def switch_on_execution_context
+        Node.send :remove_const, :ExecutionContext if Node.const_defined?(:ExecutionContext)
+        Node.const_set :ExecutionContext, Node::ExecutionContextDebug
+      end
+
+      def switch_off_execution_context
+        Node.send :remove_const, :ExecutionContext if Node.const_defined?(:ExecutionContext)
+        Node.const_set :ExecutionContext, Node::ExecutionContextNoDebug
+      end
+
   end
 end

data/lib/gql/errors.rb

@@ -19,7 +19,7 @@ module GQL
       }
 
       result[:error][:handle] = handle.to_s if handle
-      result[:error][:message] = message if ENV['DEBUG']
+      result[:error][:message] = message if GQL.debug
 
       result
     end
@@ -53,6 +53,14 @@ module GQL
       end
     end
 
+    class VariableNotFound < NotFoundError
+      def initialize(id)
+        msg = "The variable named `<#{id}>' has no value."
+
+        super(msg, 113, id)
+      end
+    end
+
     class InvalidNodeClass < Error
       def initialize(node_class, super_class)
         msg = "#{node_class} must be a (subclass of) #{super_class}."
@@ -72,7 +80,7 @@ module GQL
         msg << "If so, you have to register your field type first "
         msg << "like this: `GQL.field_types[:#{id}] = My#{id.to_s.camelize}'. "
         msg << "The following field types are currently registered: "
-        msg << GQL.field_types.keys.sort.map { |id| "`#{id}'" }.to_sentence
+        msg << GQL.field_types.keys.sort.map { |key| "`#{key}'" }.to_sentence
 
         super(msg, 122)
       end

data/lib/gql/executor.rb

@@ -7,12 +7,12 @@ module GQL
       @variables  = ast_query.variables
     end
 
-    def execute(context = {})
+    def execute(context = {}, vars = {})
       node_class = GQL.root_node_class
 
       raise Errors::RootClassNotSet if node_class.nil?
 
-      context[:__schema_root] = node_class if ENV['DEBUG']
+      variables.update vars
 
       target = GQL.root_target_proc.call(context)
 

data/lib/gql/has_calls.rb

@@ -14,7 +14,7 @@ module GQL
     end
 
     module ClassMethods
-      def call(id, *args, &block)
+      def add_call(id, *args, &block)
         options = args.extract_options!
 
         call_spec = args.shift || block || proc_for_call(id)
@@ -27,11 +27,32 @@ module GQL
         call_class.id = id.to_s
         call_class.result_class = result_class
 
-        self.const_set "#{id.to_s.camelize}Call", call_class
+        if result_class && result_class.name.nil?
+          call_class.const_set :Result, result_class
+        end
+
+        self.const_set const_name_for_call(id), call_class
         self.calls = calls.merge(id.to_sym => call_class)
       end
 
+      alias :call :add_call
+
+      def remove_call(id)
+        const_name = const_name_for_call(id)
+
+        send :remove_const, const_name if const_defined?(const_name)
+        calls.delete id
+      end
+
+      def has_call?(id)
+        calls.has_key? id
+      end
+
       private
+        def const_name_for_call(id)
+          :"#{id.to_s.camelize}Call"
+        end
+
         def proc_for_call(id)
           instance_exec id, &(call_proc || GQL.default_call_proc)
         end

data/lib/gql/has_fields.rb

@@ -10,10 +10,14 @@ module GQL
     included do
       class_attribute :fields, :field_proc, instance_accessor: false, instance_predicate: false
       self.fields = {}
+
+      object :__type__, -> { field_class }, node_class: Schema::Field if GQL.debug
+
+      const_set :ExecutionContext, GQL.debug ? ExecutionContextDebug : ExecutionContextNoDebug
     end
 
     module ClassMethods
-      def field(id, *args, &block)
+      def add_field(id, *args, &block)
         options = args.extract_options!
         type = options.delete(:type) || Node
         proc = args.shift || block || proc_for_field(id)
@@ -21,16 +25,31 @@ module GQL
         Node.validate_is_subclass! type, 'type'
 
         type.build_class(id, proc, options).tap do |field_class|
-          self.const_set "#{id.to_s.camelize}Field", field_class
+          const_name = const_name_for_field(id)
+
+          const_set const_name, field_class unless const_defined?(const_name)
           self.fields = fields.merge(id.to_sym => field_class)
         end
       end
 
+      alias :field :add_field
+
+      def remove_field(id)
+        const_name = const_name_for_field(id)
+
+        send :remove_const, const_name if const_defined?(const_name)
+        fields.delete id
+      end
+
+      def has_field?(id)
+        fields.has_key? id
+      end
+
       def cursor(id_or_proc)
         id = id_or_proc.is_a?(Proc) ? nil : id_or_proc
         proc = id ? -> { target.public_send(id) } : id_or_proc
 
-        field :cursor, proc, type: Raw
+        add_field :cursor, proc, type: Raw
       end
 
       def respond_to?(method, *args)
@@ -49,6 +68,11 @@ module GQL
       end
 
       private
+        def const_name_for_field(id)
+          prefix = id == :__type__ ? 'Schema_Type' : id.to_s.camelize
+          :"#{prefix}Field"
+        end
+
         def proc_for_field(id)
           instance_exec id, &(field_proc || GQL.default_field_proc)
         end
@@ -58,7 +82,7 @@ module GQL
             options = args.extract_options!.merge(type: type)
             args = args.push(options)
 
-            field(*args, &block)
+            add_field(*args, &block)
           end
         end
     end
@@ -90,11 +114,20 @@ module GQL
       end
 
       def target_for_field(current_target, proc)
-        method = ExecutionContext.new(current_target, context)
+        args = [current_target, context]
+        args.push self.class if GQL.debug
+
+        method = self.class.const_get(:ExecutionContext).new(*args)
         method.execute proc
       end
 
-      class ExecutionContext < Struct.new(:target, :context)
+      class ExecutionContextNoDebug < Struct.new(:target, :context)
+        def execute(method, args = [])
+          instance_exec(*args, &method)
+        end
+      end
+
+      class ExecutionContextDebug < Struct.new(:target, :context, :field_class)
         def execute(method, args = [])
           instance_exec(*args, &method)
         end

data/lib/gql/node.rb

@@ -5,9 +5,6 @@ require 'gql/has_fields'
 
 module GQL
   class Node
-    include HasCalls
-    include HasFields
-
     class_attribute :id, :proc, instance_accessor: false, instance_predicate: false
 
     class << self
@@ -29,6 +26,9 @@ module GQL
       end
     end
 
+    include HasCalls
+    include HasFields
+
     attr_reader :ast_node, :target, :variables, :context
 
     def initialize(ast_node, target, variables, context)

data/lib/gql/parser.rb

@@ -14,7 +14,7 @@ require 'active_support/core_ext/object/json'
 require 'gql/tokenizer'
 
 module GQL
-  class Parser < Racc::Parser
+  class Parser < Tokenizer
 
 module_eval(<<'...end parser.racc/module_eval...', 'parser.racc', 136)
 
@@ -27,15 +27,6 @@ module_eval(<<'...end parser.racc/module_eval...', 'parser.racc', 136)
     end
   end
 
-  class Root < Struct.new(:call, :fields)
-    def as_json(*)
-      {
-        call:       call.as_json,
-        fields:     fields.as_json
-      }
-    end
-  end
-
   class Node < Struct.new(:id, :alias_id, :call, :fields)
     def as_json(*)
       {
@@ -310,14 +301,14 @@ module_eval(<<'.,.,', 'parser.racc', 4)
 
 module_eval(<<'.,.,', 'parser.racc', 8)
   def _reduce_2(val, _values, result)
-      result = Root.new(val[0], nil   )  
+      result = Node.new('[root]', nil, val[0], nil   )  
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.racc', 9)
   def _reduce_3(val, _values, result)
-      result = Root.new(nil,    val[1])  
+      result = Node.new('[root]', nil, nil,    val[1])  
     result
   end
 .,.,

data/lib/gql/schema/call.rb

@@ -4,8 +4,13 @@ module GQL
       cursor :id
 
       string  :id
-      object  :result_class, -> { target.result_class || Placeholder }, node_class: Root
+      string  :name
+      object  :result_class, -> { target.result_class || CallerClass }, node_class: Field
       array   :parameters,   -> { (target.proc || target.instance_method(:execute)).parameters }, item_class: Parameter
+
+      def raw_value
+        target.name
+      end
     end
   end
 end

data/lib/gql/schema/{placeholder.rb → caller_class.rb}

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

data/lib/gql/schema/field.rb

@@ -4,8 +4,13 @@ module GQL
       cursor :id
 
       string      :id
+      string      :name
       connection  :calls,  -> { target.calls.values  }, list_class: List, item_class: Call
       connection  :fields, -> { target.fields.values }, list_class: List, item_class: Field
+
+      def raw_value
+        target.name
+      end
     end
   end
 end

data/lib/gql/tokenizer.rb

@@ -5,7 +5,7 @@
 #++
 
 require 'racc/parser'
-class GQL::Parser < Racc::Parser
+class GQL::Tokenizer < Racc::Parser
   require 'strscan'
 
   class Unused < StandardError ; end

data/lib/gql/version.rb

@@ -1,3 +1,3 @@
 module GQL
-  VERSION = '0.0.15'
+  VERSION = '0.0.16'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gql
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors:
 - Martin Andert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-11 00:00:00.000000000 Z
+date: 2015-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -119,11 +119,10 @@ files:
 - lib/gql/parser.rb
 - lib/gql/raw.rb
 - lib/gql/schema/call.rb
+- lib/gql/schema/caller_class.rb
 - lib/gql/schema/field.rb
 - lib/gql/schema/list.rb
 - lib/gql/schema/parameter.rb
-- lib/gql/schema/placeholder.rb
-- lib/gql/schema/root.rb
 - lib/gql/string.rb
 - lib/gql/test_case.rb
 - lib/gql/tokenizer.rb

data/lib/gql/schema/root.rb

@@ -1,14 +0,0 @@
-module GQL
-  module Schema
-    class Root < GQL::Node
-      string :name
-
-      connection  :calls,  -> { target.calls.values  }, list_class: List, item_class: Call
-      connection  :fields, -> { target.fields.values }, list_class: List, item_class: Field
-
-      def raw_value
-        target.name
-      end
-    end
-  end
-end