airship-ruby 1.1.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ba8bb1d0a7ec6945ac66b4f62497df1f1243bbb
-  data.tar.gz: acef833736c39f744c3eb8205fac2dc5d6420279
+  metadata.gz: d64943505df97e925d93c86d754852868385b1b7
+  data.tar.gz: c6092d944cbdb7f09f8c69dca03646d629747a57
 SHA512:
-  metadata.gz: f603b44c73f6713c2731767575a61f77663f9e2b99b39385c1947e65be845b0db7f4880f79f45cfa3d30e187868e9d3e630a352eb16edf5c4b22e9e04f359350
-  data.tar.gz: aaa4a4301b68830d4944b3d3b28a184ac21e282250ec725fb45c184116794173fbb8c04ce16859b55573a24a1cb16cc68cbdcad8ca13cc7a2f99cd9446c713ca
+  metadata.gz: 0c21eaa03cde9ab5b96f799a25b4fa57611f6bdaa1b23257403b17a44ad4cde557f536581e93545ba63e9bf63bb3db25603ec5d559b72610935f75a6b7fd4c15
+  data.tar.gz: 7fffa2fec753f365d37028a235aa7760911d6b38abbdaa42f3a5fc75c6e81bbf1186a83f50b7d945bf59f3f45944ddc75e0d4442d44f3bb6adde418bbe0ced38

data/airship-ruby.gemspec

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

data/lib/airship-ruby.rb

@@ -98,11 +98,11 @@ class Airship
             "additionalProperties" => false,
           },
         },
-        "required" => ["id", "display_name"],
+        "required" => ["id"],
         "additionalProperties" => false,
       },
     },
-    "required" => ["id", "display_name"],
+    "required" => ["id"],
     "additionalProperties" => false,
   }
 
@@ -213,6 +213,8 @@ class Airship
   end
 
   def enabled?(control_short_name, object, default_value=false)
+    object = self._shallow_copy(object)
+
     validation_errors = JSON::Validator.fully_validate(SCHEMA, object)
     if validation_errors.size > 0
       puts validation_errors[0]
@@ -221,9 +223,7 @@ class Airship
 
     object = self._clone_object(object)
 
-    if object['type'].nil?
-      object['type'] = 'User'
-    end
+    self._maybe_add_fields(object)
 
     error = self._validate_nesting(object) || self._validate_anonymous(object) || self._maybe_transform_id(object)
 
@@ -277,6 +277,8 @@ class Airship
   end
 
   def variation(control_short_name, object, default_value=nil)
+    object = self._shallow_copy(object)
+
     validation_errors = JSON::Validator.fully_validate(SCHEMA, object)
     if validation_errors.size > 0
       puts validation_errors[0]
@@ -285,9 +287,7 @@ class Airship
 
     object = self._clone_object(object)
 
-    if object['type'].nil?
-      object['type'] = 'User'
-    end
+    self._maybe_add_fields(object)
 
     error = self._validate_nesting(object) || self._validate_anonymous(object) || self._maybe_transform_id(object)
 
@@ -341,6 +341,8 @@ class Airship
   end
 
   def eligible?(control_short_name, object, default_value=false)
+    object = self._shallow_copy(object)
+
     validation_errors = JSON::Validator.fully_validate(SCHEMA, object)
     if validation_errors.size > 0
       puts validation_errors[0]
@@ -349,9 +351,7 @@ class Airship
 
     object = self._clone_object(object)
 
-    if object['type'].nil?
-      object['type'] = 'User'
-    end
+    self._maybe_add_fields(object)
 
     error = self._validate_nesting(object) || self._validate_anonymous(object) || self._maybe_transform_id(object)
 
@@ -406,14 +406,16 @@ class Airship
 
   protected
 
-  def _enrich_with_metadata(control_short_name, stats)
-    control_info = @gating_info_map[control_short_name]
-
-    if !control_info.nil?
-      stats['sdk_gate_control_id'] = control_info['id']
+  def _shallow_copy(object)
+    copy = {}
+    if object.is_a?(Hash)
+      object.each do |key, value|
+        copy[key.to_s] = self._shallow_copy(value)
+      end
+    else
+      return object
     end
-
-    stats['sdk_env_id'] = @gating_info['env']['id']
+    copy
   end
 
   def _get_gating_info_map(gating_info)
@@ -981,4 +983,28 @@ class Airship
 
     nil
   end
+
+  def _enrich_with_metadata(control_short_name, stats)
+    control_info = @gating_info_map[control_short_name]
+
+    if !control_info.nil?
+      stats['sdk_gate_control_id'] = control_info['id']
+    end
+
+    stats['sdk_env_id'] = @gating_info['env']['id']
+  end
+
+  def _maybe_add_fields(object)
+    if object['type'].nil?
+      object['type'] = 'User'
+    end
+
+    if object['display_name'].nil?
+      object['display_name'] = object['id'].to_s
+    end
+
+    if !object['group'].nil? && object['group']['display_name'].nil?
+      object['group']['display_name'] = object['group']['id'].to_s
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: airship-ruby
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors:
 - Airship Dev Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-05 00:00:00.000000000 Z
+date: 2018-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday