ios_analytics_cli 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 742e4b9954f42b271ec0246bac1e78f631e1dacf42842bfb4ac546a78de0b671
-  data.tar.gz: cacdf2b27199979a425b8ef9d258154dfdbba9d04d095e0c05eaef38b3e86a57
+  metadata.gz: 226df51f12f74d23073d582bc4956e17e25263cc71aa03cbec6f645bc83d65a2
+  data.tar.gz: 928dc2da2653834f98fc91264620c007d86d875752869705490a3d8942d1e5cd
 SHA512:
-  metadata.gz: 27ef1d26da04b88563c1688609c6ba47b4306cec0e92d0900cf7a0625aff6530094b8f7e101c40ec613e1c0b13418ad1b438093d6c1ff71c2d9792fb8b222d10
-  data.tar.gz: 75abaae748ef29ffb3bc33a97a2fc83d0f01468d79fd1ae138eb45eea4ba33472fd264076328f9f81aab9484343a8f559c3769984249cae126e92cfe4bf58d92
+  metadata.gz: 6b16786b2873cf5f4826cb029bc2c30e33c9f8e47ea390e9e0f5521649981188775450d1c307c8eff0bc841ae4349b14ceeb5d5297e6369dfc699d9e07fb3888
+  data.tar.gz: 3eb2372f3fe295e7f9a3ba0dae3feafc03109915bfe1790840870ee5815e392beb21ad41e54309e6481bb12ee2665be9014f9b4a7f0f4b648c040c53c7df449a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ios_analytics_cli (1.0.0)
+    ios_analytics_cli (1.1.0)
       commander (~> 4.5.2)
       tty-prompt (~> 0.21.0)
 

data/README.md

@@ -16,7 +16,7 @@ This will ask you which programming language You're using & where do You want to
 Results will be stored in `analytics.yml` file.
 
 
-After that, place Your JSON file in the directory that You provided when running `analytics init`. If You're not sure where it is, check `analytics.yml` file for `sourcePath` field.
+After that, place Your JSON file in the directory that you provided when running `analytics init`. If You're not sure where it is, check `analytics.yml` file for `sourcePath` field.
 
 After You prepared the JSON file, run
 

data/lib/ios_analytics_cli/info.rb

@@ -7,7 +7,7 @@ module Analytics
 
   def self.description
     <<-Desc
-    This gem is develop in order to reduce the time needed to even start with the implementation of Analytics in iOS apps,
+    This gem is developed in order to reduce the time needed to even start with the implementation of Analytics in iOS apps,
     by generating files, classes, methods & everything else that\'s required to call a specific event, change a user property,
     or even track an open screen. By calling just 2 commands, analytics init & analytics generate,
     all of these are generated for You from the appropriately configured JSON file.

data/lib/ios_analytics_cli/interactors/event.rb

@@ -3,19 +3,21 @@ require 'tty-prompt'
 module Analytics
   module Interactor
     class Event
-      # Returns all properties, from all events, which uses an enum as the value.
       def self.all_enum_properties(events)
         events
-          .reject { |event| event['properties'].nil? }
-          .flat_map { |event| event['properties'] }
-          .reject { |property| property['values'].nil? }
+        .map { |event| event.dup }
+        .reject { |event| event['properties'].nil? }
+        .each do | event|
+          event['properties'] = event['properties'].reject { |property| property['values'].nil? }
+        end
       end
 
       def self.enum_properties_from_event(event)
-        properties = event['properties']
-        return nil if properties.nil?
+        event_copy = event.dup
+        return nil if event_copy['properties'].nil?
 
-        properties.reject { |property| property['values'].nil? }
+        event_copy['properties'] = event_copy['properties'].reject { |property| property['values'].nil? }
+        event_copy
       end
     end
   end

data/lib/ios_analytics_cli/interactors/user_property.rb

@@ -5,7 +5,9 @@ module Analytics
     class UserProperty
       # Returns all user properties which uses an enum as the value.
       def self.all_enum_user_properties(user_properties)
-        user_properties.reject { |up| up['values'].nil? }
+        user_properties
+        .map { |up| up.dup }
+        .reject { |up| up['values'].nil? }
       end
     end
   end

data/lib/ios_analytics_cli/serializers/objc/enums.rb

@@ -33,8 +33,9 @@ module Analytics
             NS_ASSUME_NONNULL_BEGIN
 
             #pragma mark - Analytics Event Enums (AE)
-            <% Interactor::Event.all_enum_properties(@src['events']).each do |property| -%>
-            <% @enum_name = 'AE' + property['name'].pascal_case -%>
+            <% Interactor::Event.all_enum_properties(@src['events']).each do |event| -%>
+            <% event['properties'].each do |property| -%>
+            <% @enum_name = 'AE' + event['name'].pascal_case + property['name'].pascal_case -%>
 
             __swift_unavailable("This enum is only available in ObjC.")
             typedef NS_CLOSED_ENUM(NSInteger, <%= @enum_name %>) {
@@ -43,7 +44,7 @@ module Analytics
             <% end -%>
             };
             <% end -%>
-
+            <% end -%>
 
             #pragma mark - Analytics User Property Enums (AUP)
             <% Interactor::UserProperty.all_enum_user_properties(@src['userProperties']).each do |property| -%>

data/lib/ios_analytics_cli/serializers/objc/event.rb

@@ -54,7 +54,7 @@ module Analytics
             <% event['properties'].each do |property| -%>
             /// @param <%= property['name'].camel_case %> <%= property['description'] %>
             <% end -%>
