gql 0.0.17 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91c3e88c06f95f36b8f36526bce27d09799bec99
-  data.tar.gz: fc749a590e76c66395a5f7d9bc8353368004053a
+  metadata.gz: dd01c67b3f0e68e96e94cccf2b52bdc7b0ef4683
+  data.tar.gz: e525e23f3345a58363e33af7c693cc5becc1570c
 SHA512:
-  metadata.gz: 322528bd170fde6ab9d4ccfb70f4faa1619c4da64b9189b49f11899dc2a265db48ea08d6e95512e234d275845d13c733e70300ee7b039f434f8b1a956ab18e24
-  data.tar.gz: b38aea1027e426fe732024b35ed37bf23bf41feb3cd31b63e62730f1f53be942452097d526a6569bd7b5c832b416bc1258363fe6f2bd40a7b684e42ccff9e078
+  metadata.gz: 5141e572b5eab687f99263e6195a146e0aff74a4ce8361abb1ef7eccacfcb6f785de58c9a9c5c908bc978701368382cf325d92a4024c0be4acdf42e4eb8521be
+  data.tar.gz: 633ae172c44ba70a937e0ab61ffb8fbff011f2b1ed6d172bb0f7ded9054c31203c33bc29fdad41aa4c95fcdfb603fb5c35811620a97a08d1aafd5b00edf66af9

data/lib/gql/array.rb

@@ -1,34 +1,34 @@
 require 'active_support/core_ext/class/attribute'
 
 module GQL
-  class Array < Node
-    class_attribute :item_class, instance_accessor: false, instance_predicate: false
+  class Array < Field
+    class_attribute :item_field_class, instance_accessor: false, instance_predicate: false
 
     class << self
       def build_class(id, proc, options = {})
-        item_class = options.delete(:item_class) || self.item_class
+        item_field_class = options.delete(:item_field_class) || self.item_field_class
 
-        if item_class.is_a?(Hash)
-          item_class.values.each do |klass|
-            Node.validate_is_subclass! klass, 'item'
+        if item_field_class.is_a?(Hash)
+          item_field_class.values.each do |klass|
+            Field.validate_is_subclass! klass, 'item'
           end
         else
-          Node.validate_is_subclass! item_class, 'item'
-          item_class = Hash.new(item_class)
+          Field.validate_is_subclass! item_field_class, 'item'
+          item_field_class = Hash.new(item_field_class)
         end
 
         Class.new(self).tap do |field_class|
           field_class.id = id.to_s
           field_class.proc = proc
-          field_class.item_class = item_class
+          field_class.item_field_class = item_field_class
         end
       end
     end
 
     def value
       target.map do |item|
-        node = self.class.item_class[item.class].new(ast_node, item, variables, context)
-        node.value
+        field = self.class.item_field_class[item.class].new(ast_node, item, variables, context)
+        field.value
       end
     end
   end

data/lib/gql/boolean.rb

@@ -1,4 +1,4 @@
 module GQL
-  class Boolean < Raw
+  class Boolean < Scalar
   end
 end

data/lib/gql/call.rb

@@ -32,7 +32,7 @@ module GQL
         end
 
         def result_class_from_block(block)
-          Class.new(Node).tap do |result_class|
+          Class.new(Field).tap do |result_class|
             result_class.field_proc = -> id { -> { target[id] } }
             result_class.class_eval(&block)
           end

data/lib/gql/config.rb

@@ -2,16 +2,16 @@ require 'active_support/core_ext/class/subclasses'
 
 module GQL
   class Config
-    def root_node_class
-      @@root_node_class ||= nil
+    def root_field_class
+      @@root_field_class ||= nil
     end
 
-    def root_node_class=(value)
-      unless value.nil? || value <= Node
-        raise Errors::InvalidNodeClass.new(value, Node)
+    def root_field_class=(value)
+      unless value.nil? || value <= Field
+        raise Errors::InvalidFieldClass.new(value, Field)
       end
 
-      @@root_node_class = value
+      @@root_field_class = value
     end
 
     def root_target_proc
@@ -37,16 +37,16 @@ module GQL
       @@field_types = value
     end
 
-    def default_list_class
-      @@default_list_class ||= Node
+    def default_list_field_class
+      @@default_list_field_class ||= Field
     end
 
-    def default_list_class=(value)
-      unless value.nil? || value <= Node
-        raise Errors::InvalidNodeClass.new(value, Node)
+    def default_list_field_class=(value)
+      unless value.nil? || value <= Field
+        raise Errors::InvalidFieldClass.new(value, Field)
       end
 
-      @@default_list_class = value
+      @@default_list_field_class = value
     end
 
     def default_field_proc
@@ -96,31 +96,31 @@ module GQL
       end
 
       def switch_on_type_field
-        return if Node.fields.has_key? :__type__
+        return if Field.has_field? :__type__
 
-        type_field_class = Node.object :__type__, -> { field_class }, node_class: Schema::Field
+        type_field_class = Field.object :__type__, -> { field_class }, field_class: Schema::Field
 
-        Node.descendants.each do |node_class|
-          node_class.fields[:__type__] = type_field_class
+        Field.descendants.each do |field_class|
+          field_class.fields[:__type__] = type_field_class
         end
       end
 
       def switch_off_type_field
-        return unless Node.fields.has_key? :__type__
+        return unless Field.has_field? :__type__
 
-        [Node, *Node.descendants].each do |node_class|
-          node_class.remove_field :__type__
+        [Field, *Field.descendants].each do |field_class|
+          field_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
+        Field.send :remove_const, :ExecutionContext if Field.const_defined?(:ExecutionContext)
+        Field.const_set :ExecutionContext, Field::ExecutionContextDebug
       end
 
       def switch_off_execution_context
-        Node.send :remove_const, :ExecutionContext if Node.const_defined?(:ExecutionContext)
-        Node.const_set :ExecutionContext, Node::ExecutionContextNoDebug
+        Field.send :remove_const, :ExecutionContext if Field.const_defined?(:ExecutionContext)
+        Field.const_set :ExecutionContext, Field::ExecutionContextNoDebug
       end
 
   end

data/lib/gql/connection.rb

@@ -1,16 +1,16 @@
 require 'active_support/core_ext/class/attribute'
 
 module GQL
-  class Connection < Node
+  class Connection < Field
     class << self
       def build_class(id, proc, options = {})
-        list_class = options.delete(:list_class) || GQL.default_list_class
-        item_class = options.delete(:item_class)
+        list_field_class = options.delete(:list_field_class) || GQL.default_list_field_class
+        item_field_class = options.delete(:item_field_class)
 
-        Node.validate_is_subclass! list_class, 'list'
+        Field.validate_is_subclass! list_field_class, 'list'
 
-        list_class.build_class(id, proc, options).tap do |field_class|
-          field_class.array :edges, -> { target }, item_class: item_class
+        list_field_class.build_class(id, proc, options).tap do |field_class|
+          field_class.array :edges, -> { target }, item_field_class: item_field_class
         end
       end
     end

data/lib/gql/errors.rb

@@ -28,26 +28,26 @@ module GQL
   module Errors
     class NotFoundError < Error
       private
-        def construct_message(node_class, id, name, method)
-          items = node_class.send(method).keys.sort.map { |key| "`#{key}'" }
+        def construct_message(field_class, id, name, method)
+          items = field_class.send(method).keys.sort.map { |key| "`#{key}'" }
 
-          msg =  "#{node_class} has no #{name} named `#{id}'."
+          msg =  "#{field_class} has no #{name} named `#{id}'."
           msg << " Available #{name.pluralize}: #{items.to_sentence}." if items.any?
           msg
         end
     end
 
     class CallNotFound < NotFoundError
-      def initialize(id, node_class)
-        msg = construct_message(node_class, id, 'call', :calls)
+      def initialize(id, field_class)
+        msg = construct_message(field_class, id, 'call', :calls)
 
         super(msg, 111, id)
       end
     end
 
     class FieldNotFound < NotFoundError
-      def initialize(id, node_class)
-        msg = construct_message(node_class, id, 'field', :fields)
+      def initialize(id, field_class)
+        msg = construct_message(field_class, id, 'field', :fields)
 
         super(msg, 112, id)
       end
@@ -61,37 +61,46 @@ module GQL
       end
     end
 
-    class InvalidNodeClass < Error
+    class RootClassNotSet < Error
+      def initialize
+        msg =  "GQL root field class is not set. "
+        msg << "Set it with `GQL.root_field_class = MyRootField'."
+
+        super(msg, 121)
+      end
+    end
+
+    class FieldClassNotSet < Error
+      def initialize(node_class, name)
+        msg =  "#{node_class} must have a #{name} class set. "
+        msg << "Set it with `self.#{name}_class = My#{name.camelize}Class'."
+
+        super(msg, 122)
+      end
+    end
+
+    class InvalidFieldClass < Error
       def initialize(node_class, super_class)
         msg = "#{node_class} must be a (subclass of) #{super_class}."
 
-        super(msg, 121)
+        super(msg, 123)
       end
     end
 
     class NoMethodError < Error
       attr_reader :cause
 
