ft_gem 3.1.12 → 3.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0e2da07f3d2533e273a4c2b299dc80c3fe95cf2d6dd30f84c2258a3a2ae6b22
-  data.tar.gz: 9eeca9dbd37d564fa512ed2cfec993af971911878ad46c54d4d573400a7e37a7
+  metadata.gz: b333c05567a5be9cc6d934ba301abc34c0b20d71423b4c9bd74b2b4785b0f5ba
+  data.tar.gz: 67b80f508437e2ffaa342eefac5685091d684dc98662e2340fc98bdb80f61c24
 SHA512:
-  metadata.gz: 4a55724fd18a65cb6d31d82bcb74951d36727bd9d7e7331ccfa624695724d346ff3b521afecec209f668becf8a59be0fb344f9cfd7ef655f80120928184c88d5
-  data.tar.gz: 637e41c423d27e01e4fe40fb810f307acbefacc4d00b58f24257a4502c3f2dc3bcc4a5382fff94a4e87e874b5c8cb9b783562fd22b912381589cc7bb60a3d236
+  metadata.gz: 7938240f6c14e58801e9ab5f5d2075db179e7655395a1592b700e45596ebac80c886df56279009e852918ea1a01ebcffe5471c0312cbafd8582092e3d60b5f26
+  data.tar.gz: 764fbf30382d7ca98d72c0427ea2c4f5f60fdcd2ef9b6dfa977c1e8cfeb56a44af208151cc239388e3973c878eac2b587bdd9e010da47ab7ee30e9f7a2f58c71

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ft_gem
 version: !ruby/object:Gem::Version
-  version: 3.1.12
+  version: 3.2.3
 platform: ruby
 authors:
 - Murray Catto