Fix lint issues

Author: esrakartalOpt

lib/optimizely/config/datafile_project_config.rb

@@ -198,9 +198,7 @@ def initialize(datafile, logger, error_handler)
         flag_id = feature_flag['id']
         applicable_holdouts = []
 
-        if @included_holdouts[flag_id]
-          applicable_holdouts.concat(@included_holdouts[flag_id])
-        end
+        applicable_holdouts.concat(@included_holdouts[flag_id]) if @included_holdouts[flag_id]
 
         @global_holdouts.each_value do |holdout|
           excluded_flag_ids = holdout['excludedFlags'] || []
@@ -215,20 +213,20 @@ def initialize(datafile, logger, error_handler)
         @holdouts.each do |holdout|
           holdout_key = holdout['key']
           holdout_id = holdout['id']
-          
+
           @variation_key_map[holdout_key] = {}
           @variation_id_map[holdout_key] = {}
           @variation_id_map_by_experiment_id[holdout_id] = {}
           @variation_key_map_by_experiment_id[holdout_id] = {}
 
           variations = holdout['variations']
-          if variations && !variations.empty?
-            variations.each do |variation|
-              @variation_key_map[holdout_key][variation['key']] = variation
-              @variation_id_map[holdout_key][variation['id']] = variation
-              @variation_key_map_by_experiment_id[holdout_id][variation['key']] = variation
-              @variation_id_map_by_experiment_id[holdout_id][variation['id']] = variation
-            end
+          next unless variations && !variations.empty?
+
+          variations.each do |variation|
+            @variation_key_map[holdout_key][variation['key']] = variation
+            @variation_id_map[holdout_key][variation['id']] = variation
+            @variation_key_map_by_experiment_id[holdout_id][variation['key']] = variation
+            @variation_id_map_by_experiment_id[holdout_id][variation['id']] = variation
           end
         end
       end

lib/optimizely/decision_service.rb

@@ -192,21 +192,18 @@ def get_decision_for_flag(feature_flag, user_context, project_config, decide_opt
         holdout_decision = get_variation_for_holdout(holdout, user_context, project_config)
         reasons.push(*holdout_decision.reasons)
 
-        if holdout_decision.decision
-          message = "The user '#{user_id}' is bucketed into holdout '#{holdout['key']}' for feature flag '#{feature_flag['key']}'."
-          @logger.log(Logger::INFO, message)
-          reasons.push(message)
-          return DecisionResult.new(holdout_decision.decision, false, reasons)
-        end
+        next unless holdout_decision.decision
+        message = "The user '#{user_id}' is bucketed into holdout '#{holdout['key']}' for feature flag '#{feature_flag['key']}'."
+        @logger.log(Logger::INFO, message)
+        reasons.push(message)
+        return DecisionResult.new(holdout_decision.decision, false, reasons)
       end
 
       # Check if the feature flag has an experiment and the user is bucketed into that experiment
       experiment_decision = get_variation_for_feature_experiment(project_config, feature_flag, user_context, user_profile_tracker, decide_options)
       reasons.push(*experiment_decision.reasons)
 
-      if experiment_decision.decision
-        return DecisionResult.new(experiment_decision.decision, experiment_decision.error, reasons)
-      end
+      return DecisionResult.new(experiment_decision.decision, experiment_decision.error, reasons) if experiment_decision.decision
 
       # Check if the feature flag has a rollout and the user is bucketed into that rollout
       rollout_decision = get_variation_for_feature_rollout(project_config, feature_flag, user_context)
@@ -216,13 +213,13 @@ def get_decision_for_flag(feature_flag, user_context, project_config, decide_opt
         message = "The user '#{user_id}' is bucketed into a rollout for feature flag '#{feature_flag['key']}'."
         @logger.log(Logger::INFO, message)
         reasons.push(message)
-        return DecisionResult.new(rollout_decision.decision, rollout_decision.error, reasons)
+        DecisionResult.new(rollout_decision.decision, rollout_decision.error, reasons)
       else
         message = "The user '#{user_id}' is not bucketed into a rollout for feature flag '#{feature_flag['key']}'."
         @logger.log(Logger::INFO, message)
         reasons.push(message)
         default_decision = Decision.new(nil, nil, DECISION_SOURCES['ROLLOUT'], nil)
-        return DecisionResult.new(nil, false, reasons)
+        DecisionResult.new(nil, false, reasons)
       end
     end
 
@@ -262,12 +259,12 @@ def get_variation_for_holdout(holdout, user_context, project_config)
         decide_reasons.push(message)
 
         holdout_decision = Decision.new(holdout, variation, DECISION_SOURCES['HOLDOUT'], nil)
-        return DecisionResult.new(holdout_decision, false, decide_reasons)
+        DecisionResult.new(holdout_decision, false, decide_reasons)
       else
         message = "The user '#{user_id}' is not bucketed into holdout '#{holdout['key']}'."
         @logger.log(Logger::DEBUG, message)
         decide_reasons.push(message)
-        return DecisionResult.new(nil, false, decide_reasons)
+        DecisionResult.new(nil, false, decide_reasons)
       end
     end
 

spec/bucketing_holdout_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #
 #    Copyright 2025 Optimizely and contributors
 #
@@ -46,7 +48,7 @@
       # Set bucket value to be within first variation's traffic allocation (0-5000 range)
       test_bucketer.set_bucket_values([2500])
 
-      variation, reasons = test_bucketer.bucket(config, holdout, test_bucketing_id, test_user_id)
+      variation, _reasons = test_bucketer.bucket(config, holdout, test_bucketing_id, test_user_id)
 
       expect(variation).not_to be_nil
       expect(variation['id']).to eq('var_1')
@@ -70,7 +72,7 @@
       # Set bucket value outside traffic allocation range
       test_bucketer.set_bucket_values([1500])
 
-      variation, reasons = test_bucketer.bucket(config, modified_holdout, test_bucketing_id, test_user_id)
+      variation, _reasons = test_bucketer.bucket(config, modified_holdout, test_bucketing_id, test_user_id)
 
       expect(variation).to be_nil
 
@@ -91,7 +93,7 @@
 
       test_bucketer.set_bucket_values([5000])
 
-      variation, reasons = test_bucketer.bucket(config, modified_holdout, test_bucketing_id, test_user_id)
+      variation, _reasons = test_bucketer.bucket(config, modified_holdout, test_bucketing_id, test_user_id)
 
       expect(variation).to be_nil
 
@@ -112,7 +114,7 @@
 
       test_bucketer.set_bucket_values([5000])
 
-      variation, reasons = test_bucketer.bucket(config, modified_holdout, test_bucketing_id, test_user_id)
+      variation, _reasons = test_bucketer.bucket(config, modified_holdout, test_bucketing_id, test_user_id)
 
       expect(variation).to be_nil
 
@@ -130,7 +132,7 @@
 
       test_bucketer.set_bucket_values([5000])
 
-      variation, reasons = test_bucketer.bucket(config, holdout, test_bucketing_id, test_user_id)
+      variation, _reasons = test_bucketer.bucket(config, holdout, test_bucketing_id, test_user_id)
 
       expect(variation).to be_nil
 
@@ -151,7 +153,7 @@
 
       test_bucketer.set_bucket_values([5000])
 
-      variation, reasons = test_bucketer.bucket(config, modified_holdout, test_bucketing_id, test_user_id)
+      variation, _reasons = test_bucketer.bucket(config, modified_holdout, test_bucketing_id, test_user_id)
 
       # Should return nil for invalid experiment key
       expect(variation).to be_nil
@@ -167,7 +169,7 @@
 
       test_bucketer.set_bucket_values([5000])
 
-      variation, reasons = test_bucketer.bucket(config, modified_holdout, test_bucketing_id, test_user_id)
+      variation, _reasons = test_bucketer.bucket(config, modified_holdout, test_bucketing_id, test_user_id)
 
       # Should return nil for null experiment key
       expect(variation).to be_nil
@@ -182,7 +184,7 @@
 
       # Test user buckets into first variation
       test_bucketer.set_bucket_values([2500])
-      variation, reasons = test_bucketer.bucket(config, holdout, test_bucketing_id, test_user_id)
+      variation, _reasons = test_bucketer.bucket(config, holdout, test_bucketing_id, test_user_id)
 
       expect(variation).not_to be_nil
       expect(variation['id']).to eq('var_1')
@@ -200,7 +202,7 @@
 
       # Test user buckets into second variation (bucket value 7500 should be in 5000-10000 range)
       test_bucketer.set_bucket_values([7500])
-      variation, reasons = test_bucketer.bucket(config, holdout, test_bucketing_id, test_user_id)
+      variation, _reasons = test_bucketer.bucket(config, holdout, test_bucketing_id, test_user_id)
 
       expect(variation).not_to be_nil
       expect(variation['id']).to eq('var_2')
@@ -217,14 +219,14 @@
 
       # Test exact boundary value (should be included)
       test_bucketer.set_bucket_values([4999])
-      variation, reasons = test_bucketer.bucket(config, modified_holdout, test_bucketing_id, test_user_id)
+      variation, _reasons = test_bucketer.bucket(config, modified_holdout, test_bucketing_id, test_user_id)
 
       expect(variation).not_to be_nil
       expect(variation['id']).to eq('var_1')
 
       # Test value just outside boundary (should not be included)
       test_bucketer.set_bucket_values([5000])
-      variation, reasons = test_bucketer.bucket(config, modified_holdout, test_bucketing_id, test_user_id)
+      variation, _reasons = test_bucketer.bucket(config, modified_holdout, test_bucketing_id, test_user_id)
 
       expect(variation).to be_nil
     end
@@ -235,8 +237,8 @@
 
       # Create a real bucketer (not test bucketer) for consistent hashing
       real_bucketer = Optimizely::Bucketer.new(spy_logger)
-      variation1, reasons1 = real_bucketer.bucket(config, holdout, test_bucketing_id, test_user_id)
-      variation2, reasons2 = real_bucketer.bucket(config, holdout, test_bucketing_id, test_user_id)
+      variation1, _reasons1 = real_bucketer.bucket(config, holdout, test_bucketing_id, test_user_id)
+      variation2, _reasons2 = real_bucketer.bucket(config, holdout, test_bucketing_id, test_user_id)
 
       # Results should be identical
       if variation1
@@ -267,7 +269,7 @@
       expect(holdout).not_to be_nil
 
       test_bucketer.set_bucket_values([5000])
-      variation, reasons = test_bucketer.bucket(config, holdout, test_bucketing_id, test_user_id)
+      variation, _reasons = test_bucketer.bucket(config, holdout, test_bucketing_id, test_user_id)
 
       expect(reasons).not_to be_nil
       # Decision reasons should be populated from the bucketing process
@@ -284,9 +286,8 @@ def initialize(logger)
     @bucket_index = 0
   end
 
-  def set_bucket_values(values)
+  def bucket_values(values)
     @bucket_values = values
-    @bucket_index = 0
   end
 
   def generate_bucket_value(bucketing_id)
@@ -296,4 +297,4 @@ def generate_bucket_value(bucketing_id)
     @bucket_index = (@bucket_index + 1) % @bucket_values.length
     value
   end
-end
+end

spec/config/datafile_project_config_spec.rb

@@ -1512,7 +1512,7 @@
 
     describe '#decide with multiple holdouts' do
       it 'should handle multiple holdouts for different flags' do
-        flag_keys = ['test_flag_1', 'test_flag_2', 'test_flag_3', 'test_flag_4']
+        flag_keys = %w[test_flag_1 test_flag_2 test_flag_3 test_flag_4]
 
         flag_keys.each do |flag_key|
           feature_flag = config_with_holdouts.feature_flag_key_map[flag_key]
@@ -1667,7 +1667,7 @@
     describe 'holdout status messages' do
       it 'should differentiate between running and non-running holdouts' do
         running_holdouts = config_with_holdouts.holdouts.select { |h| h['status'] == 'Running' }
-        non_running_holdouts = config_with_holdouts.holdouts.select { |h| h['status'] != 'Running' }
+        non_running_holdouts = config_with_holdouts.holdouts.reject { |h| h['status'] == 'Running' }
 
         # Only running holdouts should be in the holdout_id_map
         running_holdouts.each do |holdout|

spec/decision_service_spec.rb

@@ -1216,7 +1216,7 @@
 
           user_context = project_with_holdouts.create_user_context('testUserId', {})
 
-          result = decision_service_with_holdouts.get_variations_for_feature_list(
+          _result = decision_service_with_holdouts.get_variations_for_feature_list(
             [feature_flag],
             user_context,
             config_with_holdouts,
@@ -1228,7 +1228,7 @@
           expect(result.length).to be > 0
 
           # Check if any decision is from holdout source
-          holdout_decision = result.find do |decision_result|
+          _holdout_decision = result.find do |decision_result|
             decision_result.decision&.source == Optimizely::DecisionService::DECISION_SOURCES['HOLDOUT']
           end
 
@@ -1255,7 +1255,7 @@
 
           user_context = project_with_holdouts.create_user_context('testUserId', {})
 
-          result = decision_service_with_holdouts.get_variations_for_feature_list(
+          _result = decision_service_with_holdouts.get_variations_for_feature_list(
             [feature_flag],
             user_context,
             config_with_holdouts,
@@ -1283,7 +1283,7 @@
 
           user_context = project_with_holdouts.create_user_context('testUserId', {})
 
-          result = decision_service_with_holdouts.get_variations_for_feature_list(
+          _result = decision_service_with_holdouts.get_variations_for_feature_list(
             [feature_flag],
             user_context,
             config_with_holdouts,
@@ -1312,7 +1312,7 @@
 
           user_context = project_with_holdouts.create_user_context('testUserId', user_attributes)
 
-          result = decision_service_with_holdouts.get_variations_for_feature_list(
+          _result = decision_service_with_holdouts.get_variations_for_feature_list(
             [feature_flag],
             user_context,
             config_with_holdouts,
@@ -1334,7 +1334,7 @@
 
           user_context = project_with_holdouts.create_user_context('testUserId', {})
 
-          result = decision_service_with_holdouts.get_variations_for_feature_list(
+          _result = decision_service_with_holdouts.get_variations_for_feature_list(
             [feature_flag],
             user_context,
             config_with_holdouts,
@@ -1357,7 +1357,7 @@
           # Empty user ID should still be valid for bucketing
           user_context = project_with_holdouts.create_user_context('', {})
 
-          result = decision_service_with_holdouts.get_variations_for_feature_list(
+          _result = decision_service_with_holdouts.get_variations_for_feature_list(
             [feature_flag],
             user_context,
             config_with_holdouts,
@@ -1384,7 +1384,7 @@
 
           user_context = project_with_holdouts.create_user_context('testUserId', {})
 
-          result = decision_service_with_holdouts.get_variations_for_feature_list(
+          _result = decision_service_with_holdouts.get_variations_for_feature_list(
             [feature_flag],
             user_context,
             config_with_holdouts,
@@ -1396,12 +1396,12 @@
           # With real bucketer, we expect proper decision reasons to be generated
           # Find any decision with reasons
           decision_with_reasons = result.find do |decision_result|
-            decision_result.reasons && decision_result.reasons.length > 0
+            if decision_result.reasons && !decision_result.reasons.empty?
+              true
+            end
           end
 
-          if decision_with_reasons
-            expect(decision_with_reasons.reasons.length).to be > 0
-          end
+          expect(decision_with_reasons.reasons).not_to be_empty if decision_with_reasons
         end
       end
     end
@@ -1513,7 +1513,7 @@
         if global_holdouts.length > 0
           user_context = project_with_holdouts.create_user_context('testUserId', {})
 
-          result = decision_service_with_holdouts.get_variations_for_feature_list(
+          _result = decision_service_with_holdouts.get_variations_for_feature_list(
             [feature_flag],
             user_context,
             config_with_holdouts,
@@ -1569,7 +1569,7 @@
 
         user_context = project_with_holdouts.create_user_context('testUserId', {})
 
-        result = decision_service_with_holdouts.get_variations_for_feature_list(
+        _result = decision_service_with_holdouts.get_variations_for_feature_list(
           [feature_flag],
           user_context,
           config_with_holdouts,
@@ -1589,7 +1589,7 @@
         user_context = project_with_holdouts.create_user_context('testUserId', {})
 
         # The method should handle invalid holdout data without crashing
-        result = decision_service_with_holdouts.get_variations_for_feature_list(
+        _result = decision_service_with_holdouts.get_variations_for_feature_list(
           [feature_flag],
           user_context,
           config_with_holdouts,
@@ -1651,7 +1651,7 @@
 
         user_context = project_with_holdouts.create_user_context('testUserId', user_attributes)
 
-        result = decision_service_with_holdouts.get_variations_for_feature_list(
+        _result = decision_service_with_holdouts.get_variations_for_feature_list(
           [feature_flag],
           user_context,
           config_with_holdouts,
@@ -1669,12 +1669,12 @@
         expect(feature_flag).not_to be_nil
 
         # Test with multiple users to see varying bucketing results
-        users = ['user1', 'user2', 'user3', 'user4', 'user5']
+        users = %w[user1 user2 user3 user4 user5]
         results = []
 
         users.each do |user_id|
           user_context = project_with_holdouts.create_user_context(user_id, {})
-          result = decision_service_with_holdouts.get_variations_for_feature_list(
+          _result = decision_service_with_holdouts.get_variations_for_feature_list(
             [feature_flag],
             user_context,
             config_with_holdouts,