-            + (instancetype)<%= event["name"].camel_case -%><%= format_method_params(event['properties']) %>;
+            + (instancetype)<%= event['name'].camel_case -%><%= format_method_params(event) %>;
             <% end %>
             <% end -%>
             @end
@@ -93,13 +93,13 @@ module Analytics
                 return [[self alloc] initWithName:@"<%= event['name'] %>" properties: nil];
             }
             <% else -%>
-            + (instancetype)<%= event['name'].camel_case -%><%= format_method_params(event['properties']) %>
+            + (instancetype)<%= event['name'].camel_case -%><%= format_method_params(event) %>
             {
-            <% Interactor::Event.enum_properties_from_event(event).each do |property| -%>
+            <% Interactor::Event.enum_properties_from_event(event)['properties'].each do |property| -%>
                 NSString *<%= property['name'].camel_case %>Value;
                 switch (<%= property['name'].camel_case %>) {
             <% property['values'].each do |value| -%>
-                    case <%= 'AE' + property['name'].pascal_case + value.pascal_case %>:
+                    case <%= 'AE' + event['name'].pascal_case + property['name'].pascal_case + value.pascal_case %>:
                         <%= property['name'].camel_case %>Value = @"<%= value %>";
                         break;
             <% end -%>
@@ -118,22 +118,22 @@ module Analytics
         ## Helper methods called from the ERB template
 
         # Formats the parameters in ObjC method.
-        def format_method_params(properties)
-          params = properties.map.with_index do |property, i|
+        def format_method_params(event)
+          params = event['properties'].map.with_index do |property, i|
             name = if i == 0
                      property['name'].pascal_case # 'num_of_items' -> 'NumOfItems'
                    else
                      property['name'].camel_case # 'num_of_items' -> 'numOfItems'
                    end
 
-            "#{name}:(#{format_property_type(property)})#{property['name'].camel_case}"
+            "#{name}:(#{format_property_type_from_event(property, event)})#{property['name'].camel_case}"
           end
 
           "With#{params.join(' ')}"
         end
 
         # Maps the property type to ObjC type.
-        def format_property_type(property)
+        def format_property_type_from_event(property, event)
           # if it doesn't have values, it's not an enum,
           # and if it does, we'll return capitalized property name prefixed with 'AE',
           # because an enum with the same name will be generated as well
@@ -149,7 +149,7 @@ module Analytics
               'unknown-type'
             end
           else
-            'AE' + property['name'].pascal_case
+            'AE' + event['name'].pascal_case + property['name'].pascal_case
           end
         end
 

data/lib/ios_analytics_cli/serializers/swift/event.rb

@@ -52,7 +52,7 @@ module Analytics
                 <% event["properties"].each do |property| -%>
             /// - Parameter <%= property["name"] %>: <%= property["description"] %>
                 <% end -%>
-            static func <%= event["name"].camel_case %>(<%= format_method_params(event["properties"])-%>) -> Analytics.Event {
+            static func <%= event['name'].camel_case %>(<%= format_method_params(event)-%>) -> Analytics.Event {
                     return .init(name: "<%= event["name"] %>", properties: <%= format_init_properties(event["properties"]) %>)
                 }
                 <% end -%>
@@ -62,15 +62,17 @@ module Analytics
             // MARK: - Event Property Enums
 
             extension Analytics.Event {
-            <% Interactor::Event.all_enum_properties(@src['events']).each do |property| -%>
+            <% Interactor::Event.all_enum_properties(@src['events']).each do |event| -%>
+            <% event['properties'].each do |property| -%>
 
-                /// <%= property["description"] %>
-                enum <%= property["name"].pascal_case -%>: String {
+                /// <%= property['description'] %>
+                enum <%= event['name'].pascal_case + property['name'].pascal_case -%>: String {
                 <% property["values"].each do |value| -%>
                 case <%= value.camel_case -%> = "<%= value %>"
                 <% end -%>
             }
             <% end -%>
+            <% end -%>
             }
           TEMPLATE
         end
@@ -78,16 +80,16 @@ module Analytics
         ## Helper methods called from the ERB template
 
         # Formats the parameters in Swift method.
-        def format_method_params(properties)
-          result = properties.map do |property|
-            "#{property['name'].camel_case}: #{format_property_type(property)}"
+        def format_method_params(event)
+          result = event['properties'].map do |property|
+            "#{property['name'].camel_case}: #{format_property_type_from_event(property, event)}"
           end
 
           return result.join(', ')
         end
 
         # Maps the property type to Swift type.
-        def format_property_type(property)
+        def format_property_type_from_event(property, event)
           # if it doesn't have values, it's not an enum,
           # and if it does, we'll return capitalized property name,
           # because an enum with the same name will be generated as well
@@ -103,7 +105,7 @@ module Analytics
               'unknown-type'
             end
           else
-            property['name'].pascal_case
+            event['name'].pascal_case + property['name'].pascal_case
           end
         end
 

data/lib/ios_analytics_cli/version.rb

@@ -1,4 +1,4 @@
 module Analytics
   # Current gem's version.
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.1.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ios_analytics_cli
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Mario Galijot
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-26 00:00:00.000000000 Z
+date: 2020-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.21.0
 description: |2
-      This gem is develop in order to reduce the time needed to even start with the implementation of Analytics in iOS apps,
+      This gem is developed in order to reduce the time needed to even start with the implementation of Analytics in iOS apps,
       by generating files, classes, methods & everything else that's required to call a specific event, change a user property,
       or even track an open screen. By calling just 2 commands, analytics init & analytics generate,
       all of these are generated for You from the appropriately configured JSON file.