zyphr 0.1.4 → 0.1.8

data/lib/zyphr/models/push_message.rb

@@ -19,22 +19,28 @@ module Zyphr
 
     attr_accessor :device_id
 
-    attr_accessor :subscriber_id
+    attr_accessor :user_id
+
+    attr_accessor :platform
 
     attr_accessor :title
 
     attr_accessor :body
 
+    attr_accessor :data
+
     attr_accessor :status
 
-    attr_accessor :platform
+    attr_accessor :tags
 
-    attr_accessor :created_at
+    attr_accessor :queued_at
 
     attr_accessor :sent_at
 
     attr_accessor :delivered_at
 
+    attr_accessor :created_at
+
     class EnumAttributeValidator
       attr_reader :datatype
       attr_reader :allowable_values
@@ -62,14 +68,17 @@ module Zyphr
       {
         :'id' => :'id',
         :'device_id' => :'device_id',
-        :'subscriber_id' => :'subscriber_id',
+        :'user_id' => :'user_id',
+        :'platform' => :'platform',
         :'title' => :'title',
         :'body' => :'body',
+        :'data' => :'data',
         :'status' => :'status',
-        :'platform' => :'platform',
-        :'created_at' => :'created_at',
+        :'tags' => :'tags',
+        :'queued_at' => :'queued_at',
         :'sent_at' => :'sent_at',
-        :'delivered_at' => :'delivered_at'
+        :'delivered_at' => :'delivered_at',
+        :'created_at' => :'created_at'
       }
     end
 
@@ -88,23 +97,26 @@ module Zyphr
       {
         :'id' => :'String',
         :'device_id' => :'String',
-        :'subscriber_id' => :'String',
+        :'user_id' => :'String',
+        :'platform' => :'String',
         :'title' => :'String',
         :'body' => :'String',
+        :'data' => :'Hash<String, Object>',
         :'status' => :'String',
-        :'platform' => :'String',
-        :'created_at' => :'Time',
+        :'tags' => :'Array<String>',
+        :'queued_at' => :'Time',
         :'sent_at' => :'Time',
-        :'delivered_at' => :'Time'
+        :'delivered_at' => :'Time',
+        :'created_at' => :'Time'
       }
     end
 
     # List of attributes with nullable: true
     def self.openapi_nullable
       Set.new([
-        :'subscriber_id',
+        :'queued_at',
         :'sent_at',
-        :'delivered_at'
+        :'delivered_at',
       ])
     end
 
@@ -132,8 +144,12 @@ module Zyphr
         self.device_id = attributes[:'device_id']
       end
 
-      if attributes.key?(:'subscriber_id')
-        self.subscriber_id = attributes[:'subscriber_id']
+      if attributes.key?(:'user_id')
+        self.user_id = attributes[:'user_id']
+      end
+
+      if attributes.key?(:'platform')
+        self.platform = attributes[:'platform']
       end
 
       if attributes.key?(:'title')
@@ -144,16 +160,24 @@ module Zyphr
         self.body = attributes[:'body']
       end
 
+      if attributes.key?(:'data')
+        if (value = attributes[:'data']).is_a?(Hash)
+          self.data = value
+        end
+      end
+
       if attributes.key?(:'status')
         self.status = attributes[:'status']
       end
 
-      if attributes.key?(:'platform')
-        self.platform = attributes[:'platform']
+      if attributes.key?(:'tags')
+        if (value = attributes[:'tags']).is_a?(Array)
+          self.tags = value
+        end
       end
 
-      if attributes.key?(:'created_at')
-        self.created_at = attributes[:'created_at']
+      if attributes.key?(:'queued_at')
+        self.queued_at = attributes[:'queued_at']
       end
 
       if attributes.key?(:'sent_at')
@@ -163,6 +187,10 @@ module Zyphr
       if attributes.key?(:'delivered_at')
         self.delivered_at = attributes[:'delivered_at']
       end
+
+      if attributes.key?(:'created_at')
+        self.created_at = attributes[:'created_at']
+      end
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -177,23 +205,13 @@ module Zyphr
     # @return true if the model is valid
     def valid?
       warn '[DEPRECATED] the `valid?` method is obsolete'
-      status_validator = EnumAttributeValidator.new('String', ["pending", "queued", "sent", "delivered", "failed"])
-      return false unless status_validator.valid?(@status)
       platform_validator = EnumAttributeValidator.new('String', ["ios", "android", "web"])
       return false unless platform_validator.valid?(@platform)
