ft_gem 3.1.5 → 3.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f59d9f1f380088f670d59c8d4d1717a201c3fe01469b06869e0782c1ae10caf7
-  data.tar.gz: c9f1ecb7b7e2138a8452d939d7560de5dcc5d1fa21a297ffab725d52b05fd4a3
+  metadata.gz: d64498a7f6859d6d51e064192b7812c5b3f3c1d5a7b4b09dfa2f08534fde4dbb
+  data.tar.gz: d1581653b1cd5fbe017ffac77557f68225b09a4d3264163f8de9b4299b258c8c
 SHA512:
-  metadata.gz: 06e2149714a5b1d095275f98ff5e448c6f436b441a608e43b12ef7d82e0f9fbf687c3a4d7f9c504187d0ca0cddb1e89d78f8a475dd2533ea5c044d798210f3b7
-  data.tar.gz: 54f5a746a6c7fb7ec73b89d37827a33d4aeefd6253c0bec17f0dcbf8e95d0e98d01b2712c7c3135b64a4433eed6b391d76415838b30ffdca0cddb9d41a38bc14
+  metadata.gz: dd3b8045267e02895e7b0941247ccf9c2de810cee6917b5669c75b420feef27140321c1882bf2f23e2ac279e1aafc90fb4c8272e150fd8fe1292251e43b269b7
+  data.tar.gz: 4eeb5c92e619c3305a9fc73fec4f2aa86222bae5da0e8f402458e160923e0b491f7fd592d7a68879c968530a0dbe396967d30b24df5ef8493055ac75495839ce

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

@@ -3,6 +3,7 @@ module FtGem
     module Helpers
       extend ActiveSupport::Concern
       TOGGLE_COOKIE_NAME = 'mnft'.freeze
+      PUBLICBETA_COOKIE_NAME = 'mnbeta'.freeze
       require 'base64'
 
       def feature_toggle_status(name:, user_id: nil, url: nil)
@@ -14,11 +15,11 @@ module FtGem
         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'])
-        if user_id.present? && toggles[index.to_i]['attributes']['status'] == "amber" && toggles[index.to_i]['attributes']['beta-users'] != "" && 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
+
+        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 client_percentage.to_i <= toggle_percentage.to_i && whitelisted
       rescue StandardError => e
         Rails.logger.error "FtGem::feature_toggle_status error #{e.backtrace}"
         false

data/lib/ft_gem/services/beta_service.rb

@@ -0,0 +1,21 @@
+module FtGem
+  module Services
+    module BetaService
+      def self.private_beta?(user_id: nil, toggles: nil, index: "")
+        return false unless user_id.present?
+        return false unless toggles.present?
+
+        attributes = toggles.dig(index.to_i, 'attributes')
+
+        attributes['status'] == "privatebeta" && attributes['beta-users'].split(",").include?(user_id.to_s)
+      end
+
+      def self.public_beta?(cookie: "", toggles: nil, index: "")
+        return false unless toggles.present?
+
+        attributes = toggles.dig(index.to_i, 'attributes')
+        cookie == "true" && attributes['status'] == "privatebeta"
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ft_gem
 version: !ruby/object:Gem::Version
-  version: 3.1.5
+  version: 3.1.11
 platform: ruby
 authors:
 - Murray Catto
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-17 00:00:00.000000000 Z
+date: 2020-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mumsnet_jwt
@@ -38,20 +38,21 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
-email:
+description: 
+email: 
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - lib/ft_gem.rb
 - lib/ft_gem/controllers/helpers.rb
+- lib/ft_gem/services/beta_service.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,8 +67,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
-signing_key:
+rubygems_version: 3.0.3
+signing_key: 
 specification_version: 4
 summary: Client side feature toggle
 test_files: []