mparticle 1.0.6 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9762788a48567b16db7faaf386973958808cfabeca373df4269b1a45a3906641
-  data.tar.gz: f1ef718e0e8454bfb1eb8589b9133be95b462f6d8edf4d8f4ceec3a0f1592645
+  metadata.gz: 2e643f74d5e885c07ad75683d3051bbab37e1736d423d013a03c9d69ac57eaea
+  data.tar.gz: cdc2cc3d1adb8a2455cbe51eb081a2c3ce81ee72377ae7dac48fd88357ec5f0f
 SHA512:
-  metadata.gz: 1d13b1ea200c1df11fbb53e2dd152eca13f7bc5b3b90d615f7a9452782b083e80f55c910c70a21bd483bee55aaecf442e83b06a4e463ec1a553552c5c2be2950
-  data.tar.gz: 71421fb7806a281311039f53d627df412953e91151feeb66b80dc3d61edd32eb1bbc05f129901187f055799ca200c239b916b51b8a02b8e05199b927fdd403b6
+  metadata.gz: 412958414338ad3f126b1e57078c350d748593c5917f53252f1abaf3b8500d11a7cfd04e9cbe022cffc260d6ed908798e20bba1464d9ca84716bde3c35025816
+  data.tar.gz: a57f039027d6d5106a9d63e2de08eabdbd99e18a9121bcc0178b7327a4566f939560abd1e9a1a6c2fb6e4c0aec6c1d02e33f063fa79dc941a73385bb8f8d4685

data/README.md

@@ -41,6 +41,11 @@ api_instance = MParticle::EventsApi.new(config)
 
 batch = MParticle::Batch.new
 batch.environment = 'development'
+batch.context =  MParticle::BatchContext.new
+
+batch.context.data_plan =  MParticle::DataPlanContext.new
+batch.context.data_plan.plan_id =  'my_plan_id'
+batch.context.data_plan.plan_version =  1
 
 user_identities = MParticle::UserIdentities.new
 user_identities.customerid = '12345'

data/docs/Batch.md

@@ -18,3 +18,6 @@
 | **api_key**                 | **String**                                              |             | [optional] |
 | **mpid**                    | **Integer**                                             |             | [optional] |
 | **mp_deviceid**             | **String**                                              |             | [optional] |
+| **timestamp_unixtime_ms**   | **Integer**                                             |             | [optional] |
+| **context**                 | [**BatchContext**](BatchContext.md)                     |             | [optional] |
+| **integration_attributes**  | **Hash<Integer,Hash<String,String>>**                          |             | [optional] |

data/docs/DeviceInformation.md

@@ -35,6 +35,8 @@ Name | Type | Description | Notes
 **has_nfc** | **BOOLEAN** |  | [optional] 
 **bluetooth_enabled** | **BOOLEAN** |  | [optional] 
 **bluetooth_version** | **String** |  | [optional] 
+**att_timestamp_unixtime_ms** | **Integer** |  | [optional] 
+**att_authorization_status** | **String** |  | [optional] 
 **ios_idfv** | **String** |  | [optional] 
 **android_advertising_id** | **String** |  | [optional] 
 

data/docs/UserIdentities.md

@@ -13,5 +13,17 @@ Name | Type | Description | Notes
 **email** | **String** |  | [optional] 
 **_alias** | **String** |  | [optional] 
 **facebook_custom_audience_id** | **String** |  | [optional] 
+**other_id_2** | **String** |  | [optional] 
+**other_id_3** | **String** |  | [optional] 
+**other_id_4** | **String** |  | [optional] 
+**other_id_5** | **String** |  | [optional] 
+**other_id_6** | **String** |  | [optional] 
+**other_id_7** | **String** |  | [optional] 
+**other_id_8** | **String** |  | [optional] 
+**other_id_9** | **String** |  | [optional] 
+**other_id_10** | **String** |  | [optional] 
+**mobile_number** | **String** |  | [optional] 
+**phone_number_2** | **String** |  | [optional] 
+**phone_number_3** | **String** |  | [optional] 
 
 

data/example/main.rb

@@ -2,6 +2,7 @@
 
 # load the gem
 require 'mparticle'
+require 'date'
 config = MParticle::Configuration.new
 config.api_key = 'REPLACE WITH API KEY'
 config.api_secret = 'REPLACE WITH API SECRET'
@@ -10,8 +11,13 @@ config.api_secret = 'REPLACE WITH API SECRET'
 api_instance = MParticle::EventsApi.new(config)
 
 batch = MParticle::Batch.new
+batch.timestamp_unixtime_ms = DateTime.now.strftime('%Q').to_i
 batch.environment = 'development'
 
+batch.device_info = MParticle::DeviceInformation.new
+batch.device_info.att_timestamp_unixtime_ms = DateTime.now.strftime('%Q').to_i
+batch.device_info.att_authorization_status = 'authorized'
+
 user_identities = MParticle::UserIdentities.new
 user_identities.customerid = '12345'
 
@@ -54,14 +60,14 @@ batch.user_identities = user_identities
 ccpa_consent_state = MParticle::CCPAConsentState.new
 ccpa_consent_state.document = 'document.agreement.v3'
 ccpa_consent_state.consented = true
