merge_ruby_client 1.1.0 → 2.1.0

data/lib/merge_ruby_client/ticketing/types/patched_ticket_request.rb

@@ -2,6 +2,7 @@
 
 require "date"
 require_relative "ticket_status_enum"
+require_relative "ticket_access_level_enum"
 require_relative "priority_enum"
 require_relative "remote_field_request"
 require "ostruct"
@@ -51,12 +52,17 @@ module Merge
       attr_reader :contact
       # @return [String] The ticket's parent ticket.
       attr_reader :parent_ticket
+      # @return [Merge::Ticketing::TicketAccessLevelEnum] The description of who is able to access a given ticket, or where access is
+      #  inherited from.
+      #  * `COMPANY` - COMPANY
+      #  * `PUBLIC` - PUBLIC
+      #  * `PRIVATE` - PRIVATE
+      #  * `COLLECTION` - COLLECTION
+      attr_reader :access_level
       # @return [Array<String>]
       attr_reader :tags
       # @return [Array<String>]
       attr_reader :roles
-      # @return [DateTime] When the ticket was completed.
-      attr_reader :completed_at
       # @return [String] The 3rd party url of the Ticket.
       attr_reader :ticket_url
       # @return [Merge::Ticketing::PriorityEnum] The priority or urgency of the Ticket.
@@ -65,6 +71,8 @@ module Merge
       #  * `NORMAL` - NORMAL
       #  * `LOW` - LOW
       attr_reader :priority
+      # @return [DateTime] When the ticket was completed.
+      attr_reader :completed_at
       # @return [Hash{String => Object}]
       attr_reader :integration_params
       # @return [Hash{String => Object}]
@@ -103,22 +111,28 @@ module Merge
       # @param account [String] The account associated with the ticket.
       # @param contact [String] The contact associated with the ticket.
       # @param parent_ticket [String] The ticket's parent ticket.
+      # @param access_level [Merge::Ticketing::TicketAccessLevelEnum] The description of who is able to access a given ticket, or where access is
+      #  inherited from.
+      #  * `COMPANY` - COMPANY
+      #  * `PUBLIC` - PUBLIC
+      #  * `PRIVATE` - PRIVATE
+      #  * `COLLECTION` - COLLECTION
       # @param tags [Array<String>]
       # @param roles [Array<String>]
-      # @param completed_at [DateTime] When the ticket was completed.
       # @param ticket_url [String] The 3rd party url of the Ticket.
       # @param priority [Merge::Ticketing::PriorityEnum] The priority or urgency of the Ticket.
       #  * `URGENT` - URGENT
       #  * `HIGH` - HIGH
       #  * `NORMAL` - NORMAL
       #  * `LOW` - LOW
+      # @param completed_at [DateTime] When the ticket was completed.
       # @param integration_params [Hash{String => Object}]
       # @param linked_account_params [Hash{String => Object}]
       # @param remote_fields [Array<Merge::Ticketing::RemoteFieldRequest>]
       # @param additional_properties [OpenStruct] Additional properties unmapped to the current class definition
       # @return [Merge::Ticketing::PatchedTicketRequest]
       def initialize(name: OMIT, assignees: OMIT, assigned_teams: OMIT, creator: OMIT, due_date: OMIT, status: OMIT,
-                     description: OMIT, collections: OMIT, ticket_type: OMIT, account: OMIT, contact: OMIT, parent_ticket: OMIT, tags: OMIT, roles: OMIT, completed_at: OMIT, ticket_url: OMIT, priority: OMIT, integration_params: OMIT, linked_account_params: OMIT, remote_fields: OMIT, additional_properties: nil)
+                     description: OMIT, collections: OMIT, ticket_type: OMIT, account: OMIT, contact: OMIT, parent_ticket: OMIT, access_level: OMIT, tags: OMIT, roles: OMIT, ticket_url: OMIT, priority: OMIT, completed_at: OMIT, integration_params: OMIT, linked_account_params: OMIT, remote_fields: OMIT, additional_properties: nil)
         @name = name if name != OMIT
         @assignees = assignees if assignees != OMIT
         @assigned_teams = assigned_teams if assigned_teams != OMIT
@@ -131,11 +145,12 @@ module Merge
         @account = account if account != OMIT
         @contact = contact if contact != OMIT
         @parent_ticket = parent_ticket if parent_ticket != OMIT
+        @access_level = access_level if access_level != OMIT
         @tags = tags if tags != OMIT
         @roles = roles if roles != OMIT
-        @completed_at = completed_at if completed_at != OMIT
         @ticket_url = ticket_url if ticket_url != OMIT
         @priority = priority if priority != OMIT
+        @completed_at = completed_at if completed_at != OMIT
         @integration_params = integration_params if integration_params != OMIT
         @linked_account_params = linked_account_params if linked_account_params != OMIT
         @remote_fields = remote_fields if remote_fields != OMIT
@@ -153,11 +168,12 @@ module Merge
           "account": account,
           "contact": contact,
           "parent_ticket": parent_ticket,
+          "access_level": access_level,
           "tags": tags,
           "roles": roles,
-          "completed_at": completed_at,
           "ticket_url": ticket_url,
           "priority": priority,
+          "completed_at": completed_at,
           "integration_params": integration_params,
           "linked_account_params": linked_account_params,
           "remote_fields": remote_fields
@@ -185,11 +201,12 @@ module Merge
         account = parsed_json["account"]
         contact = parsed_json["contact"]
         parent_ticket = parsed_json["parent_ticket"]
+        access_level = parsed_json["access_level"]
         tags = parsed_json["tags"]
         roles = parsed_json["roles"]
-        completed_at = (DateTime.parse(parsed_json["completed_at"]) unless parsed_json["completed_at"].nil?)
         ticket_url = parsed_json["ticket_url"]
         priority = parsed_json["priority"]
+        completed_at = (DateTime.parse(parsed_json["completed_at"]) unless parsed_json["completed_at"].nil?)
         integration_params = parsed_json["integration_params"]
         linked_account_params = parsed_json["linked_account_params"]
         remote_fields = parsed_json["remote_fields"]&.map do |item|
@@ -209,11 +226,12 @@ module Merge
           account: account,
           contact: contact,
           parent_ticket: parent_ticket,
+          access_level: access_level,
           tags: tags,
           roles: roles,
-          completed_at: completed_at,
           ticket_url: ticket_url,
           priority: priority,
+          completed_at: completed_at,
           integration_params: integration_params,
           linked_account_params: linked_account_params,
           remote_fields: remote_fields,
@@ -247,11 +265,12 @@ module Merge
         obj.account&.is_a?(String) != false || raise("Passed value for field obj.account is not the expected type, validation failed.")
         obj.contact&.is_a?(String) != false || raise("Passed value for field obj.contact is not the expected type, validation failed.")
         obj.parent_ticket&.is_a?(String) != false || raise("Passed value for field obj.parent_ticket is not the expected type, validation failed.")
+        obj.access_level&.is_a?(Merge::Ticketing::TicketAccessLevelEnum) != false || raise("Passed value for field obj.access_level is not the expected type, validation failed.")
         obj.tags&.is_a?(Array) != false || raise("Passed value for field obj.tags is not the expected type, validation failed.")
         obj.roles&.is_a?(Array) != false || raise("Passed value for field obj.roles is not the expected type, validation failed.")
-        obj.completed_at&.is_a?(DateTime) != false || raise("Passed value for field obj.completed_at is not the expected type, validation failed.")
         obj.ticket_url&.is_a?(String) != false || raise("Passed value for field obj.ticket_url is not the expected type, validation failed.")
         obj.priority&.is_a?(Merge::Ticketing::PriorityEnum) != false || raise("Passed value for field obj.priority is not the expected type, validation failed.")
+        obj.completed_at&.is_a?(DateTime) != false || raise("Passed value for field obj.completed_at is not the expected type, validation failed.")
         obj.integration_params&.is_a?(Hash) != false || raise("Passed value for field obj.integration_params is not the expected type, validation failed.")
         obj.linked_account_params&.is_a?(Hash) != false || raise("Passed value for field obj.linked_account_params is not the expected type, validation failed.")
         obj.remote_fields&.is_a?(Array) != false || raise("Passed value for field obj.remote_fields is not the expected type, validation failed.")

data/lib/merge_ruby_client/ticketing/types/remote_field_class.rb

@@ -21,6 +21,8 @@ module Merge
       # @return [Boolean]
       attr_reader :is_custom
       # @return [Boolean]
+      attr_reader :is_common_model_field
+      # @return [Boolean]
       attr_reader :is_required
       # @return [Merge::Ticketing::FieldTypeEnum]
       attr_reader :field_type
@@ -43,6 +45,7 @@ module Merge
       # @param remote_key_name [String]
       # @param description [String]
       # @param is_custom [Boolean]
+      # @param is_common_model_field [Boolean]
       # @param is_required [Boolean]
       # @param field_type [Merge::Ticketing::FieldTypeEnum]
       # @param field_format [Merge::Ticketing::FieldFormatEnum]
@@ -51,12 +54,13 @@ module Merge
       # @param additional_properties [OpenStruct] Additional properties unmapped to the current class definition
       # @return [Merge::Ticketing::RemoteFieldClass]
       def initialize(id: OMIT, display_name: OMIT, remote_key_name: OMIT, description: OMIT, is_custom: OMIT,
-                     is_required: OMIT, field_type: OMIT, field_format: OMIT, field_choices: OMIT, item_schema: OMIT, additional_properties: nil)
+                     is_common_model_field: OMIT, is_required: OMIT, field_type: OMIT, field_format: OMIT, field_choices: OMIT, item_schema: OMIT, additional_properties: nil)
         @id = id if id != OMIT
         @display_name = display_name if display_name != OMIT
         @remote_key_name = remote_key_name if remote_key_name != OMIT
         @description = description if description != OMIT
         @is_custom = is_custom if is_custom != OMIT
+        @is_common_model_field = is_common_model_field if is_common_model_field != OMIT
         @is_required = is_required if is_required != OMIT
         @field_type = field_type if field_type != OMIT
         @field_format = field_format if field_format != OMIT
@@ -69,6 +73,7 @@ module Merge
           "remote_key_name": remote_key_name,
           "description": description,
           "is_custom": is_custom,
+          "is_common_model_field": is_common_model_field,
           "is_required": is_required,
           "field_type": field_type,
           "field_format": field_format,
@@ -91,6 +96,7 @@ module Merge
         remote_key_name = parsed_json["remote_key_name"]
         description = parsed_json["description"]
         is_custom = parsed_json["is_custom"]
+        is_common_model_field = parsed_json["is_common_model_field"]
         is_required = parsed_json["is_required"]
         field_type = parsed_json["field_type"]
         field_format = parsed_json["field_format"]
@@ -110,6 +116,7 @@ module Merge
           remote_key_name: remote_key_name,
           description: description,
           is_custom: is_custom,
+          is_common_model_field: is_common_model_field,
           is_required: is_required,
           field_type: field_type,
           field_format: field_format,
@@ -138,6 +145,7 @@ module Merge
         obj.remote_key_name&.is_a?(String) != false || raise("Passed value for field obj.remote_key_name is not the expected type, validation failed.")
         obj.description&.is_a?(String) != false || raise("Passed value for field obj.description is not the expected type, validation failed.")
         obj.is_custom&.is_a?(Boolean) != false || raise("Passed value for field obj.is_custom is not the expected type, validation failed.")
+        obj.is_common_model_field&.is_a?(Boolean) != false || raise("Passed value for field obj.is_common_model_field is not the expected type, validation failed.")
         obj.is_required&.is_a?(Boolean) != false || raise("Passed value for field obj.is_required is not the expected type, validation failed.")
         obj.field_type&.is_a?(Merge::Ticketing::FieldTypeEnum) != false || raise("Passed value for field obj.field_type is not the expected type, validation failed.")
         obj.field_format&.is_a?(Merge::Ticketing::FieldFormatEnum) != false || raise("Passed value for field obj.field_format is not the expected type, validation failed.")

data/lib/merge_ruby_client/ticketing/types/ticket.rb

@@ -10,6 +10,7 @@ require_relative "ticket_account"
 require_relative "ticket_contact"
 require_relative "ticket_parent_ticket"
 require_relative "ticket_attachments_item"
+require_relative "ticket_access_level_enum"
 require_relative "priority_enum"
 require_relative "remote_data"
 require_relative "remote_field"
@@ -70,6 +71,13 @@ module Merge
       attr_reader :parent_ticket
       # @return [Array<Merge::Ticketing::TicketAttachmentsItem>]
       attr_reader :attachments
+      # @return [Merge::Ticketing::TicketAccessLevelEnum] The description of who is able to access a given ticket, or where access is
+      #  inherited from.
+      #  * `COMPANY` - COMPANY
+      #  * `PUBLIC` - PUBLIC
+      #  * `PRIVATE` - PRIVATE
+      #  * `COLLECTION` - COLLECTION
+      attr_reader :access_level
       # @return [Array<String>]
       attr_reader :tags
       # @return [Array<String>]
@@ -136,6 +144,12 @@ module Merge
       # @param contact [Merge::Ticketing::TicketContact] The contact associated with the ticket.
       # @param parent_ticket [Merge::Ticketing::TicketParentTicket] The ticket's parent ticket.
       # @param attachments [Array<Merge::Ticketing::TicketAttachmentsItem>]
+      # @param access_level [Merge::Ticketing::TicketAccessLevelEnum] The description of who is able to access a given ticket, or where access is
+      #  inherited from.
+      #  * `COMPANY` - COMPANY
+      #  * `PUBLIC` - PUBLIC
+      #  * `PRIVATE` - PRIVATE
+      #  * `COLLECTION` - COLLECTION
       # @param tags [Array<String>]
       # @param roles [Array<String>]
       # @param remote_created_at [DateTime] When the third party's ticket was created.
@@ -157,7 +171,7 @@ module Merge
       # @param additional_properties [OpenStruct] Additional properties unmapped to the current class definition
       # @return [Merge::Ticketing::Ticket]
       def initialize(id: OMIT, remote_id: OMIT, created_at: OMIT, modified_at: OMIT, name: OMIT, assignees: OMIT,
-                     assigned_teams: OMIT, creator: OMIT, due_date: OMIT, status: OMIT, description: OMIT, collections: OMIT, ticket_type: OMIT, account: OMIT, contact: OMIT, parent_ticket: OMIT, attachments: OMIT, tags: OMIT, roles: OMIT, remote_created_at: OMIT, remote_updated_at: OMIT, completed_at: OMIT, remote_was_deleted: OMIT, ticket_url: OMIT, priority: OMIT, field_mappings: OMIT, remote_data: OMIT, remote_fields: OMIT, additional_properties: nil)
+                     assigned_teams: OMIT, creator: OMIT, due_date: OMIT, status: OMIT, description: OMIT, collections: OMIT, ticket_type: OMIT, account: OMIT, contact: OMIT, parent_ticket: OMIT, attachments: OMIT, access_level: OMIT, tags: OMIT, roles: OMIT, remote_created_at: OMIT, remote_updated_at: OMIT, completed_at: OMIT, remote_was_deleted: OMIT, ticket_url: OMIT, priority: OMIT, field_mappings: OMIT, remote_data: OMIT, remote_fields: OMIT, additional_properties: nil)
         @id = id if id != OMIT
         @remote_id = remote_id if remote_id != OMIT
         @created_at = created_at if created_at != OMIT
@@ -175,6 +189,7 @@ module Merge
         @contact = contact if contact != OMIT
         @parent_ticket = parent_ticket if parent_ticket != OMIT
         @attachments = attachments if attachments != OMIT
+        @access_level = access_level if access_level != OMIT
         @tags = tags if tags != OMIT
         @roles = roles if roles != OMIT
         @remote_created_at = remote_created_at if remote_created_at != OMIT
@@ -205,6 +220,7 @@ module Merge
           "contact": contact,
           "parent_ticket": parent_ticket,
           "attachments": attachments,
+          "access_level": access_level,
           "tags": tags,
           "roles": roles,
           "remote_created_at": remote_created_at,
@@ -277,6 +293,7 @@ module Merge
           item = item.to_json
           Merge::Ticketing::TicketAttachmentsItem.from_json(json_object: item)
         end
+        access_level = parsed_json["access_level"]
         tags = parsed_json["tags"]
         roles = parsed_json["roles"]
         remote_created_at = unless parsed_json["remote_created_at"].nil?
@@ -316,6 +333,7 @@ module Merge
           contact: contact,
           parent_ticket: parent_ticket,
           attachments: attachments,
+          access_level: access_level,
           tags: tags,
           roles: roles,
           remote_created_at: remote_created_at,
