logstruct 0.1.0 → 0.1.1

data/lib/log_struct/log/ahoy.rb

@@ -1,53 +1,87 @@
 # typed: strict
 # frozen_string_literal: true
 
-require_relative "interfaces/common_fields"
-require_relative "interfaces/additional_data_field"
-require_relative "shared/serialize_common"
-require_relative "shared/merge_additional_data_fields"
+# AUTO-GENERATED: DO NOT EDIT
+# Generated by scripts/generate_structs.rb
+# Schemas dir: schemas/log_sources/
+# Template: tools/codegen/templates/sorbet/event.rb.erb
+
+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_relative "../enums/source"
 require_relative "../enums/event"
 require_relative "../enums/level"
-require_relative "../log_keys"
+require_relative "../enums/log_field"
 
 module LogStruct
   module Log
-    # Ahoy analytics log entry for structured logging
     class Ahoy < T::Struct
-      extend T::Sig
+      # typed: strict
+      # frozen_string_literal: true
 
-      include Interfaces::CommonFields
-      include Interfaces::AdditionalDataField
-      include SerializeCommon
-      include MergeAdditionalDataFields
+      extend T::Sig
 
-      # Events are generic logs for tracking
-      AhoyEvent = T.type_alias {
-        Event::Log
-      }
+      extend T::Sig
 
-      # Common fields
-      const :source, Source, default: T.let(Source::App, Source)
-      const :event, AhoyEvent, default: T.let(Event::Log, AhoyEvent)
-      const :level, Level, default: T.let(Level::Info, Level)
+      # Shared/common fields
+      const :source, Source::App, default: Source::App
+      const :event, Event, default: Event::Log
       const :timestamp, Time, factory: -> { Time.now }
+      const :level, Level, default: Level::Info
 
-      # Ahoy specifics
-      const :message, String, default: "ahoy.track"
-      const :ahoy_event, T.nilable(String), default: nil
+      # Event-specific fields
+      const :message, String
+      const :ahoy_event, String
       const :properties, T.nilable(T::Hash[Symbol, T.untyped]), default: nil
 
-      # Extra data
-      const :additional_data, T::Hash[Symbol, T.untyped], default: {}
-
-      sig { override.params(strict: T::Boolean).returns(T::Hash[Symbol, T.untyped]) }
-      def serialize(strict = true)
-        hash = serialize_common(strict)
-        merge_additional_data_fields(hash)
-        hash[LOG_KEYS.fetch(:message)] = message
-        hash[:ahoy_event] = ahoy_event if ahoy_event
-        hash[:properties] = properties if properties
-        hash
+      # Additional data
+      include LogStruct::Log::Interfaces::AdditionalDataField
+      const :additional_data, T.nilable(T::Hash[T.any(String, Symbol), T.untyped]), default: nil
+      include LogStruct::Log::Shared::MergeAdditionalDataFields
+
+      # 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,
+          ahoy_event: T.untyped,
+          properties: T.untyped,
+          additional_data: T.untyped,
+          timestamp: T.untyped).returns(T::Hash[LogStruct::LogField, T.untyped])
+      }
+      def self.build(message:,
+        ahoy_event:,
+        properties: nil,
+        additional_data: nil,
+        timestamp: Time.now)
+        h = base_hash
+        h[LogField::Message] = message
+        h[LogField::AhoyEvent] = ahoy_event
+        h[LogField::Properties] = properties unless properties.nil?
+        h
+      end
+
+      sig { returns(T::Hash[LogStruct::LogField, T.untyped]) }
+      def to_h
+        self.class.build(
+          message: message,
+          ahoy_event: ahoy_event,
+          properties: properties,
+          additional_data: additional_data,
+          timestamp: timestamp
+        )
       end
     end
   end

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