-ccpa_consent_state.timestamp_unixtime_ms = Time.now.to_i
+ccpa_consent_state.timestamp_unixtime_ms = (Time.now.to_f * 1000).to_i
 ccpa_consent_state.location = 'mparticle.test/signup'
 ccpa_consent_state.hardware_id = 'IDFA:a5d96n32-224a-3b11-1088-a202695bc710'
 
 gdpr_consent_state = MParticle::GDPRConsentState.new
 gdpr_consent_state.document = 'document_agreement.v2'
 gdpr_consent_state.consented = true
-gdpr_consent_state.timestamp_unixtime_ms = Time.now.to_i
+gdpr_consent_state.timestamp_unixtime_ms = (Time.now.to_f * 1000).to_i
 gdpr_consent_state.location = 'dtmgbank.com/signup'
 gdpr_consent_state.hardware_id = 'IDFA:a5d934n0-232f-4afc-2e9a-3832d95zc702'
 
@@ -86,5 +92,5 @@ begin
   # wait for the thread, otherwise process may exit too early
   thread.join
 rescue MParticle::ApiError => e
-  puts "Exception when calling mParticle: #{e}"
+  puts "Exception when calling mParticle: #{e.code}"
 end

data/lib/mparticle.rb

@@ -41,6 +41,8 @@ require 'mparticle/models/session_start_event'
 require 'mparticle/models/shopping_cart'
 require 'mparticle/models/source_information'
 require 'mparticle/models/user_identities'
+require 'mparticle/models/batch_context'
+require 'mparticle/models/data_plan_context'
 
 # APIs
 require 'mparticle/api/events_api'

data/lib/mparticle/api_client.rb

@@ -19,7 +19,7 @@ module MParticle
     # @option config [Configuration] Configuration for initializing the object, default to Configuration.default
     def initialize(config)
       @config = config
-      @user_agent = "mParticle Ruby client/1.0.3"
+      @user_agent = "mParticle Ruby client/1.1.0"
       @default_headers = {
         'Content-Type' => "application/json",
         'User-Agent' => @user_agent

data/lib/mparticle/models/batch.rb

@@ -31,6 +31,12 @@ module MParticle
 
     attr_accessor :mp_deviceid
 
+    attr_accessor :timestamp_unixtime_ms
+
+    attr_accessor :context
+
+    attr_accessor :integration_attributes
+    
     class EnumAttributeValidator
       attr_reader :datatype
       attr_reader :allowable_values
@@ -109,7 +115,10 @@ module MParticle
         :'user_identities' => :'user_identities',
         :'api_key' => :'api_key',
         :'mpid' => :'mpid',
-        :'mp_deviceid' => :'mp_deviceid'
+        :'mp_deviceid' => :'mp_deviceid',
+        :'timestamp_unixtime_ms' => :'timestamp_unixtime_ms',
+        :'context' => :'context',
+        :'integration_attributes' => :'integration_attributes'
       }
     end
 
@@ -128,7 +137,11 @@ module MParticle
         :'user_identities' => :'UserIdentities',
         :'api_key' => :'String',
         :'mpid' => :'Integer',
-        :'mp_deviceid' => :'String'
+        :'mp_deviceid' => :'String',
+        :'timestamp_unixtime_ms' => :'Integer',
+        :'consent_state' => :'ConsentState',
+        :'context' => :'BatchContext',
+        :'integration_attributes' => :'Hash<Integer,Hash<String,String>>'
       }
     end
 
@@ -196,6 +209,22 @@ module MParticle
         self.mp_deviceid = attributes[:'mp_deviceid']
       end
 
+      if attributes.has_key?(:'timestamp_unixtime_ms')
+        self.timestamp_unixtime_ms = attributes[:'timestamp_unixtime_ms']
+      end
+
+      if attributes.has_key?(:'consent_state')
+        self.consent_state = attributes[:'consent_state']
+      end
+
+      if attributes.has_key?(:'context')
+        self.context = attributes[:'context']
+      end
+      
+      if attributes.has_key?(:'integration_attributes')
+        self.integration_attributes = attributes[:'integration_attributes']
+      end
+
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -245,7 +274,9 @@ module MParticle
           user_identities == o.user_identities &&
           api_key == o.api_key &&
           mpid == o.mpid &&
-          mp_deviceid == o.mp_deviceid
+          mp_deviceid == o.mp_deviceid &&
+          timestamp_unixtime_ms == o.timestamp_unixtime_ms &&
+          integration_attributes == o.integration_attributes
     end
 
     # @see the `==` method
@@ -257,7 +288,7 @@ module MParticle
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [events, source_request_id, environment, ip, schema_version, device_info, application_info, user_attributes, deleted_user_attributes, user_identities, api_key, mpid, mp_deviceid].hash
+      [events, source_request_id, environment, ip, schema_version, device_info, application_info, user_attributes, deleted_user_attributes, user_identities, api_key, mpid, mp_deviceid, timestamp_unixtime_ms, integration_attributes].hash
     end
 
     # Builds the object from hash

