graphql-remote_loader 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '08255df0d13cc9804c77ad8573250fcf28a324ba'
-  data.tar.gz: b16f301f8bb77f5813ef6b96093d61cc583e9664
+  metadata.gz: b71151aac9fed6da47c53df2db83f4aa32178436
+  data.tar.gz: f556f9d29f9080efa8b326a7a21c443c090f2605
 SHA512:
-  metadata.gz: 95baeb95ffc196efa52c8b47cadc8d0f81740719b4d51423ed9fc0ebf1d5afc4149309e01d3e66667baf854634116df6a19c24a626d781e3930cb15d032d7fce
-  data.tar.gz: 161a3463f3b6337bf4ff437d60ef7ed8c022f0701c912351cd8c7f36fc653ec87bb2fc193bb631c198339e7a1759125af89056cd42c0e4329cbb3bf3648896df
+  metadata.gz: dbf5636dc0e6ab2976d763d4d66b30007b892acb608bc8846dc3731eebb87cd3932265843c2fad6470b0ba06ab9925fc42513b8f5a68ffb01b524693d41de320
+  data.tar.gz: d322e05826e6b70013d6ea692d1c05d47f645bd55cbef6e829e7678deff6eed87dc494320cbab5694d7a702a754c43ab03a8f580e35b67ddb9019b47b10038e9

data/Gemfile.lock

@@ -1,42 +1,42 @@
 PATH
   remote: .
   specs:
-    graphql-remote_loader (1.0.2)
+    graphql-remote_loader (1.0.3)
       graphql (~> 1.6)
       graphql-batch (~> 0.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    byebug (9.1.0)
+    byebug (10.0.2)
     coderay (1.1.2)
     diff-lcs (1.3)
-    graphql (1.8.4)
-    graphql-batch (0.3.9)
+    graphql (1.8.11)
+    graphql-batch (0.3.10)
       graphql (>= 0.8, < 2)
       promise.rb (~> 0.7.2)
-    method_source (0.9.0)
+    method_source (0.9.1)
     promise.rb (0.7.4)
-    pry (0.11.3)
+    pry (0.12.0)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    pry-byebug (3.5.0)
-      byebug (~> 9.1)
+    pry-byebug (3.6.0)
+      byebug (~> 10.0)
       pry (~> 0.10)
-    rake (10.4.2)
-    rspec (3.6.0)
-      rspec-core (~> 3.6.0)
-      rspec-expectations (~> 3.6.0)
-      rspec-mocks (~> 3.6.0)
-    rspec-core (3.6.0)
-      rspec-support (~> 3.6.0)
-    rspec-expectations (3.6.0)
+    rake (10.5.0)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-mocks (3.6.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-support (3.6.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
 
 PLATFORMS
   ruby

data/lib/graphql/remote_loader/loader.rb

@@ -11,7 +11,7 @@ module GraphQL
       # a) Avoid name collisions in the generated query
       # b) Determine which fields in the result JSON should be
       #    handed fulfilled to each promise
-      def self.load(query, context: {})
+      def self.load(query, context: {}, variables: {})
         @index ||= 1
         @index += 1
 
@@ -19,6 +19,8 @@ module GraphQL
 
         store_context(context)
 
+        interpolate_variables!(query, variables)
+
         self.for.load([query, prime, @context])
       end
 
@@ -68,7 +70,7 @@ module GraphQL
       private
 
       def perform(queries_and_primes)
-        query_string = QueryMerger.merge(queries_and_primes)
+        query_string = QueryMerger.merge(queries_and_primes).gsub(/\s+/, " ")
         context = queries_and_primes[-1][-1]
         response = query(query_string, context: context).to_h
 
@@ -88,6 +90,33 @@ module GraphQL
         end
       end
 
+      # Interpolates variables into the given query.
+      # For String variables, surrounds the interpolated string in quotes.
+      # To interpolate a String as an Int, Float, or Bool, convert to the appropriate Ruby type.
+      #
+      # E.g.
+      #   interpolate_variables("foo(bar: $my_var)", { my_var: "buzz" })
+      #   => "foo(bar: \"buzz\")"
+      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
+        end
+      end
+
       def dup(hash)
         JSON.parse(hash.to_json)
       end

data/lib/graphql/remote_loader/version.rb

@@ -1,5 +1,5 @@
 module GraphQL
   module RemoteLoader
-    VERSION = "1.0.3"
+    VERSION = "1.0.4"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql-remote_loader
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Nathaniel Woodthorpe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-18 00:00:00.000000000 Z
+date: 2018-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql