evva 0.1.4.2 → 0.1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90dd43b0fdd3169aa137cf665a8c592693b9d686
-  data.tar.gz: 12649831ed616d714b7357c3fdff9d1cd7cf41ea
+  metadata.gz: 87f47c713fe2f646dc5302d44a06e739976bfd6f
+  data.tar.gz: ed72f81ccb086f03fc21426dee5332260a38aa6b
 SHA512:
-  metadata.gz: 9d043c714969d7d188026015fe15d0ef3a6d0be113d05593c53624e4af1a63f755800bcfab407d35b4512fd00045791ea59085cc6cc918163faae540222dbd5c
-  data.tar.gz: ec753ef63337efd78777711e1e2b62b46956a3c44ef699d50d2f9761ff54a9f82cec7124527cf774ca5c95fbae6a3a90785d2d9702bcf0396525dabfc692b2aa
+  metadata.gz: dda81be8b9ea3b174d0d20b8e68846681521574eee808318778ccd7265ec7ae27c185b5f615a010c8d544bf62ef5f3fd47382252476d7e46e8a80dc829c4f997
+  data.tar.gz: cede59eb52f5858775c0fce0d6ca35621dc0365ace4171bd69f1961d9ea10fcdda4b2139f1fb4bfdb93a2462dafaa3ef0e980fb130eed78fa07bd2b3eb5a8adb

data/README.md

@@ -24,4 +24,5 @@ Evva
  event_file_name: /file/with/tracking/functions
  event_enum_file_name: /file/with/event/names
  people_file_name: /file/with/people/properties