data/lib/mparticle/models/batch_context.rb

@@ -0,0 +1,177 @@
+require 'date'
+
+module MParticle
+
+  class BatchContext
+    attr_accessor :data_plan
+
+
+    # Attribute mapping from ruby-style variable name to JSON key.
+    def self.attribute_map
+      {
+        :'data_plan' => :'data_plan'
+      }
+    end
+
+    # Attribute type mapping.
+    def self.swagger_types
+      {
+        :'data_plan' => :'DataPlanContext'
+      }
+    end
+
+    # Initializes the object
+    # @param [Hash] attributes Model attributes in the form of hash
+    def initialize(attributes = {})
+      return unless attributes.is_a?(Hash)
+
+      # convert string to symbol for hash key
+      attributes = attributes.each_with_object({}){|(k,v), h| h[k.to_sym] = v}
+
+      if attributes.has_key?(:'data_plan')
+        self.data_plan = attributes[:'data_plan']
+      end
+
+    end
+
+    # Show invalid properties with the reasons. Usually used together with valid?
+    # @return Array for valid properies with the reasons
+    def list_invalid_properties
+      invalid_properties = Array.new
+      return invalid_properties
+    end
+
+    # Check to see if the all the properties in the model are valid
+    # @return true if the model is valid
+    def valid?
+      return true
+    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 &&
+          data_plan == o.data_plan
+          
+    end
+
+    # @see the `==` method
+    # @param [Object] Object to be compared
+    def eql?(o)
+      self == o
+    end
+
+    # Calculates hash code according to all attributes.
+    # @return [Fixnum] Hash code
+    def hash
+      [data_plan].hash
+    end
+
+    # Builds the object from hash
+    # @param [Hash] attributes Model attributes in the form of hash
+    # @return [Object] Returns the model itself
+    def build_from_hash(attributes)
+      return nil unless attributes.is_a?(Hash)
+      self.class.swagger_types.each_pair do |key, type|
+        if type =~ /\AArray<(.*)>/i
+          # check to ensure the input is an array given that the the attribute
+          # is documented as an array but the input is not
+          if attributes[self.class.attribute_map[key]].is_a?(Array)
+            self.send("#{key}=", attributes[self.class.attribute_map[key]].map{ |v| _deserialize($1, v) } )
+          end
+        elsif !attributes[self.class.attribute_map[key]].nil?
+          self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
+        end # or else data not found in attributes(hash), not an issue as the data can be optional
+      end
+
+      self
+    end
+
+    # Deserializes the data based on type
+    # @param string type Data type
+    # @param string value Value to be deserialized
+    # @return [Object] Deserialized data
+    def _deserialize(type, value)
+      case type.to_sym
+      when :DateTime
+        DateTime.parse(value)
+      when :Date
+        Date.parse(value)
+      when :String
+        value.to_s
+      when :Integer
+        value.to_i
+      when :Float
+        value.to_f
+      when :BOOLEAN
+        if value.to_s =~ /\A(true|t|yes|y|1)\z/i
+          true
+        else
+          false
+        end
+      when :Object
+        # generic object (usually a Hash), return directly
+        value
+      when /\AArray<(?<inner_type>.+)>\z/
+        inner_type = Regexp.last_match[:inner_type]
+        value.map { |v| _deserialize(inner_type, v) }
+      when /\AHash<(?<k_type>.+?), (?<v_type>.+)>\z/
+        k_type = Regexp.last_match[:k_type]
+        v_type = Regexp.last_match[:v_type]
+        {}.tap do |hash|
+          value.each do |k, v|
+            hash[_deserialize(k_type, k)] = _deserialize(v_type, v)
+          end
+        end
+      else # model
+        temp_model = MParticle.const_get(type).new
+        temp_model.build_from_hash(value)
+      end
+    end
+
+    # Returns the string representation of the object
+    # @return [String] String presentation of the object
+    def to_s
+      to_hash.to_s
+    end
+
+    # to_body is an alias to to_hash (backward compatibility)
+    # @return [Hash] Returns the object in the form of hash
+    def to_body
+      to_hash
+    end
+
+    # Returns the object in the form of hash
+    # @return [Hash] Returns the object in the form of hash
+    def to_hash
+      hash = {}
+      self.class.attribute_map.each_pair do |attr, param|
+        value = self.send(attr)
+        next if value.nil?
+        hash[param] = _to_hash(value)
+      end
+      hash
+    end
+
+    # Outputs non-array value in the form of hash
+    # For object, use to_hash. Otherwise, just return the value
+    # @param [Object] value Any valid value
+    # @return [Hash] Returns the value in the form of hash
+    def _to_hash(value)
+      if value.is_a?(Array)
+        value.compact.map{ |v| _to_hash(v) }
+      elsif value.is_a?(Hash)
+        {}.tap do |hash|
+          value.each { |k, v| hash[k] = _to_hash(v) }
+        end
+      elsif value.respond_to? :to_hash
+        value.to_hash
+      else
+        value
+      end
+    end
+
+  end
+
+end

data/lib/mparticle/models/data_plan_context.rb

