evva 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9078e38ca6bba5b85a3349fb9e1c3f9c31b8de357080ffb1ab105e6bcbbdaa1
-  data.tar.gz: 16b264637125fafdc14a991a9cb984e440b948bdc7d934776329b8aa8ef2d89f
+  metadata.gz: 32699d4abc90a02f944c069ac0cefc8e26fbf972d42342f86ad55652d198f0c2
+  data.tar.gz: d9e9c0e5a62a712636ebede3bf3b04a9f47c8bc36bac4f06ea4d27b48ff3703f
 SHA512:
-  metadata.gz: 6efc1abd4ea8d72f7ac2edeccbf111deac25922fa0b1464d754d21e7bfef921efffddd228bb6d6913f3b64a4acfcd8763082f0b36b16e85e28b930d933df879c
-  data.tar.gz: 77a4ad5df7074b646def8c880654b551fcde2e10523e3dec622d202fba48ac7bdda6d1a882abcd5c54bc2e6175b2bb68a52c30ab77d1c522f29362bc9a297db3
+  metadata.gz: cd70916584265dc7077907d324049b93000f5805bf43bb9dda152547e36181740ba8524980606400a8bd128c556dbf09ad641d4c634d513e714b2748639a4498
+  data.tar.gz: a9a95c538e9d88011507e5a12e64afb84b91fbee6a5b70e0d48f431a05496a0384347c2f6edc97ad3a3164f80677ff05e0b700d4a2c7ea08bce69d7e59ab8145

data/.rubocop_todo.yml

@@ -57,8 +57,8 @@ Layout/EmptyLinesAroundBlockBody:
 Layout/EmptyLinesAroundClassBody:
   Exclude:
     - 'lib/evva/android_generator.rb'
-    - 'lib/evva/mixpanel_enum.rb'
-    - 'lib/evva/mixpanel_event.rb'
+    - 'lib/evva/analytics_enum.rb'
+    - 'lib/evva/analytics_event.rb'
 
 # Offense count: 1
 # Cop supports --auto-correct.
@@ -163,8 +163,8 @@ Layout/TrailingBlankLines:
     - 'lib/evva/enum_generator.rb'
     - 'lib/evva/event_generator.rb'
     - 'lib/evva/google_sheet.rb'
-    - 'lib/evva/mixpanel_enum.rb'
-    - 'lib/evva/mixpanel_event.rb'
+    - 'lib/evva/analytics_enum.rb'
+    - 'lib/evva/analytics_event.rb'
     - 'spec/lib/evva/enum_generator_spec.rb'
     - 'spec/lib/evva/event_generator_spec.rb'
     - 'spec/lib/evva/google_sheet_spec.rb'
@@ -226,8 +226,8 @@ Lint/UselessAssignment:
 # Offense count: 2
 Lint/Void:
   Exclude:
-    - 'lib/evva/mixpanel_enum.rb'
-    - 'lib/evva/mixpanel_event.rb'
+    - 'lib/evva/analytics_enum.rb'
+    - 'lib/evva/analytics_event.rb'
 
 # Offense count: 8
 Metrics/AbcSize:
@@ -309,8 +309,8 @@ Style/Documentation:
     - 'lib/evva/event_generator.rb'
     - 'lib/evva/google_sheet.rb'
     - 'lib/evva/logger.rb'
-    - 'lib/evva/mixpanel_enum.rb'
-    - 'lib/evva/mixpanel_event.rb'
+    - 'lib/evva/analytics_enum.rb'
+    - 'lib/evva/analytics_event.rb'
 
 # Offense count: 1
 # Cop supports --auto-correct.
@@ -407,8 +407,8 @@ Style/RaiseArgs:
 # Cop supports --auto-correct.
 Style/RedundantSelf:
   Exclude:
-    - 'lib/evva/mixpanel_enum.rb'
-    - 'lib/evva/mixpanel_event.rb'
+    - 'lib/evva/analytics_enum.rb'
+    - 'lib/evva/analytics_event.rb'
     - 'lib/evva/object_extension.rb'
 
 # Offense count: 1

