gql 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2a09930fd0d6998f3652bd99bacce706c64fb0e
-  data.tar.gz: 0d8a5d883919be233726b729ed4a7bec89c5958f
+  metadata.gz: fe2deb60572972e21f7f7371dd4437cd87532043
+  data.tar.gz: 502022ff7d90578776e50bcb84b9d19deddbbd8f
 SHA512:
-  metadata.gz: bf6337d65cc3a325006f1c0f87c932ae3344b035776e9a3d698deffc00421c88714d13009b8659ab2dee75e524d089966edede001ed68b49c0c17e968ece9a8d
-  data.tar.gz: 926bdde87803db064e8f4f9cb6834e4d2181a0bf1cea895a8f2d244140313140e63b3b479ce46a6f424a44cac34bad7548d2e13ded7245acbf3957bcc00b0e74
+  metadata.gz: b865d13e6b65926e4dad2e418d8cc49882a168e809eeaa372987123714aa6ad761e84f73abef746835fc9964e3683ef6de8f1ea4a91ed8c6b3ce0a0484eeac73
+  data.tar.gz: d1e7b56cd2d314de5a175c19a7f4bde686d0a907c144a6650d2a271876bde255a1e8b1b9ee6b5d8a8ebd7962d9eb81321fed1b9f4b38edbc16800ed87b5f7e10

data/README.md

@@ -86,7 +86,7 @@ This should result in the following JSON (after prettyfication):
     "year": 2010,
     "month": 3
   },
