evva 0.1.4.1 → 0.2.0

data/spec/lib/evva/config_spec.rb

@@ -5,13 +5,16 @@ describe Evva::Config do
     {
       type: 'EvvaOS',
       data_source: {
-        type:         'google_sheet',
-        sheet_id:     'abc1234567890'
+        type: 'google_sheet',
+        events_url: 'https://events.csv',
+        people_properties_url: 'https://people_properties.csv',
+        enum_classes_url: 'https://enum_classes.csv',
       },
       out_path: 'clear/path/to/event',
       event_file_name: 'event/file/name',
       people_file_name: 'people/file/name',
-      event_enum_file_name: 'event/enum/file'
+      event_enum_file_name: 'event/enum/file',
+      package_name:         'com.package.name.analytics'
     }
   end
 
@@ -26,11 +29,12 @@ describe Evva::Config do
   its(:event_file_name) { should eq('event/file/name') }
   its(:people_file_name) { should eq('people/file/name') }
   its(:event_enum_file_name) { should eq 'event/enum/file' }
+  its(:package_name) { should eq 'com.package.name.analytics' }
 
   describe '#data_source' do
     subject(:data_source) { config.data_source }
 
-    it { should eq(type: 'google_sheet', sheet_id: 'abc1234567890') }
+    it { should eq(type: 'google_sheet', events_url: 'https://events.csv', people_properties_url: 'https://people_properties.csv', enum_classes_url: 'https://enum_classes.csv') }
 
     context 'when given an unknown type data source' do
       before { hash[:data_source] = { type: 'i_dunno' } }

data/spec/lib/evva/google_sheet_spec.rb

@@ -1,107 +1,77 @@
 describe Evva::GoogleSheet do
-  let(:sheet) { Evva::GoogleSheet.new(sheet_id) }
-  let(:sheet_id) { 'abc1234567890' }
-  let(:url_info)  { "https://spreadsheets.google.com/feeds/worksheets/#{sheet_id}/public/full" }
-  let(:url_sheet) { "https://spreadsheets.google.com/feeds/list/#{sheet_id}/od6/public/full" }
-  let(:enum_sheet) { "https://spreadsheets.google.com/feeds/list/#{sheet_id}/osju1vh/public/full" }
-  let(:people_sheet) { "https://spreadsheets.google.com/feeds/list/#{sheet_id}/ojyi830/public/full" }
-  let(:file_info)  { File.read('spec/fixtures/sample_public_info.html') }
-  let(:file_sheet) { File.read('spec/fixtures/sample_public_sheet.html') }
-  let(:enum_file)  { File.read('spec/fixtures/sample_public_enums.html') }
-  let(:people_file)  { File.read('spec/fixtures/sample_public_people_properties.html') }
+  let(:sheet) { Evva::GoogleSheet.new(events_sheet, people_sheet, enum_sheet) }
+
+  let(:events_sheet) { "https://wtvr1" }
+  let(:people_sheet) { "https://wtvr2" }
+  let(:enum_sheet) { "https://wtvr3" }
+  let(:events_file) { File.read('spec/fixtures/sample_public_events.csv') }
+  let(:people_file)  { File.read('spec/fixtures/sample_public_people_properties.csv') }
+  let(:enum_file)  { File.read('spec/fixtures/sample_public_enums.csv') }
+
+  before do
+    stub_request(:get, events_sheet).to_return(status: 200, body: events_file, headers: {})
+    stub_request(:get, people_sheet).to_return(status: 200, body: people_file, headers: {})
+    stub_request(:get, enum_sheet).to_return(status: 200, body: enum_file, headers: {})
+  end
 
   describe '#events' do
     subject(:events) { sheet.events }
-    before do
-      stub_request(:get, url_info).to_return(status: 200, body: file_info, headers: {})
-      stub_request(:get, url_sheet).to_return(status: 200, body: file_sheet, headers: {})
-    end
-
-    context 'when given a valid sheet' do
-      it do
-        expect { events }.not_to raise_error
-      end
 
