gql 0.0.6 → 0.0.7

data/lib/gql/parser.y

@@ -1,14 +1,13 @@
 class GQL::Parser
 token STRING NUMBER TRUE FALSE NULL AS IDENT
 rule
-  root
-    : variables node variables    {  result = Root.new(val[1],             val[0].merge(val[2]))  }
-    | variables                   {  result = Root.new(Node.new(nil, nil), val[0]              )  }
+  query
+    : variables root variables    {  result = Query.new(val[1], val[0].merge(val[2]))  }
     ;
 
-  node
-    : call          {  result = Node.new(val[0], nil            )  }
-    | fields        {  result = Node.new(nil,    val[0].presence)  }
+  root
+    : call                  {  result = Field.new(nil, nil, val[0], nil   )  }
+    | '{' field_list '}'    {  result = Field.new(nil, nil, nil,    val[1])  }
     ;
 
   call
@@ -126,21 +125,42 @@ end
 
 ---- header
 
-require 'json'
+require 'active_support/json'
 require 'active_support/core_ext/object/blank'
+require 'active_support/core_ext/object/try'
+require 'active_support/core_ext/object/json'
 
 ---- inner
 
-  class Root < Struct.new(:node, :variables)
-  end
-
-  class Node < Struct.new(:call, :fields)
+  class Query < Struct.new(:root, :variables)
+    def as_json(*)
+      {
+        root:       root.as_json,
+        variables:  variables
+      }
+    end
   end
 
   class Field < Struct.new(:id, :alias_id, :call, :fields)
+    def as_json(*)
+      {
+        id:         id,
+        alias_id:   alias_id,
+        call:       call.as_json,
+        fields:     fields.as_json
+      }
+    end
   end
 
   class Call < Struct.new(:id, :arguments, :call, :fields)
+    def as_json(*)
+      {
+        id:         id,
+        arguments:  arguments,
+        call:       call.as_json,
+        fields:     fields.as_json
+      }
+    end
   end
 
   UNESCAPE_MAP = Hash.new { |h, k| h[k] = k.chr }

data/lib/gql/schema/call.rb

@@ -2,19 +2,11 @@ module GQL
   module Schema
     class Call < GQL::Node
       cursor :id
-      string :id
 
-      array :parameters, :item_class => Parameter do
-        target.method.parameters
-      end
-
-      string :type do
-        target.name
-      end
-
-      object :result_class, :node_class => Node do
-        target.result_class || Placeholder
-      end
+      string  :id
+      string  :type,         -> { target.name }
+      array   :parameters,   -> { target.method.parameters }, item_class: Parameter
+      object  :result_class, -> { target.result_class || Placeholder }, node_class: Node
     end
   end
 end

data/lib/gql/schema/field.rb

@@ -2,19 +2,11 @@ module GQL
   module Schema
     class Field < GQL::Node
       cursor :id
-      string :id
 
-      string :type do
-        target.name
-      end
-
-      connection :calls, :list_class => List, :item_class => Call do
-        target.calls.values
-      end
-
-      connection :fields, :list_class => List, :item_class => Field do
-        target.fields.values
-      end
+      string      :id
+      string      :type,   -> { target.name }
+      connection  :calls,  -> { target.calls.values  }, list_class: List, item_class: Call
+      connection  :fields, -> { target.fields.values }, list_class: List, item_class: Field
     end
   end
 end

data/lib/gql/schema/node.rb

@@ -1,17 +1,9 @@
 module GQL
   module Schema
     class Node < GQL::Node
-      string :type do
-        target.name
-      end
-
-      connection :calls, :list_class => List, :item_class => Call do
-        target.calls.values
-      end
-
-      connection :fields, :list_class => List, :item_class => Field do
-        target.fields.values
-      end
+      string      :type,   -> { target.name }
+      connection  :calls,  -> { target.calls.values  }, list_class: List, item_class: Call
+      connection  :fields, -> { target.fields.values }, list_class: List, item_class: Field
     end
   end
 end

data/lib/gql/schema/parameter.rb

@@ -1,13 +1,11 @@
 module GQL
   module Schema
     class Parameter < GQL::Node
-      cursor { target[1].to_s }
+      cursor -> { target[1].to_s }
 
-      string :id do
-        target[1].to_s
-      end
+      string :id, -> { target[1].to_s }
 
-      string :mode do
+      string :mode, -> {
         case target[0]
         when :req
           'required'
@@ -26,7 +24,7 @@ module GQL
         else
           target[0].to_s
         end
-      end
+      }
     end
   end
 end

data/lib/gql/string.rb

@@ -1,8 +1,8 @@
 module GQL
   class String < Simple
     # These are just example calls. Monkeypatch class to add your own.
-    call :upcase, -> { target.upcase }
-    call :downcase, -> { target.downcase }
-    call :length, Number, -> { target.size }
+    call :upcase
+    call :downcase
+    call :length, returns: Number
   end
 end

data/lib/gql/version.rb

@@ -1,3 +1,3 @@
 module GQL
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gql
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Martin Andert
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-03-05 00:00:00.000000000 Z
+date: 2015-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -157,6 +157,5 @@ rubyforge_project:
 rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
-summary: An attempted Ruby implementation of Facebook's yet-to-be-released GraphQL
-  specification.
+summary: A Ruby implementation of Facebook's yet-to-be-released GraphQL specification.
 test_files: []