urbanairship 5.6.0 → 6.0.0

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
+          url: channel_url(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),
+          url: channel_url('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 = channel_url
         @data_attribute = 'channels'
       end
     end
@@ -43,7 +64,7 @@ module Urbanairship
 
         resp = @client.send_request(
           method: 'GET',
-          url: DEVICE_TOKEN_URL + token
+          url: device_token_url(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 = device_token_url
         @data_attribute = 'device_tokens'
       end
     end
@@ -74,7 +95,7 @@ module Urbanairship
 
         resp = @client.send_request(
           method: 'GET',
-          url: APID_URL + apid
+          url: apid_url(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 = apid_url
         @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',
+          url: channel_url('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',
+          url: channel_url('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
+          url: channel_url('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,
+          url: channel_url('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'
+        @url = channel_url('email/tags')
       end
 
       def set_audience(email_address: required('email_address'))

data/lib/urbanairship/devices/email_notification.rb

@@ -70,16 +70,23 @@ module Urbanairship
       end
 
       def define_template_object
+        fail ArgumentError, 'Must choose between template_id or fields object' if template_id && plaintext_body && subject
         template_portion = {
           template_id: template_id,
-          fields: {
-            subject: subject,
-            plaintext_body: plaintext_body
-          },
+          fields: define_fields,
           variable_details: variable_details
         }.delete_if {|key, value| value.nil?}
       end
 
+      def define_fields
+        if subject && plaintext_body
+          {
+            subject: subject,
+            plaintext_body: plaintext_body
+          }
+        end
+      end
+
     end
   end
 end

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',
+          url: named_users_url('/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',
+          url: named_users_url('/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,
+            url: named_users_url('?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/'
+        @url = named_users_url('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 = named_users_url
         @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',
+          url: named_users_url('/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,
+          url: open_channel_url,
           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,
+          url: open_channel_url,
           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
+          url: channel_url(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,
+          url: segments_url,
           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
+          url: segments_url(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,
+          url: segments_url(@id),
           content_type: 'application/json'
         )
         logger.info { "Successful segment update: #{@display_name}" }
@@ -83,7 +83,7 @@ module Urbanairship
         fail ArgumentError,
           'id cannot be nil' if id.nil?
 
-        url = SEGMENTS_URL + id
+        url = segments_url(id)
         response = @client.send_request(
           method: 'DELETE',
           url: url
@@ -98,7 +98,7 @@ module Urbanairship
 
       def initialize(client: required('client'))
         super(client: client)
-        @next_page = SEGMENTS_URL
+        @next_page = segments_url
         @data_attribute = 'segments'
       end
     end

data/lib/urbanairship/devices/sms.rb

@@ -5,7 +5,14 @@ module Urbanairship
     class Sms
       include Urbanairship::Common
       include Urbanairship::Loggable
-      attr_accessor :msisdn, :sender, :opted_in, :sender
+      attr_accessor :msisdn,
+                    :sender,
+                    :opted_in,
+                    :sender,
+                    :locale_country,
+                    :locale_language,
+                    :timezone,
+                    :channel_id
 
       def initialize(client: required('client'))
         @client = client
@@ -24,16 +31,40 @@ module Urbanairship
         response = @client.send_request(
           method: 'POST',
           body: JSON.dump(payload),
-          url: CHANNEL_URL + 'sms',
+          url: channel_url('sms'),
           content_type: 'application/json'
         )
         logger.info("Registering SMS channel with msisdn #{@msisdn}")
         response
       end
 
+      def update
+        fail ArgumentError, 'sender must be set to update sms channel' if sender.nil?
+        fail ArgumentError, 'msisdn must be set to update sms channel' if msisdn.nil?
+        fail ArgumentError, 'channel_id must be set to update sms channel' if channel_id.nil?
+
+        payload = {
+          'msisdn': msisdn,
+          'sender': sender,
+          'opted_in': opted_in,
+          'locale_country': locale_country,
+          'locale_language': locale_language,
+          'timezone': timezone
+        }.delete_if {|key, value| value.nil?} #this removes the nil key value pairs
+
+        response = @client.send_request(
+          method: 'PUT',
+          body: JSON.dump(payload),
+          url: channel_url('sms/' + channel_id),
+          content_type: 'application/json'
+        )
+        logger.info("Updating SMS channel with msisdn #{@channel_id}")
+        response
+      end
+
       def opt_out
-        fail ArgumentError, 'sender must be set to register sms channel' if sender.nil?
-        fail ArgumentError, 'msisdn must be set to register sms channel' if msisdn.nil?
+        fail ArgumentError, 'sender must be set to opt out sms channel' if sender.nil?
+        fail ArgumentError, 'msisdn must be set to opt out sms channel' if msisdn.nil?
 
         payload = {
           'msisdn': msisdn,
@@ -43,7 +74,7 @@ module Urbanairship
         response = @client.send_request(
           method: 'POST',
           body: JSON.dump(payload),
-          url: CHANNEL_URL + 'sms/opt-out',
+          url: channel_url('sms/opt-out'),
           content_type: 'application/json'
         )
         logger.info("Opting Out of SMS messages for #{@msisdn}")
@@ -51,8 +82,8 @@ module Urbanairship
       end
 
       def uninstall
-        fail ArgumentError, 'sender must be set to register sms channel' if sender.nil?
-        fail ArgumentError, 'msisdn must be set to register sms channel' if msisdn.nil?
+        fail ArgumentError, 'sender must be set to uninstall sms channel' if sender.nil?
+        fail ArgumentError, 'msisdn must be set to uninstall sms channel' if msisdn.nil?
 
         payload = {
           'msisdn': msisdn,
@@ -62,7 +93,7 @@ module Urbanairship
         response = @client.send_request(
           method: 'POST',
           body: JSON.dump(payload),
-          url: CHANNEL_URL + 'sms/uninstall',
+          url: channel_url('sms/uninstall'),
           content_type: 'application/json'
         )
         logger.info("Uninstalling SMS channel for #{@msisdn}")
@@ -75,7 +106,7 @@ module Urbanairship
 
         response = @client.send_request(
             method: 'GET',
-            url: CHANNEL_URL + 'sms/' + @msisdn + '/' + @sender
+            url: channel_url('sms/' + @msisdn + '/' + @sender)
         )
         logger.info { "Retrieved information for msisdn #{@msisdn}" }
         response