@@ -0,0 +1,115 @@
+# typed: strict
+# frozen_string_literal: true
+
+# AUTO-GENERATED: DO NOT EDIT
+# Generated by scripts/generate_structs.rb
+# Schemas dir: schemas/log_sources/
+# Template: tools/codegen/templates/sorbet/event.rb.erb
+
+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_relative "../../enums/source"
+require_relative "../../enums/event"
+require_relative "../../enums/level"
+require_relative "../../enums/log_field"
+
+module LogStruct
+  module Log
+    class CarrierWave
+      class Delete < T::Struct
+        # typed: strict
+        # frozen_string_literal: true
+
+        extend T::Sig
+
+        extend T::Sig
+
+        # Shared/common fields
+        const :source, Source::CarrierWave, default: Source::CarrierWave
+        const :event, Event, default: Event::Delete
+        const :timestamp, Time, factory: -> { Time.now }
+        const :level, Level, default: Level::Info
+
+        const :storage, String
+        const :file_id, String
+        const :uploader, T.nilable(String), default: nil
+        const :model, T.nilable(String), default: nil
+        const :mount_point, T.nilable(String), default: nil
+
+        # Event-specific fields
+
+        # Additional data
+        include LogStruct::Log::Interfaces::AdditionalDataField
+        const :additional_data, T.nilable(T::Hash[T.any(String, Symbol), T.untyped]), default: nil
+        include LogStruct::Log::Shared::MergeAdditionalDataFields
+
+        # 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,
+            uploader: T.untyped,
+            model: T.untyped,
+            mount_point: T.untyped).returns(T::Hash[LogStruct::LogField, T.untyped])
+        }
+        def self.base_hash(storage: nil,
+          file_id: nil,
+          uploader: nil,
+          model: nil,
+          mount_point: nil)
+          h = {}
+          h[LogField::Storage] = storage unless storage.nil?
+          h[LogField::FileId] = file_id unless file_id.nil?
+          h[LogField::Uploader] = uploader unless uploader.nil?
+          h[LogField::Model] = model unless model.nil?
+          h[LogField::MountPoint] = mount_point unless mount_point.nil?
+          h
+        end
+
+        sig {
+          params(storage: T.untyped,
+            file_id: T.untyped,
+            uploader: T.untyped,
+            model: T.untyped,
+            mount_point: T.untyped,
+            additional_data: T.untyped,
+            timestamp: T.untyped).returns(T::Hash[LogStruct::LogField, T.untyped])
+        }
+        def self.build(storage:,
+          file_id:,
+          uploader: nil,
+          model: nil,
+          mount_point: nil,
+          additional_data: nil,
+          timestamp: Time.now)
+          base_hash(storage: storage,
+            file_id: file_id,
+            uploader: uploader,
+            model: model,
+            mount_point: mount_point)
+        end
+
+        sig { returns(T::Hash[LogStruct::LogField, T.untyped]) }
+        def to_h
+          self.class.build(
+            storage: storage,
+            file_id: file_id,
+            uploader: uploader,
+            model: model,
+            mount_point: mount_point,
+            additional_data: additional_data,
+            timestamp: timestamp
+          )
+        end
+      end
+    end
+  end
+end

data/lib/log_struct/log/carrierwave/download.rb

