evva 0.1.4.4 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f29745f30be02ffd8aaeaabc97bb6f7aa78e336a
-  data.tar.gz: 7997447508877d82eea4904e50c43a71a15b9ddb
+SHA256:
+  metadata.gz: f4038f23c86f1051786de3a9a9407a9b9656fc6b449d2e1f62be66f0081fa054
+  data.tar.gz: 6fc90e80a8a4ac97d935df0fa90cc410d582270845f8a7083081f85bf5069b93
 SHA512:
-  metadata.gz: 287b552754e902b50d228fc4813375a88083f79dc11a3cf8475bf29b15842f850036ccc69dcc5ec407735c9263458446f1b23dcdd8f98afccd9ae966f44b8f48
-  data.tar.gz: 9606d7647b418445d8417063e2dba6652be7c5252c9395b62ec65a1bc35e1f1f21fba68f173fa13f72fc4db4b6c4c44a477d1ae3547558e5b7465035c48dc31d
+  metadata.gz: 87a050829faed5ec1792fcca19e064adb17009ddcdf0b19366cab4aedc251816363665d5577cbe8e5c0e9206e30b8eaafb06546b5fdc72adc3243db90cde9d1e
+  data.tar.gz: ca0d51be95a1f5f0dd4e3e6a224dfb5aa734258be9a1b5e8b1d45386d87174d473268ceec6973147b47aa9ef726d9d8c246a7941365f753d606d9d24769c66da

data/.gitignore

@@ -1,6 +1,5 @@
 *.sublime-*
-.ruby-version
 running
 coverage
 .DS_Store*
-.byebug_history
+.byebug_history

data/.rspec

@@ -1,5 +1,4 @@
 --color
 --format documentation
 --profile
---drb
 --require spec_helper

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/.travis.yml

@@ -0,0 +1 @@
+language: ruby

data/Gemfile

@@ -1,13 +1,14 @@
 source 'https://rubygems.org'
-ruby '2.3.3'
 
 gem 'colorize'
-gem 'rubocop'
 gem 'safe_yaml'
-gem 'xml-simple'
 
-gem 'rspec'
-gem 'rspec-its'
-gem 'simplecov', require: false, group: :test
-gem 'simplecov-rcov', require: false
-gem 'webmock', '~> 1.20'
+group :test do
+  gem 'rake'
+  gem 'rspec'
+  gem 'rspec-its'
+  gem 'simplecov', require: false, group: :test
+  gem 'simplecov-rcov', require: false
+  gem 'webmock', '~> 1.20'
+  gem 'rubocop'
+end

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)
@@ -10,15 +10,15 @@ GEM
     diff-lcs (1.3)
     docile (1.1.5)
     hashdiff (0.3.7)
-    json (2.1.0)
+    json (2.3.0)
     parallel (1.12.0)
     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.1.0)
+    rake (12.3.3)
     rspec (3.7.0)
       rspec-core (~> 3.7.0)
       rspec-expectations (~> 3.7.0)
@@ -56,13 +56,13 @@ GEM
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
-    xml-simple (1.1.5)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   colorize
+  rake
   rspec
   rspec-its
   rubocop
@@ -70,10 +70,6 @@ DEPENDENCIES
   simplecov
   simplecov-rcov
   webmock (~> 1.20)
-  xml-simple
-
-RUBY VERSION
-   ruby 2.3.3p222
 
 BUNDLED WITH
-   1.15.4
+   2.2.26

data/README.md

@@ -1,4 +1,10 @@
 Evva
