urbanairship 5.5.1 → 5.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b69d5dcd7102160071266e66723dce74d1752386a4ebbda9e12cff07b3ddeb33
-  data.tar.gz: d579b09d0d59cc728f445dc51793051745431000631ff74f00b2f8be46386fb1
+  metadata.gz: c447a1f428a9ad9ba9a2f56d9ceeaea45969828c3eadaa97b33497c302eac851
+  data.tar.gz: 7347eb5271eb74d15493d18d2970b3d1e4e7fcc8053d1303ba5706453ac9a946
 SHA512:
-  metadata.gz: 739853d57c2b626679a5175ad4282766e2165d16279d27dd25746f5853ca38720e3b9f70c7627294fe15ce18d3c95c4147ddfba853111e5650c3711d34852d5e
-  data.tar.gz: e6bb28f136bb85d7429f3368ce2909a5d8e97fb7cff680a632cf969ef87fdbdd3be83195d48319c824cdf2388032a899a57ebbfc9c8ee40fb88c878ae9f5d99b
+  metadata.gz: 38c2236678e3ec19ebf328671ef73247cfee22bab34627ce9425e18b8ca8377136c39e21e7685bd29a0877ec82b00d355c961eb170bfa20c45bf82860ca271ac
+  data.tar.gz: d4c9ef053d0639db6f65f0b554cb51aeeddeaec4cfa1a95d7ac553be46f330e7dffe2e3068054eb8831fda2c8e8b633470a631559ac7921189d08a20a688e1e0

data/CHANGELOG

@@ -1,3 +1,9 @@
+--------------------
+5.6.0
+--------------------
+- Refactors EmailNotification class
+- Adds Create and Send implementation to Open Channel class
+
 --------------------
 5.5.1
 --------------------

data/docs/create_and_send.rst

@@ -487,3 +487,65 @@ shown in the line of code here:
 .. note::
 
   Should return a 202 Accepted HTTP response.
+
+Create and Send to Open Channels
+================================
+
+Create and Send to Open Channels with Template ID
+-------------------------------------------------
+
+The first few lines of code are creating an OpenChannel object, and assigning
+instance variables to that object. This is essentially creating the payload that
+will be passed to notification portion of the CreateAndSend class, which ultimately
+is sending a fully constructed payload to the API. 
+
+.. code-block:: ruby
+
+  require 'urbanairship'
+  UA = Urbanairship
+  airship = UA::Client.new(key:'<app_key>', secret:'<master_secret>')
+  open_channel_notification = UA::OpenChannel.new(client:airship)
+  open_channel_notification.open_platform = 'smart_fridge'
+  open_channel_notification.template_id = "<template_id>"
+  send_it = UA::CreateAndSend.new(client: airship)
+  send_it.addresses = [
+    {
+      "ua_address": "<ua_address>",
+      "name": "Jane"
+    }
+  ]
+  send_it.device_types = [ 'open::smart_fridge' ]
+  send_it.notification = open_channel_notification.
+  send_it.campaigns = ["winter sale", "west coast"]
+  send_it.create_and_send
+
+Create and Send to Open Channels Override
+------------------------------------------
+
+The first few lines of code are creating an OpenChannel object, and assigning
+instance variables to that object. This is essentially creating the payload that
+will be passed to notification portion of the CreateAndSend class, which ultimately
+is sending a fully constructed payload to the API. 
+
+.. code-block:: ruby
+
+  require 'urbanairship'
+  UA = Urbanairship
+  airship = UA::Client.new(key:'<app_key>', secret:'<master_secret>')
+  open_channel_notification = UA::OpenChannel.new(client:airship)
+  open_channel_notification.open_platform = 'smart_fridge'
+  open_channel_notification.alert = 'a general alert for all open channels'
+  open_channel_notification.platform_alert = 'an alert for specific open channel platforms'
+  open_channel_notification.media_attachment = 'https://example.com/cat_standing_up.jpeg'
+  open_channel_notification.title = 'That\'s pretty neat!'
+  send_it = UA::CreateAndSend.new(client: airship)
+  send_it.addresses = [
+    {
+      "ua_address": "<ua_address>",
+      "name": "Jane"
+    }
+  ]
+  send_it.device_types = [ 'open::smart_fridge' ]
+  send_it.notification = open_channel_notification,open_channel_override
+  send_it.campaigns = ["winter sale", "west coast"]
+  send_it.create_and_send

