urbanairship 6.0.0 → 7.0.0

data/lib/urbanairship/custom_events/custom_event.rb

@@ -23,7 +23,7 @@ module Urbanairship
           body: JSON.dump(events),
           content_type: 'application/json',
           method: 'POST',
-          url: custom_events_url
+          path: custom_events_path
         )
         cer = CustomEventResponse.new(body: response['body'], code: response['code'])
         logger.info { cer.format }

data/lib/urbanairship/devices/channel_tags.rb

@@ -15,7 +15,7 @@ module Urbanairship
         @add_group = {}
         @remove_group = {}
         @set_group = {}
-        @url = channel_url('tags/')
+        @path = channel_path('tags/')
       end
 
       def set_audience(ios: nil, android: nil, amazon: nil)
@@ -62,7 +62,7 @@ module Urbanairship
         response = @client.send_request(
           method: 'POST',
           body: JSON.dump(payload),
-          url: @url,
+          path: @path,
           content_type: 'application/json'
         )
         logger.info("Set tags for audience: #{@audience}")

data/lib/urbanairship/devices/channel_uninstall.rb

@@ -23,7 +23,7 @@ module Urbanairship
         response = @client.send_request(
           method: 'POST',
           body: JSON.dump(channels),
-          url: channel_url('uninstall/'),
+          path: channel_path('uninstall/'),
           content_type: 'application/json'
         )
 
@@ -53,7 +53,7 @@ module Urbanairship
         response = @client.send_request(
           method: 'POST',
           body: JSON.dump(body),
-          url: open_channel_url('uninstall/'),
+          path: open_channel_path('uninstall/'),
           content_type: 'application/json'
         )
 

data/lib/urbanairship/devices/create_and_send.rb

@@ -52,7 +52,7 @@ module Urbanairship
         response = @client.send_request(
           method: 'POST',
           body: JSON.dump(payload),
-          url: create_and_send_url,
+          path: create_and_send_path,
           content_type: 'application/json'
         )
         logger.info("Running create and send for addresses #{@addresses}")
@@ -63,7 +63,7 @@ module Urbanairship
         response = @client.send_request(
           method: 'POST',
           body: JSON.dump(payload),
-          url: create_and_send_url('validate'),
+          path: create_and_send_path('validate'),
           content_type: 'application/json'
         )
         logger.info("Validating payload for create and send")
@@ -84,7 +84,7 @@ module Urbanairship
         response = @client.send_request(
           method: 'POST',
           body: JSON.dump(scheduled_payload),
-          url: schedules_url('create-and-send'),
+          path: schedules_path('create-and-send'),
           content_type: 'application/json'
         )
         logger.info("Scheduling create and send operation with name #{@name}")

data/lib/urbanairship/devices/devicelist.rb

@@ -17,7 +17,7 @@ module Urbanairship
       def lookup(uuid: required('uuid'))
         response = @client.send_request(
           method: 'GET',
-          url: channel_url(uuid)
+          path: channel_path(uuid)
         )
         logger.info("Retrieved channel information for #{uuid}")
         response['body']['channel']
@@ -36,7 +36,7 @@ module Urbanairship
         response = @client.send_request(
           method: 'POST',
           body: JSON.dump(payload),
-          url: channel_url('attributes'),
+          path: channel_path('attributes'),
           content_type: 'application/json'
         )
         response
@@ -46,7 +46,7 @@ module Urbanairship
     class ChannelList < Urbanairship::Common::PageIterator
       def initialize(client: required('client'))
         super(client: client)
-        @next_page = channel_url
+        @next_page_path = channel_path
         @data_attribute = 'channels'
       end
     end
@@ -64,7 +64,7 @@ module Urbanairship
 
         resp = @client.send_request(
           method: 'GET',
-          url: device_token_url(token)
+          path: device_token_path(token)
         )
         logger.info("Looking up info on device token #{token}")
         resp
@@ -77,7 +77,7 @@ module Urbanairship
 
       def initialize(client: required('client'))
         super(client: client)
-        @next_page = device_token_url
+        @next_page_path = device_token_path
         @data_attribute = 'device_tokens'
       end
     end
@@ -95,7 +95,7 @@ module Urbanairship
 
         resp = @client.send_request(
           method: 'GET',
-          url: apid_url(apid)
+          path: apid_path(apid)
         )
         logger.info("Retrieved info on apid #{apid}")
         resp
@@ -105,7 +105,7 @@ module Urbanairship
     class APIDList < Urbanairship::Common::PageIterator
       def initialize(client: required('client'))
         super(client: client)
-        @next_page = apid_url
+        @next_page_path = apid_path
         @data_attribute = 'apids'
       end
     end

