gql 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c91705621b9dd8b0515c2d72859f30af612d5f24
-  data.tar.gz: d5f410d2acdc7c18f9832058db5c70fd720f7b08
+  metadata.gz: afade4dbb867e9e0a602148b69032b9993271a70
+  data.tar.gz: b2fbe5c310949e6f14c76bd736297e8a33c06874
 SHA512:
-  metadata.gz: 73cb1ed1e7bb3cdbdb4cb6cbe9eea50c8eeec8aac68d708f9bac42e9feb887bc44a03ed477b2f51da659b370c1bea5a2192490730885eaa33d2d9cee10225e73
-  data.tar.gz: 2b41f407270151041915c441b9ff6ad790298d43ea925af074b4a7405d3b5475c27db40865c62e37d50d84e4d0fd373d6cd5cd5d26c82c86a9e126f32cb6adc6
+  metadata.gz: 8db790c55fb17a480541fb5f10af5133e535452e17dd701d569a47475075f125848ecd62c08194db2f3007aa74281349c26acd0c70e091fbb49ad8aca9291b8b
+  data.tar.gz: 4ac70838a5ac05d0f46362ddd98ee0834e2c5bab6ca49c98e6ddfe91400191f4730e7281553a025d43c05a5abaaf2fcfb0df365cfb29d45e32f0bb2cb280c30a

data/README.md

@@ -148,8 +148,6 @@ This should result in the following JSON (after prettyfication):
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `bin/console` for an interactive prompt that will allow you to experiment.
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release` to create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
-
 
 ## Contributing
 

data/Rakefile

@@ -1,22 +1,35 @@
+dir = File.dirname(__FILE__)
+
 require 'bundler/gem_tasks'
 require 'rake/testtask'
 
-file 'lib/gql/tokenizer.rb' => 'lib/gql/tokenizer.rex' do |t|
+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' => 'lib/gql/parser.y' do |t|
+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
-end
 
-task :compile => ['lib/gql/tokenizer.rb', 'lib/gql/parser.rb']
+  # 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 => :compile do |t|
+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/rake

@@ -0,0 +1,16 @@
+#!/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/gql.gemspec

@@ -16,13 +16,12 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.2.0'
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  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 'minitest'
   spec.add_development_dependency 'rexical', '~> 1.0'
   spec.add_development_dependency 'racc', '~> 1.4'
 

data/lib/gql.rb

@@ -14,11 +14,12 @@ module GQL
   autoload :Parser,     'gql/parser'
   autoload :Simple,     'gql/simple'
   autoload :String,     'gql/string'
-  autoload :Tokenizer,  'gql/tokenizer'
+  autoload :TestCase,   'gql/test_case'
   autoload :VERSION,    'gql/version'
 
   module Errors
     autoload :InvalidNodeClass,   'gql/errors'
+    autoload :ScanError,          'gql/errors'
     autoload :SyntaxError,        'gql/errors'
     autoload :UndefinedCall,      'gql/errors'
     autoload :UndefinedField,     'gql/errors'
@@ -61,23 +62,14 @@ module GQL
     end
 
     def parse(input)
-      input = input.read if input.respond_to?(:read)
-
-      tokenizer = Tokenizer.new
-      tokenizer.scan_setup input
-
-      parser = Parser.new(tokenizer)
-      parser.parse
+      Parser.new(input).parse
     end
 
     def tokenize(input)
-      input = input.read if input.respond_to?(:read)
-
-      tokenizer = Tokenizer.new
-      tokenizer.scan_setup input
+      parser = Parser.new(input)
 
       [].tap do |result|
-        while token = tokenizer.next_token
+        while token = parser.next_token
           result << token
           yield token if block_given?
         end

data/lib/gql/call.rb

@@ -2,7 +2,7 @@ require 'active_support/core_ext/class/attribute'
 
 module GQL
   class Call
-    class_attribute :result_class, :proc, instance_accessor: false, instance_predicate: false
+    class_attribute :id, :result_class, :proc, instance_accessor: false, instance_predicate: false
 
     class << self
       def returns(result_class)

data/lib/gql/errors.rb

@@ -52,11 +52,14 @@ module GQL
     end
 
     class SyntaxError < Error
-      def initialize(value, token)
+      def initialize(lineno, value, token)
         token = 'character' if token == 'error' || token == %Q{"#{value}"}
 
-        super("Unexpected #{token}: `#{value}`.")
+        super("Unexpected #{token}: `#{value}` (line #{lineno}).")
       end
     end