data/lib/urbanairship/devices/create_and_send.rb

@@ -15,12 +15,6 @@ module Urbanairship
 
       def initialize(client: required('client'))
         @client = client
-        @addresses = nil
-        @device_types = nil
-        @notification = nil
-        @campaigns = nil
-        @name = nil
-        @scheduled_time = nil
       end
 
       def validate_address
@@ -40,17 +34,17 @@ module Urbanairship
 
         full_payload = {
           'audience': {
-            'create_and_send': @addresses
+            'create_and_send': addresses
           },
-          'device_types': @device_types,
-          'notification': @notification,
+          'device_types': device_types,
+          'notification': notification,
         }
 
-        if @campaigns
-          campaign_object = {'categories': @campaigns}
+        if campaigns
+          campaign_object = {'categories': campaigns}
           full_payload[:campaigns] = campaign_object
         end
-
+        
         full_payload
       end
 
@@ -81,9 +75,9 @@ module Urbanairship
 
         scheduled_payload = {
           "schedule": {
-            "scheduled_time": @scheduled_time
+            "scheduled_time": scheduled_time
           },
-          "name": @name,
+          "name": name,
           "push": payload
         }
 

data/lib/urbanairship/devices/email.rb

@@ -19,16 +19,6 @@ module Urbanairship
 
       def initialize(client: required('client'))
         @client = client
-        @address = nil
-        @commercial_opted_in = nil
-        @commercial_opted_out = nil
-        @locale_country = nil
-        @locale_language = nil
-        @timezone = nil
-        @transactional_opted_in = nil
-        @transactional_opted_out = nil
-        @type = nil
-        @channel_id = nil
       end
 
       def register
@@ -36,15 +26,15 @@ module Urbanairship
 
         payload = {
           'channel': {
-            'address': @address,
-            'commercial_opted_in': @commercial_opted_in,
-            'commercial_opted_out': @commercial_opted_out,
-            'locale_country': @locale_country,
-            'locale_language': @locale_language,
-            'timezone': @timezone,
-            'transactional_opted_in': @transactional_opted_in,
-            'transactional_opted_out': @transactional_opted_out,
-            'type': @type
+            'address': address,
+            'commercial_opted_in': commercial_opted_in,
+            'commercial_opted_out': commercial_opted_out,
+            'locale_country': locale_country,
+            'locale_language': locale_language,
+            'timezone': timezone,
+            'transactional_opted_in': transactional_opted_in,
+            'transactional_opted_out': transactional_opted_out,
+            'type': type
           }
         }
 
@@ -54,7 +44,7 @@ module Urbanairship
           url: CHANNEL_URL + 'email',
           content_type: 'application/json'
         )
-        logger.info("Registering email channel with address #{@address}")
+        logger.info("Registering email channel with address #{address}")
         response
       end
 
@@ -62,7 +52,7 @@ module Urbanairship
         fail ArgumentError, 'address must be set to register email channel' if @address.nil?
 
         payload = {
-          'email_address': @address
+          'email_address': address
         }
 
         response = @client.send_request(
@@ -71,7 +61,7 @@ module Urbanairship
           url: CHANNEL_URL + 'email/uninstall',
           content_type: 'application/json'
         )
-        logger.info("Uninstalling email channel with address #{@address}")
+        logger.info("Uninstalling email channel with address #{address}")
         response
       end
 
