evva 0.4.4 → 0.5.0

data/Gemfile

@@ -1,14 +1,16 @@
-source 'https://rubygems.org'
+# frozen_string_literal: true
 
-gem 'colorize'
-gem 'safe_yaml'
+source "https://rubygems.org"
+
+gem "colorize"
+gem "safe_yaml"
 
 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'
+  gem "rake"
+  gem "rspec"
+  gem "rspec-its"
+  gem "rubocop"
+  gem "simplecov", require: false, group: :test
+  gem "simplecov-rcov", require: false
+  gem "webmock"
 end

data/Gemfile.lock

@@ -1,61 +1,72 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
-    ast (2.3.0)
-    colorize (0.8.1)
-    crack (0.4.3)
-      safe_yaml (~> 1.0.0)
-    diff-lcs (1.3)
-    docile (1.1.5)
-    hashdiff (0.3.7)
-    json (2.3.0)
-    parallel (1.12.0)
-    parser (2.4.0.0)
-      ast (~> 2.2)
-    powerpack (0.1.1)
-    public_suffix (4.0.6)
-    rainbow (2.2.2)
-      rake
-    rake (12.3.3)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.0)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
+    ast (2.4.2)
+    bigdecimal (3.1.8)
+    colorize (1.1.0)
+    crack (1.0.0)
+      bigdecimal
+      rexml
+    diff-lcs (1.5.1)
+    docile (1.4.1)
+    hashdiff (1.1.1)
+    json (2.7.2)
+    language_server-protocol (3.17.0.3)
+    parallel (1.26.3)
+    parser (3.3.5.0)
+      ast (~> 2.4.1)
+      racc
+    public_suffix (6.0.1)
+    racc (1.8.1)
+    rainbow (3.1.1)
+    rake (13.2.1)
+    regexp_parser (2.9.2)
+    rexml (3.3.8)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.1)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-its (1.2.0)
+      rspec-support (~> 3.13.0)
+    rspec-its (1.3.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.7.0)
+    rspec-mocks (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.0)
-    rubocop (0.51.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
+    rubocop (1.67.0)
+      json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 2.3.3.1, < 3.0)
-      powerpack (~> 0.1)
-      rainbow (>= 2.2.2, < 3.0)
+      parser (>= 3.3.0.2)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 2.4, < 3.0)
+      rubocop-ast (>= 1.32.2, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.9.0)
-    safe_yaml (1.0.4)
-    simplecov (0.15.1)
-      docile (~> 1.1.0)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    simplecov-rcov (0.2.3)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.32.3)
+      parser (>= 3.3.1.0)
+    ruby-progressbar (1.13.0)
+    safe_yaml (1.0.5)
+    simplecov (0.22.0)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.13.1)
+    simplecov-rcov (0.3.7)
       simplecov (>= 0.4.1)
-    unicode-display_width (1.3.0)
-    webmock (1.24.6)
-      addressable (>= 2.3.6)
+    simplecov_json_formatter (0.1.4)
+    unicode-display_width (2.6.0)
+    webmock (3.24.0)
+      addressable (>= 2.8.0)
       crack (>= 0.3.2)
-      hashdiff
+      hashdiff (>= 0.4.0, < 2.0.0)
 
 PLATFORMS
   ruby
@@ -69,7 +80,7 @@ DEPENDENCIES
   safe_yaml
   simplecov
   simplecov-rcov
-  webmock (~> 1.20)
+  webmock
 
 BUNDLED WITH
-   2.2.26
+   2.5.21

data/README.md

@@ -4,7 +4,7 @@ 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).
+Evva automatically generates code for triggering events based on a Google Sheets specification. It generates code for both Swift (iOS) and Kotlin (Android).
 
 # Instalation
 

data/bin/evva

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
 
-require 'evva'
+require "evva"
 Evva.run(ARGV)

data/changelog.md

@@ -2,6 +2,15 @@
 
 ## Unreleased
 
+## [0.5.0] - 2024-10-16
+
+- Update all dependencies
+
+### Breaking Changes
+- Fix deprecation warnings
+- Set minimum ruby version as 3.2
+- Change `object` events in Kotlin to `data object` as an improvement brought by Kotlin 2.0
+
 ## [0.4.4] - 2024-10-16
 
 ### Breaking Changes

data/evva.gemspec

@@ -1,21 +1,23 @@
-require_relative 'lib/evva/version'
+require_relative "lib/evva/version"
 
 Gem::Specification.new do |s|
-  s.name        = 'evva'
+  s.name        = "evva"
   s.version     = Evva::VERSION
   s.date        = Evva::VERSION_UPDATED_AT
