evva 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f74dbff0766dc7623ca1ac518e7636172440511a4470398d594fefef8364fba9
-  data.tar.gz: 4793e14af612e48d0e7cf85aa313d5c6c4f92c5eb440be7a853503f39fd093e6
+  metadata.gz: f4038f23c86f1051786de3a9a9407a9b9656fc6b449d2e1f62be66f0081fa054
+  data.tar.gz: 6fc90e80a8a4ac97d935df0fa90cc410d582270845f8a7083081f85bf5069b93
 SHA512:
-  metadata.gz: ebbee6abfa8abd7e6717f20246a1271a7d7b35e4b9a42414293ff436cff842e82ac45beb7638dc642cdb00c1408f7c81cb4b8dcfdd7d4ee6dafa04f121388b5a
-  data.tar.gz: 18c42c24f8f2b7d923c9a99b5ec58a43d258340b2523fdb4bf8f136bb0d4d9a075f3497b4c0c8a8176c4e01b07db56f116066b1139389104497db86e6ed9e30b
+  metadata.gz: 87a050829faed5ec1792fcca19e064adb17009ddcdf0b19366cab4aedc251816363665d5577cbe8e5c0e9206e30b8eaafb06546b5fdc72adc3243db90cde9d1e
+  data.tar.gz: ca0d51be95a1f5f0dd4e3e6a224dfb5aa734258be9a1b5e8b1d45386d87174d473268ceec6973147b47aa9ef726d9d8c246a7941365f753d606d9d24769c66da

data/changelog.md

@@ -1,5 +1,8 @@
 # Change Log
 
+## [0.4.1] - 2021-12-23
+- Changes swift implementation so that destinations belong to EventType/PropertyType instead of Event/Property
+
 ## [0.4.0] - 2021-12-21
 - Adds type to people properties
 - Adds a list of destinations to events and people properties

data/lib/evva/templates/swift/events.swift

@@ -9,15 +9,25 @@ struct EventData {
 		self.destinations = destinations
 	}
 
-	init(name: EventName, properties: [String: Any]?, destinations: [Destination]) {
-		self.init(name: name.rawValue, properties: properties, destinations: destinations)
+	init(type: EventType, properties: [String: Any]?) {
+		self.init(name: type.name, properties: properties, destinations: type.destinations)
 	}
 }
 