@@ -80,32 +70,32 @@ 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}")
+        logger.info("Looking up email channel with address #{address}")
         response
       end
 
       def update
-        fail ArgumentError, 'address must be set to update email channel' if @channel_id.nil?
-
-        channel_data =  {}
-
-        channel_data['address'] = @address if @address
-        channel_data['commercial_opted_in'] = @commercial_opted_in if @commercial_opted_in
-        channel_data['commercial_opted_out'] = @commercial_opted_out if @commercial_opted_out
-        channel_data['locale_country'] = @locale_country if @locale_country
-        channel_data['locale_language'] = @locale_language if @locale_language
-        channel_data['timezone'] = @timezone if @timezone
-        channel_data['transactional_opted_in'] = @transactional_opted_in if @transactional_opted_in
-        channel_data['transactional_opted_out'] = @transactional_opted_out if @transactional_opted_out
-        channel_data['type'] = @type if @type
-
-        payload = {channel: channel_data}
+        fail ArgumentError, 'address must be set to update email channel' if channel_id.nil?
+
+        channel_data =  {
+          'address': address,
+          'commercial_opted_in': commercial_opted_in,
+          'commercial_opted_out': commercial_opted_out,
+          'localte_country': locale_country,
+          'locale_language': locale_language,
+          'timezone': timezone,
+          'transactional_opted_in': transactional_opted_in,
+          'transactional_opted_out': transactional_opted_out,
+          'type': type
+      }.delete_if {|key, value| value.nil?} #this removes the nil key value pairs
+
+        payload = {'channel': channel_data}
 
         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'
         )

data/lib/urbanairship/devices/email_notification.rb

@@ -16,21 +16,12 @@ module Urbanairship
                     :sender_name,
                     :subject,
                     :template_id,
-                    :variable_details
+                    :variable_details,
+                    :click_tracking,
+                    :open_tracking
 
       def initialize(client: required('client'))
         @client = client
-        @bcc = nil
-        @bypass_opt_in_level = nil
-        @html_body = nil
-        @message_type = nil
-        @plaintext_body = nil
-        @reply_to = nil
-        @sender_address = nil
-        @sender_name = nil
-        @subject = nil
-        @template_id = nil
-        @variable_details = nil
       end
 
       def email_override
@@ -41,22 +32,21 @@ module Urbanairship
         fail ArgumentError, 'sender_name is needed for email override' if @sender_name.nil?
         fail ArgumentError, 'subject is needed for email override' if @subject.nil?
 
-        override = {'email': {
-          'bypass_opt_in_level': @bypass_opt_in_level,
-          'html_body': @html_body,
-          'message_type': @message_type,
-          'plaintext_body': @plaintext_body,
-          'reply_to': @reply_to,
-          'sender_address': @sender_address,
-          'sender_name': @sender_name,
-          'subject': @subject
-        }}
+        override = {
+          bcc: bcc,
+          bypass_opt_in_level: bypass_opt_in_level,
+          click_tracking: click_tracking,
+          html_body: html_body,
+          message_type: message_type,
+          open_tracking: open_tracking, 
+          plaintext_body: plaintext_body,
+          reply_to: reply_to,
+          sender_address: sender_address,
+          sender_name: sender_name,
+          subject: subject
+        }.delete_if {|key, value| value.nil?} #this removes the nil key value pairs
 
-        if @bcc
-          override[:email][:bcc] = @bcc
-        end
-
-        override
+        {'email': override}
       end
 
       def email_with_inline_template
@@ -65,33 +55,29 @@ module Urbanairship
         fail ArgumentError, 'sender_address is needed for email with inline template' if @sender_address.nil?
         fail ArgumentError, 'sender_name is needed for email with inline template' if @sender_name.nil?
 
