bug fixes

PabloJoan · Nov 3, 2018 · 9255b48 · 9255b48
1 parent 94e3bbb
commit 9255b48
Show file tree

Hide file tree

Showing 13 changed files with 168 additions and 132 deletions.
diff --git a/src/Bucketing/Calculator/Id.php b/src/Bucketing/Calculator/Id.php
@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PabloJoan\Feature\Bucketing\Calculator;
+
+class Id
+{
+    /**
+     * Map a hex value to the half-open interval between 0 and 1 while
+     * preserving uniformity of the input distribution.
+     */
+    function number (string $idToHash) : float
+    {
+        $hash = hash('haval192,3', $idToHash);
+        $x = 0;
+        for ($i = 0; $i < 47; ++$i) {
+            $x = ($x * 2) + (hexdec($hash[$i]) < 8 ? 0 : 1);
+        }
+
+        $x = $x / 140737488355328; // ( 2 ** 47 ) is the max value of $x
+
+        return $x * 100;
+    }
+}
diff --git a/src/Bucketing/Calculator/Random.php b/src/Bucketing/Calculator/Random.php
@@ -0,0 +1,14 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PabloJoan\Feature\Bucketing\Calculator;
+
+class Random
+{
+    function number () : float
+    {
+        $x = random_int(0, PHP_INT_MAX - 1) / PHP_INT_MAX;
+        return $x * 100;
+    }
+}
diff --git a/src/Bucketing/Random.php b/src/Bucketing/Random.php
@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PabloJoan\Feature\Bucketing;
+
+use PabloJoan\Feature\Value\User;
+use PabloJoan\Feature\Bucketing\Calculator\Random as Calculator;
+
+class Random implements Type
+{
+    function id (User $user) : string
+    {
+        return $user->uaid() ?: 'no uaid';
+    }
+
+    function number (string $idToHash) : float
+    {
+        return (new Calculator)->number();
+    }
+}
diff --git a/src/Bucketing/Type.php b/src/Bucketing/Type.php
@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PabloJoan\Feature\Bucketing;
+
+use PabloJoan\Feature\Value\User;
+
+interface Type
+{
+    function id (User $user) : string;
+
+    /**
+     * A random-ish number between 0 and 100 based on the feature name and $id
+     * unless we are bucketing completely at random
+     */
+    function number (string $idToHash) : float;
+}
diff --git a/src/Bucketing/Uaid.php b/src/Bucketing/Uaid.php
@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PabloJoan\Feature\Bucketing;
+
+use PabloJoan\Feature\Value\User;
+use PabloJoan\Feature\Bucketing\Calculator\Id as Calculator;
+
+class Uaid implements Type
+{
+    function id (User $user) : string
+    {
+        return $user->uaid();
+    }
+
+    function number (string $idToHash) : float
+    {
+        return (new Calculator)->number($idToHash);
+    }
+}
diff --git a/src/Bucketing/User.php b/src/Bucketing/User.php
@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PabloJoan\Feature\Bucketing;
+
+use PabloJoan\Feature\Value\User as UserValue;
+use PabloJoan\Feature\Bucketing\Calculator\Id as Calculator;
+
+class User implements Type
+{
+    function id (UserValue $user) : string
+    {
+        return $user->id();
+    }
+
+    function number (string $idToHash) : float
+    {
+        return (new Calculator)->number($idToHash);
+    }
+}
diff --git a/src/Config.php b/src/Config.php
@@ -8,7 +8,6 @@
     User,
     Url,
     Feature,
-    Bucketing,
     Variant
 };
 
@@ -170,39 +169,7 @@ private function variantTime (Feature $feature) : string
     private function variantByPercentage (Feature $feature, string $id) : string
     {
         return $feature->enabled()->variantByPercentage(
-            $this->randomish($feature, $id)
+            $feature->bucketing()->number($id)
         );
     }
-
-    /**
-     * A random-ish number between 0 and 100 based on the feature name and $id
-     * unless we are bucketing completely at random
-     */
-    private function randomish (Feature $feature, string $id) : float
-    {
-        switch ($feature->bucketing()->by()) {
-            case Bucketing::RANDOM:
-                $x = random_int(0, PHP_INT_MAX - 1) / PHP_INT_MAX;
-
-            default:
-                $x = $this->numberFromHash($feature->name() . "-$id");
-        }
-
-        return $x * 100;
-    }
-
-    /**
-     * Map a hex value to the half-open interval between 0 and 1 while
-     * preserving uniformity of the input distribution.
-     */
-    private function numberFromHash (string $strToHash) : float
-    {
-        $hash = hash('haval192,3', $strToHash);
-        $x = 0;
-        for ($i = 0; $i < 47; ++$i) {
-            $x = ($x * 2) + (hexdec($hash[$i]) < 8 ? 0 : 1);
-        }
-
-        return $x / 140737488355328; // ( 2 ** 47 ) is the max value of $x
-    }
 }
