Skip to content

Commit ec7a74b

Browse files
fern-supportfern-support
authored
🌿 Fern Regeneration -- July 24, 2024
2 parents 23b39a4 + ba309cf commit ec7a74b

File tree

1,058 files changed

+14298
-7673
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,058 files changed

+14298
-7673
lines changed

‎lib/merge_ruby_client.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,18 @@ class Client
2525
# @return [Merge::Accounting::Client]
2626
attr_reader :accounting
2727

28-
# @param environment [Merge::Environment]
2928
# @param base_url [String]
29+
# @param environment [Merge::Environment]
3030
# @param max_retries [Long] The number of times to retry a failed request, defaults to 2.
3131
# @param timeout_in_seconds [Long]
3232
# @param api_key [String]
3333
# @param account_token [String] Token identifying the end user.
3434
# @return [Merge::Client]
35-
def initialize(api_key:, environment: Environment::PRODUCTION, base_url: nil, max_retries: nil,
35+
def initialize(api_key:, base_url: nil, environment: Merge::Environment::PRODUCTION, max_retries: nil,
3636
timeout_in_seconds: nil, account_token: nil)
3737
@request_client = Merge::RequestClient.new(
38-
environment: environment,
3938
base_url: base_url,
39+
environment: environment,
4040
max_retries: max_retries,
4141
timeout_in_seconds: timeout_in_seconds,
4242
api_key: api_key,
@@ -65,18 +65,18 @@ class AsyncClient
6565
# @return [Merge::Accounting::AsyncClient]
6666
attr_reader :accounting
6767

68-
# @param environment [Merge::Environment]
6968
# @param base_url [String]
69+
# @param environment [Merge::Environment]
7070
# @param max_retries [Long] The number of times to retry a failed request, defaults to 2.
7171
# @param timeout_in_seconds [Long]
7272
# @param api_key [String]
7373
# @param account_token [String] Token identifying the end user.
7474
# @return [Merge::AsyncClient]
75-
def initialize(api_key:, environment: Environment::PRODUCTION, base_url: nil, max_retries: nil,
75+
def initialize(api_key:, base_url: nil, environment: Merge::Environment::PRODUCTION, max_retries: nil,
7676
timeout_in_seconds: nil, account_token: nil)
7777
@async_request_client = Merge::AsyncRequestClient.new(
78-
environment: environment,
7978
base_url: base_url,
79+
environment: environment,
8080
max_retries: max_retries,
8181
timeout_in_seconds: timeout_in_seconds,
8282
api_key: api_key,

‎lib/merge_ruby_client/accounting/account_details/client.rb

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,27 @@ def initialize(request_client:)
2222
# @return [Merge::Accounting::AccountDetails]
2323
# @example
2424
# api = Merge::Client.new(
25-
# environment: Environment::PRODUCTION,
2625
# base_url: "https://api.example.com",
26+
# environment: Merge::Environment::PRODUCTION,
2727
# api_key: "YOUR_AUTH_TOKEN"
2828
# )
29-
# api.accounting.retrieve
29+
# api.accounting.account_details.retrieve
3030
def retrieve(request_options: nil)
3131
response = @request_client.conn.get do |req|
3232
req.options.timeout = request_options.timeout_in_seconds unless request_options&.timeout_in_seconds.nil?
3333
req.headers["Authorization"] = request_options.api_key unless request_options&.api_key.nil?
3434
req.headers["X-Account-Token"] = request_options.account_token unless request_options&.account_token.nil?
35-
req.headers = { **req.headers, **(request_options&.additional_headers || {}) }.compact
35+
req.headers = {
36+
**(req.headers || {}),
37+
**@request_client.get_headers,
38+
**(request_options&.additional_headers || {})
39+
}.compact
40+
unless request_options.nil? || request_options&.additional_query_parameters.nil?
41+
req.params = { **(request_options&.additional_query_parameters || {}) }.compact
42+
end
43+
unless request_options.nil? || request_options&.additional_body_parameters.nil?
44+
req.body = { **(request_options&.additional_body_parameters || {}) }.compact
45+
end
3646
req.url "#{@request_client.get_url(request_options: request_options)}/accounting/v1/account-details"
3747
end
3848
Merge::Accounting::AccountDetails.from_json(json_object: response.body)
@@ -55,18 +65,28 @@ def initialize(request_client:)
5565
# @return [Merge::Accounting::AccountDetails]
5666
# @example
5767
# api = Merge::Client.new(
58-
# environment: Environment::PRODUCTION,
5968
# base_url: "https://api.example.com",
69+
# environment: Merge::Environment::PRODUCTION,
6070
# api_key: "YOUR_AUTH_TOKEN"
6171
# )
62-
# api.accounting.retrieve
72+
# api.accounting.account_details.retrieve
6373
def retrieve(request_options: nil)
6474
Async do
6575
response = @request_client.conn.get do |req|
6676
req.options.timeout = request_options.timeout_in_seconds unless request_options&.timeout_in_seconds.nil?
6777
req.headers["Authorization"] = request_options.api_key unless request_options&.api_key.nil?
6878
req.headers["X-Account-Token"] = request_options.account_token unless request_options&.account_token.nil?
69-
req.headers = { **req.headers, **(request_options&.additional_headers || {}) }.compact
79+
req.headers = {
80+
**(req.headers || {}),
81+
**@request_client.get_headers,
82+
**(request_options&.additional_headers || {})
83+
}.compact
84+
unless request_options.nil? || request_options&.additional_query_parameters.nil?
85+
req.params = { **(request_options&.additional_query_parameters || {}) }.compact
86+
end
87+
unless request_options.nil? || request_options&.additional_body_parameters.nil?
88+
req.body = { **(request_options&.additional_body_parameters || {}) }.compact
89+
end
7090
req.url "#{@request_client.get_url(request_options: request_options)}/accounting/v1/account-details"
7191
end
7292
Merge::Accounting::AccountDetails.from_json(json_object: response.body)

‎lib/merge_ruby_client/accounting/account_token/client.rb

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,27 @@ def initialize(request_client:)
2323
# @return [Merge::Accounting::AccountToken]
2424
# @example
2525
# api = Merge::Client.new(
26-
# environment: Environment::PRODUCTION,
2726
# base_url: "https://api.example.com",
27+
# environment: Merge::Environment::PRODUCTION,
2828
# api_key: "YOUR_AUTH_TOKEN"
2929
# )
30-
# api.accounting.retrieve(public_token: "public_token")
30+
# api.accounting.account_token.retrieve(public_token: "public_token")
3131
def retrieve(public_token:, request_options: nil)
3232
response = @request_client.conn.get do |req|
3333
req.options.timeout = request_options.timeout_in_seconds unless request_options&.timeout_in_seconds.nil?
3434
req.headers["Authorization"] = request_options.api_key unless request_options&.api_key.nil?
3535
req.headers["X-Account-Token"] = request_options.account_token unless request_options&.account_token.nil?
36-
req.headers = { **req.headers, **(request_options&.additional_headers || {}) }.compact
36+
req.headers = {
37+
**(req.headers || {}),
38+
**@request_client.get_headers,
39+
**(request_options&.additional_headers || {})
40+
}.compact
41+
unless request_options.nil? || request_options&.additional_query_parameters.nil?
42+
req.params = { **(request_options&.additional_query_parameters || {}) }.compact
43+
end
44+
unless request_options.nil? || request_options&.additional_body_parameters.nil?
45+
req.body = { **(request_options&.additional_body_parameters || {}) }.compact
46+
end
3747
req.url "#{@request_client.get_url(request_options: request_options)}/accounting/v1/account-token/#{public_token}"
3848
end
3949
Merge::Accounting::AccountToken.from_json(json_object: response.body)
@@ -57,18 +67,28 @@ def initialize(request_client:)
5767
# @return [Merge::Accounting::AccountToken]
5868
# @example
5969
# api = Merge::Client.new(
60-
# environment: Environment::PRODUCTION,
6170
# base_url: "https://api.example.com",
71+
# environment: Merge::Environment::PRODUCTION,
6272
# api_key: "YOUR_AUTH_TOKEN"
6373
# )
64-
# api.accounting.retrieve(public_token: "public_token")
74+
# api.accounting.account_token.retrieve(public_token: "public_token")
6575
def retrieve(public_token:, request_options: nil)
6676
Async do
6777
response = @request_client.conn.get do |req|
6878
req.options.timeout = request_options.timeout_in_seconds unless request_options&.timeout_in_seconds.nil?
6979
req.headers["Authorization"] = request_options.api_key unless request_options&.api_key.nil?
7080
req.headers["X-Account-Token"] = request_options.account_token unless request_options&.account_token.nil?
71-
req.headers = { **req.headers, **(request_options&.additional_headers || {}) }.compact
81+
req.headers = {
82+
**(req.headers || {}),
83+
**@request_client.get_headers,
84+
**(request_options&.additional_headers || {})
85+
}.compact
86+
unless request_options.nil? || request_options&.additional_query_parameters.nil?
87+
req.params = { **(request_options&.additional_query_parameters || {}) }.compact
88+
end
89+
unless request_options.nil? || request_options&.additional_body_parameters.nil?
90+
req.body = { **(request_options&.additional_body_parameters || {}) }.compact
91+
end
7292
req.url "#{@request_client.get_url(request_options: request_options)}/accounting/v1/account-token/#{public_token}"
7393
end
7494
Merge::Accounting::AccountToken.from_json(json_object: response.body)

‎lib/merge_ruby_client/accounting/accounting_periods/client.rb

Lines changed: 40 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,24 +28,31 @@ def initialize(request_client:)
2828
# @return [Merge::Accounting::PaginatedAccountingPeriodList]
2929
# @example
3030
# api = Merge::Client.new(
31-
# environment: Environment::PRODUCTION,
3231
# base_url: "https://api.example.com",
32+
# environment: Merge::Environment::PRODUCTION,
3333
# api_key: "YOUR_AUTH_TOKEN"
3434
# )
35-
# api.accounting.list
35+
# api.accounting.accounting_periods.list
3636
def list(cursor: nil, include_deleted_data: nil, include_remote_data: nil, page_size: nil, request_options: nil)
3737
response = @request_client.conn.get do |req|
3838
req.options.timeout = request_options.timeout_in_seconds unless request_options&.timeout_in_seconds.nil?
3939
req.headers["Authorization"] = request_options.api_key unless request_options&.api_key.nil?
4040
req.headers["X-Account-Token"] = request_options.account_token unless request_options&.account_token.nil?
41-
req.headers = { **req.headers, **(request_options&.additional_headers || {}) }.compact
41+
req.headers = {
42+
**(req.headers || {}),
43+
**@request_client.get_headers,
44+
**(request_options&.additional_headers || {})
45+
}.compact
4246
req.params = {
4347
**(request_options&.additional_query_parameters || {}),
4448
"cursor": cursor,
4549
"include_deleted_data": include_deleted_data,
4650
"include_remote_data": include_remote_data,
4751
"page_size": page_size
4852
}.compact
53+
unless request_options.nil? || request_options&.additional_body_parameters.nil?
54+
req.body = { **(request_options&.additional_body_parameters || {}) }.compact
55+
end
4956
req.url "#{@request_client.get_url(request_options: request_options)}/accounting/v1/accounting-periods"
5057
end
5158
Merge::Accounting::PaginatedAccountingPeriodList.from_json(json_object: response.body)
@@ -60,21 +67,28 @@ def list(cursor: nil, include_deleted_data: nil, include_remote_data: nil, page_
6067
# @return [Merge::Accounting::AccountingPeriod]
6168
# @example
6269
# api = Merge::Client.new(
63-
# environment: Environment::PRODUCTION,
6470
# base_url: "https://api.example.com",
71+
# environment: Merge::Environment::PRODUCTION,
6572
# api_key: "YOUR_AUTH_TOKEN"
6673
# )
67-
# api.accounting.retrieve(id: "id")
74+
# api.accounting.accounting_periods.retrieve(id: "id")
6875
def retrieve(id:, include_remote_data: nil, request_options: nil)
6976
response = @request_client.conn.get do |req|
7077
req.options.timeout = request_options.timeout_in_seconds unless request_options&.timeout_in_seconds.nil?
7178
req.headers["Authorization"] = request_options.api_key unless request_options&.api_key.nil?
7279
req.headers["X-Account-Token"] = request_options.account_token unless request_options&.account_token.nil?
73-
req.headers = { **req.headers, **(request_options&.additional_headers || {}) }.compact
80+
req.headers = {
81+
**(req.headers || {}),
82+
**@request_client.get_headers,
83+
**(request_options&.additional_headers || {})
84+
}.compact
7485
req.params = {
7586
**(request_options&.additional_query_parameters || {}),
7687
"include_remote_data": include_remote_data
7788
}.compact
89+
unless request_options.nil? || request_options&.additional_body_parameters.nil?
90+
req.body = { **(request_options&.additional_body_parameters || {}) }.compact
91+
end
7892
req.url "#{@request_client.get_url(request_options: request_options)}/accounting/v1/accounting-periods/#{id}"
7993
end
8094
Merge::Accounting::AccountingPeriod.from_json(json_object: response.body)
@@ -102,25 +116,32 @@ def initialize(request_client:)
102116
# @return [Merge::Accounting::PaginatedAccountingPeriodList]
103117
# @example
104118
# api = Merge::Client.new(
105-
# environment: Environment::PRODUCTION,
106119
# base_url: "https://api.example.com",
120+
# environment: Merge::Environment::PRODUCTION,
107121
# api_key: "YOUR_AUTH_TOKEN"
108122
# )
109-
# api.accounting.list
123+
# api.accounting.accounting_periods.list
110124
def list(cursor: nil, include_deleted_data: nil, include_remote_data: nil, page_size: nil, request_options: nil)
111125
Async do
112126
response = @request_client.conn.get do |req|
113127
req.options.timeout = request_options.timeout_in_seconds unless request_options&.timeout_in_seconds.nil?
114128
req.headers["Authorization"] = request_options.api_key unless request_options&.api_key.nil?
115129
req.headers["X-Account-Token"] = request_options.account_token unless request_options&.account_token.nil?
116-
req.headers = { **req.headers, **(request_options&.additional_headers || {}) }.compact
130+
req.headers = {
131+
**(req.headers || {}),
132+
**@request_client.get_headers,
133+
**(request_options&.additional_headers || {})
134+
}.compact
117135
req.params = {
118136
**(request_options&.additional_query_parameters || {}),
119137
"cursor": cursor,
120138
"include_deleted_data": include_deleted_data,
121139
"include_remote_data": include_remote_data,
122140
"page_size": page_size
123141
}.compact
142+
unless request_options.nil? || request_options&.additional_body_parameters.nil?
143+
req.body = { **(request_options&.additional_body_parameters || {}) }.compact
144+
end
124145
req.url "#{@request_client.get_url(request_options: request_options)}/accounting/v1/accounting-periods"
125146
end
126147
Merge::Accounting::PaginatedAccountingPeriodList.from_json(json_object: response.body)
@@ -136,22 +157,29 @@ def list(cursor: nil, include_deleted_data: nil, include_remote_data: nil, page_
136157
# @return [Merge::Accounting::AccountingPeriod]
137158
# @example
138159
# api = Merge::Client.new(
139-
# environment: Environment::PRODUCTION,
140160
# base_url: "https://api.example.com",
161+
# environment: Merge::Environment::PRODUCTION,
141162
# api_key: "YOUR_AUTH_TOKEN"
142163
# )
143-
# api.accounting.retrieve(id: "id")
164+
# api.accounting.accounting_periods.retrieve(id: "id")
144165
def retrieve(id:, include_remote_data: nil, request_options: nil)
145166
Async do
146167
response = @request_client.conn.get do |req|
147168
req.options.timeout = request_options.timeout_in_seconds unless request_options&.timeout_in_seconds.nil?
148169
req.headers["Authorization"] = request_options.api_key unless request_options&.api_key.nil?
149170
req.headers["X-Account-Token"] = request_options.account_token unless request_options&.account_token.nil?
150-
req.headers = { **req.headers, **(request_options&.additional_headers || {}) }.compact
171+
req.headers = {
172+
**(req.headers || {}),
173+
**@request_client.get_headers,
174+
**(request_options&.additional_headers || {})
175+
}.compact
151176
req.params = {
152177
**(request_options&.additional_query_parameters || {}),
153178
"include_remote_data": include_remote_data
154179
}.compact
180+
unless request_options.nil? || request_options&.additional_body_parameters.nil?
181+
req.body = { **(request_options&.additional_body_parameters || {}) }.compact
182+
end
155183
req.url "#{@request_client.get_url(request_options: request_options)}/accounting/v1/accounting-periods/#{id}"
156184
end
157185
Merge::Accounting::AccountingPeriod.from_json(json_object: response.body)

0 commit comments

Comments
 (0)