evva 0.1.4 → 0.1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56e6842ab3d66a9abb5650bb441f0291e8c51e72
-  data.tar.gz: b823b271c2577b6fd072617d55546558a097ae10
+  metadata.gz: eb97d0f1d8232f0bd8be466a5bb44d0d6969d620
+  data.tar.gz: eafd1e8f81baa14886ba4fcb466ea18b59f9b199
 SHA512:
-  metadata.gz: 32d566d2c257d59dd7dd5a8f19c07342322d3402ea34fb2e230126ec92e6410829ee5a9d2a302b829cfee0df0dfa52b9ac236807a82f6996df59a3b06443a8e7
-  data.tar.gz: f82155689b8307c2c7709921e5ee9f602612c13b5065d7b5a1ca32f253d0a7efe179be5cead7adf78e1de35eebf77ec1faa062ac3b5476a9de961fba60104156
+  metadata.gz: 6f35827bcadcc08b17693f45d7b5106c75fddb277df50f837eb38e8ab10e06612d53ee550a37ad173e85ffa9e830a5b4debb2136c361dff0e4335c15054449b7
+  data.tar.gz: eec447eb9229129b08415d30382e23fcab70b354a6512e906d756fe7c87ef734011fe2ba4da7cc09706ac00bcd2310e6047698f36e5eaafcb3be2d9521b9ef0d

data/changelog.md

@@ -1,13 +1,16 @@
 # Change Log
-##[0.1.4] - 2018-02-08
+## [0.1.4.1] - 2018-02-08
+- DRYs methods in swift event generation
+
+## [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
+## [0.1.3] - 2018-02-08
 - Fixes quotations and spacing on Swift code generation
 
-##[0.1.2] - 2018-01-25
+## [0.1.2] - 2018-01-25
 - Improves swift code generation
 
 ## [0.1.1] - 2017-11-07

data/lib/evva/swift_generator.rb

@@ -4,7 +4,17 @@ module Evva
       "import CoreLocation\n"\
       "import Foundation\n"\
       "import SharedCode\n\n"\
-      "@objc class MixpanelHelper: NSObject {\n"\
+      "@objc class MixpanelHelper: NSObject {\n\n"\
+      "\tprivate struct EventData {\n"\
+      "\t\tlet name: String\n"\
+      "\t\tlet properties: [String: Any]?\n"\
+      "\t\tlet timeEvent: Bool\n\n"\
+      "\t\tinit(name: String, properties: [String: Any]? = nil, timeEvent: Bool = false) {\n"\
+      "\t\t\tself.name = name\n"\
+      "\t\t\tself.properties = properties\n"\
+      "\t\t\tself.timeEvent = timeEvent\n"\
+      "\t\t}\n"\
+      "\t}\n\n"\
       "\tenum Event {\n".freeze
 
     SWIFT_EVENT_DATA_HEADER =
@@ -16,7 +26,7 @@ module Evva
     SWIFT_INCREMENT_FUNCTION =
       "\tfunc increment(times: Int = 1) {\n"\
       "\t\tMixpanelAPI.instance.incrementCounter(rawValue, times: times)\n"\
-      '\t}'.freeze
+      "\t}".freeze
 
     NATIVE_TYPES = %w[Int String Double Float Bool].freeze
 
@@ -25,12 +35,14 @@ module Evva
       bundle.each do |event|
         event_file += swift_case(event)
       end
-      event_file += "\t}\n\n"
       event_file += SWIFT_EVENT_DATA_HEADER
       bundle.each do |event|
         event_file += swift_event_data(event)
       end
-      event_file += "\t}\n}\n"
+      event_file += "\t\t\t}\n"
+      event_file += "\t\t}\n"
+      event_file += "\t}\n"
+      event_file += "}\n"
     end
 
     def swift_case(event_data)
@@ -38,7 +50,7 @@ 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').gsub('Long', 'Int') }.join(", ")
+        trimmed_properties = event_data.properties.map { |k, v| k.to_s + ': ' + native_type(v) }.join(", ")
         "\t\tcase #{function_name}(#{trimmed_properties})\n"
       end
     end
@@ -50,9 +62,11 @@ module Evva
                         "\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}" })
-        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"
+        function_arguments = dictionary_pairs(event_data.properties)
+        function_body = "\t\t\tcase .#{function_name}(#{function_header}):\n"\
+                        "\t\t\t\treturn EventData(name: \"#{event_data.event_name}\", properties: [\n"\
+                        "\t\t\t\t\t#{function_arguments.join(",\n\t\t\t\t\t")} ]\n"\
+                        "\t\t\t\t)\n\n"
       end
       function_body
     end
@@ -74,39 +88,31 @@ module Evva
       enum_body + "} \n"
     end
 
-    def process_arguments(props)
-      arguments = ''
-      props.each do |property|
-        val = property.split(':').first
-        if is_special_property?(property)
-          if is_optional_property?(property)
-            val = val.chomp('?')
-            arguments += "\"#{val}\": #{val}.rawValue, "
-          else
-            arguments += "\"#{val}\": #{val}.rawValue, "
-          end
-        else
-          if is_optional_property?(property)
-            val = val.chomp('?')
-            arguments += "\"#{val}\": #{val}, "
-          else
-            arguments += "\"#{val}\": #{val}, "
+    def dictionary_pairs(props)
+      props.map do |name, type|
+        pair = "\"#{name}\": #{name}"
+        if is_raw_representable_property?(type)
+          if is_optional_property?(type)
+            pair += "?"
           end
+          pair += ".rawValue"
         end
+        pair += " as Any"
       end
-      arguments.chomp(', ')
     end
 
     private
 
-    def is_special_property?(prop)
-      type = prop.split(':')[1]
-      !NATIVE_TYPES.include?(type.chomp('?'))
+    def is_raw_representable_property?(type)
+      !NATIVE_TYPES.include?(native_type(type).chomp('?'))
+    end
+
+    def is_optional_property?(type)
+      type.end_with?('?')
     end
 
-    def is_optional_property?(prop)
-      type = prop.split(':')[1]
-      type.include?('?') ? true : false
+    def native_type(type)
+      type.gsub('Boolean','Bool').gsub('Long', 'Int')
     end
 
     def prepend_let(props)

data/lib/evva/version.rb

@@ -1,4 +1,4 @@
 module Evva
-  VERSION = '0.1.4'.freeze
+  VERSION = '0.1.4.1'.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.4
+  version: 0.1.4.1
 platform: ruby
 authors:
 - RicardoTrindade