diff --git a/src/Feature.php b/src/Feature.php
@@ -5,7 +5,7 @@
 namespace PabloJoan\Feature;
 
 use PabloJoan\Feature\Value\{
-    FeatureCollection,
+    Features,
     User,
     Url
 };
@@ -41,7 +41,7 @@ class Feature
 
     function __construct (array $input = null)
     {
-        $this->features = new FeatureCollection($input['features'] ?? []);
+        $this->features = new Features($input['features'] ?? []);
         $this->user     = new User($input['user'] ?? []);
         $this->url      = new Url($input['url'] ?? '');
         $this->source   = $input['source'] ?? '';
@@ -52,7 +52,7 @@ function __construct (array $input = null)
      */
     function changeFeatures (array $features) : Feature
     {
-        $this->features = new FeatureCollection($features);
+        $this->features = new Features($features);
         return $this;
     }
 
@@ -63,7 +63,7 @@ function changeFeatures (array $features) : Feature
      */
     function setFeature (string $name, array $feature) : Feature
     {
-        $this->features->set($name, $feature);
+        $this->features[$name] = $feature;
         return $this;
     }
 
@@ -72,7 +72,7 @@ function setFeature (string $name, array $feature) : Feature
      */
     function removeFeature (string $name) : Feature
     {
-        $this->features->remove($name);
+        unset($this->features[$name]);
         return $this;
     }
 
@@ -109,7 +109,7 @@ function changeSource (string $source) : Feature
     function isEnabled (string $name) : bool
     {
         $config = new Config($this->user, $this->url, $this->source);
-        return $config->isEnabled($this->features->get($name));
+        return $config->isEnabled($this->features[$name]);
     }
 
     /**
@@ -121,7 +121,7 @@ function isEnabled (string $name) : bool
     function isEnabledFor (string $name, array $user) : bool
     {
         $config = new Config(new User($user), $this->url, $this->source);
-        return $config->isEnabled($this->features->get($name));
+        return $config->isEnabled($this->features[$name]);
     }
 
     /**
@@ -133,7 +133,7 @@ function isEnabledBucketingBy (string $name, string $id) : bool
     {
         $config = new Config(new User([]), $this->url, $this->source); 
         return $config->isEnabledBucketingBy(
-            $this->features->get($name),
+            $this->features[$name],
             $id
         );
     }
@@ -145,7 +145,7 @@ function isEnabledBucketingBy (string $name, string $id) : bool
     function variant (string $name) : string
     {
         $config = new Config($this->user, $this->url, $this->source);
-        return $config->variant($this->features->get($name));
+        return $config->variant($this->features[$name]);
     }
 
     /**
@@ -157,7 +157,7 @@ function variant (string $name) : string
     function variantFor (string $name, array $user) : string
     {
         $config = new Config(new User($user), $this->url, $this->source);
-        return $config->variant($this->features->get($name));
+        return $config->variant($this->features[$name]);
     }
 
     /**
@@ -170,13 +170,13 @@ function variantBucketingBy (string $name, string $id) : string
     {
         $config = new Config(new User([]), $this->url, $this->source);
         return $config->variantBucketingBy(
-            $this->features->get($name),
+            $this->features[$name],
             $id
         );
     }
 
     function description (string $name) : string
     {
-        return $this->features->get($name)->description();
+        return $this->features[$name]->description();
     }
 }
diff --git a/src/Value/Bucketing.php b/src/Value/Bucketing.php
diff --git a/src/Value/Enabled.php b/src/Value/Enabled.php
@@ -20,19 +20,18 @@ function __construct ($enabled)
             $variant = is_int($variant) ? Variant::ON : $variant;
             $this->percentages[$variant] = $total;
         }
+        asort($this->percentages, SORT_NUMERIC);
     }
 
     function variantByPercentage (float $number) : string
     {
-        foreach ($this->percentages as $variant => $percent) {
-            $withinThreshold = $number < $percent;
-            switch ($withinThreshold) {
-                case true:
-                    return $variant;
-                    break;
-            }
-        }
-        return '';
+        $threshHold = function ($percent) use ($number) {
+            return $number < $percent;
+        };
+
+        $variant = key(array_filter($this->percentages, $threshHold));
+
+        return (string) ($variant ?: '');
     }
 
     private function percentage (int $percent) : int