got tests running

Author: ndbroadbent

lib/log_struct.rb

@@ -6,7 +6,7 @@
 require "log_struct/version"
 require "log_struct/enums"  # All enums are now in the enums directory
 require "log_struct/configuration"
-require "log_struct/json_formatter"
+require "log_struct/formatter"
 require "log_struct/railtie"
 require "log_struct/concerns/error_handling"
 require "log_struct/concerns/configuration"

lib/log_struct/integrations/sidekiq/logger.rb

@@ -1,9 +1,9 @@
 # typed: strict
 # frozen_string_literal: true
 
-require_relative "../../../logger"
-require_relative "../../../log/sidekiq"
-require_relative "../../../enums/source"
+require_relative "../../logger"
+require_relative "../../log/sidekiq"
+require_relative "../../enums/source"
 
 module LogStruct
   module Integrations

lib/log_struct/log.rb

@@ -1,22 +1,20 @@
 # typed: strict
 # frozen_string_literal: true
 
-# Enums
+# Common Enums
 require_relative "enums/source"
 require_relative "enums/log_event"
 require_relative "enums/log_level"
 
 # Log Structs
-require_relative "log/log_interface"
-require_relative "log/request_interface"
-require_relative "log/log_serialization"
+require_relative "log/carrierwave"
+require_relative "log/email"
 require_relative "log/error"
 require_relative "log/exception"
-require_relative "log/email"
-require_relative "log/request"
 require_relative "log/job"
-require_relative "log/storage"
-require_relative "log/shrine"
-require_relative "log/carrierwave"
 require_relative "log/plain"
+require_relative "log/request"
+require_relative "log/security"
+require_relative "log/shrine"
 require_relative "log/sidekiq"
+require_relative "log/storage"

lib/log_struct/log/security.rb

@@ -1,16 +1,16 @@
 # typed: strict
 # frozen_string_literal: true
 
-require_relative "interfaces/log_interface"
-require_relative "interfaces/request_interface"
-require_relative "interfaces/msg_interface"
+require_relative "interfaces/common_interface"
 require_relative "interfaces/data_interface"
-require_relative "shared/data_merging"
+require_relative "interfaces/message_interface"
+require_relative "interfaces/request_interface"
+require_relative "shared/add_request_fields"
 require_relative "shared/merge_data_fields"
-require_relative "../enums/source"
+require_relative "shared/serialize_common"
 require_relative "../enums/log_event"
 require_relative "../enums/log_level"
-require_relative "../log_security_event"
+require_relative "../enums/source"
 require_relative "../log_keys"
 
 module LogStruct
@@ -20,9 +20,9 @@ class Security < T::Struct
       extend T::Sig
 
       include CommonInterface
-      include RequestInterface
-      include MessageInterface
       include DataInterface
+      include MessageInterface
+      include RequestInterface
       include SerializeCommon
       include AddRequestFields
       include MergeDataFields

lib/log_struct/log/shared/add_request_fields.rb

@@ -1,8 +1,8 @@
 # typed: strict
 # frozen_string_literal: true
 
-require_relative "../interfaces/log_interface"
 require_relative "../../log_keys"
+require_relative "../interfaces/request_interface"
 
 module LogStruct
   module Log

lib/log_struct/log/shared/merge_data_fields.rb

@@ -1,9 +1,9 @@
 # typed: strict
 # frozen_string_literal: true
 
-require_relative "data_interface"
-require_relative "serialize_common"
 require_relative "../../log_keys"
+require_relative "../interfaces/data_interface"
+require_relative "serialize_common"
 
 module LogStruct
   module Log

lib/log_struct/log/shared/serialize_common.rb

@@ -1,8 +1,8 @@
 # typed: strict
 # frozen_string_literal: true
 
-require_relative "../interfaces/log_interface"
 require_relative "../../log_keys"
+require_relative "../interfaces/common_interface"
 
 module LogStruct
   module Log

lib/log_struct/log/storage.rb

@@ -1,7 +1,7 @@
 # typed: strict
 # frozen_string_literal: true
 
-require_relative "log_interface"
+require_relative "interfaces/common_interface"
 require_relative "shared/serialize_common"
 require_relative "../enums/source"
 require_relative "../enums/log_event"