graphql-libgraphqlparser 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 991f9f625b2275609b07eab64c3002d1579f511e
-  data.tar.gz: 0f282d13ab730c8a061ae5f14a748e2c9232a7fc
+  metadata.gz: 7c6c3d2f3e3f782d3c576ed544599fb743e8cf12
+  data.tar.gz: dc13fc9f17377d35a9b9fdec26ab00064d4e47da
 SHA512:
-  metadata.gz: d40cf6b525e4afc651f97f868c120241c8cb507b194192e9a80c55e387a18416c81f79933ce290906d4ee4f86839fbf64e36131e9f5a74fcfae9486b9fb423bc
-  data.tar.gz: ae7882681347d4da3d8c82fc4c7947226ddfc0d23b995e858cbfe6e10030d46964771a3782db4600514c34399b5fcca2c8cab42553f3463cf5e26f8e4cbdb44d
+  metadata.gz: c4bff9e47683edfad5bf7ea6005ccf4ce694c6bf53b36ef3ac821b398cf5714851967eb56b400d463329f70f6eda4bd81c8e94ba2572ccb8bf559377101700a3
+  data.tar.gz: bda7eb33bb87c80152fc9f195359de73ec106866948264bbe960d183e1771200c0e6be6fea157be5dde5b85d21a0627ab8cf397b665d38f20f027dd74b0d2ee3

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+# 1.2.0
+
+- Support `tracer:` keyword to `.parse` (supports GraphQL::Tracing) #27
+
 # 1.1.0
 
 - Support `null`

data/lib/graphql/libgraphqlparser.rb

@@ -6,40 +6,42 @@ require_relative '../graphql_libgraphqlparser_ext'
 
 module GraphQL
   module Libgraphqlparser
-    def self.parse(string)
-      begin
-        builder = builder_parse(string)
-        builder.document
-      rescue ArgumentError
-        if index = string.index("\x00")
-          string_before_null = string.slice(0, index)
-          line = string_before_null.count("\n") + 1
-          col = index - (string_before_null.rindex("\n") || 0)
-          raise GraphQL::ParseError.new("Invalid null byte in query", line, col, string)
-        end
-        raise
-      rescue ParseError => e
-        error_message = e.message.match(/(\d+)\.(\d+): (.*)/)
-        if error_message
-          line = error_message[1].to_i
-          col = error_message[2].to_i
-          raise GraphQL::ParseError.new(error_message[3], line, col, string)
-        else
-          raise GraphQL::ParseError.new(e.message, nil, nil, string)
+    def self.parse(string, tracer: GraphQL::Tracing::NullTracer)
+      tracer.trace("parse", { query_string: string }) do
+        begin
+          builder = builder_parse(string)
+          builder.document
+        rescue ArgumentError
+          if index = string.index("\x00")
+            string_before_null = string.slice(0, index)
+            line = string_before_null.count("\n") + 1
+            col = index - (string_before_null.rindex("\n") || 0)
+            raise GraphQL::ParseError.new("Invalid null byte in query", line, col, string)
+          end
+          raise
+        rescue ParseError => e
+          error_message = e.message.match(/(\d+)\.(\d+): (.*)/)
+          if error_message
+            line = error_message[1].to_i
+            col = error_message[2].to_i
+            raise GraphQL::ParseError.new(error_message[3], line, col, string)
+          else
+            raise GraphQL::ParseError.new(e.message, nil, nil, string)
+          end
         end
       end
     end
   end
 
   class << self
-    def parse_with_libgraphqlparser(string)
-      Libgraphqlparser.parse(string)
+    def parse_with_libgraphqlparser(*args)
+      Libgraphqlparser.parse(*args)
     end
 
     alias :parse_without_libgraphqlparser :parse
 
-    def parse(string, as: nil)
-      parse_with_libgraphqlparser(string)
+    def parse(*args)
+      parse_with_libgraphqlparser(*args)
     end
   end
 end

data/lib/graphql/libgraphqlparser/version.rb

@@ -1,5 +1,5 @@
 module GraphQL
   module Libgraphqlparser
-    VERSION = "1.1.0"
+    VERSION = "1.2.0"
   end
 end

data/test/graphql/libgraphqlparser_test.rb

@@ -159,7 +159,7 @@ describe GraphQL::Libgraphqlparser do
           let(:query_string) { 'query { ... @skip(if: false) { field } }' }
           let(:inline_fragment) { query.selections[0] }
           it "gets directives and nil type" do
-            assert_equal nil, inline_fragment.type
+            assert_nil inline_fragment.type
             assert_equal 1, inline_fragment.directives.length
           end
         end
@@ -227,7 +227,7 @@ describe GraphQL::Libgraphqlparser do
       it "parses unnamed queries" do
         assert_equal 1, document.definitions.length
         assert_equal "query", operation.operation_type
-        assert_equal nil, operation.name
+        assert_nil operation.name
         assert_equal 3, operation.selections.length
       end
     end
@@ -264,4 +264,20 @@ describe GraphQL::Libgraphqlparser do
       assert_equal 28, err.col
     end
   end
+
+  describe "Compatibility" do
+    TestQuery = GraphQL::ObjectType.define do
+      name "Query"
+      field :int, !types.Int, resolve: ->(*a) { 1 }
+    end
+
+    TestSchema = GraphQL::Schema.define do
+      query(TestQuery)
+    end
+
+    it "works with a schema" do
+      res = TestSchema.execute("{ int }")
+      assert_equal 1, res["data"]["int"]
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql-libgraphqlparser
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-25 00:00:00.000000000 Z
+date: 2018-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
@@ -213,7 +213,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Use Libgraphqlparser to parse queries for the GraphQL gem