evva 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91e13c0040b6c7afa9b48d0913dd7b12b301ffe4
-  data.tar.gz: e14a7dd7e190d55d8827ab3e02c100e87374aec6
+  metadata.gz: 0ecc532385f462a9f37aec975d66fbd19b18aa05
+  data.tar.gz: acea35b0751f2f5574da3c75a615911a2093c6ab
 SHA512:
-  metadata.gz: c9a76ca65eb48908a0d6f94c525f5c46fb8995a4e7cfd3fdf5d7b0edaee7688c82ad4200c239a468f493f3002148c821cfeb7c8ba12d9d0545e8f7d0f431534d
-  data.tar.gz: 55ebd2109cb41956effa3930d7e7db558ce68910a442a04db0606e284b9e893fdb1932d249e3c38eb9b492bf969879fc727728189589ad25314d58aafbe570d2
+  metadata.gz: f628dec72519c201300590971a50c6ad81e7d0fe43d529b10b8d36f5463f03536c522a6307d2a082f2a39f55a147d626db9840521dca271cb895c336bc2ab668
+  data.tar.gz: 9a69b2a1810f3ea7a783e399fbda02eb03806526680096dfa1fb7f438e258480b4f7c551bb304078e4f0371b051bc48faa87bdac3dfbf3d2ac58f8aae5832d38

data/Gemfile

@@ -1,10 +1,11 @@
 source 'https://rubygems.org'
 ruby '2.3.3'
 
-gem 'colorize',   '~> 0.7'
-gem 'rubocop',    '~> 0.49.1'
-gem 'safe_yaml',  '~> 1.0'
-gem 'xml-simple', '~> 1.1'
+gem 'colorize'
+gem 'rubocop'
+gem 'safe_yaml'
+gem 'xml-simple'
+gem 'byebug'
 
 gem 'rspec'
 gem 'rspec-its'

data/Gemfile.lock

@@ -1,50 +1,51 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.5.1)
-      public_suffix (~> 2.0, >= 2.0.2)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
     ast (2.3.0)
+    byebug (9.1.0)
     colorize (0.8.1)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     diff-lcs (1.3)
     docile (1.1.5)
-    hashdiff (0.3.5)
+    hashdiff (0.3.7)
     json (2.1.0)
     parallel (1.12.0)
     parser (2.4.0.0)
       ast (~> 2.2)
     powerpack (0.1.1)
-    public_suffix (2.0.5)
+    public_suffix (3.0.0)
     rainbow (2.2.2)
       rake
-    rake (12.0.0)
-    rspec (3.6.0)
-      rspec-core (~> 3.6.0)
-      rspec-expectations (~> 3.6.0)
-      rspec-mocks (~> 3.6.0)
-    rspec-core (3.6.0)
-      rspec-support (~> 3.6.0)
-    rspec-expectations (3.6.0)
+    rake (12.1.0)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.0)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
+      rspec-support (~> 3.7.0)
     rspec-its (1.2.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.6.0)
+    rspec-mocks (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-support (3.6.0)
-    rubocop (0.49.1)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.0)
+    rubocop (0.51.0)
       parallel (~> 1.10)
       parser (>= 2.3.3.1, < 3.0)
       powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
+      rainbow (>= 2.2.2, < 3.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.8.1)
+    ruby-progressbar (1.9.0)
     safe_yaml (1.0.4)
-    simplecov (0.15.0)
+    simplecov (0.15.1)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
@@ -62,15 +63,16 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  colorize (~> 0.7)
+  byebug
+  colorize
   rspec
   rspec-its
-  rubocop (~> 0.49.1)
-  safe_yaml (~> 1.0)
+  rubocop
+  safe_yaml
   simplecov
   simplecov-rcov
   webmock (~> 1.20)
-  xml-simple (~> 1.1)
+  xml-simple
 
 RUBY VERSION
    ruby 2.3.3p222

data/changelog.md

@@ -1,5 +1,8 @@
 # Change Log
 
+##[0.1.2] - 2018-01-25
+Improves swift code generation
+
 ## [0.1.1] - 2017-11-07
 Fixes mismatch between file name and class name generated.
 

data/lib/evva/android_generator.rb

@@ -15,10 +15,10 @@ module Evva
       "import com.hole19golf.hole19.analytics.Event\n\n".freeze
 
     KOTIN_PEOPLE_FUNCTIONS =
-      "\topen fun updateProperties(property: MixpanelProperties, value: Any) {\n"\
+      "\nopen fun updateProperties(property: MixpanelProperties, value: Any) {\n"\
       "\t\tmixpanelMask.updateProperties(property.key, value)"\
       "\t\n} \n"\
-      "\topen fun incrementCounter(property: MixpanelProperties) {\n"\
+      "\nopen fun incrementCounter(property: MixpanelProperties) {\n"\
       "\t\tmixpanelMask.incrementCounter(property.key)"\
       "\t\n} \n".freeze
 