-      it 'returns an array with the corresponding events' do
-        expected = [Evva::MixpanelEvent.new('cp_page_view', { course_id: 'Long', course_name: 'String' }),
-                    Evva::MixpanelEvent.new('nav_feed_tap', {}),
-                    Evva::MixpanelEvent.new('cp_view_scorecard', { course_id: 'Long', course_name: 'String' })]
-        expect(events).to eq(expected)
-      end
+    it do
+      expect { events }.not_to raise_error
     end
 
-    context 'when given an inexistent sheet' do
-      before { stub_request(:get, url_info).to_return(status: 400, body: 'Not Found', headers: {}) }
-
-      it do
-        expect { events }.to raise_error /Cannot access sheet/
-      end
+    it 'returns an array with the corresponding events' do
+      expected = [Evva::MixpanelEvent.new('cp_page_view', { course_id: 'Long', course_name: 'String' }),
+                  Evva::MixpanelEvent.new('nav_feed_tap', {}),
+                  Evva::MixpanelEvent.new('cp_view_scorecard', { course_id: 'Long', course_name: 'String' })]
+      expect(events).to eq(expected)
     end
 
-    context 'when given a private sheet' do
-      before { stub_request(:get, url_info).to_return(status: 302, body: '<HTML></HTML>', headers: {}) }
+    context "when given an inexistent sheet" do
+      before { stub_request(:get, events_sheet).to_return(status: 400, body: "Not Found", headers: {}) }
 
       it do
-        expect { events }.to raise_error /Cannot access sheet/
+        expect { events }.to raise_error /Http Error/
       end
     end
 
-    context 'when url content is not XML' do
-      before { stub_request(:get, url_info).to_return(status: 200, body: 'This is not XML; { this: "is json" }', headers: {}) }
+    context "when url content is not CSV" do
+      before { stub_request(:get, events_sheet).to_return(status: 200, body: "{\"asdsa\": \"This is a json\"}", headers: {}) }
 
       it do
-        expect { events }.to raise_error /Cannot parse. Expected XML/
+        expect { events }.to raise_error /Cannot parse. Expected CSV/
       end
     end
   end
 
-  describe '#enum_classes' do
-    subject(:enum_classes) { sheet.enum_classes }
-    let(:expected_enum) do
-      [
-        Evva::MixpanelEnum.new('PageViewSourceScreen', ['course_discovery','synced_courses','nearby','deal']),
-        Evva::MixpanelEnum.new('PremiumClickBuy', ['notes','hi_res_maps','whatever'])
-      ]
-    end
-
-    context 'when given a valid sheet' do
-      before do
-        stub_request(:get, url_info).to_return(status: 200, body: file_info, headers: {})
-        stub_request(:get, enum_sheet).to_return(status: 200, body: enum_file, headers: {})
-      end
-
-      it do
-        expect { enum_classes }.not_to raise_error
-      end
+  describe '#people_properties' do
+    subject(:people_properties) { sheet.people_properties }
 
-      it 'returns an array with the corresponding events' do
-        expect(enum_classes).to eq expected_enum
-      end
+    it do
+      expect { people_properties }.not_to raise_error
     end
-  end
 
