graphql-libgraphqlparser 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c4613bbf60c0b4f7d3c46b9eab1cfebd09e8bca
-  data.tar.gz: 5fd0643c098f384ed2c179d0c4457e5fb74baf5a
+  metadata.gz: 04eb54d2a820c7feb3665a0248c50d4efba85183
+  data.tar.gz: cee6d0ba79be3ddc8a2d6876a679335520893463
 SHA512:
-  metadata.gz: ae591657133ee1c6a3c198478621d374af2213fd603e9b63a35af1d834a686e92ed111590d23792737cd36c0a36e49bec4cf8d0eb3971346bee2a352ad275cce
-  data.tar.gz: fb5d52c13abf84e35f0a479c50633d8b59e5e0a9f498c8784f746682f5f8ad3baae020357dad491f050b07f262939f1363689e392f3341caa7bf267895018dd2
+  metadata.gz: 0ec0914c1a78e9dfec3cfd24d2921c2ced720c2e4c69b1d9a23df36edab94a97356c50f4a00c6d73cca1a5a8e2633be8cf18fd85da42542127d50f491bc9f95e
+  data.tar.gz: 5f7f987b1474ef12b691544f1d8a2cf567d34171bc04058cc13d8b40ce7ca6b8ee332aa955b27ef190cfe3eaedd30ce6f446205e4af24436a1bfb68b140517d3

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+# 0.4.0
+
+- Raise a `ParseError` when the query string contains a null byte
+
 # 0.3.0
 
 - Fix inline fragments without type conditions

data/graphql-libgraphqlparser.gemspec

@@ -24,6 +24,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "guard-bundler", "~> 2.1"
   spec.add_development_dependency "guard-minitest", "~> 2.4"
   spec.add_development_dependency "guard-rake", "~> 1.0"
+  # Lock to a lower version to support Ruby 2.1
+  spec.add_development_dependency "listen", "~> 3.0.0"
   spec.add_development_dependency 'minitest', '~> 5.8'
   spec.add_development_dependency "minitest-reporters", "~>1.0"
   spec.add_development_dependency 'rake', '~> 11.0'

data/lib/graphql/libgraphqlparser/version.rb

@@ -1,5 +1,5 @@
 module GraphQL
   module Libgraphqlparser
-    VERSION = '0.3.0'
+    VERSION = '0.4.0'
   end
 end

data/lib/graphql/libgraphqlparser.rb

@@ -7,8 +7,27 @@ require_relative '../graphql_libgraphqlparser_ext'
 module GraphQL
   module Libgraphqlparser
     def self.parse(string)
-      builder = builder_parse(string)
-      builder.document
+      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
 

data/test/graphql/libgraphqlparser_test.rb

@@ -237,7 +237,16 @@ describe GraphQL::Libgraphqlparser do
   describe "errors" do
     let(:query_string) {%| query doSomething { bogus { } |}
     it "raises a parse error" do
-      err = assert_raises(GraphQL::Libgraphqlparser::ParseError) { document }
+      err = assert_raises(GraphQL::ParseError) { document }
+    end
+
+    it "raises a parse error in query with null byte" do
+      err = assert_raises(GraphQL::ParseError) do
+        GraphQL::Libgraphqlparser.parse("mutation{\nsend(message: \"null\x00byte\")\n}")
+      end
+      assert_equal err.message, "Invalid null byte in query"
+      assert_equal err.line, 2
+      assert_equal err.col, 20
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql-libgraphqlparser
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-29 00:00:00.000000000 Z
+date: 2016-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: listen
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -198,7 +212,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Use Libgraphqlparser to parse queries for the GraphQL gem