+ special_enum_file_name: //file/with/special/enum/properties/
  ```

data/changelog.md

@@ -1,4 +1,8 @@
 # Change Log
+## [0.1.4.3] - 2018-10-12
+ - Fixes swift and kotlin tabs, indentation and property names
+ - Merges all special enums in a single file
+
 ## [0.1.4.2] - 2018-02-14
  - Replaces Swift headers
 
@@ -20,4 +24,4 @@
 - Fixes mismatch between file name and class name generated.
 
 ## [0.1.0] - 2017/10/26
-- Initial Release.
+- Initial Release.

data/lib/evva.rb

@@ -5,7 +5,6 @@ require 'evva/logger'
 require 'evva/google_sheet'
 require 'evva/config'
 require 'evva/file_reader'
-require 'evva/data_source'
 require 'evva/mixpanel_event'
 require 'evva/mixpanel_enum'
 require 'evva/object_extension'
@@ -44,13 +43,12 @@ module Evva
       path = "#{configuration.out_path}/#{configuration.event_enum_file_name}.#{extension}"
       write_to_file(path, generator.event_enum(bundle[:events], configuration.event_enum_file_name))
     end
+
     path = "#{configuration.out_path}/#{configuration.people_file_name}.#{extension}"
     write_to_file(path, generator.people_properties(bundle[:people], configuration.people_file_name))
 
-    bundle[:enums].each do |enum|
-      path = "#{configuration.out_path}/#{enum.enum_name}.#{extension}"
-      write_to_file(path, generator.special_property_enum(enum))
-    end
+    path = "#{configuration.out_path}/#{configuration.special_enum_file_name}.#{extension}"
+    write_to_file(path, generator.special_property_enums(bundle[:enums]))
   end
 
   def analytics_data(config:)

data/lib/evva/android_generator.rb

@@ -1,48 +1,72 @@
 module Evva
   class AndroidGenerator
-    KOTLIN_EVENT_HEADER =
-      "package com.hole19golf.hole19.analytics\n\n"\
-      "import com.hole19golf.hole19.analytics.Event\n"\
-      "import com.hole19golf.hole19.analytics.MixpanelAnalyticsMask\n"\
-      "import org.json.JSONObject\n\n".freeze
-
-    KOTLIN_PEOPLE_HEADER =
-      "package com.hole19golf.hole19.analytics\n"\
-      "import com.hole19golf.hole19.analytics.Event\n\n".freeze
-
-    KOTLIN_BUNDLE_HEADER =
-      "package com.hole19golf.hole19.analytics\n"\
-      "import com.hole19golf.hole19.analytics.Event\n\n".freeze
-
-    KOTIN_PEOPLE_FUNCTIONS =
-      "\nopen fun updateProperties(property: MixpanelProperties, value: Any) {\n"\
-      "\t\tmixpanelMask.updateProperties(property.key, value)"\
-      "\t\n} \n"\
-      "\nopen fun incrementCounter(property: MixpanelProperties) {\n"\
-      "\t\tmixpanelMask.incrementCounter(property.key)"\
-      "\t\n} \n".freeze
-
-    NATIVE_TYPES = %w[Long Int String Double Float Boolean].freeze
 
     def events(bundle, file_name)
-      event_file = KOTLIN_EVENT_HEADER + "open class #{file_name}(private val mixpanelMask: MixpanelAnalyticsMask) {\n".freeze
-      bundle.each do |event|
-        event_file += "\n#{kotlin_function(event)}"
+      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")}
+
+\topen fun updateProperties(property: MixpanelProperties, value: Any) {
+\t\tmask.updateProperties(property.key, value)
+\t}
+
+\topen fun incrementCounter(property: MixpanelProperties) {
+\t\tmask.incrementCounter(property.key)
+\t}
+}"""
       end
-      event_file += KOTIN_PEOPLE_FUNCTIONS
-      event_file += "\n}"
     end
 
     def people_properties(people_bundle, file_name)
-      properties = KOTLIN_PEOPLE_HEADER + "enum class #{file_name}(val key: String) {\n"
-      properties += people_bundle.map { |prop| "\t\t#{prop.upcase}(\"#{prop}\")" }.join(",\n")
-      properties += ";\n}\n"
+      header_footer_wrapper do
+        body = "enum class MixpanelProperties(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)
-      event_file = KOTLIN_BUNDLE_HEADER + "enum class #{file_name}(override val key: String) : Event {\n"
-      event_file += bundle.map { |event| "\t\t#{event.event_name.upcase}(\"#{event.event_name}\")"}.join(", \n")
-      event_file += "\n}\n"
+      header_footer_wrapper([IMPORT_EVENT]) do
+        body = "enum class #{file_name}(override val key: String) : Event {\n"
+        body << bundle.map(&:event_name).map { |prop| "\t#{prop.upcase}(\"#{prop}\")" }.join(",\n")
+        body << ";\n}"
+      end
+    end
+
+    def special_property_enums(enums)
+      header_footer_wrapper do
+        enums.map do |enum|
+          body = "enum class #{enum.enum_name}(val key: String) {\n"
+          body << enum.values.map { |vals| "\t#{vals.tr(' ', '_').upcase}(\"#{vals}\")"}.join(",\n")
+          body << ";\n}"
+        end.join("\n\n")
+      end
+    end
+
+    IMPORT_EVENT = "import com.hole19golf.hole19.analytics.Event".freeze
+    IMPORT_MASK = "import com.hole19golf.hole19.analytics.MixpanelAnalyticsMask".freeze
+    IMPORT_JSON = "import org.json.JSONObject".freeze
+
+    NATIVE_TYPES = %w[Long Int String Double Float Boolean].freeze
+
+    private
+
+    def imports_header(imports = [])
+      return unless imports.length > 0
+      imports.join("\n") + "\n\n"
+    end
+
+    def header_footer_wrapper(imports = [])
+<<-Kotlin
+package com.hole19golf.hole19.analytics
+
+#{imports_header(imports)}/**
+ * This file was automatically generated by evva: https://github.com/hole19/evva
+ */
+
+#{yield.gsub("\t", "    ")}
+Kotlin
     end
 
     def kotlin_function(event_data)
@@ -50,27 +74,18 @@ module Evva
       function_arguments = event_data.properties.map { |name, type| "#{name}: #{type}" }.join(', ')
       if !function_arguments.empty?
         props = json_props(event_data.properties)
-        function_body =
-          "open fun #{function_name}(#{function_arguments}) {"\
-          "#{props}"\
-          "\tmixpanelMask.trackEvent(MixpanelEvent.#{event_data.event_name.upcase}, properties)\n"
+"""\topen fun #{function_name}(#{function_arguments}) {
+#{props}
+\t\tmask.trackEvent(MixpanelEvent.#{event_data.event_name.upcase}, properties)
+\t}"""
+
       else
-        function_body =
-          "open fun #{function_name}() {\n"\
-          "\tmixpanelMask.trackEvent(MixpanelEvent.#{event_data.event_name.upcase})\n"
+"""\topen fun #{function_name}() {
+\t\tmask.trackEvent(MixpanelEvent.#{event_data.event_name.upcase})
+\t}"""
       end
-      function_body += "}\n"
-    end
-
-    def special_property_enum(enum)
-      enum_body = "package com.hole19golf.hole19.analytics\n\n"
-      enum_body += "enum class #{enum.enum_name}(val key: String) {\n"
-      enum_body += enum.values.map { |vals| "\t#{vals.tr(' ', '_').upcase}(\"#{vals}\")"}.join(",\n")
-      enum_body += "\n}\n"
     end
 
-    private
-
     def json_props(properties)
       split_properties =
         properties
@@ -89,12 +104,10 @@ module Evva
             end
           end
         end
-        .map { |line| "\t\t#{line}" }
+        .map { |line| "\t\t\t#{line}" }
         .join("\n")
 
-      resulting_json = "\n\tval properties = JSONObject().apply {\n" +
-                       +split_properties.to_s
-      resulting_json += "\n\t}\n"
+      "\t\tval properties = JSONObject().apply {\n#{split_properties}\n\t\t}"
     end
 
     def special_property?(type)

data/lib/evva/config.rb

@@ -39,6 +39,10 @@ module Evva
       @hash[:event_enum_file_name]
     end
 
+    def special_enum_file_name
+      @hash[:special_enum_file_name]
+    end
+
     CONFIG_STRUCT = {
       type: Hash,
       elements: {

data/lib/evva/google_sheet.rb

@@ -8,45 +8,43 @@ module Evva
     end
 
     def events
-      raw = raw_data(@sheet_id, 0)
-      Logger.info('Downloading dictionary from Google Sheet...')
-      non_language_columns = %w[id updated category
-                                title content link]
       event_list = []
-      raw['entry'].each do |entry|
-        filtered_entry = entry.reject { |c| non_language_columns.include?(c) }
-        event_name = filtered_entry['eventname'].first
-        properties = hash_parser(filtered_entry['props'].first)
-        event_list.push(Evva::MixpanelEvent.new(event_name, properties))
+      iterate_entries(raw_data(@sheet_id, 0)) do |entry|
+        event_name = entry['eventname'].first
+        properties = hash_parser(entry['eventproperties'].first)
+        event_list << Evva::MixpanelEvent.new(event_name, properties)
       end
       event_list
     end
 
     def people_properties
-      raw = raw_data(@sheet_id, 1)
       people_list = []
-      Logger.info('Downloading dictionary from Google Sheet...')
-      non_language_columns = %w[id updated category title content link]
-      raw['entry'].each do |entry|
-        filtered_entry = entry.reject { |c| non_language_columns.include?(c) }
-        value = filtered_entry['value'].first
+      iterate_entries(raw_data(@sheet_id, 1)) do |entry|
+        value = entry['propertyname'].first
         people_list << value
       end
       people_list
     end
 
     def enum_classes
-      raw = raw_data(@sheet_id, 2)
+      enum_list = []
+      iterate_entries(raw_data(@sheet_id, 2)) do |entry|
+        enum_name = entry['enumname'].first
+        values = entry['possiblevalues'].first.split(',')
+        enum_list << Evva::MixpanelEnum.new(enum_name, values)
+      end
+      enum_list
+    end
+
+    private
+
+    def iterate_entries(data)
       Logger.info('Downloading dictionary from Google Sheet...')
       non_language_columns = %w[id updated category title content link]
-      enum_list = []
-      raw['entry'].each do |entry|
+      data['entry'].each do |entry|
         filtered_entry = entry.reject { |c| non_language_columns.include?(c) }
-        enum_name = filtered_entry['enum'].first
-        values = filtered_entry['values'].first.split(',')
-        enum_list.push(Evva::MixpanelEnum.new(enum_name, values))
+        yield(filtered_entry)
       end
-      enum_list
     end
 
     def xml_data(uri, headers = nil)
@@ -56,13 +54,13 @@ module Evva
       http.verify_mode = OpenSSL::SSL::VERIFY_NONE
       data = http.get(uri.path, headers)
       unless data.code.to_i == 200
-        raise 'Cannot access sheet at #{uri} - HTTP #{data.code}'
+        raise "Cannot access sheet at #{uri} - HTTP #{data.code}"
       end
 
       begin
         XmlSimple.xml_in(data.body, 'KeyAttr' => 'name')
       rescue
-        raise 'Cannot parse. Expected XML at #{uri}'
+        raise "Cannot parse. Expected XML at #{uri}"
       end
     end
 
@@ -73,8 +71,6 @@ module Evva
       xml_data(url)
     end
 
-    private
-
     def hash_parser(property_array)
       h = {}
       unless property_array.empty?

data/lib/evva/swift_generator.rb

@@ -10,29 +10,26 @@ module Evva
     NATIVE_TYPES = %w[Int String Double Float Bool].freeze
 
     def events(bundle, file_name)
-      event_file = EXTENSION_HEADER
-      event_file += "\tenum Event {\n\n"
-      bundle.each do |event|
-        event_file += event_case(event)
+      header_footer_wrapper do
+"""\tenum Event {
+#{bundle.map { |e| event_case(e) }.join("\n")}
+
+\t\tvar data: EventData {
+\t\t\tswitch self {
+#{bundle.map { |e| event_data(e) }.join("\n\n")}
+\t\t\t}
+\t\t}
+\t}"""
       end
-      event_file += "\n\t\tvar data: EventData {\n"
-      event_file += "\t\t\tswitch self {\n"
-      bundle.each do |event|
-        event_file += event_data(event)
-      end
-      event_file += "\t\t\t}\n"
-      event_file += "\t\t}\n\n"
-      event_file += "\t}"
-      event_file += EXTENSION_FOOTER
     end
 
     def event_case(event_data)
       function_name = camelize(event_data.event_name)
       if event_data.properties.empty?
-        "\t\tcase #{function_name}\n"
+        "\t\tcase #{function_name}"
       else
         trimmed_properties = event_data.properties.map { |k, v| k.to_s + ': ' + native_type(v) }.join(", ")
-        "\t\tcase #{function_name}(#{trimmed_properties})\n"
+        "\t\tcase #{function_name}(#{trimmed_properties})"
       end
     end
 
@@ -40,14 +37,14 @@ module Evva
       function_name = camelize(event_data.event_name)
       if event_data.properties.empty?
         function_body = "\t\t\tcase .#{function_name}:\n" \
-                        "\t\t\t\treturn EventData(name: \"#{event_data.event_name}\")\n\n"
+                        "\t\t\t\treturn EventData(name: \"#{event_data.event_name}\")"
       else
         function_header = prepend_let(event_data.properties)
         function_arguments = dictionary_pairs(event_data.properties)
         function_body = "\t\t\tcase .#{function_name}(#{function_header}):\n"\
                         "\t\t\t\treturn EventData(name: \"#{event_data.event_name}\", properties: [\n"\
                         "\t\t\t\t\t#{function_arguments.join(",\n\t\t\t\t\t")} ]\n"\
-                        "\t\t\t\t)\n\n"
+                        "\t\t\t\t)"
       end
       function_body
     end
@@ -57,23 +54,39 @@ module Evva
     end
 
     def people_properties(people_bundle, file_name)
-      properties = EXTENSION_HEADER
-      properties += "\tenum Property: String {\n"
-      people_bundle.each do |prop|
-        properties += "\t\tcase #{camelize(prop)} = \"#{prop}\"\n"
+      header_footer_wrapper do
+        props = "\tenum Property: String {\n"
+        people_bundle.each do |prop|
+          props << "\t\tcase #{camelize(prop)} = \"#{prop}\"\n"
+        end
+        props << "\t}"
       end
-      properties += "\t}"
-      properties += EXTENSION_FOOTER
     end
 
-    def special_property_enum(enum)
-      enum_body = EXTENSION_HEADER
-      enum_body += "\tenum #{enum.enum_name}: String {\n"
-      enum.values.map do |val|
-        enum_body += "\t\tcase #{val.tr(' ', '_')} = \"#{val}\"\n"
+    def special_property_enums(enums)
+      header_footer_wrapper do
+        enums.map do |enum|
+          body = "\tenum #{enum.enum_name}: String {\n"
+          enum.values.each do |value|
+            body << "\t\tcase #{camelize(value)} = \"#{value}\"\n"
+          end
+          body << "\t}"
+        end.join("\n\n")
       end
-      enum_body += "\t}"
-      enum_body += EXTENSION_FOOTER
+    end
+
+    private
+
+    def header_footer_wrapper
+"""// This file was automatically generated by evva: https://github.com/hole19/evva
+
+import Foundation
+
+extension Analytics {
+
+#{yield.gsub("\t", "    ")}
+}
+"""
     end
 
     def dictionary_pairs(props)
@@ -89,8 +102,6 @@ module Evva
       end
     end
 
-    private
-
     def is_raw_representable_property?(type)
       !NATIVE_TYPES.include?(native_type(type).chomp('?'))
     end
@@ -108,7 +119,7 @@ module Evva
     end
 
     def camelize(term)
-      string = term.to_s
+      string = term.to_s.tr(' ', '_').downcase
       string = string.sub(/^(?:#{@acronym_regex}(?=\b|[A-Z_])|\w)/) { |match| match.downcase }
       string.gsub!(/(?:_|(\/))([a-z\d]*)/i) { "#{$1}#{$2.capitalize}" }
       string.gsub!("/".freeze, "::".freeze)

data/lib/evva/version.rb

@@ -1,4 +1,4 @@
 module Evva
-  VERSION = '0.1.4.2'.freeze
-  VERSION_UPDATED_AT = '2018-02-14'.freeze
+  VERSION = '0.1.4.3'.freeze
+  VERSION_UPDATED_AT = '2018-10-12'.freeze
 end

data/spec/fixtures/sample_public_enums.html

@@ -1 +1 @@
-<?xml version='1.0' encoding='UTF-8'?><feed xmlns='http://www.w3.org/2005/Atom' xmlns:openSearch='http://a9.com/-/spec/opensearchrss/1.0/' xmlns:gsx='http://schemas.google.com/spreadsheets/2006/extended'><id>https://spreadsheets.google.com/feeds/list/1LaJd68os3g_GFlerogC64grNIlXb2iukMznOvdml7A4/osju1vh/public/full</id><updated>2017-08-22T10:31:52.161Z</updated><category scheme='http://schemas.google.com/spreadsheets/2006' term='http://schemas.google.com/spreadsheets/2006#list'/><title type='text'>Enums</title><link rel='alternate' type='application/atom+xml' href='https://docs.google.com/a/hole19golf.com/spreadsheets/d/1LaJd68os3g_GFlerogC64grNIlXb2iukMznOvdml7A4/pubhtml'/><link rel='http://schemas.google.com/g/2005#feed' type='application/atom+xml' href='https://spreadsheets.google.com/feeds/list/1LaJd68os3g_GFlerogC64grNIlXb2iukMznOvdml7A4/osju1vh/public/full'/><link rel='http://schemas.google.com/g/2005#post' type='application/atom+xml' href='https://spreadsheets.google.com/feeds/list/1LaJd68os3g_GFlerogC64grNIlXb2iukMznOvdml7A4/osju1vh/public/full'/><link rel='self' type='application/atom+xml' href='https://spreadsheets.google.com/feeds/list/1LaJd68os3g_GFlerogC64grNIlXb2iukMznOvdml7A4/osju1vh/public/full'/><author><name>ricardo.trindade</name><email>ricardo.trindade@hole19golf.com</email></author><openSearch:totalResults>2</openSearch:totalResults><openSearch:startIndex>1</openSearch:startIndex><entry><id>https://spreadsheets.google.com/feeds/list/1LaJd68os3g_GFlerogC64grNIlXb2iukMznOvdml7A4/osju1vh/public/full/cokwr</id><updated>2017-08-22T10:31:52.161Z</updated><category scheme='http://schemas.google.com/spreadsheets/2006' term='http://schemas.google.com/spreadsheets/2006#list'/><title type='text'>PageViewSourceScreen</title><content type='text'>values: course_discovery,synced_courses,nearby,deal</content><link rel='self' type='application/atom+xml' href='https://spreadsheets.google.com/feeds/list/1LaJd68os3g_GFlerogC64grNIlXb2iukMznOvdml7A4/osju1vh/public/full/cokwr'/><gsx:enum>PageViewSourceScreen</gsx:enum><gsx:values>course_discovery,synced_courses,nearby,deal</gsx:values></entry><entry><id>https://spreadsheets.google.com/feeds/list/1LaJd68os3g_GFlerogC64grNIlXb2iukMznOvdml7A4/osju1vh/public/full/cpzh4</id><updated>2017-08-22T10:31:52.161Z</updated><category scheme='http://schemas.google.com/spreadsheets/2006' term='http://schemas.google.com/spreadsheets/2006#list'/><title type='text'>PremiumClickBuy</title><content type='text'>values: notes,hi_res_maps,whatever</content><link rel='self' type='application/atom+xml' href='https://spreadsheets.google.com/feeds/list/1LaJd68os3g_GFlerogC64grNIlXb2iukMznOvdml7A4/osju1vh/public/full/cpzh4'/><gsx:enum>PremiumClickBuy</gsx:enum><gsx:values>notes,hi_res_maps,whatever</gsx:values></entry></feed>
+<?xml version='1.0' encoding='UTF-8'?><feed xmlns='http://www.w3.org/2005/Atom' xmlns:openSearch='http://a9.com/-/spec/opensearchrss/1.0/' xmlns:gsx='http://schemas.google.com/spreadsheets/2006/extended'><id>https://spreadsheets.google.com/feeds/list/1LaJd68os3g_GFlerogC64grNIlXb2iukMznOvdml7A4/osju1vh/public/full</id><updated>2017-08-22T10:31:52.161Z</updated><category scheme='http://schemas.google.com/spreadsheets/2006' term='http://schemas.google.com/spreadsheets/2006#list'/><title type='text'>Enums</title><link rel='alternate' type='application/atom+xml' href='https://docs.google.com/a/hole19golf.com/spreadsheets/d/1LaJd68os3g_GFlerogC64grNIlXb2iukMznOvdml7A4/pubhtml'/><link rel='http://schemas.google.com/g/2005#feed' type='application/atom+xml' href='https://spreadsheets.google.com/feeds/list/1LaJd68os3g_GFlerogC64grNIlXb2iukMznOvdml7A4/osju1vh/public/full'/><link rel='http://schemas.google.com/g/2005#post' type='application/atom+xml' href='https://spreadsheets.google.com/feeds/list/1LaJd68os3g_GFlerogC64grNIlXb2iukMznOvdml7A4/osju1vh/public/full'/><link rel='self' type='application/atom+xml' href='https://spreadsheets.google.com/feeds/list/1LaJd68os3g_GFlerogC64grNIlXb2iukMznOvdml7A4/osju1vh/public/full'/><author><name>ricardo.trindade</name><email>ricardo.trindade@hole19golf.com</email></author><openSearch:totalResults>2</openSearch:totalResults><openSearch:startIndex>1</openSearch:startIndex><entry><id>https://spreadsheets.google.com/feeds/list/1LaJd68os3g_GFlerogC64grNIlXb2iukMznOvdml7A4/osju1vh/public/full/cokwr</id><updated>2017-08-22T10:31:52.161Z</updated><category scheme='http://schemas.google.com/spreadsheets/2006' term='http://schemas.google.com/spreadsheets/2006#list'/><title type='text'>PageViewSourceScreen</title><content type='text'>possiblevalues: course_discovery,synced_courses,nearby,deal</content><link rel='self' type='application/atom+xml' href='https://spreadsheets.google.com/feeds/list/1LaJd68os3g_GFlerogC64grNIlXb2iukMznOvdml7A4/osju1vh/public/full/cokwr'/><gsx:enumname>PageViewSourceScreen</gsx:enumname><gsx:possiblevalues>course_discovery,synced_courses,nearby,deal</gsx:possiblevalues></entry><entry><id>https://spreadsheets.google.com/feeds/list/1LaJd68os3g_GFlerogC64grNIlXb2iukMznOvdml7A4/osju1vh/public/full/cpzh4</id><updated>2017-08-22T10:31:52.161Z</updated><category scheme='http://schemas.google.com/spreadsheets/2006' term='http://schemas.google.com/spreadsheets/2006#list'/><title type='text'>PremiumClickBuy</title><content type='text'>possiblevalues: notes,hi_res_maps,whatever</content><link rel='self' type='application/atom+xml' href='https://spreadsheets.google.com/feeds/list/1LaJd68os3g_GFlerogC64grNIlXb2iukMznOvdml7A4/osju1vh/public/full/cpzh4'/><gsx:enumname>PremiumClickBuy</gsx:enumname><gsx:possiblevalues>notes,hi_res_maps,whatever</gsx:possiblevalues></entry></feed>

data/spec/fixtures/sample_public_people_properties.html

@@ -1 +1 @@
-<?xml version='1.0' encoding='UTF-8'?><feed xmlns='http://www.w3.org/2005/Atom' xmlns:openSearch='http://a9.com/-/spec/opensearchrss/1.0/' xmlns:gsx='http://schemas.google.com/spreadsheets/2006/extended'><id>https://spreadsheets.google.com/feeds/list/1LaJd68os3g_GFlerogC64grNIlXb2iukMznOvdml7A4/ojyi830/public/full</id><updated>2017-09-06T13:27:41.023Z</updated><category scheme='http://schemas.google.com/spreadsheets/2006' term='http://schemas.google.com/spreadsheets/2006#list'/><title type='text'>PeopleProperties</title><link rel='alternate' type='application/atom+xml' href='https://docs.google.com/a/hole19golf.com/spreadsheets/d/1LaJd68os3g_GFlerogC64grNIlXb2iukMznOvdml7A4/pubhtml'/><link rel='http://schemas.google.com/g/2005#feed' type='application/atom+xml' href='https://spreadsheets.google.com/feeds/list/1LaJd68os3g_GFlerogC64grNIlXb2iukMznOvdml7A4/ojyi830/public/full'/><link rel='http://schemas.google.com/g/2005#post' type='application/atom+xml' href='https://spreadsheets.google.com/feeds/list/1LaJd68os3g_GFlerogC64grNIlXb2iukMznOvdml7A4/ojyi830/public/full'/><link rel='self' type='application/atom+xml' href='https://spreadsheets.google.com/feeds/list/1LaJd68os3g_GFlerogC64grNIlXb2iukMznOvdml7A4/ojyi830/public/full'/><author><name>ricardo.trindade</name><email>ricardo.trindade@hole19golf.com</email></author><openSearch:totalResults>2</openSearch:totalResults><openSearch:startIndex>1</openSearch:startIndex><entry><id>https://spreadsheets.google.com/feeds/list/1LaJd68os3g_GFlerogC64grNIlXb2iukMznOvdml7A4/ojyi830/public/full/cokwr</id><updated>2017-09-06T13:27:41.023Z</updated><category scheme='http://schemas.google.com/spreadsheets/2006' term='http://schemas.google.com/spreadsheets/2006#list'/><title type='text'>roundsWithWear</title><content type='text'>value: rounds_with_wear</content><link rel='self' type='application/atom+xml' href='https://spreadsheets.google.com/feeds/list/1LaJd68os3g_GFlerogC64grNIlXb2iukMznOvdml7A4/ojyi830/public/full/cokwr'/><gsx:properties>roundsWithWear</gsx:properties><gsx:value>rounds_with_wear</gsx:value></entry><entry><id>https://spreadsheets.google.com/feeds/list/1LaJd68os3g_GFlerogC64grNIlXb2iukMznOvdml7A4/ojyi830/public/full/cpzh4</id><updated>2017-09-06T13:27:41.023Z</updated><category scheme='http://schemas.google.com/spreadsheets/2006' term='http://schemas.google.com/spreadsheets/2006#list'/><title type='text'>totalFriends</title><content type='text'>value: total_friends</content><link rel='self' type='application/atom+xml' href='https://spreadsheets.google.com/feeds/list/1LaJd68os3g_GFlerogC64grNIlXb2iukMznOvdml7A4/ojyi830/public/full/cpzh4'/><gsx:properties>totalFriends</gsx:properties><gsx:value>total_friends</gsx:value></entry></feed>
+<?xml version='1.0' encoding='UTF-8'?><feed xmlns='http://www.w3.org/2005/Atom' xmlns:openSearch='http://a9.com/-/spec/opensearchrss/1.0/' xmlns:gsx='http://schemas.google.com/spreadsheets/2006/extended'><id>https://spreadsheets.google.com/feeds/list/1LaJd68os3g_GFlerogC64grNIlXb2iukMznOvdml7A4/ojyi830/public/full</id><updated>2017-09-06T13:27:41.023Z</updated><category scheme='http://schemas.google.com/spreadsheets/2006' term='http://schemas.google.com/spreadsheets/2006#list'/><title type='text'>PeopleProperties</title><link rel='alternate' type='application/atom+xml' href='https://docs.google.com/a/hole19golf.com/spreadsheets/d/1LaJd68os3g_GFlerogC64grNIlXb2iukMznOvdml7A4/pubhtml'/><link rel='http://schemas.google.com/g/2005#feed' type='application/atom+xml' href='https://spreadsheets.google.com/feeds/list/1LaJd68os3g_GFlerogC64grNIlXb2iukMznOvdml7A4/ojyi830/public/full'/><link rel='http://schemas.google.com/g/2005#post' type='application/atom+xml' href='https://spreadsheets.google.com/feeds/list/1LaJd68os3g_GFlerogC64grNIlXb2iukMznOvdml7A4/ojyi830/public/full'/><link rel='self' type='application/atom+xml' href='https://spreadsheets.google.com/feeds/list/1LaJd68os3g_GFlerogC64grNIlXb2iukMznOvdml7A4/ojyi830/public/full'/><author><name>ricardo.trindade</name><email>ricardo.trindade@hole19golf.com</email></author><openSearch:totalResults>2</openSearch:totalResults><openSearch:startIndex>1</openSearch:startIndex><entry><id>https://spreadsheets.google.com/feeds/list/1LaJd68os3g_GFlerogC64grNIlXb2iukMznOvdml7A4/ojyi830/public/full/cokwr</id><updated>2017-09-06T13:27:41.023Z</updated><category scheme='http://schemas.google.com/spreadsheets/2006' term='http://schemas.google.com/spreadsheets/2006#list'/><title type='text'>roundsWithWear</title><content type='text'>propertyname: rounds_with_wear</content><link rel='self' type='application/atom+xml' href='https://spreadsheets.google.com/feeds/list/1LaJd68os3g_GFlerogC64grNIlXb2iukMznOvdml7A4/ojyi830/public/full/cokwr'/><gsx:properties>roundsWithWear</gsx:properties><gsx:propertyname>rounds_with_wear</gsx:propertyname></entry><entry><id>https://spreadsheets.google.com/feeds/list/1LaJd68os3g_GFlerogC64grNIlXb2iukMznOvdml7A4/ojyi830/public/full/cpzh4</id><updated>2017-09-06T13:27:41.023Z</updated><category scheme='http://schemas.google.com/spreadsheets/2006' term='http://schemas.google.com/spreadsheets/2006#list'/><title type='text'>totalFriends</title><content type='text'>propertyname: total_friends</content><link rel='self' type='application/atom+xml' href='https://spreadsheets.google.com/feeds/list/1LaJd68os3g_GFlerogC64grNIlXb2iukMznOvdml7A4/ojyi830/public/full/cpzh4'/><gsx:properties>totalFriends</gsx:properties><gsx:propertyname>total_friends</gsx:propertyname></entry></feed>

data/spec/fixtures/sample_public_sheet.html

@@ -1 +1 @@
-<?xml version='1.0' encoding='UTF-8'?><feed xmlns='http://www.w3.org/2005/Atom' xmlns:openSearch='http://a9.com/-/spec/opensearchrss/1.0/' xmlns:gsx='http://schemas.google.com/spreadsheets/2006/extended'><id>https://spreadsheets.google.com/feeds/list/abc1234567890/od6/public/full</id><updated>2017-08-22T10:31:52.161Z</updated><category scheme='http://schemas.google.com/spreadsheets/2006' term='http://schemas.google.com/spreadsheets/2006#list'/><title type='text'>Events</title><link rel='alternate' type='application/atom+xml' href='https://docs.google.com/a/hole19golf.com/spreadsheets/d/abc1234567890/pubhtml'/><link rel='http://schemas.google.com/g/2005#feed' type='application/atom+xml' href='https://spreadsheets.google.com/feeds/list/abc1234567890/od6/public/full'/><link rel='http://schemas.google.com/g/2005#post' type='application/atom+xml' href='https://spreadsheets.google.com/feeds/list/abc1234567890/od6/public/full'/><link rel='self' type='application/atom+xml' href='https://spreadsheets.google.com/feeds/list/abc1234567890/od6/public/full'/><author><name>ricardo.trindade</name><email>ricardo.trindade@hole19golf.com</email></author><openSearch:totalResults>3</openSearch:totalResults><openSearch:startIndex>1</openSearch:startIndex><entry><id>https://spreadsheets.google.com/feeds/list/abc1234567890/od6/public/full/cokwr</id><updated>2017-08-22T10:31:52.161Z</updated><category scheme='http://schemas.google.com/spreadsheets/2006' term='http://schemas.google.com/spreadsheets/2006#list'/><title type='text'>trackCpPageView</title><content type='text'>eventname: cp_page_view, props: course_id:Long,course_name:String</content><link rel='self' type='application/atom+xml' href='https://spreadsheets.google.com/feeds/list/abc1234567890/od6/public/full/cokwr'/><gsx:functionname>trackCpPageView</gsx:functionname><gsx:eventname>cp_page_view</gsx:eventname><gsx:props>course_id:Long,course_name:String</gsx:props></entry><entry><id>https://spreadsheets.google.com/feeds/list/abc1234567890/od6/public/full/cpzh4</id><updated>2017-08-22T10:31:52.161Z</updated><category scheme='http://schemas.google.com/spreadsheets/2006' term='http://schemas.google.com/spreadsheets/2006#list'/><title type='text'>trackNavFeedTap</title><content type='text'>eventname: nav_feed_tap</content><link rel='self' type='application/atom+xml' href='https://spreadsheets.google.com/feeds/list/abc1234567890/od6/public/full/cpzh4'/><gsx:functionname>trackNavFeedTap</gsx:functionname><gsx:eventname>nav_feed_tap</gsx:eventname><gsx:props></gsx:props></entry><entry><id>https://spreadsheets.google.com/feeds/list/abc1234567890/od6/public/full/cre1l</id><updated>2017-08-22T10:31:52.161Z</updated><category scheme='http://schemas.google.com/spreadsheets/2006' term='http://schemas.google.com/spreadsheets/2006#list'/><title type='text'>trackCpViewScorecard</title><content type='text'>eventname: cp_view_scorecard, props: course_id:Long,course_name:String</content><link rel='self' type='application/atom+xml' href='https://spreadsheets.google.com/feeds/list/abc1234567890/od6/public/full/cre1l'/><gsx:functionname>trackCpViewScorecard</gsx:functionname><gsx:eventname>cp_view_scorecard</gsx:eventname><gsx:props>course_id:Long,course_name:String</gsx:props></entry></feed>
+<?xml version='1.0' encoding='UTF-8'?><feed xmlns='http://www.w3.org/2005/Atom' xmlns:openSearch='http://a9.com/-/spec/opensearchrss/1.0/' xmlns:gsx='http://schemas.google.com/spreadsheets/2006/extended'><id>https://spreadsheets.google.com/feeds/list/abc1234567890/od6/public/full</id><updated>2017-08-22T10:31:52.161Z</updated><category scheme='http://schemas.google.com/spreadsheets/2006' term='http://schemas.google.com/spreadsheets/2006#list'/><title type='text'>Events</title><link rel='alternate' type='application/atom+xml' href='https://docs.google.com/a/hole19golf.com/spreadsheets/d/abc1234567890/pubhtml'/><link rel='http://schemas.google.com/g/2005#feed' type='application/atom+xml' href='https://spreadsheets.google.com/feeds/list/abc1234567890/od6/public/full'/><link rel='http://schemas.google.com/g/2005#post' type='application/atom+xml' href='https://spreadsheets.google.com/feeds/list/abc1234567890/od6/public/full'/><link rel='self' type='application/atom+xml' href='https://spreadsheets.google.com/feeds/list/abc1234567890/od6/public/full'/><author><name>ricardo.trindade</name><email>ricardo.trindade@hole19golf.com</email></author><openSearch:totalResults>3</openSearch:totalResults><openSearch:startIndex>1</openSearch:startIndex><entry><id>https://spreadsheets.google.com/feeds/list/abc1234567890/od6/public/full/cokwr</id><updated>2017-08-22T10:31:52.161Z</updated><category scheme='http://schemas.google.com/spreadsheets/2006' term='http://schemas.google.com/spreadsheets/2006#list'/><title type='text'>trackCpPageView</title><content type='text'>eventname: cp_page_view, eventproperties: course_id:Long,course_name:String</content><link rel='self' type='application/atom+xml' href='https://spreadsheets.google.com/feeds/list/abc1234567890/od6/public/full/cokwr'/><gsx:functionname>trackCpPageView</gsx:functionname><gsx:eventname>cp_page_view</gsx:eventname><gsx:eventproperties>course_id:Long,course_name:String</gsx:eventproperties></entry><entry><id>https://spreadsheets.google.com/feeds/list/abc1234567890/od6/public/full/cpzh4</id><updated>2017-08-22T10:31:52.161Z</updated><category scheme='http://schemas.google.com/spreadsheets/2006' term='http://schemas.google.com/spreadsheets/2006#list'/><title type='text'>trackNavFeedTap</title><content type='text'>eventname: nav_feed_tap</content><link rel='self' type='application/atom+xml' href='https://spreadsheets.google.com/feeds/list/abc1234567890/od6/public/full/cpzh4'/><gsx:functionname>trackNavFeedTap</gsx:functionname><gsx:eventname>nav_feed_tap</gsx:eventname><gsx:eventproperties></gsx:eventproperties></entry><entry><id>https://spreadsheets.google.com/feeds/list/abc1234567890/od6/public/full/cre1l</id><updated>2017-08-22T10:31:52.161Z</updated><category scheme='http://schemas.google.com/spreadsheets/2006' term='http://schemas.google.com/spreadsheets/2006#list'/><title type='text'>trackCpViewScorecard</title><content type='text'>eventname: cp_view_scorecard, eventproperties: course_id:Long,course_name:String</content><link rel='self' type='application/atom+xml' href='https://spreadsheets.google.com/feeds/list/abc1234567890/od6/public/full/cre1l'/><gsx:functionname>trackCpViewScorecard</gsx:functionname><gsx:eventname>cp_view_scorecard</gsx:eventname><gsx:eventproperties>course_id:Long,course_name:String</gsx:eventproperties></entry></feed>

data/spec/lib/evva/android_generator_spec.rb

@@ -1,135 +1,153 @@
 describe Evva::AndroidGenerator do
   let(:generator) { described_class.new }
 
-  def trim_spaces(str)
-      str.gsub(/^[ \t]+/, '')
-         .gsub(/[ \t]+$/, '')
-  end
+  describe '#events' do
+    subject { generator.events(events, "MixpanelAnalytics") }
 
-  describe '#kotlin_function' do
-    subject { trim_spaces(generator.kotlin_function(event)) }
+    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' })
+    ] }
 
-    context 'when the event has no properties' do
-      let(:event) { Evva::MixpanelEvent.new('nav_feed_tap') }
-      let(:expected) { <<-Kotlin
-        open fun trackNavFeedTap() {
-          mixpanelMask.trackEvent(MixpanelEvent.NAV_FEED_TAP)
-        }
-        Kotlin
-      }
-      it { should eq trim_spaces(expected) }
-    end
-
-    context 'event has properties' do
-      let(:event) { Evva::MixpanelEvent.new('cp_page_view', { course_id: 'Long', course_name: 'String' }) }
-      let(:expected) { <<-Kotlin
-        open fun trackCpPageView(course_id: Long, course_name: String) {
-          val properties = JSONObject().apply {
+    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)
+    }
+
+    open fun trackCpPageViewA(course_id: Long, course_name: String) {
+        val properties = JSONObject().apply {
             put("course_id", course_id)
             put("course_name", course_name)
-          }
-          mixpanelMask.trackEvent(MixpanelEvent.CP_PAGE_VIEW, properties)
         }
-        Kotlin
-      }
-      it { should eq trim_spaces(expected) }
-    end
-
-    context 'event has special properties' do
-      let(:event) { Evva::MixpanelEvent.new('cp_page_view', { course_id: 'Long', course_name: 'String', from_screen: 'CourseProfileSource' }) }
-      let(:expected) { <<-Kotlin
-        open fun trackCpPageView(course_id: Long, course_name: String, from_screen: CourseProfileSource) {
-          val properties = JSONObject().apply {
+        mask.trackEvent(MixpanelEvent.CP_PAGE_VIEW_A, properties)
+    }
+
+    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)
-          }
-          mixpanelMask.trackEvent(MixpanelEvent.CP_PAGE_VIEW, properties)
         }
-        Kotlin
-      }
-      it { should eq trim_spaces(expected) }
-    end
-
-    context 'event has optional properties' do
-      let(:event) { Evva::MixpanelEvent.new('cp_page_view', { course_id: 'Long', course_name: 'String', from_screen: 'CourseProfileSource?' }) }
-      let(:expected) { <<-Kotlin
-        open fun trackCpPageView(course_id: Long, course_name: String, from_screen: CourseProfileSource?) {
-          val properties = JSONObject().apply {
+        mask.trackEvent(MixpanelEvent.CP_PAGE_VIEW_B, properties)
+    }
+
+    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) }
-          }
-          mixpanelMask.trackEvent(MixpanelEvent.CP_PAGE_VIEW, properties)
         }
-        Kotlin
-      }
-      it { should eq trim_spaces(expected) }
-    end
-
-    context 'event has optional but not special properties' do
-      let(:event) { Evva::MixpanelEvent.new('cp_page_view', { course_id: 'Long?', course_name: 'String' }) }
-      let(:expected) { <<-Kotlin
-        open fun trackCpPageView(course_id: Long?, course_name: String) {
-          val properties = JSONObject().apply {
+        mask.trackEvent(MixpanelEvent.CP_PAGE_VIEW_C, properties)
+    }
+
+    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)
-          }
-          mixpanelMask.trackEvent(MixpanelEvent.CP_PAGE_VIEW, properties)
         }
-        Kotlin
-      }
-      it { should eq trim_spaces(expected) }
-    end
+        mask.trackEvent(MixpanelEvent.CP_PAGE_VIEW_D, properties)
+    }
+
+    open fun updateProperties(property: MixpanelProperties, value: Any) {
+        mask.updateProperties(property.key, value)
+    }
+
+    open fun incrementCounter(property: MixpanelProperties) {
+        mask.incrementCounter(property.key)
+    }
+}
+Kotlin
+    }
+
+    it { should eq expected }
   end
 
-  describe '#special_property_enum' do
-    subject { trim_spaces(generator.special_property_enum(enum)) }
-    let(:enum) { Evva::MixpanelEnum.new('CourseProfileSource', ['course_discovery','synced_courses']) }
-    let(:expected) { <<-Kotlin
-      package com.hole19golf.hole19.analytics
-
-      enum class CourseProfileSource(val key: String) {
-        COURSE_DISCOVERY("course_discovery"),
-        SYNCED_COURSES("synced_courses")
-      }
-      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'])
+    ] }
+    let(:expected) {
+<<-Kotlin
+package com.hole19golf.hole19.analytics
+
+/**
+ * This file was automatically generated by evva: https://github.com/hole19/evva
+ */
+
+enum class CourseProfileSource(val key: String) {
+    COURSE_DISCOVERY("course_discovery"),
+    SYNCED_COURSES("synced_courses");
+}
+
+enum class PremiumFrom(val key: String) {
+    COURSE_PROFILE("Course Profile"),
+    ROUND_SETUP("Round Setup");
+}
+Kotlin
      }
-    it { should eq trim_spaces(expected) }
+    it { should eq expected }
   end
 
   describe '#event_enum' do
-    subject { trim_spaces(generator.event_enum(event_bundle, 'MixpanelEvent')) }
+    subject { generator.event_enum(event_bundle, 'MixpanelEvent') }
     let(:event_bundle) { [
       Evva::MixpanelEvent.new('nav_feed_tap', {}),
       Evva::MixpanelEvent.new('nav_performance_tap', {})
       ] }
-    let(:expected) { <<-Kotlin
-      package com.hole19golf.hole19.analytics
-      import com.hole19golf.hole19.analytics.Event
-
-      enum class MixpanelEvent(override val key: String) : Event {
-        NAV_FEED_TAP("nav_feed_tap"),
-        NAV_PERFORMANCE_TAP("nav_performance_tap")
-      }
-      Kotlin
+    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 {
+    NAV_FEED_TAP("nav_feed_tap"),
+    NAV_PERFORMANCE_TAP("nav_performance_tap");
+}
+Kotlin
      }
-    it { should eq trim_spaces(expected) }
+    it { should eq expected }
   end
 
   describe '#people_properties' do
-    subject { trim_spaces(generator.people_properties(people_bundle, 'MixpanelProperties')) }
+    subject { generator.people_properties(people_bundle, 'MixpanelProperties') }
     let(:people_bundle) { ['rounds_with_wear', 'friends_from_facebook'] }
-    let(:expected) { <<-Kotlin
-      package com.hole19golf.hole19.analytics
-      import com.hole19golf.hole19.analytics.Event
-
-      enum class MixpanelProperties(val key: String) {
-        ROUNDS_WITH_WEAR("rounds_with_wear"),
-        FRIENDS_FROM_FACEBOOK("friends_from_facebook");
-      }
-      Kotlin
+    let(:expected) {
+<<-Kotlin
+package com.hole19golf.hole19.analytics
+
+/**
+ * This file was automatically generated by evva: https://github.com/hole19/evva
+ */
+
+enum class MixpanelProperties(val key: String) {
+    ROUNDS_WITH_WEAR("rounds_with_wear"),
+    FRIENDS_FROM_FACEBOOK("friends_from_facebook");
+}
+Kotlin
     }
-    it { should eq trim_spaces(expected) }
+    it { should eq expected }
   end
 end

data/spec/lib/evva/swift_generator_spec.rb

@@ -1,94 +1,125 @@
 describe Evva::SwiftGenerator do
   let(:generator) { described_class.new }
 
-  def trim_spaces(str)
-      str.gsub(/^[ \t]+/, '')
-         .gsub(/[ \t]+$/, '')
-  end
-
   describe '#events' do
-    subject { trim_spaces(generator.events(event_bundle, "")) }
-    let(:event_bundle) {
-      [Evva::MixpanelEvent.new('nav_feed_tap', []),
-       Evva::MixpanelEvent.new('cp_page_view', ['course_id:Long'],['course_name:String?'])]
-    }
-    let(:expected) { <<-Swift
-        import CoreLocation
-        import Foundation
-        import SharedCode
-
-        class MixpanelHelper: NSObject {
-          enum Event {
-            case trackNavFeedTap
-            case trackCpPageView(course_id: Long, course_name: String?)
-          }
-
-          private var data: EventData {
-            switch self {
+    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' })
+    ] }
+
+    let(:expected) {
+<<-Swift
+// This file was automatically generated by evva: https://github.com/hole19/evva
 
-            case .trackNavFeedTap
-              return EventData(name:"nav_feed_tap")
+import Foundation
 
-            case .trackCpPageView(let course_id, let course_name):
-              return EventData(name:"cp_page_view", properties: ["course_id": course_id, "course_name": course_name])
-          }
+extension Analytics {
+
+    enum Event {
+        case cpPageView
+        case cpPageViewA(course_id: Int, course_name: String)
+        case cpPageViewB(course_id: Int, course_name: String, from_screen: CourseProfileSource)
+        case cpPageViewC(course_id: Int, course_name: String, from_screen: CourseProfileSource?)
+        case cpPageViewD(course_id: Int?, course_name: String)
+
+        var data: EventData {
+            switch self {
+            case .cpPageView:
+                return EventData(name: "cp_page_view")
+
+            case .cpPageViewA(let course_id, let course_name):
+                return EventData(name: "cp_page_view_a", properties: [
+                    "course_id": course_id as Any,
+                    "course_name": course_name as Any ]
+                )
+
+            case .cpPageViewB(let course_id, let course_name, let from_screen):
+                return EventData(name: "cp_page_view_b", properties: [
+                    "course_id": course_id as Any,
+                    "course_name": course_name as Any,
+                    "from_screen": from_screen.rawValue as Any ]
+                )
+
+            case .cpPageViewC(let course_id, let course_name, let from_screen):
+                return EventData(name: "cp_page_view_c", properties: [
+                    "course_id": course_id as Any,
+                    "course_name": course_name as Any,
+                    "from_screen": from_screen?.rawValue as Any ]
+                )
+
+            case .cpPageViewD(let course_id, let course_name):
+                return EventData(name: "cp_page_view_d", properties: [
+                    "course_id": course_id as Any,
+                    "course_name": course_name as Any ]
+                )
+            }
         }
-      Swift
     }
-    it { should eq trim_spaces(expected) }
+}
+Swift
+    }
+
+    it { should eq expected }
   end
 
-  describe '#process_arguments' do
-    context "with optional arguments" do
-      let(:properties) { 'course_id:Long,course_name:String,from_screen: CourseProfileSource?' }
+  describe '#special_property_enums' do
+    subject { generator.special_property_enums(enums) }
 
-      it 'processes the arguments looking for special properties' do
-        expected = '"course_id": course_id, "course_name": course_name, "from_screen": from_screen.rawValue'
-        expect(generator.process_arguments(properties)).to eq expected
-      end
-    end
+    let(:enums) { [
+      Evva::MixpanelEnum.new('CourseProfileSource', ['course_discovery', 'synced_courses']),
+      Evva::MixpanelEnum.new('PremiumFrom', ['Course Profile', 'Round Setup'])
+    ] }
 
-    context "without optional arguments" do
-      let(:properties) { 'course_id:Long,course_name:String,from_screen: CourseProfileSource' }
+    let(:expected) {
+<<-Swift
+// This file was automatically generated by evva: https://github.com/hole19/evva
 
-      it 'processes the arguments looking for special properties' do
-        expected = '"course_id": course_id, "course_name": course_name, "from_screen": from_screen.rawValue'
-        expect(generator.process_arguments(properties)).to eq expected
-      end
-    end
-  end
+import Foundation
 
-  describe '#special_property_enum' do
-    subject { trim_spaces(generator.special_property_enum(enum)) }
-    let(:enum) { Evva::MixpanelEnum.new('CourseProfileSource', 'course_discovery,synced_courses') }
-    let(:expected) { <<-Swift
-        import Foundation
+extension Analytics {
 
-        enum CourseProfileSource: String {
-          case course_discovery = "course_discovery"
-          case synced_courses = "synced_courses"
-        }
-      Swift
-     }
+    enum CourseProfileSource: String {
+        case courseDiscovery = "course_discovery"
+        case syncedCourses = "synced_courses"
+    }
+
+    enum PremiumFrom: String {
+        case courseProfile = "Course Profile"
+        case roundSetup = "Round Setup"
+    }
+}
+Swift
+    }
 
-    it { should eq trim_spaces(expected) }
+    it { should eq expected }
   end
 
   describe "#people_properties" do
-    subject { trim_spaces(generator.people_properties(people_bundle)) }
+    subject { generator.people_properties(people_bundle, "") }
+
     let(:people_bundle) { ['rounds_with_wear', 'friends_from_facebook'] }
-    let(:expected) { <<-Swift
-      fileprivate enum Counter: String {
-        case RoundsWithWear = "rounds_with_wear"
-        case FriendsFromFacebook = "friends_from_facebook"
 
-        func increment(times: Int = 1) {
-          MixpanelAPI.instance.incrementCounter(rawValue, times: times)
-        }
-      }
-      Swift
+    let(:expected) {
+<<-Swift
+// This file was automatically generated by evva: https://github.com/hole19/evva
+
+import Foundation
+
+extension Analytics {
+
+    enum Property: String {
+        case roundsWithWear = "rounds_with_wear"
+        case friendsFromFacebook = "friends_from_facebook"
+    }
+}
+Swift
     }
 
-    it { should eq trim_spaces(expected) }
+    it { should eq expected }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evva
 version: !ruby/object:Gem::Version
-  version: 0.1.4.2
+  version: 0.1.4.3
 platform: ruby
 authors:
 - RicardoTrindade
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-14 00:00:00.000000000 Z
+date: 2018-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: safe_yaml
@@ -86,7 +86,6 @@ files:
 - lib/evva.rb
 - lib/evva/android_generator.rb
 - lib/evva/config.rb
-- lib/evva/data_source.rb
 - lib/evva/file_reader.rb
 - lib/evva/google_sheet.rb
 - lib/evva/logger.rb
@@ -104,7 +103,6 @@ files:
 - spec/fixtures/test.yml
 - spec/lib/evva/android_generator_spec.rb
 - spec/lib/evva/config_spec.rb
-- spec/lib/evva/data_source_spec.rb
 - spec/lib/evva/google_sheet_spec.rb
 - spec/lib/evva/logger_spec.rb
 - spec/lib/evva/object_extension_spec.rb
@@ -130,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: An event generating service

data/lib/evva/data_source.rb

@@ -1,23 +0,0 @@
-module Evva
-  class DataSource
-    def initialize(keys)
-      unless keys.is_a?(Hash)
-        raise ArgumentError, "keys: expected Hash, got #{keys.class}"
-      end
-
-      keys.each do |property, v|
-        unless v.is_a?(Hash)
-          raise ArgumentError, "keys['#{property}']: expected Hash, got #{v.class}"
-        end
-
-        v.each do |key, v|
-          unless v.is_a?(String) || v.nil?
-            raise ArgumentError, "keys['#{property}']['#{key}']: expected String, got #{v.class}"
-          end
-        end
-      end
-
-      @keys = Hash[keys.map { |k, v| [k.downcase, v] }]
-    end
-  end
-end

data/spec/lib/evva/data_source_spec.rb

@@ -1,28 +0,0 @@
-describe Evva::DataSource do
-  subject(:dict) { Evva::DataSource.new(keys) }
-
-  describe '.initialize' do
-    let(:keys) { { 'event' => { 'kNo1' => 'text' } } }
-    it { expect { subject }.not_to raise_error }
-
-    context 'when created with invalid type parameters' do
-      let(:keys) { 'cenas' }
-      it { expect { subject }.to raise_error /expected Hash/ }
-    end
-
-    context 'when created with an invalid json schema' do
-      let(:keys) { { 'event' => 'text' } }
-      it { expect { subject }.to raise_error /event.+expected Hash/ }
-    end
-
-    context 'when created with an invalid json schema' do
-      let(:keys) { { 'a-event' => { 'kNo1' => { 'wtvr' => 'text' } } } }
-      it { expect { subject }.to raise_error /a-event.+kNo1.+expected String/ }
-    end
-
-    context 'when given empty translations' do
-      let(:keys) { { 'event' => { 'kNo1' => nil } } }
-      it { expect { subject }.not_to raise_error }
-    end
-  end
-end