statsig 1.4.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ac164a57fadf37c1c9ce2b978df30da43901cc3b53e03e1b3e52a72e19981cb
-  data.tar.gz: aad0387cd6a80bfd3cbf501118466f444790ec387b45a96d562a3256331ae034
+  metadata.gz: a7fc845aabeb9119437279ba79db3970aecf676229ea36c0fd5af08186cb87af
+  data.tar.gz: d81e0e6b0ae19959b95bfbd56d0dfb55c8baaab0bfa393a099e84226bb5a8fb5
 SHA512:
-  metadata.gz: f7eeefd82a45217becadee9783d2616de5e6997d29236fecea526947a34e54f921125fbf018f57a1fbf2f7560c00d80721f632a9498e0f065b6914b035beef5f
-  data.tar.gz: 24b8c55535b7656109b669d898351e536953c83ecc6858e94eabacbdb36f8c9e600b55bb9cd06fc8b043a84305f351e645c07a673a85c1688668de6181c125f3
+  metadata.gz: 1d9d50f2f01599da2d6a5694c049e4a9ff1caca997563d69849588068e8505878678c5bbc7d8be2b7f887eb1ce36acea6e0f465246f4ce77117860ce77c34f7c
+  data.tar.gz: e3da88258f99e6579a9b07cd0a5d715587a56dc78b0c99cc490a52d0a12962bb7a74c783458b8cf85f497cf92d74b75a5eca9ae3053a37a84cfb5609b8252067

data/lib/evaluator.rb

@@ -84,10 +84,10 @@ class Evaluator
       return $fetch_from_server if other_gate_result == $fetch_from_server
       return type == 'pass_gate' ? other_gate_result.gate_value : !other_gate_result.gate_value
     when 'ip_based'
-      value = get_value_from_user(user, field) || get_value_from_ip(user&.value_lookup['ip'], field)
+      value = get_value_from_user(user, field) || get_value_from_ip(user, field)
       return $fetch_from_server if value == $fetch_from_server
     when 'ua_based'
-      value = get_value_from_user(user, field) || get_value_from_ua(user&.value_lookup['userAgent'], field)
+      value = get_value_from_user(user, field) || get_value_from_ua(user, field)
       return $fetch_from_server if value == $fetch_from_server
     when 'user_field'
       value = get_value_from_user(user, field)
@@ -177,13 +177,22 @@ class Evaluator
 
     user_lookup_table = user&.value_lookup
     return nil unless user_lookup_table.is_a?(Hash)
-    return user_lookup_table[field.downcase] if user_lookup_table.has_key?(field.downcase)
+    return user_lookup_table[field.downcase] if user_lookup_table.has_key?(field.downcase) && !user_lookup_table[field.downcase].nil?
 
     user_custom = user_lookup_table['custom']
-    return nil unless user_custom.is_a?(Hash)
-    user_custom.each do |key, value|
-      return value if key.downcase.casecmp?(field.downcase)
+    if user_custom.is_a?(Hash)
+      user_custom.each do |key, value|
+        return value if key.downcase.casecmp?(field.downcase) && !value.nil?
+      end
+    end
+
+    private_attributes = user_lookup_table['privateAttributes']
+    if private_attributes.is_a?(Hash)
+      private_attributes.each do |key, value|
+        return value if key.downcase.casecmp?(field.downcase) && !value.nil?
+      end
     end
+
     nil
   end
 
@@ -197,17 +206,19 @@ class Evaluator
     nil
   end
 
-  def get_value_from_ip(ip, field)
-    return nil unless ip.is_a?(String) && field.is_a?(String)
+  def get_value_from_ip(user, field)
+    return nil unless user.is_a?(StatsigUser) && field.is_a?(String) && field.downcase == 'country'
+    ip = get_value_from_user(user, 'ip')
+    return nil unless ip.is_a?(String)
 
-    if field.downcase != 'country'
-      return $fetch_from_server
-    end
     CountryLookup.lookup_ip_string(ip)
   end
 
-  def get_value_from_ua(ua, field)
-    return nil unless ua.is_a?(String) && field.is_a?(String)
+  def get_value_from_ua(user, field)
+    return nil unless user.is_a?(StatsigUser) && field.is_a?(String)
+    ua = get_value_from_user(user, 'userAgent')
+    return nil unless ua.is_a?(String)
+
     parsed = @ua_parser.parse ua
     os = parsed.os
     case field.downcase

data/lib/network.rb

@@ -39,7 +39,7 @@ class Network
 
   def check_gate(user, gate_name)
     begin
-      request_body = JSON.generate({'user' => user&.serialize, 'gateName' => gate_name})
+      request_body = JSON.generate({'user' => user&.serialize(false), 'gateName' => gate_name})
       response = post_helper('check_gate', request_body)
       return JSON.parse(response.body) unless response.nil?
       false
@@ -50,7 +50,7 @@ class Network
 
   def get_config(user, dynamic_config_name)
     begin
-      request_body = JSON.generate({'user' => user&.serialize, 'configName' => dynamic_config_name})
+      request_body = JSON.generate({'user' => user&.serialize(false), 'configName' => dynamic_config_name})
       response = post_helper('get_config', request_body)
       return JSON.parse(response.body) unless response.nil?
       nil

data/lib/statsig_driver.rb

@@ -96,7 +96,7 @@ class StatsigDriver
     user = normalize_user(user)
 
     event = StatsigEvent.new(event_name)
-    event.user = user&.serialize
+    event.user = user
     event.value = value
     event.metadata = metadata
     event.statsig_metadata = @statsig_metadata

data/lib/statsig_event.rb

@@ -1,15 +1,22 @@
 class StatsigEvent
   attr_accessor :value
-  attr_accessor :user
   attr_accessor :metadata
   attr_accessor :statsig_metadata
+  attr_reader :user
+
   def initialize(event_name)
     @event_name = event_name
     @time = Time.now.to_f * 1000
   end
 
+  def user=(value)
+    if value.is_a?(StatsigUser)
+      @user = value.serialize(true)
+    end
+  end
+
   def serialize
-    return {
+    {
       'eventName' => @event_name,
       'metadata' => @metadata,
       'value' => @value,

data/lib/statsig_user.rb

@@ -7,6 +7,7 @@ class StatsigUser
   attr_accessor :locale
   attr_accessor :app_version
   attr_accessor :statsig_environment
+  attr_accessor :private_attributes
 
   def custom
     @custom
@@ -29,11 +30,12 @@ class StatsigUser
       @app_version = user_hash['appVersion'] || user_hash['app_version']
       @custom = user_hash['custom']
       @statsig_environment = user_hash['statsigEnvironment']
+      @private_attributes = user_hash['privateAttributes']
     end
   end
 
-  def serialize
-    {
+  def serialize(for_logging)
+    hash = {
       'userID' => @user_id,
       'email' => @email,
       'ip' => @ip,
@@ -43,7 +45,12 @@ class StatsigUser
       'appVersion' => @app_version,
       'custom' => @custom,
       'statsigEnvironment' => @statsig_environment,
+      'privateAttributes' => @private_attributes,
     }
+    if for_logging
+      hash.delete('privateAttributes')
+    end
+    hash
   end
 
   def value_lookup
@@ -62,6 +69,7 @@ class StatsigUser
       'appversion' => @app_version,
       'app_version' => @app_version,
       'custom' => @custom,
+      'privateAttributes' => @private_attributes,
     }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: statsig
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Statsig, Inc
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-13 00:00:00.000000000 Z
+date: 2021-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler