rudder_analytics_sync 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5726304487704b78e0e4af5710528e3b065b590a
-  data.tar.gz: 33ff76d7d2fcec35e640908472061a683061afcd
+  metadata.gz: e0cedeea6bd334e5d9740396e2076f2d7562acd7
+  data.tar.gz: d4d84573ed8d38feb37addf83f2d1f63d063a9b2
 SHA512:
-  metadata.gz: 53e11d8490d9184c53d791e8f38dbeb8c262137d4732ccc405a6e999bb2b52c6bf9396b881d2dc476380a364f3f9d36b286eee1687208ccb73feaf2ca56f681a
-  data.tar.gz: 31790054a46185fcbdb96b721cdd58af13f687cf71d839ef36d6f6bb4fbe0215d6baf7d833e25a3db9bdd4e698c77cd593134e39e4dd4e5a79e33f103b2ace76
+  metadata.gz: dc32266bd0dcef218ccc61d3ebb443da965c4d14e74b877aeb1e4b3a733c63c0f204968ce730138a32ffa758834081ac1aa14192d26ab3eb9960ee5328e6457d
+  data.tar.gz: 5c1e78aa055457d7611ceecc1d59d051abe46227ae9998981084f7f429cbef8c3d04dab3a8c7e31760efdeaf8ec6f858fde5b666bfe7bf601bcf070b7924d7fa

data/example/example.rb

@@ -1,29 +1,44 @@
-$LOAD_PATH << './lib/rudder_analytics_sync'
-
 require 'rudder_analytics_sync'
 
 include RudderAnalyticsSync
 
 analytics = RudderAnalyticsSync::Client.new(
-  write_key: 'YOUR_WRITE_KEY', # required
-  data_plane_url: 'https://a14c63e1.ngrok.io',
+  write_key: '1aJDXU7xlQpUp6qW1ppTJTvkgSi', # required
+  data_plane_url: 'https://86143ed0.ngrok.io',
   on_error: proc { |error_code, error_body, exception, response|
     # defaults to an empty proc
   }
 )
 
-analytics.track(
-  user_id: 'test_user_id',
-  event: 'Created Account'
-)
+# analytics.track(
+#   user_id: 'test_user_id',
+#   event: 'Created Account'
+# )
 
 analytics.batch do |batch|
   batch.track(
     user_id: 'test_user_id',
     event: 'Created Account'
   )
+  batch.page(
+    user_id: 'test_user_id',
+    name: 'Created Account',
+    properties: {
+      k1: 'v1'
+    }
+  )
   batch.track(
     user_id: 'test_user_id',
     event: 'Closed Account'
   )
+  batch.identify(
+    user_id: 'test_user_id_1',
+    traits: {
+      name: 'test'
+    }
+  )
+  batch.group(
+    user_id: 'test_user_id',
+    group_id: 'group_id'
+  )
 end

data/lib/rudder_analytics_sync/batch.rb

@@ -56,7 +56,7 @@ module RudderAnalyticsSync
     def add(operation_class, options, action)
       operation = operation_class.new(client, symbolize_keys(options))
       operation_payload = operation.build_payload
-      operation_payload[:action] = action
+      operation_payload[:type] = action
       payload[:batch] << operation_payload
     end
   end

data/lib/rudder_analytics_sync/operations/identify.rb

@@ -8,9 +8,11 @@ module RudderAnalyticsSync
       end
 
       def build_payload
-        base_payload.merge(
+        merged_payload = base_payload.merge(
           traits: options[:traits] && isoify_dates!(options[:traits])
         )
+        merged_payload[:context][:traits] = merged_payload[:context][:traits].merge(options[:traits])
+        merged_payload
       end
     end
   end

data/lib/rudder_analytics_sync/operations/operation.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'rudder_analytics_sync./utils'
+
 module RudderAnalyticsSync
   module Operations
     class Operation
@@ -9,6 +11,9 @@ module RudderAnalyticsSync
         library: {
           name: 'rudder-sdk-ruby-sync',
           version: RudderAnalyticsSync::VERSION
+        },
+        traits: {
+
         }
       }.freeze
 
@@ -28,15 +33,23 @@ module RudderAnalyticsSync
 
       def base_payload
         check_identity!
