evva 0.1.4.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: eb97d0f1d8232f0bd8be466a5bb44d0d6969d620
-  data.tar.gz: eafd1e8f81baa14886ba4fcb466ea18b59f9b199
+SHA256:
+  metadata.gz: c9078e38ca6bba5b85a3349fb9e1c3f9c31b8de357080ffb1ab105e6bcbbdaa1
+  data.tar.gz: 16b264637125fafdc14a991a9cb984e440b948bdc7d934776329b8aa8ef2d89f
 SHA512:
-  metadata.gz: 6f35827bcadcc08b17693f45d7b5106c75fddb277df50f837eb38e8ab10e06612d53ee550a37ad173e85ffa9e830a5b4debb2136c361dff0e4335c15054449b7
-  data.tar.gz: eec447eb9229129b08415d30382e23fcab70b354a6512e906d756fe7c87ef734011fe2ba4da7cc09706ac00bcd2310e6047698f36e5eaafcb3be2d9521b9ef0d
+  metadata.gz: 6efc1abd4ea8d72f7ac2edeccbf111deac25922fa0b1464d754d21e7bfef921efffddd228bb6d6913f3b64a4acfcd8763082f0b36b16e85e28b930d933df879c
+  data.tar.gz: 77a4ad5df7074b646def8c880654b551fcde2e10523e3dec622d202fba48ac7bdda6d1a882abcd5c54bc2e6175b2bb68a52c30ab77d1c522f29362bc9a297db3

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/.ruby-version

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

data/.travis.yml

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

data/Gemfile

@@ -1,13 +1,15 @@
 source 'https://rubygems.org'
-ruby '2.3.3'
+ruby '2.7.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

@@ -10,7 +10,7 @@ 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)
@@ -18,7 +18,7 @@ GEM
     public_suffix (3.0.0)
     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,9 @@ DEPENDENCIES
   simplecov
   simplecov-rcov
   webmock (~> 1.20)
-  xml-simple
 
 RUBY VERSION
-   ruby 2.3.3p222
+   ruby 2.7.3p183
 
 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
 