+
+    class ScanError < Error
+    end
   end
 end

data/lib/gql/node.rb

@@ -25,13 +25,13 @@ module GQL
     class << self
       def call(id, *args)
         if id.is_a? Hash
-          id.each do |id, call_class|
-            call id, call_class
+          id.each do |name, call_class|
+            call name, call_class
           end
         else
           options = args.extract_options!
 
-          proc_or_class = args.shift || -> (*args) { target.public_send(id, *args) }
+          proc_or_class = args.shift || -> (*pargs) { target.public_send(id, *pargs) }
           result_class = options[:returns] || proc_or_class.try(:result_class)
 
           if result_class.is_a? ::Array
@@ -51,8 +51,8 @@ module GQL
 
           call_class =
             if proc_or_class.is_a? Proc
-              Class.new(Call).tap do |call_class|
-                call_class.class_eval do
+              Class.new(Call).tap do |klass|
+                klass.class_eval do
                   self.proc = proc_or_class
 
                   def execute(*args)
@@ -60,12 +60,13 @@ module GQL
                   end
                 end
 
-                self.const_set "#{id.to_s.camelize}Call", call_class
+                self.const_set "#{id.to_s.camelize}Call", klass
               end
             else
               proc_or_class
             end
 
+          call_class.id = id.to_s
           call_class.result_class = result_class
 
           self.calls = calls.merge(id.to_sym => call_class)
@@ -114,7 +115,7 @@ module GQL
         else
           super
         end
-      rescue NoMethodError => exc
+      rescue NoMethodError
         raise Errors::UndefinedFieldType, method
       end
     end

data/lib/gql/parser.rb

@@ -6,16 +6,17 @@
 
 require 'racc/parser.rb'
 
-
 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'
 
+require 'gql/tokenizer'
+
 module GQL
   class Parser < Racc::Parser
 
-module_eval(<<'...end parser.y/module_eval...', 'parser.y', 134)
+module_eval(<<'...end parser.racc/module_eval...', 'parser.racc', 135)
 
   class Query < Struct.new(:root, :variables)
     def as_json(*)
@@ -48,34 +49,9 @@ module_eval(<<'...end parser.y/module_eval...', 'parser.y', 134)
     end
   end
 
-  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 initialize(tokenizer)
+  def initialize(str)
     super()
-
-    @tokenizer = tokenizer
-  end
-
-  def next_token
-    @tokenizer.next_token
+    scan_setup str
   end
 
   def parse
@@ -83,38 +59,14 @@ module_eval(<<'...end parser.y/module_eval...', 'parser.y', 134)
   end
 
   def on_error(token, value, vstack)
-    raise Errors::SyntaxError.new(value, token_to_str(token))
+    raise Errors::SyntaxError.new(lineno, value, token_to_str(token))
   end
 
   private
-    def unescape_string(str)
-      string = str.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
-    end
-
     def convert_number(str)
       str.count('.') > 0 ? str.to_f : str.to_i
     end
-...end parser.y/module_eval...
+...end parser.racc/module_eval...
 ##### State transition tables begin ###
 
 racc_action_table = [
@@ -339,77 +291,77 @@ Racc_debug_parser = false
 
 # reduce 0 omitted
 
-module_eval(<<'.,.,', 'parser.y', 4)
+module_eval(<<'.,.,', 'parser.racc', 4)
   def _reduce_1(val, _values, result)
       result = Query.new(val[1], val[0].merge(val[2]))  
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 8)
+module_eval(<<'.,.,', 'parser.racc', 8)
   def _reduce_2(val, _values, result)
       result = Field.new(nil, nil, val[0], nil   )  
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 9)
+module_eval(<<'.,.,', 'parser.racc', 9)
   def _reduce_3(val, _values, result)
       result = Field.new(nil, nil, nil,    val[1])  
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 13)
+module_eval(<<'.,.,', 'parser.racc', 13)
   def _reduce_4(val, _values, result)
        result = Call.new(val[0], val[1], nil,    val[2].presence)   
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 14)
+module_eval(<<'.,.,', 'parser.racc', 14)
   def _reduce_5(val, _values, result)
        result = Call.new(val[0], val[1], val[3], nil            )   
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 15)
+module_eval(<<'.,.,', 'parser.racc', 15)
   def _reduce_6(val, _values, result)
        result = Call.new(val[0], val[1], nil,    nil            )   
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 19)
+module_eval(<<'.,.,', 'parser.racc', 19)
   def _reduce_7(val, _values, result)
        result = []       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 20)
+module_eval(<<'.,.,', 'parser.racc', 20)
   def _reduce_8(val, _values, result)
        result = []       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 21)
+module_eval(<<'.,.,', 'parser.racc', 21)
   def _reduce_9(val, _values, result)
        result = val[1]   
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 25)
+module_eval(<<'.,.,', 'parser.racc', 25)
   def _reduce_10(val, _values, result)
        result.push val[2]    
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 26)
+module_eval(<<'.,.,', 'parser.racc', 26)
   def _reduce_11(val, _values, result)
        result = val          
     result
@@ -420,84 +372,84 @@ module_eval(<<'.,.,', 'parser.y', 26)
 
 # reduce 13 omitted
 
-module_eval(<<'.,.,', 'parser.y', 35)
+module_eval(<<'.,.,', 'parser.racc', 35)
   def _reduce_14(val, _values, result)
        result = []       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 36)
+module_eval(<<'.,.,', 'parser.racc', 36)
   def _reduce_15(val, _values, result)
        result = val[1]   
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 40)
+module_eval(<<'.,.,', 'parser.racc', 40)
   def _reduce_16(val, _values, result)
        result.push val[2]    
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 41)
+module_eval(<<'.,.,', 'parser.racc', 41)
   def _reduce_17(val, _values, result)
        result = val          
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 45)
+module_eval(<<'.,.,', 'parser.racc', 45)
   def _reduce_18(val, _values, result)
        result = Field.new(val[0], val[2], nil,    val[1].presence)   
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 46)
+module_eval(<<'.,.,', 'parser.racc', 46)
   def _reduce_19(val, _values, result)
        result = Field.new(val[0], val[3], val[2], nil            )   
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 47)
+module_eval(<<'.,.,', 'parser.racc', 47)
   def _reduce_20(val, _values, result)
        result = Field.new(val[0], val[1], nil,    nil            )   
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 48)
+module_eval(<<'.,.,', 'parser.racc', 48)
   def _reduce_21(val, _values, result)
        result = Field.new(val[0], nil,    nil,    val[1].presence)   
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 49)
+module_eval(<<'.,.,', 'parser.racc', 49)
   def _reduce_22(val, _values, result)
        result = Field.new(val[0], nil,    val[2], nil            )   
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 50)
+module_eval(<<'.,.,', 'parser.racc', 50)
   def _reduce_23(val, _values, result)
        result = Field.new(val[0], nil,    nil,    nil            )   
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 54)
+module_eval(<<'.,.,', 'parser.racc', 54)
   def _reduce_24(val, _values, result)
        result = val[1]   
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 58)
+module_eval(<<'.,.,', 'parser.racc', 58)
   def _reduce_25(val, _values, result)
        result = {}   
     result
@@ -508,21 +460,21 @@ module_eval(<<'.,.,', 'parser.y', 58)
 
 # reduce 27 omitted
 
-module_eval(<<'.,.,', 'parser.y', 64)
+module_eval(<<'.,.,', 'parser.racc', 64)
   def _reduce_28(val, _values, result)
        result.update val[1]    
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 68)
+module_eval(<<'.,.,', 'parser.racc', 68)
   def _reduce_29(val, _values, result)
        result = { val[0] => val[2] }     
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 72)
+module_eval(<<'.,.,', 'parser.racc', 72)
   def _reduce_30(val, _values, result)
        result = val[1]   
     result
@@ -537,21 +489,21 @@ module_eval(<<'.,.,', 'parser.y', 72)
 
 # reduce 34 omitted
 
-module_eval(<<'.,.,', 'parser.y', 86)
+module_eval(<<'.,.,', 'parser.racc', 86)
   def _reduce_35(val, _values, result)
        result = {}       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 87)
