Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add dot notation accessing for graphql responses #1246

Merged
merged 6 commits into from
Dec 4, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ Layout/EmptyLineAfterGuardClause:
Enabled: true
Style/GlobalStdStream:
Enabled: true
Style/OpenStructUse:
Enabled: false
Layout/LineLength:
Exclude:
- "test/clients/*"
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
Note: For changes to the API, see https://shopify.dev/changelog?filter=api

## Unreleased
[#1210](https://github.com/Shopify/shopify-api-ruby/pull/1246) Add context option `response_as_struct` to allow GraphQL API responses to be accessed via dot notation.

## 13.3.1

Expand Down
1 change: 1 addition & 0 deletions lib/shopify_api/clients/graphql/client.rb
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ def query(query:, variables: nil, headers: nil, tries: 1)
body_type: "application/json",
tries: tries,
),
response_as_struct: Context.response_as_struct || false,
)
end
end
Expand Down
9 changes: 7 additions & 2 deletions lib/shopify_api/clients/http_client.rb
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ def initialize(base_path:, session: nil)
end
end

sig { params(request: HttpRequest).returns(HttpResponse) }
def request(request)
sig { params(request: HttpRequest, response_as_struct: T::Boolean).returns(HttpResponse) }
def request(request, response_as_struct: false)
request.verify

headers = @headers
Expand All @@ -60,6 +60,11 @@ def request(request)
body = res.body
end

if response_as_struct && body.is_a?(Hash)
json_body = body.to_json
body = JSON.parse(json_body, object_class: OpenStruct)
end

response = HttpResponse.new(code: res.code.to_i, headers: res.headers.to_h, body: body)

if response.headers["x-shopify-api-deprecated-reason"]
Expand Down
4 changes: 2 additions & 2 deletions lib/shopify_api/clients/http_response.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class HttpResponse
sig { returns(T::Hash[String, T::Array[String]]) }
attr_reader :headers

sig { returns(T.any(T::Hash[String, T.untyped], String)) }
sig { returns(T.any(T::Hash[String, T.untyped], String, OpenStruct)) }
attr_reader :body

sig { returns(T.nilable(String)) }
Expand All @@ -22,7 +22,7 @@ class HttpResponse
params(
code: Integer,
headers: T::Hash[String, T::Array[String]],
body: T.any(T::Hash[String, T.untyped], String),
body: T.any(T::Hash[String, T.untyped], String, OpenStruct),
).void
end
def initialize(code:, headers:, body:)
Expand Down
9 changes: 8 additions & 1 deletion lib/shopify_api/context.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ class Context
@active_session = T.let(Concurrent::ThreadLocalVar.new { nil }, T.nilable(Concurrent::ThreadLocalVar))
@user_agent_prefix = T.let(nil, T.nilable(String))
@old_api_secret_key = T.let(nil, T.nilable(String))
@response_as_struct = T.let(false, T.nilable(T::Boolean))

@rest_resource_loader = T.let(nil, T.nilable(Zeitwerk::Loader))

Expand All @@ -43,6 +44,7 @@ class << self
user_agent_prefix: T.nilable(String),
old_api_secret_key: T.nilable(String),
api_host: T.nilable(String),
response_as_struct: T.nilable(T::Boolean),
).void
end
def setup(
Expand All @@ -59,7 +61,8 @@ def setup(
private_shop: nil,
user_agent_prefix: nil,
old_api_secret_key: nil,
api_host: nil
api_host: nil,
response_as_struct: false
)
unless ShopifyAPI::AdminVersions::SUPPORTED_ADMIN_VERSIONS.include?(api_version)
raise Errors::UnsupportedVersionError,
Expand All @@ -78,6 +81,7 @@ def setup(
@private_shop = private_shop
@user_agent_prefix = user_agent_prefix
@old_api_secret_key = old_api_secret_key
@response_as_struct = response_as_struct
@log_level = if valid_log_level?(log_level)
log_level.to_sym
else
Expand Down Expand Up @@ -128,6 +132,9 @@ def load_rest_resources(api_version:)
sig { returns(Symbol) }
attr_reader :log_level

sig { returns T.nilable(T::Boolean) }
attr_reader :response_as_struct

sig { returns(T::Boolean) }
def private?
@is_private
Expand Down
10 changes: 10 additions & 0 deletions test/clients/http_client_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,16 @@ def test_json_parser_error
assert_equal(502, error.code)
end

def test_response_as_struct
stub_request(@request.http_method, "https://#{@shop}#{@base_path}/#{@request.path}")
.with(body: @request.body.to_json, query: @request.query, headers: @expected_headers)
.to_return(body: { "key" => { "nested_key" => "nested_value" } }.to_json, headers: @response_headers)

response = @client.request(@request, response_as_struct: true)
assert_kind_of(OpenStruct, response.body)
assert_equal("nested_value", response.body.key.nested_key)
end

private

def simple_http_test(http_method)
Expand Down
5 changes: 4 additions & 1 deletion test/test_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ def setup
private_shop: T.nilable(String),
user_agent_prefix: T.nilable(String),
old_api_secret_key: T.nilable(String),
response_as_struct: T.nilable(T::Boolean),
).void
end
def modify_context(
Expand All @@ -64,7 +65,8 @@ def modify_context(
logger: nil,
private_shop: "do-not-set",
user_agent_prefix: nil,
old_api_secret_key: nil
old_api_secret_key: nil,
response_as_struct: nil
)
ShopifyAPI::Context.setup(
api_key: api_key ? api_key : ShopifyAPI::Context.api_key,
Expand All @@ -79,6 +81,7 @@ def modify_context(
user_agent_prefix: user_agent_prefix ? user_agent_prefix : ShopifyAPI::Context.user_agent_prefix,
old_api_secret_key: old_api_secret_key ? old_api_secret_key : ShopifyAPI::Context.old_api_secret_key,
log_level: :off,
response_as_struct: response_as_struct || ShopifyAPI::Context.response_as_struct,
)
end
end
Expand Down