data/lib/evva/swift_generator.rb

@@ -18,7 +18,9 @@ module Evva
       "MixpanelAPI.instance.incrementCounter(rawValue, times: times)\n"\
       '}'.freeze
 
-    def events(bundle)
+    NATIVE_TYPES = %w[Long 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)
@@ -34,62 +36,63 @@ module Evva
 
     def swift_case(event_data)
       function_name = 'track' + titleize(event_data.event_name)
-      if event_data.properties.nil?
-        case_body = "\t\tcase #{function_name}\n"
+      if event_data.properties.empty?
+        "\t\tcase #{function_name}\n"
       else
-        trimmed_properties = event_data.properties.gsub('Boolean', 'Bool')
-        case_body = "\t\tcase #{function_name}(#{trimmed_properties})\n"
+        trimmed_properties = event_data.properties.map { |k, v| "#{k}: #{v.gsub('Boolean', 'Bool')}" }
+        "\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.nil?
+      if event_data.properties.empty?
         function_body = "case .#{function_name} \n" \
-                        "\treturn EventData(name:" + %("#{event_data.event_name}") + ")\n\n"
+                        "\treturn EventData(name:\"#{event_data.event_name}\")\n\n"
       else
         function_header = prepend_let(event_data.properties)
-        function_arguments = process_arguments(event_data.properties.gsub('Boolean', 'Bool'))
+        function_arguments = process_arguments(event_data.properties.map { |k, v| "#{k}: #{v.gsub('Boolean', 'Bool')}" })
         function_body = "case .#{function_name}(#{function_header}):\n" \
-                        "\treturn EventData(name:" + %("#{event_data.event_name}") + ", properties: [#{function_arguments}])\n\n"
+                        "\treturn EventData(name:\"#{event_data.event_name}\", properties: [#{function_arguments}])\n\n"
       end
-
       function_body
     end
 
-    def event_enum(enum)
+    def event_enum(enum, file_name)
       # empty
     end
 
-    def people_properties(people_bundle)
+    def people_properties(people_bundle, file_name)
       properties = SWIFT_PEOPLE_HEADER
-      people_bundle.each do |prop|
-        properties += swift_people_const(prop)
-      end
-      properties += SWIFT_INCREMENT_FUNCTION + "\n}"
+      properties += people_bundle.map { |prop| swift_people_const(prop) }.join('')
+      properties + "\n" + SWIFT_INCREMENT_FUNCTION + "\n}\n"
     end
 
     def special_property_enum(enum)
       enum_body = "import Foundation\n\n"
-      enum_values = enum.values.split(',')
       enum_body += "enum #{enum.enum_name}: String {\n"
-      enum_values.each do |vals|
-        enum_body += "\tcase #{vals.tr(' ', '_')} = " + %("#{vals}") + "\n"
-      end
-      enum_body += "} \n"
+      enum_body += enum.values.map { |vals| "\tcase #{vals.tr(' ', '_')} = \"#{vals}\"\n" }.join('')
+      enum_body + "} \n"
     end
 
     def process_arguments(props)
       arguments = ''
-      props.split(',').each do |property|
-        if is_special_property(property)
-          if is_optional_property(property)
-
+      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 += %("#{property.split(':').first}") + ':' + property.split(':').first + '.rawValue, '
+            arguments += "\"#{val}\": #{val}.rawValue, "
           end
         else
-          arguments += %("#{property.split(':').first}") + ':' + property.split(':').first + ', '
+          if is_optional_property?(property)
+            val = val.chomp('?')
+            arguments += "\"#{val}\": #{val}, "
+          else
+            arguments += "\"#{val}\": #{val}, "
+          end
         end
       end
       arguments.chomp(', ')
@@ -97,28 +100,22 @@ module Evva
 
     private
 
-    def is_special_property(prop)
-      types_array = %w[Long Int String Double Float Boolean]
+    def is_special_property?(prop)
       type = prop.split(':')[1]
-      types_array.include?(type) ? false : true
+      !NATIVE_TYPES.include?(type.chomp('?'))
     end
 
-    def is_optional_property(prop)
+    def is_optional_property?(prop)
       type = prop.split(':')[1]
       type.include?('?') ? true : false
     end
 
-
     def prepend_let(props)
-      function_header = ''
-      props.split(',').each do |property|
-        function_header += 'let ' + property.split(':')[0] + ', '
-      end
-      function_header.chomp(', ')
+      props.map { |k, v| "let #{k}" }.join(', ')
     end
 
     def swift_people_const(prop)
-      case_body = "\tcase #{prop.property_name} = " + %("#{prop.property_value}") + "\n"
+      "\tcase #{titleize(prop)} = \"#{prop}\"\n"
     end
 
     def titleize(str)

data/lib/evva/version.rb

@@ -1,4 +1,4 @@
 module Evva