+      status_validator = EnumAttributeValidator.new('String', ["queued", "sending", "sent", "delivered", "failed", "expired"])
+      return false unless status_validator.valid?(@status)
       true
     end
 
-    # Custom attribute writer method checking allowed values (enum).
-    # @param [Object] status Object to be assigned
-    def status=(status)
-      validator = EnumAttributeValidator.new('String', ["pending", "queued", "sent", "delivered", "failed"])
-      unless validator.valid?(status)
-        fail ArgumentError, "invalid value for \"status\", must be one of #{validator.allowable_values}."
-      end
-      @status = status
-    end
-
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] platform Object to be assigned
     def platform=(platform)
@@ -204,6 +222,16 @@ module Zyphr
       @platform = platform
     end
 
+    # Custom attribute writer method checking allowed values (enum).
+    # @param [Object] status Object to be assigned
+    def status=(status)
+      validator = EnumAttributeValidator.new('String', ["queued", "sending", "sent", "delivered", "failed", "expired"])
+      unless validator.valid?(status)
+        fail ArgumentError, "invalid value for \"status\", must be one of #{validator.allowable_values}."
+      end
+      @status = status
+    end
+
     # Checks equality by comparing each attribute.
     # @param [Object] Object to be compared
     def ==(o)
@@ -211,14 +239,17 @@ module Zyphr
       self.class == o.class &&
           id == o.id &&
           device_id == o.device_id &&
-          subscriber_id == o.subscriber_id &&
+          user_id == o.user_id &&
+          platform == o.platform &&
           title == o.title &&
           body == o.body &&
+          data == o.data &&
           status == o.status &&
-          platform == o.platform &&
-          created_at == o.created_at &&
+          tags == o.tags &&
+          queued_at == o.queued_at &&
           sent_at == o.sent_at &&
-          delivered_at == o.delivered_at
+          delivered_at == o.delivered_at &&
+          created_at == o.created_at
     end
 
     # @see the `==` method
@@ -230,7 +261,7 @@ module Zyphr
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [id, device_id, subscriber_id, title, body, status, platform, created_at, sent_at, delivered_at].hash
+      [id, device_id, user_id, platform, title, body, data, status, tags, queued_at, sent_at, delivered_at, created_at].hash
     end
 
     # Builds the object from hash

data/lib/zyphr/models/push_message_detail.rb

@@ -19,27 +19,29 @@ module Zyphr
 
     attr_accessor :device_id
 
-    attr_accessor :subscriber_id
+    attr_accessor :user_id
+
+    attr_accessor :platform
 
     attr_accessor :title
 
     attr_accessor :body
 
+    attr_accessor :data
+
     attr_accessor :status
 
-    attr_accessor :platform
+    attr_accessor :tags
 
-    attr_accessor :created_at
+    attr_accessor :queued_at
 
     attr_accessor :sent_at
 
     attr_accessor :delivered_at
 
-    attr_accessor :batch_id
-
-    attr_accessor :user_id
+    attr_accessor :created_at
 
-    attr_accessor :data
+    attr_accessor :batch_id
 
     attr_accessor :badge
 
@@ -47,16 +49,16 @@ module Zyphr
 
     attr_accessor :image_url
 
+    attr_accessor :content_available
+
+    attr_accessor :action_buttons
+
     attr_accessor :status_reason
 
     attr_accessor :provider_message_id
 
-    attr_accessor :tags
-
     attr_accessor :metadata
 
-    attr_accessor :queued_at
-
     attr_accessor :failed_at
 
     attr_accessor :events
@@ -88,25 +90,26 @@ module Zyphr
       {
         :'id' => :'id',
         :'device_id' => :'device_id',
-        :'subscriber_id' => :'subscriber_id',
+        :'user_id' => :'user_id',
+        :'platform' => :'platform',
         :'title' => :'title',
         :'body' => :'body',
+        :'data' => :'data',
         :'status' => :'status',
-        :'platform' => :'platform',
-        :'created_at' => :'created_at',
+        :'tags' => :'tags',
+        :'queued_at' => :'queued_at',
         :'sent_at' => :'sent_at',
         :'delivered_at' => :'delivered_at',
+        :'created_at' => :'created_at',
         :'batch_id' => :'batch_id',
-        :'user_id' => :'user_id',
-        :'data' => :'data',
         :'badge' => :'badge',
         :'sound' => :'sound',
         :'image_url' => :'image_url',
+        :'content_available' => :'content_available',
+        :'action_buttons' => :'action_buttons',
         :'status_reason' => :'status_reason',
         :'provider_message_id' => :'provider_message_id',
-        :'tags' => :'tags',
         :'metadata' => :'metadata',
-        :'queued_at' => :'queued_at',
         :'failed_at' => :'failed_at',
         :'events' => :'events'
       }