-      def initialize(node_class, id, cause)
+      def initialize(field_class, id, cause)
         @cause = cause
 
-        msg =  "Undefined method `#{id}' for #{node_class}. "
+        msg =  "Undefined method `#{id}' for #{field_class}. "
         msg << "Did you try to add a field of type `#{id}'? "
         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 { |key| "`#{key}'" }.to_sentence
 
-        super(msg, 122)
-      end
-    end
-
-    class RootClassNotSet < Error
-      def initialize
-        msg =  "GQL root node class is not set. "
-        msg << "Set it with `GQL.root_node_class = MyRootNode'."
-
-        super(msg, 123)
+        super(msg, 124)
       end
     end
 
@@ -109,14 +118,5 @@ module GQL
         super(msg, 132, value)
       end
     end
-
-    class UndefinedNodeClass < Error
-      def initialize(node_class, name)
-        msg =  "#{node_class} must have a #{name} class set. "
-        msg << "Set it with `self.#{name}_class = My#{name.camelize}Class'."
-
-        super(msg, 124)
-      end
-    end
   end
 end

data/lib/gql/executor.rb

@@ -8,16 +8,16 @@ module GQL
     end
 
     def execute(context = {}, vars = {})
-      node_class = GQL.root_node_class
+      field_class = GQL.root_field_class
 
-      raise Errors::RootClassNotSet if node_class.nil?
+      raise Errors::RootClassNotSet if field_class.nil?
 
       variables.update vars
 
       target = GQL.root_target_proc.call(context)
 
-      node = node_class.new(ast_root, target, variables, context)
-      node.value
+      field = field_class.new(ast_root, target, variables, context)
+      field.value
     end
   end
 end

data/lib/gql/{node.rb → field.rb}

@@ -4,7 +4,7 @@ require 'gql/has_calls'
 require 'gql/has_fields'
 
 module GQL
-  class Node
+  class Field
     class_attribute :id, :proc, instance_accessor: false, instance_predicate: false
 
     class << self
@@ -17,11 +17,11 @@ module GQL
 
       def validate_is_subclass!(subclass, name)
         if subclass.nil?
-          raise Errors::UndefinedNodeClass.new(self, name)
+          raise Errors::FieldClassNotSet.new(self, name)
         end
 
         unless subclass <= self
-          raise Errors::InvalidNodeClass.new(subclass, self)
+          raise Errors::InvalidFieldClass.new(subclass, self)
         end
       end
     end
@@ -42,11 +42,11 @@ module GQL
       elsif ast_fields = ast_node.fields
         value_of_fields ast_fields
       else
-        raw_value
+        scalar_value
       end
     end
 
-    def raw_value
+    def scalar_value
       nil
     end
   end

data/lib/gql/has_calls.rb

@@ -21,7 +21,7 @@ module GQL
         result_spec = options[:returns] || call_spec.try(:result_class)
         result_class = result_class_from_spec(result_spec)
 
-        Node.validate_is_subclass! result_class, 'result' if result_class
+        Field.validate_is_subclass! result_class, 'result' if result_class
 
         call_class = call_class_from_spec(call_spec)
         call_class.id = id.to_s
@@ -65,12 +65,12 @@ module GQL
 
         def result_class_from_connection_spec(spec)
           if spec.size == 1
-            spec.unshift GQL.default_list_class
+            spec.unshift GQL.default_list_field_class
           end
 
           options = {
-            list_class: spec.first,
-            item_class: spec.last
+            list_field_class: spec.first,
+            item_field_class: spec.last
           }
 
           Connection.build_class :result, nil, options

data/lib/gql/has_fields.rb

@@ -15,10 +15,10 @@ module GQL
     module ClassMethods
       def add_field(id, *args, &block)
         options = args.extract_options!
-        type = options.delete(:type) || Node
+        type = options.delete(:type) || Field
         proc = args.shift || block || proc_for_field(id)
 
-        Node.validate_is_subclass! type, 'type'
+        Field.validate_is_subclass! type, 'type'
 
         type.build_class(id, proc, options).tap do |field_class|
           const_name = const_name_for_field(id)
@@ -45,7 +45,7 @@ module GQL
         id = id_or_proc.is_a?(Proc) ? nil : id_or_proc
         proc = id ? -> { target.public_send(id) } : id_or_proc
 
-        add_field :cursor, proc, type: Raw
+        add_field :cursor, proc, type: Scalar
       end
 
       def respond_to?(method, *args)
@@ -74,7 +74,7 @@ module GQL
         end
 
         def define_field_method(name, type)
-          Node.define_singleton_method name do |*args, &block|
+          Field.define_singleton_method name do |*args, &block|
             options = args.extract_options!.merge(type: type)
             args = args.push(options)
 

