zyphr 0.1.3 → 0.1.6

data/lib/zyphr/models/device.rb

@@ -17,21 +17,19 @@ module Zyphr
   class Device
     attr_accessor :id
 
-    attr_accessor :subscriber_id
+    attr_accessor :user_id
 
     attr_accessor :platform
 
-    attr_accessor :app_version
+    attr_accessor :token
 
-    attr_accessor :device_model
+    attr_accessor :metadata
 
-    attr_accessor :os_version
-
-    attr_accessor :status
+    attr_accessor :last_active_at
 
     attr_accessor :created_at
 
-    attr_accessor :last_seen_at
+    attr_accessor :updated_at
 
     class EnumAttributeValidator
       attr_reader :datatype
@@ -59,14 +57,13 @@ module Zyphr
     def self.attribute_map
       {
         :'id' => :'id',
-        :'subscriber_id' => :'subscriber_id',
+        :'user_id' => :'user_id',
         :'platform' => :'platform',
-        :'app_version' => :'app_version',
-        :'device_model' => :'device_model',
-        :'os_version' => :'os_version',
-        :'status' => :'status',
+        :'token' => :'token',
+        :'metadata' => :'metadata',
+        :'last_active_at' => :'last_active_at',
         :'created_at' => :'created_at',
-        :'last_seen_at' => :'last_seen_at'
+        :'updated_at' => :'updated_at'
       }
     end
 
@@ -84,25 +81,20 @@ module Zyphr
     def self.openapi_types
       {
         :'id' => :'String',
-        :'subscriber_id' => :'String',
+        :'user_id' => :'String',
         :'platform' => :'String',
-        :'app_version' => :'String',
-        :'device_model' => :'String',
-        :'os_version' => :'String',
-        :'status' => :'String',
+        :'token' => :'String',
+        :'metadata' => :'Hash<String, Object>',
+        :'last_active_at' => :'Time',
         :'created_at' => :'Time',
-        :'last_seen_at' => :'Time'
+        :'updated_at' => :'Time'
       }
     end
 
     # List of attributes with nullable: true
     def self.openapi_nullable
       Set.new([
-        :'subscriber_id',
-        :'app_version',
-        :'device_model',
-        :'os_version',
-        :'last_seen_at'
+        :'last_active_at',
       ])
     end
 
@@ -126,36 +118,34 @@ module Zyphr
         self.id = attributes[:'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?(:'app_version')
-        self.app_version = attributes[:'app_version']
-      end
-
-      if attributes.key?(:'device_model')
-        self.device_model = attributes[:'device_model']
+      if attributes.key?(:'token')
+        self.token = attributes[:'token']
       end
 
-      if attributes.key?(:'os_version')
-        self.os_version = attributes[:'os_version']
+      if attributes.key?(:'metadata')
+        if (value = attributes[:'metadata']).is_a?(Hash)
+          self.metadata = value
+        end
       end
 
-      if attributes.key?(:'status')
-        self.status = attributes[:'status']
+      if attributes.key?(:'last_active_at')
+        self.last_active_at = attributes[:'last_active_at']
       end
 
       if attributes.key?(:'created_at')
         self.created_at = attributes[:'created_at']
       end
 
-      if attributes.key?(:'last_seen_at')
-        self.last_seen_at = attributes[:'last_seen_at']
+      if attributes.key?(:'updated_at')
+        self.updated_at = attributes[:'updated_at']
       end
     end
 
@@ -173,8 +163,6 @@ module Zyphr
       warn '[DEPRECATED] the `valid?` method is obsolete'
       platform_validator = EnumAttributeValidator.new('String', ["ios", "android", "web"])
       return false unless platform_validator.valid?(@platform)
-      status_validator = EnumAttributeValidator.new('String', ["active", "inactive"])
-      return false unless status_validator.valid?(@status)
       true
     end
 
@@ -188,30 +176,19 @@ 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', ["active", "inactive"])
-      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)
       return true if self.equal?(o)
       self.class == o.class &&
           id == o.id &&
-          subscriber_id == o.subscriber_id &&
+          user_id == o.user_id &&
           platform == o.platform &&
-          app_version == o.app_version &&
-          device_model == o.device_model &&
-          os_version == o.os_version &&
-          status == o.status &&
+          token == o.token &&
+          metadata == o.metadata &&
+          last_active_at == o.last_active_at &&
           created_at == o.created_at &&
-          last_seen_at == o.last_seen_at
+          updated_at == o.updated_at
     end
 
     # @see the `==` method
@@ -223,7 +200,7 @@ module Zyphr
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [id, subscriber_id, platform, app_version, device_model, os_version, status, created_at, last_seen_at].hash
+      [id, user_id, platform, token, metadata, last_active_at, created_at, updated_at].hash
     end
 
     # Builds the object from hash

data/lib/zyphr/models/device_stats.rb

@@ -19,11 +19,14 @@ module Zyphr
 
     attr_accessor :by_platform
 
+    attr_accessor :active30_days
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
         :'total' => :'total',
-        :'by_platform' => :'by_platform'
+        :'by_platform' => :'byPlatform',
+        :'active30_days' => :'active30Days'
       }
     end
 
@@ -41,7 +44,8 @@ module Zyphr
     def self.openapi_types
       {
         :'total' => :'Integer',
-        :'by_platform' => :'Hash<String, Integer>'
+        :'by_platform' => :'Hash<String, Integer>',
+        :'active30_days' => :'Integer'
       }
     end
 
@@ -76,6 +80,10 @@ module Zyphr
           self.by_platform = value
         end
       end
+
+      if attributes.key?(:'active30_days')
+        self.active30_days = attributes[:'active30_days']
+      end
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -99,7 +107,8 @@ module Zyphr
       return true if self.equal?(o)
       self.class == o.class &&
           total == o.total &&
-          by_platform == o.by_platform
+          by_platform == o.by_platform &&
+          active30_days == o.active30_days
     end
 
     # @see the `==` method
@@ -111,7 +120,7 @@ module Zyphr
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [total, by_platform].hash
+      [total, by_platform, active30_days].hash
     end
 
     # Builds the object from hash

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