ft_gem 3.1.14 → 3.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: db43b97ec5443d62e7c13333b733500fed1cbd9c2f13462955ef242dd810a0c2
-  data.tar.gz: 1941b502277a462f749f29199c068007c614e0ad175a1e65ccf8139f35dcd86b
+SHA1:
+  metadata.gz: 212273bf41a194c45f3c3c8021ebe712be110027
+  data.tar.gz: cfab39aeccf578f1df5beec51255a03a2c448fdd
 SHA512:
-  metadata.gz: 78dd064fd71a7862fa0a8ab4c61a5c30b0faf4bb3e4a0394429e1669fd9c57e6795dbb2d68ce85af9393b306e03f536db2dcde0704b8b77ba03dc8048b36189d
-  data.tar.gz: 36cc45d908f1ce9e74963b65169d2c546962c49d9b9c415a30f341e391b7b64558f61c20a96e8e397b5b5034bb79acb2d4c19b3027261b98d9f12643e37ce09c
+  metadata.gz: 42faaf44b67c17c0d1d354231a42daaa52495d9e77bd996917ea44b80b5fedaee4d448a10cfb2a0503449044f4dcbe369213a337fd1b3ce3de64676a9c42e925
+  data.tar.gz: 9031f6721ff0d0070ef50bd6edb9985a2ac2dbaec654802e35cb46d403bd698661a4be9715cb4ec0e0a9ce77560deef5fc54e28ae4d6162f232aed4cfb92aa1e

data/lib/ft_gem/controllers/helpers.rb

@@ -8,16 +8,20 @@ module FtGem
 
       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])
         index = toggles.index { |toggle| toggle['attributes']['name'] == name }
         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']
+
         whitelisted = FtShared.new.whitelisted?(url: url, whitelist_urls: toggles[index.to_i]['attributes']['whitelist-urls'])
+        return false unless whitelisted
+
+        return true if FtGem::Services::BetaService.public_beta?(cookie: cookies[PUBLICBETA_COOKIE_NAME], toggles: toggles, index: index)
+        return true if FtGem::Services::BetaService.private_beta?(user_id: user_id, toggles: toggles, index: index)
 
-        return true && whitelisted if FtGem::Services::BetaService.public_beta?(cookie: Base64.decode64(cookies[PUBLICBETA_COOKIE_NAME]),toggles: toggles, index: index)
-        return true && whitelisted if FtGem::Services::BetaService.private_beta?(user_id: user_id, toggles: toggles, index: index)
+        update_feature_toggles(toggles: toggles)
+        decoded_cookie = Base64.decode64(cookies[TOGGLE_COOKIE_NAME])
+
+        client_percentage = calc_client_percentage(decoded_cookie: decoded_cookie, toggle_name: name)
+        toggle_percentage = toggles[index.to_i]['attributes']['percentage']
 
         return client_percentage.to_i <= toggle_percentage.to_i && whitelisted
       rescue StandardError => e

data/lib/ft_gem/services/beta_service.rb

@@ -7,14 +7,17 @@ module FtGem
 
         attributes = toggles[index.to_i].dig('attributes')
 
+        Rails.logger.info("########### PRIVATE BETA status: #{attributes['status']}, include users: #{attributes['beta-users'].split(",").include?(user_id.to_s)} ################")
         attributes['status'] == "privatebeta" && attributes['beta-users'].split(",").include?(user_id.to_s)
       end
 
-      def self.public_beta?(cookie: "", toggles: nil, index: "")
+      def self.public_beta?(cookie: nil, toggles: nil, index: "")
         return false unless toggles.present?
 
         attributes = toggles.dig(index.to_i, 'attributes')
-        cookie == "true" && attributes['status'] == "publicbeta"
+
+        Rails.logger.info("########### PUBLIC BETA cookie: #{cookie}, status: #{attributes['status']} ################")
+        attributes['status'] == "publicbeta" && cookie.present?
       end
     end
   end

data/lib/ft_gem/shared/ft_shared.rb

@@ -1,8 +1,15 @@
 class FtShared
+
+  def svc_url
+      url = ENV['MICROSVC_URL']
+      url = ENV['SITE_URL'] unless url
+      url
+  end
+
   def fetch(name:)
     http_response = ''
     Rails.cache.fetch("feature-toggle-#{name}", expires_in: 1.minute) do
-      http_response = HTTParty.get("#{ENV['SITE_URL']}/service/ft/api/v1/feature-toggles/status", query: { name: name }, headers: authentication_header)
+      http_response = HTTParty.get("#{svc_url}/service/ft/api/v1/feature-toggles/status", query: { name: name }, headers: header_hash)
       JSON.parse(http_response.to_json)['data']
     end
   rescue StandardError => e
@@ -12,15 +19,15 @@ class FtShared
 
   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("#{svc_url}/service/ft/api/v1/feature-toggles", headers: header_hash).to_json)['data']
     end
   rescue StandardError => e
     Rails.logger.error "FtHelper::all_toggles error #{e.message}"
     {}
   end
 
-  def authentication_header
-    { Authorization: "Bearer #{MumsnetJWT.tokenify}" }
+  def header_hash
+    { Authorization: "Bearer #{MumsnetJWT.tokenify}", Host: "#{ENV['SITE_HOSTNAME']}" }
   end
 
   def whitelisted?(url:, whitelist_urls:)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ft_gem
 version: !ruby/object:Gem::Version
-  version: 3.1.14
+  version: 3.2.7
 platform: ruby
 authors:
 - Murray Catto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-19 00:00:00.000000000 Z
+date: 2021-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mumsnet_jwt
@@ -67,7 +67,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: Client side feature toggle