evva 0.4.1 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4038f23c86f1051786de3a9a9407a9b9656fc6b449d2e1f62be66f0081fa054
-  data.tar.gz: 6fc90e80a8a4ac97d935df0fa90cc410d582270845f8a7083081f85bf5069b93
+  metadata.gz: e3f1cd09cc493a75e644d51edd737562bf55155de573db968b198820c1b1cad8
+  data.tar.gz: 4bd7cd7e846fde8df4a38fc30bdf00f4f836fa201516fa42209fc32b099f6eef
 SHA512:
-  metadata.gz: 87a050829faed5ec1792fcca19e064adb17009ddcdf0b19366cab4aedc251816363665d5577cbe8e5c0e9206e30b8eaafb06546b5fdc72adc3243db90cde9d1e
-  data.tar.gz: ca0d51be95a1f5f0dd4e3e6a224dfb5aa734258be9a1b5e8b1d45386d87174d473268ceec6973147b47aa9ef726d9d8c246a7941365f753d606d9d24769c66da
+  metadata.gz: 005373a4fd6e7d93a7f866b8b0d4f84b27e57eb3040d7b268195ef89f6721de34cacfd16d700a234954182fbee1f4b50281f508c623966b6d73d67a96695ebd7
+  data.tar.gz: 178a841a3bfc177a24722701f8c5531abce5cc5fd1e48f30908443d055851220b2f2cdddc082c8b1bbe31a9ea77bd15c451a219af8cf83fab483c8d41f95bfe9

data/changelog.md

@@ -1,5 +1,13 @@
 # Change Log
 
+## Unreleased
+
+## [0.4.3] - 2023-09-14
+- Put class properties in newline for Kotlin
+
+## [0.4.2] - 2022-01-05
+- Fix kotlin generation changes in 0.4.0
+
 ## [0.4.1] - 2021-12-23
 - Changes swift implementation so that destinations belong to EventType/PropertyType instead of Event/Property
 

data/lib/evva/android_generator.rb

@@ -26,6 +26,8 @@ module Evva
 
         events = bundle.map do |event|
           properties = event.properties.map do |name, type|
+            type = native_type(type)
+
             param_name = camelize(name.to_s, false)
             value_fetcher = param_name
 
@@ -51,8 +53,7 @@ module Evva
             class_name: camelize(event.event_name),
             event_name: constantize(event.event_name),
             properties: properties,
-            destinations: destinations,
-            is_object: properties.count == 0 && destinations.count == 0,
+            destinations: destinations
           }
         end
 
@@ -82,10 +83,11 @@ module Evva
         destinations_class_name = destinations_file_name
 
         properties = people_bundle.map do |property|
+          type = native_type(property.type)
           {
             class_name: camelize(property.property_name),
             property_name: constantize(property.property_name),
-            type: property.type,
+            type: type,
             is_special_property: is_special_property?(property.type),
             destinations: property.destinations.map { |p| constantize(p) },
           }
@@ -175,6 +177,11 @@ module Evva
       string.tr(' ', '_').upcase
     end
 
+    def native_type(type)
+      type
+        .gsub('Date','String')
+    end
+
     def is_special_property?(type)
       !NATIVE_TYPES.include?(type.chomp('?'))
     end

data/lib/evva/templates/kotlin/events.kt

@@ -1,32 +1,36 @@
-sealed class <%= class_name %>(event: <%= enums_class_name %>) {
+sealed class <%= class_name %>(
+    event: <%= enums_class_name %>,
+    val properties: Map<String, Any?>? = null,
+    val destinations: Array<<%= destinations_class_name %>> = emptyArray()
+) {
     val name = event.key
 
-    open val properties: Map<String, Any?>? = null
-    open val destinations: Array<<%= destinations_class_name %>> = []
-
     <%- events.each_with_index do |e, index| -%>
-    <%- if e[:is_object] -%>
-    object <%= e[:class_name] %> : <%= class_name %>(<%= enums_class_name %>.<%= e[:event_name] %>)
+    <%- if e[:properties].count == 0 -%>
+    object <%= e[:class_name] %> : <%= class_name %>(
     <%- else -%>
-    data class <%= e[:class_name] %><% if e[:properties].count > 0 %>(
-        <%= e[:properties].map { |p| "val #{p[:param_name]}: #{p[:type]}" }.join(", ") %>
-    )<% end %> : <%= class_name %>(<%= enums_class_name %>.<%= e[:event_name] %>) {
+    data class <%= e[:class_name] %>(
+        <%- e[:properties].each_with_index do |p, index| -%>
+        <%= "val #{p[:param_name]}: #{p[:type]}" %><% if index < e[:properties].count - 1 %>,<% end %>
+        <%- end -%>
+    ) : <%= class_name %>(
+    <%- end -%>
+        event = <%= enums_class_name %>.<%= e[:event_name] %>,
         <%- if e[:properties].count > 0 -%>
-        override val properties = mapOf(
+        properties = mapOf(
             <%- e[:properties].each_with_index do |p, index| -%>
             "<%= p[:name] %>" to <%= p[:value_fetcher] %><% if index < e[:properties].count - 1 %>,<% end %>
             <%- end -%>
-        )
+        ),
         <%- end -%>
         <%- if e[:destinations].count > 0 -%>
-        override val destinations = [
+        destinations = arrayOf(
             <%- e[:destinations].each_with_index do |d, index| -%>
             <%= destinations_class_name %>.<%= d %><% if index < e[:destinations].count - 1 %>,<% end %>
             <%- end -%>
-        ]
+        )
         <%- end -%>
-    }
-    <%- end -%>
+    )
     <%- unless index == events.count - 1 -%>
 
     <%- end -%>

data/lib/evva/templates/kotlin/people_properties.kt

@@ -1,22 +1,24 @@
-sealed class <%= class_name %>(property: <%= enums_class_name %>) {
+sealed class <%= class_name %>(
+	property: <%= enums_class_name %>,
+	val innerValue: Any,
+	val destinations: Array<<%= destinations_class_name %>> = emptyArray()
+) {
 	val name = property.key
 
-	open val value: Any = ""
-	open val destinations: Array<<%= destinations_class_name %>> = []
-
 	<%- properties.each_with_index do |property, index| -%>
 	data class <%= property[:class_name] %>(
 		val value: <%= property[:type] %>
-	) : <%= class_name %>(<%= enums_class_name %>.<%= property[:property_name] %>) {
-		override val value = value<% if property[:is_special_property] %>.key<% end %>
+	) : <%= class_name %>(
+		property = <%= enums_class_name %>.<%= property[:property_name] %>,
+		innerValue = value<% if property[:is_special_property] %>.key<% end %>,
 		<%- if property[:destinations].count > 0 -%>
-		override val destinations = [
+		destinations = arrayOf(
 			<%- property[:destinations].each_with_index do |d, index| -%>
 			<%= destinations_class_name %>.<%= d %><% if index < property[:destinations].count - 1 %>,<% end %>
 			<%- end -%>
-		]
+		)
 		<%- end -%>
-	}
+	)
 	<%- unless index == properties.count - 1 -%>
 
 	<%- end -%>

data/lib/evva/version.rb

@@ -1,4 +1,4 @@
 module Evva
-  VERSION = '0.4.1'.freeze
-  VERSION_UPDATED_AT = '2021-12-23'.freeze
+  VERSION = '0.4.3'.freeze
+  VERSION_UPDATED_AT = '2023-09-14'.freeze
 end

data/spec/lib/evva/android_generator_spec.rb

@@ -10,7 +10,7 @@ describe Evva::AndroidGenerator do
       Evva::AnalyticsEvent.new('cp_page_view_a', { course_id: 'Long', course_name: 'String' }, ["firebase", "custom destination"]),
       Evva::AnalyticsEvent.new('cp_page_view_b', { course_id: 'Long', course_name: 'String', from_screen: 'CourseProfileSource' }, ["firebase"]),
       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' }, []),
+      Evva::AnalyticsEvent.new('cp_page_view_d', { course_id: 'Long?', course_name: 'String', viewed_at: 'Date' }, []),
     ] }
 
     let(:expected) {
@@ -21,64 +21,80 @@ package com.hole19golf.hole19.analytics
  * This file was automatically generated by evva: https://github.com/hole19/evva
  */
 
-sealed class AnalyticsEvent(event: AnalyticsEvents) {
+sealed class AnalyticsEvent(
+    event: AnalyticsEvents,
+    val properties: Map<String, Any?>? = null,
+    val destinations: Array<AnalyticsDestinations> = emptyArray()
+) {
     val name = event.key
 
-    open val properties: Map<String, Any?>? = null
-    open val destinations: Array<AnalyticsDestinations> = []
+    object CpPageView : AnalyticsEvent(
+        event = AnalyticsEvents.CP_PAGE_VIEW,
+    )
 
-    object CpPageView : AnalyticsEvent(AnalyticsEvents.CP_PAGE_VIEW)
-
-    data class CpPageView2 : AnalyticsEvent(AnalyticsEvents.CP_PAGE_VIEW_2) {
-        override val destinations = [
+    object CpPageView2 : AnalyticsEvent(
+        event = AnalyticsEvents.CP_PAGE_VIEW_2,
+        destinations = arrayOf(
             AnalyticsDestinations.FIREBASE
-        ]
-    }
+        )
+    )
 
     data class CpPageViewA(
-        val courseId: Long, val courseName: String
-    ) : AnalyticsEvent(AnalyticsEvents.CP_PAGE_VIEW_A) {
-        override val properties = mapOf(
+        val courseId: Long,
+        val courseName: String
+    ) : AnalyticsEvent(
+        event = AnalyticsEvents.CP_PAGE_VIEW_A,
+        properties = mapOf(
             "course_id" to courseId,
             "course_name" to courseName
-        )
-        override val destinations = [
+        ),
+        destinations = arrayOf(
             AnalyticsDestinations.FIREBASE,
             AnalyticsDestinations.CUSTOM_DESTINATION
-        ]
-    }
+        )
+    )
 
     data class CpPageViewB(
-        val courseId: Long, val courseName: String, val fromScreen: CourseProfileSource
-    ) : AnalyticsEvent(AnalyticsEvents.CP_PAGE_VIEW_B) {
-        override val properties = mapOf(
+        val courseId: Long,
+        val courseName: String,
+        val fromScreen: CourseProfileSource
+    ) : AnalyticsEvent(
+        event = AnalyticsEvents.CP_PAGE_VIEW_B,
+        properties = mapOf(
             "course_id" to courseId,
             "course_name" to courseName,
             "from_screen" to fromScreen.key
-        )
-        override val destinations = [
+        ),
+        destinations = arrayOf(
             AnalyticsDestinations.FIREBASE
-        ]
-    }
+        )
+    )
 
     data class CpPageViewC(
-        val courseId: Long, val courseName: String, val fromScreen: CourseProfileSource?
-    ) : AnalyticsEvent(AnalyticsEvents.CP_PAGE_VIEW_C) {
-        override val properties = mapOf(
+        val courseId: Long,
+        val courseName: String,
+        val fromScreen: CourseProfileSource?
+    ) : AnalyticsEvent(
+        event = AnalyticsEvents.CP_PAGE_VIEW_C,
+        properties = mapOf(
             "course_id" to courseId,
             "course_name" to courseName,
             "from_screen" to fromScreen?.key
-        )
-    }
+        ),
+    )
 
     data class CpPageViewD(
-        val courseId: Long?, val courseName: String
-    ) : AnalyticsEvent(AnalyticsEvents.CP_PAGE_VIEW_D) {
-        override val properties = mapOf(
+        val courseId: Long?,
+        val courseName: String,
+        val viewedAt: String
+    ) : AnalyticsEvent(
+        event = AnalyticsEvents.CP_PAGE_VIEW_D,
+        properties = mapOf(
             "course_id" to courseId,
-            "course_name" to courseName
-        )
-    }
+            "course_name" to courseName,
+            "viewed_at" to viewedAt
+        ),
+    )
 }
 Kotlin
     }
