graphql-remote_loader 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 373c88fb1ed204a41f90ca7d23968d4c29a62df9
-  data.tar.gz: b535426a4ac97d8ce0bd0fd0ab1a76d6a292f3bb
+  metadata.gz: bbd2e637ecc93810900d66de559f52ed874b5b08
+  data.tar.gz: 0fd8533f7f4514e6e18216311298eec7485bce18
 SHA512:
-  metadata.gz: edee071404cb25b0d65f9bd7247f91f088d0b9b1a87dbb2082d14e137848b7150f47c66a5fda0ca8bab45c76eaafd33e0a7f8b0bc4cc0d2e499370db6a8e5da1
-  data.tar.gz: 2586f4f3b17e2dc6cc4f99cbd83b23575f78389bbbefac08e620a5919f642fcb2e7332036544c8b1f7c643f49c67a3d482772c00cd3c2a72d64576676fd62159
+  metadata.gz: 8cd9ba1245a71ba2643c9e65b7b0fd461e830f911a4d69e29a214eb0412d459638d9571514e4a683cc01c25919220d23b5ae326e975a55d2127e1367a4553835
+  data.tar.gz: a20d45c2bac56cf499bc88bcb2e94f66db84c924ae136a94cf81747d95bbeb196798f891f7aedf8d04c0c5ab4c86c0b6ab4d9b8f0af452bae35d0ce2feafa0c5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    graphql-remote_loader (1.0.0)
+    graphql-remote_loader (1.0.1)
       graphql (~> 1.6)
       graphql-batch (~> 0.3)
 
@@ -11,7 +11,7 @@ GEM
     byebug (9.1.0)
     coderay (1.1.2)
     diff-lcs (1.3)
-    graphql (1.7.14)
+    graphql (1.8.4)
     graphql-batch (0.3.9)
       graphql (>= 0.8, < 2)
       promise.rb (~> 0.7.2)

data/README.md

@@ -45,39 +45,6 @@ A promise-based resolution strategy from Shopify's [`graphql-batch`](https://git
 
 You can think of it as a lightweight version of schema-stitching.
 
-## How it works
-
-Using GraphQL batch, the loader collects all GraphQL sub-queries before combining and executing one query.
-
-### Merging queries
-
-Once we have all the queries we need, we merge them all together by treating the query ASTs as prefix trees and merging the prefix trees together. For example, if the input queries were `["viewer { foo bar }", "buzz viewer { foo bazz }"]`, then the merged query would be:
-
-```graphql
-query{
-  buzz
-  viewer{
-    foo
-    bar
-    bazz
-  }
-}
-```
-
-### Name conflicts
-
-Suppose we want to merge `["user(login: "foo") { url }", "user(login: "bar") { url }"]`. We can't treat these `user` fields as equal since their arguments don't match, but we also can't naively combine these queries together, the `user` key will be ambiguous.
-
-To solve this problem, we introduce identified aliases. Every query to be merged is given a unique ID. When building the query, we include this unique ID in a new alias on all fields. This prevents conflicts between separate subqueries.
-
-### Fulfilling promises
-
-We only want to fulfill each promise with the data it asked for. This is especially relevant in the case of conflicts as in the case above.
-
-When fulfilling promises, we traverse the result hash and prune out all result keys with UIDs that don't match the query. Before returning the filtered hash, we scrub the UIDs so that the result keys are the same as the GraphQL field names.
-
-This solution prevents all conflict issues and doesn't change the way your API uses this library.
-
 ## How to use
 First, you'll need to install the gem. Either do `gem install graphql-remote_loader` or add this to your Gemfile:
 
@@ -106,9 +73,11 @@ end
 
 This example uses [`graphql-client`](https://github.com/github/graphql-client). Any client, or even just plain `cURL`/`HTTP` can be used.
 
+With your loader setup, you can begin using `#load` or `#load_value` in your `graphql-ruby` resolvers.
+
 ## Running tests
 
 ```
 bundle install
-rspec
+bundle exec rspec
 ```

data/lib/graphql/remote_loader/loader.rb

@@ -11,21 +11,23 @@ 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)
+      def self.load(query, context: {})
         @index ||= 1
         @index += 1
 
         prime = Prime.take(@index - 1).last
 
-        self.for.load([query, prime])
+        store_context(context)
+
+        self.for.load([query, prime, @context])
       end
 
       # Loads the value, then if the query was successful, fulfills promise with
       # the leaf value instead of the full results hash.
       #
       # If errors are present, returns nil.
-      def self.load_value(*path)
-        load(query_from_path(path)).then do |results|
+      def self.load_value(*path, context: {})
+        load(query_from_path(path), context: context).then do |results|
           next nil if results["errors"] && !results["errors"].empty?
 
           value_from_hash(results["data"])
@@ -36,6 +38,11 @@ module GraphQL
         @index = nil
       end
 
+      def self.store_context(context)
+        @context ||= {}
+        @context.merge!(context.to_h)
+      end
+
       # Given a query string, return a response JSON
       def query(query_string)
         raise NotImplementedError,
@@ -46,11 +53,12 @@ module GraphQL
 
       def perform(queries_and_primes)
         query_string = QueryMerger.merge(queries_and_primes)
-        response = query(query_string).to_h
+        context = queries_and_primes[-1][-1]
+        response = query(query_string, context: context).to_h
 
         data, errors = response["data"], response["errors"]
 
-        queries_and_primes.each do |query, prime|
+        queries_and_primes.each do |query, prime, context|
           response = {}
 
           response["data"] = filter_keys_on_data(data, prime)
@@ -60,7 +68,7 @@ module GraphQL
 
           scrub_primes_from_error_paths!(response["errors"])
 
-          fulfill([query, prime], response)
+          fulfill([query, prime, context], response)
         end
       end
 

data/lib/graphql/remote_loader/query_merger.rb

@@ -59,6 +59,9 @@ module GraphQL
 
           a_query.selections.each do |a_query_selection|
             matching_field = b_query.selections.find do |b_query_selection|
+              next false if (a_query_selection.is_a? GraphQL::Language::Nodes::InlineFragment) &&
+                (b_query_selection.is_a? GraphQL::Language::Nodes::InlineFragment)
+
               same_name = a_query_selection.name == b_query_selection.name
 
               next same_name if exempt_node_types.any? { |type| b_query_selection.is_a?(type) }

data/lib/graphql/remote_loader/version.rb

@@ -1,5 +1,5 @@
 module GraphQL
   module RemoteLoader
-    VERSION = "1.0.1"
+    VERSION = "1.0.2"
   end
 end

metadata

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