-  describe '#people_properties' do
-    subject(:people_properties) { sheet.people_properties }
-    let(:expected_people_properties) do
-      [
+    it 'returns an array with the corresponding events' do
+      expect(people_properties).to eq [
         'rounds_with_wear',
         'total_friends'
       ]
     end
+  end
 
-    context 'when given a valid sheet' do
-      before do
-        stub_request(:get, url_info).to_return(status: 200, body: file_info, headers: {})
-        stub_request(:get, people_sheet).to_return(status: 200, body: people_file, headers: {})
-      end
+  describe '#enum_classes' do
+    subject(:enum_classes) { sheet.enum_classes }
 
-      it do
-        expect { people_properties }.not_to raise_error
-      end
+    it do
+      expect { enum_classes }.not_to raise_error
+    end
 
-      it 'returns an array with the corresponding events' do
-        expect(people_properties).to eq expected_people_properties
-      end
+    it 'returns an array with the corresponding events' do
+      expect(enum_classes).to eq [
+        Evva::MixpanelEnum.new('PageViewSourceScreen', ['course_discovery','synced_courses','nearby','deal']),
+        Evva::MixpanelEnum.new('PremiumClickBuy', ['notes','hi_res_maps','whatever'])
+      ]
     end
   end
 end

data/spec/lib/evva/swift_generator_spec.rb

@@ -1,94 +1,125 @@
 describe Evva::SwiftGenerator do
   let(:generator) { described_class.new }
 
-  def trim_spaces(str)
-      str.gsub(/^[ \t]+/, '')
-         .gsub(/[ \t]+$/, '')
-  end
-
   describe '#events' do
-    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?'])]
-    }
-    let(:expected) { <<-Swift
-        import CoreLocation
-        import Foundation
-        import SharedCode
-
-        class MixpanelHelper: NSObject {
-          enum Event {
-            case trackNavFeedTap
-            case trackCpPageView(course_id: Long, course_name: String?)
-          }
-
-          private var data: EventData {
-            switch self {
+    subject { generator.events(event_bundle, "") }
+
+    let(:event_bundle) { [
+      Evva::MixpanelEvent.new('cp_page_view'),
+      Evva::MixpanelEvent.new('cp_page_view_a', { course_id: 'Long', course_name: 'String' }),
+      Evva::MixpanelEvent.new('cp_page_view_b', { course_id: 'Long', course_name: 'String', from_screen: 'CourseProfileSource' }),
+      Evva::MixpanelEvent.new('cp_page_view_c', { course_id: 'Long', course_name: 'String', from_screen: 'CourseProfileSource?' }),
+      Evva::MixpanelEvent.new('cp_page_view_d', { course_id: 'Long?', course_name: 'String' })
+    ] }
+
+    let(:expected) {
+<<-Swift
+// This file was automatically generated by evva: https://github.com/hole19/evva
 
-            case .trackNavFeedTap
-              return EventData(name:"nav_feed_tap")
+import Foundation
 
-            case .trackCpPageView(let course_id, let course_name):
-              return EventData(name:"cp_page_view", properties: ["course_id": course_id, "course_name": course_name])
-          }
+extension Analytics {
+
+    enum Event {
+        case cpPageView
+        case cpPageViewA(course_id: Int, course_name: String)
+        case cpPageViewB(course_id: Int, course_name: String, from_screen: CourseProfileSource)
+        case cpPageViewC(course_id: Int, course_name: String, from_screen: CourseProfileSource?)
+        case cpPageViewD(course_id: Int?, course_name: String)
+
+        var data: EventData {
+            switch self {
+            case .cpPageView:
+                return EventData(name: "cp_page_view")
+
+            case .cpPageViewA(let course_id, let course_name):
+                return EventData(name: "cp_page_view_a", properties: [
+                    "course_id": course_id as Any,
+                    "course_name": course_name as Any ]
+                )
+
+            case .cpPageViewB(let course_id, let course_name, let from_screen):
+                return EventData(name: "cp_page_view_b", properties: [
+                    "course_id": course_id as Any,
+                    "course_name": course_name as Any,
+                    "from_screen": from_screen.rawValue as Any ]
+                )
+
+            case .cpPageViewC(let course_id, let course_name, let from_screen):
+                return EventData(name: "cp_page_view_c", properties: [
+                    "course_id": course_id as Any,
+                    "course_name": course_name as Any,
+                    "from_screen": from_screen?.rawValue as Any ]
+                )
+
+            case .cpPageViewD(let course_id, let course_name):
+                return EventData(name: "cp_page_view_d", properties: [
+                    "course_id": course_id as Any,
+                    "course_name": course_name as Any ]
+                )
+            }
         }
-      Swift
     }
-    it { should eq trim_spaces(expected) }
+}
+Swift
+    }
+
+    it { should eq expected }
   end
 
-  describe '#process_arguments' do
-    context "with optional arguments" do
-      let(:properties) { 'course_id:Long,course_name:String,from_screen: CourseProfileSource?' }
+  describe '#special_property_enums' do
+    subject { generator.special_property_enums(enums) }
 
-      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
+    let(:enums) { [
+      Evva::MixpanelEnum.new('CourseProfileSource', ['course_discovery', 'synced_courses']),
+      Evva::MixpanelEnum.new('PremiumFrom', ['Course Profile', 'Round Setup'])
+    ] }
 
-    context "without optional arguments" do
-      let(:properties) { 'course_id:Long,course_name:String,from_screen: CourseProfileSource' }
+    let(:expected) {
+<<-Swift
+// This file was automatically generated by evva: https://github.com/hole19/evva
 
-      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
+import Foundation
 
-  describe '#special_property_enum' do
-    subject { trim_spaces(generator.special_property_enum(enum)) }
-    let(:enum) { Evva::MixpanelEnum.new('CourseProfileSource', 'course_discovery,synced_courses') }
-    let(:expected) { <<-Swift
-        import Foundation
+extension Analytics {
 
-        enum CourseProfileSource: String {
-          case course_discovery = "course_discovery"
-          case synced_courses = "synced_courses"
-        }
-      Swift
-     }
+    enum CourseProfileSource: String {
+        case courseDiscovery = "course_discovery"
+        case syncedCourses = "synced_courses"
+    }
+
+    enum PremiumFrom: String {
+        case courseProfile = "Course Profile"
+        case roundSetup = "Round Setup"
+    }
+}
+Swift
+    }
 
-    it { should eq trim_spaces(expected) }
+    it { should eq expected }
   end
 
   describe "#people_properties" do
-    subject { trim_spaces(generator.people_properties(people_bundle)) }
+    subject { 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
+    let(:expected) {
+<<-Swift
+// This file was automatically generated by evva: https://github.com/hole19/evva
+
+import Foundation
+
+extension Analytics {
+
+    enum Property: String {
+        case roundsWithWear = "rounds_with_wear"
+        case friendsFromFacebook = "friends_from_facebook"
+    }
+}
+Swift
     }
 
-    it { should eq trim_spaces(expected) }
+    it { should eq expected }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evva
 version: !ruby/object:Gem::Version
-  version: 0.1.4.1
+  version: 0.2.0
 platform: ruby
 authors:
 - RicardoTrindade
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-08 00:00:00.000000000 Z
+date: 2021-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: safe_yaml
@@ -38,34 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
-- !ruby/object:Gem::Dependency
-  name: xml-simple
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.20'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.20'
 description: Evva generates all the analytics event tracking functions for you
 email: ricardo.trindade743@gmail.com
 executables:
@@ -76,9 +48,12 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop_todo.yml"
+- ".ruby-version"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - README.md
+- Rakefile
 - bin/evva
 - changelog.md
 - evva.gemspec
@@ -86,7 +61,6 @@ files:
 - lib/evva.rb
 - lib/evva/android_generator.rb
 - lib/evva/config.rb
-- lib/evva/data_source.rb
 - lib/evva/file_reader.rb
 - lib/evva/google_sheet.rb
 - lib/evva/logger.rb
@@ -97,14 +71,12 @@ files:
 - lib/evva/version.rb
 - rubocop.yml
 - spec/evva_spec.rb
-- spec/fixtures/sample_public_enums.html
-- spec/fixtures/sample_public_info.html
-- spec/fixtures/sample_public_people_properties.html
-- spec/fixtures/sample_public_sheet.html
+- spec/fixtures/sample_public_enums.csv
+- spec/fixtures/sample_public_events.csv
+- spec/fixtures/sample_public_people_properties.csv
 - spec/fixtures/test.yml
 - spec/lib/evva/android_generator_spec.rb
 - spec/lib/evva/config_spec.rb
-- spec/lib/evva/data_source_spec.rb
 - spec/lib/evva/google_sheet_spec.rb
 - spec/lib/evva/logger_spec.rb
 - spec/lib/evva/object_extension_spec.rb
@@ -129,8 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: An event generating service