-        inline_template = {'email': {
-          'message_type': @message_type,
-          'reply_to': @reply_to,
-          'sender_address': @sender_address,
-          'sender_name': @sender_name,
-          'template': {}
-          }
-        }
-
-        if @subject and @plaintext_body
-          fields_object = {'plaintext_body': @plaintext_body, 'subject': @subject}
-          inline_template[:email][:template][:fields] = fields_object
-        end
-
-        if @bcc
-          inline_template[:email][:bcc] = @bcc
-        end
+        inline_template = {
+          bcc: bcc,
+          click_tracking: click_tracking,
+          message_type: message_type,
+          open_tracking: open_tracking,
+          reply_to: reply_to,
+          sender_address: sender_address,
+          sender_name: sender_name,
+          template: define_template_object
+        }.delete_if {|key, value| value.nil?} #this removes the nil key value pairs      
 
-        if @variable_details
-          inline_template[:email][:template][:variable_details] = @variable_details
-        end
-
-        if @template_id
-          inline_template[:email][:template][:template_id] = @template_id
-        end
+        {'email': inline_template}
+      end
 
-        inline_template
+      def define_template_object
+        template_portion = {
+          template_id: template_id,
+          fields: {
+            subject: subject,
+            plaintext_body: plaintext_body
+          },
+          variable_details: variable_details
+        }.delete_if {|key, value| value.nil?}
       end
 
     end

data/lib/urbanairship/devices/mms_notification.rb

@@ -19,14 +19,6 @@ module Urbanairship
 
       def initialize(client: required('client'))
         @client = client
-        @fallback_text = nil
-        @shorten_links = nil
-        @content_length = nil
-        @content_type = nil
-        @url = nil
-        @text = nil
-        @subject = nil
-        @template_id = nil
       end
 
       def validate_url
@@ -36,24 +28,24 @@ module Urbanairship
       end
 
       def mms_override