data/lib/urbanairship/devices/email.rb

@@ -41,7 +41,7 @@ module Urbanairship
         response = @client.send_request(
           method: 'POST',
           body: JSON.dump(payload),
-          url: channel_url('email'),
+          path: channel_path('email'),
           content_type: 'application/json'
         )
         logger.info("Registering email channel with address #{address}")
@@ -58,7 +58,7 @@ module Urbanairship
         response = @client.send_request(
           method: 'POST',
           body: JSON.dump(payload),
-          url: channel_url('email/uninstall'),
+          path: channel_path('email/uninstall'),
           content_type: 'application/json'
         )
         logger.info("Uninstalling email channel with address #{address}")
@@ -70,7 +70,7 @@ module Urbanairship
 
         response = @client.send_request(
           method: 'GET',
-          url: channel_url('email/' + address)
+          path: channel_path('email/' + address)
         )
         logger.info("Looking up email channel with address #{address}")
         response
@@ -95,7 +95,7 @@ module Urbanairship
 
         response = @client.send_request(
           method: 'PUT',
-          url: channel_url('email/' + channel_id),
+          path: channel_path('email/' + channel_id),
           body: JSON.dump(payload),
           content_type: 'application/json'
         )
@@ -109,7 +109,7 @@ module Urbanairship
 
       def initialize(client: required('client'))
         super(client: client)
-        @url = channel_url('email/tags')
+        @path = channel_path('email/tags')
       end
 
       def set_audience(email_address: required('email_address'))

data/lib/urbanairship/devices/named_user.rb

@@ -25,7 +25,7 @@ module Urbanairship
         response = @client.send_request(
           method: 'POST',
           body: JSON.dump(payload),
-          url: named_users_url('/associate'),
+          path: named_users_path('/associate'),
           content_type: 'application/json'
         )
         logger.info { "Associated channel_id #{channel_id} with named_user #{@named_user_id}" }
@@ -40,7 +40,7 @@ module Urbanairship
         response = @client.send_request(
           method: 'POST',
           body: JSON.dump(payload),
-          url: named_users_url('/disassociate'),
+          path: named_users_path('/disassociate'),
           content_type: 'application/json'
         )
         logger.info { "Dissociated channel_id #{channel_id}" }
@@ -52,7 +52,7 @@ module Urbanairship
            'named_user_id is required for lookup' if @named_user_id.nil?
         response = @client.send_request(
             method: 'GET',
-            url: named_users_url('?id=' + @named_user_id),
+            path: named_users_path('?id=' + @named_user_id),
         )
         logger.info { "Retrieved information on named_user_id #{@named_user_id}" }
         response
@@ -65,7 +65,7 @@ module Urbanairship
 
       def initialize(client: required('client'))
         super(client: client)
-        @url = named_users_url('tags/')
+        @path = named_users_path('tags/')
       end
 
       def set_audience(user_ids: required('user_ids'))
@@ -79,7 +79,7 @@ module Urbanairship
 
       def initialize(client: required('client'))
         super(client: client)
-        @next_page = named_users_url
+        @next_page_path = named_users_path
         @data_attribute = 'named_users'
       end
     end
@@ -101,7 +101,7 @@ module Urbanairship
         response = @client.send_request(
           method: 'POST',
           body: JSON.dump(payload),
-          url: named_users_url('/uninstall'),
+          path: named_users_path('/uninstall'),
           content_type: 'application/json'
         )
         logger.info { "Uninstalled named_user_ids #{@named_user_ids} " }

data/lib/urbanairship/devices/open_channel.rb

@@ -45,7 +45,7 @@ module Urbanairship
 
         response = @client.send_request(
           method: 'POST',
-          url: open_channel_url,
+          path: open_channel_path,
           body: JSON.dump(body),
           content_type: 'application/json'
         )
@@ -77,7 +77,7 @@ module Urbanairship
 
         response = @client.send_request(
           method: 'POST',
-          url: open_channel_url,
+          path: open_channel_path,
           body: JSON.dump(body),
           content_type: 'application/json'
         )
@@ -90,7 +90,7 @@ module Urbanairship
 
         response = @client.send_request(
           method: 'GET',
-          url: channel_url(channel_id)
+          path: channel_path(channel_id)
         )
         logger.info("Looking up info on device token #{channel_id}")
         response

data/lib/urbanairship/devices/segment.rb

@@ -28,7 +28,7 @@ module Urbanairship
         response = @client.send_request(
           method: 'POST',
           body: JSON.dump(payload),
-          url: segments_url,
+          path: segments_path,
           content_type: 'application/json'
         )
         logger.info { "Successful segment creation: #{@display_name}" }