@@ -19,9 +25,13 @@ 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/
  ```

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.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
+
+## [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
+
 ## [0.1.4.1] - 2018-02-08
 - DRYs methods in swift event generation
 
@@ -17,4 +33,5 @@
 - Fixes mismatch between file name and class name generated.
 
 ## [0.1.0] - 2017/10/26
-- Initial Release.
+- 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/evva_config.yml

@@ -3,8 +3,12 @@ type: iOS
 data_source:
   type: google_sheet
   sheet_id: 1LaJd68os3g_GFlerogC64grNIlXb2iukMznOvdml7A4
+  events_url: https://path-to-csv
+  people_properties_url: https://path-to-csv
+  enum_classes_url: https://path-to-csv
 
 out_path: analytics
 event_file_name: MixpanelAnalytics
 event_enum_file_name: MixpanelEvent
-people_file_name: MixpanelProperties
+people_file_name: MixpanelProperties
+package_name: com.hole19golf.hole19.analytics

data/lib/evva/android_generator.rb

@@ -1,48 +1,78 @@
 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
+    attr_accessor :package_name
+
+    def initialize(package_name)
+      @package_name = package_name
+    end
+
+    IMPORT_EVENT = "import packagename.Event".freeze
+    IMPORT_MASK = "import packagename.MixpanelAnalyticsMask".freeze
+    IMPORT_JSON = "import org.json.JSONObject".freeze
 
     NATIVE_TYPES = %w[Long Int String Double Float Boolean].freeze
 
     def events(bundle, file_name)
-      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
+
+    private
+
+    def imports_header(imports = [])
+      return unless imports.length > 0
+      imports.map { |ev| ev. gsub("packagename", @package_name) }
+             .join("\n") + "\n\n"
+    end
+
+    def header_footer_wrapper(imports = [])
+<<-Kotlin
+package #{@package_name}
+
+#{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 +80,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 +110,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,14 @@ module Evva
       @hash[:event_enum_file_name]
     end
 
+    def special_enum_file_name
+      @hash[:special_enum_file_name]
+    end
+
+    def package_name
+      @hash[:package_name]
+    end
+
     CONFIG_STRUCT = {
       type: Hash,
       elements: {
@@ -49,7 +57,8 @@ module Evva
         out_path: { type: String },
         event_file_name: { type: String },
         event_enum_file_name: { type: String },
-        people_file_name: { type: String }
+        people_file_name: { type: String },
+        package_name: { type: String }
       }
     }.freeze
 
@@ -57,7 +66,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
 

data/lib/evva/google_sheet.rb

@@ -1,83 +1,86 @@
 require 'net/https'
-require 'xmlsimple'
+require 'csv'
 
 module Evva
   class GoogleSheet
-    def initialize(sheet_id)
-      @sheet_id = sheet_id
+    def initialize(events_url, people_properties_url, enum_classes_url)
+      @events_url = events_url
+      @people_properties_url = people_properties_url
+      @enum_classes_url = enum_classes_url
     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]
+      Logger.info("Downloading data from Google Sheet at #{@events_url}")
+      csv = get_csv(@events_url)
+
       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))
+      csv.each do |row|
+        event_name = row['Event Name']
+        properties = hash_parser(row['Event Properties'])
+        event_list << Evva::MixpanelEvent.new(event_name, properties)
       end
       event_list
     end
 
     def people_properties
-      raw = raw_data(@sheet_id, 1)
+      Logger.info("Downloading data from Google Sheet at #{@people_properties_url}")
+      csv = get_csv(@people_properties_url)
+
       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
+      csv.each do |row|
+        value = row['Property Name']
         people_list << value
       end
       people_list
     end
 
     def enum_classes
-      raw = raw_data(@sheet_id, 2)
-      Logger.info('Downloading dictionary from Google Sheet...')
-      non_language_columns = %w[id updated category title content link]
+      Logger.info("Downloading data from Google Sheet at #{@enum_classes_url}")
+      csv = get_csv(@enum_classes_url)
+
       enum_list = []
-      raw['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))
+      csv.each do |row|
+        enum_name = row['Enum Name']
+        values = row['Possible Values'].split(',')
+        enum_list << Evva::MixpanelEnum.new(enum_name, values)
       end
       enum_list
     end
 
-    def xml_data(uri, headers = nil)
-      uri = URI.parse(uri)
-      http = Net::HTTP.new(uri.host, uri.port)
-      http.use_ssl = true
-      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}'
-      end
+    private
+
+    def get_csv(url)
+      data = get(url)
 
       begin
-        XmlSimple.xml_in(data.body, 'KeyAttr' => 'name')
-      rescue
-        raise 'Cannot parse. Expected XML at #{uri}'
+        CSV.parse(data, headers: true)
+      rescue StandardError => e
+        raise "Cannot parse. Expected CSV at #{url}: #{e}"
       end
     end
 
-    def raw_data(sheet_id, sheet_number)
-      Logger.info('Downloading Google Sheet...')
-      sheet = xml_data("https://spreadsheets.google.com/feeds/worksheets/#{sheet_id}/public/full")
-      url   = sheet['entry'][sheet_number]['link'][0]['href']
-      xml_data(url)
-    end
+    def get(url, max_redirects = 1)
+      raise "Too may redirects" if max_redirects == -1
 
-    private
+      uri = URI(url)
+
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = true
+      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+
+      request = Net::HTTP::Get.new(uri.request_uri)
+      response = http.request(request)
+
+      return get(response['location'], max_redirects - 1) if response.is_a? Net::HTTPRedirection
+
+      raise "Http Error #{response.body}" if response.code.to_i >= 400
+
+      response.body
+    end
 
     def hash_parser(property_array)
       h = {}
-      unless property_array.empty?
+      unless property_array.nil? || property_array.empty?
         property_array.split(',').each do |prop|
           split_prop = prop.split(':')
           prop_name = split_prop[0].to_sym