airship-ruby 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac94177d71469e596c7ffb61a4c5c1eee838f196
-  data.tar.gz: 7d10788fa32c0e7cb90b797ef11dd77a3efd8a93
+  metadata.gz: 577e120e2dd12d0d8d355f21adfe8d2bf93145c7
+  data.tar.gz: 563b3918684b1be0d36dc40642a8257fd90fc40c
 SHA512:
-  metadata.gz: 8b53ba8664daa2506ce385cf94465a18366bdfc3cb0cab132a457708ed81e46756878f358910765db60d08cdbb0d70163d39fd4167379eb5f4e06348860a9b23
-  data.tar.gz: 0c759743a09c30112e1f01ea942d222330641cd5b6993fdf81725f0d8e9763a7ac0705d18eeeb7630324a4d732a383c20d66bf499d43e2fbb8af7375d582503a
+  metadata.gz: 94df167af112babb0fd21241767a8c4d21339b16e91dbbeea280517f082a25391fea23608979a79af2c1f7313cbe711f1d08d637325c82a82fae17119cd2443f
+  data.tar.gz: 6f20a23eabb5b79d0b5b0be0078605035197a58c7b3712b922770ea6bebbd843429e868fcbce12e5867ac0b53331fb15919fc3b1c279c43550ac84f2275d92c7

data/airship-ruby.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = "airship-ruby"
-  s.version     = "1.1.2"
+  s.version     = "1.1.3"
   s.licenses    = ["MIT"]
   s.summary     = "Airship Ruby SDK"
   s.description = "Ruby SDK"

data/lib/airship-ruby.rb

@@ -21,7 +21,7 @@ class Airship
         "type" => "boolean",
       },
       "id" => {
-        "type" => "string",
+        "type" => ["string", "integer"],
         "maxLength" => 250,
         "minLength" => 1,
       },
@@ -64,7 +64,7 @@ class Airship
             "enum" => [true],
           },
           "id" => {
-            "type" => "string",
+            "type" => ["string", "integer"],
             "maxLength" => 250,
             "minLength" => 1,
           },
@@ -99,7 +99,7 @@ class Airship
         "additionalProperties" => false,
       },
     },
-    "required" => ["type", "id", "display_name"],
+    "required" => ["id", "display_name"],
     "additionalProperties" => false,
   }
 
@@ -177,7 +177,7 @@ class Airship
     @gate_stats_upload_batch_interval = 60
 
     @gate_stats_watcher = nil
-    @gate_stats_last_task_scheduled_timestamp = Concurrent::AtomicFixnum.new(0)
+    @gate_stats_last_task_scheduled_timestamp = 0
 
     @gate_stats_uploader_tasks = []
 
@@ -215,7 +215,11 @@ class Airship
 
     object = self._clone_object(object)
 
-    error = self._validate_nesting(object)
+    if object['type'].nil?
+      object['type'] = 'User'
+    end
+
+    error = self._validate_nesting(object) || self._maybe_transform_id(object)
 
     if !error.nil?
       puts error
@@ -247,6 +251,12 @@ class Airship
       stats['sdk_gate_control_short_name'] = control_short_name
       stats['sdk_gate_timestamp'] = sdk_gate_timestamp
       stats['sdk_gate_latency'] = sdk_gate_latency
+
+      stats['sdk_gate_value'] = is_enabled
+      stats['sdk_gate_variation'] = variation
+      stats['sdk_gate_eligibility'] = is_eligible
+      stats['sdk_gate_type'] = 'value'
+
       stats['sdk_version'] = sdk_version
       stats['sdk_id'] = @@sdk_id
 
@@ -267,7 +277,11 @@ class Airship
 
     object = self._clone_object(object)
 
-    error = self._validate_nesting(object)
+    if object['type'].nil?
+      object['type'] = 'User'
+    end
+
+    error = self._validate_nesting(object) || self._maybe_transform_id(object)
 
     if !error.nil?
       puts error
@@ -299,6 +313,12 @@ class Airship
       stats['sdk_gate_control_short_name'] = control_short_name
       stats['sdk_gate_timestamp'] = sdk_gate_timestamp
       stats['sdk_gate_latency'] = sdk_gate_latency
+
+      stats['sdk_gate_value'] = is_enabled
+      stats['sdk_gate_variation'] = variation
+      stats['sdk_gate_eligibility'] = is_eligible
+      stats['sdk_gate_type'] = 'variation'
+
       stats['sdk_version'] = sdk_version
       stats['sdk_id'] = @@sdk_id
 
@@ -319,7 +339,11 @@ class Airship
 
     object = self._clone_object(object)
 
-    error = self._validate_nesting(object)
+    if object['type'].nil?
+      object['type'] = 'User'
+    end
+
+    error = self._validate_nesting(object) || self._maybe_transform_id(object)
 
     if !error.nil?
       puts error
@@ -351,6 +375,12 @@ class Airship
       stats['sdk_gate_control_short_name'] = control_short_name
       stats['sdk_gate_timestamp'] = sdk_gate_timestamp
       stats['sdk_gate_latency'] = sdk_gate_latency
+
+      stats['sdk_gate_value'] = is_enabled
+      stats['sdk_gate_variation'] = variation
+      stats['sdk_gate_eligibility'] = is_eligible
+      stats['sdk_gate_type'] = 'eligibility'
+
       stats['sdk_version'] = sdk_version
       stats['sdk_id'] = @@sdk_id
 
@@ -409,6 +439,11 @@ class Airship
     end
     if response.status == 200
       gating_info = JSON.parse(response.body)
+
+      if gating_info['server_info'] == 'maintenance'
+        return
+      end
+
       gating_info_map = self._get_gating_info_map(gating_info)
       @gating_info = gating_info
       @gating_info_map = gating_info_map
@@ -424,10 +459,10 @@ class Airship
   def _create_watcher
     Concurrent::TimerTask.new(execution_interval: @gate_stats_upload_batch_interval, timeout_interval: 10) do |task|
       now = Time.now.utc.to_i
-      if now - @gate_stats_last_task_scheduled_timestamp.value >= @gate_stats_upload_batch_interval
+      if now - @gate_stats_last_task_scheduled_timestamp >= @gate_stats_upload_batch_interval
         processed = self._process_batch(0)
         if processed
-          @gate_stats_last_task_scheduled_timestamp.value = now
+          @gate_stats_last_task_scheduled_timestamp = now
         end
       end
     end
@@ -482,7 +517,7 @@ class Airship
     processed = self._process_batch(@max_gate_stats_batch_size - 1, gate_stats)
     if processed
       now = Time.now.utc.to_i
-      @gate_stats_last_task_scheduled_timestamp.value = now
+      @gate_stats_last_task_scheduled_timestamp = now
     end
   end
 
@@ -605,6 +640,7 @@ class Airship
         return false
       end
     elsif attribute_type == OBJECT_ATTRIBUTE_TYPE_DATETIME
+      # to_time.to_i respects timezones
       unix_timestamp = nil
       begin
         unix_timestamp = DateTime.parse(attribute_val).to_time.to_i
@@ -655,6 +691,7 @@ class Airship
     end
 
     sampled_inside_base_population = false
+    is_eligible = false
     control_info['rule_sets'].each do |rule_set|
       if sampled_inside_base_population
         break
@@ -672,6 +709,7 @@ class Airship
       end
 
       if satisfies_all_rules
+        is_eligible = true
         hash_key = "SAMPLING:control_#{control_info['id']}:env_#{@gating_info['env']['id']}:rule_set_#{rule_set['id']}:client_object_#{object['type']}_#{object['id']}"
         if Airship.get_hashed_value(hash_key) <= rule_set['sampling_percentage']
           sampled_inside_base_population = true
@@ -683,7 +721,7 @@ class Airship
       return {
         'is_enabled' => false,
         'variation' => nil,
-        'is_eligible' => false,
+        'is_eligible' => is_eligible,
       }
     end
 
@@ -883,4 +921,31 @@ class Airship
       return 'A group cannot be nested inside another group'
     end
   end
+
+  def _maybe_transform_id(object)
+    if object['id'].is_a?(Integer)
+      id_str = object['id'].to_s
+      if id_str.length > 250
+        return 'Integer id must have 250 digits or less'
+      end
+      object['id'] = id_str
+    end
+
+    group = nil
+    if !object['group'].nil?
+      group = object['group']
+    end
+
+    if !group.nil?
+      if group['id'].is_a?(Integer)
+        id_str = group['id'].to_s
+        if id_str.length > 250
+          return 'Integer id must have 250 digits or less'
+        end
+        group['id'] = id_str
+      end
+    end
+
+    nil
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: airship-ruby
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Airship Dev Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-23 00:00:00.000000000 Z
+date: 2018-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday