evva 0.1.4.1 → 0.1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb97d0f1d8232f0bd8be466a5bb44d0d6969d620
-  data.tar.gz: eafd1e8f81baa14886ba4fcb466ea18b59f9b199
+  metadata.gz: 90dd43b0fdd3169aa137cf665a8c592693b9d686
+  data.tar.gz: 12649831ed616d714b7357c3fdff9d1cd7cf41ea
 SHA512:
-  metadata.gz: 6f35827bcadcc08b17693f45d7b5106c75fddb277df50f837eb38e8ab10e06612d53ee550a37ad173e85ffa9e830a5b4debb2136c361dff0e4335c15054449b7
-  data.tar.gz: eec447eb9229129b08415d30382e23fcab70b354a6512e906d756fe7c87ef734011fe2ba4da7cc09706ac00bcd2310e6047698f36e5eaafcb3be2d9521b9ef0d
+  metadata.gz: 9d043c714969d7d188026015fe15d0ef3a6d0be113d05593c53624e4af1a63f755800bcfab407d35b4512fd00045791ea59085cc6cc918163faae540222dbd5c
+  data.tar.gz: ec753ef63337efd78777711e1e2b62b46956a3c44ef699d50d2f9761ff54a9f82cec7124527cf774ca5c95fbae6a3a90785d2d9702bcf0396525dabfc692b2aa

data/changelog.md

@@ -1,4 +1,7 @@
 # Change Log
+## [0.1.4.2] - 2018-02-14
+ - Replaces Swift headers
+
 ## [0.1.4.1] - 2018-02-08
 - DRYs methods in swift event generation
 

data/lib/evva/swift_generator.rb

@@ -1,52 +1,33 @@
 module Evva
   class SwiftGenerator
-    SWIFT_EVENT_HEADER =
-      "import CoreLocation\n"\
-      "import Foundation\n"\
-      "import SharedCode\n\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 =
-      "\t\tprivate var data: EventData {\n"\
-      "\t\t\tswitch self {\n".freeze
-
-    SWIFT_PEOPLE_HEADER = "fileprivate enum Counter: String {\n".freeze
-
-    SWIFT_INCREMENT_FUNCTION =
-      "\tfunc increment(times: Int = 1) {\n"\
-      "\t\tMixpanelAPI.instance.incrementCounter(rawValue, times: times)\n"\
-      "\t}".freeze
+    EXTENSION_HEADER =
+      "\nimport Foundation\n\n"\
+      "extension Analytics {\n\n".freeze
+
+    EXTENSION_FOOTER =
+      "\n\n}\n"
 
     NATIVE_TYPES = %w[Int String Double Float Bool].freeze
 
     def events(bundle, file_name)
-      event_file = SWIFT_EVENT_HEADER
+      event_file = EXTENSION_HEADER
+      event_file += "\tenum Event {\n\n"
       bundle.each do |event|
-        event_file += swift_case(event)
+        event_file += event_case(event)
       end
-      event_file += SWIFT_EVENT_DATA_HEADER
+      event_file += "\n\t\tvar data: EventData {\n"
+      event_file += "\t\t\tswitch self {\n"
       bundle.each do |event|
-        event_file += swift_event_data(event)
+        event_file += event_data(event)
       end
       event_file += "\t\t\t}\n"
-      event_file += "\t\t}\n"
-      event_file += "\t}\n"
-      event_file += "}\n"
+      event_file += "\t\t}\n\n"
+      event_file += "\t}"
+      event_file += EXTENSION_FOOTER
     end
 
-    def swift_case(event_data)
-      function_name = 'track' + titleize(event_data.event_name)
+    def event_case(event_data)
+      function_name = camelize(event_data.event_name)
       if event_data.properties.empty?
         "\t\tcase #{function_name}\n"
       else
@@ -55,8 +36,8 @@ module Evva
       end
     end
 
-    def swift_event_data(event_data)
-      function_name = 'track' + titleize(event_data.event_name)
+    def event_data(event_data)
+      function_name = camelize(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"
@@ -76,16 +57,23 @@ module Evva
     end
 
     def people_properties(people_bundle, file_name)
-      properties = SWIFT_PEOPLE_HEADER
-      properties += people_bundle.map { |prop| swift_people_const(prop) }.join('')
-      properties + "\n" + SWIFT_INCREMENT_FUNCTION + "\n}\n"
+      properties = EXTENSION_HEADER
+      properties += "\tenum Property: String {\n"
+      people_bundle.each do |prop|
+        properties += "\t\tcase #{camelize(prop)} = \"#{prop}\"\n"
+      end
+      properties += "\t}"
+      properties += EXTENSION_FOOTER
     end
 
     def special_property_enum(enum)
-      enum_body = "import Foundation\n\n"
-      enum_body += "enum #{enum.enum_name}: String {\n"
-      enum_body += enum.values.map { |vals| "\tcase #{vals.tr(' ', '_')} = \"#{vals}\"\n" }.join('')
-      enum_body + "} \n"
+      enum_body = EXTENSION_HEADER
+      enum_body += "\tenum #{enum.enum_name}: String {\n"
+      enum.values.map do |val|
+        enum_body += "\t\tcase #{val.tr(' ', '_')} = \"#{val}\"\n"
+      end
+      enum_body += "\t}"
+      enum_body += EXTENSION_FOOTER
     end
 
     def dictionary_pairs(props)
@@ -119,12 +107,13 @@ module Evva
       props.map { |k, v| "let #{k}" }.join(', ')
     end
 
-    def swift_people_const(prop)
-      "\tcase #{titleize(prop)} = \"#{prop}\"\n"
+    def camelize(term)
+      string = term.to_s
+      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)
+      string
     end
 
-    def titleize(str)
-      str.split('_').collect(&:capitalize).join
-    end
   end
 end

data/lib/evva/version.rb

@@ -1,4 +1,4 @@
 module Evva
-  VERSION = '0.1.4.1'.freeze
-  VERSION_UPDATED_AT = '2018-02-08'.freeze
+  VERSION = '0.1.4.2'.freeze
+  VERSION_UPDATED_AT = '2018-02-14'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evva
 version: !ruby/object:Gem::Version
-  version: 0.1.4.1
+  version: 0.1.4.2
 platform: ruby
 authors:
 - RicardoTrindade
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-08 00:00:00.000000000 Z
+date: 2018-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: safe_yaml