logstruct 0.1.2 → 0.1.3

data/lib/log_struct/log/active_job/enqueue.rb

@@ -9,9 +9,9 @@
 require "log_struct/shared/interfaces/common_fields"
 require "log_struct/shared/interfaces/additional_data_field"
 require "log_struct/shared/interfaces/request_fields"
-require "log_struct/shared/shared/serialize_common"
-require "log_struct/shared/shared/merge_additional_data_fields"
-require "log_struct/shared/shared/add_request_fields"
+require "log_struct/shared/serialize_common"
+require "log_struct/shared/merge_additional_data_fields"
+require "log_struct/shared/add_request_fields"
 require_relative "../../enums/source"
 require_relative "../../enums/event"
 require_relative "../../enums/level"
@@ -21,11 +21,6 @@ module LogStruct
   module Log
     class ActiveJob
       class Enqueue < T::Struct
-        # typed: strict
-        # frozen_string_literal: true
-
-        extend T::Sig
-
         extend T::Sig
 
         # Shared/common fields
@@ -36,7 +31,7 @@ module LogStruct
 
         const :job_id, String
         const :job_class, String
-        const :queue_name, T.nilable(String), default: nil
+        const :queue_name, T.nilable(Symbol), default: nil
         const :arguments, T.nilable(T::Array[T.untyped]), default: nil
         const :executions, T.nilable(Integer), default: nil
         const :provider_job_id, T.nilable(String), default: nil
@@ -44,81 +39,22 @@ module LogStruct
         # Event-specific fields
         const :retries, T.nilable(Integer), default: nil
 
-        # Additional data
-
-        # Request fields (optional)
-
         # Serialize shared fields
         include LogStruct::Log::Interfaces::CommonFields
         include LogStruct::Log::Shared::SerializeCommon
 
-        sig {
-          params(job_id: T.untyped,
-            job_class: T.untyped,
-            queue_name: T.untyped,
-            arguments: T.untyped,
-            executions: T.untyped,
-            provider_job_id: T.untyped).returns(T::Hash[LogStruct::LogField, T.untyped])
-        }
-        def self.base_hash(job_id: nil,
-          job_class: nil,
-          queue_name: nil,
-          arguments: nil,
-          executions: nil,
-          provider_job_id: nil)
-          h = {}
-          h[LogField::JobId] = job_id unless job_id.nil?
-          h[LogField::JobClass] = job_class unless job_class.nil?
+        sig { returns(T::Hash[LogStruct::LogField, T.untyped]) }
+        def to_h
+          h = T.let({}, T::Hash[LogStruct::LogField, T.untyped])
+          h[LogField::JobId] = job_id
+          h[LogField::JobClass] = job_class
           h[LogField::QueueName] = queue_name unless queue_name.nil?
           h[LogField::Arguments] = arguments unless arguments.nil?
           h[LogField::Executions] = executions unless executions.nil?
           h[LogField::ProviderJobId] = provider_job_id unless provider_job_id.nil?
-          h
-        end
-
-        sig {
-          params(job_id: T.untyped,
-            job_class: T.untyped,
-            queue_name: T.untyped,
-            arguments: T.untyped,
-            executions: T.untyped,
-            provider_job_id: T.untyped,
-            retries: T.untyped,
-            additional_data: T.untyped,
-            timestamp: T.untyped).returns(T::Hash[LogStruct::LogField, T.untyped])
-        }
-        def self.build(job_id:,
-          job_class:,
-          queue_name: nil,
-          arguments: nil,
-          executions: nil,
-          provider_job_id: nil,
-          retries: nil,
-          additional_data: nil,
-          timestamp: Time.now)
-          h = base_hash(job_id: job_id,
-            job_class: job_class,
-            queue_name: queue_name,
-            arguments: arguments,
-            executions: executions,
-            provider_job_id: provider_job_id)
           h[LogField::Retries] = retries unless retries.nil?
           h
         end