-  s.summary     = 'An event generating service'
-  s.description = 'Evva generates all the analytics event tracking functions for you'
-  s.authors     = ['RicardoTrindade']
-  s.email       = 'ricardo.trindade743@gmail.com'
-  s.license     = 'MIT'
-  s.homepage    = 'https://github.com/hole19/'
+  s.summary     = "An event generating service"
+  s.description = "Evva generates all the analytics event tracking functions for you"
+  s.authors     = ["André Andrade", "João Costa", "Ricardo Trindade"]
+  s.email       = "ricardo.trindade743@gmail.com"
+  s.license     = "MIT"
+  s.homepage    = "https://github.com/hole19/"
 
   s.files         = `git ls-files`.split("\n")
-  s.require_paths = ['lib']
+  s.require_paths = ["lib"]
 
-  s.executables << 'evva'
+  s.executables << "evva"
 
-  s.add_runtime_dependency 'safe_yaml',  '~> 1.0'
-  s.add_runtime_dependency 'colorize',   '~> 0.7'
+  s.required_ruby_version = ">= 3.2.0"
+
+  s.add_runtime_dependency "colorize",   "~> 1.0"
+  s.add_runtime_dependency "safe_yaml",  "~> 1.0"
 end

data/lib/evva/config.rb

@@ -83,7 +83,7 @@ module Evva
     }.freeze
 
     DICTIONARY_STRUCT = {
-      'google_sheet' => GOOGLE_SHEET_STRUCT
+      "google_sheet" => GOOGLE_SHEET_STRUCT
     }.freeze
   end
 end

data/lib/evva/file_reader.rb

@@ -1,4 +1,4 @@
-require 'fileutils'
+require "fileutils"
 
 module Evva
   class FileReader

data/lib/evva/google_sheet.rb

@@ -1,18 +1,18 @@
-require 'net/https'
-require 'csv'
+require "net/https"
+require "csv"
 
 module Evva
   class GoogleSheet
-    EVENT_NAME = 'Event Name'
-    EVENT_PROPERTIES = 'Event Properties'
-    EVENT_DESTINATION = 'Event Destination'
+    EVENT_NAME = "Event Name"
+    EVENT_PROPERTIES = "Event Properties"
+    EVENT_DESTINATION = "Event Destination"
 
-    PROPERTY_NAME = 'Property Name'
-    PROPERTY_TYPE = 'Property Type'
-    PROPERTY_DESTINATION = 'Property Destination'
+    PROPERTY_NAME = "Property Name"
+    PROPERTY_TYPE = "Property Type"
+    PROPERTY_DESTINATION = "Property Destination"
 
-    ENUM_NAME = 'Enum Name'
-    ENUM_VALUES = 'Possible Values'
+    ENUM_NAME = "Enum Name"
+    ENUM_VALUES = "Possible Values"
 
     def initialize(events_url, people_properties_url, enum_classes_url)
       @events_url = events_url
@@ -29,7 +29,7 @@ module Evva
       @events ||= @events_csv.map do |row|
         event_name = row[EVENT_NAME]
         properties = hash_parser(row[EVENT_PROPERTIES])
-        destinations = row[EVENT_DESTINATION]&.split(',')
+        destinations = row[EVENT_DESTINATION]&.split(",")
         Evva::AnalyticsEvent.new(event_name, properties, destinations || [])
       end
     end
@@ -43,7 +43,7 @@ module Evva
       @people_properties ||= @people_properties_csv.map do |row|
         property_name = row[PROPERTY_NAME]
         property_type = row[PROPERTY_TYPE]
-        destinations = row[PROPERTY_DESTINATION]&.split(',')
+        destinations = row[PROPERTY_DESTINATION]&.split(",")
         Evva::AnalyticsProperty.new(property_name, property_type, destinations || [])
       end
     end
@@ -56,7 +56,7 @@ module Evva
 
       @enum_classes ||= @enum_classes_csv.map do |row|
         enum_name = row[ENUM_NAME]
-        values = row[ENUM_VALUES].split(',')
+        values = row[ENUM_VALUES].split(",")
         Evva::AnalyticsEnum.new(enum_name, values)
       end
     end
@@ -65,7 +65,7 @@ module Evva
       @destinations ||= events.map(&:destinations).flatten.uniq
     end
 
-    private
+  private
 
     def get_csv(url)
       data = get(url)
@@ -89,7 +89,7 @@ module Evva
       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
+      return get(response["location"], max_redirects - 1) if response.is_a? Net::HTTPRedirection
 
       raise "Http Error #{response.body}" if response.code.to_i >= 400
 
@@ -99,8 +99,8 @@ module Evva
     def hash_parser(property_array)
       h = {}
       unless property_array.nil? || property_array.empty?
-        property_array.split(',').each do |prop|
-          split_prop = prop.split(':')
+        property_array.split(",").each do |prop|
+          split_prop = prop.split(":")
           prop_name = split_prop[0].to_sym
           prop_type = split_prop[1].to_s
           h[prop_name] = prop_type

data/lib/evva/{android_generator.rb → kotlin_generator.rb}

@@ -1,5 +1,5 @@
 module Evva
-  class AndroidGenerator
+  class KotlinGenerator
     attr_accessor :package_name
 
     def initialize(package_name)
@@ -32,7 +32,7 @@ module Evva
             value_fetcher = param_name
 
             if is_special_property?(type)
-              if type.end_with?('?')
+              if type.end_with?("?")
                 # optional value, we need ? to access a parameter
                 value_fetcher += "?"
               end
@@ -142,7 +142,7 @@ module Evva
       end
     end
 
-    private
+  private
 
     def header_footer_wrapper
       package_name = @package_name
@@ -156,10 +156,8 @@ module Evva
     def template_from(path)
       file = File.read(path)
 
-      # - 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, '-')
+      # trim mode using "-" so that you can decide to not include a line (useful on loops and if statements)
+      ERB.new(file, trim_mode: "-")
     end
 
     # extracted from Rails' ActiveSupport
@@ -174,16 +172,16 @@ module Evva
     end
 
     def constantize(string)
-      string.tr(' ', '_').upcase
+      string.tr(" ", "_").upcase
     end
 
     def native_type(type)
       type
-        .gsub('Date','String')
+        .gsub("Date","String")
     end
 
     def is_special_property?(type)
-      !NATIVE_TYPES.include?(type.chomp('?'))
+      !NATIVE_TYPES.include?(type.chomp("?"))
     end
   end
 end

data/lib/evva/logger.rb

@@ -1,5 +1,5 @@
-require 'singleton'
-require 'colorize'
+require "singleton"
+require "colorize"
 
 module Evva
   module Logger
@@ -27,11 +27,11 @@ module Evva
 
     def print_summary
       if @levels[:warn] > 0 || @levels[:error] > 0
-        info ''
-        info 'Finished with:'
+        info ""
+        info "Finished with:"
         info "  #{@levels[:warn]} warnings" if @levels[:warn]  > 0
         info "  #{@levels[:error]} errors"  if @levels[:error] > 0
-        info ''
+        info ""
       end
     end
 
@@ -39,7 +39,7 @@ module Evva
       @silent_mode = value
     end
 
-    private
+  private
 
     @levels = { info: 0, warn: 0, error: 0 }
     @silent_mode = false

data/lib/evva/object_extension.rb

@@ -13,7 +13,7 @@ Object.class_eval do
   def validate_structure!(structure, error_prefix = [])
     return if nil? && structure[:optional]
 
-    prepend_error = error_prefix.empty? ? '' : (['self'] + error_prefix + [': ']).join
+    prepend_error = error_prefix.empty? ? "" : (["self"] + error_prefix + [": "]).join
 
     unless is_a? structure[:type]
       raise ArgumentError, "#{prepend_error}Expected #{structure[:type]}, got #{self.class}"

data/lib/evva/swift_generator.rb

@@ -1,4 +1,4 @@
-require 'erb'
+require "erb"
 
 module Evva
   class SwiftGenerator
@@ -21,7 +21,7 @@ module Evva
             value_fetcher = k.to_s
 
             if is_special_property?(type)
-              if type.end_with?('?')
+              if type.end_with?("?")
                 # optional value, we need ? to access a parameter
                 value_fetcher += "?"
               end
@@ -100,7 +100,7 @@ module Evva
       end
     end
 
-    private
+  private
 
     def header_footer_wrapper
       content = yield
@@ -113,24 +113,22 @@ module Evva
     def template_from(path)
       file = File.read(path)
 
-      # - 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, '-')
+      # trim mode using "-" so that you can decide to not include a line (useful on loops and if statements)
+      ERB.new(file, trim_mode: "-")
     end
 
     def native_type(type)
       type
-        .gsub('Boolean','Bool')
-        .gsub('Long', 'Int')
+        .gsub("Boolean","Bool")
+        .gsub("Long", "Int")
     end
 
     def is_special_property?(type)
-      !NATIVE_TYPES.include?(type.chomp('?'))
+      !NATIVE_TYPES.include?(type.chomp("?"))
     end
 
     def camelize(term)
