evva 0.1.4.3 → 0.1.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87f47c713fe2f646dc5302d44a06e739976bfd6f
-  data.tar.gz: ed72f81ccb086f03fc21426dee5332260a38aa6b
+  metadata.gz: f29745f30be02ffd8aaeaabc97bb6f7aa78e336a
+  data.tar.gz: 7997447508877d82eea4904e50c43a71a15b9ddb
 SHA512:
-  metadata.gz: dda81be8b9ea3b174d0d20b8e68846681521574eee808318778ccd7265ec7ae27c185b5f615a010c8d544bf62ef5f3fd47382252476d7e46e8a80dc829c4f997
-  data.tar.gz: cede59eb52f5858775c0fce0d6ca35621dc0365ace4171bd69f1961d9ea10fcdda4b2139f1fb4bfdb93a2462dafaa3ef0e980fb130eed78fa07bd2b3eb5a8adb
+  metadata.gz: 287b552754e902b50d228fc4813375a88083f79dc11a3cf8475bf29b15842f850036ccc69dcc5ec407735c9263458446f1b23dcdd8f98afccd9ae966f44b8f48
+  data.tar.gz: 9606d7647b418445d8417063e2dba6652be7c5252c9395b62ec65a1bc35e1f1f21fba68f173fa13f72fc4db4b6c4c44a477d1ae3547558e5b7465035c48dc31d

data/changelog.md

@@ -1,4 +1,7 @@
 # Change Log
+## [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
@@ -25,3 +28,4 @@
 
 ## [0.1.0] - 2017/10/26
 - Initial Release.
+

data/evva_config.yml

@@ -7,4 +7,5 @@ data_source:
 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.rb

@@ -26,7 +26,7 @@ module Evva
     bundle = analytics_data(config: config.data_source)
     case config.type.downcase
     when 'android'
-      generator = Evva::AndroidGenerator.new
+      generator = Evva::AndroidGenerator.new(config.package_name)
       evva_write(bundle, generator, config, 'kt')
     when 'ios'
       generator = Evva::SwiftGenerator.new

data/lib/evva/android_generator.rb

@@ -1,5 +1,16 @@
 module Evva
   class AndroidGenerator
+    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)
       header_footer_wrapper([IMPORT_EVENT, IMPORT_MASK, IMPORT_JSON]) do
@@ -44,22 +55,17 @@ module Evva
       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"
+      imports.map { |ev| ev. gsub("packagename", @package_name) }
+             .join("\n") + "\n\n"
     end
 
     def header_footer_wrapper(imports = [])
 <<-Kotlin
-package com.hole19golf.hole19.analytics
+package #{@package_name}
 
 #{imports_header(imports)}/**
  * This file was automatically generated by evva: https://github.com/hole19/evva

data/lib/evva/config.rb

@@ -43,6 +43,10 @@ module Evva
       @hash[:special_enum_file_name]
     end
 
+    def package_name
+      @hash[:package_name]
+    end
+
     CONFIG_STRUCT = {
       type: Hash,
       elements: {
@@ -53,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
 

data/lib/evva/version.rb

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

data/spec/fixtures/test.yml

@@ -7,4 +7,5 @@ data_source:
 out_path: analytics
 event_file_name: MixpanelAnalytics
 event_enum_file_name: MixpanelEvent
-people_file_name: MixpanelProperties
+people_file_name: MixpanelProperties
+package_name: com.package.name.analytics

data/spec/lib/evva/android_generator_spec.rb

@@ -1,5 +1,5 @@
 describe Evva::AndroidGenerator do
-  let(:generator) { described_class.new }
+  let(:generator) { described_class.new("com.hole19golf.hole19.analytics") }
 
   describe '#events' do
     subject { generator.events(events, "MixpanelAnalytics") }

data/spec/lib/evva/config_spec.rb

@@ -11,7 +11,8 @@ describe Evva::Config do
       out_path: 'clear/path/to/event',
       event_file_name: 'event/file/name',
       people_file_name: 'people/file/name',
-      event_enum_file_name: 'event/enum/file'
+      event_enum_file_name: 'event/enum/file',
+      package_name:         'com.package.name.analytics'
     }
   end
 
@@ -26,6 +27,7 @@ describe Evva::Config do
   its(:event_file_name) { should eq('event/file/name') }
   its(:people_file_name) { should eq('people/file/name') }
   its(:event_enum_file_name) { should eq 'event/enum/file' }
+  its(:package_name) { should eq 'com.package.name.analytics' }
 
   describe '#data_source' do
     subject(:data_source) { config.data_source }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evva
 version: !ruby/object:Gem::Version
-  version: 0.1.4.3
+  version: 0.1.4.4
 platform: ruby
 authors:
 - RicardoTrindade
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-12 00:00:00.000000000 Z
+date: 2019-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: safe_yaml