ft_gem 3.1.6 → 3.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ca0566dc7734cac585efc11741f71fdd293e4a924d207d0285d0555d4c63f34
-  data.tar.gz: d88568950bac57aa06858fa31dc5b18f32179d938cf79c2f08045894984a3230
+  metadata.gz: c0e2da07f3d2533e273a4c2b299dc80c3fe95cf2d6dd30f84c2258a3a2ae6b22
+  data.tar.gz: 9eeca9dbd37d564fa512ed2cfec993af971911878ad46c54d4d573400a7e37a7
 SHA512:
-  metadata.gz: 530936aef0568a373e8b59aba62ff94bbb11593ea3b6c96ac7a860fa4351f0d578a4fe439df584ccf8c61bbce872aa42df0233eb3e7cb377542ceb6bcea9171b
-  data.tar.gz: 21a2c60a25d65c333fda8ed4cfe7eb6ea616cfd8490e9ff5acd46893f31adb0b6efc4f26b49e3afa79c4f01fdfe57d3737b31965c327b8c57457c070d4c1135c
+  metadata.gz: 4a55724fd18a65cb6d31d82bcb74951d36727bd9d7e7331ccfa624695724d346ff3b521afecec209f668becf8a59be0fb344f9cfd7ef655f80120928184c88d5
+  data.tar.gz: 637e41c423d27e01e4fe40fb810f307acbefacc4d00b58f24257a4502c3f2dc3bcc4a5382fff94a4e87e874b5c8cb9b783562fd22b912381589cc7bb60a3d236

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)
-          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: 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
@@ -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)
-        user_id.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.6
+  version: 3.1.12
 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: []