-      string = term.to_s.tr(' ', '_').downcase
+      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/templates/kotlin/events.kt

@@ -7,7 +7,7 @@ sealed class <%= class_name %>(
 
     <%- events.each_with_index do |e, index| -%>
     <%- if e[:properties].count == 0 -%>
-    object <%= e[:class_name] %> : <%= class_name %>(
+    data object <%= e[:class_name] %> : <%= class_name %>(
     <%- else -%>
     data class <%= e[:class_name] %>(
         <%- e[:properties].each_with_index do |p, index| -%>

data/lib/evva/version.rb

@@ -1,4 +1,4 @@
 module Evva
-  VERSION = '0.4.4'.freeze
-  VERSION_UPDATED_AT = '2024-10-16'.freeze
+  VERSION = "0.5.0".freeze
+  VERSION_UPDATED_AT = "2024-10-16".freeze
 end

data/lib/evva.rb

@@ -1,24 +1,24 @@
-require 'optparse'
-require 'yaml'
+require "optparse"
+require "yaml"
 
-require 'evva/logger'
-require 'evva/google_sheet'
-require 'evva/config'
-require 'evva/file_reader'
-require 'evva/analytics_event'
-require 'evva/analytics_enum'
-require 'evva/analytics_property'
-require 'evva/object_extension'
-require 'evva/version'
-require 'evva/android_generator'
-require 'evva/swift_generator'
+require "evva/logger"
+require "evva/google_sheet"
+require "evva/config"
+require "evva/file_reader"
+require "evva/analytics_event"
+require "evva/analytics_enum"
+require "evva/analytics_property"
+require "evva/object_extension"
+require "evva/version"
+require "evva/kotlin_generator"
+require "evva/swift_generator"
 
 module Evva
   extend self
   def run(options)
     file_reader = Evva::FileReader.new
     options = command_line_options(options)
-    unless config_file = file_reader.open_file('evva_config.yml', 'r', true)
+    unless config_file = file_reader.open_file("evva_config.yml", "r", true)
       Logger.error("Could not open evva_config.yml")
       return
     end
@@ -26,12 +26,12 @@ module Evva
     config = Evva::Config.new(hash: YAML.safe_load(config_file))
     bundle = analytics_data(config: config.data_source)
     case config.type.downcase
-    when 'android'
-      generator = Evva::AndroidGenerator.new(config.package_name)
-      evva_write(bundle, generator, config, 'kt')
-    when 'ios'
+    when "android"
+      generator = Evva::KotlinGenerator.new(config.package_name)
+      evva_write(bundle, generator, config, "kt")
+    when "ios"
       generator = Evva::SwiftGenerator.new
-      evva_write(bundle, generator, config, 'swift')
+      evva_write(bundle, generator, config, "swift")
     end
     Evva::Logger.print_summary
   end
@@ -40,7 +40,7 @@ module Evva
     path = "#{configuration.out_path}/#{configuration.event_file_name}.#{extension}"
     write_to_file(path, generator.events(bundle[:events], configuration.event_file_name, configuration.event_enum_file_name, configuration.destinations_file_name))
 
-    unless configuration.type.downcase == 'ios'
+    unless configuration.type.downcase == "ios"
       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
@@ -48,7 +48,7 @@ module Evva
     path = "#{configuration.out_path}/#{configuration.people_file_name}.#{extension}"
     write_to_file(path, generator.people_properties(bundle[:people], configuration.people_file_name, configuration.people_enum_file_name, configuration.destinations_file_name))
 
-    unless configuration.type.downcase == 'ios'
+    unless configuration.type.downcase == "ios"
       path = "#{configuration.out_path}/#{configuration.people_enum_file_name}.#{extension}"
       write_to_file(path, generator.people_properties_enum(bundle[:people], configuration.people_enum_file_name))
     end
@@ -63,7 +63,7 @@ module Evva
   def analytics_data(config:)
     source =
       case config[:type]
-      when 'google_sheet'
+      when "google_sheet"
         Evva::GoogleSheet.new(config[:events_url], config[:people_properties_url], config[:enum_classes_url])
       end
     events_bundle = {}
@@ -78,12 +78,12 @@ module Evva
     opts_hash = {}
 
     opts_parser = OptionParser.new do |opts|
-      opts.on_tail('-h', '--help', 'Show this message') do
+      opts.on_tail("-h", "--help", "Show this message") do
         puts opts
         exit
       end
 
-      opts.on_tail('-v', '--version', 'Show version') do
+      opts.on_tail("-v", "--version", "Show version") do
         puts Evva::VERSION
         exit
       end