airship-ruby 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 451b81bcd103d63b142bb998ce9cacc7b72acc79
-  data.tar.gz: c9289079bc5ce81f7a440400e02c64ab0d3ca1af
+  metadata.gz: ac94177d71469e596c7ffb61a4c5c1eee838f196
+  data.tar.gz: 7d10788fa32c0e7cb90b797ef11dd77a3efd8a93
 SHA512:
-  metadata.gz: 08ce0abb7d336a23571ef2bbc2c6ce1ad05099123d62ca5f3668e16f6adc9459ae4210cae4fb39527401974ebbf6d5f17f51bc5b1220625b3b14b00310c54d72
-  data.tar.gz: 8be8a73b91a2278a48858cd7671d8dc2d79f3dcc5d23dcd3536654b4844dbbe2f440a6597a0e4c759418387517ad69fe2a2b573ceb8f2d8a7ed0a3bfc1217289
+  metadata.gz: 8b53ba8664daa2506ce385cf94465a18366bdfc3cb0cab132a457708ed81e46756878f358910765db60d08cdbb0d70163d39fd4167379eb5f4e06348860a9b23
+  data.tar.gz: 0c759743a09c30112e1f01ea942d222330641cd5b6993fdf81725f0d8e9763a7ac0705d18eeeb7630324a4d732a383c20d66bf499d43e2fbb8af7375d582503a

data/airship-ruby.gemspec

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

data/lib/airship-ruby.rb

@@ -169,6 +169,7 @@ class Airship
 
     @gating_info = nil
     @gating_info_downloader_task = nil
+    @gating_info_polling_interval = 60
 
     @gating_info_map = nil
 
@@ -182,12 +183,18 @@ class Airship
 
     @gate_stats_batch = []
 
+    @initialization_lock = Concurrent::Semaphore.new(1)
     @gate_stats_batch_lock = Concurrent::Semaphore.new(1)
   end
 
   def init
-    # Not thread safe yet
+    @initialization_lock.acquire
     if @gating_info_downloader_task.nil?
+      self._poll
+      if @gating_info.nil?
+        @initialization_lock.release
+        raise Exception.new('Failed to connect to Airship server')
+      end
       @gating_info_downloader_task = self._create_poller
       @gating_info_downloader_task.execute
     end
@@ -196,9 +203,167 @@ class Airship
       @gate_stats_watcher = self._create_watcher
       @gate_stats_watcher.execute
     end