@@ -127,25 +130,26 @@ module Zyphr
       {
         :'id' => :'String',
         :'device_id' => :'String',
-        :'subscriber_id' => :'String',
+        :'user_id' => :'String',
+        :'platform' => :'String',
         :'title' => :'String',
         :'body' => :'String',
+        :'data' => :'Hash<String, Object>',
         :'status' => :'String',
-        :'platform' => :'String',
-        :'created_at' => :'Time',
+        :'tags' => :'Array<String>',
+        :'queued_at' => :'Time',
         :'sent_at' => :'Time',
         :'delivered_at' => :'Time',
+        :'created_at' => :'Time',
         :'batch_id' => :'String',
-        :'user_id' => :'String',
-        :'data' => :'Hash<String, Object>',
-        :'badge' => :'String',
+        :'badge' => :'Integer',
         :'sound' => :'String',
         :'image_url' => :'String',
+        :'content_available' => :'Boolean',
+        :'action_buttons' => :'Array<PushMessageDetailAllOfActionButtons>',
         :'status_reason' => :'String',
         :'provider_message_id' => :'String',
-        :'tags' => :'Array<String>',
         :'metadata' => :'Hash<String, Object>',
-        :'queued_at' => :'Time',
         :'failed_at' => :'Time',
         :'events' => :'Array<PushEvent>'
       }
@@ -154,14 +158,16 @@ module Zyphr
     # List of attributes with nullable: true
     def self.openapi_nullable
       Set.new([
-        :'subscriber_id',
+        :'queued_at',
         :'sent_at',
         :'delivered_at',
         :'batch_id',
-        :'user_id',
+        :'badge',
+        :'sound',
+        :'image_url',
+        :'action_buttons',
         :'status_reason',
         :'provider_message_id',
-        :'queued_at',
         :'failed_at',
       ])
     end
@@ -197,8 +203,12 @@ module Zyphr
         self.device_id = attributes[:'device_id']
       end
 
-      if attributes.key?(:'subscriber_id')
-        self.subscriber_id = attributes[:'subscriber_id']
+      if attributes.key?(:'user_id')
+        self.user_id = attributes[:'user_id']
+      end
+
+      if attributes.key?(:'platform')
+        self.platform = attributes[:'platform']
       end
 
       if attributes.key?(:'title')
@@ -209,16 +219,24 @@ module Zyphr
         self.body = attributes[:'body']
       end
 
+      if attributes.key?(:'data')
+        if (value = attributes[:'data']).is_a?(Hash)
+          self.data = value
+        end
+      end
+
       if attributes.key?(:'status')
         self.status = attributes[:'status']
       end
 
-      if attributes.key?(:'platform')
-        self.platform = attributes[:'platform']
+      if attributes.key?(:'tags')
+        if (value = attributes[:'tags']).is_a?(Array)
+          self.tags = value
+        end
       end
 
-      if attributes.key?(:'created_at')
-        self.created_at = attributes[:'created_at']
+      if attributes.key?(:'queued_at')
+        self.queued_at = attributes[:'queued_at']
       end
 
       if attributes.key?(:'sent_at')
@@ -229,18 +247,12 @@ module Zyphr
         self.delivered_at = attributes[:'delivered_at']
       end
 
-      if attributes.key?(:'batch_id')
-        self.batch_id = attributes[:'batch_id']
-      end
-
-      if attributes.key?(:'user_id')
-        self.user_id = attributes[:'user_id']
+      if attributes.key?(:'created_at')
+        self.created_at = attributes[:'created_at']
       end
 
-      if attributes.key?(:'data')
-        if (value = attributes[:'data']).is_a?(Hash)
-          self.data = value
-        end
+      if attributes.key?(:'batch_id')
+        self.batch_id = attributes[:'batch_id']
       end
 
       if attributes.key?(:'badge')
@@ -255,6 +267,16 @@ module Zyphr
         self.image_url = attributes[:'image_url']
       end
 
