gql 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3b82548839c3920e499f9256cab69aa5ba31081
-  data.tar.gz: c1631dc4bac082ad2086eadbe816791971f45b57
+  metadata.gz: c2a09930fd0d6998f3652bd99bacce706c64fb0e
+  data.tar.gz: 0d8a5d883919be233726b729ed4a7bec89c5958f
 SHA512:
-  metadata.gz: 71d53e0856f5c0937d980deb1e1f27351dd9f76c84a6a9f449d23a26483bfd2745323c5d39fde5a480783f052389daf9ee5f690fc071f3eabc3bed3ebe308f8b
-  data.tar.gz: 0247f336c99c7365ebe800e1df5213cbdc9d525d1f4cf9ceb44b689b60547fe99a7126a9ed7ebc59400b6264a6af0397a505808f8ee8f2e03e31de3300f15c20
+  metadata.gz: bf6337d65cc3a325006f1c0f87c932ae3344b035776e9a3d698deffc00421c88714d13009b8659ab2dee75e524d089966edede001ed68b49c0c17e968ece9a8d
+  data.tar.gz: 926bdde87803db064e8f4f9cb6834e4d2181a0bf1cea895a8f2d244140313140e63b3b479ce46a6f424a44cac34bad7548d2e13ded7245acbf3957bcc00b0e74

data/README.md

@@ -33,7 +33,7 @@ TODO: Write usage instructions here
 
 ## Example
 
-Run `bin/console` for an interactive prompt and enter the following:
+Run `bin/console` for an interactive prompt (loaded with example models/data) and enter the following:
 
 ```ruby
 puts q(<<-QUERY_STRING).to_json
@@ -78,69 +78,69 @@ QUERY_STRING
 This should result in the following JSON (after prettyfication):
 
 ```json
