ft_gem 3.1.0 → 3.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 882b46bd6292e36ab8cd057adcd6982091a0bb50549c038955466bcd547ea134
-  data.tar.gz: 00516c790a74ec6d5b03036ac9784371f25da4e70bd532d6c8b522cf91199e31
+  metadata.gz: f59d9f1f380088f670d59c8d4d1717a201c3fe01469b06869e0782c1ae10caf7
+  data.tar.gz: c9f1ecb7b7e2138a8452d939d7560de5dcc5d1fa21a297ffab725d52b05fd4a3
 SHA512:
-  metadata.gz: b680e623e2eb1268c119bd0a059c2a0a5f25a7763ac58e7682fba4dbe8c3a7ec46d02b291dbf002145e140c2907b3ba326aac0c44dd253f72e9481a1523714b0
-  data.tar.gz: 5aadadf5af0047d30584a4a70e4e819539f934fb2d09fbad5b012c5181daa3e614944df5990d9de5438bfe7b31834e5b1c99a6bbef0062188948b91fb76fde48
+  metadata.gz: 06e2149714a5b1d095275f98ff5e448c6f436b441a608e43b12ef7d82e0f9fbf687c3a4d7f9c504187d0ca0cddb1e89d78f8a475dd2533ea5c044d798210f3b7
+  data.tar.gz: 54f5a746a6c7fb7ec73b89d37827a33d4aeefd6253c0bec17f0dcbf8e95d0e98d01b2712c7c3135b64a4433eed6b391d76415838b30ffdca0cddb9d41a38bc14

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.present? && toggles[index.to_i]['attributes']['status'] == "amber" && toggles[index.to_i]['attributes']['beta-users'] != "" && toggles[index.to_i]['attributes']['beta-users'].split(",").include?(user_id.to_s)
+          return true
+        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
@@ -29,7 +33,7 @@ module FtGem
           new_cookie.push("#{toggle['attributes']['name']}:#{client_percentage}")
         end
         cookies.delete TOGGLE_COOKIE_NAME, domain: ENV['COOKIE_DOMAIN']
-        cookies[TOGGLE_COOKIE_NAME] = { value: Base64.encode64(new_cookie.join(',')).to_s, secure: true }
+        cookies[TOGGLE_COOKIE_NAME] = { value: Base64.strict_encode64(new_cookie.join(',')).to_s, secure: true }
       rescue StandardError => e
         Rails.logger.error "FTApiGem::update_feature_toggles error #{e.backtrace}"
         nil

data/lib/ft_gem/shared/ft_shared.rb

@@ -1,19 +1,21 @@
 class FtShared
   def fetch(name:)
+    http_response = ''
     Rails.cache.fetch("feature-toggle-#{name}", expires_in: 1.minute) do
-      JSON.parse(HTTParty.get("#{ENV['SITE_URL']}/service/ft/api/v1/feature-toggles/status", query: { name: name }, headers: authentication_header).to_json)['data']
+      http_response = HTTParty.get("#{ENV['SITE_URL']}/service/ft/api/v1/feature-toggles/status", query: { name: name }, headers: authentication_header)
+      JSON.parse(http_response.to_json)['data']
     end
   rescue StandardError => e
-    Rails.logger.error "FtHelper::fetch error #{e.backtrace}"
+    Rails.logger.error "FtHelper::fetch error for #{name}\nerror: #{e.message}\nhttp_response: #{http_response}"
     nil
   end
 
   def all_toggles
     Rails.cache.fetch('all-feature-toggles', expires_in: 1.minute) do
-      JSON.parse(HTTParty.get("#{ENV['SITE_URL']}/service/ft/api/v1/feature-toggles/", headers: authentication_header).to_json)['data']
+      JSON.parse(HTTParty.get("#{ENV['SITE_URL']}/service/ft/api/v1/feature-toggles", headers: authentication_header).to_json)['data']
     end
   rescue StandardError => e
-    Rails.logger.error "FtHelper::all_toggles error #{e.backtrace}"
+    Rails.logger.error "FtHelper::all_toggles error #{e.message}"
     {}
   end
 

data/lib/ft_gem/view/helpers.rb

@@ -7,7 +7,7 @@ module FtGem
         whitelisted = FtShared.new.whitelisted?(url: url, whitelist_urls: toggle['attributes']['whitelist-urls'])
         toggle['attributes']['percentage'].to_i == 100 && whitelisted
       rescue StandardError => e
-        Rails.logger.error "FtHelper::status error #{e.backtrace}"
+        Rails.logger.error "FtHelper::status error #{e.message}"
         false
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ft_gem
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.5
 platform: ruby
 authors:
 - Murray Catto
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-11-09 00:00:00.000000000 Z
+date: 2020-11-17 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,8 +66,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
 summary: Client side feature toggle
 test_files: []