+module_eval(<<'.,.,', 'parser.racc', 87)
   def _reduce_36(val, _values, result)
        result = val[1]   
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 91)
+module_eval(<<'.,.,', 'parser.racc', 91)
   def _reduce_37(val, _values, result)
        result.update val[2]    
     result
@@ -560,35 +512,35 @@ module_eval(<<'.,.,', 'parser.y', 91)
 
 # reduce 38 omitted
 
-module_eval(<<'.,.,', 'parser.y', 96)
+module_eval(<<'.,.,', 'parser.racc', 96)
   def _reduce_39(val, _values, result)
        result = { val[0] => val[2] }    
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 100)
+module_eval(<<'.,.,', 'parser.racc', 100)
   def _reduce_40(val, _values, result)
        result = []       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 101)
+module_eval(<<'.,.,', 'parser.racc', 101)
   def _reduce_41(val, _values, result)
        result = val[1]   
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 105)
+module_eval(<<'.,.,', 'parser.racc', 105)
   def _reduce_42(val, _values, result)
        result.push val[2]    
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 106)
+module_eval(<<'.,.,', 'parser.racc', 106)
   def _reduce_43(val, _values, result)
        result = val          
     result
@@ -597,42 +549,42 @@ module_eval(<<'.,.,', 'parser.y', 106)
 
 # reduce 44 omitted
 
-module_eval(<<'.,.,', 'parser.y', 111)
+module_eval(<<'.,.,', 'parser.racc', 111)
   def _reduce_45(val, _values, result)
        result = convert_number(val[0])   
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 112)
+module_eval(<<'.,.,', 'parser.racc', 112)
   def _reduce_46(val, _values, result)
        result = true                     
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 113)
+module_eval(<<'.,.,', 'parser.racc', 113)
   def _reduce_47(val, _values, result)
        result = false                    
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 114)
+module_eval(<<'.,.,', 'parser.racc', 114)
   def _reduce_48(val, _values, result)
        result = nil                      
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 118)
+module_eval(<<'.,.,', 'parser.racc', 118)
   def _reduce_49(val, _values, result)
        result = unescape_string(val[0])  
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 121)
+module_eval(<<'.,.,', 'parser.racc', 121)
   def _reduce_50(val, _values, result)
        result = val[0].to_sym    
     result
@@ -644,4 +596,4 @@ def _reduce_none(val, _values, result)
 end
 
   end   # class Parser
-  end   # module GQL
+end # GQL

data/lib/gql/schema/call.rb

@@ -5,8 +5,16 @@ module GQL
 
       string  :id
       string  :type,         -> { target.name }
-      array   :parameters,   -> { target.method.parameters }, item_class: Parameter
       object  :result_class, -> { target.result_class || Placeholder }, node_class: Node
+
+
+      array :parameters, -> {
+        if target.proc
+          target.proc.parameters
+        else
+          target.instance_method(:execute).parameters
+        end
+      }, item_class: Parameter
     end
   end
 end

data/lib/gql/test_case.rb

@@ -0,0 +1,4 @@
+module GQL
+  class TestCase < ActiveSupport::TestCase
+  end
+end

data/lib/gql/tokenizer.rb

@@ -1,14 +1,14 @@
 #--
 # DO NOT MODIFY!!!!
 # This file is automatically generated by rex 1.0.5
-# from lexical definition file "lib/gql/tokenizer.rex".
+# from lexical definition file "support/tokenizer.rex".
 #++
 
 require 'racc/parser'
-class GQL::Tokenizer < Racc::Parser
+class GQL::Parser < Racc::Parser
   require 'strscan'
 
-  class ScanError < StandardError ; end
+  class Unused < StandardError ; end
 
   attr_reader   :lineno
   attr_reader   :filename
@@ -63,8 +63,8 @@ class GQL::Tokenizer < Racc::Parser
       when (text = @ss.scan(/\/\//))
          action { @state = :REM;  nil }
 
-      when (text = @ss.scan(/"(?:[^"\\]|\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4}))*"/))
-         action { [:STRING, text.gsub(/^"|"$/, '')] }
+      when (text = @ss.scan(/"(?:[^"\\]|\\["\\\/bfnrt]|\\u[0-9a-fA-F]{4})*"/))
+         action { [:STRING, unescape_string(text)] }
 
       when (text = @ss.scan(/-?(?:0|[1-9]\d*)(?:\.\d+)?(?:[eE][+-]?\d+)?/))
          action { [:NUMBER, text] }
