Merge pull request rmosolgo#1401 from rmosolgo/friendlier-variables

Accept symbol-keyed hashes in variables

Author: Robert Mosolgo

lib/graphql/query/variables.rb

@@ -13,7 +13,8 @@ class Variables
       def initialize(ctx, ast_variables, provided_variables)
         schema = ctx.schema
         @context = ctx
-        @provided_variables = provided_variables
+
+        @provided_variables = deep_stringify(provided_variables)
         @errors = []
         @storage = ast_variables.each_with_object({}) do |ast_variable, memo|
           # Find the right value for this variable:
@@ -27,7 +28,7 @@ def initialize(ctx, ast_variables, provided_variables)
             variable_name = ast_variable.name
             default_value = ast_variable.default_value
             provided_value = @provided_variables[variable_name]
-            value_was_provided = @provided_variables.key?(variable_name)
+            value_was_provided =  @provided_variables.key?(variable_name)
 
             validation_result = variable_type.validate_input(provided_value, ctx)
             if !validation_result.valid?
@@ -45,6 +46,23 @@ def initialize(ctx, ast_variables, provided_variables)
       end
 
       def_delegators :@storage, :length, :key?, :[], :fetch, :to_h
+
+      private
+
+      def deep_stringify(val)
+        case val
+        when Array
+          val.map { |v| deep_stringify(v) }
+        when Hash
+          new_val = {}
+          val.each do |k, v|
+            new_val[k.to_s] = deep_stringify(v)
+          end
+          new_val
+        else
+          val
+        end
+      end
     end
   end
 end

spec/graphql/query/variables_spec.rb

@@ -48,6 +48,47 @@
       end
     end
 
+    describe "symbol keys" do
+      let(:query_string) { <<-GRAPHQL
+        query testVariables(
+          $dairy_product_1: DairyProductInput!
+          $dairy_product_2: DairyProductInput!
+        ) {
+          __typename
+        }
+      GRAPHQL
+      }
+
+      let(:provided_variables) {
+        {
+          dairy_product_1: { source: "COW", fatContent: 0.99 },
+          "dairy_product_2" => { source: "DONKEY", "fatContent": 0.89 },
+        }
+      }
+
+      it "checks for string matches" do
+        # These get merged into all the values above
+        default_values = {
+          "originDairy"=>"Sugar Hollow Dairy",
+          "organic"=>false,
+          "order_by"=>{"direction"=>"ASC"}
+        }
+
+        expected_input_1 = {
+          "source" => 1,
+          "fatContent" => 0.99,
+        }.merge(default_values)
+
+        assert_equal(expected_input_1, variables["dairy_product_1"].to_h)
+
+        expected_input_2 = {
+          "source" => :donkey,
+          "fatContent" => 0.89,
+        }.merge(default_values)
+        assert_equal(expected_input_2, variables["dairy_product_2"].to_h)
+      end
+    end
+
     describe "validating input objects" do
       let(:query_string) {%|
       query searchMyDairy (

spec/graphql/schema/enum_spec.rb

@@ -67,7 +67,7 @@
     it "works as input" do
       query_str = "query($family: Family!) { instruments(family: $family) { name } }"
       expected_names = ["Piano", "Organ"]
-      result = Jazz::Schema.execute(query_str, variables: { "family" => "KEYS" })
+      result = Jazz::Schema.execute(query_str, variables: { family: "KEYS" })
       assert_equal expected_names, result["data"]["instruments"].map { |i| i["name"] }
     end
   end

spec/graphql/schema/object_spec.rb

@@ -141,10 +141,10 @@
       }
       GRAPHQL
 
-      res = Jazz::Schema.execute(mutation_str, variables: { "name" => "Miles Davis Quartet" })
+      res = Jazz::Schema.execute(mutation_str, variables: { name: "Miles Davis Quartet" })
       new_id = res["data"]["addEnsemble"]["id"]
 
-      res2 = Jazz::Schema.execute(query_str, variables: { "id" => new_id })
+      res2 = Jazz::Schema.execute(query_str, variables: { id: new_id })
       assert_equal "Miles Davis Quartet", res2["data"]["find"]["name"]
     end