-
-        sig { returns(T::Hash[LogStruct::LogField, T.untyped]) }
-        def to_h
-          self.class.build(
-            job_id: job_id,
-            job_class: job_class,
-            queue_name: queue_name,
-            arguments: arguments,
-            executions: executions,
-            provider_job_id: provider_job_id,
-            retries: retries,
-            timestamp: timestamp
-          )
-        end
       end
     end
   end

data/lib/log_struct/log/active_job/finish.rb

@@ -9,9 +9,9 @@
 require "log_struct/shared/interfaces/common_fields"
 require "log_struct/shared/interfaces/additional_data_field"
 require "log_struct/shared/interfaces/request_fields"
-require "log_struct/shared/shared/serialize_common"
-require "log_struct/shared/shared/merge_additional_data_fields"
-require "log_struct/shared/shared/add_request_fields"
+require "log_struct/shared/serialize_common"
+require "log_struct/shared/merge_additional_data_fields"
+require "log_struct/shared/add_request_fields"
 require_relative "../../enums/source"
 require_relative "../../enums/event"
 require_relative "../../enums/level"
@@ -21,11 +21,6 @@ module LogStruct
   module Log
     class ActiveJob
       class Finish < T::Struct
-        # typed: strict
-        # frozen_string_literal: true
-
-        extend T::Sig
-
         extend T::Sig
 
         # Shared/common fields
@@ -36,7 +31,7 @@ module LogStruct
 
         const :job_id, String
         const :job_class, String
-        const :queue_name, T.nilable(String), default: nil
+        const :queue_name, T.nilable(Symbol), default: nil
         const :arguments, T.nilable(T::Array[T.untyped]), default: nil
         const :executions, T.nilable(Integer), default: nil
         const :provider_job_id, T.nilable(String), default: nil
@@ -45,85 +40,23 @@ module LogStruct
         const :duration_ms, Float
         const :finished_at, Time
 
-        # Additional data
-
-        # Request fields (optional)
-
         # Serialize shared fields
         include LogStruct::Log::Interfaces::CommonFields
         include LogStruct::Log::Shared::SerializeCommon
 
-        sig {
-          params(job_id: T.untyped,
-            job_class: T.untyped,
-            queue_name: T.untyped,
-            arguments: T.untyped,
-            executions: T.untyped,
-            provider_job_id: T.untyped).returns(T::Hash[LogStruct::LogField, T.untyped])
-        }
-        def self.base_hash(job_id: nil,
-          job_class: nil,
-          queue_name: nil,
-          arguments: nil,
-          executions: nil,
-          provider_job_id: nil)
-          h = {}
-          h[LogField::JobId] = job_id unless job_id.nil?
-          h[LogField::JobClass] = job_class unless job_class.nil?
+        sig { returns(T::Hash[LogStruct::LogField, T.untyped]) }
+        def to_h
+          h = T.let({}, T::Hash[LogStruct::LogField, T.untyped])
+          h[LogField::JobId] = job_id
+          h[LogField::JobClass] = job_class
           h[LogField::QueueName] = queue_name unless queue_name.nil?
           h[LogField::Arguments] = arguments unless arguments.nil?
           h[LogField::Executions] = executions unless executions.nil?
           h[LogField::ProviderJobId] = provider_job_id unless provider_job_id.nil?
-          h
-        end
-
-        sig {
-          params(duration_ms: T.untyped,
-            finished_at: T.untyped,
-            job_id: T.untyped,
-            job_class: T.untyped,
-            queue_name: T.untyped,
-            arguments: T.untyped,
-            executions: T.untyped,
-            provider_job_id: T.untyped,
-            additional_data: T.untyped,
-            timestamp: T.untyped).returns(T::Hash[LogStruct::LogField, T.untyped])
-        }
-        def self.build(duration_ms:,
-          finished_at:,
-          job_id:,
-          job_class:,
-          queue_name: nil,
-          arguments: nil,
-          executions: nil,
-          provider_job_id: nil,
-          additional_data: nil,
-          timestamp: Time.now)
-          h = base_hash(job_id: job_id,
-            job_class: job_class,
-            queue_name: queue_name,
-            arguments: arguments,
-            executions: executions,
-            provider_job_id: provider_job_id)
           h[LogField::DurationMs] = duration_ms
           h[LogField::FinishedAt] = finished_at
           h
         end