@@ -45,7 +45,7 @@ module Urbanairship
           'id must be set to a valid string' if id.nil?
         response = @client.send_request(
           method: 'GET',
-          url: segments_url(id)
+          path: segments_path(id)
         )
         logger.info("Retrieved segment information for #{id}")
         @id = id
@@ -69,7 +69,7 @@ module Urbanairship
         response = @client.send_request(
           method: 'PUT',
           body: JSON.dump(data),
-          url: segments_url(@id),
+          path: segments_path(@id),
           content_type: 'application/json'
         )
         logger.info { "Successful segment update: #{@display_name}" }
@@ -80,13 +80,11 @@ module Urbanairship
       #
       # @ returns [Object] response HTTP response
       def delete
-        fail ArgumentError,
-          'id cannot be nil' if id.nil?
+        fail ArgumentError, 'id cannot be nil' if id.nil?
 
-        url = segments_url(id)
         response = @client.send_request(
           method: 'DELETE',
-          url: url
+          path: segments_path(id)
         )
         logger.info { "Successful segment deletion: #{@display_name}" }
         response
@@ -98,7 +96,7 @@ module Urbanairship
 
       def initialize(client: required('client'))
         super(client: client)
-        @next_page = segments_url
+        @next_page_path = segments_path
         @data_attribute = 'segments'
       end
     end

data/lib/urbanairship/devices/sms.rb

@@ -31,7 +31,7 @@ module Urbanairship
         response = @client.send_request(
           method: 'POST',
           body: JSON.dump(payload),
-          url: channel_url('sms'),
+          path: channel_path('sms'),
           content_type: 'application/json'
         )
         logger.info("Registering SMS channel with msisdn #{@msisdn}")
@@ -55,7 +55,7 @@ module Urbanairship
         response = @client.send_request(
           method: 'PUT',
           body: JSON.dump(payload),
-          url: channel_url('sms/' + channel_id),
+          path: channel_path('sms/' + channel_id),
           content_type: 'application/json'
         )
         logger.info("Updating SMS channel with msisdn #{@channel_id}")
@@ -74,7 +74,7 @@ module Urbanairship
         response = @client.send_request(
           method: 'POST',
           body: JSON.dump(payload),
-          url: channel_url('sms/opt-out'),
+          path: channel_path('sms/opt-out'),
           content_type: 'application/json'
         )
         logger.info("Opting Out of SMS messages for #{@msisdn}")
@@ -93,7 +93,7 @@ module Urbanairship
         response = @client.send_request(
           method: 'POST',
           body: JSON.dump(payload),
-          url: channel_url('sms/uninstall'),
+          path: channel_path('sms/uninstall'),
           content_type: 'application/json'
         )
         logger.info("Uninstalling SMS channel for #{@msisdn}")
@@ -106,7 +106,7 @@ module Urbanairship
 
         response = @client.send_request(
             method: 'GET',
-            url: channel_url('sms/' + @msisdn + '/' + @sender)
+            path: channel_path('sms/' + @msisdn + '/' + @sender)
         )
         logger.info { "Retrieved information for msisdn #{@msisdn}" }
         response

data/lib/urbanairship/devices/static_lists.rb

@@ -22,7 +22,7 @@ module Urbanairship
         response = @client.send_request(
           method: 'POST',
           body: JSON.dump(payload),
-          url: lists_url,
+          path: lists_path,
           content_type: 'application/json'
         )
         logger.info("Created static list for #{@name}")
@@ -35,7 +35,7 @@ module Urbanairship
           response = @client.send_request(
               method: 'PUT',
               body: csv_file,
-              url: lists_url(@name + '/csv/'),
+              path: lists_path(@name + '/csv/'),
               content_type: 'text/csv',
               encoding: gzip
           )
@@ -43,7 +43,7 @@ module Urbanairship
           response = @client.send_request(
               method: 'PUT',
               body: csv_file,
-              url: lists_url(@name + '/csv/'),
+              path: lists_path(@name + '/csv/'),
               content_type: 'text/csv'
           )
         end
@@ -61,7 +61,7 @@ module Urbanairship
         response = @client.send_request(
           method: 'PUT',
           body: JSON.dump(payload),
-          url: lists_url(@name),
+          path: lists_path(@name),
           content_type: 'application/json'
         )
         logger.info("Updating the metadata for list #{@name}")
@@ -72,7 +72,7 @@ module Urbanairship
         fail ArgumentError, 'Name must be set' if name.nil?
         response = @client.send_request(
           method: 'GET',
-          url: lists_url(@name)
+          path: lists_path(@name)
         )
         logger.info("Retrieving info for list #{@name}")
         response