-  VERSION = '0.1.1'.freeze
-  VERSION_UPDATED_AT = '2017-11-07'.freeze
+  VERSION = '0.1.2'.freeze
+  VERSION_UPDATED_AT = '2018-01-25'.freeze
 end

data/spec/lib/evva/swift_generator_spec.rb

@@ -7,10 +7,10 @@ describe Evva::SwiftGenerator do
   end
 
   describe '#events' do
-    subject { trim_spaces(generator.events(event_bundle)) }
+    subject { trim_spaces(generator.events(event_bundle, "")) }
     let(:event_bundle) {
       [Evva::MixpanelEvent.new('nav_feed_tap', []),
-       Evva::MixpanelEvent.new('cp_page_view', 'course_id:Long,course_name:String')]
+       Evva::MixpanelEvent.new('cp_page_view', ['course_id:Long'],['course_name:String?'])]
     }
     let(:expected) { <<-Swift
         import CoreLocation
@@ -20,47 +20,41 @@ describe Evva::SwiftGenerator do
         class MixpanelHelper: NSObject {
           enum Event {
             case trackNavFeedTap
-            case trackCpPageView(course_id:Long,course_name:String)
+            case trackCpPageView(course_id: Long, course_name: String?)
           }
-        private var data: EventData {
-          switch self {
 
-          case .trackNavFeedTap
-        return EventData(name:"nav_feed_tap")
+          private var data: EventData {
+            switch self {
 
-          case .trackCpPageView(let course_id, let course_name):
-        return EventData(name:"cp_page_view", properties: ["course_id":course_id, "course_name":course_name])
+            case .trackNavFeedTap
+              return EventData(name:"nav_feed_tap")
 
+            case .trackCpPageView(let course_id, let course_name):
+              return EventData(name:"cp_page_view", properties: ["course_id": course_id, "course_name": course_name])
+          }
         }
-      }
       Swift
     }
     it { should eq trim_spaces(expected) }
   end
 
-  describe '#swift_case' do
-    context 'event has no properties' do
-      event = Evva::MixpanelEvent.new('nav_feed_tap', [])
-      it 'should create a case for an event to be tracked' do
-        expected = "\t\tcase trackNavFeedTap\n"
-        expect(generator.swift_case(event)).to eq expected
-      end
-    end
+  describe '#process_arguments' do
+    context "with optional arguments" do
+      let(:properties) { 'course_id:Long,course_name:String,from_screen: CourseProfileSource?' }
 
-    context 'event has properties' do
-      event = Evva::MixpanelEvent.new('cp_page_view', 'course_id:Long,course_name:String')
-      it 'should create a case for an event to be tracked' do
-        expected = "\t\tcase trackCpPageView(course_id:Long,course_name:String)\n"
-        expect(generator.swift_case(event)).to eq expected
+      it 'processes the arguments looking for special properties' do
+        expected = '"course_id": course_id, "course_name": course_name, "from_screen": from_screen.rawValue'
+        expect(generator.process_arguments(properties)).to eq expected
       end
     end
-  end
 
-  describe '#process_arguments' do
-    properties = 'course_id:Long,course_name:String,from_screen: CourseProfileSource'
-    it 'should process the arguments looking for special properties' do
-      expected = '"course_id":course_id, "course_name":course_name, "from_screen":from_screen.rawValue'
-      expect(generator.process_arguments(properties)).to eq expected
+    context "without optional arguments" do
+      let(:properties) { 'course_id:Long,course_name:String,from_screen: CourseProfileSource' }
+
+      it 'processes the arguments looking for special properties' do
+        expected = '"course_id": course_id, "course_name": course_name, "from_screen": from_screen.rawValue'
+        expect(generator.process_arguments(properties)).to eq expected
+      end
     end
   end
 
@@ -71,11 +65,30 @@ describe Evva::SwiftGenerator do
         import Foundation
 
         enum CourseProfileSource: String {
-        case course_discovery = "course_discovery"
-        case synced_courses = "synced_courses"
+          case course_discovery = "course_discovery"
+          case synced_courses = "synced_courses"
         }
       Swift
      }
+
+    it { should eq trim_spaces(expected) }
+  end
+
+  describe "#people_properties" do
+    subject { trim_spaces(generator.people_properties(people_bundle)) }
+    let(:people_bundle) { ['rounds_with_wear', 'friends_from_facebook'] }
+    let(:expected) { <<-Swift
+      fileprivate enum Counter: String {
+        case RoundsWithWear = "rounds_with_wear"
+        case FriendsFromFacebook = "friends_from_facebook"
+
+        func increment(times: Int = 1) {
+          MixpanelAPI.instance.incrementCounter(rawValue, times: times)
+        }
+      }
+      Swift
+    }
+
     it { should eq trim_spaces(expected) }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evva
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - RicardoTrindade
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-07 00:00:00.000000000 Z
+date: 2018-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: safe_yaml