voiceml 0.9.2 → 0.9.3

data/lib/voiceml/resources/pricing.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'uri'
+require_relative "base"
 
 require_relative '../models/pricing'
 
@@ -42,6 +42,8 @@ module VoiceML
 
   # `.../Countries` list + per-country fetch. `model` is the fetch body class.
   class PricingCountriesResource
+    include V1Pages
+    include FieldMapping
     def initialize(transport, base_path, model)
       @transport = transport
       @base      = base_path
@@ -55,25 +57,29 @@ module VoiceML
     end
 
     def fetch(iso_country)
-      @model.from_hash(@transport.request(:get, "#{@base}/#{iso_country}"))
+      @model.from_hash(@transport.request(:get, "#{@base}/#{encode_path_segment(iso_country)}"))
     end
   end
 
   # `/v1/Voice/Numbers/{Number}` — single-number fetch.
   class PricingV1VoiceNumbersResource
+    include V1Pages
+    include FieldMapping
     def initialize(transport)
       @transport = transport
     end
 
     def fetch(number)
       PricingVoiceNumber.from_hash(
-        @transport.request(:get, "/v1/Voice/Numbers/#{URI.encode_www_form_component(number)}")
+        @transport.request(:get, "/v1/Voice/Numbers/#{encode_path_segment(number)}")
       )
     end
   end
 
   # `/v2/Voice/Numbers/{Destination}` — origin-aware single-number fetch.
   class PricingV2VoiceNumbersResource
+    include V1Pages
+    include FieldMapping
     def initialize(transport)
       @transport = transport
     end
