ft_gem 3.1.11 → 3.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d64498a7f6859d6d51e064192b7812c5b3f3c1d5a7b4b09dfa2f08534fde4dbb
-  data.tar.gz: d1581653b1cd5fbe017ffac77557f68225b09a4d3264163f8de9b4299b258c8c
+  metadata.gz: 0a388bf5a96a2c5baec8e883e0438dbd0e7ec62f55fe37187e7e2c4034b25b58
+  data.tar.gz: e1d8d9f3ced0ec3429fc2ceae552a29f8ffee33ee88f760e6f0d2f7e313ed820
 SHA512:
-  metadata.gz: dd3b8045267e02895e7b0941247ccf9c2de810cee6917b5669c75b420feef27140321c1882bf2f23e2ac279e1aafc90fb4c8272e150fd8fe1292251e43b269b7
-  data.tar.gz: 4eeb5c92e619c3305a9fc73fec4f2aa86222bae5da0e8f402458e160923e0b491f7fd592d7a68879c968530a0dbe396967d30b24df5ef8493055ac75495839ce
+  metadata.gz: 329f36b475d2d6ada6f46e271f4808a06d0d93698f234b1e7d8c35919acf4bf2d39afd021f2e83350d9b20826e35154e18b14a4a8b672640123fdc4f984bccb4
+  data.tar.gz: 4bd56b5a27dee8f04b3fe4668f6b323f80258ba45e2d73a20e810afe25da44aca06fea7cfca5ee084dc91990ca9ac0df3e6126510bb443497e30067526c31d29

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: "false",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

@@ -5,8 +5,9 @@ module FtGem
         return false unless user_id.present?
         return false unless toggles.present?
 
-        attributes = toggles.dig(index.to_i, 'attributes')
+        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
 
@@ -14,7 +15,9 @@ module FtGem
         return false unless toggles.present?
 
         attributes = toggles.dig(index.to_i, 'attributes')
-        cookie == "true" && attributes['status'] == "privatebeta"
+
+        Rails.logger.info("########### PUBLIC BETA cookie: #{cookie}, status: #{attributes['status']} ################")
+        attributes['status'] == "publicbeta" && cookie == "true"
       end
     end
   end

metadata

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