-
-        sig { returns(T::Hash[LogStruct::LogField, T.untyped]) }
-        def to_h
-          self.class.build(
-            job_id: job_id,
-            job_class: job_class,
-            queue_name: queue_name,
-            arguments: arguments,
-            executions: executions,
-            provider_job_id: provider_job_id,
-            duration_ms: duration_ms,
-            finished_at: finished_at,
-            timestamp: timestamp
-          )
-        end
       end
     end
   end

data/lib/log_struct/log/active_job/schedule.rb

@@ -9,9 +9,9 @@
 require "log_struct/shared/interfaces/common_fields"
 require "log_struct/shared/interfaces/additional_data_field"
 require "log_struct/shared/interfaces/request_fields"
-require "log_struct/shared/shared/serialize_common"
-require "log_struct/shared/shared/merge_additional_data_fields"
-require "log_struct/shared/shared/add_request_fields"
+require "log_struct/shared/serialize_common"
+require "log_struct/shared/merge_additional_data_fields"
+require "log_struct/shared/add_request_fields"
 require_relative "../../enums/source"
 require_relative "../../enums/event"
 require_relative "../../enums/level"
@@ -21,11 +21,6 @@ module LogStruct
   module Log
     class ActiveJob
       class Schedule < T::Struct
-        # typed: strict
-        # frozen_string_literal: true
-
-        extend T::Sig
-
         extend T::Sig
 
         # Shared/common fields
@@ -36,7 +31,7 @@ module LogStruct
 
         const :job_id, String
         const :job_class, String
-        const :queue_name, T.nilable(String), default: nil
+        const :queue_name, T.nilable(Symbol), default: nil
         const :arguments, T.nilable(T::Array[T.untyped]), default: nil
         const :executions, T.nilable(Integer), default: nil
         const :provider_job_id, T.nilable(String), default: nil
@@ -44,81 +39,22 @@ module LogStruct
         # Event-specific fields
         const :scheduled_at, Time
 
-        # Additional data
-
-        # Request fields (optional)
-
         # Serialize shared fields
         include LogStruct::Log::Interfaces::CommonFields
         include LogStruct::Log::Shared::SerializeCommon
 
-        sig {
-          params(job_id: T.untyped,
-            job_class: T.untyped,
-            queue_name: T.untyped,
-            arguments: T.untyped,
-            executions: T.untyped,
-            provider_job_id: T.untyped).returns(T::Hash[LogStruct::LogField, T.untyped])
-        }
-        def self.base_hash(job_id: nil,
-          job_class: nil,
-          queue_name: nil,
-          arguments: nil,
-          executions: nil,
-          provider_job_id: nil)
-          h = {}
-          h[LogField::JobId] = job_id unless job_id.nil?
-          h[LogField::JobClass] = job_class unless job_class.nil?
+        sig { returns(T::Hash[LogStruct::LogField, T.untyped]) }
+        def to_h
+          h = T.let({}, T::Hash[LogStruct::LogField, T.untyped])
+          h[LogField::JobId] = job_id
+          h[LogField::JobClass] = job_class
           h[LogField::QueueName] = queue_name unless queue_name.nil?
           h[LogField::Arguments] = arguments unless arguments.nil?
           h[LogField::Executions] = executions unless executions.nil?
           h[LogField::ProviderJobId] = provider_job_id unless provider_job_id.nil?
-          h
-        end
-
-        sig {
-          params(scheduled_at: T.untyped,
-            job_id: T.untyped,
-            job_class: T.untyped,
-            queue_name: T.untyped,
-            arguments: T.untyped,
-            executions: T.untyped,
-            provider_job_id: T.untyped,
-            additional_data: T.untyped,
-            timestamp: T.untyped).returns(T::Hash[LogStruct::LogField, T.untyped])
-        }
-        def self.build(scheduled_at:,
-          job_id:,
-          job_class:,
-          queue_name: nil,
-          arguments: nil,
-          executions: nil,
-          provider_job_id: nil,
-          additional_data: nil,
-          timestamp: Time.now)
-          h = base_hash(job_id: job_id,
-            job_class: job_class,
-            queue_name: queue_name,
-            arguments: arguments,
-            executions: executions,
-            provider_job_id: provider_job_id)
           h[LogField::ScheduledAt] = scheduled_at
           h
         end
-
-        sig { returns(T::Hash[LogStruct::LogField, T.untyped]) }
-        def to_h
-          self.class.build(
-            job_id: job_id,
-            job_class: job_class,
-            queue_name: queue_name,
-            arguments: arguments,
-            executions: executions,
-            provider_job_id: provider_job_id,
-            scheduled_at: scheduled_at,
-            timestamp: timestamp
-          )
-        end
       end
     end
   end

data/lib/log_struct/log/active_job/start.rb

@@ -9,9 +9,9 @@
 require "log_struct/shared/interfaces/common_fields"
 require "log_struct/shared/interfaces/additional_data_field"
 require "log_struct/shared/interfaces/request_fields"
-require "log_struct/shared/shared/serialize_common"
-require "log_struct/shared/shared/merge_additional_data_fields"
-require "log_struct/shared/shared/add_request_fields"
+require "log_struct/shared/serialize_common"
+require "log_struct/shared/merge_additional_data_fields"
+require "log_struct/shared/add_request_fields"
 require_relative "../../enums/source"
 require_relative "../../enums/event"
 require_relative "../../enums/level"
@@ -21,11 +21,6 @@ module LogStruct
   module Log
     class ActiveJob
       class Start < T::Struct
-        # typed: strict
-        # frozen_string_literal: true
-
-        extend T::Sig
-
         extend T::Sig
 
         # Shared/common fields
@@ -36,7 +31,7 @@ module LogStruct
 
         const :job_id, String
         const :job_class, String
-        const :queue_name, T.nilable(String), default: nil
+        const :queue_name, T.nilable(Symbol), default: nil
         const :arguments, T.nilable(T::Array[T.untyped]), default: nil
         const :executions, T.nilable(Integer), default: nil
         const :provider_job_id, T.nilable(String), default: nil
@@ -45,85 +40,23 @@ module LogStruct
         const :started_at, Time
         const :attempt, T.nilable(Integer), default: nil
 
-        # Additional data
-
-        # Request fields (optional)
-
         # Serialize shared fields
         include LogStruct::Log::Interfaces::CommonFields
         include LogStruct::Log::Shared::SerializeCommon
 
-        sig {
-          params(job_id: T.untyped,
-            job_class: T.untyped,
-            queue_name: T.untyped,
-            arguments: T.untyped,
-            executions: T.untyped,
-            provider_job_id: T.untyped).returns(T::Hash[LogStruct::LogField, T.untyped])
-        }
-        def self.base_hash(job_id: nil,
-          job_class: nil,
-          queue_name: nil,
-          arguments: nil,
-          executions: nil,
-          provider_job_id: nil)
-          h = {}
-          h[LogField::JobId] = job_id unless job_id.nil?
-          h[LogField::JobClass] = job_class unless job_class.nil?
+        sig { returns(T::Hash[LogStruct::LogField, T.untyped]) }
+        def to_h
+          h = T.let({}, T::Hash[LogStruct::LogField, T.untyped])
+          h[LogField::JobId] = job_id
+          h[LogField::JobClass] = job_class
           h[LogField::QueueName] = queue_name unless queue_name.nil?
           h[LogField::Arguments] = arguments unless arguments.nil?
           h[LogField::Executions] = executions unless executions.nil?
           h[LogField::ProviderJobId] = provider_job_id unless provider_job_id.nil?