@@ -92,7 +92,7 @@ class GQL::Tokenizer < Racc::Parser
 
       else
         text = @ss.string[@ss.pos .. -1]
-        raise  ScanError, "can not match: '" + text + "'"
+        raise  GQL::Errors::ScanError, "can not match: '" + text + "'"
       end  # if
 
     when :REMS
@@ -103,9 +103,12 @@ class GQL::Tokenizer < Racc::Parser
       when (text = @ss.scan(/.*(?=\*\/)/))
         ;
 
+      when (text = @ss.scan(/(.|\n)*(?=\*\/)/))
+        ;
+
       else
         text = @ss.string[@ss.pos .. -1]
-        raise  ScanError, "can not match: '" + text + "'"
+        raise  GQL::Errors::ScanError, "can not match: '" + text + "'"
       end  # if
 
     when :REM
@@ -118,13 +121,49 @@ class GQL::Tokenizer < Racc::Parser
 
       else
         text = @ss.string[@ss.pos .. -1]
-        raise  ScanError, "can not match: '" + text + "'"
+        raise  GQL::Errors::ScanError, "can not match: '" + text + "'"
       end  # if
 
     else
-      raise  ScanError, "undefined state: '" + state.to_s + "'"
+      raise  GQL::Errors::ScanError, "undefined state: '" + state.to_s + "'"
     end  # case state
     token
   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
+    end
 end # class

data/lib/gql/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gql
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Martin Andert
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-03-06 00:00:00.000000000 Z
+date: 2015-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rexical
   requirement: !ruby/object:Gem::Requirement
@@ -107,6 +93,7 @@ files:
 - README.md
 - Rakefile
 - bin/console
+- bin/rake
 - bin/setup
 - gql.gemspec
 - lib/gql.rb
@@ -122,7 +109,6 @@ files:
 - lib/gql/number.rb
 - lib/gql/object.rb
 - lib/gql/parser.rb
-- lib/gql/parser.y
 - lib/gql/schema/call.rb
 - lib/gql/schema/field.rb
 - lib/gql/schema/list.rb
@@ -131,8 +117,8 @@ files:
 - lib/gql/schema/placeholder.rb
 - lib/gql/simple.rb
 - lib/gql/string.rb
+- lib/gql/test_case.rb
 - lib/gql/tokenizer.rb
-- lib/gql/tokenizer.rex
 - lib/gql/version.rb
 homepage: https://github.com/martinandert/gql
 licenses:

data/lib/gql/parser.y

