ft_gem 3.1.10 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21b45e240a1861569b16e5e45a0b1d660511981dec84d6e4c75f2885a1e52225
-  data.tar.gz: 2c32bcf43c396dcdf24fb07d982476c0135967a2d19ba8dd9db42bead064c68e
+  metadata.gz: 35400c0fa6a2f7640b62ae165101ed26afac0c10bcacdca9bc4d0adcef9b827b
+  data.tar.gz: c34b83cdd99f07730de5c3942cd6bcbf21ad49b72d48160824ade5f9f6e80880
 SHA512:
-  metadata.gz: e118c452267dc979e61bf8c1745fc09c83f86e5f295d3fcaf0e4da84e7356d320efdc9497a02675489dc7a0900c26a3e77fd25ee5aca2210c9a60facbd58e2b9
-  data.tar.gz: 6e268ed09221c2bd491c5f3fa668cc060661a9557f49f8d234cbb13bf2bf261a9285b76ea85335bac241f6dc6109a81cbaeaf7ed96c4b45e8b68d989c4a0fb8b
+  metadata.gz: 545f3a715845a5e452e6340d3d737fe23afb3843020490855c563a2e57a1e55802216ba9f05a312f2a709ee5e9ec5ee36d21aeba292f1414344afb64a6e8c4a4
+  data.tar.gz: c3eaf501b6837dffd80b1fd2d2455b66da2571333259c2d16e53e45c5afe7cb6203f60b283372cd20fc53fba6b20e41a05a267bfd6998d11da7f1383799fe85b

data/lib/ft_gem.rb

@@ -1,10 +1,15 @@
 require 'ft_gem/shared/ft_shared'
 require 'ft_gem/view/helpers'
+require 'ft_gem/services/beta_service'
 module FtGem
   module Controllers
     autoload :Helpers, 'ft_gem/controllers/helpers'
   end
 
+  module Services
+    autoload :BetaService, 'ft_gem/services/beta_service'
+  end
+
   class Railtie < Rails::Railtie
     initializer 'ft_gem.view.helpers' do |_app|
       ActionView::Base.send :include, FtGem::View::Helpers

data/lib/ft_gem/controllers/helpers.rb

@@ -8,16 +8,19 @@ 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 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)
+        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.10
+  version: 3.2.1
 platform: ruby
 authors:
 - Murray Catto