-          h
-        end
-
-        sig {
-          params(started_at: T.untyped,
-            job_id: T.untyped,
-            job_class: T.untyped,
-            queue_name: T.untyped,
-            arguments: T.untyped,
-            executions: T.untyped,
-            provider_job_id: T.untyped,
-            attempt: T.untyped,
-            additional_data: T.untyped,
-            timestamp: T.untyped).returns(T::Hash[LogStruct::LogField, T.untyped])
-        }
-        def self.build(started_at:,
-          job_id:,
-          job_class:,
-          queue_name: nil,
-          arguments: nil,
-          executions: nil,
-          provider_job_id: nil,
-          attempt: nil,
-          additional_data: nil,
-          timestamp: Time.now)
-          h = base_hash(job_id: job_id,
-            job_class: job_class,
-            queue_name: queue_name,
-            arguments: arguments,
-            executions: executions,
-            provider_job_id: provider_job_id)
           h[LogField::StartedAt] = started_at
           h[LogField::Attempt] = attempt unless attempt.nil?
           h
         end
-
-        sig { returns(T::Hash[LogStruct::LogField, T.untyped]) }
-        def to_h
-          self.class.build(
-            job_id: job_id,
-            job_class: job_class,
-            queue_name: queue_name,
-            arguments: arguments,
-            executions: executions,
-            provider_job_id: provider_job_id,
-            started_at: started_at,
-            attempt: attempt,
-            timestamp: timestamp
-          )
-        end
       end
     end
   end

data/lib/log_struct/log/active_job.rb

@@ -18,7 +18,7 @@ module LogStruct
         extend T::Sig
         const :job_id, String
         const :job_class, String
-        const :queue_name, T.nilable(String), default: nil
+        const :queue_name, T.nilable(Symbol), default: nil
         const :arguments, T.nilable(T::Array[T.untyped]), default: nil
         const :executions, T.nilable(Integer), default: nil
         const :provider_job_id, T.nilable(String), default: nil