-        fail ArgumentError, 'fallback_text is needed for MMS override' if @fallback_text.nil?
-        fail ArgumentError, 'content_length is needed for MMS override' if @content_length.nil?
-        fail ArgumentError, 'content_type is needed for MMS override' if @content_type.nil?
-        fail ArgumentError, 'url is needed for MMS override' if @url.nil?
+        fail ArgumentError, 'fallback_text is needed for MMS override' if fallback_text.nil?
+        fail ArgumentError, 'content_length is needed for MMS override' if content_length.nil?
+        fail ArgumentError, 'content_type is needed for MMS override' if content_type.nil?
+        fail ArgumentError, 'url is needed for MMS override' if url.nil?
 
         validate_url
 
         override = {"mms": {
-                "subject": @subject,
-                "fallback_text": @fallback_text,
-                "shorten_links": @shorten_links,
+                "subject": subject,
+                "fallback_text": fallback_text,
+                "shorten_links": shorten_links,
                 "slides": [
                       {
-                         "text": @text,
+                         "text": text,
                          "media": {
-                            "url": @url,
-                            "content_type": @content_type,
-                            "content_length": @content_length
+                            "url": url,
+                            "content_type": content_type,
+                            "content_length": content_length
                          }
                       }
                     ]
@@ -63,22 +55,22 @@ module Urbanairship
       end
 
       def mms_template_with_id
-        fail ArgumentError, 'content_length is needed for MMS Inline Template with ID' if @content_length.nil?
-        fail ArgumentError, 'content_type is needed for MMS Inline Template with ID' if @content_type.nil?
-        fail ArgumentError, 'url is needed for MMS Inline Template with ID' if @url.nil?
-        fail ArgumentError, 'template_id is needed for MMS Inline Template with ID' if @template_id.nil?
+        fail ArgumentError, 'content_length is needed for MMS Inline Template with ID' if content_length.nil?
+        fail ArgumentError, 'content_type is needed for MMS Inline Template with ID' if content_type.nil?
+        fail ArgumentError, 'url is needed for MMS Inline Template with ID' if url.nil?
+        fail ArgumentError, 'template_id is needed for MMS Inline Template with ID' if template_id.nil?
 
         {"mms": {
             "template": {
-              "template_id": @template_id
+              "template_id": template_id
             },
             "shorten_links": true,
             "slides": [
                 {
                     "media": {
-                        "url": @url,
-                        "content_type": @content_type,
-                        "content_length": @content_length
+                        "url": url,
+                        "content_type": content_type,
+                        "content_length": content_length
                     }
                 }
             ]
@@ -87,22 +79,22 @@ module Urbanairship
       end
 
       def mms_inline_template
-        fail ArgumentError, 'slide_1_text text is needed for MMS with inline template' if @text.nil?
+        fail ArgumentError, 'slide_1_text text is needed for MMS with inline template' if text.nil?
 
           {"mms": {
             "template": {
               "fields": {
-                "subject": @subject,
-                "fallback_text": @fallback_text,
-                "slide_1_text": @text
+                "subject": subject,
+                "fallback_text": fallback_text,
+                "slide_1_text": text
               }
             },
             "slides": [
               {
                 "media": {
-                    "url": @url,
-                    "content_type": @content_type,
-                    "content_length": @content_length
+                    "url": url,
+                    "content_type": content_type,
+                    "content_length": content_length
                 }
               }
             ]

data/lib/urbanairship/devices/open_channel.rb

@@ -5,37 +5,41 @@ module Urbanairship
     class OpenChannel
       include Urbanairship::Common
       include Urbanairship::Loggable
-      attr_accessor :channel_id, :open_platform, :opt_in, :address,
-                    :tags, :identifiers
+      attr_accessor :channel_id, 
+                    :open_platform, 
+                    :opt_in, 
+                    :address,
+                    :tags, 
+                    :identifiers,
+                    :template_id,
+                    :alert,
+                    :extra,
+                    :media_attachment,
+                    :summary,
+                    :title,
+                    :template_id,
+                    :fields,
+                    :interactive,
+                    :platform_alert
       
       def initialize(client: required('client'))
         @client = client
-        @channel_id = nil
-        @open_platform = nil
-        @opt_in = nil
-        @address = nil
-        @tags = nil
-        @identifiers = nil
       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
+        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},
-          'opt_in': @opt_in,
-          'address': @address
-        }
+          'open': {:open_platform_name => open_platform},
+          'opt_in': opt_in,
+          'address': address,
+          'tags': tags
+        }.delete_if {|key, value| value.nil?} #this removes the nil key value pairs
         
-        if @tags
-          channel_data['tags'] = @tags
-        end
-        if @identifiers
-          channel_data[:open][:identifiers] = @identifiers
-        end
+        set_identifiers
         
         body = {'channel': channel_data}
         
@@ -45,37 +49,29 @@ module Urbanairship
           body: JSON.dump(body),
           content_type: 'application/json'
         )
-        logger.info("Registering open channel with address: #{@address}")
+        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
-        fail TypeError, 'opt_in must be boolean' unless [true, false].include? @opt_in
-        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
+        fail ArgumentError, 'set_tags cannot be true when tags are not set' unless set_tags == true && tags != nil
+        fail TypeError, 'opt_in must be boolean' unless [true, false].include? opt_in
+        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},
-          'opt_in': @opt_in,
-          'set_tags': set_tags
-        }
+          'open': {'open_platform_name': open_platform},
+          'opt_in': opt_in,
+          'set_tags': set_tags,
+          'channel_id': channel_id,
+          'address': address,
+          'tags': tags
+        }.delete_if {|key, value| value.nil?} #this removes the nil key value pairs
         
-        if @channel_id
-          channel_data['channel_id'] = @channel_id
-        end
-        if @address
-          channel_data['address'] = @address
-        end
-        if @tags
-          channel_data['tags'] = @tags
-        end
-        if @identifiers
-          channel_data['open']['identifiers'] = @identifiers
-        end
+        set_identifiers
         
         body = {'channel': channel_data}
           
