ft_gem 3.1.8 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 809676c332224a3afa063feb423dc9e8af915ffe37f8b5315ab45d25102fb903
-  data.tar.gz: c621a941075cbe797eb6286f5bf26b9d8e7abe8a1efa189369ba8a4c6336c378
+  metadata.gz: c87e1b362c32c626bae277df5143edae9272ecd266f35385f1357f4e160afc56
+  data.tar.gz: 1b344e81360b00da689b46c280b9bd4e5c7e396f539dbe9164f9aaba75811d79
 SHA512:
-  metadata.gz: 5ee30a4db3847c8ef0bab9ddde3b547e7f38a9724896bfcd26b05588ddd72a3d94f68e207fcf3e0f6d2e512b7bec0bd3609ed5e84b47342be8eedc0406b9dbb1
-  data.tar.gz: 62fc8f5afb70f7c1dd15ede41201d75031e2b6f61c8c18906a5a4ee9f1ac3c00080b6d0794ce5f43766aba7e9eda3d6347d11ae11ed262fdb7ed0c914842285a
+  metadata.gz: 5b130653d438520557292a204f73369a791c724a4e1063e947e63a77dc4853315bbb889049785313f0a9eabb8e8fa15570e74e523fad5178db2a6f141e0c9e24
+  data.tar.gz: 341027d3da3318695a647480268aa71925caab0d1dfabc82b21e778cb8ada8fd2efb27ee8b8d28c37838623858c8d55c199c04c196c9925efd6b9c5d57e2a942

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_beta(user_id: user_id, toggles: toggles, index: index)
-          return true && whitelisted
-        else
-          return client_percentage.to_i <= toggle_percentage.to_i && whitelisted
-        end
+
+        return true && whitelisted if FtGem::Services::BetaService.public_beta?(cookie: 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
@@ -53,12 +54,6 @@ module FtGem
       def api_feature_toggle_status(name:)
         FtGem::View::Helpers.status(name: name)
       end
-
-      private
-
-      def user_id_beta(user_id: nil, toggles: nil, index: "")
-        user_id.present? && toggles.present? && toggles[index.to_i]['attributes']['status'] == "amber" && toggles[index.to_i]['attributes']['beta-users'].split(",").include?(user_id.to_s)
-      end
     end
   end
 end

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[index.to_i].dig('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'] == "publicbeta"
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ft_gem
 version: !ruby/object:Gem::Version
-  version: 3.1.8
+  version: 3.2.0
 platform: ruby
 authors:
 - Murray Catto
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-18 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: []