inject prepared query.

Author: gmac

lib/shopify_custom_data_graphql/client.rb

@@ -37,6 +37,8 @@ def set(key, value, bytesize)
       end
     end
 
+    attr_reader :lru
+
     def initialize(
       shop_url:,
       access_token:,
@@ -104,8 +106,8 @@ def schema(reload_custom_schema: false, reload_admin_schema: false)
     def execute(query: nil, variables: nil, operation_name: nil)
       tracer = Tracer.new
       tracer.span("execute") do
-        perform_query(query, operation_name, tracer) do |admin_query|
-          @admin.fetch(admin_query, variables: variables)
+        perform_query(query, operation_name, tracer) do |prepared_query|
+          @admin.fetch(prepared_query.query, variables: variables)
         end
       end
     rescue ValidationError => e

lib/shopify_custom_data_graphql/prepared_query.rb

@@ -58,7 +58,7 @@ def to_json
     def perform(tracer = DEFAULT_TRACER)
       raise NoQueryError, "No query to execute" if query.nil?
 
-      raw_result = tracer.span("proxy") { yield(query, @document) }
+      raw_result = tracer.span("proxy") { yield(self) }
 
       result = if transformed?
         tracer.span("transform_response") do

test/shopify_custom_data_graphql/response_transformer_test.rb

@@ -808,15 +808,15 @@ def fetch(fixture, document, variables: {}, operation_name: nil, schema: nil, ex
     errors = query.schema.static_validator.validate(query)[:errors]
     refute errors.any?, "Invalid custom data query: #{errors.first.message}" if errors.any?
     prepared_query = ShopifyCustomDataGraphQL::RequestTransformer.new(query).perform
-    prepared_query.perform do |query_string|
+    prepared_query.perform do |pq|
       file_path = "#{__dir__}/../fixtures/responses/#{fixture}.json"
       response = JSON.parse(File.read(file_path))
 
       if expect_valid_response
         # validate that the cached fixture matches the request shape
-        admin_query = GraphQL::Query.new(base_schema, query: query_string)
+        admin_query = GraphQL::Query.new(base_schema, query: pq.query)
         fixture = GraphQL::ResponseValidator.new(admin_query, response, scalar_validators: SCALAR_VALIDATORS)
-        assert fixture.valid?, "#{fixture.errors.map(&:message).join("\n")} in:\n#{query_string}"
+        assert fixture.valid?, "#{fixture.errors.map(&:message).join("\n")} in:\n#{pq.query}"
         fixture.prune!.to_h
       else
         response