-        current_time = Time.now
+        current_time = Time.now.utc
+
+        anonymous_id = options[:anonymous_id] || uid()
+        context[:traits] = (context[:traits] || {}) && {
+          anonymousId: anonymous_id,
+          userId: options[:user_id] 
+        }
 
         {
           userId: options[:user_id],
-          anonymousId: options[:anonymous_id],
+          anonymousId: anonymous_id,
           context: context,
-          integrations: options[:integrations],
-          timestamp: timestamp(options.fetch(:timestamp, current_time)),
-          sentAt: current_time.iso8601
+          integrations: options[:integrations] || {All: true},
+          timestamp: maybe_datetime_in_iso8601(options[:timestamp] || Time.now.utc),
+          sentAt: maybe_datetime_in_iso8601(current_time),
+          messageId: uid(),
+          properties: options[:properties] || {}
         }
       end
 
@@ -44,14 +57,6 @@ module RudderAnalyticsSync
         raise ArgumentError, 'user_id or anonymous_id must be present' \
           unless options[:user_id] || options[:anonymous_id]
       end
-
-      def timestamp(timestamp)
-        if timestamp.respond_to?(:iso8601)
-          timestamp.iso8601
-        else
-          Time.iso8601(timestamp).iso8601
-        end
-      end
     end
   end
 end

data/lib/rudder_analytics_sync/operations/page.rb

@@ -12,7 +12,7 @@ module RudderAnalyticsSync
 
         base_payload.merge(
           name: options[:name],
-          properties: properties
+          properties: properties || {}
         )
       end
     end

data/lib/rudder_analytics_sync/operations/track.rb

@@ -15,7 +15,7 @@ module RudderAnalyticsSync
 
         base_payload.merge(
           event: options[:event],
-          properties: properties
+          properties: properties || {}
         )
       end
     end

data/lib/rudder_analytics_sync/utils.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'securerandom'
+
 module RudderAnalyticsSync
   module Utils
     def self.included(klass)
@@ -27,17 +29,47 @@ module RudderAnalyticsSync
       end
     end
 
-    def maybe_datetime_in_iso8601(prop)
-      case prop
-      when Time
-        prop.iso8601(3)
-      when DateTime
-        prop.to_time.iso8601(3)
-      when Date
-        prop.strftime('%F')
-      else
-        prop
+    # public: Returns a uid string
+    #
+    def uid
+        arr = SecureRandom.random_bytes(16).unpack('NnnnnN')
+        arr[2] = (arr[2] & 0x0fff) | 0x4000
+        arr[3] = (arr[3] & 0x3fff) | 0x8000
+        '%08x-%04x-%04x-%04x-%04x%08x' % arr
+    end
+
+    def maybe_datetime_in_iso8601(datetime)
+      case datetime
+        when Time
+          time_in_iso8601 datetime
+        when DateTime
+          time_in_iso8601 datetime.to_time
+        when Date
+          date_in_iso8601 datetime
+        else
+          datetime
       end
     end
+
+    def time_in_iso8601(time, fraction_digits = 3)
+      fraction = (('.%06i' % time.usec)[0, fraction_digits + 1] if fraction_digits > 0)
+
+      "#{time.strftime('%Y-%m-%dT%H:%M:%S')}#{fraction}#{formatted_offset(time, true, 'Z')}"
+    end
+
+    def date_in_iso8601(date)
+      date.strftime('%F')
+    end
+
+    def formatted_offset(time, colon = true, alternate_utc_string = nil)
+      time.utc? && alternate_utc_string || seconds_to_utc_offset(time.utc_offset, colon)
+    end
+
+    def seconds_to_utc_offset(seconds, colon = true)
+      (colon ? UTC_OFFSET_WITH_COLON : UTC_OFFSET_WITHOUT_COLON) % [(seconds < 0 ? '-' : '+'), (seconds.abs / 3600), ((seconds.abs % 3600) / 60)]
+    end
+
+    UTC_OFFSET_WITH_COLON = '%s%02d:%02d'
+    UTC_OFFSET_WITHOUT_COLON = UTC_OFFSET_WITH_COLON.sub(':', '')
   end
 end

data/lib/rudder_analytics_sync/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RudderAnalyticsSync
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rudder_analytics_sync
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - RudderStack