logstruct 0.1.1 → 0.1.3

data/lib/log_struct/log/active_storage/url.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 Url < T::Struct
-        # typed: strict
-        # frozen_string_literal: true
-
-        extend T::Sig
-
         extend T::Sig
 
         # Shared/common fields
@@ -34,58 +29,23 @@ 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
         const :url, String
 
-        # 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(url: T.untyped,
-            storage: T.untyped,
-            file_id: T.untyped,
-            additional_data: T.untyped,
-            timestamp: T.untyped).returns(T::Hash[LogStruct::LogField, T.untyped])
-        }
-        def self.build(url:,
-          storage:,
-          file_id:,
-          additional_data: nil,
-          timestamp: Time.now)
-          h = base_hash(storage: storage,
-            file_id: file_id)
-          h[LogField::Url] = url
-          h
-        end
-
         sig { returns(T::Hash[LogStruct::LogField, T.untyped]) }
         def to_h
-          self.class.build(
-            storage: storage,
-            file_id: file_id,
-            url: url,
-            timestamp: timestamp
-          )
+          h = T.let({}, T::Hash[LogStruct::LogField, T.untyped])
+          h[LogField::Storage] = storage
+          h[LogField::FileId] = file_id
+          h[LogField::Url] = url
+          h
         end
       end
     end

data/lib/log_struct/log/active_storage.rb

@@ -19,12 +19,12 @@ module LogStruct
     class ActiveStorage
       class BaseFields < T::Struct
         extend T::Sig
-        const :storage, String
+        const :storage, Symbol
         const :file_id, String
 
         Kwargs = T.type_alias do
           {
-            storage: String,
+            storage: Symbol,
             file_id: String
           }
         end

data/lib/log_struct/log/ahoy.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 Ahoy < T::Struct
-      # typed: strict
-      # frozen_string_literal: true
-
-      extend T::Sig
-
       extend T::Sig
 
       # Shared/common fields
@@ -38,51 +33,18 @@ module LogStruct
       const :ahoy_event, String
       const :properties, T.nilable(T::Hash[Symbol, T.untyped]), 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 { 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
+      def to_h
+        h = T.let({}, T::Hash[LogStruct::LogField, T.untyped])
         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
 end

data/lib/log_struct/log/carrierwave/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 CarrierWave
       class Delete < T::Struct
-        # typed: strict
-        # frozen_string_literal: true
-
-        extend T::Sig
-
         extend T::Sig
 
         # Shared/common fields
@@ -34,81 +29,32 @@ module LogStruct
         const :timestamp, Time, factory: -> { Time.now }
         const :level, Level, default: Level::Info
 
-        const :storage, String
+        const :storage, Symbol
         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)
+        const :version, T.nilable(String), default: nil
+        const :store_path, T.nilable(String), default: nil
+        const :extension, T.nilable(String), default: nil
 
         # 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?
+        sig { returns(T::Hash[LogStruct::LogField, T.untyped]) }
+        def to_h
+          h = T.let({}, T::Hash[LogStruct::LogField, T.untyped])
+          h[LogField::Storage] = storage
+          h[LogField::FileId] = file_id
           h[LogField::Uploader] = uploader unless uploader.nil?
           h[LogField::Model] = model unless model.nil?
           h[LogField::MountPoint] = mount_point unless mount_point.nil?
+          h[LogField::Version] = version unless version.nil?
+          h[LogField::StorePath] = store_path unless store_path.nil?
+          h[LogField::Extension] = extension unless extension.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

data/lib/log_struct/log/carrierwave/download.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 CarrierWave
       class Download < T::Struct
-        # typed: strict
-        # frozen_string_literal: true
-
-        extend T::Sig
-
         extend T::Sig
 
         # Shared/common fields
@@ -34,97 +29,40 @@ module LogStruct
         const :timestamp, Time, factory: -> { Time.now }
         const :level, Level, default: Level::Info
 
-        const :storage, String
+        const :storage, Symbol
         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