@@ -0,0 +1,131 @@
+# typed: strict
+# frozen_string_literal: true
+
+# AUTO-GENERATED: DO NOT EDIT
+# Generated by scripts/generate_structs.rb
+# Schemas dir: schemas/log_sources/
+# Template: tools/codegen/templates/sorbet/event.rb.erb
+
+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_relative "../../enums/source"
+require_relative "../../enums/event"
+require_relative "../../enums/level"
+require_relative "../../enums/log_field"
+
+module LogStruct
+  module Log
+    class CarrierWave
+      class Download < T::Struct
+        # typed: strict
+        # frozen_string_literal: true
+
+        extend T::Sig
+
+        extend T::Sig
+
+        # Shared/common fields
+        const :source, Source::CarrierWave, default: Source::CarrierWave
+        const :event, Event, default: Event::Download
+        const :timestamp, Time, factory: -> { Time.now }
+        const :level, Level, default: Level::Info
+
+        const :storage, String
+        const :file_id, String
+        const :uploader, T.nilable(String), default: nil
+        const :model, T.nilable(String), default: nil
+        const :mount_point, T.nilable(String), default: nil
+
+        # Event-specific fields
+        const :filename, T.nilable(String), default: nil
+        const :mime_type, T.nilable(String), default: nil
+        const :size, T.nilable(Integer), default: nil
+
+        # Additional data
+        include LogStruct::Log::Interfaces::AdditionalDataField
+        const :additional_data, T.nilable(T::Hash[T.any(String, Symbol), T.untyped]), default: nil
+        include LogStruct::Log::Shared::MergeAdditionalDataFields
+
+        # 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,
+            uploader: T.untyped,
+            model: T.untyped,
+            mount_point: T.untyped).returns(T::Hash[LogStruct::LogField, T.untyped])
+        }
+        def self.base_hash(storage: nil,
+          file_id: nil,
+          uploader: nil,
+          model: nil,
+          mount_point: nil)
+          h = {}
+          h[LogField::Storage] = storage unless storage.nil?
+          h[LogField::FileId] = file_id unless file_id.nil?
+          h[LogField::Uploader] = uploader unless uploader.nil?
+          h[LogField::Model] = model unless model.nil?
+          h[LogField::MountPoint] = mount_point unless mount_point.nil?
+          h
+        end
+
+        sig {
+          params(storage: T.untyped,
+            file_id: T.untyped,
+            uploader: T.untyped,
+            model: T.untyped,
+            mount_point: T.untyped,
+            filename: T.untyped,
+            mime_type: T.untyped,
+            size: T.untyped,
+            additional_data: T.untyped,
+            timestamp: T.untyped).returns(T::Hash[LogStruct::LogField, T.untyped])
+        }
+        def self.build(storage:,
+          file_id:,
+          uploader: nil,
+          model: nil,
+          mount_point: nil,
+          filename: nil,
+          mime_type: nil,
+          size: nil,
+          additional_data: nil,
+          timestamp: Time.now)
+          h = base_hash(storage: storage,
+            file_id: file_id,
+            uploader: uploader,
+            model: model,
+            mount_point: mount_point)
+          h[LogField::Filename] = filename unless filename.nil?
+          h[LogField::MimeType] = mime_type unless mime_type.nil?
+          h[LogField::Size] = size unless size.nil?
+          h
+        end
+
+        sig { returns(T::Hash[LogStruct::LogField, T.untyped]) }
+        def to_h
+          self.class.build(
+            storage: storage,
+            file_id: file_id,
+            uploader: uploader,
+            model: model,
+            mount_point: mount_point,
+            filename: filename,
+            mime_type: mime_type,
+            size: size,
+            additional_data: additional_data,
+            timestamp: timestamp
+          )
+        end
+      end
+    end
+  end
+end

data/lib/log_struct/log/carrierwave/upload.rb

@@ -0,0 +1,141 @@
+# typed: strict
+# frozen_string_literal: true
+
+# AUTO-GENERATED: DO NOT EDIT
+# Generated by scripts/generate_structs.rb
+# Schemas dir: schemas/log_sources/
+# Template: tools/codegen/templates/sorbet/event.rb.erb
+
+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_relative "../../enums/source"
+require_relative "../../enums/event"
+require_relative "../../enums/level"
+require_relative "../../enums/log_field"
+
+module LogStruct
+  module Log
+    class CarrierWave
+      class Upload < T::Struct
+        # typed: strict
+        # frozen_string_literal: true
+
+        extend T::Sig
+
+        extend T::Sig
+
+        # Shared/common fields
+        const :source, Source::CarrierWave, default: Source::CarrierWave
+        const :event, Event, default: Event::Upload
+        const :timestamp, Time, factory: -> { Time.now }
+        const :level, Level, default: Level::Info
+
+        const :storage, String
+        const :file_id, String
+        const :uploader, T.nilable(String), default: nil
+        const :model, T.nilable(String), default: nil
+        const :mount_point, T.nilable(String), default: nil
+
+        # Event-specific fields
+        const :filename, T.nilable(String), default: nil
+        const :mime_type, T.nilable(String), default: nil
+        const :size, T.nilable(Integer), default: nil
+        const :metadata, T.nilable(T::Hash[String, T.untyped]), default: nil
+        const :duration_ms, T.nilable(Float), default: nil
+
+        # Additional data
+        include LogStruct::Log::Interfaces::AdditionalDataField
+        const :additional_data, T.nilable(T::Hash[T.any(String, Symbol), T.untyped]), default: nil
+        include LogStruct::Log::Shared::MergeAdditionalDataFields
+
+        # 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,
+            uploader: T.untyped,
+            model: T.untyped,
+            mount_point: T.untyped).returns(T::Hash[LogStruct::LogField, T.untyped])
+        }
+        def self.base_hash(storage: nil,
+          file_id: nil,
+          uploader: nil,
+          model: nil,
+          mount_point: nil)
+          h = {}
+          h[LogField::Storage] = storage unless storage.nil?
+          h[LogField::FileId] = file_id unless file_id.nil?
+          h[LogField::Uploader] = uploader unless uploader.nil?
+          h[LogField::Model] = model unless model.nil?
+          h[LogField::MountPoint] = mount_point unless mount_point.nil?
+          h
+        end
+
+        sig {
+          params(storage: T.untyped,
+            file_id: T.untyped,
+            uploader: T.untyped,
+            model: T.untyped,
+            mount_point: T.untyped,
+            filename: T.untyped,
+            mime_type: T.untyped,
+            size: T.untyped,
+            metadata: T.untyped,
+            duration_ms: T.untyped,
+            additional_data: T.untyped,
+            timestamp: T.untyped).returns(T::Hash[LogStruct::LogField, T.untyped])
+        }
+        def self.build(storage:,
+          file_id:,
+          uploader: nil,
+          model: nil,
+          mount_point: nil,
+          filename: nil,
+          mime_type: nil,
+          size: nil,
+          metadata: nil,
+          duration_ms: nil,
+          additional_data: nil,
+          timestamp: Time.now)
+          h = base_hash(storage: storage,
+            file_id: file_id,
+            uploader: uploader,
+            model: model,
+            mount_point: mount_point)
+          h[LogField::Filename] = filename unless filename.nil?
+          h[LogField::MimeType] = mime_type unless mime_type.nil?
+          h[LogField::Size] = size unless size.nil?
+          h[LogField::Metadata] = metadata unless metadata.nil?
+          h[LogField::DurationMs] = duration_ms unless duration_ms.nil?
+          h
+        end
+
+        sig { returns(T::Hash[LogStruct::LogField, T.untyped]) }
+        def to_h
+          self.class.build(
+            storage: storage,
+            file_id: file_id,
+            uploader: uploader,
+            model: model,
+            mount_point: mount_point,
+            filename: filename,
+            mime_type: mime_type,
+            size: size,
+            metadata: metadata,
+            duration_ms: duration_ms,
+            additional_data: additional_data,
+            timestamp: timestamp
+          )
+        end
+      end
+    end
+  end
+end

data/lib/log_struct/log/carrierwave.rb

@@ -1,81 +1,46 @@
 # typed: strict
 # frozen_string_literal: true
 
-require_relative "interfaces/common_fields"
-require_relative "interfaces/additional_data_field"
-require_relative "shared/serialize_common"
-require_relative "shared/merge_additional_data_fields"
-require_relative "../enums/source"
-require_relative "../enums/event"
-require_relative "../enums/level"
-require_relative "../log_keys"
+# AUTO-GENERATED: DO NOT EDIT
+# Generated by scripts/generate_structs.rb
+# Schemas dir: schemas/log_sources/
+# Template: tools/codegen/templates/sorbet/source_parent.rb.erb
+
+require_relative "carrierwave/upload"
+require_relative "carrierwave/delete"
+require_relative "carrierwave/download"
 
 module LogStruct
   module Log
