mparticle 1.0.4 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9bac3ffb5b4f05c631d5c2beecbacfdc02420027
-  data.tar.gz: 0cf6073c991daaf5db99d34cfd3cf4eae3444bb6
+SHA256:
+  metadata.gz: 8308b885dc052724e0e33e9c81c48b66962eaba058d4dbee48b23aa910c59409
+  data.tar.gz: 4ec2ce62682cc068114983cc33841cb589cc67d9c272c99ec41757c3d6397f7a
 SHA512:
-  metadata.gz: 6dd990e982b42a19a25804c8885485944cce2b04023a4c85b4d661724ee7938fa684a5b0830c904bcf596a57d568700f7eb0c41ad1abd0e2118a349d9a8b824b
-  data.tar.gz: 4721215db4f61185e90889cacf8b9553d00364c1392c00bca8b9c3f721d6a684096add75d015ecaf9b5be90f1cd740c3eee7e5e032ada2503b8cca388dada868
+  metadata.gz: aef4d8bfb6b787652096f7648d8e9d1e34f496143fc9ebda570dfb3980d2decec02b69b3ff883d187078e98904ecaeddb373bba2e5c1139097736297de8d1756
+  data.tar.gz: d59b4c4c687d46fa906629e7bca7bc420278356dec3f6bab162d480207bb9b8d073b82e068b3993bbea0317db581bf23de53eae2617c68e235d8bd1a069674d2

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/AppEvent.md

@@ -1,18 +1,18 @@
 # MParticle::AppEvent
 
 ## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**timestamp_unixtime_ms** | **Integer** |  | [optional] 
-**event_id** | **Integer** |  | [optional] 
-**source_message_id** | **String** |  | [optional] 
-**session_id** | **Integer** |  | [optional] 
-**session_uuid** | **String** |  | [optional] 
-**custom_attributes** | **Hash<String, String>** |  | [optional] 
-**location** | [**GeoLocation**](GeoLocation.md) |  | [optional] 
-**device_current_state** | [**DeviceCurrentState**](DeviceCurrentState.md) |  | [optional] 
-**custom_event_type** | **String** |  | 
-**event_name** | **String** |  | 
-**media_info** | [**MediaInfo**](MediaInfo.md) |  | [optional] 
-
 
+| Name                      | Type                                            | Description | Notes      |
+| ------------------------- | ----------------------------------------------- | ----------- | ---------- |
+| **timestamp_unixtime_ms** | **Integer**                                     |             | [optional] |
+| **event_id**              | **Integer**                                     |             | [optional] |
+| **source_message_id**     | **String**                                      |             | [optional] |
+| **session_id**            | **Integer**                                     |             | [optional] |
+| **session_uuid**          | **String**                                      |             | [optional] |
+| **custom_attributes**     | **Hash<String, String>**                  |             | [optional] |
+| **location**              | [**GeoLocation**](GeoLocation.md)               |             | [optional] |
+| **device_current_state**  | [**DeviceCurrentState**](DeviceCurrentState.md) |             | [optional] |
+| **custom_event_type**     | **String**                                      |             |
+| **event_name**            | **String**                                      |             |
+| **media_info**            | [**MediaInfo**](MediaInfo.md)                   |             | [optional] |
+| **custom_flags**          | **Hash<String, String>**                  |             | [optional] |

data/docs/Batch.md

@@ -18,3 +18,4 @@
 | **api_key**                 | **String**                                              |             | [optional] |
 | **mpid**                    | **Integer**                                             |             | [optional] |
 | **mp_deviceid**             | **String**                                              |             | [optional] |
+| **timestamp_unixtime_ms**   | **Integer**                                             |             | [optional] |

data/docs/CCPAConsentState.md

@@ -0,0 +1,10 @@
+# mParticle.CCPAConsentState
+
+## Properties
+
+| Name                      | Type        | Description | Notes |
+| ------------------------- | ----------- | ----------- | ----- |
+| **consented**             | **Boolean** |             |       |
+| **timestamp_unixtime_ms** | **Number**  |             |       |
+| **location**              | **String**  |             |       |
+| **hardware_id**           | **String**  |             |       |

data/docs/CommerceEvent.md

@@ -1,22 +1,22 @@
 # MParticle::CommerceEvent
 
 ## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**timestamp_unixtime_ms** | **Integer** |  | [optional] 