+        const :version, T.nilable(String), default: nil
+        const :store_path, T.nilable(String), default: nil
+        const :extension, 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?
+        sig { returns(T::Hash[LogStruct::LogField, T.untyped]) }
+        def to_h
+          h = T.let({}, T::Hash[LogStruct::LogField, T.untyped])
+          h[LogField::Storage] = storage
+          h[LogField::FileId] = file_id
           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::Version] = version unless version.nil?
+          h[LogField::StorePath] = store_path unless store_path.nil?
+          h[LogField::Extension] = extension unless extension.nil?
           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

data/lib/log_struct/log/carrierwave/upload.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 CarrierWave
       class Upload < T::Struct
-        # typed: strict
-        # frozen_string_literal: true
-
-        extend T::Sig
-
         extend T::Sig
 
         # Shared/common fields
@@ -34,11 +29,14 @@ module LogStruct
         const :timestamp, Time, factory: -> { Time.now }
         const :level, Level, default: Level::Info
 
-        const :storage, String
+        const :storage, Symbol
         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
+        const :version, T.nilable(String), default: nil
+        const :store_path, T.nilable(String), default: nil
+        const :extension, T.nilable(String), default: nil
 
         # Event-specific fields
         const :filename, T.nilable(String), default: nil
@@ -47,69 +45,21 @@ module LogStruct
         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?
+        sig { returns(T::Hash[LogStruct::LogField, T.untyped]) }
+        def to_h
+          h = T.let({}, T::Hash[LogStruct::LogField, T.untyped])
+          h[LogField::Storage] = storage
+          h[LogField::FileId] = file_id
           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::Version] = version unless version.nil?
+          h[LogField::StorePath] = store_path unless store_path.nil?
+          h[LogField::Extension] = extension unless extension.nil?
           h[LogField::Filename] = filename unless filename.nil?
           h[LogField::MimeType] = mime_type unless mime_type.nil?
           h[LogField::Size] = size unless size.nil?
@@ -117,24 +67,6 @@ module LogStruct
           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

data/lib/log_struct/log/carrierwave.rb

@@ -15,19 +15,25 @@ module LogStruct
     class CarrierWave
       class BaseFields < T::Struct
         extend T::Sig
-        const :storage, String
+        const :storage, Symbol
         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
+        const :version, T.nilable(String), default: nil
+        const :store_path, T.nilable(String), default: nil
+        const :extension, T.nilable(String), default: nil
 
         Kwargs = T.type_alias do
           {
-            storage: String,
+            storage: Symbol,
             file_id: String,
             uploader: T.nilable(String),
             model: T.nilable(String),
-            mount_point: T.nilable(String)
+            mount_point: T.nilable(String),
+            version: T.nilable(String),
+            store_path: T.nilable(String),
+            extension: T.nilable(String)
           }
         end
 
@@ -38,7 +44,10 @@ module LogStruct
             file_id: file_id,
             uploader: uploader,
             model: model,
-            mount_point: mount_point
+            mount_point: mount_point,
+            version: version,
+            store_path: store_path,
+            extension: extension
           }
         end
       end

data/lib/log_struct/log/dotenv/load.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 Dotenv
       class Load < T::Struct
-        # typed: strict
-        # frozen_string_literal: true
-
-        extend T::Sig
-
         extend T::Sig
 
         # Shared/common fields
@@ -37,39 +32,16 @@ module LogStruct
         # Event-specific fields
         const :file, String
 
-        # 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(file: T.untyped,
-            additional_data: T.untyped,
-            timestamp: T.untyped).returns(T::Hash[LogStruct::LogField, T.untyped])
-        }
-        def self.build(file:,
-          additional_data: nil,
-          timestamp: Time.now)
-          h = base_hash
+        def to_h
+          h = T.let({}, T::Hash[LogStruct::LogField, T.untyped])
           h[LogField::File] = file
           h
         end
-
-        sig { returns(T::Hash[LogStruct::LogField, T.untyped]) }
-        def to_h
-          self.class.build(
-            file: file,
-            timestamp: timestamp
-          )
-        end
       end
     end
   end