-  {
-    "id": "ma",
-    "is_admin": true,
-    "name": "Martin Andert",
-    "created_year_and_month": {
-      "year": 2010,
-      "month": 3
-    },
-    "created": "March 04, 2010 14:04",
-    "account": {
-      "bank_name": "Foo Bank",
-      "iban": "987654321",
-      "saldo_string": "100000.00 EUR",
-      "saldo": {
-        "currency": "EUR",
-        "cents": 10000000
-      }
-    },
-    "albums": {
-      "count": 2,
-      "edges": [
-        {
-          "cursor": "1",
-          "node": {
-            "artist": "Metallica",
-            "title": "Black Album",
-            "songs": {
-              "edges": [
-                {
-                  "id": 1,
-                  "upcased_title": "ENTER SANDMAN",
-                  "upcased_title_length": 13
-                }, {
-                  "id": 2,
-                  "upcased_title": "SAD BUT TRUE",
-                  "upcased_title_length": 12
-                }
-              ]
-            }
+{
+  "id": "ma",
+  "is_admin": true,
+  "name": "Martin Andert",
+  "created_year_and_month": {
+    "year": 2010,
+    "month": 3
+  },
+  "created": "March 04, 2010 14:04",
+  "account": {
+    "bank_name": "Foo Bank",
+    "iban": "987654321",
+    "saldo_string": "100000.00 EUR",
+    "saldo": {
+      "currency": "EUR",
+      "cents": 10000000
+    }
+  },
+  "albums": {
+    "count": 2,
+    "edges": [
+      {
+        "cursor": "1",
+        "node": {
+          "artist": "Metallica",
+          "title": "Black Album",
+          "songs": {
+            "edges": [
+              {
+                "id": 1,
+                "upcased_title": "ENTER SANDMAN",
+                "upcased_title_length": 13
+              }, {
+                "id": 2,
+                "upcased_title": "SAD BUT TRUE",
+                "upcased_title_length": 12
+              }
+            ]
           }
-        }, {
-          "cursor": "2",
-          "node": {
-            "artist": "Nirvana",
-            "title": "Nevermind",
-            "songs": {
-              "edges": [
-                {
-                  "id": 5,
-                  "upcased_title": "SMELLS LIKE TEEN SPIRIT",
-                  "upcased_title_length": 23
-                }, {
-                  "id": 6,
-                  "upcased_title": "COME AS YOU ARE",
-                  "upcased_title_length": 15
-                }
-              ]
-            }
+        }
+      }, {
+        "cursor": "2",
+        "node": {
+          "artist": "Nirvana",
+          "title": "Nevermind",
+          "songs": {
+            "edges": [
+              {
+                "id": 5,
+                "upcased_title": "SMELLS LIKE TEEN SPIRIT",
+                "upcased_title_length": 23
+              }, {
+                "id": 6,
+                "upcased_title": "COME AS YOU ARE",
+                "upcased_title_length": 15
+              }
+            ]
           }
         }
-      ]
-    }
+      }
+    ]
   }
+}
 ```
 
 

data/lib/gql/call.rb

@@ -1,6 +1,44 @@
 module GQL
   class Call
-    attr_reader :target, :context
+    class Method
+      attr_reader :target, :context
+
+      def initialize(target, context)
+        @target, @context = target, context
+      end
+
+      def execute(method, args)
+        instance_exec(*args, &method)
+      end
+    end
+
+    class_attribute :method, :result_class, instance_accessor: false, instance_predicate: false
+
+    class << self
+      def build_class(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
+
+          field_type_class, connection_class, node_class = result_class
+
+          unless field_type_class <= Fields::Connection
+            raise Errors::InvalidNodeClass.new(field_type_class, Fields::Connection)
+          end
+
+          result_class = field_type_class.build_class(nil, connection_class, node_class)
+        elsif result_class && !(result_class <= Node)
+          raise Errors::InvalidNodeClass.new(result_class, Node)
+        end
+
+        Class.new(self).tap do |call_class|
+          call_class.method = method
+          call_class.result_class = result_class
+        end
+      end
+    end
+
+    attr_reader :caller, :ast_node, :target, :variables, :context
 
     def initialize(caller, ast_node, target, variables, context)
       @caller, @ast_node, @target = caller, ast_node, target
@@ -8,18 +46,19 @@ module GQL
     end
 
     def execute
-      args = substitute_variables(@ast_node.arguments)
-      target = instance_exec(*args, &self.class.const_get(:Function))
+      args = substitute_variables(ast_node.arguments)
 
-      result_class = self.class.const_get(:Result) || @caller.class
+      method = Method.new(target, context)
+      target = method.execute(self.class.method, args)
+      result_class = self.class.result_class || caller.class
 
-      result = result_class.new(@ast_node, target, @variables, context)
-      result.__value
+      result = result_class.new(ast_node, target, variables, context)
+      result.value
     end
 
     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

@@ -0,0 +1,23 @@
+module GQL
+  class Config
+    def root_node_class
+      @@root_node_class ||= nil
+    end
+
+    def root_node_class=(value)
+      unless value.nil? || value <= Node
+        raise Errors::InvalidNodeClass.new(value, Node)
+      end
+
+      @@root_node_class = value
+    end
+
+    def field_types
+      @@field_types ||= {}
+    end
+
+    def field_types=(value)
+      @@field_types = value
+    end
+  end
+end

data/lib/gql/connection.rb

@@ -1,35 +1,35 @@
+require 'active_support/core_ext/class/attribute'
+
 module GQL
   class Connection < Node
-    field :edges
-
-    def initialize(node_class, *args)
-      super(*args)
-
-      @node_class = node_class
-    end
+    class_attribute :node_class, instance_accessor: false, instance_predicate: false
 
-    alias :items :__target
+    class << self
+      def build_class(node_class)
+        node_class ||= self.node_class
 
-    def edges_ast_node
-      @edges_ast_node ||= @ast_node.fields.find { |f| f.name == :edges }
-    end
+        if node_class.nil?
+          raise Errors::UndefinedNodeClass.new(self, 'node')
+        end
 
-    def edges
-      raise Errors::InvalidNodeClass.new(@node_class, Node) unless @node_class < Node
+        unless node_class <= GQL::Node
+          raise Errors::InvalidNodeClass.new(node_class, GQL::Node)
+        end
 
-      items.map do |item|
-        node = @node_class.new(edges_ast_node, item, @variables, __context)
-        node.__value
+        Class.new(self).tap do |connection_class|
+          connection_class.node_class = node_class
+        end
       end
     end
 
-    EdgesField.class_eval do
-      def __value
-        if @ast_node.fields
-          __target
-        else
-          nil
+    def value_of_field(ast_field)
+      if ast_field.name == :edges
+        target.map do |item|
+          node = self.class.node_class.new(ast_field, item, variables, context)
+          node.value
         end
+      else
+        super
       end
     end
   end

data/lib/gql/errors.rb

@@ -1,35 +1,39 @@
 require 'active_support/core_ext/array/conversions'
+require 'active_support/core_ext/string/inflections'
 
 module GQL
   class Error < StandardError
   end
 
   module Errors
-    class SchemaError < Error
+    class UndefinedRoot < Error
+      def initialize
+        super('Root node class is undefined. Define it with `GQL.root_node_class = MyRootNode`.')
+      end
     end
 
-    class UndefinedRoot < SchemaError
-      def initialize
-        super('No root node class is known to the schema. Assign it with `GQL::Schema.root = MyRootNode`.')
+    class UndefinedNodeClass < Error
+      def initialize(node_class, name)
+        super("#{node_class} must define a #{name} class. Set it with `self.#{name}_class = My#{method.camelize}Class`.")
       end
     end
 
-    class InvalidNodeClass < SchemaError
+    class InvalidNodeClass < Error
       def initialize(node_class, super_class)
-        super("#{node_class} must be a subclass of #{super_class}.")
+        super("#{node_class} must be a (subclass of) #{super_class}.")
       end
     end
 
-    class UndefinedType < SchemaError
+    class UndefinedFieldType < Error
       def initialize(name)
-        types = Schema.fields.keys.sort.map { |name| "`#{name}`" }
+        types = GQL.field_types.keys.sort.map { |name| "`#{name}`" }
         types = types.size > 0 ? " Available types: #{types.to_sentence}." : ''
 
-        super("The field type `#{name}` is not known to the schema. Define it with `GQL::Schema.fields[my_type] = MyFieldType`.#{types}")
+        super("The field type `#{name}` is undefined. Define it with `GQL.field_types[:#{name}] = My#{name.to_s.camelize}`.#{types}")
       end
     end
 
-    class UndefinedCall < SchemaError
+    class UndefinedCall < Error
       def initialize(name, node_class)
         calls = node_class.call_classes.keys.sort.map { |name| "`#{name}`" }
         calls = calls.size > 0 ? " Available calls: #{calls.to_sentence}." : ''
@@ -38,7 +42,7 @@ module GQL
       end
     end
 
-    class UndefinedField < SchemaError
+    class UndefinedField < Error
       def initialize(name, node_class)
         fields = node_class.field_classes.keys.sort.map { |name| "`#{name}`" }
         fields = fields.size > 0 ? " Available fields: #{fields.to_sentence}." : ''

data/lib/gql/executor.rb

@@ -1,18 +1,19 @@
 module GQL
   class Executor
+    attr_reader :ast_node, :variables
+
     def initialize(ast_root)
-      @ast_root = ast_root
-      @variables = ast_root.variables
+      @ast_node   = ast_root.node
+      @variables  = ast_root.variables
     end
 
     def execute(context = {})
-      root_class = Schema.root
+      node_class = GQL.root_node_class
 
-      raise Errors::UndefinedRoot if root_class.nil?
-      raise Errors::InvalidNodeClass.new(root_class, Node) unless root_class < Node
+      raise Errors::UndefinedRoot if node_class.nil?
 
-      root = root_class.new(@ast_root, nil, @variables, context)
-      root.__value
+      node = node_class.new(ast_node, nil, variables, context)
+      node.value
     end
   end
 end

data/lib/gql/field.rb

@@ -1,7 +1,31 @@
+require 'active_support/core_ext/class/attribute'
+
 module GQL
   class Field < Node
-    def __raw_value
-      __target
+    class Method
+      attr_reader :target, :context
+
+      def initialize(target, context)
+        @target, @context = target, context
+      end
+
+      def execute(method)
+        instance_exec(&method)
+      end
+    end
+
+    class_attribute :method, instance_accessor: false, instance_predicate: false
+
+    class << self
+      def build_class(method, connection_class, node_class)
+        Class.new(self).tap do |field_class|
+          field_class.method = method
+        end
+      end
+    end
+
+    def raw_value
+      target
     end
   end
 end

data/lib/gql/fields/connection.rb

@@ -1,22 +1,36 @@
+require 'active_support/core_ext/class/attribute'
+
 module GQL
   module Fields
     class Connection < Field
-      def __value
-        if @ast_node.fields
-          __raw_value
-        else
-          super
+      class_attribute :connection_class, instance_accessor: false, instance_predicate: false
+
+      class << self
+        def build_class(method, connection_class, node_class)
+          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.method = method
+            field_class.connection_class = connection_class.build_class(node_class)
+          end
         end
       end
 
-      def __raw_value
-        connection_class = self.class.const_get(:CONNECTION_CLASS)
-        node_class = self.class.const_get(:NODE_CLASS)
-
-        raise Errors::InvalidNodeClass.new(connection_class, GQL::Connection) unless connection_class <= GQL::Connection
+      def value_of_fields(*)
+        connection = self.class.connection_class.new(ast_node, target, variables, context)
+        connection.value
+      end
 
-        connection = connection_class.new(node_class, @ast_node, __target, @variables, __context)
-        connection.__value
+      def raw_value
+        nil
       end
     end
   end

data/lib/gql/fields/object.rb

@@ -1,17 +1,37 @@
+require 'active_support/core_ext/class/attribute'
+
 module GQL
   module Fields
     class Object < Field
-      def __value
-        raise Errors::InvalidNodeClass.new(__node_class__, Node) unless __node_class__ < Node
+      class_attribute :node_class, instance_accessor: false, instance_predicate: false
 
-        node = __node_class__.new(@ast_node, __target, @variables, __context)
-        node.__value
-      end
+      class << self
+        def build_class(method, connection_class, node_class)
+          node_class ||= self.node_class
+
+          if node_class.nil?
+            raise Errors::UndefinedNodeClass.new(self, 'node')
+          end
 
-      private
-        def __node_class__
-          self.class.const_get :NODE_CLASS
+          unless node_class <= GQL::Node
+            raise Errors::InvalidNodeClass.new(node_class, GQL::Node)
+          end
+
+          Class.new(self).tap do |field_class|
+            field_class.method = method
+            field_class.node_class = node_class
+          end
         end
+      end
+
+      def value_of_fields(*)
+        node = self.class.node_class.new(ast_node, target, variables, context)
+        node.value
+      end
+
+      def raw_value
+        nil
+      end
     end
   end
 end