@@ -0,0 +1,186 @@
+require 'date'
+
+module MParticle
+
+  class DataPlanContext
+    attr_accessor :plan_id
+
+    attr_accessor :plan_version
+
+
+    # Attribute mapping from ruby-style variable name to JSON key.
+    def self.attribute_map
+      {
+        :'plan_id' => :'plan_id',
+        :'plan_version' => :'plan_version'
+      }
+    end
+
+    # Attribute type mapping.
+    def self.swagger_types
+      {
+        :'plan_id' => :'String',
+        :'plan_version' => :'Integer'
+      }
+    end
+
+    # Initializes the object
+    # @param [Hash] attributes Model attributes in the form of hash
+    def initialize(attributes = {})
+      return unless attributes.is_a?(Hash)
+
+      # convert string to symbol for hash key
+      attributes = attributes.each_with_object({}){|(k,v), h| h[k.to_sym] = v}
+
+      if attributes.has_key?(:'plan_id')
+        self.plan_id = attributes[:'plan_id']
+      end
+
+      if attributes.has_key?(:'plan_version')
+        self.plan_version = attributes[:'plan_version']
+      end
+
+    end
+
+    # Show invalid properties with the reasons. Usually used together with valid?
+    # @return Array for valid properies with the reasons
+    def list_invalid_properties
+      invalid_properties = Array.new
+      return invalid_properties
+    end
+
+    # Check to see if the all the properties in the model are valid
+    # @return true if the model is valid
+    def valid?
+      return true
+    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 &&
+          plan_id == o.plan_id &&
+          plan_version == o.plan_version
+          
+    end
+
+    # @see the `==` method
+    # @param [Object] Object to be compared
+    def eql?(o)
+      self == o
+    end
+
+    # Calculates hash code according to all attributes.
+    # @return [Fixnum] Hash code
+    def hash
+      [plan_id, plan_version].hash
+    end
+
+    # Builds the object from hash
+    # @param [Hash] attributes Model attributes in the form of hash
+    # @return [Object] Returns the model itself
+    def build_from_hash(attributes)
+      return nil unless attributes.is_a?(Hash)
+      self.class.swagger_types.each_pair do |key, type|
+        if type =~ /\AArray<(.*)>/i
+          # check to ensure the input is an array given that the the attribute
+          # is documented as an array but the input is not
+          if attributes[self.class.attribute_map[key]].is_a?(Array)
+            self.send("#{key}=", attributes[self.class.attribute_map[key]].map{ |v| _deserialize($1, v) } )
+          end
+        elsif !attributes[self.class.attribute_map[key]].nil?
+          self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
+        end # or else data not found in attributes(hash), not an issue as the data can be optional
+      end
+
+      self
+    end
+
+    # Deserializes the data based on type
+    # @param string type Data type
+    # @param string value Value to be deserialized
+    # @return [Object] Deserialized data
+    def _deserialize(type, value)
+      case type.to_sym
+      when :DateTime
+        DateTime.parse(value)
+      when :Date
+        Date.parse(value)
+      when :String
+        value.to_s
+      when :Integer
+        value.to_i
+      when :Float
+        value.to_f
+      when :BOOLEAN
+        if value.to_s =~ /\A(true|t|yes|y|1)\z/i
+          true
+        else
+          false
+        end
+      when :Object
+        # generic object (usually a Hash), return directly
+        value
+      when /\AArray<(?<inner_type>.+)>\z/
+        inner_type = Regexp.last_match[:inner_type]
+        value.map { |v| _deserialize(inner_type, v) }
+      when /\AHash<(?<k_type>.+?), (?<v_type>.+)>\z/
+        k_type = Regexp.last_match[:k_type]
+        v_type = Regexp.last_match[:v_type]
+        {}.tap do |hash|
+          value.each do |k, v|
+            hash[_deserialize(k_type, k)] = _deserialize(v_type, v)
+          end
+        end
+      else # model
+        temp_model = MParticle.const_get(type).new
+        temp_model.build_from_hash(value)
+      end
+    end
+
+    # Returns the string representation of the object
+    # @return [String] String presentation of the object
+    def to_s
+      to_hash.to_s
+    end
+
+    # to_body is an alias to to_hash (backward compatibility)
+    # @return [Hash] Returns the object in the form of hash
+    def to_body
+      to_hash
+    end
+
+    # Returns the object in the form of hash
+    # @return [Hash] Returns the object in the form of hash
+    def to_hash
+      hash = {}
+      self.class.attribute_map.each_pair do |attr, param|
+        value = self.send(attr)
+        next if value.nil?
+        hash[param] = _to_hash(value)
+      end
+      hash
+    end
+
+    # Outputs non-array value in the form of hash
+    # For object, use to_hash. Otherwise, just return the value
+    # @param [Object] value Any valid value
+    # @return [Hash] Returns the value in the form of hash
+    def _to_hash(value)
+      if value.is_a?(Array)
+        value.compact.map{ |v| _to_hash(v) }
+      elsif value.is_a?(Hash)
+        {}.tap do |hash|
+          value.each { |k, v| hash[k] = _to_hash(v) }
+        end
+      elsif value.respond_to? :to_hash
+        value.to_hash
+      else
+        value
+      end
+    end
+
+  end
+
+end

