Skip to content

Commit 6ee8bc6

Browse files
authored
Merge pull request #33 from merge-api/fern-bot/04-22-2025-0554PM
🌿 Fern Regeneration -- April 22, 2025
2 parents e40c567 + 2e41d51 commit 6ee8bc6

File tree

467 files changed

+37037
-29625
lines changed

Some content is hidden

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

467 files changed

+37037
-29625
lines changed

lib/merge_ruby_client.rb

+14-14
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,23 @@
33
require_relative "environment"
44
require_relative "types_export"
55
require_relative "requests"
6-
require_relative "merge_ruby_client/ats/client"
76
require_relative "merge_ruby_client/crm/client"
8-
require_relative "merge_ruby_client/filestorage/client"
7+
require_relative "merge_ruby_client/ats/client"
98
require_relative "merge_ruby_client/hris/client"
9+
require_relative "merge_ruby_client/filestorage/client"
1010
require_relative "merge_ruby_client/ticketing/client"
1111
require_relative "merge_ruby_client/accounting/client"
1212

1313
module Merge
1414
class Client
15-
# @return [Merge::Ats::Client]
16-
attr_reader :ats
1715
# @return [Merge::Crm::Client]
1816
attr_reader :crm
19-
# @return [Merge::Filestorage::Client]
20-
attr_reader :filestorage
17+
# @return [Merge::Ats::Client]
18+
attr_reader :ats
2119
# @return [Merge::Hris::Client]
2220
attr_reader :hris
21+
# @return [Merge::Filestorage::Client]
22+
attr_reader :filestorage
2323
# @return [Merge::Ticketing::Client]
2424
attr_reader :ticketing
2525
# @return [Merge::Accounting::Client]
@@ -42,24 +42,24 @@ def initialize(api_key:, base_url: nil, environment: Merge::Environment::PRODUCT
4242
api_key: api_key,
4343
account_token: account_token
4444
)
45-
@ats = Merge::Ats::Client.new(request_client: @request_client)
4645
@crm = Merge::Crm::Client.new(request_client: @request_client)
47-
@filestorage = Merge::Filestorage::Client.new(request_client: @request_client)
46+
@ats = Merge::Ats::Client.new(request_client: @request_client)
4847
@hris = Merge::Hris::Client.new(request_client: @request_client)
48+
@filestorage = Merge::Filestorage::Client.new(request_client: @request_client)
4949
@ticketing = Merge::Ticketing::Client.new(request_client: @request_client)
5050
@accounting = Merge::Accounting::Client.new(request_client: @request_client)
5151
end
5252
end
5353

5454
class AsyncClient
55-
# @return [Merge::Ats::AsyncClient]
56-
attr_reader :ats
5755
# @return [Merge::Crm::AsyncClient]
5856
attr_reader :crm
59-
# @return [Merge::Filestorage::AsyncClient]
60-
attr_reader :filestorage
57+
# @return [Merge::Ats::AsyncClient]
58+
attr_reader :ats
6159
# @return [Merge::Hris::AsyncClient]
6260
attr_reader :hris
61+
# @return [Merge::Filestorage::AsyncClient]
62+
attr_reader :filestorage
6363
# @return [Merge::Ticketing::AsyncClient]
6464
attr_reader :ticketing
6565
# @return [Merge::Accounting::AsyncClient]
@@ -82,10 +82,10 @@ def initialize(api_key:, base_url: nil, environment: Merge::Environment::PRODUCT
8282
api_key: api_key,
8383
account_token: account_token
8484
)
85-
@ats = Merge::Ats::AsyncClient.new(request_client: @async_request_client)
8685
@crm = Merge::Crm::AsyncClient.new(request_client: @async_request_client)
87-
@filestorage = Merge::Filestorage::AsyncClient.new(request_client: @async_request_client)
86+
@ats = Merge::Ats::AsyncClient.new(request_client: @async_request_client)
8887
@hris = Merge::Hris::AsyncClient.new(request_client: @async_request_client)
88+
@filestorage = Merge::Filestorage::AsyncClient.new(request_client: @async_request_client)
8989
@ticketing = Merge::Ticketing::AsyncClient.new(request_client: @async_request_client)
9090
@accounting = Merge::Accounting::AsyncClient.new(request_client: @async_request_client)
9191
end

lib/merge_ruby_client/accounting/accounting_periods/client.rb

+10-4
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,8 @@ def list(cursor: nil, include_deleted_data: nil, include_remote_data: nil, inclu
7070
# @param id [String]
7171
# @param include_remote_data [Boolean] Whether to include the original data Merge fetched from the third-party to
7272
# produce these models.
73+
# @param include_shell_data [Boolean] Whether to include shell records. Shell records are empty records (they may
74+
# contain some metadata but all other fields are null).
7375
# @param request_options [Merge::RequestOptions]
7476
# @return [Merge::Accounting::AccountingPeriod]
7577
# @example
@@ -79,7 +81,7 @@ def list(cursor: nil, include_deleted_data: nil, include_remote_data: nil, inclu
7981
# api_key: "YOUR_AUTH_TOKEN"
8082
# )
8183
# api.accounting.accounting_periods.retrieve(id: "id")
82-
def retrieve(id:, include_remote_data: nil, request_options: nil)
84+
def retrieve(id:, include_remote_data: nil, include_shell_data: nil, request_options: nil)
8385
response = @request_client.conn.get do |req|
8486
req.options.timeout = request_options.timeout_in_seconds unless request_options&.timeout_in_seconds.nil?
8587
req.headers["Authorization"] = request_options.api_key unless request_options&.api_key.nil?
@@ -91,7 +93,8 @@ def retrieve(id:, include_remote_data: nil, request_options: nil)
9193
}.compact
9294
req.params = {
9395
**(request_options&.additional_query_parameters || {}),
94-
"include_remote_data": include_remote_data
96+
"include_remote_data": include_remote_data,
97+
"include_shell_data": include_shell_data
9598
}.compact
9699
unless request_options.nil? || request_options&.additional_body_parameters.nil?
97100
req.body = { **(request_options&.additional_body_parameters || {}) }.compact
@@ -167,6 +170,8 @@ def list(cursor: nil, include_deleted_data: nil, include_remote_data: nil, inclu
167170
# @param id [String]
168171
# @param include_remote_data [Boolean] Whether to include the original data Merge fetched from the third-party to
169172
# produce these models.
173+
# @param include_shell_data [Boolean] Whether to include shell records. Shell records are empty records (they may
174+
# contain some metadata but all other fields are null).
170175
# @param request_options [Merge::RequestOptions]
171176
# @return [Merge::Accounting::AccountingPeriod]
172177
# @example
@@ -176,7 +181,7 @@ def list(cursor: nil, include_deleted_data: nil, include_remote_data: nil, inclu
176181
# api_key: "YOUR_AUTH_TOKEN"
177182
# )
178183
# api.accounting.accounting_periods.retrieve(id: "id")
179-
def retrieve(id:, include_remote_data: nil, request_options: nil)
184+
def retrieve(id:, include_remote_data: nil, include_shell_data: nil, request_options: nil)
180185
Async do
181186
response = @request_client.conn.get do |req|
182187
req.options.timeout = request_options.timeout_in_seconds unless request_options&.timeout_in_seconds.nil?
@@ -189,7 +194,8 @@ def retrieve(id:, include_remote_data: nil, request_options: nil)
189194
}.compact
190195
req.params = {
191196
**(request_options&.additional_query_parameters || {}),
192-
"include_remote_data": include_remote_data
197+
"include_remote_data": include_remote_data,
198+
"include_shell_data": include_shell_data
193199
}.compact
194200
unless request_options.nil? || request_options&.additional_body_parameters.nil?
195201
req.body = { **(request_options&.additional_body_parameters || {}) }.compact

lib/merge_ruby_client/accounting/accounts/client.rb

+16-6
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ def initialize(request_client:)
4545
# @param modified_after [DateTime] If provided, only objects synced by Merge after this date time will be returned.
4646
# @param modified_before [DateTime] If provided, only objects synced by Merge before this date time will be
4747
# returned.
48+
# @param name [String] If provided, will only return Accounts with this name.
4849
# @param page_size [Integer] Number of results to return per page.
4950
# @param remote_fields [Merge::Accounting::Accounts::AccountsListRequestRemoteFields] Deprecated. Use show_enum_origins.
5051
# @param remote_id [String] The API provider's ID for the given object.
@@ -61,7 +62,7 @@ def initialize(request_client:)
6162
# )
6263
# api.accounting.accounts.list
6364
def list(account_type: nil, company_id: nil, created_after: nil, created_before: nil, cursor: nil, expand: nil,
64-
include_deleted_data: nil, include_remote_data: nil, include_shell_data: nil, modified_after: nil, modified_before: nil, page_size: nil, remote_fields: nil, remote_id: nil, show_enum_origins: nil, request_options: nil)
65+
include_deleted_data: nil, include_remote_data: nil, include_shell_data: nil, modified_after: nil, modified_before: nil, name: nil, page_size: nil, remote_fields: nil, remote_id: nil, show_enum_origins: nil, request_options: nil)
6566
response = @request_client.conn.get do |req|
6667
req.options.timeout = request_options.timeout_in_seconds unless request_options&.timeout_in_seconds.nil?
6768
req.headers["Authorization"] = request_options.api_key unless request_options&.api_key.nil?
@@ -84,6 +85,7 @@ def list(account_type: nil, company_id: nil, created_after: nil, created_before:
8485
"include_shell_data": include_shell_data,
8586
"modified_after": modified_after,
8687
"modified_before": modified_before,
88+
"name": name,
8789
"page_size": page_size,
8890
"remote_fields": remote_fields,
8991
"remote_id": remote_id,
@@ -152,6 +154,8 @@ def create(model:, is_debug_mode: nil, run_async: nil, request_options: nil)
152154
# should be comma separated without spaces.
153155
# @param include_remote_data [Boolean] Whether to include the original data Merge fetched from the third-party to
154156
# produce these models.
157+
# @param include_shell_data [Boolean] Whether to include shell records. Shell records are empty records (they may
158+
# contain some metadata but all other fields are null).
155159
# @param remote_fields [Merge::Accounting::Accounts::AccountsRetrieveRequestRemoteFields] Deprecated. Use show_enum_origins.
156160
# @param show_enum_origins [Merge::Accounting::Accounts::AccountsRetrieveRequestShowEnumOrigins] A comma separated list of enum field names for which you'd like the original
157161
# values to be returned, instead of Merge's normalized enum values. [Learn
@@ -165,8 +169,8 @@ def create(model:, is_debug_mode: nil, run_async: nil, request_options: nil)
165169
# api_key: "YOUR_AUTH_TOKEN"
166170
# )
167171
# api.accounting.accounts.retrieve(id: "id")
168-
def retrieve(id:, expand: nil, include_remote_data: nil, remote_fields: nil, show_enum_origins: nil,
169-
request_options: nil)
172+
def retrieve(id:, expand: nil, include_remote_data: nil, include_shell_data: nil, remote_fields: nil,
173+
show_enum_origins: nil, request_options: nil)
170174
response = @request_client.conn.get do |req|
171175
req.options.timeout = request_options.timeout_in_seconds unless request_options&.timeout_in_seconds.nil?
172176
req.headers["Authorization"] = request_options.api_key unless request_options&.api_key.nil?
@@ -180,6 +184,7 @@ def retrieve(id:, expand: nil, include_remote_data: nil, remote_fields: nil, sho
180184
**(request_options&.additional_query_parameters || {}),
181185
"expand": expand,
182186
"include_remote_data": include_remote_data,
187+
"include_shell_data": include_shell_data,
183188
"remote_fields": remote_fields,
184189
"show_enum_origins": show_enum_origins
185190
}.compact
@@ -254,6 +259,7 @@ def initialize(request_client:)
254259
# @param modified_after [DateTime] If provided, only objects synced by Merge after this date time will be returned.
255260
# @param modified_before [DateTime] If provided, only objects synced by Merge before this date time will be
256261
# returned.
262+
# @param name [String] If provided, will only return Accounts with this name.
257263
# @param page_size [Integer] Number of results to return per page.
258264
# @param remote_fields [Merge::Accounting::Accounts::AccountsListRequestRemoteFields] Deprecated. Use show_enum_origins.
259265
# @param remote_id [String] The API provider's ID for the given object.
@@ -270,7 +276,7 @@ def initialize(request_client:)
270276
# )
271277
# api.accounting.accounts.list
272278
def list(account_type: nil, company_id: nil, created_after: nil, created_before: nil, cursor: nil, expand: nil,
273-
include_deleted_data: nil, include_remote_data: nil, include_shell_data: nil, modified_after: nil, modified_before: nil, page_size: nil, remote_fields: nil, remote_id: nil, show_enum_origins: nil, request_options: nil)
279+
include_deleted_data: nil, include_remote_data: nil, include_shell_data: nil, modified_after: nil, modified_before: nil, name: nil, page_size: nil, remote_fields: nil, remote_id: nil, show_enum_origins: nil, request_options: nil)
274280
Async do
275281
response = @request_client.conn.get do |req|
276282
req.options.timeout = request_options.timeout_in_seconds unless request_options&.timeout_in_seconds.nil?
@@ -294,6 +300,7 @@ def list(account_type: nil, company_id: nil, created_after: nil, created_before:
294300
"include_shell_data": include_shell_data,
295301
"modified_after": modified_after,
296302
"modified_before": modified_before,
303+
"name": name,
297304
"page_size": page_size,
298305
"remote_fields": remote_fields,
299306
"remote_id": remote_id,
@@ -365,6 +372,8 @@ def create(model:, is_debug_mode: nil, run_async: nil, request_options: nil)
365372
# should be comma separated without spaces.
366373
# @param include_remote_data [Boolean] Whether to include the original data Merge fetched from the third-party to
367374
# produce these models.
375+
# @param include_shell_data [Boolean] Whether to include shell records. Shell records are empty records (they may
376+
# contain some metadata but all other fields are null).
368377
# @param remote_fields [Merge::Accounting::Accounts::AccountsRetrieveRequestRemoteFields] Deprecated. Use show_enum_origins.
369378
# @param show_enum_origins [Merge::Accounting::Accounts::AccountsRetrieveRequestShowEnumOrigins] A comma separated list of enum field names for which you'd like the original
370379
# values to be returned, instead of Merge's normalized enum values. [Learn
@@ -378,8 +387,8 @@ def create(model:, is_debug_mode: nil, run_async: nil, request_options: nil)
378387
# api_key: "YOUR_AUTH_TOKEN"
379388
# )
380389
# api.accounting.accounts.retrieve(id: "id")
381-
def retrieve(id:, expand: nil, include_remote_data: nil, remote_fields: nil, show_enum_origins: nil,
382-
request_options: nil)
390+
def retrieve(id:, expand: nil, include_remote_data: nil, include_shell_data: nil, remote_fields: nil,
391+
show_enum_origins: nil, request_options: nil)
383392
Async do
384393
response = @request_client.conn.get do |req|
385394
req.options.timeout = request_options.timeout_in_seconds unless request_options&.timeout_in_seconds.nil?
@@ -394,6 +403,7 @@ def retrieve(id:, expand: nil, include_remote_data: nil, remote_fields: nil, sho
394403
**(request_options&.additional_query_parameters || {}),
395404
"expand": expand,
396405
"include_remote_data": include_remote_data,
406+
"include_shell_data": include_shell_data,
397407
"remote_fields": remote_fields,
398408
"show_enum_origins": show_enum_origins
399409
}.compact

lib/merge_ruby_client/accounting/addresses/client.rb

+10-2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ def initialize(request_client:)
2121
# @param id [String]
2222
# @param include_remote_data [Boolean] Whether to include the original data Merge fetched from the third-party to
2323
# produce these models.
24+
# @param include_shell_data [Boolean] Whether to include shell records. Shell records are empty records (they may
25+
# contain some metadata but all other fields are null).
2426
# @param remote_fields [String] Deprecated. Use show_enum_origins.
2527
# @param show_enum_origins [String] A comma separated list of enum field names for which you'd like the original
2628
# values to be returned, instead of Merge's normalized enum values. [Learn
@@ -34,7 +36,8 @@ def initialize(request_client:)
3436
# api_key: "YOUR_AUTH_TOKEN"
3537
# )
3638
# api.accounting.addresses.retrieve(id: "id")
37-
def retrieve(id:, include_remote_data: nil, remote_fields: nil, show_enum_origins: nil, request_options: nil)
39+
def retrieve(id:, include_remote_data: nil, include_shell_data: nil, remote_fields: nil, show_enum_origins: nil,
40+
request_options: nil)
3841
response = @request_client.conn.get do |req|
3942
req.options.timeout = request_options.timeout_in_seconds unless request_options&.timeout_in_seconds.nil?
4043
req.headers["Authorization"] = request_options.api_key unless request_options&.api_key.nil?
@@ -47,6 +50,7 @@ def retrieve(id:, include_remote_data: nil, remote_fields: nil, show_enum_origin
4750
req.params = {
4851
**(request_options&.additional_query_parameters || {}),
4952
"include_remote_data": include_remote_data,
53+
"include_shell_data": include_shell_data,
5054
"remote_fields": remote_fields,
5155
"show_enum_origins": show_enum_origins
5256
}.compact
@@ -74,6 +78,8 @@ def initialize(request_client:)
7478
# @param id [String]
7579
# @param include_remote_data [Boolean] Whether to include the original data Merge fetched from the third-party to
7680
# produce these models.
81+
# @param include_shell_data [Boolean] Whether to include shell records. Shell records are empty records (they may
82+
# contain some metadata but all other fields are null).
7783
# @param remote_fields [String] Deprecated. Use show_enum_origins.
7884
# @param show_enum_origins [String] A comma separated list of enum field names for which you'd like the original
7985
# values to be returned, instead of Merge's normalized enum values. [Learn
@@ -87,7 +93,8 @@ def initialize(request_client:)
8793
# api_key: "YOUR_AUTH_TOKEN"
8894
# )
8995
# api.accounting.addresses.retrieve(id: "id")
90-
def retrieve(id:, include_remote_data: nil, remote_fields: nil, show_enum_origins: nil, request_options: nil)
96+
def retrieve(id:, include_remote_data: nil, include_shell_data: nil, remote_fields: nil, show_enum_origins: nil,
97+
request_options: nil)
9198
Async do
9299
response = @request_client.conn.get do |req|
93100
req.options.timeout = request_options.timeout_in_seconds unless request_options&.timeout_in_seconds.nil?
@@ -101,6 +108,7 @@ def retrieve(id:, include_remote_data: nil, remote_fields: nil, show_enum_origin
101108
req.params = {
102109
**(request_options&.additional_query_parameters || {}),
103110
"include_remote_data": include_remote_data,
111+
"include_shell_data": include_shell_data,
104112
"remote_fields": remote_fields,
105113
"show_enum_origins": show_enum_origins
106114
}.compact

0 commit comments

Comments
 (0)