data/lib/gql/number.rb

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

data/lib/gql/object.rb

@@ -1,14 +1,14 @@
 require 'active_support/core_ext/class/attribute'
 
 module GQL
-  class Object < Node
+  class Object < Field
     class << self
       def build_class(id, proc, options = {})
-        node_class = options.delete(:node_class)
+        field_class = options.delete(:field_class)
 
-        Node.validate_is_subclass! node_class, 'node'
+        Field.validate_is_subclass! field_class, 'field'
 
-        node_class.build_class id, proc, options
+        field_class.build_class id, proc, options
       end
     end
   end

data/lib/gql/parser.rb

@@ -27,7 +27,7 @@ module_eval(<<'...end parser.racc/module_eval...', 'parser.racc', 136)
     end
   end
 
-  class Node < Struct.new(:id, :alias_id, :call, :fields)
+  class Field < Struct.new(:id, :alias_id, :call, :fields)
     def as_json(*)
       {
         id:         id,
@@ -301,14 +301,14 @@ module_eval(<<'.,.,', 'parser.racc', 4)
 
 module_eval(<<'.,.,', 'parser.racc', 8)
   def _reduce_2(val, _values, result)
-      result = Node.new('[root]', nil, val[0], nil   )  
+      result = Field.new('[root]', nil, val[0], nil   )  
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.racc', 9)
   def _reduce_3(val, _values, result)
-      result = Node.new('[root]', nil, nil,    val[1])  
+      result = Field.new('[root]', nil, nil,    val[1])  
     result
   end
 .,.,
@@ -403,49 +403,49 @@ module_eval(<<'.,.,', 'parser.racc', 41)
 
 module_eval(<<'.,.,', 'parser.racc', 45)
   def _reduce_18(val, _values, result)
-       result = Node.new(val[0], val[2], nil,    val[1].presence)   
+       result = Field.new(val[0], val[2], nil,    val[1].presence)   
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.racc', 46)
   def _reduce_19(val, _values, result)
-       result = Node.new(val[0], val[1], nil,    val[2].presence)   
+       result = Field.new(val[0], val[1], nil,    val[2].presence)   
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.racc', 47)
   def _reduce_20(val, _values, result)
-       result = Node.new(val[0], val[3], val[2], nil            )   
+       result = Field.new(val[0], val[3], val[2], nil            )   
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.racc', 48)
   def _reduce_21(val, _values, result)
-       result = Node.new(val[0], val[1], nil,    nil            )   
+       result = Field.new(val[0], val[1], nil,    nil            )   
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.racc', 49)
   def _reduce_22(val, _values, result)
-       result = Node.new(val[0], nil,    nil,    val[1].presence)   
+       result = Field.new(val[0], nil,    nil,    val[1].presence)   
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.racc', 50)
   def _reduce_23(val, _values, result)
-       result = Node.new(val[0], nil,    val[2], nil            )   
+       result = Field.new(val[0], nil,    val[2], nil            )   
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.racc', 51)
   def _reduce_24(val, _values, result)
-       result = Node.new(val[0], nil,    nil,    nil            )   
+       result = Field.new(val[0], nil,    nil,    nil            )   
     result
   end
 .,.,

data/lib/gql/scalar.rb

@@ -0,0 +1,7 @@
+module GQL
+  class Scalar < Field
+    def scalar_value
+      target
+    end
+  end
+end

data/lib/gql/schema/call.rb

@@ -1,14 +1,14 @@
 module GQL
   module Schema
-    class Call < GQL::Node
+    class Call < GQL::Field
       cursor :id
 
       string  :id
       string  :name
-      object  :result_class, -> { target.result_class || CallerClass }, node_class: Field
-      array   :parameters,   -> { (target.proc || target.instance_method(:execute)).parameters }, item_class: Parameter
+      object  :result_class, -> { target.result_class || CallerClass }, field_class: Field
+      array   :parameters,   -> { (target.proc || target.instance_method(:execute)).parameters }, item_field_class: Parameter
 
-      def raw_value
+      def scalar_value
         target.name
       end
     end

data/lib/gql/schema/caller_class.rb

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

data/lib/gql/schema/field.rb

@@ -1,14 +1,14 @@
 module GQL
   module Schema
-    class Field < GQL::Node
+    class Field < GQL::Field
       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
+      connection  :calls,  -> { target.calls.values  }, list_field_class: List, item_field_class: Call
+      connection  :fields, -> { target.fields.values }, list_field_class: List, item_field_class: Field
 
-      def raw_value
+      def scalar_value
         target.name
       end
     end

data/lib/gql/schema/list.rb

@@ -1,6 +1,6 @@
 module GQL
   module Schema
-    class List < GQL::Node
+    class List < GQL::Field
       call :count, returns: GQL::Number
       number :count
 

data/lib/gql/schema/parameter.rb

@@ -1,6 +1,6 @@
 module GQL
   module Schema
-    class Parameter < GQL::Node
+    class Parameter < GQL::Field
       TYPES = {
         req:      'required',
         opt:      'optional',
@@ -16,7 +16,7 @@ module GQL
       string :id,   -> { target[1].to_s }
       string :type, -> { TYPES[target[0]] || target[0].to_s }
 
-      def raw_value
+      def scalar_value
         "#{target[1]} (#{TYPES[target[0]] || target[0]})"
       end
     end

data/lib/gql/string.rb

@@ -1,5 +1,5 @@
 module GQL
-  class String < Raw
+  class String < Scalar
     # These are just example calls. Monkeypatch class to add your own.
     call :upcase
     call :downcase

data/lib/gql/tokenizer.rb

@@ -69,22 +69,25 @@ class GQL::Tokenizer < Racc::Parser
       when (text = @ss.scan(/-?(?:0|[1-9]\d*)(?:\.\d+)?(?:[eE][+-]?\d+)?/))
          action { [:NUMBER, text] }
 
-      when (text = @ss.scan(/true/))
+      when (text = @ss.scan(/true\b/))
          action { [:TRUE, text] }
 
-      when (text = @ss.scan(/false/))
+      when (text = @ss.scan(/false\b/))
          action { [:FALSE, text] }
 
-      when (text = @ss.scan(/null/))
+      when (text = @ss.scan(/null\b/))
          action { [:NULL, text] }
 
-      when (text = @ss.scan(/[aA][sS]/))
+      when (text = @ss.scan(/[aA][sS]\b/))
          action { [:AS, text] }
 
       when (text = @ss.scan(/[a-zA-Z_][a-zA-Z0-9_]*/))
          action { [:IDENT, text] }
 
-      when (text = @ss.scan(/\s+/))
+      when (text = @ss.scan(/(?:[[:blank:]]|\f)+/))
+        ;
+
+      when (text = @ss.scan(/\r?\n/))
         ;
 
       when (text = @ss.scan(/./))

data/lib/gql/version.rb

@@ -1,3 +1,3 @@
 module GQL
-  VERSION = '0.0.17'
+  VERSION = '0.0.18'
 end

data/lib/gql.rb

@@ -11,11 +11,11 @@ module GQL
   autoload :Connection
   autoload :Error, 'gql/errors'
   autoload :Executor
-  autoload :Node
+  autoload :Field
   autoload :Number
   autoload :Object
   autoload :Parser
-  autoload :Raw
+  autoload :Scalar
   autoload :String
   autoload :TestCase
   autoload :Tokenizer
@@ -25,13 +25,13 @@ module GQL
 
     autoload_at 'gql/errors' do
       autoload :CallNotFound
+      autoload :FieldClassNotSet
       autoload :FieldNotFound
-      autoload :InvalidNodeClass
+      autoload :InvalidFieldClass
       autoload :NoMethodError
       autoload :RootClassNotSet
       autoload :ScanError
       autoload :SyntaxError
-      autoload :UndefinedNodeClass
       autoload :VariableNotFound
     end
   end
@@ -55,8 +55,8 @@ module GQL
       Thread.current[:gql_config] = value
     end
 
-    %w(root_node_class root_target_proc field_types
-       default_list_class default_field_proc
+    %w(root_field_class root_target_proc field_types
+       default_list_field_class default_field_proc
        default_call_proc debug).each do |method|
       module_eval <<-DELEGATORS, __FILE__, __LINE__ + 1
         def #{method}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gql
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
 platform: ruby
 authors:
 - Martin Andert
@@ -111,13 +111,13 @@ files:
 - lib/gql/connection.rb
 - lib/gql/errors.rb
 - lib/gql/executor.rb
+- lib/gql/field.rb
 - lib/gql/has_calls.rb
 - lib/gql/has_fields.rb
-- lib/gql/node.rb
 - lib/gql/number.rb
 - lib/gql/object.rb
 - lib/gql/parser.rb
-- lib/gql/raw.rb
+- lib/gql/scalar.rb
 - lib/gql/schema/call.rb
 - lib/gql/schema/caller_class.rb
 - lib/gql/schema/field.rb

data/lib/gql/raw.rb

@@ -1,7 +0,0 @@
-module GQL
-  class Raw < Node
-    def raw_value
-      target
-    end
-  end
-end