ft_gem 3.1.3 → 3.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef9fd27c96559162edf384f50805b181bb19a6f413b68b0dd25c1bb7bb91b8ca
-  data.tar.gz: c2805800a918ee5439a42f5a94fe625dd7220d6e905cd793cea11135e68f563a
+  metadata.gz: 809676c332224a3afa063feb423dc9e8af915ffe37f8b5315ab45d25102fb903
+  data.tar.gz: c621a941075cbe797eb6286f5bf26b9d8e7abe8a1efa189369ba8a4c6336c378
 SHA512:
-  metadata.gz: a0ff18ca90cdebf23ce7caa62caf24b978cc3fe6e74964c0f2adcd138635d6e718d85a27325e5b1f6b226ba21c11c6135d21715ef37d58c1c4b86ca380f28c1a
-  data.tar.gz: 341fa06b4cb8ae03e2a4a43a34748b8ad90731628d970e4ef9c5011b734d613bc36beaf3d5d163c7ba0e79b709a4ee234e2e6efaafa7f2cfe0c5d7ab08d8b98e
+  metadata.gz: 5ee30a4db3847c8ef0bab9ddde3b547e7f38a9724896bfcd26b05588ddd72a3d94f68e207fcf3e0f6d2e512b7bec0bd3609ed5e84b47342be8eedc0406b9dbb1
+  data.tar.gz: 62fc8f5afb70f7c1dd15ede41201d75031e2b6f61c8c18906a5a4ee9f1ac3c00080b6d0794ce5f43766aba7e9eda3d6347d11ae11ed262fdb7ed0c914842285a

data/lib/ft_gem/controllers/helpers.rb

@@ -5,7 +5,7 @@ module FtGem
       TOGGLE_COOKIE_NAME = 'mnft'.freeze
       require 'base64'
 
-      def feature_toggle_status(name:, url: nil)
+      def feature_toggle_status(name:, user_id: nil, url: nil)
         toggles = FtShared.new.all_toggles
         update_feature_toggles(toggles: toggles)
         decoded_cookie = Base64.decode64(cookies[TOGGLE_COOKIE_NAME])
@@ -14,7 +14,11 @@ module FtGem
         client_percentage = calc_client_percentage(decoded_cookie: decoded_cookie, toggle_name: name)
         toggle_percentage = toggles[index.to_i]['attributes']['percentage']
         whitelisted = FtShared.new.whitelisted?(url: url, whitelist_urls: toggles[index.to_i]['attributes']['whitelist-urls'])
-        client_percentage.to_i <= toggle_percentage.to_i && whitelisted
+        if user_id_beta(user_id: user_id, toggles: toggles, index: index)
+          return true && whitelisted
+        else
+          return client_percentage.to_i <= toggle_percentage.to_i && whitelisted
+        end
       rescue StandardError => e
         Rails.logger.error "FtGem::feature_toggle_status error #{e.backtrace}"
         false
@@ -49,6 +53,12 @@ module FtGem
       def api_feature_toggle_status(name:)
         FtGem::View::Helpers.status(name: name)
       end
+
+      private
+
+      def user_id_beta(user_id: nil, toggles: nil, index: "")
+        user_id.present? && toggles.present? && toggles[index.to_i]['attributes']['status'] == "amber" && toggles[index.to_i]['attributes']['beta-users'].split(",").include?(user_id.to_s)
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ft_gem
 version: !ruby/object:Gem::Version
-  version: 3.1.3
+  version: 3.1.8
 platform: ruby
 authors:
 - Murray Catto
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-11-09 00:00:00.000000000 Z
+date: 2020-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mumsnet_jwt
@@ -38,8 +38,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
-email: 
+description:
+email:
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -48,10 +48,10 @@ files:
 - lib/ft_gem/controllers/helpers.rb
 - lib/ft_gem/shared/ft_shared.rb
 - lib/ft_gem/view/helpers.rb
-homepage: 
+homepage:
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -66,9 +66,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
-signing_key: 
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
 summary: Client side feature toggle
 test_files: []