data/lib/mparticle/models/device_information.rb

@@ -67,6 +67,10 @@ module MParticle
 
     attr_accessor :bluetooth_version
 
+    attr_accessor :att_timestamp_unixtime_ms
+
+    attr_accessor :att_authorization_status
+
     attr_accessor :ios_idfv
 
     attr_accessor :android_advertising_id
@@ -128,6 +132,8 @@ module MParticle
         :'has_nfc' => :'has_nfc',
         :'bluetooth_enabled' => :'bluetooth_enabled',
         :'bluetooth_version' => :'bluetooth_version',
+        :'att_timestamp_unixtime_ms' => :'att_timestamp_unixtime_ms',
+        :'att_authorization_status' => :'att_authorization_status',
         :'ios_idfv' => :'ios_idfv',
         :'android_advertising_id' => :'android_advertising_id'
       }
@@ -168,6 +174,8 @@ module MParticle
         :'has_nfc' => :'BOOLEAN',
         :'bluetooth_enabled' => :'BOOLEAN',
         :'bluetooth_version' => :'String',
+        :'att_timestamp_unixtime_ms' => :'Integer',
+        :'att_authorization_status' => :'String',
         :'ios_idfv' => :'String',
         :'android_advertising_id' => :'String'
       }
@@ -309,6 +317,14 @@ module MParticle
         self.bluetooth_version = attributes[:'bluetooth_version']
       end
 
+      if attributes.has_key?(:'att_timestamp_unixtime_ms')
+        self.att_timestamp_unixtime_ms = attributes[:'att_timestamp_unixtime_ms']
+      end
+
+      if attributes.has_key?(:'att_authorization_status')
+        self.att_authorization_status = attributes[:'att_authorization_status']
+      end
+
       if attributes.has_key?(:'ios_idfv')
         self.ios_idfv = attributes[:'ios_idfv']
       end
@@ -330,7 +346,9 @@ module MParticle
     # @return true if the model is valid
     def valid?
       platform_validator = EnumAttributeValidator.new('String', ["Unknown", "iOS", "Android", "tvOS"])
+      att_validator = EnumAttributeValidator.new('String', ["authorized", "denied", "not_determined", "restricted"])
       return false unless platform_validator.valid?(@platform)
+      return false unless att_validator.valid?(@att_authorization_status)
       return true
     end
 
@@ -344,6 +362,16 @@ module MParticle
       @platform = platform
     end
 
+    # Custom attribute writer method checking allowed values (enum).
+    # @param [Object] att_authorization_status Object to be assigned
+    def att_authorization_status=(att_authorization_status)
+      validator = EnumAttributeValidator.new('String', ["authorized", "denied", "not_determined", "restricted"])
+      unless validator.valid?(att_authorization_status)
+        fail ArgumentError, "invalid value for 'att_authorization_status', must be one of #{validator.allowable_values}."
+      end
+      @att_authorization_status = att_authorization_status
+    end
+
     # Checks equality by comparing each attribute.
     # @param [Object] Object to be compared
     def ==(o)
@@ -381,6 +409,8 @@ module MParticle
           has_nfc == o.has_nfc &&
           bluetooth_enabled == o.bluetooth_enabled &&
           bluetooth_version == o.bluetooth_version &&
+          att_timestamp_unixtime_ms == o.att_timestamp_unixtime_ms &&
+          att_authorization_status == o.att_authorization_status &&
           ios_idfv == o.ios_idfv &&
           android_advertising_id == o.android_advertising_id
     end
@@ -394,7 +424,7 @@ module MParticle
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [brand, product, device, android_uuid, device_manufacturer, platform, os_version, device_model, screen_height, screen_width, screen_dpi, device_country, locale_language, locale_country, network_country, network_carrier, network_code, network_mobile_country_code, timezone_offset, build_identifier, http_header_user_agent, ios_advertising_id, push_token, cpu_architecture, is_tablet, push_notification_sound_enabled, push_notification_vibrate_enabled, radio_access_technology, supports_telephony, has_nfc, bluetooth_enabled, bluetooth_version, ios_idfv, android_advertising_id].hash
+      [brand, product, device, android_uuid, device_manufacturer, platform, os_version, device_model, screen_height, screen_width, screen_dpi, device_country, locale_language, locale_country, network_country, network_carrier, network_code, network_mobile_country_code, timezone_offset, build_identifier, http_header_user_agent, ios_advertising_id, push_token, cpu_architecture, is_tablet, push_notification_sound_enabled, push_notification_vibrate_enabled, radio_access_technology, supports_telephony, has_nfc, bluetooth_enabled, bluetooth_version, att_timestamp_unixtime_ms, att_authorization_status, ios_idfv, android_advertising_id].hash
     end
 
     # Builds the object from hash

data/lib/mparticle/models/user_identities.rb

@@ -23,6 +23,30 @@ module MParticle
 
     attr_accessor :facebook_custom_audience_id
 
