Fix Rubocop failures

Author: zachaysan

lib/flagsmith.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
-require "pry"
-require "pry-byebug"
+
+require 'pry'
+require 'pry-byebug'
 
 require 'faraday'
 require 'faraday/retry'
@@ -70,14 +71,14 @@ def initialize(config)
     end
 
     def validate_offline_mode!
-      if @config.offline_mode? and not @config.offline_handler
+      if @config.offline_mode? && !@config.offline_handler
         raise Flagsmith::ClientError,
               'The offline_mode config param requires a matching offline_handler.'
       end
-      if @config.offline_handler and @config.default_flag_handler
-        raise Flagsmith::ClientError,
-        'Cannot use offline_handler and default_flag_handler at the same time.'
-      end
+      return unless @config.offline_handler && @config.default_flag_handler
+
+      raise Flagsmith::ClientError,
+            'Cannot use offline_handler and default_flag_handler at the same time.'
     end
 
     def api_client
@@ -126,9 +127,7 @@ def environment_from_api
     # Get all the default for flags for the current environment.
     # @returns Flags object holding all the flags for the current environment.
     def get_environment_flags # rubocop:disable Naming/AccessorMethodName
-      if @config.local_evaluation? or @config.offline_mode
-        return environment_flags_from_document
-      end
+      return environment_flags_from_document if @config.local_evaluation? || @config.offline_mode
 
       environment_flags_from_api
     end
@@ -194,7 +193,7 @@ def environment_flags_from_document
         engine.get_environment_feature_states(environment),
         analytics_processor: analytics_processor,
         default_flag_handler: default_flag_handler,
-        offline_handler: offline_handler,
+        offline_handler: offline_handler
       )
     end
 
@@ -205,23 +204,25 @@ def get_identity_flags_from_document(identifier, traits = {})
         engine.get_identity_feature_states(environment, identity_model),
         analytics_processor: analytics_processor,
         default_flag_handler: default_flag_handler,
-        offline_handler: offline_handler,
+        offline_handler: offline_handler
       )
     end
 
+    # rubocop:disable Metrics/MethodLength
     def environment_flags_from_api
       if offline_handler
         begin
-          return process_environment_flags_from_api
-        rescue
-          return environment_flags_from_document
+          process_environment_flags_from_api
+        rescue StandardError
+          environment_flags_from_document
         end
       else
         rescue_with_default_handler do
           return process_environment_flags_from_api
         end
       end
     end
+    # rubocop:enable Metrics/MethodLength
 
     def process_environment_flags_from_api
       api_flags = api_client.get(@config.environment_flags_url).body
@@ -234,19 +235,21 @@ def process_environment_flags_from_api
       )
     end
 
+    # rubocop:disable Metrics/MethodLength
     def get_identity_flags_from_api(identifier, traits = {})
       if offline_handler
         begin
-          return process_identity_flags_from_api(identifier, traits)
-        rescue
-          return get_identity_flags_from_document(identifier, traits)
+          process_identity_flags_from_api(identifier, traits)
+        rescue StandardError
+          get_identity_flags_from_document(identifier, traits)
         end
       else
         rescue_with_default_handler do
           return process_identity_flags_from_api(identifier, traits)
         end
       end
     end
+    # rubocop:enable Metrics/MethodLength
 
     def process_identity_flags_from_api(identifier, traits = {})
       data = generate_identities_data(identifier, traits)

lib/flagsmith/sdk/models/flags.rb

@@ -120,6 +120,14 @@ def feature_value(feature_name)
       end
       alias get_feature_value feature_value
 
+      def get_flag_from_offline_handler(key)
+        @offline_handler.environment.feature_states.each do |feature_state|
+          return Flag.from_feature_state_model(feature_state, nil) if key == Flagsmith::Flags::Collection.normalize_key(feature_state.feature.name)
+        end
+        raise Flagsmith::Flags::NotFound,
+              "Feature does not exist: #{key}, offline_handler did not find a flag in this case."
+      end
+
       # Get a specific flag given the feature name.
       # :param feature_name: the name of the feature to retrieve the flag for.
       # :return: BaseFlag object.
@@ -131,16 +139,7 @@ def get_flag(feature_name)
         @analytics_processor.track_feature(flag.feature_name) if @analytics_processor && flag.feature_id
         flag
       rescue KeyError
-        if @offline_handler
-          @offline_handler.environment.feature_states.each do |feature_state|
-            if key == Flagsmith::Flags::Collection.normalize_key(feature_state.feature.name)
-              return Flag.from_feature_state_model(feature_state, nil)
-            end
-          end
-
-          raise Flagsmith::Flags::NotFound,
-                "Feature does not exist: #{key}, offline_handler did not find a flag in this case."
-        end
+        return get_flag_from_offline_handler(key) if @offline_handler
 
         return @default_flag_handler.call(feature_name) if @default_flag_handler
 

lib/flagsmith/sdk/offline_handlers.rb

@@ -2,8 +2,8 @@
 
 module Flagsmith
   module OfflineHandlers
+    # Provides the offline_handler to the Flagsmith::Client.
     class LocalFileHandler
-
       attr_reader :environment
 
       def initialize(environment_document_path)
@@ -12,7 +12,6 @@ def initialize(environment_document_path)
         data = JSON.parse(environment_file.read, symbolize_names: true)
         @environment = Flagsmith::Engine::Environment.build(data)
       end
-
     end
   end
 end