-enum EventName: String {
+enum EventType: String {
 	<%- events.each do |e| -%>
 	case <%= e[:case_name] %> = "<%= e[:event_name] %>"
 	<%- end -%>
+
+	var name: String { return rawValue }
+
+	var destinations: [Destination] {
+		switch self {
+		<%- events.each do |e| -%>
+		case .<%= e[:case_name] %>: return [<%= e[:destinations].map { |d| ".#{d}" }.join(", ") %>]
+		<%- end -%>
+		}
+	}
 }
 
 enum Event {
@@ -37,22 +47,13 @@ enum Event {
 		<%- else -%>
 		case let .<%= e[:case_name] %>(<%= e[:properties].map { |p| p[:name] }.join(", ") %>):
 		<%- end -%>
-			return EventData(name: .<%= e[:case_name] %>,
+			return EventData(type: .<%= e[:case_name] %>,
 				<%- if e[:properties].count == 0 -%>
-							 properties: nil,
+							 properties: nil)
 				<%- else -%>
 							 properties: [
 					<%- e[:properties].each do |p| -%>
 								"<%= p[:name] %>": <%= p[:value] %> as Any,
-					<%- end -%>
-							 ],
-				<%- end -%>
-				<%- if e[:destinations].count == 0 -%>
-							 destinations: [])
-				<%- else -%>
-							 destinations: [
-					<%- e[:destinations].each do |d| -%>
-								.<%= d %>,
 					<%- end -%>
 							 ])
 				<%- end -%>

data/lib/evva/templates/swift/people_properties.swift

@@ -9,15 +9,25 @@ struct PropertyData {
 		self.destinations = destinations
 	}
 
-	init(name: PropertyName, value: Any, destinations: [Destination]) {
-		self.init(name: name.rawValue, value: value, destinations: destinations)
+	init(type: PropertyType, value: Any) {
+		self.init(name: type.name, value: value, destinations: type.destinations)
 	}
 }
 
-enum PropertyName: String {
+enum PropertyType: String {
 	<%- properties.each do |p| -%>
 	case <%= p[:case_name] %> = "<%= p[:property_name ] %>"
 	<%- end -%>
+
+	var name: String { return rawValue }
+
+	var destinations: [Destination] {
+		switch self {
+		<%- properties.each_with_index do |p, index| -%>
+		case .<%= p[:case_name] %>: return [<%= p[:destinations].map { |d| ".#{d}" }.join(", ") %>]
+		<%- end -%>
+		}
+	}
 }
 
 enum Property {
@@ -29,17 +39,8 @@ enum Property {
 		switch self {
 		<%- properties.each_with_index do |p, index| -%>
 		case let .<%= p[:case_name] %>(value):
-			return PropertyData(name: .<%= p[:case_name] %>,
-								value: value<% if p[:is_special_property] %>.rawValue<% end %>,
-			<%- if p[:destinations].count == 0 -%>
-								destinations: [])
-			<%- else -%>
-								destinations: [
-				<%- p[:destinations].each do |d| -%>
-									.<%= d %>,
-				<%- end -%>
-								])
-			<%- end -%>
+			return PropertyData(type: .<%= p[:case_name] %>,
+								value: value<% if p[:is_special_property] %>.rawValue<% end %>)
 			<%- unless index == properties.count - 1 -%>
 
 			<%- end -%>

data/lib/evva/version.rb

@@ -1,4 +1,4 @@
 module Evva
-  VERSION = '0.4.0'.freeze
-  VERSION_UPDATED_AT = '2021-12-21'.freeze
+  VERSION = '0.4.1'.freeze
+  VERSION_UPDATED_AT = '2021-12-23'.freeze
 end

data/spec/lib/evva/swift_generator_spec.rb

@@ -30,17 +30,29 @@ extension Analytics {
             self.destinations = destinations
         }
 
-        init(name: EventName, properties: [String: Any]?, destinations: [Destination]) {
-            self.init(name: name.rawValue, properties: properties, destinations: destinations)
+        init(type: EventType, properties: [String: Any]?) {
+            self.init(name: type.name, properties: properties, destinations: type.destinations)
         }
     }
 
-    enum EventName: String {
+    enum EventType: String {
         case cpPageView = "cp_page_view"
         case cpPageViewA = "cp_page_view_a"
         case cpPageViewB = "cp_page_view_b"
         case cpPageViewC = "cp_page_view_c"
         case cpPageViewD = "cp_page_view_d"
+
+        var name: String { return rawValue }
+
+        var destinations: [Destination] {
+            switch self {
+            case .cpPageView: return [.firebase]
+            case .cpPageViewA: return [.firebase, .customDestination]
+            case .cpPageViewB: return []
+            case .cpPageViewC: return []
+            case .cpPageViewD: return []
+            }
+        }
     }
 
     enum Event {
@@ -53,48 +65,38 @@ extension Analytics {
         var data: EventData {
             switch self {
             case .cpPageView:
-                return EventData(name: .cpPageView,
-                                 properties: nil,
-                                 destinations: [
-                                    .firebase,
-                                 ])
+                return EventData(type: .cpPageView,
+                                 properties: nil)
 
             case let .cpPageViewA(course_id, course_name):
-                return EventData(name: .cpPageViewA,
+                return EventData(type: .cpPageViewA,
                                  properties: [
                                     "course_id": course_id as Any,
                                     "course_name": course_name as Any,
-                                 ],
-                                 destinations: [
-                                    .firebase,
-                                    .customDestination,
                                  ])
 
             case let .cpPageViewB(course_id, course_name, from_screen):
-                return EventData(name: .cpPageViewB,
+                return EventData(type: .cpPageViewB,
                                  properties: [
                                     "course_id": course_id as Any,
                                     "course_name": course_name as Any,
                                     "from_screen": from_screen.rawValue as Any,
-                                 ],
-                                 destinations: [])
+                                 ])
 
             case let .cpPageViewC(course_id, course_name, from_screen):
-                return EventData(name: .cpPageViewC,
+                return EventData(type: .cpPageViewC,
                                  properties: [
                                     "course_id": course_id as Any,
                                     "course_name": course_name as Any,
                                     "from_screen": from_screen?.rawValue as Any,
-                                 ],
-                                 destinations: [])
+                                 ])
 
             case let .cpPageViewD(course_id, course_name):
-                return EventData(name: .cpPageViewD,
+                return EventData(type: .cpPageViewD,
                                  properties: [
                                     "course_id": course_id as Any,
                                     "course_name": course_name as Any,
-                                 ],
-                                 destinations: [])
+                                 ])
             }
         }
     }
@@ -163,15 +165,25 @@ extension Analytics {
             self.destinations = destinations
         }
 
-        init(name: PropertyName, value: Any, destinations: [Destination]) {
-            self.init(name: name.rawValue, value: value, destinations: destinations)
+        init(type: PropertyType, value: Any) {
+            self.init(name: type.name, value: value, destinations: type.destinations)
         }
     }
 
-    enum PropertyName: String {
+    enum PropertyType: String {
         case roundsWithWear = "rounds_with_wear"
         case wearPlatform = "wear_platform"
         case numberOfTimesItHappened = "number_of_times_it_happened"
+
+        var name: String { return rawValue }
+
+        var destinations: [Destination] {
+            switch self {
+            case .roundsWithWear: return [.firebase]
+            case .wearPlatform: return [.firebase, .customDestination]
+            case .numberOfTimesItHappened: return []
+            }
+        }
     }
 
     enum Property {
@@ -182,24 +194,16 @@ extension Analytics {
         var data: PropertyData {
             switch self {
             case let .roundsWithWear(value):
-                return PropertyData(name: .roundsWithWear,
-                                    value: value,
-                                    destinations: [
-                                        .firebase,
-                                    ])
+                return PropertyData(type: .roundsWithWear,
+                                    value: value)
 
             case let .wearPlatform(value):
-                return PropertyData(name: .wearPlatform,
-                                    value: value.rawValue,
-                                    destinations: [
-                                        .firebase,
-                                        .customDestination,
-                                    ])
+                return PropertyData(type: .wearPlatform,
+                                    value: value.rawValue)
 
             case let .numberOfTimesItHappened(value):
-                return PropertyData(name: .numberOfTimesItHappened,
-                                    value: value,
-                                    destinations: [])
+                return PropertyData(type: .numberOfTimesItHappened,
+                                    value: value)
             }
         }
     }

metadata

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