@@ -82,7 +82,7 @@ module Urbanairship
         fail ArgumentError, 'Name must be set' if name.nil?
         response = @client.send_request(
           method: 'DELETE',
-          url: lists_url(@name)
+          path: lists_path(@name)
         )
         logger.info("Deleted list #{@name}")
         response
@@ -92,7 +92,7 @@ module Urbanairship
     class StaticLists < Urbanairship::Common::PageIterator
       def initialize(client: required('client'))
         super(client: client)
-        @next_page = lists_url
+        @next_page_path = lists_path
         @data_attribute = 'lists'
       end
     end

data/lib/urbanairship/push/location.rb

@@ -14,11 +14,11 @@ module Urbanairship
       def name_lookup(name: required('name'), type: nil)
         fail ArgumentError, 'name needs to be a string' unless name.is_a? String
         fail ArgumentError, 'type needs to be a string' unless type.nil? or type.is_a? String
-        url = location_url('?q=' + name)
-        url += '&type=' + type unless type.nil?
+        path = location_path('?q=' + name)
+        path += '&type=' + type unless type.nil?
         resp = @client.send_request(
           method: 'GET',
-          url: url
+          path: path
         )
         logger.info("Retrieved location information for #{name}")
         resp
@@ -28,11 +28,11 @@ module Urbanairship
         fail ArgumentError,
           'latitude and longitude need to be numbers' unless latitude.is_a? Numeric and longitude.is_a? Numeric
         fail ArgumentError, 'type needs to be a string' unless type.nil? or type.is_a? String
-        url = location_url(latitude.to_s + ',' + longitude.to_s)
-        url += '?type=' + type unless type.nil?
+        path = location_path(latitude.to_s + ',' + longitude.to_s)
+        path += '?type=' + type unless type.nil?
         resp = @client.send_request(
           method: 'GET',
-          url: url
+          path: path
         )
         logger.info("Retrieved location information for latitude #{latitude} and longitude #{longitude}")
         resp
@@ -45,11 +45,11 @@ module Urbanairship
            'lat1, long1, lat2, and long2 need to be numbers' unless lat1.is_a? Numeric and long2.is_a? Numeric\
            and lat2.is_a? Numeric and long2.is_a? Numeric
         fail ArgumentError, 'type needs to be a string' unless type.nil? or type.is_a? String
-        url = location_url(lat1.to_s + ',' + long1.to_s + ',' + lat2.to_s + ',' + long2.to_s)
-        url += '?type=' + type unless type.nil?
+        path = location_path(lat1.to_s + ',' + long1.to_s + ',' + lat2.to_s + ',' + long2.to_s)
+        path += '?type=' + type unless type.nil?
         resp = @client.send_request(
           method: 'GET',
-          url: url
+          path: path
         )
         logger.info("Retrieved location information for bounding box with lat1 #{lat1}, long1 #{long1}," +
           " lat2 #{lat2}, and long2 #{long2}")
@@ -58,20 +58,20 @@ module Urbanairship
 
       def alias_lookup(from_alias: required('from_alias'))
         fail ArgumentError, 'from_alias needs to be a string or an array of strings' unless from_alias.is_a? String or from_alias.is_a? Array
-        url = location_url('from-alias?')
+        path = location_path('from-alias?')
         if from_alias.is_a? Array
           from_alias.each do |a|
             fail ArgumentError, 'from_alias needs to be a string or an array of strings' unless a.is_a? String
-            url += a + '&'
+            path += a + '&'
           end
-          url = url.chop
+          path = path.chop
         else
-          url += from_alias
+          path += from_alias
         end
 
         resp = @client.send_request(
           method: 'GET',
-          url: url
+          path: path
         )
         logger.info("Retrieved location info from alias #{from_alias}")
         resp
@@ -81,10 +81,10 @@ module Urbanairship
         fail ArgumentError, 'polygon_id needs to be a string' unless polygon_id.is_a? String
         fail ArgumentError, 'zoom needs to be an integer' unless zoom.is_a? Integer
 
-        url = location_url(polygon_id + '?zoom=' + zoom.to_s)
+        path = location_path(polygon_id + '?zoom=' + zoom.to_s)
         resp = @client.send_request(
           method: 'GET',
-          url: url
+          path: path
         )
         logger.info("Retrieved location info for polygon #{polygon_id} and zoom level #{zoom}")
         resp
@@ -93,7 +93,7 @@ module Urbanairship
       def date_ranges
         resp = @client.send_request(
           method: 'GET',
-          url: segments_url('dates/')
+          path: segments_path('dates/')
         )
         logger.info('Retrieved location date ranges')
         resp