graphql 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1aafd43a1c33e73554a5e5231efd24bfdf236de
-  data.tar.gz: f0d8e2e7225fce433a02976d7b61195afea4c573
+  metadata.gz: 280ed673cf1dbbf668aa99c14d43ab9ac9b97af8
+  data.tar.gz: c2b66a6c3bcad312b56bdf565dfd39475e0f627d
 SHA512:
-  metadata.gz: 7fd15c75d9467dd23867d281dae3f932f64351a1a18d0010c85ca8c74297e0368e33dc15d3f6265937a09fe4339aadfa387f87e466137d265583577d951bedbc
-  data.tar.gz: 39b48cbccf44d3c0c02226d7329dacef7045f5a8acea12cebe56f6ad2ce9fe6b4f0b318bd45699e7965884dbc935df015bb71abdcd65d964af211eca21718344
+  metadata.gz: 7147139cddf0a0381c16cbc95ef614d00d6fe6993db51648d04b66d020f75cfad00e36ba1ec31e5ac04e793f55e54b898410cd0da9e1ba9d452465257abdbd7a
+  data.tar.gz: d8b2f834717227a408bd4a953f0dcbc82f8e05941fd848230c1895744bfdadddd45bdd50b61ca07e58eb091de1a648ad9c175b4149f3be77da83c7afd524911f

data/lib/graphql/language/lexer.rb

@@ -499,15 +499,18 @@ self.graphql_lexer_en_main = 6;
         data = query_string.unpack("c*")
         eof = data.length
 
+        # Since `Lexer` is a module, store all lexer state
+        # in this local variable:
         meta = {
           line: 1,
           col: 1,
           data: data,
-          tokens: []
+          tokens: [],
+          previous_token: nil,
         }
 
         
-# line 511 "lib/graphql/language/lexer.rb"
+# line 514 "lib/graphql/language/lexer.rb"
 begin
 	p ||= 0
 	pe ||= data.length
@@ -517,14 +520,14 @@ begin
 	act = 0
 end
 
-# line 132 "lib/graphql/language/lexer.rl"
+# line 135 "lib/graphql/language/lexer.rl"
 
         emit_token = ->(name) {
           emit(name, ts, te, meta)
         }
 
         
-# line 528 "lib/graphql/language/lexer.rb"
+# line 531 "lib/graphql/language/lexer.rb"
 begin
 	_klen, _trans, _keys, _acts, _nacts = nil
 	_goto_level = 0
@@ -554,7 +557,7 @@ begin
 		begin
 ts = p
 		end
-# line 558 "lib/graphql/language/lexer.rb"
+# line 561 "lib/graphql/language/lexer.rb"
 		end # from state action switch
 	end
 	if _trigger_goto
@@ -932,7 +935,7 @@ when 49 then
  emit_token.call(:UNKNOWN_CHAR) end
 end 
 			end
-# line 936 "lib/graphql/language/lexer.rb"
+# line 939 "lib/graphql/language/lexer.rb"
 			end # action switch
 		end
 	end
@@ -952,7 +955,7 @@ when 0 then
 # line 1 "NONE"
 		begin
 ts = nil;		end
-# line 956 "lib/graphql/language/lexer.rb"
+# line 959 "lib/graphql/language/lexer.rb"
 		end # to state action switch
 	end
 	if _trigger_goto
@@ -979,7 +982,7 @@ end
 	end
 	end
 
-# line 138 "lib/graphql/language/lexer.rl"
+# line 141 "lib/graphql/language/lexer.rl"
 
         meta[:tokens]
       end
@@ -990,10 +993,10 @@ end
           value: meta[:data][ts...te].pack("c*"),
           line: meta[:line],
           col: meta[:col],
-          prev_token: @previous_token,
+          prev_token: meta[:previous_token],
         )
 
-        @previous_token = token
+        meta[:previous_token] = token
 
         meta[:col] += te - ts
       end
@@ -1004,9 +1007,9 @@ end
           value: meta[:data][ts...te].pack("c*"),
           line: meta[:line],
           col: meta[:col],
-          prev_token: @previous_token,
+          prev_token: meta[:previous_token],
         )
-        @previous_token = token
+        meta[:previous_token] = token
         # Bump the column counter for the next token
         meta[:col] += te - ts
       end
@@ -1034,7 +1037,7 @@ end
             value: value,
             line: meta[:line],
             col: meta[:col],
-            prev_token: @previous_token,
+            prev_token: meta[:previous_token],
           )
         else
           replace_escaped_characters_in_place(value)
@@ -1044,11 +1047,11 @@ end
             value: value,
             line: meta[:line],
             col: meta[:col],
-            prev_token: @previous_token,
+            prev_token: meta[:previous_token],
           )
         end
 
-        @previous_token = token
+        meta[:previous_token] = token
         meta[:col] += te - ts
       end
     end

data/lib/graphql/language/lexer.rl

@@ -121,11 +121,14 @@ module GraphQL
         data = query_string.unpack("c*")
         eof = data.length
 
+        # Since `Lexer` is a module, store all lexer state
+        # in this local variable:
         meta = {
           line: 1,
           col: 1,
           data: data,
-          tokens: []
+          tokens: [],
+          previous_token: nil,
         }
 
         %% write init;
@@ -145,10 +148,10 @@ module GraphQL
           value: meta[:data][ts...te].pack("c*"),
           line: meta[:line],
           col: meta[:col],
-          prev_token: @previous_token,
+          prev_token: meta[:previous_token],
         )
 
-        @previous_token = token
+        meta[:previous_token] = token
 
         meta[:col] += te - ts
       end
@@ -159,9 +162,9 @@ module GraphQL
           value: meta[:data][ts...te].pack("c*"),
           line: meta[:line],
           col: meta[:col],
-          prev_token: @previous_token,
+          prev_token: meta[:previous_token],
         )
-        @previous_token = token
+        meta[:previous_token] = token
         # Bump the column counter for the next token
         meta[:col] += te - ts
       end
@@ -189,7 +192,7 @@ module GraphQL
             value: value,
             line: meta[:line],
             col: meta[:col],
-            prev_token: @previous_token,
+            prev_token: meta[:previous_token],
           )
         else
           replace_escaped_characters_in_place(value)
@@ -199,11 +202,11 @@ module GraphQL
             value: value,
             line: meta[:line],
             col: meta[:col],
-            prev_token: @previous_token,
+            prev_token: meta[:previous_token],
           )
         end
 
-        @previous_token = token
+        meta[:previous_token] = token
         meta[:col] += te - ts
       end
     end

data/lib/graphql/query/arguments.rb

@@ -60,14 +60,15 @@ module GraphQL
       NULL_ARGUMENT_VALUE = ArgumentValue.new(nil, nil, nil)
 
       def wrap_value(value, arg_defn_type)
-        case value
-        when Array
+        case arg_defn_type
+        when GraphQL::ListType
           value.map { |item| wrap_value(item, arg_defn_type.of_type) }
-        when Hash
-          if arg_defn_type.unwrap.kind.input_object?
+        when GraphQL::NonNullType
+          wrap_value(value, arg_defn_type.of_type)
+        when GraphQL::InputObjectType
+          if value.is_a?(Hash)
             self.class.new(value, argument_definitions: arg_defn_type.arguments)
           else
-            # It may be a custom scalar that coerces to a Hash
             value
           end
         else

data/lib/graphql/version.rb

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

data/spec/graphql/enum_type_spec.rb

@@ -36,6 +36,36 @@ describe GraphQL::EnumType do
     end
   end
 
+  describe "values that are Arrays" do
+    let(:schema) {
+      enum = GraphQL::EnumType.define do
+        name "PluralEnum"
+        value 'PETS', value: ["dogs", "cats"]
+        value 'FRUITS', value: ["apples", "oranges"]
+        value 'PLANETS', value: ["Earth"]
+      end
+
+      query_type = GraphQL::ObjectType.define do
+        name "Query"
+        field :names, types[types.String] do
+          argument :things, types[enum]
+          resolve ->(o, a, c) {
+            a[:things].reduce(&:+)
+          }
+        end
+      end
+
+      GraphQL::Schema.define do
+        query(query_type)
+      end
+    }
+
+    it "accepts them as inputs" do
+      res = schema.execute("{ names(things: [PETS, PLANETS]) }")
+      assert_equal ["dogs", "cats", "Earth"], res["data"]["names"]
+    end
+  end
+
   it "has value description" do
     assert_equal("Animal with horns", enum.values["GOAT"].description)
   end

data/spec/graphql/language/lexer_spec.rb

@@ -18,5 +18,11 @@ describe GraphQL::Language::Lexer do
     it "keeps track of previous_token" do
       assert_equal tokens[0], tokens[1].prev_token
     end
+
+    it "clears the previous_token between runs" do
+      tok_1 = subject.tokenize(query_string)
+      tok_2 = subject.tokenize(query_string)
+      assert_equal nil, tok_2[0].prev_token
+    end
   end
 end

data/spec/graphql/query/arguments_spec.rb

@@ -90,8 +90,8 @@ describe GraphQL::Query::Arguments do
         {a: 1, b: {a: 2}, c: {a: 3}},
         argument_definitions: input_type.arguments
       )
-      assert args["b"].is_a?(GraphQL::Query::Arguments)
-      assert args["c"].is_a?(Hash)
+      assert_instance_of GraphQL::Query::Arguments, args["b"]
+      assert_instance_of Hash, args["c"]
     end
   end
 

metadata

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