@@ -82,7 +88,7 @@ module VoiceML
       params = {}
       params['OriginationNumber'] = origination_number unless origination_number.nil?
       PricingVoiceNumberV2.from_hash(
-        @transport.request(:get, "/v2/Voice/Numbers/#{URI.encode_www_form_component(destination_number)}",
+        @transport.request(:get, "/v2/Voice/Numbers/#{encode_path_segment(destination_number)}",
                            params: params)
       )
     end
@@ -90,6 +96,8 @@ module VoiceML
 
   # `/v2/Trunking/Numbers/{Destination}` — origin-aware single-number fetch.
   class PricingV2TrunkingNumbersResource
+    include V1Pages
+    include FieldMapping
     def initialize(transport)
       @transport = transport
     end
@@ -98,7 +106,7 @@ module VoiceML
       params = {}
       params['OriginationNumber'] = origination_number unless origination_number.nil?
       PricingTrunkingNumber.from_hash(
-        @transport.request(:get, "/v2/Trunking/Numbers/#{URI.encode_www_form_component(destination_number)}",
+        @transport.request(:get, "/v2/Trunking/Numbers/#{encode_path_segment(destination_number)}",
                            params: params)
       )
     end

data/lib/voiceml/resources/queues.rb

@@ -47,12 +47,13 @@ module VoiceML
     def each(**kwargs, &block)
       return enum_for(:each, **kwargs) unless block
 
-      page_num = kwargs.delete(:page) || 0
+      page = list(**kwargs)
       loop do
-        chunk = list(**kwargs, page: page_num)
-        chunk.queues.each(&block)
-        break if chunk.next_page_uri.nil? || chunk.next_page_uri.empty? || chunk.queues.empty?
-        page_num += 1
+        page.queues.each(&block)
+        nxt = next_page(page)
+        break if nxt.nil?
+
+        page = nxt
       end
     end
 

data/lib/voiceml/resources/recordings.rb

@@ -2,6 +2,7 @@
 
 require_relative 'base'
 require_relative '../models/recordings'
+require_relative '../models/transcriptions'
 
 module VoiceML
   # Account-scoped `/Recordings` operations.
@@ -26,6 +27,15 @@ module VoiceML
       'IncludeSoftDeleted' => :include_soft_deleted
     }.freeze
 
+    LIST_TRANSCRIPTIONS_FIELDS = {
+      'DateCreated'  => :date_created,
+      'DateCreated<' => :date_created_lt,
+      'DateCreated>' => :date_created_gt,
+      'Page'         => :page,
+      'PageSize'     => :page_size,
+      'PageToken'    => :page_token
+    }.freeze
+
     # @return [VoiceML::RecordingList]
     def list(**kwargs)
       RecordingList.from_hash(
@@ -38,12 +48,13 @@ module VoiceML
     def each(**kwargs, &block)
       return enum_for(:each, **kwargs) unless block
 
-      page_num = kwargs.delete(:page) || 0
+      page = list(**kwargs)
       loop do
-        chunk = list(**kwargs, page: page_num)
-        chunk.recordings.each(&block)
-        break if chunk.next_page_uri.nil? || chunk.next_page_uri.empty? || chunk.recordings.empty?
-        page_num += 1
+        page.recordings.each(&block)
+        nxt = next_page(page)
+        break if nxt.nil?
+
+        page = nxt
       end
     end
 
@@ -85,5 +96,28 @@ module VoiceML
       @transport.request(:delete, path('Recordings', recording_sid))
       nil
     end
+
+    # --- Recording-scoped stored transcriptions ---
+
+    # @return [VoiceML::TranscriptionList]
+    def list_transcriptions(recording_sid, **kwargs)
+      TranscriptionList.from_hash(
+        @transport.request(:get, path('Recordings', recording_sid, 'Transcriptions'),
+                           params: form_params(LIST_TRANSCRIPTIONS_FIELDS, kwargs))
+      )
+    end
+
+    # @return [VoiceML::Transcription]
+    def get_transcription(recording_sid, sid)
+      Transcription.from_hash(
+        @transport.request(:get, path('Recordings', recording_sid, 'Transcriptions', sid))
+      )
+    end
+
+    # @return [nil]
+    def delete_transcription(recording_sid, sid)
+      @transport.request(:delete, path('Recordings', recording_sid, 'Transcriptions', sid))
+      nil
+    end
   end
 end

data/lib/voiceml/resources/routes_v2.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative 'base'
+
 require_relative '../models/routes_v2'
 
 module VoiceML
@@ -16,38 +18,42 @@ module VoiceML
   # Operations on /v2/SipDomains/{SipDomain}. Keyed by domain name; account
   # is resolved from HTTP Basic auth.
   class RoutesV2SipDomainsResource
+    include V1Pages
+    include FieldMapping
     def initialize(transport)
       @transport = transport
     end
 
     def fetch(domain_name)
-      RoutesV2SipDomain.from_hash(@transport.request(:get, "/v2/SipDomains/#{domain_name}"))
+      RoutesV2SipDomain.from_hash(@transport.request(:get, "/v2/SipDomains/#{encode_path_segment(domain_name)}"))
     end
 
     def update(domain_name, voice_region: nil, friendly_name: nil)
       form = {}
       form['VoiceRegion'] = voice_region unless voice_region.nil?
       form['FriendlyName'] = friendly_name unless friendly_name.nil?
-      RoutesV2SipDomain.from_hash(@transport.request(:post, "/v2/SipDomains/#{domain_name}", form: form))
+      RoutesV2SipDomain.from_hash(@transport.request(:post, "/v2/SipDomains/#{encode_path_segment(domain_name)}", form: form))
     end
   end
 
   # Operations on /v2/PhoneNumbers/{PhoneNumber}. Keyed by E.164 phone number or
   # its PN sid; account resolved from HTTP Basic auth.
   class RoutesV2PhoneNumbersResource
+    include V1Pages
+    include FieldMapping
     def initialize(transport)
       @transport = transport
     end
 
     def fetch(phone_number)
-      RoutesV2PhoneNumber.from_hash(@transport.request(:get, "/v2/PhoneNumbers/#{phone_number}"))
+      RoutesV2PhoneNumber.from_hash(@transport.request(:get, "/v2/PhoneNumbers/#{encode_path_segment(phone_number)}"))
     end
 
     def update(phone_number, voice_region: nil, friendly_name: nil)
       form = {}
       form['VoiceRegion'] = voice_region unless voice_region.nil?
       form['FriendlyName'] = friendly_name unless friendly_name.nil?
-      RoutesV2PhoneNumber.from_hash(@transport.request(:post, "/v2/PhoneNumbers/#{phone_number}", form: form))
+      RoutesV2PhoneNumber.from_hash(@transport.request(:post, "/v2/PhoneNumbers/#{encode_path_segment(phone_number)}", form: form))
     end
   end
 end

data/lib/voiceml/resources/sip.rb

@@ -2,16 +2,18 @@
 
 require_relative 'base'
 require_relative '../models/sip'
+require_relative '../models/sip_registrations'
 
 module VoiceML
   # `client.sip` — top-level SIP Trunking holder.
   class SipResource
-    attr_reader :domains, :credential_lists, :ip_access_control_lists
+    attr_reader :domains, :credential_lists, :ip_access_control_lists, :registrations
 
     def initialize(transport)
       @domains = SipDomainsResource.new(transport)
       @credential_lists = SipCredentialListsResource.new(transport)
       @ip_access_control_lists = SipIpAccessControlListsResource.new(transport)
+      @registrations = SipRegistrationsResource.new(transport)
     end
   end
 
@@ -33,9 +35,10 @@ module VoiceML
     }.freeze
 
     PAGE_FIELDS = { 'Page' => :page, 'PageSize' => :page_size, 'PageToken' => :page_token }.freeze
+    LIST_FIELDS = { 'FriendlyName' => :friendly_name, 'Page' => :page, 'PageSize' => :page_size, 'PageToken' => :page_token }.freeze
 
     def list(**kwargs)
-      SipDomainList.new(@transport.request(:get, path('SIP', 'Domains'), params: form_params(PAGE_FIELDS, kwargs)))
+      SipDomainList.new(@transport.request(:get, path('SIP', 'Domains'), params: form_params(LIST_FIELDS, kwargs)))
     end
 
     def create(domain_name:, **kwargs)
@@ -130,12 +133,14 @@ module VoiceML
   # /SIP/CredentialLists + /Credentials sub-resource.
   class SipCredentialListsResource < BaseResource
     PAGE_FIELDS = { 'Page' => :page, 'PageSize' => :page_size, 'PageToken' => :page_token }.freeze
+    LIST_FIELDS = { 'FriendlyName' => :friendly_name, 'Page' => :page, 'PageSize' => :page_size, 'PageToken' => :page_token }.freeze
 
     def list(**kwargs)
-      SipCredentialListList.new(@transport.request(:get, path('SIP', 'CredentialLists'), params: form_params(PAGE_FIELDS, kwargs)))
+      SipCredentialListList.new(@transport.request(:get, path('SIP', 'CredentialLists'), params: form_params(LIST_FIELDS, kwargs)))
     end
-    def create(friendly_name:)
-      SipCredentialList.from_hash(@transport.request(:post, path('SIP', 'CredentialLists'), form: { 'FriendlyName' => friendly_name }))
+    def create(friendly_name: nil)
+      form = friendly_name.nil? ? {} : { 'FriendlyName' => friendly_name }
+      SipCredentialList.from_hash(@transport.request(:post, path('SIP', 'CredentialLists'), form: form))
     end
     def fetch(credential_list_sid)
       SipCredentialList.from_hash(@transport.request(:get, path('SIP', 'CredentialLists', credential_list_sid)))
@@ -158,8 +163,9 @@ module VoiceML
     def fetch_credential(credential_list_sid, credential_sid)
       SipCredential.from_hash(@transport.request(:get, path('SIP', 'CredentialLists', credential_list_sid, 'Credentials', credential_sid)))
     end
-    def update_credential(credential_list_sid, credential_sid, password:)
-      SipCredential.from_hash(@transport.request(:post, path('SIP', 'CredentialLists', credential_list_sid, 'Credentials', credential_sid), form: { 'Password' => password }))
+    def update_credential(credential_list_sid, credential_sid, password: nil)
+      form = password.nil? ? {} : { 'Password' => password }
+      SipCredential.from_hash(@transport.request(:post, path('SIP', 'CredentialLists', credential_list_sid, 'Credentials', credential_sid), form: form))
     end
     def delete_credential(credential_list_sid, credential_sid)
       @transport.request(:delete, path('SIP', 'CredentialLists', credential_list_sid, 'Credentials', credential_sid)); nil
@@ -169,13 +175,15 @@ module VoiceML
   # /SIP/IpAccessControlLists + /IpAddresses sub-resource.
   class SipIpAccessControlListsResource < BaseResource
     PAGE_FIELDS = { 'Page' => :page, 'PageSize' => :page_size, 'PageToken' => :page_token }.freeze
+    LIST_FIELDS = { 'FriendlyName' => :friendly_name, 'Page' => :page, 'PageSize' => :page_size, 'PageToken' => :page_token }.freeze
     IP_FIELDS = { 'FriendlyName' => :friendly_name, 'IpAddress' => :ip_address, 'CidrPrefixLength' => :cidr_prefix_length }.freeze
 
     def list(**kwargs)
-      SipIpAccessControlListList.new(@transport.request(:get, path('SIP', 'IpAccessControlLists'), params: form_params(PAGE_FIELDS, kwargs)))
+      SipIpAccessControlListList.new(@transport.request(:get, path('SIP', 'IpAccessControlLists'), params: form_params(LIST_FIELDS, kwargs)))
     end
-    def create(friendly_name:)
-      SipIpAccessControlList.from_hash(@transport.request(:post, path('SIP', 'IpAccessControlLists'), form: { 'FriendlyName' => friendly_name }))
+    def create(friendly_name: nil)
+      form = friendly_name.nil? ? {} : { 'FriendlyName' => friendly_name }
+      SipIpAccessControlList.from_hash(@transport.request(:post, path('SIP', 'IpAccessControlLists'), form: form))
     end
     def fetch(acl_sid)
       SipIpAccessControlList.from_hash(@transport.request(:get, path('SIP', 'IpAccessControlLists', acl_sid)))
@@ -190,7 +198,7 @@ module VoiceML
 
     # /IpAddresses sub-resource
     def list_ip_addresses(acl_sid, **kwargs)
-      SipIpAddressList.new(@transport.request(:get, path('SIP', 'IpAccessControlLists', acl_sid, 'IpAddresses'), params: form_params(PAGE_FIELDS, kwargs)))
+      SipIpAddressList.new(@transport.request(:get, path('SIP', 'IpAccessControlLists', acl_sid, 'IpAddresses'), params: form_params(LIST_FIELDS, kwargs)))
     end
     def create_ip_address(acl_sid, friendly_name:, ip_address:, cidr_prefix_length: nil)
       form = { 'FriendlyName' => friendly_name, 'IpAddress' => ip_address }
@@ -207,4 +215,15 @@ module VoiceML
       @transport.request(:delete, path('SIP', 'IpAccessControlLists', acl_sid, 'IpAddresses', ip_address_sid)); nil
     end
   end
+
+  # /SIP/Registrations — live registrations on the tenant's SIP Domains.
+  class SipRegistrationsResource < BaseResource
+    LIST_FIELDS = { 'Page' => :page, 'PageSize' => :page_size, 'PageToken' => :page_token }.freeze
+
+    # @return [VoiceML::SipRegistrationList]
+    def list(**kwargs)
+      SipRegistrationList.new(@transport.request(:get, path('SIP', 'Registrations'),
+                                                 params: form_params(LIST_FIELDS, kwargs)))
+    end
+  end
 end

data/lib/voiceml/resources/transcriptions.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require_relative 'base'
+require_relative '../models/transcriptions'
+
+module VoiceML
+  # Operations on the account-wide `/Transcriptions` — stored transcriptions
+  # across all recordings. Per-recording access lives on
+  # {VoiceML::RecordingsResource}; live-call start/stop on
+  # {VoiceML::CallsResource}.
+  class TranscriptionsResource < BaseResource
+    LIST_FIELDS = {
+      'DateCreated'  => :date_created,
+      'DateCreated<' => :date_created_lt,
+      'DateCreated>' => :date_created_gt,
+      'Page'         => :page,
+      'PageSize'     => :page_size,
+      'PageToken'    => :page_token
+    }.freeze
+
+    # @return [VoiceML::TranscriptionList]
+    def list(**kwargs)
+      TranscriptionList.from_hash(
+        @transport.request(:get, path('Transcriptions'),
+                           params: form_params(LIST_FIELDS, kwargs))
+      )
+    end
+
+    # @return [VoiceML::Transcription]
+    def fetch(sid)
+      Transcription.from_hash(@transport.request(:get, path('Transcriptions', sid)))
+    end
+
+    # @return [nil]
+    def delete(sid)
+      @transport.request(:delete, path('Transcriptions', sid))
+      nil
+    end
+  end
+end

data/lib/voiceml/resources/usage_records.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+require_relative 'base'
+require_relative '../models/usage_records'
+
+module VoiceML
+  # Operations on `/Usage/Records` — usage buckets over the account, with the
+  # nine fixed windows (`AllTime`, `Daily`, `LastMonth`, `Monthly`,
+  # `ThisMonth`, `Today`, `Yearly`, `Yesterday`) the API offers.
+  class UsageRecordsResource < BaseResource
+    LIST_FIELDS = {
+      'Category'          => :category,
+      'StartDate'         => :start_date,
+      'EndDate'           => :end_date,
+      'IncludeSubaccounts' => :include_subaccounts,
+      'Page'              => :page,
+      'PageSize'          => :page_size,
+      'PageToken'         => :page_token
+    }.freeze
+
+    WINDOWS = {
+      all_time: 'AllTime',
+      daily: 'Daily',
+      last_month: 'LastMonth',
+      monthly: 'Monthly',
+      this_month: 'ThisMonth',
+      today: 'Today',
+      yearly: 'Yearly',
+      yesterday: 'Yesterday'
+    }.freeze
+
+    # @return [VoiceML::UsageRecordList]
+    def list(**kwargs)
+      UsageRecordList.from_hash(
+        @transport.request(:get, path('Usage', 'Records'),
+                           params: form_params(LIST_FIELDS, kwargs))
+      )
+    end
+
+    WINDOWS.each do |ruby_name, segment|
+      # @!method list_all_time(**kwargs)
+      # @return [VoiceML::UsageRecordList]
+      define_method("list_#{ruby_name}") do |**kwargs|
+        UsageRecordList.from_hash(
+          @transport.request(:get, path('Usage', 'Records', segment),
+                             params: form_params(LIST_FIELDS, kwargs))
+        )
+      end
+    end
+  end
+end

data/lib/voiceml/resources/voice_v1.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative 'base'
+
 require_relative '../models/voice_v1'
 
 module VoiceML
@@ -20,6 +22,8 @@ module VoiceML
 
   # /v1/IpRecords + /v1/IpRecords/{Sid}
   class VoiceV1IpRecordsResource
+    include V1Pages
+    include FieldMapping
     def initialize(transport)
       @transport = transport
     end
@@ -38,23 +42,25 @@ module VoiceML
     end
 
     def fetch(sid)
-      VoiceV1IpRecord.from_hash(@transport.request(:get, "/v1/IpRecords/#{sid}"))
+      VoiceV1IpRecord.from_hash(@transport.request(:get, "/v1/IpRecords/#{encode_path_segment(sid)}"))
     end
 
     def update(sid, friendly_name: nil)
       form = {}
       form['FriendlyName'] = friendly_name unless friendly_name.nil?
-      VoiceV1IpRecord.from_hash(@transport.request(:post, "/v1/IpRecords/#{sid}", form: form))
+      VoiceV1IpRecord.from_hash(@transport.request(:post, "/v1/IpRecords/#{encode_path_segment(sid)}", form: form))
     end
 
     def delete(sid)
-      @transport.request(:delete, "/v1/IpRecords/#{sid}")
+      @transport.request(:delete, "/v1/IpRecords/#{encode_path_segment(sid)}")
       nil
     end
   end
 
   # /v1/SourceIpMappings + /v1/SourceIpMappings/{Sid}
   class VoiceV1SourceIpMappingsResource
+    include V1Pages
+    include FieldMapping
     def initialize(transport)
       @transport = transport
     end
@@ -71,22 +77,24 @@ module VoiceML
     end
 
     def fetch(sid)
-      VoiceV1SourceIpMapping.from_hash(@transport.request(:get, "/v1/SourceIpMappings/#{sid}"))
+      VoiceV1SourceIpMapping.from_hash(@transport.request(:get, "/v1/SourceIpMappings/#{encode_path_segment(sid)}"))
     end
 
     def update(sid, sip_domain_sid:)
       form = { 'SipDomainSid' => sip_domain_sid }
-      VoiceV1SourceIpMapping.from_hash(@transport.request(:post, "/v1/SourceIpMappings/#{sid}", form: form))
+      VoiceV1SourceIpMapping.from_hash(@transport.request(:post, "/v1/SourceIpMappings/#{encode_path_segment(sid)}", form: form))
     end
 
     def delete(sid)
-      @transport.request(:delete, "/v1/SourceIpMappings/#{sid}")
+      @transport.request(:delete, "/v1/SourceIpMappings/#{encode_path_segment(sid)}")
       nil
     end
   end
 
   # /v1/ByocTrunks + /v1/ByocTrunks/{Sid}
   class VoiceV1ByocTrunksResource
+    include V1Pages
+    include FieldMapping
     TRUNK_FIELDS = {
       'FriendlyName' => :friendly_name,
       'VoiceUrl' => :voice_url,
@@ -111,38 +119,28 @@ module VoiceML
     end
 
     def create(**kwargs)
-      VoiceV1ByocTrunk.from_hash(@transport.request(:post, '/v1/ByocTrunks', form: build_form(kwargs)))
+      VoiceV1ByocTrunk.from_hash(@transport.request(:post, '/v1/ByocTrunks', form: form_params(TRUNK_FIELDS, kwargs)))
     end
 
     def fetch(sid)
-      VoiceV1ByocTrunk.from_hash(@transport.request(:get, "/v1/ByocTrunks/#{sid}"))
+      VoiceV1ByocTrunk.from_hash(@transport.request(:get, "/v1/ByocTrunks/#{encode_path_segment(sid)}"))
     end
 
     def update(sid, **kwargs)
-      VoiceV1ByocTrunk.from_hash(@transport.request(:post, "/v1/ByocTrunks/#{sid}", form: build_form(kwargs)))
+      VoiceV1ByocTrunk.from_hash(@transport.request(:post, "/v1/ByocTrunks/#{encode_path_segment(sid)}", form: form_params(TRUNK_FIELDS, kwargs)))
     end
 
     def delete(sid)
-      @transport.request(:delete, "/v1/ByocTrunks/#{sid}")
+      @transport.request(:delete, "/v1/ByocTrunks/#{encode_path_segment(sid)}")
       nil
     end
 
-    private
-
-    def build_form(kwargs)
-      out = {}
-      TRUNK_FIELDS.each do |wire, k|
-        value = kwargs[k]
-        next if value.nil?
-
-        out[wire] = value
-      end
-      out
-    end
   end
 
   # /v1/ConnectionPolicies + /v1/ConnectionPolicies/{Sid} + nested /Targets
   class VoiceV1ConnectionPoliciesResource
+    include V1Pages
+    include FieldMapping
     TARGET_FIELDS = {
       'Target' => :target,
       'FriendlyName' => :friendly_name,
@@ -168,17 +166,17 @@ module VoiceML
     end
 
     def fetch(sid)
-      VoiceV1ConnectionPolicy.from_hash(@transport.request(:get, "/v1/ConnectionPolicies/#{sid}"))
+      VoiceV1ConnectionPolicy.from_hash(@transport.request(:get, "/v1/ConnectionPolicies/#{encode_path_segment(sid)}"))
     end
 
     def update(sid, friendly_name: nil)
       form = {}
       form['FriendlyName'] = friendly_name unless friendly_name.nil?
-      VoiceV1ConnectionPolicy.from_hash(@transport.request(:post, "/v1/ConnectionPolicies/#{sid}", form: form))
+      VoiceV1ConnectionPolicy.from_hash(@transport.request(:post, "/v1/ConnectionPolicies/#{encode_path_segment(sid)}", form: form))
     end
 
     def delete(sid)
-      @transport.request(:delete, "/v1/ConnectionPolicies/#{sid}")
+      @transport.request(:delete, "/v1/ConnectionPolicies/#{encode_path_segment(sid)}")
       nil
     end
 
@@ -187,52 +185,47 @@ module VoiceML
       params = {}
       params['PageSize'] = page_size unless page_size.nil?
       VoiceV1ConnectionPolicyTargetList.new(
-        @transport.request(:get, "/v1/ConnectionPolicies/#{connection_policy_sid}/Targets", params: params)
+        @transport.request(:get, "/v1/ConnectionPolicies/#{encode_path_segment(connection_policy_sid)}/Targets", params: params)
       )
     end
 
     def create_target(connection_policy_sid, target:, friendly_name: nil, priority: nil, weight: nil, enabled: nil)
       kwargs = { target: target, friendly_name: friendly_name, priority: priority, weight: weight, enabled: enabled }
       VoiceV1ConnectionPolicyTarget.from_hash(
-        @transport.request(:post, "/v1/ConnectionPolicies/#{connection_policy_sid}/Targets",
+        @transport.request(:post, "/v1/ConnectionPolicies/#{encode_path_segment(connection_policy_sid)}/Targets",
                            form: build_target_form(kwargs))
       )
     end
 
     def fetch_target(connection_policy_sid, sid)
       VoiceV1ConnectionPolicyTarget.from_hash(
-        @transport.request(:get, "/v1/ConnectionPolicies/#{connection_policy_sid}/Targets/#{sid}")
+        @transport.request(:get, "/v1/ConnectionPolicies/#{encode_path_segment(connection_policy_sid)}/Targets/#{encode_path_segment(sid)}")
       )
     end
 
     def update_target(connection_policy_sid, sid, **kwargs)
       VoiceV1ConnectionPolicyTarget.from_hash(
-        @transport.request(:post, "/v1/ConnectionPolicies/#{connection_policy_sid}/Targets/#{sid}",
+        @transport.request(:post, "/v1/ConnectionPolicies/#{encode_path_segment(connection_policy_sid)}/Targets/#{encode_path_segment(sid)}",
                            form: build_target_form(kwargs))
       )
     end
 
     def delete_target(connection_policy_sid, sid)
-      @transport.request(:delete, "/v1/ConnectionPolicies/#{connection_policy_sid}/Targets/#{sid}")
+      @transport.request(:delete, "/v1/ConnectionPolicies/#{encode_path_segment(connection_policy_sid)}/Targets/#{encode_path_segment(sid)}")
       nil
     end
 
     private
 
     def build_target_form(kwargs)
-      out = {}
-      TARGET_FIELDS.each do |wire, k|
-        value = kwargs[k]
-        next if value.nil?
-
-        out[wire] = value
-      end
-      out
+      form_params(TARGET_FIELDS, kwargs)
     end
   end
 
   # /v1/Settings — DialingPermissions inheritance toggle (singleton).
   class VoiceV1DialingPermissionsResource
+    include V1Pages
+    include FieldMapping
     def initialize(transport)
       @transport = transport
     end