+    attr_accessor :other_id_2
+
+    attr_accessor :other_id_3
+
+    attr_accessor :other_id_4
+
+    attr_accessor :other_id_5
+
+    attr_accessor :other_id_6
+
+    attr_accessor :other_id_7
+
+    attr_accessor :other_id_8
+
+    attr_accessor :other_id_9
+
+    attr_accessor :other_id_10
+
+    attr_accessor :mobile_number
+
+    attr_accessor :phone_number_2
+
+    attr_accessor :phone_number_3
+
 
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
@@ -36,7 +60,19 @@ module MParticle
         :'yahoo' => :'yahoo',
         :'email' => :'email',
         :'_alias' => :'alias',
-        :'facebook_custom_audience_id' => :'facebook_custom_audience_id'
+        :'facebook_custom_audience_id' => :'facebook_custom_audience_id',
+        :'other_id_2' => :'other_id_2',
+        :'other_id_3' => :'other_id_3',
+        :'other_id_4' => :'other_id_4',
+        :'other_id_5' => :'other_id_5',
+        :'other_id_6' => :'other_id_6',
+        :'other_id_7' => :'other_id_7',
+        :'other_id_8' => :'other_id_8',
+        :'other_id_9' => :'other_id_9',
+        :'other_id_10' => :'other_id_10',
+        :'mobile_number' => :'mobile_number',
+        :'phone_number_2' => :'phone_number_2',
+        :'phone_number_3' => :'phone_number_3'
       }
     end
 
@@ -52,7 +88,19 @@ module MParticle
         :'yahoo' => :'String',
         :'email' => :'String',
         :'_alias' => :'String',
-        :'facebook_custom_audience_id' => :'String'
+        :'facebook_custom_audience_id' => :'String',
+        :'other_id_2' => :'String',
+        :'other_id_3' => :'String',
+        :'other_id_4' => :'String',
+        :'other_id_5' => :'String',
+        :'other_id_6' => :'String',
+        :'other_id_7' => :'String',
+        :'other_id_8' => :'String',
+        :'other_id_9' => :'String',
+        :'other_id_10' => :'String',
+        :'mobile_number' => :'String',
+        :'phone_number_2' => :'String',
+        :'phone_number_3' => :'String'
       }
     end
 
@@ -104,6 +152,54 @@ module MParticle
         self.facebook_custom_audience_id = attributes[:'facebook_custom_audience_id']
       end
 
+      if attributes.has_key?(:'other_id_2')
+        self.other_id_2 = attributes[:'other_id_2']
+      end
+
+      if attributes.has_key?(:'other_id_3')
+        self.other_id_3 = attributes[:'other_id_3']
+      end
+
+      if attributes.has_key?(:'other_id_4')
+        self.other_id_4 = attributes[:'other_id_4']
+      end
+
+      if attributes.has_key?(:'other_id_5')
+        self.other_id_5 = attributes[:'other_id_5']
+      end
+
+      if attributes.has_key?(:'other_id_6')
+        self.other_id_6 = attributes[:'other_id_6']
+      end
+
+      if attributes.has_key?(:'other_id_7')
+        self.other_id_7 = attributes[:'other_id_7']
+      end
+
+      if attributes.has_key?(:'other_id_8')
+        self.other_id_8 = attributes[:'other_id_8']
+      end
+
+      if attributes.has_key?(:'other_id_9')
+        self.other_id_9 = attributes[:'other_id_9']
+      end
+
+      if attributes.has_key?(:'other_id_10')
+        self.other_id_10 = attributes[:'other_id_10']
+      end
+
+      if attributes.has_key?(:'mobile_number')
+        self.mobile_number = attributes[:'mobile_number']
+      end
+
+      if attributes.has_key?(:'phone_number_2')
+        self.phone_number_2 = attributes[:'phone_number_2']
+      end
+
+      if attributes.has_key?(:'phone_number_3')
+        self.phone_number_3 = attributes[:'phone_number_3']
+      end
+
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -133,7 +229,19 @@ module MParticle
           yahoo == o.yahoo &&
           email == o.email &&
           _alias == o._alias &&
-          facebook_custom_audience_id == o.facebook_custom_audience_id
+          facebook_custom_audience_id == o.facebook_custom_audience_id &&
+          other_id_2 == o.other_id_2 &&
+          other_id_3 == o.other_id_3 &&
+          other_id_4 == o.other_id_4 &&
+          other_id_5 == o.other_id_5 &&
+          other_id_6 == o.other_id_6 &&
+          other_id_7 == o.other_id_7 &&
+          other_id_8 == o.other_id_8 &&
+          other_id_9 == o.other_id_9 &&
+          other_id_10 == o.other_id_10 &&
+          mobile_number == o.mobile_number &&
+          phone_number_2 == o.phone_number_2 &&
+          phone_number_3 == o.phone_number_3
     end
 
     # @see the `==` method
@@ -145,7 +253,7 @@ module MParticle
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [other, customerid, facebook, twitter, google, microsoft, yahoo, email, _alias, facebook_custom_audience_id].hash
+      [other, customerid, facebook, twitter, google, microsoft, yahoo, email, _alias, facebook_custom_audience_id, other_id_2, other_id_3, other_id_4, other_id_5, other_id_6, other_id_7, other_id_8, other_id_9, other_id_10, mobile_number, phone_number_2, phone_number_3].hash
     end
 
     # Builds the object from hash

