urbanairship 5.6.1 → 7.0.0

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'
         )
 
@@ -31,33 +31,33 @@ module Urbanairship
         response
       end
     end
-    
-    
+
+
     class OpenChannelUninstall
       include Urbanairship::Common
       include Urbanairship::Loggable
       attr_reader :client
-      
+
       def initialize(client: required('client'))
         @client = client
       end
-      
+
       def uninstall(address: required('address'),
                     open_platform: required('open_platform'))
-        
+
         body = {
           address: address,
           open_platform_name: open_platform
         }
-        
+
         response = @client.send_request(
           method: 'POST',
           body: JSON.dump(body),
-          url: OPEN_CHANNEL_URL + 'uninstall/',
+          path: open_channel_path('uninstall/'),
           content_type: 'application/json'
         )
-        
-        logger.info { "Successfully unintalled open channel with address: #{address}"}
+
+        logger.info { "Successfully uninstalled open channel with address: #{address}"}
         response
       end
     end

data/lib/urbanairship/devices/create_and_send.rb

@@ -44,7 +44,7 @@ module Urbanairship
           campaign_object = {'categories': campaigns}
           full_payload[:campaigns] = campaign_object
         end
-        
+
         full_payload
       end
 
@@ -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

@@ -7,6 +7,8 @@ module Urbanairship
       include Urbanairship::Common
       include Urbanairship::Loggable
       attr_writer :client
+      attr_accessor :audience,
+                    :attributes
 
       def initialize(client: required('client'))
         @client = client
@@ -15,17 +17,36 @@ 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']
       end
+
+      def payload
+        {
+          'audience': audience,
+          'attributes': [
+            attributes
+          ]
+        }
+      end
+
+      def set_attributes
+        response = @client.send_request(
+          method: 'POST',
+          body: JSON.dump(payload),
+          path: channel_path('attributes'),
+          content_type: 'application/json'
+        )
+        response
+      end
     end
 
     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
@@ -43,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
@@ -56,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
@@ -74,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
@@ -84,9 +105,9 @@ 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
   end
-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_USER_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_USER_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_USER_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_USER_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_USER_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_USER_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

@@ -5,11 +5,11 @@ module Urbanairship
     class OpenChannel
       include Urbanairship::Common
       include Urbanairship::Loggable
-      attr_accessor :channel_id, 
-                    :open_platform, 
-                    :opt_in, 
+      attr_accessor :channel_id,
+                    :open_platform,
+                    :opt_in,
                     :address,
-                    :tags, 
+                    :tags,
                     :identifiers,
                     :template_id,
                     :alert,
@@ -21,16 +21,16 @@ module Urbanairship
                     :fields,
                     :interactive,
                     :platform_alert
-      
+
       def initialize(client: required('client'))
         @client = client
       end
-      
+
       def create()
         fail TypeError, 'address must be set to create open channel' unless address.is_a? String
         fail TypeError, 'open_platform must be set to create open channel' unless open_platform.is_a? String
         fail TypeError, 'opt_in must be boolean' unless [true, false].include? opt_in
-        
+
         channel_data = {
           'type': 'open',
           'open': {:open_platform_name => open_platform},
@@ -38,21 +38,21 @@ module Urbanairship
           'address': address,
           'tags': tags
         }.delete_if {|key, value| value.nil?} #this removes the nil key value pairs
-        
+
         set_identifiers
-        
+
         body = {'channel': channel_data}
-        
+
         response = @client.send_request(
           method: 'POST',
-          url: OPEN_CHANNEL_URL,
+          path: open_channel_path,
           body: JSON.dump(body),
           content_type: 'application/json'
         )
         logger.info("Registering open channel with address: #{address}")
         response
       end
-      
+
       def update(set_tags: required('set_tags'))
         fail ArgumentError, 'set_tags must be boolean' unless [true, false].include? set_tags
         fail ArgumentError, 'set_tags cannot be true when tags are not set' unless set_tags == true && tags != nil
@@ -60,7 +60,7 @@ module Urbanairship
         fail TypeError, 'address or channel_id must not be nil' unless address.is_a? String || channel_id.is_a?(String)
         fail TypeError, 'open_platform cannot be nil' unless open_platform.is_a? String
         fail TypeErorr, 'address must not be nil if opt_in is true' unless opt_in.is_a? TrueClass
-        
+
         channel_data = {
           'type': 'open',
           'open': {'open_platform_name': open_platform},
@@ -70,34 +70,34 @@ module Urbanairship
           'address': address,
           'tags': tags
         }.delete_if {|key, value| value.nil?} #this removes the nil key value pairs
-        
+
         set_identifiers
-        
+
         body = {'channel': channel_data}
-          
+
         response = @client.send_request(
           method: 'POST',
-          url: OPEN_CHANNEL_URL,
+          path: open_channel_path,
           body: JSON.dump(body),
           content_type: 'application/json'
         )
         logger.info("Updating open channel with address #{address}")
         response
       end
-      
+
       def lookup(channel_id: required('channel_id'))
         fail ArgumentError, 'channel_id needs to be a string' unless channel_id.is_a? String
-        
+
         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
       end
 
       def notification_with_template_id
-        fail TypeError, 'open_platform cannot be nil' if open_platform.nil? 
+        fail TypeError, 'open_platform cannot be nil' if open_platform.nil?
 
         if alert
           payload = {
@@ -124,7 +124,7 @@ module Urbanairship
       end
 
       def open_channel_override
-        fail TypeError, 'open_platform cannot be nil' if open_platform.nil? 
+        fail TypeError, 'open_platform cannot be nil' if open_platform.nil?
         payload = {
             'alert': platform_alert,
             'extra': extra,
@@ -147,4 +147,3 @@ module Urbanairship
     end
   end
 end
-      

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