@@ -85,7 +81,7 @@ module Urbanairship
           body: JSON.dump(body),
           content_type: 'application/json'
         )
-        logger.info("Updating open channel with address #{@address}")
+        logger.info("Updating open channel with address #{address}")
         response
       end
       
@@ -99,6 +95,55 @@ module Urbanairship
         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? 
+
+        if alert
+          payload = {
+            "open::#{open_platform}":{
+              'template': {
+                'template_id': template_id,
+                'fields': {
+                  'alert': alert
+                }
+              }
+            }
+          }
+        else
+          payload = {
+            "open::#{open_platform}":{
+              'template': {
+                'template_id': template_id,
+              }
+            }
+          }
+        end
+
+        payload
+      end
+
+      def open_channel_override
+        fail TypeError, 'open_platform cannot be nil' if open_platform.nil? 
+        payload = {
+            'alert': platform_alert,
+            'extra': extra,
+            'media_attachment': media_attachment,
+            'summary': summary,
+            'title': title,
+            'interactive': interactive
+          }.delete_if {|key, value| value.nil?} #this removes the nil key value pairs
+
+        {'alert': alert,
+         "open::#{open_platform}": payload}
+      end
+
+      def set_identifiers
+        if identifiers
+          channel_data[:open][:identifiers] = identifiers
+        end
+      end
+
     end
   end
 end

data/lib/urbanairship/devices/segment.rb

@@ -12,9 +12,6 @@ module Urbanairship
 
       def initialize(client: required('client'))
         @client = client
-        @display_name = nil
-        @criteria = nil
-        @id = nil
       end
 
       # Build a Segment from the display_name and criteria attributes