+========
+
+[![Status](https://travis-ci.org/hole19/evva.svg?branch=master)](https://travis-ci.org/hole19/evva?branch=master)
+[![Gem](https://img.shields.io/gem/v/evva.svg?style=flat)](http://rubygems.org/gems/evva "View this project in Rubygems")
+
+Evva automatically generates code for triggering events based on a Google Sheets specification. It generated code for both iOS (Swift) and Android (Kotlin).
 
 # Instalation
 
@@ -18,11 +24,15 @@ Evva
 
  data_source:
   type: google_sheet
-  sheet_id: <GOOGLE-DRIVE-SHEET-ID>
+  events_url: <GOOGLE-DRIVE-EVENTS-SHEET-URL>
+  people_properties_url: <GOOGLE-DRIVE-PEOPLE-PROPERTIES-SHEET-URL>
+  enum_classes_url: <GOOGLE-DRIVE-ENUM-CLASSES-SHEET-URL>
 
  out_path: /folder/where/analytics/classes/are
  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/
+ people_file_name: /file/with/people/property/names
+ destinations_file_name: /file/with/destinations
+ special_enum_file_name: /file/with/special/enum/properties/
  ```

data/Rakefile

@@ -0,0 +1,9 @@
+require "rake"
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.pattern = Dir.glob("spec/**/*_spec.rb")
+  t.rspec_opts = "--format documentation"
+end
+
+task default: :spec

data/changelog.md

@@ -1,4 +1,20 @@
 # 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
+
+## [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.
+
 ## [0.1.4.4] - 2019-02-04
  - Adds support for dynamic android package name
 
@@ -26,6 +42,6 @@
 ## [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.gemspec

@@ -18,7 +18,4 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency 'safe_yaml',  '~> 1.0'
   s.add_runtime_dependency 'colorize',   '~> 0.7'
-  s.add_runtime_dependency 'xml-simple', '~> 1.1'
-
-  s.add_development_dependency 'webmock', '~> 1.20'
 end

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

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

data/lib/evva/analytics_event.rb

@@ -0,0 +1,17 @@
+module Evva
+  class AnalyticsEvent
+    attr_reader :event_name, :properties, :destinations
+
+    def initialize(event_name, properties, destinations)
+      @event_name = event_name
+      @properties = properties
+      @destinations = destinations
+    end
+
+    def ==(other)
+      event_name == other.event_name &&
+      properties == other.properties &&
+      destinations == other.destinations
+    end
+  end
+end

data/lib/evva/analytics_property.rb

@@ -0,0 +1,17 @@
+module Evva
+  class AnalyticsProperty
+    attr_reader :property_name, :type, :destinations
+
+    def initialize(property_name, type, destinations)
+      @property_name = property_name
+      @type = type
+      @destinations = destinations
+    end
+
+    def ==(other)
+      property_name == other.property_name &&
+      type == other.type &&
+      destinations == other.destinations
+    end
+  end
+end

data/lib/evva/android_generator.rb

@@ -6,126 +6,177 @@ 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
+    BASE_TEMPLATE = File.expand_path("./templates/kotlin/base.kt", __dir__)
+    EVENTS_TEMPLATE = File.expand_path("./templates/kotlin/events.kt", __dir__)
+    EVENT_ENUM_TEMPLATE = File.expand_path("./templates/kotlin/event_enum.kt", __dir__)
+    PEOPLE_PROPERTIES_TEMPLATE = File.expand_path("./templates/kotlin/people_properties.kt", __dir__)
+    PEOPLE_PROPERTIES_ENUM_TEMPLATE = File.expand_path("./templates/kotlin/people_properties_enum.kt", __dir__)
+    SPECIAL_PROPERTY_ENUMS_TEMPLATE = File.expand_path("./templates/kotlin/special_property_enums.kt", __dir__)
+    DESTINATIONS_TEMPLATE = File.expand_path("./templates/kotlin/destinations.kt", __dir__)
 
-    NATIVE_TYPES = %w[Long Int String Double Float Boolean].freeze
+    TAB_SIZE = "    " # \t -> 4 spaces
 
-    def events(bundle, file_name)
-      header_footer_wrapper([IMPORT_EVENT, IMPORT_MASK, IMPORT_JSON]) do
-"""open class #{file_name}(private val mask: MixpanelAnalyticsMask) {
+    NATIVE_TYPES = %w[Long Int String Double Float Boolean Date].freeze
 
-#{bundle.map { |e| kotlin_function(e) }.join("\n\n")}
+    def events(bundle, file_name, enums_file_name, destinations_file_name)
+      header_footer_wrapper do
+        class_name = file_name
+        enums_class_name = enums_file_name
+        destinations_class_name = destinations_file_name
+
+        events = bundle.map do |event|
+          properties = event.properties.map do |name, type|
+            param_name = camelize(name.to_s, false)
+            value_fetcher = param_name
+
+            if is_special_property?(type)
+              if type.end_with?('?')
+                # optional value, we need ? to access a parameter
+                value_fetcher += "?"
+              end
+              value_fetcher += ".key"
+            end
+
+            {
+              param_name: param_name,
+              value_fetcher: value_fetcher,
+              type: type,
+              name: name.to_s,
+            }
+          end
+
+          destinations = event.destinations.map { |p| constantize(p) }
 
-\topen fun updateProperties(property: MixpanelProperties, value: Any) {
-\t\tmask.updateProperties(property.key, value)
-\t}
+          {
+            class_name: camelize(event.event_name),
+            event_name: constantize(event.event_name),
+            properties: properties,
+            destinations: destinations,
+            is_object: properties.count == 0 && destinations.count == 0,
+          }
+        end
 
-\topen fun incrementCounter(property: MixpanelProperties) {
-\t\tmask.incrementCounter(property.key)
-\t}
-}"""
+        template_from(EVENTS_TEMPLATE).result(binding)
       end
     end
 
-    def people_properties(people_bundle, file_name)
+    def event_enum(bundle, file_name)
       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}"
+        class_name = file_name
+
+        events = bundle.map(&:event_name).map do |event_name|
+          {
+            name: constantize(event_name),
+            value: event_name,
+          }
+        end
+
+        template_from(EVENT_ENUM_TEMPLATE).result(binding)
       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"
-        body << bundle.map(&:event_name).map { |prop| "\t#{prop.upcase}(\"#{prop}\")" }.join(",\n")
-        body << ";\n}"
+    def people_properties(people_bundle, file_name, enums_file_name, destinations_file_name)
+      header_footer_wrapper do
+        class_name = file_name
+        enums_class_name = enums_file_name
+        destinations_class_name = destinations_file_name
+
+        properties = people_bundle.map do |property|
+          {
+            class_name: camelize(property.property_name),
+            property_name: constantize(property.property_name),
+            type: property.type,
+            is_special_property: is_special_property?(property.type),
+            destinations: property.destinations.map { |p| constantize(p) },
+          }
+        end
+
+        template_from(PEOPLE_PROPERTIES_TEMPLATE).result(binding)
       end
     end
 
-    def special_property_enums(enums)
+    def people_properties_enum(people_bundle, file_name)
       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")
+        class_name = file_name
+
+        properties = people_bundle.map(&:property_name).map do |property_name|
+          {
+            name: constantize(property_name),
+            value: property_name,
+          }
+        end
+
+        template_from(PEOPLE_PROPERTIES_ENUM_TEMPLATE).result(binding)
       end
     end
 
-    private
+    def special_property_enums(enums_bundle)
+      header_footer_wrapper do
+        enums = enums_bundle.map do |enum|
+          values = enum.values.map do |value|
+            {
+              name: constantize(value),
+              value: value,
+            }
+          end
+
+          {
+            class_name: enum.enum_name,
+            values: values,
+          }
+        end
 
-    def imports_header(imports = [])
-      return unless imports.length > 0
-      imports.map { |ev| ev. gsub("packagename", @package_name) }
-             .join("\n") + "\n\n"
+        template_from(SPECIAL_PROPERTY_ENUMS_TEMPLATE).result(binding)
+      end
     end
 
-    def header_footer_wrapper(imports = [])
-<<-Kotlin
-package #{@package_name}
+    def destinations(bundle, file_name)
+      header_footer_wrapper do
+        class_name = file_name
 
-#{imports_header(imports)}/**
- * This file was automatically generated by evva: https://github.com/hole19/evva
- */
+        destinations = bundle.map { |d| constantize(d) }
 
-#{yield.gsub("\t", "    ")}
-Kotlin
+        template_from(DESTINATIONS_TEMPLATE).result(binding)
+      end
     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}) {
-#{props}
-\t\tmask.trackEvent(MixpanelEvent.#{event_data.event_name.upcase}, properties)
-\t}"""
+    private
 
-      else
-"""\topen fun #{function_name}() {
-\t\tmask.trackEvent(MixpanelEvent.#{event_data.event_name.upcase})
-\t}"""
-      end
+    def header_footer_wrapper
+      package_name = @package_name
+
+      content = yield
+        .chop # trim trailing newlines created by sublime
+
+      template_from(BASE_TEMPLATE).result(binding).gsub("\t", TAB_SIZE)
     end
 
-    def json_props(properties)
-      split_properties =
-        properties
-        .map do |name, type|
-          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})"
-            end
-          end
-        end
-        .map { |line| "\t\t\t#{line}" }
-        .join("\n")
+    def template_from(path)
+      file = File.read(path)
 
-      "\t\tval properties = JSONObject().apply {\n#{split_properties}\n\t\t}"
+      # - 2nd argument (nil) changes nothing
+      # - 3rd argument activates trim mode using "-" so that you can decide to
+      # not include a line (useful on loops and if statements)
+      ERB.new(file, nil, '-')
     end
 
-    def special_property?(type)
-      !NATIVE_TYPES.include?(type.chomp('?'))
+    # 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
 
-    def optional_property?(type)
-      type.include?('?')
+    def constantize(string)
+      string.tr(' ', '_').upcase
     end
 
-    def titleize(str)
-      str.split('_').collect(&:capitalize).join
+    def is_special_property?(type)
+      !NATIVE_TYPES.include?(type.chomp('?'))
     end
   end
 end

data/lib/evva/config.rb

@@ -31,18 +31,26 @@ module Evva
       @hash[:event_file_name]
     end
 
+    def event_enum_file_name
+      @hash[:event_enum_file_name]
+    end
+
     def people_file_name
       @hash[:people_file_name]
     end
 
-    def event_enum_file_name
-      @hash[:event_enum_file_name]
+    def people_enum_file_name
+      @hash[:people_enum_file_name]
     end
 
     def special_enum_file_name
       @hash[:special_enum_file_name]
     end
 
+    def destinations_file_name
+      @hash[:destinations_file_name]
+    end
+
     def package_name
       @hash[:package_name]
     end
@@ -58,6 +66,8 @@ module Evva
         event_file_name: { type: String },
         event_enum_file_name: { type: String },
         people_file_name: { type: String },
+        people_enum_file_name: { type: String },
+        destinations_file_name: { type: String },
         package_name: { type: String }
       }
     }.freeze
@@ -66,7 +76,9 @@ module Evva
       type: Hash,
       elements: {
         type: { type: String },
-        sheet_id: { type: String }
+        events_url: { type: String },
+        people_properties_url: { type: String },
+        enum_classes_url: { type: String },
       }
     }.freeze