graphql 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 280ed673cf1dbbf668aa99c14d43ab9ac9b97af8
-  data.tar.gz: c2b66a6c3bcad312b56bdf565dfd39475e0f627d
+  metadata.gz: f79f91876d8a49ea48c4d551a073491c33eefc31
+  data.tar.gz: 3e91b2b21c60df562e95879a4a8fd24f214553e2
 SHA512:
-  metadata.gz: 7147139cddf0a0381c16cbc95ef614d00d6fe6993db51648d04b66d020f75cfad00e36ba1ec31e5ac04e793f55e54b898410cd0da9e1ba9d452465257abdbd7a
-  data.tar.gz: d8b2f834717227a408bd4a953f0dcbc82f8e05941fd848230c1895744bfdadddd45bdd50b61ca07e58eb091de1a648ad9c175b4149f3be77da83c7afd524911f
+  metadata.gz: 86a409aedbc0f2261b80b1f4cbca9e5fcc529abdb609557299de5547ff554e5f98a35188dcf6ba1a82650995f8989d867738c98aeafda4de7686b33932dff371
+  data.tar.gz: 23135beccd828141bb898bd12514899a0125035f38284146f2941a36e5117449854759e6b202937996e078782123e7f87437f5244be6af392186fd8d1d798cdc

data/lib/graphql/enum_type.rb

@@ -104,7 +104,7 @@ module GraphQL
       matching_value = allowed_values.find { |v| v.name == value_name }
 
       if matching_value.nil?
-        result.add_problem("Expected #{JSON.generate(value_name, quirks_mode: true)} to be one of: #{allowed_values.join(', ')}")
+        result.add_problem("Expected #{JSON.generate(value_name, quirks_mode: true)} to be one of: #{allowed_values.map(&:name).join(', ')}")
       end
 
       result

data/lib/graphql/language/lexer.rb

@@ -1029,9 +1029,11 @@ end
       UTF_8 = /\\u[\dAa-f]{4}/i
       UTF_8_REPLACE = ->(m) { [m[-4..-1].to_i(16)].pack('U'.freeze) }
 
+      VALID_STRING = /\A(?:[^\\]|#{ESCAPES}|#{UTF_8})*\z/o
+
       def self.emit_string(ts, te, meta)
         value = meta[:data][ts...te].pack("c*").force_encoding("UTF-8")
-        if value =~ /\\u|\\./ && value !~ ESCAPES
+        if value !~ VALID_STRING
           meta[:tokens] << token = GraphQL::Language::Token.new(
             name: :BAD_UNICODE_ESCAPE,
             value: value,

data/lib/graphql/language/lexer.rl

@@ -184,9 +184,11 @@ module GraphQL
       UTF_8 = /\\u[\dAa-f]{4}/i
       UTF_8_REPLACE = ->(m) { [m[-4..-1].to_i(16)].pack('U'.freeze) }
 
+      VALID_STRING = /\A(?:[^\\]|#{ESCAPES}|#{UTF_8})*\z/o
+
       def self.emit_string(ts, te, meta)
         value = meta[:data][ts...te].pack("c*").force_encoding("UTF-8")
-        if value =~ /\\u|\\./ && value !~ ESCAPES
+        if value !~ VALID_STRING
           meta[:tokens] << token = GraphQL::Language::Token.new(
             name: :BAD_UNICODE_ESCAPE,
             value: value,

data/lib/graphql/version.rb

@@ -1,3 +1,3 @@
 module GraphQL
-  VERSION = "1.2.3"
+  VERSION = "1.2.4"
 end

data/spec/graphql/enum_type_spec.rb

@@ -75,6 +75,10 @@ describe GraphQL::EnumType do
 
     it "returns an invalid result" do
       assert(!result.valid?)
+      assert_equal(
+        result.problems.first['explanation'],
+        "Expected \"bad enum\" to be one of: COW, DONKEY, GOAT, REINDEER, SHEEP, YAK"
+      )
     end
   end
 

data/spec/graphql/language/lexer_spec.rb

@@ -19,6 +19,18 @@ describe GraphQL::Language::Lexer do
       assert_equal tokens[0], tokens[1].prev_token
     end
 
+    it "unescapes escaped characters" do
+      assert_equal "\" \\ / \b \f \n \r \t", subject.tokenize('"\\" \\\\ \\/ \\b \\f \\n \\r \\t"').first.to_s
+    end
+
+    it "unescapes escaped unicode characters" do
+      assert_equal "\t", subject.tokenize('"\\u0009"').first.to_s
+    end
+
+    it "rejects bad unicode, even when there's good unicode in the string" do
+      assert_equal :BAD_UNICODE_ESCAPE, subject.tokenize('"\\u0XXF \\u0009"').first.name
+    end
+
     it "clears the previous_token between runs" do
       tok_1 = subject.tokenize(query_string)
       tok_2 = subject.tokenize(query_string)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-14 00:00:00.000000000 Z
+date: 2016-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter