ft_gem 3.0.9 → 3.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58fbec10bcb730b69f3f8f4289ec9eb5f21437f47cc545bd2050616c19e66d19
-  data.tar.gz: 27096da6d9084cdcfa3a6f86ef891d1d01684a37d513019a72f653ce526365ab
+  metadata.gz: bd51c11b15d1f46fd98c4476c8a0d0eadbead26785f022dbae2ec1b0a661b033
+  data.tar.gz: 0351fb12d09f8d4ead1746247f1d1d67a41f668afc58124f4bfc22853db24ff0
 SHA512:
-  metadata.gz: 968d5f9103a0ef28d7e2bc7adeca1a88735de32726802eb27fd00d8fa97b3d386424a599dc6e9b64d8f6c621654e701a371f0564d3157eb4102473ff4e293a0b
-  data.tar.gz: 718da1efc3697fbc481792eb7bc2d5d3ca335db5bf2eab24a4f0ec9f27351cbc35df2b81ad1b8d5b6ae6d2aceb1c887b862cdba4d2b7e4b193e456037e188ff6
+  metadata.gz: 329fd3295dd560e017f8cb60d8ee92c46137e89a9941d76f3359dc7b376630cd431adbba2487c1b52155719de079e7b0e97b7547c9da5caa18da4e3b19f7bedb
+  data.tar.gz: 240149ba279adfdeb18d357642f306d88b1ad6ba3e6e7eb90dfcf50235d3e9edb9e94cd7a1541e3044e18d7fc2c3fc3c811589dcfe8ce04664c24490af367734

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:)
+      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])
@@ -13,7 +13,12 @@ module FtGem
         return false if index.nil?
         client_percentage = calc_client_percentage(decoded_cookie: decoded_cookie, toggle_name: name)
         toggle_percentage = toggles[index.to_i]['attributes']['percentage']
-        client_percentage.to_i <= toggle_percentage.to_i
+        whitelisted = FtShared.new.whitelisted?(url: url, whitelist_urls: toggles[index.to_i]['attributes']['whitelist-urls'])
+        if (user_id.present? && toggles[index.to_i]['attributes']['status'] == "amber" && 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
@@ -27,7 +32,8 @@ module FtGem
           client_percentage = calc_client_percentage(decoded_cookie: decoded_cookie, toggle_name: toggle['attributes']['name'])
           new_cookie.push("#{toggle['attributes']['name']}:#{client_percentage}")
         end
-        cookies[TOGGLE_COOKIE_NAME] = { value: Base64.encode64(new_cookie.join(',')).to_s, domain: ENV['COOKIE_DOMAIN'] }
+        cookies.delete TOGGLE_COOKIE_NAME, domain: ENV['COOKIE_DOMAIN']
+        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,23 +1,39 @@
 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
 
   def authentication_header
     { Authorization: "Bearer #{MumsnetJWT.tokenify}" }
   end
+
+  def whitelisted?(url:, whitelist_urls:)
+    return true if whitelist_urls.empty? || url.nil?
+    whitelisted = false
+    whitelist_urls.each do |whitelist_url|
+      if whitelist_url[whitelist_url.length - 1] == '*'
+        whitelist_url.chomp!('*')
+        whitelisted = true if url.starts_with?(whitelist_url)
+      elsif whitelist_url == url
+        whitelisted = true
+      end
+    end
+    whitelisted
+  end
 end

data/lib/ft_gem/view/helpers.rb

@@ -1,12 +1,13 @@
 module FtGem
   module View
     module Helpers
-      def self.status(name:)
+      def self.status(name:, url: nil)
         toggle = FtShared.new.fetch(name: name)
         return false if toggle.nil?
-        toggle['attributes']['percentage'].to_i == 100
+        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.0.9
+  version: 3.1.4
 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,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: []