evva 0.1.3.1 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 984a0025952782b80e9d68c5ec038737bda49de3
-  data.tar.gz: 04e05f9f041ede0d2e1dd5e8721d43b35e0134fa
+  metadata.gz: 56e6842ab3d66a9abb5650bb441f0291e8c51e72
+  data.tar.gz: b823b271c2577b6fd072617d55546558a097ae10
 SHA512:
-  metadata.gz: 6a52c0b7b13bf66202d268401ff9e45f4dd70c48a8e39276314b895e2ffd391f60f29f8820902d338018af98c869ee75f7ff955a53af843d56cb8314b63fb3f1
-  data.tar.gz: 7406fb876d45eeec87447e13bf0afe75054c93f1c206a74dbee072f5a93da12f877640a204d61a891b5e00dd9042adeabf5eb0f4d42daf617f829645e3a7bca8
+  metadata.gz: 32d566d2c257d59dd7dd5a8f19c07342322d3402ea34fb2e230126ec92e6410829ee5a9d2a302b829cfee0df0dfa52b9ac236807a82f6996df59a3b06443a8e7
+  data.tar.gz: f82155689b8307c2c7709921e5ee9f602612c13b5065d7b5a1ca32f253d0a7efe179be5cead7adf78e1de35eebf77ec1faa062ac3b5476a9de961fba60104156

data/changelog.md

@@ -1,12 +1,17 @@
 # Change Log
+##[0.1.4] - 2018-02-08
+- Removes not needed enum file on Swift generator
+- Removes Long type on Swift generator
+- More tabbing fixes according to #9
+
 ##[0.1.3] - 2018-02-08
-Fixes quotations and spacing on Swift code generation
+- Fixes quotations and spacing on Swift code generation
 
 ##[0.1.2] - 2018-01-25
-Improves swift code generation
+- Improves swift code generation
 
 ## [0.1.1] - 2017-11-07
-Fixes mismatch between file name and class name generated.
+- Fixes mismatch between file name and class name generated.
 
 ## [0.1.0] - 2017/10/26
-Initial Release.
+- Initial Release.

data/lib/evva.rb

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

data/lib/evva/swift_generator.rb

@@ -4,7 +4,7 @@ module Evva
       "import CoreLocation\n"\
       "import Foundation\n"\
       "import SharedCode\n\n"\
-      "class MixpanelHelper: NSObject {\n"\
+      "@objc class MixpanelHelper: NSObject {\n"\
       "\tenum Event {\n".freeze
 
     SWIFT_EVENT_DATA_HEADER =
@@ -14,23 +14,23 @@ module Evva
     SWIFT_PEOPLE_HEADER = "fileprivate enum Counter: String {\n".freeze
 
     SWIFT_INCREMENT_FUNCTION =
-      "func increment(times: Int = 1) {\n"\
-      "MixpanelAPI.instance.incrementCounter(rawValue, times: times)\n"\
-      '}'.freeze
+      "\tfunc increment(times: Int = 1) {\n"\
+      "\t\tMixpanelAPI.instance.incrementCounter(rawValue, times: times)\n"\
+      '\t}'.freeze
 
-    NATIVE_TYPES = %w[Long Int String Double Float Bool].freeze
+    NATIVE_TYPES = %w[Int String Double Float Bool].freeze
 
     def events(bundle, file_name)
       event_file = SWIFT_EVENT_HEADER
       bundle.each do |event|
         event_file += swift_case(event)
       end
-      event_file += "}\n"
+      event_file += "\t}\n\n"
       event_file += SWIFT_EVENT_DATA_HEADER
       bundle.each do |event|
         event_file += swift_event_data(event)
       end
-      event_file += "}\n}\n"
+      event_file += "\t}\n}\n"
     end
 
     def swift_case(event_data)
@@ -38,21 +38,21 @@ module Evva
       if event_data.properties.empty?
         "\t\tcase #{function_name}\n"
       else
-        trimmed_properties = event_data.properties.map { |k, v| k.to_s + '": ' + v.gsub('Boolean', 'Bool') }.join(",\"")
-        "\t\tcase #{function_name}(\"#{trimmed_properties})\n"
+        trimmed_properties = event_data.properties.map { |k, v| k.to_s + ': ' + v.gsub('Boolean','Bool').gsub('Long', 'Int') }.join(", ")
+        "\t\tcase #{function_name}(#{trimmed_properties})\n"
       end
     end
 
     def swift_event_data(event_data)
       function_name = 'track' + titleize(event_data.event_name)
       if event_data.properties.empty?
-        function_body = "\t\t\tcase .#{function_name} \n" \
-                        "\t\t\t\treturn EventData(name:\"#{event_data.event_name}\")\n\n"
+        function_body = "\t\t\tcase .#{function_name}:\n" \
+                        "\t\t\t\treturn EventData(name: \"#{event_data.event_name}\")\n\n"
       else
         function_header = prepend_let(event_data.properties)
-        function_arguments = process_arguments(event_data.properties.map { |k, v| "#{k}: #{v.gsub('Boolean', 'Bool')}" })
+        function_arguments = process_arguments(event_data.properties.map { |k, v| "#{k}: #{v}" })
         function_body = "\t\t\tcase .#{function_name}(#{function_header}):\n" \
-                        "\t\t\t\treturn EventData(name:\"#{event_data.event_name}\", properties: [#{function_arguments}])\n\n"
+                        "\t\t\t\treturn EventData(name: \"#{event_data.event_name}\", properties: [#{function_arguments}])\n\n"
       end
       function_body
     end

data/lib/evva/version.rb

@@ -1,4 +1,4 @@
 module Evva
-  VERSION = '0.1.3.1'.freeze
+  VERSION = '0.1.4'.freeze
   VERSION_UPDATED_AT = '2018-02-08'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: evva
 version: !ruby/object:Gem::Version
-  version: 0.1.3.1
+  version: 0.1.4
 platform: ruby
 authors:
 - RicardoTrindade