From 30a3dbb108a0827c3630398e7b708a889c3a139f Mon Sep 17 00:00:00 2001 From: Gard Rimestad Date: Tue, 22 Aug 2023 13:30:47 +0200 Subject: [PATCH] refactor: make method name more clear and return object better --- lib/unleash/feature_toggle.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/unleash/feature_toggle.rb b/lib/unleash/feature_toggle.rb index 88bd72d..bbdf7e5 100644 --- a/lib/unleash/feature_toggle.rb +++ b/lib/unleash/feature_toggle.rb @@ -39,7 +39,7 @@ def get_variant(context, fallback_variant = Unleash::FeatureToggle.disabled_vari toggle_enabled = am_enabled?(context) - strategy = am_enabled(context)[:strategy] + strategy = evaluate(context)[:strategy] group_id = strategy&.params&.fetch('groupId', self.name) || self.name variants = strategy&.variants || self.variant_definitions @@ -70,23 +70,23 @@ def resolve_stickiness(variants) # only check if it is enabled, do not do metrics def am_enabled?(context) - am_enabled(context)[:result] + evaluate(context)[:is_enabled] end - def am_enabled(context) + def evaluate(context) returnable = { - result: false, + is_enabled: false, strategy: nil } return returnable unless self.enabled if self.strategies.empty? - returnable[:result] = true + returnable[:is_enabled] = true else returnable[:strategy] = self.strategies.find(proc{ nil }) do |s| (strategy_enabled?(s, context) && strategy_constraint_matches?(s, context)) end - returnable[:result] = true if returnable[:strategy] + returnable[:is_enabled] = true if returnable[:strategy] end Unleash.logger.debug "Unleash::FeatureToggle (enabled:#{self.enabled} " \