+      if attributes.key?(:'content_available')
+        self.content_available = attributes[:'content_available']
+      end
+
+      if attributes.key?(:'action_buttons')
+        if (value = attributes[:'action_buttons']).is_a?(Array)
+          self.action_buttons = value
+        end
+      end
+
       if attributes.key?(:'status_reason')
         self.status_reason = attributes[:'status_reason']
       end
@@ -263,22 +285,12 @@ module Zyphr
         self.provider_message_id = attributes[:'provider_message_id']
       end
 
-      if attributes.key?(:'tags')
-        if (value = attributes[:'tags']).is_a?(Array)
-          self.tags = value
-        end
-      end
-
       if attributes.key?(:'metadata')
         if (value = attributes[:'metadata']).is_a?(Hash)
           self.metadata = value
         end
       end
 
-      if attributes.key?(:'queued_at')
-        self.queued_at = attributes[:'queued_at']
-      end
-
       if attributes.key?(:'failed_at')
         self.failed_at = attributes[:'failed_at']
       end
@@ -302,23 +314,13 @@ module Zyphr
     # @return true if the model is valid
     def valid?
       warn '[DEPRECATED] the `valid?` method is obsolete'
-      status_validator = EnumAttributeValidator.new('String', ["pending", "queued", "sent", "delivered", "failed"])
-      return false unless status_validator.valid?(@status)
       platform_validator = EnumAttributeValidator.new('String', ["ios", "android", "web"])
       return false unless platform_validator.valid?(@platform)
+      status_validator = EnumAttributeValidator.new('String', ["queued", "sending", "sent", "delivered", "failed", "expired"])
+      return false unless status_validator.valid?(@status)
       true
     end
 
-    # Custom attribute writer method checking allowed values (enum).
-    # @param [Object] status Object to be assigned
-    def status=(status)
-      validator = EnumAttributeValidator.new('String', ["pending", "queued", "sent", "delivered", "failed"])
-      unless validator.valid?(status)
-        fail ArgumentError, "invalid value for \"status\", must be one of #{validator.allowable_values}."
-      end
-      @status = status
-    end
-
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] platform Object to be assigned
     def platform=(platform)
@@ -329,6 +331,16 @@ module Zyphr
       @platform = platform
     end
 
+    # Custom attribute writer method checking allowed values (enum).
+    # @param [Object] status Object to be assigned
+    def status=(status)
+      validator = EnumAttributeValidator.new('String', ["queued", "sending", "sent", "delivered", "failed", "expired"])
+      unless validator.valid?(status)
+        fail ArgumentError, "invalid value for \"status\", must be one of #{validator.allowable_values}."
+      end
+      @status = status
+    end
+
     # Checks equality by comparing each attribute.
     # @param [Object] Object to be compared
     def ==(o)
@@ -336,25 +348,26 @@ module Zyphr
       self.class == o.class &&
           id == o.id &&
           device_id == o.device_id &&
-          subscriber_id == o.subscriber_id &&
+          user_id == o.user_id &&
+          platform == o.platform &&
           title == o.title &&
           body == o.body &&
+          data == o.data &&
           status == o.status &&
-          platform == o.platform &&
-          created_at == o.created_at &&
+          tags == o.tags &&
+          queued_at == o.queued_at &&
           sent_at == o.sent_at &&
           delivered_at == o.delivered_at &&
+          created_at == o.created_at &&
           batch_id == o.batch_id &&
-          user_id == o.user_id &&
-          data == o.data &&
           badge == o.badge &&
           sound == o.sound &&
           image_url == o.image_url &&
+          content_available == o.content_available &&
+          action_buttons == o.action_buttons &&
           status_reason == o.status_reason &&
           provider_message_id == o.provider_message_id &&
-          tags == o.tags &&
           metadata == o.metadata &&
-          queued_at == o.queued_at &&
           failed_at == o.failed_at &&
           events == o.events
     end
@@ -368,7 +381,7 @@ module Zyphr
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [id, device_id, subscriber_id, title, body, status, platform, created_at, sent_at, delivered_at, batch_id, user_id, data, badge, sound, image_url, status_reason, provider_message_id, tags, metadata, queued_at, failed_at, events].hash
+      [id, device_id, user_id, platform, title, body, data, status, tags, queued_at, sent_at, delivered_at, created_at, batch_id, badge, sound, image_url, content_available, action_buttons, status_reason, provider_message_id, metadata, failed_at, events].hash
     end
 
     # Builds the object from hash