-    # Thread safe after this point
+    @initialization_lock.release
+  end
+
+  def enabled?(control_short_name, object, default_value=false)
+    validation_errors = JSON::Validator.fully_validate(SCHEMA, object)
+    if validation_errors.size > 0
+      puts validation_errors[0]
+      return default_value
+    end
+
+    object = self._clone_object(object)
+
+    error = self._validate_nesting(object)
+
+    if !error.nil?
+      puts error
+      return default_value
+    end
+
+    if @gating_info_map.nil?
+      return default_value
+    end
+
+    gate_timestamp = Time.now.iso8601
+
+    start = Time.now
+
+    gate_values = self._get_gate_values(control_short_name, object)
+    is_enabled = gate_values['is_enabled']
+    variation = gate_values['variation']
+    is_eligible = gate_values['is_eligible']
+    _should_send_stats = gate_values['_should_send_stats']
+
+    finish = Time.now
+
+    if _should_send_stats
+      sdk_gate_timestamp = gate_timestamp
+      sdk_gate_latency = "#{(finish - start) * 1000 * 1000}us"
+      sdk_version = SDK_VERSION
+
+      stats = {}
+      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_version'] = sdk_version
+      stats['sdk_id'] = @@sdk_id
+
+      object['stats'] = stats
+
+      self._upload_stats_async(object)
+    end
+
+    return is_enabled
+  end
+
+  def variation(control_short_name, object, default_value=nil)
+    validation_errors = JSON::Validator.fully_validate(SCHEMA, object)
+    if validation_errors.size > 0
+      puts validation_errors[0]
+      return default_value
+    end
+
+    object = self._clone_object(object)
+
+    error = self._validate_nesting(object)
+
+    if !error.nil?
+      puts error
+      return default_value
+    end
+
+    if @gating_info_map.nil?
+      return default_value
+    end
+
+    gate_timestamp = Time.now.iso8601
+
+    start = Time.now
+
+    gate_values = self._get_gate_values(control_short_name, object)
+    is_enabled = gate_values['is_enabled']
+    variation = gate_values['variation']
+    is_eligible = gate_values['is_eligible']
+    _should_send_stats = gate_values['_should_send_stats']
+
+    finish = Time.now
+
+    if _should_send_stats
+      sdk_gate_timestamp = gate_timestamp
+      sdk_gate_latency = "#{(finish - start) * 1000 * 1000}us"
+      sdk_version = SDK_VERSION
+
+      stats = {}
+      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_version'] = sdk_version
+      stats['sdk_id'] = @@sdk_id
+
+      object['stats'] = stats
+
+      self._upload_stats_async(object)
+    end
+
+    return variation
+  end
+
+  def eligible?(control_short_name, object, default_value=false)
+    validation_errors = JSON::Validator.fully_validate(SCHEMA, object)
+    if validation_errors.size > 0
+      puts validation_errors[0]
+      return default_value
+    end
+
+    object = self._clone_object(object)
+
+    error = self._validate_nesting(object)
+
+    if !error.nil?
+      puts error
+      return default_value
+    end
+
+    if @gating_info_map.nil?
+      return default_value
+    end
+
+    gate_timestamp = Time.now.iso8601
+
+    start = Time.now
+
+    gate_values = self._get_gate_values(control_short_name, object)
+    is_enabled = gate_values['is_enabled']
+    variation = gate_values['variation']
+    is_eligible = gate_values['is_eligible']
+    _should_send_stats = gate_values['_should_send_stats']
+
+    finish = Time.now
+
+    if _should_send_stats
+      sdk_gate_timestamp = gate_timestamp
+      sdk_gate_latency = "#{(finish - start) * 1000 * 1000}us"
+      sdk_version = SDK_VERSION
+
+      stats = {}
+      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_version'] = sdk_version
+      stats['sdk_id'] = @@sdk_id
+
+      object['stats'] = stats
+
+      self._upload_stats_async(object)
+    end
+
+    return is_eligible
   end
 
+  protected
+
   def _get_gating_info_map(gating_info)
     map = {}
 
@@ -236,24 +401,28 @@ class Airship
     map
   end
 
+  def _poll
+    conn = Faraday.new(url: "#{GATING_INFO_ENDPOINT}/#{@env_key}")
+    response = conn.get do |req|
+      req.options.timeout = 10
+      req.headers['api-key'] = @api_key
+    end
+    if response.status == 200
+      gating_info = JSON.parse(response.body)
+      gating_info_map = self._get_gating_info_map(gating_info)
+      @gating_info = gating_info
+      @gating_info_map = gating_info_map
+    end
+  end
+
   def _create_poller
-    Concurrent::TimerTask.new(execution_interval: 60, timeout_interval: 10, run_now: true) do |task|
-      conn = Faraday.new(url: "#{GATING_INFO_ENDPOINT}/#{@env_key}")
-      response = conn.get do |req|
-        req.options.timeout = 10
-        req.headers['api-key'] = @api_key
-      end
-      if response.status == 200
-        gating_info = JSON.parse(response.body)
-        gating_info_map = self._get_gating_info_map(gating_info)
-        @gating_info = gating_info
-        @gating_info_map = gating_info_map
-      end
+    Concurrent::TimerTask.new(execution_interval: @gating_info_polling_interval, timeout_interval: 10) do |task|
+      self._poll
     end
   end
 
   def _create_watcher
-    Concurrent::TimerTask.new(execution_interval: @gate_stats_upload_batch_interval, timeout_interval: 10, run_now: true) do |task|
+    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
         processed = self._process_batch(0)