@@ -362,6 +380,7 @@ module Merge
         obj.contact.nil? || Merge::Ticketing::TicketContact.validate_raw(obj: obj.contact)
         obj.parent_ticket.nil? || Merge::Ticketing::TicketParentTicket.validate_raw(obj: obj.parent_ticket)
         obj.attachments&.is_a?(Array) != false || raise("Passed value for field obj.attachments is not the expected type, validation failed.")
+        obj.access_level&.is_a?(Merge::Ticketing::TicketAccessLevelEnum) != false || raise("Passed value for field obj.access_level is not the expected type, validation failed.")
         obj.tags&.is_a?(Array) != false || raise("Passed value for field obj.tags is not the expected type, validation failed.")
         obj.roles&.is_a?(Array) != false || raise("Passed value for field obj.roles is not the expected type, validation failed.")
         obj.remote_created_at&.is_a?(DateTime) != false || raise("Passed value for field obj.remote_created_at is not the expected type, validation failed.")

data/lib/merge_ruby_client/ticketing/types/ticket_access_level_enum.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Merge
+  module Ticketing
+    # * `COMPANY` - COMPANY
+    #  * `PUBLIC` - PUBLIC
+    #  * `PRIVATE` - PRIVATE
+    #  * `COLLECTION` - COLLECTION
+    class TicketAccessLevelEnum
+      COMPANY = "COMPANY"
+      PUBLIC = "PUBLIC"
+      PRIVATE = "PRIVATE"
+      COLLECTION = "COLLECTION"
+    end
+  end
+end

data/lib/merge_ruby_client/ticketing/types/ticket_request.rb

@@ -10,6 +10,7 @@ require_relative "ticket_request_account"
 require_relative "ticket_request_contact"
 require_relative "ticket_request_parent_ticket"
 require_relative "ticket_request_attachments_item"
+require_relative "ticket_access_level_enum"
 require_relative "priority_enum"
 require_relative "remote_field_request"
 require "ostruct"
@@ -61,6 +62,13 @@ module Merge
       attr_reader :parent_ticket
       # @return [Array<Merge::Ticketing::TicketRequestAttachmentsItem>]
       attr_reader :attachments
+      # @return [Merge::Ticketing::TicketAccessLevelEnum] The description of who is able to access a given ticket, or where access is
+      #  inherited from.
+      #  * `COMPANY` - COMPANY
+      #  * `PUBLIC` - PUBLIC
+      #  * `PRIVATE` - PRIVATE
+      #  * `COLLECTION` - COLLECTION
+      attr_reader :access_level
       # @return [Array<String>]
       attr_reader :tags
       # @return [Array<String>]
@@ -114,6 +122,12 @@ module Merge
       # @param contact [Merge::Ticketing::TicketRequestContact] The contact associated with the ticket.
       # @param parent_ticket [Merge::Ticketing::TicketRequestParentTicket] The ticket's parent ticket.
       # @param attachments [Array<Merge::Ticketing::TicketRequestAttachmentsItem>]
+      # @param access_level [Merge::Ticketing::TicketAccessLevelEnum] The description of who is able to access a given ticket, or where access is
+      #  inherited from.
+      #  * `COMPANY` - COMPANY
+      #  * `PUBLIC` - PUBLIC
+      #  * `PRIVATE` - PRIVATE
+      #  * `COLLECTION` - COLLECTION
       # @param tags [Array<String>]
       # @param roles [Array<String>]
       # @param completed_at [DateTime] When the ticket was completed.
@@ -129,7 +143,7 @@ module Merge
       # @param additional_properties [OpenStruct] Additional properties unmapped to the current class definition
       # @return [Merge::Ticketing::TicketRequest]
       def initialize(name: OMIT, assignees: OMIT, assigned_teams: OMIT, creator: OMIT, due_date: OMIT, status: OMIT,
-                     description: OMIT, collections: OMIT, ticket_type: OMIT, account: OMIT, contact: OMIT, parent_ticket: OMIT, attachments: OMIT, tags: OMIT, roles: OMIT, completed_at: OMIT, ticket_url: OMIT, priority: OMIT, integration_params: OMIT, linked_account_params: OMIT, remote_fields: OMIT, additional_properties: nil)
+                     description: OMIT, collections: OMIT, ticket_type: OMIT, account: OMIT, contact: OMIT, parent_ticket: OMIT, attachments: OMIT, access_level: OMIT, tags: OMIT, roles: OMIT, completed_at: OMIT, ticket_url: OMIT, priority: OMIT, integration_params: OMIT, linked_account_params: OMIT, remote_fields: OMIT, additional_properties: nil)
         @name = name if name != OMIT
         @assignees = assignees if assignees != OMIT
         @assigned_teams = assigned_teams if assigned_teams != OMIT