@@ -141,6 +157,7 @@ Kotlin
     subject { generator.people_properties(people_bundle, 'AnalyticsProperty', 'AnalyticsProperties', 'AnalyticsDestinations') }
     let(:people_bundle) { [
       Evva::AnalyticsProperty.new('rounds_with_wear', 'String', []),
+      Evva::AnalyticsProperty.new('last_active_at', 'Date', []),
       Evva::AnalyticsProperty.new('wear_platform', 'WearableAppPlatform', ["firebase", "custom destination"]),
     ] }
     let(:expected) {
@@ -151,27 +168,37 @@ package com.hole19golf.hole19.analytics
  * This file was automatically generated by evva: https://github.com/hole19/evva
  */
 
-sealed class AnalyticsProperty(property: AnalyticsProperties) {
+sealed class AnalyticsProperty(
+    property: AnalyticsProperties,
+    val innerValue: Any,
+    val destinations: Array<AnalyticsDestinations> = emptyArray()
+) {
     val name = property.key
 
-    open val value: Any = ""
-    open val destinations: Array<AnalyticsDestinations> = []
-
     data class RoundsWithWear(
         val value: String
-    ) : AnalyticsProperty(AnalyticsProperties.ROUNDS_WITH_WEAR) {
-        override val value = value
-    }
+    ) : AnalyticsProperty(
+        property = AnalyticsProperties.ROUNDS_WITH_WEAR,
+        innerValue = value,
+    )
+
+    data class LastActiveAt(
+        val value: String
+    ) : AnalyticsProperty(
+        property = AnalyticsProperties.LAST_ACTIVE_AT,
+        innerValue = value,
+    )
 
     data class WearPlatform(
         val value: WearableAppPlatform
-    ) : AnalyticsProperty(AnalyticsProperties.WEAR_PLATFORM) {
-        override val value = value.key
-        override val destinations = [
+    ) : AnalyticsProperty(
+        property = AnalyticsProperties.WEAR_PLATFORM,
+        innerValue = value.key,
+        destinations = arrayOf(
             AnalyticsDestinations.FIREBASE,
             AnalyticsDestinations.CUSTOM_DESTINATION
-        ]
-    }
+        )
+    )
 }
 Kotlin
     }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evva
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.3
 platform: ruby
 authors:
 - RicardoTrindade
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-23 00:00:00.000000000 Z
+date: 2023-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: safe_yaml