@@ -714,160 +883,4 @@ class Airship
       return 'A group cannot be nested inside another group'
     end
   end
-
-  def enabled?(control_short_name, object)
-    if @gating_info_map.nil?
-      return false
-    end
-
-    validation_errors = JSON::Validator.fully_validate(SCHEMA, object)
-    if validation_errors.size > 0
-      puts validation_errors[0]
-      return false
-    end
-
-    object = self._clone_object(object)
-
-    error = self._validate_nesting(object)
-
-    if !error.nil?
-      puts error
-      return false
-    end
-
-    gate_timestamp = Time.now.iso8601
-
-    start = Time.now
-
-    gate_values = self._get_gate_values(control_short_name, object)
-    is_enabled = gate_values['is_enabled']
-    variation = gate_values['variation']
-    is_eligible = gate_values['is_eligible']
-    _should_send_stats = gate_values['_should_send_stats']
-
-    finish = Time.now
-
-    if _should_send_stats
-      sdk_gate_timestamp = gate_timestamp
-      sdk_gate_latency = "#{(finish - start) * 1000 * 1000}us"
-      sdk_version = SDK_VERSION
-
-      stats = {}
-      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_version'] = sdk_version
-      stats['sdk_id'] = @@sdk_id
-
-      object['stats'] = stats
-
-      self._upload_stats_async(object)
-    end
-
-    return is_enabled
-  end
-
-  def variation(control_short_name, object)
-    if @gating_info_map.nil?
-      return nil
-    end
-
-    validation_errors = JSON::Validator.fully_validate(SCHEMA, object)
-    if validation_errors.size > 0
-      puts validation_errors[0]
-      return nil
-    end
-
-    object = self._clone_object(object)
-
-    error = self._validate_nesting(object)
-
-    if !error.nil?
-      puts error
-      return nil
-    end
-
-    gate_timestamp = Time.now.iso8601
-
-    start = Time.now
-
-    gate_values = self._get_gate_values(control_short_name, object)
-    is_enabled = gate_values['is_enabled']
-    variation = gate_values['variation']
-    is_eligible = gate_values['is_eligible']
-    _should_send_stats = gate_values['_should_send_stats']
-
-    finish = Time.now
-
-    if _should_send_stats
-      sdk_gate_timestamp = gate_timestamp
-      sdk_gate_latency = "#{(finish - start) * 1000 * 1000}us"
-      sdk_version = SDK_VERSION
-
-      stats = {}
-      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_version'] = sdk_version
-      stats['sdk_id'] = @@sdk_id
-
-      object['stats'] = stats
-
-      self._upload_stats_async(object)
-    end
-
-    return variation
-  end
-
-  def eligible?(control_short_name, object)
-    if @gating_info_map.nil?
-      return false
-    end
-
-    validation_errors = JSON::Validator.fully_validate(SCHEMA, object)
-    if validation_errors.size > 0
-      puts validation_errors[0]
-      return false
-    end
-
-    object = self._clone_object(object)
-
-    error = self._validate_nesting(object)
-
-    if !error.nil?
-      puts error
-      return false
-    end
-
-    gate_timestamp = Time.now.iso8601
-
-    start = Time.now
-
-    gate_values = self._get_gate_values(control_short_name, object)
-    is_enabled = gate_values['is_enabled']
-    variation = gate_values['variation']
-    is_eligible = gate_values['is_eligible']
-    _should_send_stats = gate_values['_should_send_stats']
-
-    finish = Time.now
-
-    if _should_send_stats
-      sdk_gate_timestamp = gate_timestamp
-      sdk_gate_latency = "#{(finish - start) * 1000 * 1000}us"
-      sdk_version = SDK_VERSION
-
-      stats = {}
-      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_version'] = sdk_version
-      stats['sdk_id'] = @@sdk_id
-
-      object['stats'] = stats
-
-      self._upload_stats_async(object)
-    end
-
-    return is_eligible
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: airship-ruby
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Airship Dev Team