evva 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eda305fb53e24ab22bc0708758f7474d31ca0ea3
-  data.tar.gz: 6505070c7afb5614034bf41a1678b9a7be41b30e
+  metadata.gz: 91e13c0040b6c7afa9b48d0913dd7b12b301ffe4
+  data.tar.gz: e14a7dd7e190d55d8827ab3e02c100e87374aec6
 SHA512:
-  metadata.gz: 01ee93a2ec2073988a970ba21613bbcff4a40fc1d7cb17ab7ebb432f9a06ae619c2c2a66c6a688d35410a43f8a112d94be5f9c6d44c7808ea9c952630f810041
-  data.tar.gz: 0e04da40cdd2417b130a01334c1bc429d3eaf2b26ccbcbd4dcf6ef0e7441b7280bef3aeb44064038897ac3559c521c94d2a55b9a75dda65f917e7fb04c997ea1
+  metadata.gz: c9a76ca65eb48908a0d6f94c525f5c46fb8995a4e7cfd3fdf5d7b0edaee7688c82ad4200c239a468f493f3002148c821cfeb7c8ba12d9d0545e8f7d0f431534d
+  data.tar.gz: 55ebd2109cb41956effa3930d7e7db558ce68910a442a04db0606e284b9e893fdb1932d249e3c38eb9b492bf969879fc727728189589ad25314d58aafbe570d2

data/changelog.md

@@ -0,0 +1,7 @@
+# Change Log
+
+## [0.1.1] - 2017-11-07
+Fixes mismatch between file name and class name generated.
+
+## [0.1.0] - 2017/10/26
+Initial Release.

data/lib/evva.rb

@@ -38,13 +38,13 @@ module Evva
 
   def evva_write(bundle, generator, configuration, extension)
     path = "#{configuration.out_path}/#{configuration.event_file_name}.#{extension}"
-    write_to_file(path, generator.events(bundle[:events]))
+    write_to_file(path, generator.events(bundle[:events], configuration.event_file_name))
 
     path = "#{configuration.out_path}/#{configuration.event_enum_file_name}.#{extension}"
-    write_to_file(path, generator.event_enum(bundle[:events]))
+    write_to_file(path, generator.event_enum(bundle[:events], configuration.event_enum_file_name))
 
     path = "#{configuration.out_path}/#{configuration.people_file_name}.#{extension}"
-    write_to_file(path, generator.people_properties(bundle[:people]))
+    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}"

data/lib/evva/android_generator.rb

@@ -4,18 +4,15 @@ module Evva
       "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"\
-      "open class MixpanelEvents(private val mixpanelMask: MixpanelAnalyticsMask) {\n".freeze
+      "import org.json.JSONObject\n\n".freeze
 
     KOTLIN_PEOPLE_HEADER =
       "package com.hole19golf.hole19.analytics\n"\
-      "import com.hole19golf.hole19.analytics.Event\n\n"\
-      "enum class MixpanelProperties(val key: String) {\n".freeze
+      "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"\
-      "enum class MixpanelEvent(override val key: String) : Event {\n".freeze
+      "import com.hole19golf.hole19.analytics.Event\n\n".freeze
 
     KOTIN_PEOPLE_FUNCTIONS =
       "\topen fun updateProperties(property: MixpanelProperties, value: Any) {\n"\
@@ -27,8 +24,8 @@ module Evva
 
     NATIVE_TYPES = %w[Long Int String Double Float Boolean].freeze
 
-    def events(bundle)
-      event_file = KOTLIN_EVENT_HEADER
+    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)}"
       end
@@ -36,14 +33,14 @@ module Evva
       event_file += "\n}"
     end
 
-    def people_properties(people_bundle)
-      properties = KOTLIN_PEOPLE_HEADER
+    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"
     end
 
-    def event_enum(bundle)
-      event_file = KOTLIN_BUNDLE_HEADER
+    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"
     end

data/lib/evva/version.rb

@@ -1,4 +1,4 @@
 module Evva
-  VERSION = '0.1.0'.freeze
-  VERSION_UPDATED_AT = '2017-10-26'.freeze
+  VERSION = '0.1.1'.freeze
+  VERSION_UPDATED_AT = '2017-11-07'.freeze
 end

data/spec/lib/evva/android_generator_spec.rb

@@ -99,7 +99,7 @@ describe Evva::AndroidGenerator do
   end
 
   describe '#event_enum' do
-    subject { trim_spaces(generator.event_enum(event_bundle)) }
+    subject { trim_spaces(generator.event_enum(event_bundle, 'MixpanelEvent')) }
     let(:event_bundle) { [
       Evva::MixpanelEvent.new('nav_feed_tap', {}),
       Evva::MixpanelEvent.new('nav_performance_tap', {})
@@ -118,7 +118,7 @@ describe Evva::AndroidGenerator do
   end
 
   describe '#people_properties' do
-    subject { trim_spaces(generator.people_properties(people_bundle)) }
+    subject { trim_spaces(generator.people_properties(people_bundle, 'MixpanelProperties')) }
     let(:people_bundle) { ['rounds_with_wear', 'friends_from_facebook'] }
     let(:expected) { <<-Kotlin
       package com.hole19golf.hole19.analytics

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evva
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - RicardoTrindade
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-26 00:00:00.000000000 Z
+date: 2017-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: safe_yaml
@@ -80,6 +80,7 @@ files:
 - Gemfile.lock
 - README.md
 - bin/evva
+- changelog.md
 - evva.gemspec
 - evva_config.yml
 - lib/evva.rb