gql 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: afade4dbb867e9e0a602148b69032b9993271a70
-  data.tar.gz: b2fbe5c310949e6f14c76bd736297e8a33c06874
+  metadata.gz: cb700c03e6fe7d133fe2bc42736b5908e66174ac
+  data.tar.gz: da41c9aefb85d60137e6fad700993632f66a5b06
 SHA512:
-  metadata.gz: 8db790c55fb17a480541fb5f10af5133e535452e17dd701d569a47475075f125848ecd62c08194db2f3007aa74281349c26acd0c70e091fbb49ad8aca9291b8b
-  data.tar.gz: 4ac70838a5ac05d0f46362ddd98ee0834e2c5bab6ca49c98e6ddfe91400191f4730e7281553a025d43c05a5abaaf2fcfb0df365cfb29d45e32f0bb2cb280c30a
+  metadata.gz: cf3fcd9f66515866b529288aacf23f31980c2e2acb6d49c0b558f9908de0b6912ebbccbfc24099b93cfd8566c0076b011bae32c10045acc889d03e89934fc924
+  data.tar.gz: fdfa1d2cb54671fb57c340beff95d43c3644874c46b35ff90d825362a8bb6616f6c5afe3981ca1dcb81affa20f9ffcb5c344a47ac16b6e42b69f4714e4c5840e

data/lib/gql.rb

@@ -6,13 +6,12 @@ module GQL
   autoload :Connection, 'gql/connection'
   autoload :Error,      'gql/errors'
   autoload :Executor,   'gql/executor'
-  autoload :Field,      'gql/field'
   autoload :List,       'gql/list'
   autoload :Node,       'gql/node'
   autoload :Number,     'gql/number'
   autoload :Object,     'gql/object'
   autoload :Parser,     'gql/parser'
-  autoload :Simple,     'gql/simple'
+  autoload :Raw,        'gql/raw'
   autoload :String,     'gql/string'
   autoload :TestCase,   'gql/test_case'
   autoload :VERSION,    'gql/version'
@@ -32,9 +31,9 @@ module GQL
     autoload :Call,         'gql/schema/call'
     autoload :Field,        'gql/schema/field'
     autoload :List,         'gql/schema/list'
-    autoload :Node,         'gql/schema/node'
     autoload :Parameter,    'gql/schema/parameter'
     autoload :Placeholder,  'gql/schema/placeholder'