@@ -143,6 +157,7 @@ module Merge
         @contact = contact if contact != OMIT
         @parent_ticket = parent_ticket if parent_ticket != OMIT
         @attachments = attachments if attachments != OMIT
+        @access_level = access_level if access_level != OMIT
         @tags = tags if tags != OMIT
         @roles = roles if roles != OMIT
         @completed_at = completed_at if completed_at != OMIT
@@ -166,6 +181,7 @@ module Merge
           "contact": contact,
           "parent_ticket": parent_ticket,
           "attachments": attachments,
+          "access_level": access_level,
           "tags": tags,
           "roles": roles,
           "completed_at": completed_at,
@@ -231,6 +247,7 @@ module Merge
           item = item.to_json
           Merge::Ticketing::TicketRequestAttachmentsItem.from_json(json_object: item)
         end
+        access_level = parsed_json["access_level"]
         tags = parsed_json["tags"]
         roles = parsed_json["roles"]
         completed_at = (DateTime.parse(parsed_json["completed_at"]) unless parsed_json["completed_at"].nil?)
@@ -256,6 +273,7 @@ module Merge
           contact: contact,
           parent_ticket: parent_ticket,
           attachments: attachments,
+          access_level: access_level,
           tags: tags,
           roles: roles,
           completed_at: completed_at,
@@ -295,6 +313,7 @@ module Merge
         obj.contact.nil? || Merge::Ticketing::TicketRequestContact.validate_raw(obj: obj.contact)
         obj.parent_ticket.nil? || Merge::Ticketing::TicketRequestParentTicket.validate_raw(obj: obj.parent_ticket)
         obj.attachments&.is_a?(Array) != false || raise("Passed value for field obj.attachments is not the expected type, validation failed.")
+        obj.access_level&.is_a?(Merge::Ticketing::TicketAccessLevelEnum) != false || raise("Passed value for field obj.access_level is not the expected type, validation failed.")
         obj.tags&.is_a?(Array) != false || raise("Passed value for field obj.tags is not the expected type, validation failed.")
         obj.roles&.is_a?(Array) != false || raise("Passed value for field obj.roles is not the expected type, validation failed.")
         obj.completed_at&.is_a?(DateTime) != false || raise("Passed value for field obj.completed_at is not the expected type, validation failed.")

data/lib/merge_ruby_client/ticketing/users/client.rb

@@ -51,7 +51,7 @@ module Merge
       #    environment: Merge::Environment::PRODUCTION,
       #    api_key: "YOUR_AUTH_TOKEN"
       #  )
-      #  api.ticketing.users.list
+      #  api.ticketing.users.list(cursor: "cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw")
       def list(created_after: nil, created_before: nil, cursor: nil, email_address: nil, expand: nil,
                include_deleted_data: nil, include_remote_data: nil, include_shell_data: nil, modified_after: nil, modified_before: nil, page_size: nil, remote_id: nil, team: nil, request_options: nil)
         response = @request_client.conn.get do |req|
@@ -171,7 +171,7 @@ module Merge
       #    environment: Merge::Environment::PRODUCTION,
       #    api_key: "YOUR_AUTH_TOKEN"
       #  )
-      #  api.ticketing.users.list
+      #  api.ticketing.users.list(cursor: "cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw")
       def list(created_after: nil, created_before: nil, cursor: nil, email_address: nil, expand: nil,
                include_deleted_data: nil, include_remote_data: nil, include_shell_data: nil, modified_after: nil, modified_before: nil, page_size: nil, remote_id: nil, team: nil, request_options: nil)
         Async do

data/lib/merge_ruby_client.rb

@@ -3,25 +3,25 @@
 require_relative "environment"
 require_relative "types_export"
 require_relative "requests"
-require_relative "merge_ruby_client/crm/client"
 require_relative "merge_ruby_client/ats/client"
-require_relative "merge_ruby_client/hris/client"
+require_relative "merge_ruby_client/crm/client"
 require_relative "merge_ruby_client/filestorage/client"
 require_relative "merge_ruby_client/ticketing/client"