@@ -27,7 +27,7 @@ module LogStruct
           {
             job_id: String,
             job_class: String,
-            queue_name: T.nilable(String),
+            queue_name: T.nilable(Symbol),
             arguments: T.nilable(T::Array[T.untyped]),
             executions: T.nilable(Integer),
             provider_job_id: T.nilable(String)

data/lib/log_struct/log/active_model_serializers.rb

@@ -9,9 +9,9 @@
 require "log_struct/shared/interfaces/common_fields"
 require "log_struct/shared/interfaces/additional_data_field"
 require "log_struct/shared/interfaces/request_fields"
-require "log_struct/shared/shared/serialize_common"
-require "log_struct/shared/shared/merge_additional_data_fields"
-require "log_struct/shared/shared/add_request_fields"
+require "log_struct/shared/serialize_common"
+require "log_struct/shared/merge_additional_data_fields"
+require "log_struct/shared/add_request_fields"
 require_relative "../enums/source"
 require_relative "../enums/event"
 require_relative "../enums/level"
@@ -20,11 +20,6 @@ require_relative "../enums/log_field"
 module LogStruct
   module Log
     class ActiveModelSerializers < T::Struct
-      # typed: strict
-      # frozen_string_literal: true
-
-      extend T::Sig
-
       extend T::Sig
 
       # Shared/common fields
@@ -40,36 +35,13 @@ module LogStruct
       const :resource_class, T.nilable(String), default: nil
       const :duration_ms, Float
 
-      # Additional data
-
-      # Request fields (optional)
-
       # Serialize shared fields
       include LogStruct::Log::Interfaces::CommonFields
       include LogStruct::Log::Shared::SerializeCommon
 
       sig { returns(T::Hash[LogStruct::LogField, T.untyped]) }
-      def self.base_hash
-        {}
-      end
-
-      sig {
-        params(message: T.untyped,
-          duration_ms: T.untyped,
-          serializer: T.untyped,
-          adapter: T.untyped,
-          resource_class: T.untyped,
-          additional_data: T.untyped,
-          timestamp: T.untyped).returns(T::Hash[LogStruct::LogField, T.untyped])
-      }
-      def self.build(message:,
-        duration_ms:,
-        serializer: nil,
-        adapter: nil,
-        resource_class: nil,
-        additional_data: nil,
-        timestamp: Time.now)
-        h = base_hash
+      def to_h
+        h = T.let({}, T::Hash[LogStruct::LogField, T.untyped])
         h[LogField::Message] = message
         h[LogField::Serializer] = serializer unless serializer.nil?
         h[LogField::Adapter] = adapter unless adapter.nil?
@@ -77,18 +49,6 @@ module LogStruct
         h[LogField::DurationMs] = duration_ms
         h
       end
-
-      sig { returns(T::Hash[LogStruct::LogField, T.untyped]) }
-      def to_h
-        self.class.build(
-          message: message,
-          serializer: serializer,
-          adapter: adapter,
-          resource_class: resource_class,
-          duration_ms: duration_ms,
-          timestamp: timestamp
-        )
-      end
     end
   end
 end

data/lib/log_struct/log/active_storage/delete.rb

@@ -9,9 +9,9 @@
 require "log_struct/shared/interfaces/common_fields"
 require "log_struct/shared/interfaces/additional_data_field"
 require "log_struct/shared/interfaces/request_fields"
-require "log_struct/shared/shared/serialize_common"
-require "log_struct/shared/shared/merge_additional_data_fields"
-require "log_struct/shared/shared/add_request_fields"
+require "log_struct/shared/serialize_common"
+require "log_struct/shared/merge_additional_data_fields"
+require "log_struct/shared/add_request_fields"
 require_relative "../../enums/source"
 require_relative "../../enums/event"
 require_relative "../../enums/level"
@@ -21,11 +21,6 @@ module LogStruct
   module Log
     class ActiveStorage
       class Delete < T::Struct
-        # typed: strict
-        # frozen_string_literal: true
-
-        extend T::Sig
-
         extend T::Sig
 
         # Shared/common fields
@@ -34,52 +29,19 @@ module LogStruct
         const :timestamp, Time, factory: -> { Time.now }
         const :level, Level, default: Level::Info
 
-        const :storage, String
+        const :storage, Symbol
         const :file_id, String
 
-        # Event-specific fields
-
-        # Additional data
-
-        # Request fields (optional)
-
         # Serialize shared fields
         include LogStruct::Log::Interfaces::CommonFields
         include LogStruct::Log::Shared::SerializeCommon
 
-        sig {
-          params(storage: T.untyped,
-            file_id: T.untyped).returns(T::Hash[LogStruct::LogField, T.untyped])
-        }
-        def self.base_hash(storage: nil,
-          file_id: nil)
-          h = {}
-          h[LogField::Storage] = storage unless storage.nil?
-          h[LogField::FileId] = file_id unless file_id.nil?
-          h
-        end
-
-        sig {
-          params(storage: T.untyped,
-            file_id: T.untyped,
-            additional_data: T.untyped,
-            timestamp: T.untyped).returns(T::Hash[LogStruct::LogField, T.untyped])
-        }
-        def self.build(storage:,
-          file_id:,
-          additional_data: nil,
-          timestamp: Time.now)
-          base_hash(storage: storage,
-            file_id: file_id)
-        end
-
         sig { returns(T::Hash[LogStruct::LogField, T.untyped]) }
         def to_h
-          self.class.build(
-            storage: storage,
-            file_id: file_id,
-            timestamp: timestamp
-          )
+          h = T.let({}, T::Hash[LogStruct::LogField, T.untyped])
+          h[LogField::Storage] = storage
+          h[LogField::FileId] = file_id
+          h
         end
       end
     end