+    autoload :Root,         'gql/schema/root'
   end
 
   extend(Module.new {

data/lib/gql/array.rb

@@ -1,7 +1,7 @@
 require 'active_support/core_ext/class/attribute'
 
 module GQL
-  class Array < Field
+  class Array < Node
     class_attribute :item_class, instance_accessor: false, instance_predicate: false
 
     class << self

data/lib/gql/boolean.rb

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

data/lib/gql/call.rb

@@ -8,6 +8,21 @@ module GQL
       def returns(result_class)
         self.result_class = result_class
       end
+
+      def execute(caller_class, ast_node, target, variables, context)
+        args = substitute_variables(ast_node.arguments, variables)
+        target = new(target, context).execute(*args)
+
+        next_class = result_class || caller_class
+
+        result = next_class.new(ast_node, target, variables, context)
+        result.value
+      end
+
+      private
+        def substitute_variables(args, variables)
+          args.map { |arg| arg.is_a?(::Symbol) ? variables[arg] : arg }
+        end
     end
 
     attr_reader :target, :context
@@ -19,20 +34,5 @@ module GQL
     def execute(*)
       raise NotImplementedError, 'override in subclass'
     end
-
-    def result_for(caller_class, ast_node, variables)
-      args = substitute_variables(ast_node.arguments, variables)
-      target = execute(*args)
-
-      result_class = self.class.result_class || caller_class
-
-      result = result_class.new(ast_node, target, variables, context)
-      result.value
-    end
-
-    private
-      def substitute_variables(args, variables)
-        args.map { |arg| arg.is_a?(::Symbol) ? variables[arg] : arg }
-      end
   end
 end

data/lib/gql/config.rb

@@ -10,7 +10,7 @@ module GQL
       end
 
       if ENV['DEBUG']
-        value.call :_schema, -> { context[:_schema_root] }, returns: Schema::Node
+        value.call :_schema, -> { context[:_schema_root] }, returns: Schema::Root
       end
 
       @@root_node_class = value

data/lib/gql/connection.rb

@@ -1,7 +1,7 @@
 require 'active_support/core_ext/class/attribute'
 
 module GQL
-  class Connection < Field
+  class Connection < Node
     class_attribute :list_class, instance_accessor: false, instance_predicate: false
     class_attribute :item_class, instance_accessor: false, instance_predicate: false
 

data/lib/gql/node.rb

@@ -17,12 +17,19 @@ module GQL
       end
     end
 
-    class_attribute :calls, :fields, instance_accessor: false, instance_predicate: false
+    class_attribute :id, :proc, :calls, :fields, instance_accessor: false, instance_predicate: false
 
     self.calls = {}
     self.fields = {}
 
     class << self
+      def build_class(id, proc, options = {})
+        Class.new(self).tap do |field_class|
+          field_class.id = id.to_s
+          field_class.proc = proc
+        end
+      end
+
       def call(id, *args)
         if id.is_a? Hash
           id.each do |name, call_class|
@@ -76,9 +83,9 @@ module GQL
       def field(id, *args)
         options = args.extract_options!
         proc    = args.shift || -> { target.public_send(id) }
-        type    = options.delete(:type) || Field
+        type    = options.delete(:type) || Node
 
-        Field.validate_is_subclass! type, 'type'
+        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
@@ -90,7 +97,7 @@ module GQL
         id = id_or_proc.is_a?(Proc) ? nil : id_or_proc
         proc = id ? -> { target.public_send(id) } : id_or_proc
 
-        field :cursor, proc, type: Simple
+        field :cursor, proc, type: Raw
       end
 
       def validate_is_subclass!(subclass, name)
@@ -104,14 +111,19 @@ module GQL
       end
 
       def respond_to?(method, *args)
-        GQL.field_types.has_key?(method) || super
+        super || GQL.field_types.has_key?(method)
       end
 
       def method_missing(method, *args, &block)
         if type = GQL.field_types[method]
-          options = args.extract_options!.merge(type: type)
+          Node.define_singleton_method method do |*margs, &mblock|
+            options = margs.extract_options!.merge(type: type)
+            margs = margs.push(options)
+
+            field(*margs, &mblock)
+          end
 
-          field(*args.push(options), &block)
+          send method, *args, &block
         else
           super
         end
@@ -144,8 +156,7 @@ module GQL
         raise Errors::UndefinedCall.new(ast_call.id, self.class)
       end
 
-      call = call_class.new(target, context)
-      call.result_for self.class, ast_call, variables
+      call_class.execute(self.class, ast_call, target, variables, context)
     end
 
     def value_of_fields(ast_fields)

data/lib/gql/number.rb

@@ -1,5 +1,5 @@
 module GQL
-  class Number < Simple
+  class Number < Raw
     # 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,7 +1,7 @@
 require 'active_support/core_ext/class/attribute'
 
 module GQL
-  class Object < Field
+  class Object < Node
     class_attribute :node_class, instance_accessor: false, instance_predicate: false
 
     class << self

data/lib/gql/parser.rb

@@ -27,7 +27,7 @@ module_eval(<<'...end parser.racc/module_eval...', 'parser.racc', 135)
     end
   end
 
-  class Field < Struct.new(:id, :alias_id, :call, :fields)
+  class Node < Struct.new(:id, :alias_id, :call, :fields)
     def as_json(*)
       {
         id:         id,
@@ -187,7 +187,7 @@ racc_reduce_table = [
   1, 41, :_reduce_46,
   1, 41, :_reduce_47,
   1, 41, :_reduce_48,
-  1, 44, :_reduce_49,
+  1, 44, :_reduce_none,
   1, 27, :_reduce_50 ]
 
 racc_reduce_n = 51
@@ -300,14 +300,14 @@ module_eval(<<'.,.,', 'parser.racc', 4)
 
 module_eval(<<'.,.,', 'parser.racc', 8)
   def _reduce_2(val, _values, result)
-      result = Field.new(nil, nil, val[0], nil   )  
+      result = Node.new(nil, nil, val[0], nil   )  
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.racc', 9)
   def _reduce_3(val, _values, result)
-      result = Field.new(nil, nil, nil,    val[1])  
+      result = Node.new(nil, nil, nil,    val[1])  
     result
   end
 .,.,
@@ -402,42 +402,42 @@ module_eval(<<'.,.,', 'parser.racc', 41)
 
 module_eval(<<'.,.,', 'parser.racc', 45)
   def _reduce_18(val, _values, result)
-       result = Field.new(val[0], val[2], nil,    val[1].presence)   
+       result = Node.new(val[0], val[2], nil,    val[1].presence)   
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.racc', 46)
   def _reduce_19(val, _values, result)
-       result = Field.new(val[0], val[3], val[2], nil            )   
+       result = Node.new(val[0], val[3], val[2], nil            )   
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.racc', 47)
   def _reduce_20(val, _values, result)
-       result = Field.new(val[0], val[1], nil,    nil            )   
+       result = Node.new(val[0], val[1], nil,    nil            )   
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.racc', 48)
   def _reduce_21(val, _values, result)
-       result = Field.new(val[0], nil,    nil,    val[1].presence)   
+       result = Node.new(val[0], nil,    nil,    val[1].presence)   
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.racc', 49)
   def _reduce_22(val, _values, result)
-       result = Field.new(val[0], nil,    val[2], nil            )   
+       result = Node.new(val[0], nil,    val[2], nil            )   
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.racc', 50)
   def _reduce_23(val, _values, result)
-       result = Field.new(val[0], nil,    nil,    nil            )   
+       result = Node.new(val[0], nil,    nil,    nil            )   
     result
   end
 .,.,
@@ -577,12 +577,7 @@ module_eval(<<'.,.,', 'parser.racc', 114)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 118)
-  def _reduce_49(val, _values, result)
-       result = unescape_string(val[0])  
-    result
-  end
-.,.,
+# reduce 49 omitted
 
 module_eval(<<'.,.,', 'parser.racc', 121)
   def _reduce_50(val, _values, result)

data/lib/gql/{simple.rb → raw.rb}

@@ -1,5 +1,5 @@
 module GQL
-  class Simple < Field
+  class Raw < Node
     def raw_value
       target
     end

data/lib/gql/schema/{node.rb → root.rb}

@@ -1,6 +1,6 @@
 module GQL
   module Schema
-    class Node < GQL::Node
+    class Root < GQL::Node
       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

data/lib/gql/string.rb

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

data/lib/gql/tokenizer.rb

@@ -64,7 +64,7 @@ class GQL::Parser < Racc::Parser
          action { @state = :REM;  nil }
 
       when (text = @ss.scan(/"(?:[^"\\]|\\["\\\/bfnrt]|\\u[0-9a-fA-F]{4})*"/))
-         action { [:STRING, unescape_string(text)] }
+         action { [:STRING, convert_json(text)] }
 
       when (text = @ss.scan(/-?(?:0|[1-9]\d*)(?:\.\d+)?(?:[eE][+-]?\d+)?/))
          action { [:NUMBER, text] }
@@ -131,39 +131,8 @@ class GQL::Parser < Racc::Parser
   end  # def _next_token
 
   private
-    UNESCAPE_MAP = Hash.new { |h, k| h[k] = k.chr }
-    UNESCAPE_MAP.update(
-      ?"  => '"',
-      ?\\ => '\\',
-      ?/  => '/',
-      ?b  => "\b",
-      ?f  => "\f",
-      ?n  => "\n",
-      ?r  => "\r",
-      ?t  => "\t",
-      ?u  => nil,
-    )
-    EMPTY_8BIT_STRING = ''
-    if String.method_defined? :encode
-      EMPTY_8BIT_STRING.force_encoding Encoding::ASCII_8BIT
-    end
-    def unescape_string(str)
-      string = str.gsub(/^"|"$/, '').gsub(%r((?:\\[\\bfnrt"/]|(?:\\u(?:[A-Fa-f\d]{4}))+|\\[\x20-\xff]))n) do |c|
-        if u = UNESCAPE_MAP[$&[1]]
-          u
-        else # \uXXXX
-          bytes = EMPTY_8BIT_STRING.dup
-          i = 0
-          while c[6 * i] == ?\\ && c[6 * i + 1] == ?u
-            bytes << c[6 * i + 2, 2].to_i(16) << c[6 * i + 4, 2].to_i(16)
-            i += 1
-          end
-          JSON.iconv('utf-8', 'utf-16be', bytes)
-        end
-      end
-      if string.respond_to? :force_encoding
-        string.force_encoding ::Encoding::UTF_8
-      end
-      string
+    require 'multi_json'
+    def convert_json(str)
+      MultiJson.load("[#{str}]").first
     end
 end # class

data/lib/gql/version.rb

@@ -1,3 +1,3 @@
 module GQL
-  VERSION = '0.0.8'
+  VERSION = '0.0.9'
 end

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification
 name: gql
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Martin Andert
 autorequire: 
-bindir: exe
+bindir: bin
 cert_chain: []
 date: 2015-03-08 00:00:00.000000000 Z
 dependencies:
@@ -72,14 +72,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: 
 email:
 - mandert@gmail.com
@@ -87,15 +101,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- Gemfile
 - LICENSE.txt
 - README.md
-- Rakefile
-- bin/console
-- bin/rake
-- bin/setup
-- gql.gemspec
 - lib/gql.rb
 - lib/gql/array.rb
 - lib/gql/boolean.rb
@@ -104,18 +111,17 @@ files:
 - lib/gql/connection.rb
 - lib/gql/errors.rb
 - lib/gql/executor.rb
-- lib/gql/field.rb
 - lib/gql/node.rb
 - lib/gql/number.rb
 - lib/gql/object.rb
 - lib/gql/parser.rb
+- lib/gql/raw.rb
 - lib/gql/schema/call.rb
 - lib/gql/schema/field.rb
 - lib/gql/schema/list.rb
-- lib/gql/schema/node.rb
 - lib/gql/schema/parameter.rb
 - lib/gql/schema/placeholder.rb
-- lib/gql/simple.rb
+- lib/gql/schema/root.rb
 - lib/gql/string.rb
 - lib/gql/test_case.rb
 - lib/gql/tokenizer.rb

data/.gitignore

@@ -1,10 +0,0 @@
-/.bundle/
-/.yardoc
-/Gemfile.lock
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-/lib/gql/parser.output

data/Gemfile

@@ -1,4 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in gql.gemspec
-gemspec

data/Rakefile

@@ -1,35 +0,0 @@
-dir = File.dirname(__FILE__)
-
-require 'bundler/gem_tasks'
-require 'rake/testtask'
-
-file 'lib/gql/tokenizer.rb' => 'support/tokenizer.rex' do |t|
-  sh "bundle exec rex #{t.prerequisites.first} --output-file #{t.name}"
-
-  # use custom scan error class
-  sh "sed --in-place 's/class ScanError/class Unused/' #{t.name}"
-  sh "sed --in-place 's/ScanError/GQL::Errors::ScanError/' #{t.name}"
-end
-
-file 'lib/gql/parser.rb' => 'support/parser.racc' do |t|
-  if ENV['DEBUG']
-    sh "bundle exec racc --debug --verbose --output-file=#{t.name} #{t.prerequisites.first}"
-  else
-    sh "bundle exec racc --output-file=#{t.name} #{t.prerequisites.first}"
-  end
-
-  # fix indentation of generated parser code to silence test warning
-  sh "sed --in-place 's/  end\s*# module/end #/g' #{t.name}"
-end
-
-Rake::TestTask.new :test do |t|
-  t.libs << 'test'
-  t.test_files = Dir.glob("#{dir}/test/cases/**/*_test.rb")
-# t.warning = true
-# t.verbose = true
-end
-
-task :compile => ['lib/gql/tokenizer.rb', 'lib/gql/parser.rb']
-task :test    => :compile
-task :release => :test
-task :default => :test

data/bin/console

@@ -1,25 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'bundler/setup'
-require 'gql'
-
-require_relative '../test/example'
-
-def ctxt
-  @ctxt ||= { auth_token: 'ma' }
-end
-
-def q(string, context = ctxt)
-  GQL.execute string, context
-end
-
-def p(string)
-  GQL.parse string
-end
-
-def t(string, &block)
-  GQL.tokenize string, &block
-end
-
-require 'irb'
-IRB.start

data/bin/rake

@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'rake' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('rake', 'rake')

data/bin/setup

@@ -1,5 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-IFS=$'\n\t'
-
-bundle install

data/gql.gemspec

@@ -1,29 +0,0 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-
-require 'gql/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = 'gql'
-  spec.version       = GQL::VERSION
-  spec.authors       = ['Martin Andert']
-  spec.email         = ['mandert@gmail.com']
-
-  spec.summary       = 'A Ruby implementation of Facebook\'s yet-to-be-released GraphQL specification.'
-  spec.homepage      = 'https://github.com/martinandert/gql'
-  spec.license       = 'MIT'
-
-  spec.required_ruby_version = '>= 2.2.0'
-
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features|support)/}) }
-  spec.bindir        = 'exe'
-  spec.require_paths = ['lib']
-
-  spec.add_development_dependency 'bundler', '~> 1.8'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rexical', '~> 1.0'
-  spec.add_development_dependency 'racc', '~> 1.4'
-
-  spec.add_dependency 'activesupport', '~> 4.2'
-end

data/lib/gql/field.rb

@@ -1,16 +0,0 @@
-require 'active_support/core_ext/class/attribute'
-
-module GQL
-  class Field < Node
-    class_attribute :id, :proc, instance_accessor: false, instance_predicate: false
-
-    class << self
-      def build_class(id, proc, options = {})
-        Class.new(self).tap do |field_class|
-          field_class.id = id.to_s
-          field_class.proc = proc
-        end
-      end
-    end
-  end
-end