+require_relative "merge_ruby_client/hris/client"
 require_relative "merge_ruby_client/accounting/client"
 
 module Merge
   class Client
-    # @return [Merge::Crm::Client]
-    attr_reader :crm
     # @return [Merge::Ats::Client]
     attr_reader :ats
-    # @return [Merge::Hris::Client]
-    attr_reader :hris
+    # @return [Merge::Crm::Client]
+    attr_reader :crm
     # @return [Merge::Filestorage::Client]
     attr_reader :filestorage
     # @return [Merge::Ticketing::Client]
     attr_reader :ticketing
+    # @return [Merge::Hris::Client]
+    attr_reader :hris
     # @return [Merge::Accounting::Client]
     attr_reader :accounting
 
@@ -42,26 +42,26 @@ module Merge
         api_key: api_key,
         account_token: account_token
       )
-      @crm = Merge::Crm::Client.new(request_client: @request_client)
       @ats = Merge::Ats::Client.new(request_client: @request_client)
-      @hris = Merge::Hris::Client.new(request_client: @request_client)
+      @crm = Merge::Crm::Client.new(request_client: @request_client)
       @filestorage = Merge::Filestorage::Client.new(request_client: @request_client)
       @ticketing = Merge::Ticketing::Client.new(request_client: @request_client)
+      @hris = Merge::Hris::Client.new(request_client: @request_client)
       @accounting = Merge::Accounting::Client.new(request_client: @request_client)
     end
   end
 
   class AsyncClient
-    # @return [Merge::Crm::AsyncClient]
-    attr_reader :crm
     # @return [Merge::Ats::AsyncClient]
     attr_reader :ats
-    # @return [Merge::Hris::AsyncClient]
-    attr_reader :hris
+    # @return [Merge::Crm::AsyncClient]
+    attr_reader :crm
     # @return [Merge::Filestorage::AsyncClient]
     attr_reader :filestorage
     # @return [Merge::Ticketing::AsyncClient]
     attr_reader :ticketing
+    # @return [Merge::Hris::AsyncClient]
+    attr_reader :hris
     # @return [Merge::Accounting::AsyncClient]
     attr_reader :accounting
 
@@ -82,11 +82,11 @@ module Merge
         api_key: api_key,
         account_token: account_token
       )
-      @crm = Merge::Crm::AsyncClient.new(request_client: @async_request_client)
       @ats = Merge::Ats::AsyncClient.new(request_client: @async_request_client)
-      @hris = Merge::Hris::AsyncClient.new(request_client: @async_request_client)
+      @crm = Merge::Crm::AsyncClient.new(request_client: @async_request_client)
       @filestorage = Merge::Filestorage::AsyncClient.new(request_client: @async_request_client)
       @ticketing = Merge::Ticketing::AsyncClient.new(request_client: @async_request_client)
+      @hris = Merge::Hris::AsyncClient.new(request_client: @async_request_client)
       @accounting = Merge::Accounting::AsyncClient.new(request_client: @async_request_client)
     end
   end

data/lib/requests.rb

@@ -48,7 +48,7 @@ module Merge
 
     # @return [Hash{String => String}]
     def get_headers
-      headers = { "X-Fern-Language": "Ruby", "X-Fern-SDK-Name": "merge_ruby_client", "X-Fern-SDK-Version": "1.1.0" }
+      headers = { "X-Fern-Language": "Ruby", "X-Fern-SDK-Name": "merge_ruby_client", "X-Fern-SDK-Version": "2.1.0" }
       headers["Authorization"] = ((@api_key.is_a? Method) ? @api_key.call : @api_key) unless @api_key.nil?
       headers
     end
@@ -96,7 +96,7 @@ module Merge
 
     # @return [Hash{String => String}]
     def get_headers
-      headers = { "X-Fern-Language": "Ruby", "X-Fern-SDK-Name": "merge_ruby_client", "X-Fern-SDK-Version": "1.1.0" }
+      headers = { "X-Fern-Language": "Ruby", "X-Fern-SDK-Name": "merge_ruby_client", "X-Fern-SDK-Version": "2.1.0" }
       headers["Authorization"] = ((@api_key.is_a? Method) ? @api_key.call : @api_key) unless @api_key.nil?
       headers
     end