data/lib/mparticle/version.rb

@@ -1,3 +1,3 @@
 module MParticle
-  VERSION = "1.0.6"
+  VERSION = "1.0.8"
 end

data/mparticle.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = "mparticle"
-  s.version     = "1.0.6"
+  s.version     = "1.1.0"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["mParticle Inc."]
   s.email       = ["support@mparticle.com"]
@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.required_ruby_version = ">= 1.9"
 
   s.add_runtime_dependency 'typhoeus', '~> 1.0', '>= 1.0.1'
-  s.add_runtime_dependency 'json', '~> 1.8', '>= 1.8.3'
+  s.add_runtime_dependency 'json', '~> 2.0', '>= 2.3.0'
 
   s.files         = `find *`.split("\n").uniq.sort.select{|f| !f.empty? }
   s.executables   = []

data/spec/models/batch_spec.rb

@@ -0,0 +1,39 @@
+require 'mparticle'
+require 'json'
+
+describe 'Batch' do
+  it 'should create an instance of Batch' do
+    model = MParticle::Batch.new
+    expect(model).to be_an_instance_of MParticle::Batch
+  end
+
+  it 'should set integration attributes on batch' do
+    batch_model = MParticle::Batch.new
+    batch_model.integration_attributes = { 123 => { "foo" => "bar"}, 456 => { "foo" => "baz" }}
+    expect(batch_model.integration_attributes[123]["foo"]).to eq 'bar'
+    expect(batch_model.integration_attributes[456]["foo"]).to eq 'baz'
+    puts batch_model.to_hash
+    json = batch_model.to_hash.to_json
+
+  end
+
+  it 'should have the property att_timestamp_unixtime_ms {base name: "att_timestamp_unixtime_ms" }' do
+    device_info = MParticle::DeviceInformation.new
+    now = (Time.now.to_f * 1000).to_i
+    device_info.att_timestamp_unixtime_ms = now
+    expect(device_info.att_timestamp_unixtime_ms).to eq now
+    puts device_info.to_hash
+    json = device_info.to_hash.to_json
+
+  end
+
+  it 'should have the property att_authorization_status {base name: "att_authorization_status" }' do
+    device_info = MParticle::DeviceInformation.new
+    device_info.att_authorization_status = 'authorized'
+    expect(device_info.att_authorization_status).to eq('authorized')
+    puts device_info.to_hash
+    json = device_info.to_hash.to_json
+
+  end
+
+end

data/spec/models/ccpa_consent_state_spec.rb

@@ -13,7 +13,7 @@ describe 'CCPAConsentState' do
   end
 
   it 'should have the property timestamp_unixtime_ms {base name: "timestamp_unixtime_ms" }' do
-    now = Time.now.to_i
+    now = (Time.now.to_f * 1000).to_i
     model = MParticle::CCPAConsentState.new
     model.timestamp_unixtime_ms = now
     expect(model.timestamp_unixtime_ms).to eq now

data/spec/models/data_plan_context_spec.rb

@@ -0,0 +1,19 @@
+require 'mparticle'
+
+describe 'DataPlanContext' do
+  it 'should create an instance of DataPlanContext' do
+    model = MParticle::DataPlanContext.new
+    expect(model).to be_an_instance_of MParticle::DataPlanContext
+  end
+
+  it 'should set context on batch' do
+    batch_model = MParticle::Batch.new
+    batch_model.context = MParticle::BatchContext.new
+    batch_model.context.data_plan = MParticle::DataPlanContext.new
+    batch_model.context.data_plan.plan_id = 'foo_dp_id'
+    batch_model.context.data_plan.plan_version = 5
+    expect(batch_model.context.data_plan.plan_id).to eq('foo_dp_id')
+    expect(batch_model.context.data_plan.plan_version).to eq(5)
+  end
+
+end

data/spec/models/gdpr_consent_state_spec.rb

@@ -19,7 +19,7 @@ describe 'GDPRConsentState' do
     end
 
     it 'should have the property timestamp_unixtime_ms {base name: "timestamp_unixtime_ms" }' do
-      now = Time.now.to_i
+      now = (Time.now.to_f * 1000).to_i
       model = MParticle::GDPRConsentState.new
       model.timestamp_unixtime_ms = now
       expect(model.timestamp_unixtime_ms).to eq now

data/spec/models/user_identities_spec.rb