-**event_id** | **Integer** |  | [optional] 
-**source_message_id** | **String** |  | [optional] 
-**session_id** | **Integer** |  | [optional] 
-**session_uuid** | **String** |  | [optional] 
-**custom_attributes** | **Hash<String, String>** |  | [optional] 
-**location** | [**GeoLocation**](GeoLocation.md) |  | [optional] 
-**device_current_state** | [**DeviceCurrentState**](DeviceCurrentState.md) |  | [optional] 
-**product_action** | [**ProductAction**](ProductAction.md) |  | [optional] 
-**promotion_action** | [**PromotionAction**](PromotionAction.md) |  | [optional] 
-**product_impressions** | [**Array<ProductImpression>**](ProductImpression.md) |  | [optional] 
-**shopping_cart** | [**ShoppingCart**](ShoppingCart.md) |  | [optional] 
-**currency_code** | **String** |  | [optional] 
-**screen_name** | **String** |  | [optional] 
-**is_non_interactive** | **BOOLEAN** |  | [optional] 
-
 
+| Name                      | Type                                                       | Description | Notes      |
+| ------------------------- | ---------------------------------------------------------- | ----------- | ---------- |
+| **timestamp_unixtime_ms** | **Integer**                                                |             | [optional] |
+| **event_id**              | **Integer**                                                |             | [optional] |
+| **source_message_id**     | **String**                                                 |             | [optional] |
+| **session_id**            | **Integer**                                                |             | [optional] |
+| **session_uuid**          | **String**                                                 |             | [optional] |
+| **custom_attributes**     | **Hash<String, String>**                             |             | [optional] |
+| **location**              | [**GeoLocation**](GeoLocation.md)                          |             | [optional] |
+| **device_current_state**  | [**DeviceCurrentState**](DeviceCurrentState.md)            |             | [optional] |
+| **product_action**        | [**ProductAction**](ProductAction.md)                      |             | [optional] |
+| **promotion_action**      | [**PromotionAction**](PromotionAction.md)                  |             | [optional] |
+| **product_impressions**   | [**Array<ProductImpression>**](ProductImpression.md) |             | [optional] |
+| **shopping_cart**         | [**ShoppingCart**](ShoppingCart.md)                        |             | [optional] |
+| **currency_code**         | **String**                                                 |             | [optional] |
+| **screen_name**           | **String**                                                 |             | [optional] |
+| **is_non_interactive**    | **BOOLEAN**                                                |             | [optional] |
+| **custom_flags**          | **Hash<String, String>**                             |             | [optional] |

data/docs/ConsentState.md

@@ -2,6 +2,7 @@
 
 ## Properties
 
-| Name | Type | Description | Notes |
-| ---- | ---- | ----------- | ----- |
-
+| Name      | Type     | Description | Notes |
+| --------- | -------- | ----------- | ----- |
+| **gdpr ** | **Hash** |             |       |
+| **ccpa ** | **Hash** |             |       |

data/docs/ScreenViewEvent.md

@@ -1,17 +1,17 @@
 # MParticle::ScreenViewEvent
 
 ## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**timestamp_unixtime_ms** | **Integer** |  | [optional] 
-**event_id** | **Integer** |  | [optional] 
-**source_message_id** | **String** |  | [optional] 
-**session_id** | **Integer** |  | [optional] 
-**session_uuid** | **String** |  | [optional] 
-**custom_attributes** | **Hash<String, String>** |  | [optional] 
-**location** | [**GeoLocation**](GeoLocation.md) |  | [optional] 
-**device_current_state** | [**DeviceCurrentState**](DeviceCurrentState.md) |  | [optional] 
-**screen_name** | **String** |  | 
-**activity_type** | **String** |  | [optional] 
-
 
+| Name                      | Type                                            | Description | Notes      |
+| ------------------------- | ----------------------------------------------- | ----------- | ---------- |
+| **timestamp_unixtime_ms** | **Integer**                                     |             | [optional] |
+| **event_id**              | **Integer**                                     |             | [optional] |
+| **source_message_id**     | **String**                                      |             | [optional] |
+| **session_id**            | **Integer**                                     |             | [optional] |
+| **session_uuid**          | **String**                                      |             | [optional] |
+| **custom_attributes**     | **Hash<String, String>**                  |             | [optional] |
+| **location**              | [**GeoLocation**](GeoLocation.md)               |             | [optional] |
+| **device_current_state**  | [**DeviceCurrentState**](DeviceCurrentState.md) |             | [optional] |
+| **screen_name**           | **String**                                      |             |
+| **activity_type**         | **String**                                      |             | [optional] |
+| **custom_flags**          | **Hash<String, 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,6 +11,7 @@ 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'
 
 user_identities = MParticle::UserIdentities.new
@@ -19,10 +21,45 @@ app_event = MParticle::AppEvent.new
 app_event.event_name = 'Test event'
 app_event.custom_event_type = 'navigation'
 app_event.custom_attributes = { 'Test key' => 'Test value' }