data/Gemfile

@@ -1,5 +1,4 @@
 source 'https://rubygems.org'
-ruby '2.7.3'
 
 gem 'colorize'
 gem 'safe_yaml'

data/Gemfile.lock

@@ -1,8 +1,8 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.5.2)
-      public_suffix (>= 2.0.2, < 4.0)
+    addressable (2.8.0)
+      public_suffix (>= 2.0.2, < 5.0)
     ast (2.3.0)
     colorize (0.8.1)
     crack (0.4.3)
@@ -15,7 +15,7 @@ GEM
     parser (2.4.0.0)
       ast (~> 2.2)
     powerpack (0.1.1)
-    public_suffix (3.0.0)
+    public_suffix (4.0.6)
     rainbow (2.2.2)
       rake
     rake (12.3.3)
@@ -71,8 +71,5 @@ DEPENDENCIES
   simplecov-rcov
   webmock (~> 1.20)
 
-RUBY VERSION
-   ruby 2.7.3p183
-
 BUNDLED WITH
    2.2.26

data/changelog.md

@@ -1,6 +1,9 @@
 # Change Log
 
-## [0.2.0] - 2021/08/30
+## [0.3.0] - 2021-12-16
+- Revamp Android generator to generate events as classes instead of methods.
+
+## [0.2.0] - 2021-08-30
 - Google Spreadsheet option stopped working due to a change in the API. This version fixes that.
 
 Note: You'll need a new setup. View README.
@@ -32,6 +35,6 @@ Note: You'll need a new setup. View README.
 ## [0.1.1] - 2017-11-07
 - Fixes mismatch between file name and class name generated.
 
-## [0.1.0] - 2017/10/26
+## [0.1.0] - 2017-10-26
 - Initial Release.
 

data/evva_config.yml

@@ -8,7 +8,7 @@ data_source:
   enum_classes_url: https://path-to-csv
 
 out_path: analytics
-event_file_name: MixpanelAnalytics
-event_enum_file_name: MixpanelEvent
-people_file_name: MixpanelProperties
+event_file_name: AnalyticsEvent
+event_enum_file_name: AnalyticsEvents
+people_file_name: AnalyticsProperties
 package_name: com.hole19golf.hole19.analytics

data/lib/evva/{mixpanel_enum.rb → analytics_enum.rb}

@@ -1,5 +1,5 @@
 module Evva
-  class MixpanelEnum
+  class AnalyticsEnum
     attr_reader :enum_name, :values
     def initialize(enum_name, values)
       @enum_name = enum_name

data/lib/evva/{mixpanel_event.rb → analytics_event.rb}

@@ -1,5 +1,5 @@
 module Evva
-  class MixpanelEvent
+  class AnalyticsEvent
     attr_reader :event_name, :properties
     def initialize(event_name, properties = {})
       @event_name = event_name

data/lib/evva/android_generator.rb

@@ -6,40 +6,31 @@ module Evva
       @package_name = package_name
     end
 
-    IMPORT_EVENT = "import packagename.Event".freeze
-    IMPORT_MASK = "import packagename.MixpanelAnalyticsMask".freeze
-    IMPORT_JSON = "import org.json.JSONObject".freeze
-
     NATIVE_TYPES = %w[Long Int String Double Float Boolean].freeze
 
     def events(bundle, file_name)
-      header_footer_wrapper([IMPORT_EVENT, IMPORT_MASK, IMPORT_JSON]) do
-"""open class #{file_name}(private val mask: MixpanelAnalyticsMask) {
-
-#{bundle.map { |e| kotlin_function(e) }.join("\n\n")}
+      header_footer_wrapper do
+"""sealed class #{file_name}(event: AnalyticsEvents) {
+\tval name = event.key
 
-\topen fun updateProperties(property: MixpanelProperties, value: Any) {
-\t\tmask.updateProperties(property.key, value)
-\t}
+\topen val properties: Map<String, Any?>? = null
 
-\topen fun incrementCounter(property: MixpanelProperties) {
-\t\tmask.incrementCounter(property.key)
-\t}
+#{bundle.map { |e| event_class(e, file_name) }.join("\n\n")}
 }"""
       end
     end
 
     def people_properties(people_bundle, file_name)
       header_footer_wrapper do
-        body = "enum class MixpanelProperties(val key: String) {\n"
+        body = "enum class #{file_name}(val key: String) {\n"
         body << people_bundle.map { |prop| "\t#{prop.upcase}(\"#{prop}\")" }.join(",\n")
         body << ";\n}"
       end
     end
 
     def event_enum(bundle, file_name)
-      header_footer_wrapper([IMPORT_EVENT]) do
-        body = "enum class #{file_name}(override val key: String) : Event {\n"
+      header_footer_wrapper do
+        body = "enum class #{file_name}(val key: String) {\n"
         body << bundle.map(&:event_name).map { |prop| "\t#{prop.upcase}(\"#{prop}\")" }.join(",\n")
         body << ";\n}"
       end
@@ -75,45 +66,47 @@ package #{@package_name}
 Kotlin
     end
 
-    def kotlin_function(event_data)
-      function_name = 'track' + titleize(event_data.event_name)
-      function_arguments = event_data.properties.map { |name, type| "#{name}: #{type}" }.join(', ')
-      if !function_arguments.empty?
-        props = json_props(event_data.properties)
-"""\topen fun #{function_name}(#{function_arguments}) {
+    def event_class(event_data, superclass_name)
+      class_name = camelize(event_data.event_name)
+      class_arguments = event_data.properties.map { |name, type| "val #{camelize(name, false)}: #{type}" }.join(', ')
+      if !class_arguments.empty?
+        props = props_map(event_data.properties)
+
+"""\tdata class #{class_name}(
+\t\t#{class_arguments}
+\t) : #{superclass_name}(AnalyticsEvents.#{event_data.event_name.upcase}) {
 #{props}
-\t\tmask.trackEvent(MixpanelEvent.#{event_data.event_name.upcase}, properties)
 \t}"""
 
       else
-"""\topen fun #{function_name}() {
-\t\tmask.trackEvent(MixpanelEvent.#{event_data.event_name.upcase})
-\t}"""
+"""\tobject #{class_name} : #{superclass_name}(AnalyticsEvents.#{event_data.event_name.upcase})"""
       end
     end
 
-    def json_props(properties)
+    def props_map(properties)
       split_properties =
         properties
-        .map do |name, type|
+        .map.with_index do |data, index|
+          name, type = data
+          prop = "\t\t\t\"#{name}\" to #{camelize(name, false)}"
+
           if special_property?(type)
             if optional_property?(type)
-              "#{name}?.let { put(\"#{name}\", it.key) }"
-            else
-              "put(\"#{name}\", #{name}.key)"
-            end
-          else
-            if optional_property?(type)
-              "#{name}?.let { put(\"#{name}\", it) }"
-            else
-              "put(\"#{name}\", #{name})"
+              prop = "#{prop}?"
             end
+            prop = "#{prop}.key"
+          end
+
+          if index < properties.size - 1
+            # add list comma to every property except the last one
+            prop = "#{prop},"
           end
+
+          prop
         end
-        .map { |line| "\t\t\t#{line}" }
         .join("\n")
 
-      "\t\tval properties = JSONObject().apply {\n#{split_properties}\n\t\t}"
+      "\t\toverride val properties = mapOf(\n#{split_properties}\n\t\t)"
     end
 
     def special_property?(type)
@@ -124,8 +117,15 @@ Kotlin
       type.include?('?')
     end
 
-    def titleize(str)
-      str.split('_').collect(&:capitalize).join
+    # extracted from Rails' ActiveSupport
+    def camelize(string, uppercase_first_letter = true)
+      string = string.to_s
+      if uppercase_first_letter
+        string = string.sub(/^[a-z\d]*/) { |match| match.capitalize }
+      else
+        string = string.sub(/^(?:(?=\b|[A-Z_])|\w)/) { |match| match.downcase }
+      end
+      string.gsub(/(?:_|(\/))([a-z\d]*)/) { "#{$1}#{$2.capitalize}" }.gsub("/", "::")
     end
   end
 end

data/lib/evva/google_sheet.rb

@@ -17,7 +17,7 @@ module Evva
       csv.each do |row|
         event_name = row['Event Name']
         properties = hash_parser(row['Event Properties'])
-        event_list << Evva::MixpanelEvent.new(event_name, properties)
+        event_list << Evva::AnalyticsEvent.new(event_name, properties)
       end
       event_list
     end
@@ -42,7 +42,7 @@ module Evva
       csv.each do |row|
         enum_name = row['Enum Name']
         values = row['Possible Values'].split(',')
-        enum_list << Evva::MixpanelEnum.new(enum_name, values)
+        enum_list << Evva::AnalyticsEnum.new(enum_name, values)
       end
       enum_list
     end

data/lib/evva/version.rb

@@ -1,4 +1,4 @@
 module Evva
-  VERSION = '0.2.0'.freeze
-  VERSION_UPDATED_AT = '2021-08-30'.freeze
+  VERSION = '0.3.0'.freeze
+  VERSION_UPDATED_AT = '2021-12-16'.freeze
 end

data/lib/evva.rb

@@ -5,8 +5,8 @@ require 'evva/logger'
 require 'evva/google_sheet'
 require 'evva/config'
 require 'evva/file_reader'
-require 'evva/mixpanel_event'
-require 'evva/mixpanel_enum'
+require 'evva/analytics_event'
+require 'evva/analytics_enum'
 require 'evva/object_extension'
 require 'evva/version'
 require 'evva/android_generator'

data/spec/evva_spec.rb

@@ -7,7 +7,7 @@ describe Evva do
     before do
       allow_any_instance_of(Evva::FileReader).to receive(:open_file).and_return(file)
       allow_any_instance_of(Evva::GoogleSheet).to receive(:events).and_return(
-        [Evva::MixpanelEvent.new('trackEvent',[])])
+        [Evva::AnalyticsEvent.new('trackEvent',[])])
 
       allow_any_instance_of(Evva::GoogleSheet).to receive(:people_properties).and_return([])
       allow_any_instance_of(Evva::GoogleSheet).to receive(:enum_classes).and_return([])

data/spec/fixtures/test.yml

@@ -7,7 +7,7 @@ data_source:
   enum_classes_url: https://path-to-csv
 
 out_path: analytics
-event_file_name: MixpanelAnalytics
-event_enum_file_name: MixpanelEvent
-people_file_name: MixpanelProperties
+event_file_name: AnalyticsEvent
+event_enum_file_name: AnalyticsEvents
+people_file_name: AnalyticsProperties
 package_name: com.package.name.analytics

data/spec/lib/evva/android_generator_spec.rb

@@ -2,74 +2,67 @@ describe Evva::AndroidGenerator do
   let(:generator) { described_class.new("com.hole19golf.hole19.analytics") }
 
   describe '#events' do