@@ -1,231 +0,0 @@
-class GQL::Parser
-token STRING NUMBER TRUE FALSE NULL AS IDENT
-rule
-  query
-    : variables root variables    {  result = Query.new(val[1], val[0].merge(val[2]))  }
-    ;
-
-  root
-    : call                  {  result = Field.new(nil, nil, val[0], nil   )  }
-    | '{' field_list '}'    {  result = Field.new(nil, nil, nil,    val[1])  }
-    ;
-
-  call
-    : identifier arguments fields       {   result = Call.new(val[0], val[1], nil,    val[2].presence)   }
-    | identifier arguments '.' call     {   result = Call.new(val[0], val[1], val[3], nil            )   }
-    | identifier arguments              {   result = Call.new(val[0], val[1], nil,    nil            )   }
-    ;
-
-  arguments
-    : /* empty */               {   result = []       }
-    | '(' ')'                   {   result = []       }
-    | '(' argument_list ')'     {   result = val[1]   }
-    ;
-
-  argument_list
-    : argument_list ',' argument    {   result.push val[2]    }
-    | argument                      {   result = val          }
-    ;
-
-  argument
-    : variable_identifier
-    | json_value
-    ;
-
-  fields
-    : '{' '}'                 {   result = []       }
-    | '{' field_list '}'      {   result = val[1]   }
-    ;
-
-  field_list
-    : field_list ',' field    {   result.push val[2]    }
-    | field                   {   result = val          }
-    ;
-
-  field
-    : identifier fields alias_identifier      {   result = Field.new(val[0], val[2], nil,    val[1].presence)   }
-    | identifier '.' call alias_identifier    {   result = Field.new(val[0], val[3], val[2], nil            )   }
-    | identifier alias_identifier             {   result = Field.new(val[0], val[1], nil,    nil            )   }
-    | identifier fields                       {   result = Field.new(val[0], nil,    nil,    val[1].presence)   }
-    | identifier '.' call                     {   result = Field.new(val[0], nil,    val[2], nil            )   }
-    | identifier                              {   result = Field.new(val[0], nil,    nil,    nil            )   }
-    ;
-
-  alias_identifier
-    : AS identifier             {   result = val[1]   }
-    ;
-
-  variables
-    : /* empty */               {   result = {}   }
-    | variable_list
-    ;
-
-  variable_list
-    : variable
-    | variable_list variable    {   result.update val[1]    }
-    ;
-
-  variable
-    : variable_identifier '=' variable_value    {   result = { val[0] => val[2] }     }
-    ;
-
-  variable_identifier
-    : '<' identifier '>'    {   result = val[1]   }
-    ;
-
-  variable_value
-    : json_value
-    ;
-
-  json_value
-    : object
-    | array
-    | scalar
-    ;
-
-  object
-    : '{' '}'         {   result = {}       }
-    | '{' pairs '}'   {   result = val[1]   }
-    ;
-
-  pairs
-    : pairs ',' pair    {   result.update val[2]    }
-    | pair
-    ;
-
-  pair
-    : string ':' json_value   {   result = { val[0] => val[2] }    }
-    ;
-
-  array
-    : '[' ']'          {   result = []       }
-    | '[' values ']'   {   result = val[1]   }
-    ;
-
-  values
-    : values ',' json_value   {   result.push val[2]    }
-    | json_value              {   result = val          }
-    ;
-
-  scalar
-    : string
-    | NUMBER      {   result = convert_number(val[0])   }
-    | TRUE        {   result = true                     }
-    | FALSE       {   result = false                    }
-    | NULL        {   result = nil                      }
-    ;
-
-  string
-    : STRING      {   result = unescape_string(val[0])  }
-
-  identifier
-    : IDENT       {   result = val[0].to_sym    }
-    ;
-end
-
----- header
-
-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 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 }
-
-  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 initialize(tokenizer)
-    super()
-
-    @tokenizer = tokenizer
-  end
-
-  def next_token
-    @tokenizer.next_token
-  end
-
-  def parse
-    do_parse
-  end
-
-  def on_error(token, value, vstack)
-    raise Errors::SyntaxError.new(value, token_to_str(token))
-  end
-
-  private
-    def unescape_string(str)
-      string = str.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
-    end
-
-    def convert_number(str)
-      str.count('.') > 0 ? str.to_f : str.to_i
-    end

data/lib/gql/tokenizer.rex

@@ -1,46 +0,0 @@
-class GQL::Tokenizer
-macro
-  BLANK         \s+
-  REM_IN        \/\*
-  REM_OUT       \*\/
-  REM           \/\/
-  STRING        "(?:[^"\\]|\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4}))*"
-  NUMBER        -?(?:0|[1-9]\d*)(?:\.\d+)?(?:[eE][+-]?\d+)?
-  TRUE          true
-  FALSE         false
-  NULL          null
-  IDENT         [a-zA-Z_][a-zA-Z0-9_]*
-  AS            [aA][sS]
-
-rule
-
-# [:state]      pattern         [action]
-
-# remarks
-                {REM_IN}        { @state = :REMS; nil }
-  :REMS         {REM_OUT}       { @state = nil;   nil }
-  :REMS         .*(?={REM_OUT}) # ignore
-                {REM}           { @state = :REM;  nil }
-  :REM          \n              { @state = nil;   nil }
-  :REM          .*(?=$)         # ignore
-
-# scalars
-                {STRING}        { [:STRING, text.gsub(/^"|"$/, '')] }
-                {NUMBER}        { [:NUMBER, text] }
-                {TRUE}          { [:TRUE, text] }
-                {FALSE}         { [:FALSE, text] }
-                {NULL}          { [:NULL, text] }
-
-# keywords
-                {AS}            { [:AS, text] }
-
-# identifier
-                {IDENT}         { [:IDENT, text] }
-
-# whitespace
-                {BLANK}         # ignore
-
-# rest
-                .               { [text, text] }
-
-end