+app_event.custom_flags = {
+  'answer': 42,
+  'question': 'What is the answer to life, the universe, and everything?',
+  'dolphins': [
+      'So long',
+      'Thanks for all the fish'
+  ]
+}
+
+screen_view_event = MParticle::ScreenViewEvent.new
+screen_view_event.custom_flags = {
+  'answer': 42,
+  'question': 'What is the answer to life, the universe, and everything?',
+  'dolphins': [
+      'So long',
+      'Thanks for all the fish'
+  ]
+}
+
+commerce_event = MParticle::CommerceEvent.new
+commerce_event = {
+  'answer': 42,
+  'question': 'What is the answer to life, the universe, and everything?',
+  'dolphins': [
+      'So long',
+      'Thanks for all the fish'
+  ]
+}
 
 batch.events = [MParticle::SessionStartEvent.new, app_event, MParticle::SessionEndEvent.new]
 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.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
@@ -32,8 +69,9 @@ gdpr_consent_state.hardware_id = 'IDFA:a5d934n0-232f-4afc-2e9a-3832d95zc702'
 
 consent_state = MParticle::ConsentState.new
 # Make sure this purpose matches your consent purpose in
-# Setup > GDPR Settings
-# https://docs.mparticle.com/guides/consent-management/#enabling-gdpr-consent-management
+# Workspace Settings > Workspace > Regulations
+# https://docs.mparticle.com/guides/consent-management/
+consent_state.ccpa = { 'data_sale_opt_out' => ccpa_consent_state }
 consent_state.gdpr = { 'document_agreement' => gdpr_consent_state }
 batch.consent_state = consent_state
 
@@ -50,5 +88,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.response_body}"
 end

data/lib/mparticle.rb

@@ -13,6 +13,7 @@ require 'mparticle/models/application_state_transition_event'
 require 'mparticle/models/attribution_info'
 require 'mparticle/models/batch'
 require 'mparticle/models/breadcrumb_event'
+require 'mparticle/models/ccpa_consent_state'
 require 'mparticle/models/commerce_event'
 require 'mparticle/models/consent_state'
 require 'mparticle/models/crash_report_event'
@@ -40,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.0.9"
       @default_headers = {
         'Content-Type' => "application/json",
         'User-Agent' => @user_agent

data/lib/mparticle/models/app_event.rb

@@ -25,6 +25,8 @@ module MParticle
 
     attr_accessor :media_info
 
+    attr_accessor :custom_flags
+
     class EnumAttributeValidator
       attr_reader :datatype
       attr_reader :allowable_values
@@ -60,7 +62,8 @@ module MParticle
         :'device_current_state' => :'device_current_state',
         :'custom_event_type' => :'custom_event_type',
         :'event_name' => :'event_name',
-        :'media_info' => :'media_info'
+        :'media_info' => :'media_info',
+        :'custom_flags' => :'custom_flags',
       }
     end
 
@@ -77,7 +80,8 @@ module MParticle
         :'device_current_state' => :'DeviceCurrentState',
         :'custom_event_type' => :'String',
         :'event_name' => :'String',
-        :'media_info' => :'MediaInfo'
+        :'media_info' => :'MediaInfo',
+        :'custom_flags' => :'Hash<String, String>',
       }
     end
 
@@ -135,6 +139,10 @@ module MParticle
         self.media_info = attributes[:'media_info']
       end
 
+      if attributes.has_key?(:'custom_flags')
+        self.custom_flags = attributes[:'custom_flags']
+      end
+
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -187,7 +195,8 @@ module MParticle
           device_current_state == o.device_current_state &&
           custom_event_type == o.custom_event_type &&
           event_name == o.event_name &&
-          media_info == o.media_info
+          media_info == o.media_info &&
+          custom_flags == o.custom_flags
     end
 
     # @see the `==` method
@@ -199,7 +208,7 @@ module MParticle
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [timestamp_unixtime_ms, event_id, source_message_id, session_id, session_uuid, custom_attributes, location, device_current_state, custom_event_type, event_name, media_info].hash
+      [timestamp_unixtime_ms, event_id, source_message_id, session_id, session_uuid, custom_attributes, location, device_current_state, custom_event_type, event_name, media_info, custom_flags].hash
     end
 
     # Builds the object from hash

data/lib/mparticle/models/batch.rb

@@ -31,6 +31,10 @@ module MParticle
 
     attr_accessor :mp_deviceid
 
+    attr_accessor :timestamp_unixtime_ms
+
+    attr_accessor :context
+    
     class EnumAttributeValidator
       attr_reader :datatype
       attr_reader :allowable_values
@@ -109,7 +113,9 @@ 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'
       }
     end
 
@@ -128,7 +134,10 @@ 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'
       }
     end
 
@@ -196,6 +205,18 @@ 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
+
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -245,7 +266,8 @@ 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
     end
 
     # @see the `==` method
@@ -257,7 +279,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].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