-    subject { generator.events(events, "MixpanelAnalytics") }
+    subject { generator.events(events, "AnalyticsEvent") }
 
     let(:events) { [
-      Evva::MixpanelEvent.new('cp_page_view'),
-      Evva::MixpanelEvent.new('cp_page_view_a', { course_id: 'Long', course_name: 'String' }),
-      Evva::MixpanelEvent.new('cp_page_view_b', { course_id: 'Long', course_name: 'String', from_screen: 'CourseProfileSource' }),
-      Evva::MixpanelEvent.new('cp_page_view_c', { course_id: 'Long', course_name: 'String', from_screen: 'CourseProfileSource?' }),
-      Evva::MixpanelEvent.new('cp_page_view_d', { course_id: 'Long?', course_name: 'String' })
+      Evva::AnalyticsEvent.new('cp_page_view'),
+      Evva::AnalyticsEvent.new('cp_page_view_a', { course_id: 'Long', course_name: 'String' }),
+      Evva::AnalyticsEvent.new('cp_page_view_b', { course_id: 'Long', course_name: 'String', from_screen: 'CourseProfileSource' }),
+      Evva::AnalyticsEvent.new('cp_page_view_c', { course_id: 'Long', course_name: 'String', from_screen: 'CourseProfileSource?' }),
+      Evva::AnalyticsEvent.new('cp_page_view_d', { course_id: 'Long?', course_name: 'String' })
     ] }
 
     let(:expected) {
 <<-Kotlin
 package com.hole19golf.hole19.analytics
 
-import com.hole19golf.hole19.analytics.Event
-import com.hole19golf.hole19.analytics.MixpanelAnalyticsMask
-import org.json.JSONObject
-
 /**
  * This file was automatically generated by evva: https://github.com/hole19/evva
  */
 
-open class MixpanelAnalytics(private val mask: MixpanelAnalyticsMask) {
-
-    open fun trackCpPageView() {
-        mask.trackEvent(MixpanelEvent.CP_PAGE_VIEW)
-    }
+sealed class AnalyticsEvent(event: AnalyticsEvents) {
+    val name = event.key
 
-    open fun trackCpPageViewA(course_id: Long, course_name: String) {
-        val properties = JSONObject().apply {
-            put("course_id", course_id)
-            put("course_name", course_name)
-        }
-        mask.trackEvent(MixpanelEvent.CP_PAGE_VIEW_A, properties)
-    }
+    open val properties: Map<String, Any?>? = null
 
-    open fun trackCpPageViewB(course_id: Long, course_name: String, from_screen: CourseProfileSource) {
-        val properties = JSONObject().apply {
-            put("course_id", course_id)
-            put("course_name", course_name)
-            put("from_screen", from_screen.key)
-        }
-        mask.trackEvent(MixpanelEvent.CP_PAGE_VIEW_B, properties)
-    }
+    object CpPageView : AnalyticsEvent(AnalyticsEvents.CP_PAGE_VIEW)
 
-    open fun trackCpPageViewC(course_id: Long, course_name: String, from_screen: CourseProfileSource?) {
-        val properties = JSONObject().apply {
-            put("course_id", course_id)
-            put("course_name", course_name)
-            from_screen?.let { put("from_screen", it.key) }
-        }
-        mask.trackEvent(MixpanelEvent.CP_PAGE_VIEW_C, properties)
+    data class CpPageViewA(
+        val courseId: Long, val courseName: String
+    ) : AnalyticsEvent(AnalyticsEvents.CP_PAGE_VIEW_A) {
+        override val properties = mapOf(
+            "course_id" to courseId,
+            "course_name" to courseName
+        )
     }
 
-    open fun trackCpPageViewD(course_id: Long?, course_name: String) {
-        val properties = JSONObject().apply {
-            course_id?.let { put("course_id", it) }
-            put("course_name", course_name)
-        }
-        mask.trackEvent(MixpanelEvent.CP_PAGE_VIEW_D, properties)
+    data class CpPageViewB(
+        val courseId: Long, val courseName: String, val fromScreen: CourseProfileSource
+    ) : AnalyticsEvent(AnalyticsEvents.CP_PAGE_VIEW_B) {
+        override val properties = mapOf(
+            "course_id" to courseId,
+            "course_name" to courseName,
+            "from_screen" to fromScreen.key
+        )
     }
 
-    open fun updateProperties(property: MixpanelProperties, value: Any) {
-        mask.updateProperties(property.key, value)
+    data class CpPageViewC(
+        val courseId: Long, val courseName: String, val fromScreen: CourseProfileSource?
+    ) : AnalyticsEvent(AnalyticsEvents.CP_PAGE_VIEW_C) {
+        override val properties = mapOf(
+            "course_id" to courseId,
+            "course_name" to courseName,
+            "from_screen" to fromScreen?.key
+        )
     }
 
-    open fun incrementCounter(property: MixpanelProperties) {
-        mask.incrementCounter(property.key)
+    data class CpPageViewD(
+        val courseId: Long?, val courseName: String
+    ) : AnalyticsEvent(AnalyticsEvents.CP_PAGE_VIEW_D) {
+        override val properties = mapOf(
+            "course_id" to courseId,
+            "course_name" to courseName
+        )
     }
 }
 Kotlin
@@ -81,8 +74,8 @@ Kotlin
   describe '#special_property_enums' do
     subject { generator.special_property_enums(enums) }
     let(:enums) { [
-      Evva::MixpanelEnum.new('CourseProfileSource', ['course_discovery', 'synced_courses']),
-      Evva::MixpanelEnum.new('PremiumFrom', ['Course Profile', 'Round Setup'])
+      Evva::AnalyticsEnum.new('CourseProfileSource', ['course_discovery', 'synced_courses']),
+      Evva::AnalyticsEnum.new('PremiumFrom', ['Course Profile', 'Round Setup'])
     ] }
     let(:expected) {
 <<-Kotlin
@@ -107,22 +100,20 @@ Kotlin
   end
 
   describe '#event_enum' do
-    subject { generator.event_enum(event_bundle, 'MixpanelEvent') }
+    subject { generator.event_enum(event_bundle, 'AnalyticsEvents') }
     let(:event_bundle) { [
-      Evva::MixpanelEvent.new('nav_feed_tap', {}),
-      Evva::MixpanelEvent.new('nav_performance_tap', {})
+      Evva::AnalyticsEvent.new('nav_feed_tap', {}),
+      Evva::AnalyticsEvent.new('nav_performance_tap', {})
       ] }
     let(:expected) {
 <<-Kotlin
 package com.hole19golf.hole19.analytics
 
-import com.hole19golf.hole19.analytics.Event
-
 /**
  * This file was automatically generated by evva: https://github.com/hole19/evva
  */
 
-enum class MixpanelEvent(override val key: String) : Event {
+enum class AnalyticsEvents(val key: String) {
     NAV_FEED_TAP("nav_feed_tap"),
     NAV_PERFORMANCE_TAP("nav_performance_tap");
 }
@@ -132,7 +123,7 @@ Kotlin
   end
 
   describe '#people_properties' do
-    subject { generator.people_properties(people_bundle, 'MixpanelProperties') }
+    subject { generator.people_properties(people_bundle, 'AnalyticsProperties') }
     let(:people_bundle) { ['rounds_with_wear', 'friends_from_facebook'] }
     let(:expected) {
 <<-Kotlin
@@ -142,7 +133,7 @@ package com.hole19golf.hole19.analytics
  * This file was automatically generated by evva: https://github.com/hole19/evva
  */
 
-enum class MixpanelProperties(val key: String) {
+enum class AnalyticsProperties(val key: String) {
     ROUNDS_WITH_WEAR("rounds_with_wear"),
     FRIENDS_FROM_FACEBOOK("friends_from_facebook");
 }

data/spec/lib/evva/google_sheet_spec.rb

@@ -22,9 +22,9 @@ describe Evva::GoogleSheet do
     end
 
     it 'returns an array with the corresponding events' do
-      expected = [Evva::MixpanelEvent.new('cp_page_view', { course_id: 'Long', course_name: 'String' }),
-                  Evva::MixpanelEvent.new('nav_feed_tap', {}),
-                  Evva::MixpanelEvent.new('cp_view_scorecard', { course_id: 'Long', course_name: 'String' })]
+      expected = [Evva::AnalyticsEvent.new('cp_page_view', { course_id: 'Long', course_name: 'String' }),
+                  Evva::AnalyticsEvent.new('nav_feed_tap', {}),
+                  Evva::AnalyticsEvent.new('cp_view_scorecard', { course_id: 'Long', course_name: 'String' })]
       expect(events).to eq(expected)
     end
 
@@ -69,8 +69,8 @@ describe Evva::GoogleSheet do
 
     it 'returns an array with the corresponding events' do
       expect(enum_classes).to eq [
-        Evva::MixpanelEnum.new('PageViewSourceScreen', ['course_discovery','synced_courses','nearby','deal']),
-        Evva::MixpanelEnum.new('PremiumClickBuy', ['notes','hi_res_maps','whatever'])
+        Evva::AnalyticsEnum.new('PageViewSourceScreen', ['course_discovery','synced_courses','nearby','deal']),
+        Evva::AnalyticsEnum.new('PremiumClickBuy', ['notes','hi_res_maps','whatever'])
       ]
     end
   end

data/spec/lib/evva/swift_generator_spec.rb

@@ -5,11 +5,11 @@ describe Evva::SwiftGenerator do
     subject { generator.events(event_bundle, "") }
 
     let(:event_bundle) { [
-      Evva::MixpanelEvent.new('cp_page_view'),
-      Evva::MixpanelEvent.new('cp_page_view_a', { course_id: 'Long', course_name: 'String' }),
-      Evva::MixpanelEvent.new('cp_page_view_b', { course_id: 'Long', course_name: 'String', from_screen: 'CourseProfileSource' }),
-      Evva::MixpanelEvent.new('cp_page_view_c', { course_id: 'Long', course_name: 'String', from_screen: 'CourseProfileSource?' }),
-      Evva::MixpanelEvent.new('cp_page_view_d', { course_id: 'Long?', course_name: 'String' })
+      Evva::AnalyticsEvent.new('cp_page_view'),
+      Evva::AnalyticsEvent.new('cp_page_view_a', { course_id: 'Long', course_name: 'String' }),
+      Evva::AnalyticsEvent.new('cp_page_view_b', { course_id: 'Long', course_name: 'String', from_screen: 'CourseProfileSource' }),
+      Evva::AnalyticsEvent.new('cp_page_view_c', { course_id: 'Long', course_name: 'String', from_screen: 'CourseProfileSource?' }),
+      Evva::AnalyticsEvent.new('cp_page_view_d', { course_id: 'Long?', course_name: 'String' })
     ] }
 
     let(:expected) {
@@ -71,8 +71,8 @@ Swift
     subject { generator.special_property_enums(enums) }
 
     let(:enums) { [
-      Evva::MixpanelEnum.new('CourseProfileSource', ['course_discovery', 'synced_courses']),
-      Evva::MixpanelEnum.new('PremiumFrom', ['Course Profile', 'Round Setup'])
+      Evva::AnalyticsEnum.new('CourseProfileSource', ['course_discovery', 'synced_courses']),
+      Evva::AnalyticsEnum.new('PremiumFrom', ['Course Profile', 'Round Setup'])
     ] }
 
     let(:expected) {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evva
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - RicardoTrindade
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-30 00:00:00.000000000 Z
+date: 2021-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: safe_yaml
@@ -48,7 +48,6 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop_todo.yml"
-- ".ruby-version"
 - ".travis.yml"
 - Gemfile
 - Gemfile.lock
@@ -59,13 +58,13 @@ files:
 - evva.gemspec
 - evva_config.yml
 - lib/evva.rb
+- lib/evva/analytics_enum.rb
+- lib/evva/analytics_event.rb
 - lib/evva/android_generator.rb
 - lib/evva/config.rb
 - lib/evva/file_reader.rb
 - lib/evva/google_sheet.rb
 - lib/evva/logger.rb
-- lib/evva/mixpanel_enum.rb
-- lib/evva/mixpanel_event.rb
 - lib/evva/object_extension.rb
 - lib/evva/swift_generator.rb
 - lib/evva/version.rb

data/.ruby-version

@@ -1 +0,0 @@
-2.7.3