@@ -25,8 +22,8 @@ module Urbanairship
         fail ArgumentError,
           'Both display_name and criteria must be set to a value' if display_name.nil? or criteria.nil?
         payload = {
-          :display_name => @display_name,
-          :criteria => @criteria
+          'display_name': display_name,
+          'criteria': criteria
         }
         response = @client.send_request(
           method: 'POST',
@@ -67,8 +64,8 @@ module Urbanairship
           'Either display_name or criteria must be set to a value' if display_name.nil? and criteria.nil?
 
         data = {}
-        data['display_name'] = @display_name
-        data['criteria'] = @criteria
+        data['display_name'] = display_name
+        data['criteria'] = criteria
         response = @client.send_request(
           method: 'PUT',
           body: JSON.dump(data),
@@ -84,9 +81,9 @@ module Urbanairship
       # @ returns [Object] response HTTP response
       def delete
         fail ArgumentError,
-          'id cannot be nil' if @id.nil?
+          'id cannot be nil' if id.nil?
 
-        url = SEGMENTS_URL + @id
+        url = SEGMENTS_URL + id
         response = @client.send_request(
           method: 'DELETE',
           url: url

data/lib/urbanairship/devices/sms.rb

@@ -9,19 +9,16 @@ module Urbanairship
 
       def initialize(client: required('client'))
         @client = client
-        @sender = nil
-        @msisdn = nil
-        @opted_in = nil
       end
 
       def register
-        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 register sms channel' if sender.nil?
+        fail ArgumentError, 'msisdn must be set to register sms channel' if msisdn.nil?
 
         payload = {
-          'msisdn': @msisdn,
-          'sender': @sender,
-          'opted_in': @opted_in
+          'msisdn': msisdn,
+          'sender': sender,
+          'opted_in': opted_in
         }
 
         response = @client.send_request(
@@ -35,12 +32,12 @@ module Urbanairship
       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 register sms channel' if sender.nil?
+        fail ArgumentError, 'msisdn must be set to register sms channel' if msisdn.nil?
 
         payload = {
-          'msisdn': @msisdn,
-          'sender': @sender,
+          'msisdn': msisdn,
+          'sender': sender,
         }
 
         response = @client.send_request(
@@ -54,12 +51,12 @@ 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 register sms channel' if sender.nil?
+        fail ArgumentError, 'msisdn must be set to register sms channel' if msisdn.nil?
 
         payload = {
-          'msisdn': @msisdn,
-          'sender': @sender,
+          'msisdn': msisdn,
+          'sender': sender,
         }
 
         response = @client.send_request(
@@ -73,8 +70,8 @@ module Urbanairship
       end
 
       def lookup
-        fail ArgumentError,'msisdn is required for lookup' if @msisdn.nil?
-        fail ArgumentError,'sender is required for lookup' if @sender.nil?
+        fail ArgumentError,'msisdn is required for lookup' if msisdn.nil?
+        fail ArgumentError,'sender is required for lookup' if sender.nil?
 
         response = @client.send_request(
             method: 'GET',

data/lib/urbanairship/devices/sms_notification.rb

@@ -15,20 +15,15 @@ module Urbanairship
 
       def initialize(client: required('client'))
         @client = client
-        @alert = nil
-        @generic_alert = nil
-        @expiry = nil
-        @shorten_links = nil
-        @template_id = nil
       end
 
       def sms_notification_override
         {
-           "alert": @generic_alert,
+           "alert": generic_alert,
            "sms": {
-              "alert": @sms_alert,
-              "expiry": @expiry,
-              "shorten_links": @shorten_links
+              "alert": sms_alert,
+              "expiry": expiry,
+              "shorten_links": shorten_links
            }
         }
       end

data/lib/urbanairship/devices/static_lists.rb

@@ -11,12 +11,11 @@ module Urbanairship
       def initialize(client: required('client'))
         fail ArgumentError, 'Client cannot be set to nil' if client.nil?
         @client = client
-        @name = nil
       end
 
       def create(description: nil, extras: nil)
-        fail ArgumentError, 'Name must be set' if @name.nil?
-        payload = {'name' => @name}
+        fail ArgumentError, 'Name must be set' if name.nil?
+        payload = {'name': name}
         payload['description'] = description unless description.nil?
         payload['extras'] = extras unless extras.nil?
 
@@ -31,7 +30,7 @@ module Urbanairship
       end
 
       def upload(csv_file: required('csv_file'), gzip: false)
-        fail ArgumentError, 'Name must be set' if @name.nil?
+        fail ArgumentError, 'Name must be set' if name.nil?
         if gzip
           response = @client.send_request(
               method: 'PUT',
@@ -53,7 +52,7 @@ module Urbanairship
       end
 
       def update(description: nil, extras: nil)
-        fail ArgumentError, 'Name must be set' if @name.nil?
+        fail ArgumentError, 'Name must be set' if name.nil?
         fail ArgumentError,
            'Either description or extras must be set to a value' if description.nil? and extras.nil?
         payload = {}
@@ -70,7 +69,7 @@ module Urbanairship
       end
 
       def lookup
-        fail ArgumentError, 'Name must be set' if @name.nil?
+        fail ArgumentError, 'Name must be set' if name.nil?
         response = @client.send_request(
           method: 'GET',
           url: LISTS_URL + @name
@@ -80,7 +79,7 @@ module Urbanairship
       end
 
       def delete
-        fail ArgumentError, 'Name must be set' if @name.nil?
+        fail ArgumentError, 'Name must be set' if name.nil?
         response = @client.send_request(
           method: 'DELETE',
           url: LISTS_URL + @name

data/lib/urbanairship/version.rb

@@ -1,3 +1,3 @@
 module Urbanairship
-  VERSION = '5.5.1'
+  VERSION = '5.6.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: urbanairship
 version: !ruby/object:Gem::Version
-  version: 5.5.1
+  version: 5.6.0
 platform: ruby
 authors:
 - Airship
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-14 00:00:00.000000000 Z
+date: 2020-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client