-  "created": "March 04, 2010 14:04",
+  "created": "March 05, 2010 20:14",
   "account": {
     "bank_name": "Foo Bank",
     "iban": "987654321",
@@ -100,7 +100,7 @@ This should result in the following JSON (after prettyfication):
     "count": 2,
     "edges": [
       {
-        "cursor": "1",
+        "cursor": 1,
         "node": {
           "artist": "Metallica",
           "title": "Black Album",
@@ -119,7 +119,7 @@ This should result in the following JSON (after prettyfication):
           }
         }
       }, {
-        "cursor": "2",
+        "cursor": 2,
         "node": {
           "artist": "Nirvana",
           "title": "Nevermind",

data/lib/gql.rb

@@ -20,6 +20,7 @@ module GQL
   end
 
   module Fields
+    autoload :Array,        'gql/fields/array'
     autoload :Boolean,      'gql/fields/boolean'
     autoload :Connection,   'gql/fields/connection'
     autoload :Float,        'gql/fields/float'
@@ -75,6 +76,7 @@ module GQL
   })
 
   self.field_types.update(
+    array:      Fields::Array,
     boolean:    Fields::Boolean,
     connection: Fields::Connection,
     float:      Fields::Float,

data/lib/gql/call.rb

@@ -26,7 +26,8 @@ module GQL
             raise Errors::InvalidNodeClass.new(field_type_class, Fields::Connection)
           end
 
-          result_class = field_type_class.build_class(nil, connection_class, node_class)
+          options = { connection_class: connection_class, node_class: node_class }
+          result_class = field_type_class.build_class(nil, options)
         elsif result_class && !(result_class <= Node)
           raise Errors::InvalidNodeClass.new(result_class, Node)
         end

data/lib/gql/connection.rb

@@ -8,28 +8,11 @@ module GQL
       def build_class(node_class)
         node_class ||= self.node_class
 
-        if node_class.nil?
-          raise Errors::UndefinedNodeClass.new(self, 'node')
-        end
-
-        unless node_class <= GQL::Node
-          raise Errors::InvalidNodeClass.new(node_class, GQL::Node)
-        end
-
         Class.new(self).tap do |connection_class|
-          connection_class.node_class = node_class
-        end
-      end
-    end
-
-    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
+          connection_class.array :edges, node_class: node_class do
+            target
+          end
         end
-      else
-        super
       end
     end
   end

data/lib/gql/errors.rb

@@ -14,7 +14,7 @@ module GQL
 
     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`.")
+        super("#{node_class} must define a #{name} class. Set it with `self.#{name}_class = My#{name.camelize}Class`.")
       end
     end
 

data/lib/gql/field.rb

@@ -17,7 +17,7 @@ module GQL
     class_attribute :method, instance_accessor: false, instance_predicate: false
 
     class << self
-      def build_class(method, connection_class, node_class)
+      def build_class(method, options = {})
         Class.new(self).tap do |field_class|
           field_class.method = method
         end

data/lib/gql/fields/array.rb

@@ -0,0 +1,39 @@
+require 'active_support/core_ext/class/attribute'
+
+module GQL
+  module Fields
+    class Array < Field
+      class_attribute :node_class, instance_accessor: false, instance_predicate: false
+
+      class << self
+        def build_class(method, options = {})
+          node_class = options[:node_class] || self.node_class
+
+          if node_class.nil?
+            raise Errors::UndefinedNodeClass.new(self, 'node')
+          end
+
+          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
+        target.map do |item|
+          node = self.class.node_class.new(ast_node, item, variables, context)
+          node.value
+        end
+      end
+
+      def raw_value
+        nil
+      end
+    end
+  end
+end

data/lib/gql/fields/connection.rb

@@ -4,10 +4,11 @@ module GQL
   module Fields
     class Connection < Field
       class_attribute :connection_class, instance_accessor: false, instance_predicate: false
+      self.connection_class = GQL::Connection
 
       class << self
-        def build_class(method, connection_class, node_class)
-          connection_class ||= self.connection_class
+        def build_class(method, options = {})
+          connection_class = options[:connection_class] || self.connection_class
 
           if connection_class.nil?
             raise Errors::UndefinedNodeClass.new(self, 'connection')
@@ -19,7 +20,7 @@ module GQL
 
           Class.new(self).tap do |field_class|
             field_class.method = method
-            field_class.connection_class = connection_class.build_class(node_class)
+            field_class.connection_class = connection_class.build_class(options[:node_class])
           end
         end
       end

data/lib/gql/fields/object.rb

@@ -6,8 +6,8 @@ module GQL
       class_attribute :node_class, instance_accessor: false, instance_predicate: false
 
       class << self
-        def build_class(method, connection_class, node_class)
-          node_class ||= self.node_class
+        def build_class(method, options = {})
+          node_class = options[:node_class] || self.node_class
 
           if node_class.nil?
             raise Errors::UndefinedNodeClass.new(self, 'node')
@@ -24,7 +24,7 @@ module GQL
         end
       end
 
-      def value_of_fields(*)
+      def value
         node = self.class.node_class.new(ast_node, target, variables, context)
         node.value
       end

data/lib/gql/node.rb

@@ -1,5 +1,6 @@
 require 'active_support/core_ext/class/attribute'
 require 'active_support/core_ext/string/inflections'
+require 'active_support/core_ext/array/extract_options'
 
 module GQL
   class Node
@@ -9,12 +10,6 @@ module GQL
     self.field_classes = {}
 
     class << self
-      def cursor(method_name)
-        define_method :cursor do
-          target.send(method_name).to_s
-        end
-      end
-
       def call(*names, &block)
         names_with_result_class = names.extract_options!
 
@@ -31,22 +26,32 @@ module GQL
         end
       end
 
-      def field(*names, field_type_class: nil, connection_class: nil, node_class: nil, &block)
+      def field(*names, &block)
+        options = names.extract_options!
+
         names.each do |name|
           method = block || lambda { target.public_send(name) }
-          field_type_class ||= Field
+          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, connection_class, node_class)
+          field_class = field_type_class.build_class(method, options)
 
           self.const_set "#{name.to_s.camelize}Field", field_class
           self.field_classes = field_classes.merge(name => field_class)
         end
       end
 
+      def cursor(name = nil, &block)
+        if name
+          field :cursor, &-> { target.public_send(name) }
+        elsif block_given?
+          field :cursor, &block
+        end
+      end
+
       def method_missing(method, *names, &block)
         if field_type_class = GQL.field_types[method]
           options = names.extract_options!
@@ -101,14 +106,12 @@ module GQL
       when :node
         field = self.class.new(ast_field, target, variables, context)
         field.value
-      when :cursor
-        cursor
       else
         method = Field::Method.new(target, context)
         field_class = self.class.field_classes[ast_field.name]
 
         if field_class.nil?
-          raise Errors::UndefinedField.new(ast_field.name, self.class)
+          raise Errors::UndefinedField.new(ast_field.name, self.class.superclass)
         end
 
         next_target = method.execute(field_class.method)

data/lib/gql/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gql
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Martin Andert
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-03-04 00:00:00.000000000 Z
+date: 2015-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -116,6 +116,7 @@ files:
 - lib/gql/errors.rb
 - lib/gql/executor.rb
 - lib/gql/field.rb
+- lib/gql/fields/array.rb
 - lib/gql/fields/boolean.rb
 - lib/gql/fields/connection.rb
 - lib/gql/fields/float.rb