Fix lint issues

Author: esrakartalOpt

lib/optimizely/config/datafile_project_config.rb

@@ -33,7 +33,7 @@ class DatafileProjectConfig < ProjectConfig
                 :group_id_map, :rollout_id_map, :rollout_experiment_id_map, :variation_id_map,
                 :variation_id_to_variable_usage_map, :variation_key_map, :variation_id_map_by_experiment_id,
                 :variation_key_map_by_experiment_id, :flag_variation_map, :integration_key_map, :integrations,
-                :public_key_for_odp, :host_for_odp, :all_segments, :region, :holdouts, :holdout_id_map, 
+                :public_key_for_odp, :host_for_odp, :all_segments, :region, :holdouts, :holdout_id_map,
                 :global_holdouts, :included_holdouts, :excluded_holdouts, :flag_holdouts_map
     # Boolean - denotes if Optimizely should remove the last block of visitors' IP address before storing event data
     attr_reader :anonymize_ip
@@ -127,8 +127,7 @@ def initialize(datafile, logger, error_handler)
         if holdout['includedFlags'].nil? || holdout['includedFlags'].empty?
           @global_holdouts[holdout['id']] = holdout
 
-          if holdout['excludedFlags']
-            holdout['excludedFlags'].each do |flag_id|
+          holdout['excludedFlags']&.each do |flag_id|
               @excluded_holdouts[flag_id] ||= []
               @excluded_holdouts[flag_id] << holdout
             end
@@ -631,7 +630,7 @@ def get_holdouts_for_flag(flag_key)
       # Helper method to get holdouts from an applied feature flag
       #
       # flag_key - Key of the feature flag
-      # 
+      #
       # Returns the holdouts that apply for a specific flag
 
       feature_flag = @feature_flag_key_map[flag_key]
@@ -659,30 +658,26 @@ def get_holdouts_for_flag(flag_key)
       end
 
       # Add holdouts that specifically include this flag
-      if @included_holdouts.key?(flag_id)
-        holdouts.concat(@included_holdouts[flag_id])
-      end
+      holdouts.concat(@included_holdouts[flag_id]) if @included_holdouts.key?(flag_id)
 
       # Cache the result
       @flag_holdouts_map[flag_id] = holdouts
 
-      return holdouts
+      holdouts
     end
 
     def get_holdout(holdout_id)
       # Helper method to get holdout from holdout ID
       #
       # holdout_id - ID of the holdout
-      # 
+      #
       # Returns the holdout
 
       holdout = @holdout_id_map[holdout_id]
-      if holdout
-        return holdout
-      else
-        @logger.log Logger::ERROR, "Holdout with ID '#{holdout_id}' not found."
-        return nil
-      end
+      return holdout if holdout
+
+      @logger.log Logger::ERROR, "Holdout with ID '#{holdout_id}' not found."
+      nil
     end
   end
 end

spec/config/datafile_project_config_spec.rb

@@ -1238,8 +1238,8 @@
   describe '#get_holdouts_for_flag' do
     let(:config_with_holdouts) do
       Optimizely::DatafileProjectConfig.new(
-        OptimizelySpec::CONFIG_BODY_WITH_HOLDOUTS_JSON, 
-        logger, 
+        OptimizelySpec::CONFIG_BODY_WITH_HOLDOUTS_JSON,
+        logger,
         error_handler
       )
     end
@@ -1288,8 +1288,8 @@
   describe '#get_holdout' do
     let(:config_with_holdouts) do
       Optimizely::DatafileProjectConfig.new(
-        OptimizelySpec::CONFIG_BODY_WITH_HOLDOUTS_JSON, 
-        logger, 
+        OptimizelySpec::CONFIG_BODY_WITH_HOLDOUTS_JSON,
+        logger,
         error_handler
       )
     end
@@ -1338,7 +1338,7 @@
 
       expect(result).to be_nil
       expect(spy_logger).to have_received(:log).with(
-        Logger::ERROR, 
+        Logger::ERROR,
         "Holdout with ID 'invalid_holdout_id' not found."
       )
     end
@@ -1348,7 +1348,7 @@
 
       expect(result).not_to be_nil
       expect(spy_logger).not_to have_received(:log).with(
-        Logger::ERROR, 
+        Logger::ERROR,
         anything
       )
     end
@@ -1363,13 +1363,13 @@
           'key' => 'global',
           'status' => 'Running',
           'includedFlags' => [],
-          'excludedFlags' => ['boolean_feature', 'string_single_variable_feature']
+          'excludedFlags' => %w[boolean_feature string_single_variable_feature]
         },
         {
           'id' => 'specific_holdout',
           'key' => 'specific',
-          'status' => 'Running', 
-          'includedFlags' => ['multi_variate_feature', 'empty_feature'],
+          'status' => 'Running',
+          'includedFlags' => %w[multi_variate_feature empty_feature],
           'excludedFlags' => []
         },
         {

spec/spec_params.rb

@@ -1940,30 +1940,30 @@ module OptimizelySpec
   CONFIG_DICT_WITH_INTEGRATIONS_JSON = JSON.dump(CONFIG_DICT_WITH_INTEGRATIONS)
 
   CONFIG_BODY_WITH_HOLDOUTS = VALID_CONFIG_BODY.merge({
-    'holdouts' => [
-      {
-        'id' => 'holdout_1',
-        'key' => 'global_holdout',
-        'status' => 'Running',
-        'includedFlags' => [],
-        'excludedFlags' => ['553339214']
-      },
-      {
-        'id' => 'holdout_2', 
-        'key' => 'specific_holdout',
-        'status' => 'Running',
-        'includedFlags' => ['594089'],
-        'excludedFlags' => []
-      },
-      {
-        'id' => 'holdout_3',
-        'key' => 'inactive_holdout',
-        'status' => 'Inactive',
-        'includedFlags' => ['553339214'],
-        'excludedFlags' => []
-      }
-    ]
-  }).freeze
+      'holdouts' => [
+        {
+          'id' => 'holdout_1',
+          'key' => 'global_holdout',
+          'status' => 'Running',
+          'includedFlags' => [],
+          'excludedFlags' => ['553339214']
+        },
+        {
+          'id' => 'holdout_2',
+          'key' => 'specific_holdout',
+          'status' => 'Running',
+          'includedFlags' => ['594089'],
+          'excludedFlags' => []
+        },
+        {
+          'id' => 'holdout_3',
+          'key' => 'inactive_holdout',
+          'status' => 'Inactive',
+          'includedFlags' => ['553339214'],
+          'excludedFlags' => []
+        }
+      ]
+    }).freeze
 
   CONFIG_BODY_WITH_HOLDOUTS_JSON = JSON.dump(CONFIG_BODY_WITH_HOLDOUTS).freeze