@@ -0,0 +1,59 @@
+require 'mparticle'
+
+describe 'UserIdentities' do
+  it 'should create an instance of UserIdentities' do
+    model = MParticle::UserIdentities.new
+    expect(model).to be_an_instance_of MParticle::UserIdentities
+  end
+
+  it 'should set all identities' do
+    model = MParticle::UserIdentities.new
+    model.other = 'foo_other'
+    expect(model.other).to eq('foo_other')
+    model.customerid = 'foo_customerid'
+    expect(model.customerid).to eq('foo_customerid')
+    model.facebook = 'foo_facebook'
+    expect(model.facebook).to eq('foo_facebook')
+    model.twitter = 'foo_twitter'
+    expect(model.twitter).to eq('foo_twitter')
+    model.google = 'foo_google'
+    expect(model.google).to eq('foo_google')
+    model.microsoft = 'foo_microsoft'
+    expect(model.microsoft).to eq('foo_microsoft')
+    model.yahoo = 'foo_yahoo'
+    expect(model.yahoo).to eq('foo_yahoo')
+    model.email = 'foo_email'
+    expect(model.email).to eq('foo_email')
+    model._alias = 'foo_alias'
+    expect(model._alias).to eq('foo_alias')
+    model.facebook_custom_audience_id = 'foo_fbid'
+    expect(model.facebook_custom_audience_id).to eq('foo_fbid')
+    model.other_id_2 = 'foo_other_id_2'
+    expect(model.other_id_2).to eq('foo_other_id_2')
+    model.other_id_3 = 'foo_other_id_3'
+    expect(model.other_id_3).to eq('foo_other_id_3')
+    model.other_id_4 = 'foo_other_id_4'
+    expect(model.other_id_4).to eq('foo_other_id_4')
+    model.other_id_5 = 'foo_other_id_5'
+    expect(model.other_id_5).to eq('foo_other_id_5')
+    model.other_id_6 = 'foo_other_id_6'
+    expect(model.other_id_6).to eq('foo_other_id_6')
+    model.other_id_7 = 'foo_other_id_7'
+    expect(model.other_id_7).to eq('foo_other_id_7')
+    model.other_id_8 = 'foo_other_id_8'
+    expect(model.other_id_8).to eq('foo_other_id_8')
+    model.other_id_9 = 'foo_other_id_9'
+    expect(model.other_id_9).to eq('foo_other_id_9')
+    model.other_id_10 = 'foo_other_id_10'
+    expect(model.other_id_10).to eq('foo_other_id_10')
+    model.mobile_number = 'foo_mobile_number'
+    expect(model.mobile_number).to eq('foo_mobile_number')
+    model.phone_number_2 = 'foo_phone_number_2'
+    expect(model.phone_number_2).to eq('foo_phone_number_2')
+    model.phone_number_3 = 'foo_phone_number_3'
+    expect(model.phone_number_3).to eq('foo_phone_number_3')
+
+
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mparticle
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.1.0
 platform: ruby
 authors:
 - mParticle Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-18 00:00:00.000000000 Z
+date: 2021-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus
@@ -36,20 +36,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.3
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.3
+        version: 2.3.0
 description: Use this client to send your data into the mParticle platform.
 email:
 - support@mparticle.com
@@ -57,8 +57,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- Gemfile
-- Gemfile.lock
 - README.md
 - docs/ApiResponse.md
 - docs/ApiResponseErrors.md
@@ -110,11 +108,13 @@ files:
 - lib/mparticle/models/application_state_transition_event.rb
 - lib/mparticle/models/attribution_info.rb
 - lib/mparticle/models/batch.rb
+- lib/mparticle/models/batch_context.rb
 - lib/mparticle/models/breadcrumb_event.rb
 - lib/mparticle/models/ccpa_consent_state.rb
 - lib/mparticle/models/commerce_event.rb
 - lib/mparticle/models/consent_state.rb
 - lib/mparticle/models/crash_report_event.rb
+- lib/mparticle/models/data_plan_context.rb
 - lib/mparticle/models/device_current_state.rb
 - lib/mparticle/models/device_information.rb
 - lib/mparticle/models/event_base.rb
@@ -140,16 +140,17 @@ files:
 - lib/mparticle/models/source_information.rb
 - lib/mparticle/models/user_identities.rb
 - lib/mparticle/version.rb
-- mparticle-1.0.4.gem
-- mparticle-1.0.5.gem
 - mparticle.gemspec
 - spec/models/app_event_spec.rb
+- spec/models/batch_spec.rb
 - spec/models/ccpa_consent_state_spec.rb
 - spec/models/commerce_event_spec.rb
 - spec/models/consent_state_spec.rb
+- spec/models/data_plan_context_spec.rb
 - spec/models/gdpr_consent_state_spec.rb
 - spec/models/product_spec.rb
 - spec/models/screen_view_event_spec.rb
+- spec/models/user_identities_spec.rb
 homepage: https://www.mparticle.com
 licenses:
 - Apache-2.0

data/Gemfile

@@ -1,4 +0,0 @@
-source 'https://rubygems.org'
-gem 'rspec', '3.9.0'
-gem 'typhoeus', '~> 1.0', '>= 1.0.1'
-gem 'json', '~> 1.8', '>= 1.8.3'

data/Gemfile.lock

@@ -1,34 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    diff-lcs (1.3)
-    ethon (0.12.0)
-      ffi (>= 1.3.0)
-    ffi (1.11.3)
-    json (1.8.6)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
-    typhoeus (1.3.1)
-      ethon (>= 0.9.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  json (~> 1.8, >= 1.8.3)
-  rspec (= 3.9.0)
-  typhoeus (~> 1.0, >= 1.0.1)
-
-BUNDLED WITH
-   1.17.2