-    # CarrierWave log entry for structured logging
-    class CarrierWave < T::Struct
-      extend T::Sig
-
-      include Interfaces::CommonFields
-      include Interfaces::AdditionalDataField
-      include SerializeCommon
-      include MergeAdditionalDataFields
-
-      CarrierWaveEvent = T.type_alias {
-        T.any(
-          Event::Upload,
-          Event::Download,
-          Event::Delete,
-          Event::Metadata,
-          Event::Exist,
-          Event::Unknown
-        )
-      }
-
-      # Common fields
-      const :source, Source::CarrierWave, default: T.let(Source::CarrierWave, Source::CarrierWave)
-      const :event, CarrierWaveEvent
-      const :timestamp, Time, factory: -> { Time.now }
-      const :level, Level, default: T.let(Level::Info, Level)
-
-      # File-specific fields
-      const :operation, T.nilable(Symbol), default: nil
-      const :storage, T.nilable(String), default: nil
-      const :file_id, T.nilable(String), default: nil
-      const :filename, T.nilable(String), default: nil
-      const :mime_type, T.nilable(String), default: nil
-      const :size, T.nilable(Integer), default: nil
-      const :metadata, T.nilable(T::Hash[String, T.untyped]), default: nil
-      const :duration, T.nilable(Float), default: nil
-
-      # CarrierWave-specific fields
-      const :uploader, T.nilable(String), default: nil
-      const :model, T.nilable(String), default: nil
-      const :mount_point, T.nilable(String), default: nil
-      const :additional_data, T::Hash[Symbol, T.untyped], default: {}
-
-      # Convert the log entry to a hash for serialization
-      sig { override.params(strict: T::Boolean).returns(T::Hash[Symbol, T.untyped]) }
-      def serialize(strict = true)
-        hash = serialize_common(strict)
-        merge_additional_data_fields(hash)
-
-        # Add file-specific fields if they're present
-        hash[LOG_KEYS.fetch(:storage)] = storage if storage
-        hash[LOG_KEYS.fetch(:operation)] = operation if operation
-        hash[LOG_KEYS.fetch(:file_id)] = file_id if file_id
-        hash[LOG_KEYS.fetch(:filename)] = filename if filename
-        hash[LOG_KEYS.fetch(:mime_type)] = mime_type if mime_type
-        hash[LOG_KEYS.fetch(:size)] = size if size
-        hash[LOG_KEYS.fetch(:metadata)] = metadata if metadata
-        hash[LOG_KEYS.fetch(:duration)] = duration if duration
-
-        # Add CarrierWave-specific fields if they're present
-        hash[LOG_KEYS.fetch(:uploader)] = uploader if uploader
-        hash[LOG_KEYS.fetch(:model)] = model if model
-        hash[LOG_KEYS.fetch(:mount_point)] = mount_point if mount_point
-
-        hash
+    class CarrierWave
+      class BaseFields < T::Struct
+        extend T::Sig
+        const :storage, String
+        const :file_id, String
+        const :uploader, T.nilable(String), default: nil
+        const :model, T.nilable(String), default: nil
+        const :mount_point, T.nilable(String), default: nil
+
+        Kwargs = T.type_alias do
+          {
+            storage: String,
+            file_id: String,
+            uploader: T.nilable(String),
+            model: T.nilable(String),
+            mount_point: T.nilable(String)
+          }
+        end
+
+        sig { returns(Kwargs) }
+        def to_kwargs
+          {
+            storage: storage,
+            file_id: file_id,
+            uploader: uploader,
+            model: model,
+            mount_point: mount_point
+          }
+        end
       end
     end
   end