Merge pull request #34 from zencargo/add-support-for-array-variables

add support for array variables

Author: Nathaniel Woodthorpe

lib/graphql/remote_loader/loader.rb

@@ -99,22 +99,32 @@ def self.interpolate_variables(query, variables = {})
       end
 
       def self.interpolate_variables!(query, variables = {})
-        variables.each do |variable, value|
-          case value
-          when Integer, Float, TrueClass, FalseClass
-            # These types are safe to directly interpolate into the query, and GraphQL does not expect these types to be quoted.
-            query.gsub!("$#{variable.to_s}", value.to_s)
-          else
-            # A string is either a GraphQL String or ID type.
-            # This means we need to
-            # a) Surround the value in quotes
-            # b) escape special characters in the string
-            #
-            # This else also catches unknown objects, which could break the query if we directly interpolate.
-            # These objects get converted to strings, then escaped.
-
-            query.gsub!("$#{variable.to_s}", value.to_s.inspect)
-          end
+        variables.each { |variable, value| query.gsub!("$#{variable.to_s}", stringify_variable(value)) }
+      end
+
+      def self.stringify_variable(value)
+        case value
+        when Integer, Float, TrueClass, FalseClass
+          # These types are safe to directly interpolate into the query, and GraphQL does not expect these types to be quoted.
+          value.to_s
+        when Array
+          # Arrays can contain elements with various types, so we need to check them one by one
+          stringified_elements = value.map { |element| stringify_variable(element) }
+          "[#{stringified_elements.join(', ')}]"
+        when Hash
+          # Hashes can contain values with various types, so we need to check them one by one
+          stringified_key_value_pairs = value.map { |key, value| "#{key}: #{stringify_variable(value)}" }
+          "{#{stringified_key_value_pairs.join(', ')}}"
+        else
+          # A string is either a GraphQL String or ID type.
+          # This means we need to
+          # a) Surround the value in quotes
+          # b) escape special characters in the string
+          #
+          # This else also catches unknown objects, which could break the query if we directly interpolate.
+          # These objects get converted to strings, then escaped.
+
+          value.to_s.inspect
         end
       end
 

spec/unit/lib/graphql/remote_loader/loader_spec.rb

@@ -116,6 +116,40 @@ def query(query_string)
       expect(results["data"]["foo"]).to eq("foo_result")
     end
 
+    it "interpolates array variables correctly" do
+      TestLoader.any_instance.should_receive(:query).once
+        .with('query { p2foo: foo(bar: ["fir\"st", true, 5, {text: "value", number: 6}]) }', anything)
+        .and_return({
+          "data" => {
+            "p2foo" => "foo_result"
+          }
+        })
+
+      results = GraphQL::Batch.batch do
+        TestLoader.load("foo(bar: $my_variable)",
+                        variables: { my_variable: ["fir\"st", true, 5, { text: 'value', number: 6 }] })
+      end
+
+      expect(results["data"]["foo"]).to eq("foo_result")
+    end
+
+    it "interpolates hash variables correctly" do
+      TestLoader.any_instance.should_receive(:query).once
+        .with('query { p2foo: foo(bar: {array: ["fir\"st", true, 5], text: "value", number: 6}) }', anything)
+        .and_return({
+          "data" => {
+            "p2foo" => "foo_result"
+          }
+        })
+
+      results = GraphQL::Batch.batch do
+        TestLoader.load("foo(bar: $my_variable)",
+                        variables: { my_variable: { array: ["fir\"st", true, 5], text: 'value', number: 6 } })
+      end
+
+      expect(results["data"]["foo"]).to eq("foo_result")
+    end
+
     it "interpolates string variables correctly" do
       TestLoader.any_instance.should_receive(:query).once
         .with("query { p2foo: foo(bar: \"testing string\") }", anything)