cogger 0.25.0 → 0.27.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82eadd70b70fc632efb641adf780c4f68fa76786ec1f170343e2e0dcb909182c
-  data.tar.gz: 1b9f9159eb2e21950aec9a369a0272f68f4ae5111e104093ba491181f6c8edf3
+  metadata.gz: 70f6a9da3a0ab293bb7909571afaf8af33e2c42dd36f1bb0845ac38442d13557
+  data.tar.gz: f8dca81f5e93e6ba4c59a6af2bb57cf89cb79ff3a9885b1e390b61549a3dcf41
 SHA512:
-  metadata.gz: b7d78ff5e80252151ab31e919d46a56bce0fc64a118b3f6d961953bd8a4c8d53c2ecd2f670ccb058129a3f91817ed5ed45cead216461e1a66f6ece33210d10ad
-  data.tar.gz: 45da02e73d70296f684f1de615f55a9ff37ca4df5ed0e31946af0951350a652f9936cd5d60032d0ab70dedd5093cd519f55feae961f830b9ef1dfbb31ff9603b
+  metadata.gz: 14ae3c273c6da93bed7c4c2e01d55ac010525f2342806a3bd63eef9a12920fe92797391a3d1d450ed2d90e3d56ca15dcbb50ad9046f1d0bdcad087df437f9fcd
+  data.tar.gz: c5215a8a89e139ba6087d70dfe10575fe4bb1b3d251b3aa333f9400406e4dd05255529578be09e537052e534c3d890db614b8fcac52ff260626ba92c018504c3

data/cogger.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name = "cogger"
-  spec.version = "0.25.0"
+  spec.version = "0.27.0"
   spec.authors = ["Brooke Kuhlmann"]
   spec.email = ["brooke@alchemists.io"]
   spec.homepage = "https://alchemists.io/projects/cogger"
@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.metadata = {
     "bug_tracker_uri" => "https://github.com/bkuhlmann/cogger/issues",
     "changelog_uri" => "https://alchemists.io/projects/cogger/versions",
-    "documentation_uri" => "https://alchemists.io/projects/cogger",
+    "homepage_uri" => "https://alchemists.io/projects/cogger",
     "funding_uri" => "https://github.com/sponsors/bkuhlmann",
     "label" => "Cogger",
     "rubygems_mfa_required" => "true",
@@ -22,9 +22,9 @@ Gem::Specification.new do |spec|
   spec.signing_key = Gem.default_key_path
   spec.cert_chain = [Gem.default_cert_path]
 
-  spec.required_ruby_version = "~> 3.3"
-  spec.add_dependency "core", "~> 1.0"
-  spec.add_dependency "refinements", "~> 12.7"
+  spec.required_ruby_version = ">= 3.3", "<= 3.4"
+  spec.add_dependency "core", "~> 1.7"
+  spec.add_dependency "refinements", "~> 12.8"
   spec.add_dependency "tone", "~> 1.0"
   spec.add_dependency "zeitwerk", "~> 2.6"
 

data/lib/cogger/entry.rb

@@ -15,10 +15,9 @@ module Cogger
           payload:
     end
 
-    def self.for_crash message, error, id:, at: ::Time.now
+    def self.for_crash message, error, id:
       new id:,
           level: "FATAL",
-          at:,
           message:,
           payload: {
             error_message: error.message,

data/lib/cogger/formatters/abstract.rb

@@ -4,10 +4,12 @@ module Cogger
   module Formatters
     # An abstract class with common/shared functionality.
     class Abstract
+      NEW_LINE = "\n"
+
       SANITIZERS = {
-        datetime: Sanitizers::DateTime,
         escape: Sanitizers::Escape.new,
-        filter: Sanitizers::Filter
+        filter: Sanitizers::Filter,
+        format_time: Sanitizers::FormatTime
       }.freeze
 
       def initialize sanitizers: SANITIZERS
@@ -23,10 +25,8 @@ module Cogger
 
       def sanitize entry, message
         entry.public_send(message).tap do |attributes|
-          function = -> value { sanitize_datetime value, format: entry.datetime_format }
-
           filter attributes
-          attributes.transform_values!(&function)
+          attributes.transform_values! { |value| format_time value, format: entry.datetime_format }
         end
       end
 
@@ -34,7 +34,7 @@ module Cogger
 
       def filter(...) = sanitizers.fetch(__method__).call(...)
 
-      def sanitize_datetime(...) = sanitizers.fetch(:datetime).call(...)
+      def format_time(...) = sanitizers.fetch(__method__).call(...)
 
       private
 

data/lib/cogger/formatters/color.rb

@@ -16,7 +16,7 @@ module Cogger
         *, entry = input
         attributes = sanitize entry, :tagged
 
-        "#{format(parse(attributes[:level]), attributes).tap(&:strip!)}\n"
+        format(parse(attributes[:level]), attributes).tap(&:strip!) << NEW_LINE
       end
 
       private

data/lib/cogger/formatters/crash.rb

@@ -22,7 +22,7 @@ module Cogger
         attributes = sanitize entry, :tagged
         attributes[:backtrace] = %(  #{attributes[:backtrace].join "\n  "})
 
-        "#{format(parse(attributes[:level]), attributes)}\n"
+        format(parse(attributes[:level]), attributes) << NEW_LINE
       end
 
       private

data/lib/cogger/formatters/json.rb

@@ -9,7 +9,7 @@ module Cogger
     class JSON < Abstract
       TEMPLATE = nil
 
-      def initialize template = TEMPLATE, parser: Parsers::KeyExtractor.new
+      def initialize template = TEMPLATE, parser: Parsers::Position.new
         super()
         @template = template
         @parser = parser
@@ -19,22 +19,12 @@ module Cogger
         *, entry = input
         attributes = sanitize(entry, :tagged_attributes).tap(&:compact!)
 
-        %(#{reorder(attributes).to_json}\n)
+        parser.call(template, attributes).to_json << NEW_LINE
       end
 
       private
 
       attr_reader :template, :parser
-
-      def reorder attributes
-        positions = positions_for template
-
-        return attributes if positions.empty?
-
-        attributes.slice(*positions).merge!(attributes.except(*positions))
-      end
-
-      def positions_for(template) = template ? parser.call(template) : Core::EMPTY_ARRAY
     end
   end
 end

data/lib/cogger/formatters/parsers/key.rb

@@ -10,9 +10,8 @@ module Cogger
         PATTERN = /
           %                                   # Start.
           (?<flag>[\s#+-0*])?                 # Optional flag.
+          \.?                                 # Optional precision.
           (?<width>\d+)?                      # Optional width.
-          \.?                                 # Optional precision delimiter.
-          (?<precision>\d+)?                  # Optional precision value.
           <                                   # Reference start.
           (?<key>\w+)                         # Key.
           :                                   # Delimiter.

data/lib/cogger/formatters/parsers/{key_extractor.rb → position.rb}

@@ -3,8 +3,8 @@
 module Cogger
   module Formatters
     module Parsers
-      # Parses template and extracts keys.
-      class KeyExtractor
+      # Parses template and reorders attributes based on template key positions.
+      class Position
         PATTERN = /
           %             # Start.
           ?             # Flag, width, or precision.
@@ -19,11 +19,20 @@ module Cogger
           @pattern = pattern
         end
 
-        def call(template) = template.scan(pattern).map { |match| match.first.to_sym }
+        # :reek:FeatureEnvy
+        def call template, attributes
+          return attributes if !template || template.empty?
+          return attributes unless template.match? pattern
+
+          keys = scan template
+          attributes.slice(*keys).merge!(attributes.except(*keys))
+        end
 
         private
 
         attr_reader :pattern
+
+        def scan(template) = template.scan(pattern).map { |match| match.first.to_sym }
       end
     end
   end

data/lib/cogger/formatters/property.rb

@@ -8,7 +8,7 @@ module Cogger
     class Property < Abstract
       TEMPLATE = nil
 
-      def initialize template = TEMPLATE, parser: Parsers::KeyExtractor.new
+      def initialize template = TEMPLATE, parser: Parsers::Position.new
         super()
         @template = template
         @parser = parser
@@ -18,7 +18,7 @@ module Cogger
         *, entry = input
         attributes = sanitize(entry, :tagged_attributes).tap(&:compact!)
 
-        concat(attributes).chop! << "\n"
+        concat(attributes).chop! << NEW_LINE
       end
 
       private
@@ -26,20 +26,10 @@ module Cogger
       attr_reader :template, :parser
 
       def concat attributes
-        reorder(attributes).each.with_object(+"") do |(key, value), line|
+        parser.call(template, attributes).each.with_object(+"") do |(key, value), line|
           line << key.to_s << "=" << escape(value) << " "
         end
       end
-
-      def reorder attributes
-        positions = positions_for template
-
-        return attributes if positions.empty?
-
-        attributes.slice(*positions).merge!(attributes.except(*positions))
-      end
-
-      def positions_for(template) = template ? parser.call(template) : Core::EMPTY_ARRAY
     end
   end
 end

data/lib/cogger/formatters/sanitizers/{date_time.rb → format_time.rb}

@@ -6,8 +6,8 @@ module Cogger
   module Formatters
     module Sanitizers
       # Sanitizes/formats date/time value.
-      DateTime = lambda do |value, format: Cogger::DATETIME_FORMAT|
-        return value unless value.is_a?(::Time) || value.is_a?(Date) || value.is_a?(::DateTime)
+      FormatTime = lambda do |value, format: Cogger::DATETIME_FORMAT|
+        return value unless value.is_a?(::Time) || value.is_a?(Date) || value.is_a?(DateTime)
 
         value.strftime format
       end

data/lib/cogger/formatters/simple.rb

@@ -15,7 +15,7 @@ module Cogger
         *, entry = input
         attributes = sanitize entry, :tagged
 
-        "#{format(template, attributes).tap(&:strip!)}\n"
+        format(template, attributes).tap(&:strip!) << NEW_LINE
       end
 
       private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cogger
 version: !ruby/object:Gem::Version
-  version: 0.25.0
+  version: 0.27.0
 platform: ruby
 authors:
 - Brooke Kuhlmann
@@ -35,7 +35,7 @@ cert_chain:
   3n5C8/6Zh9DYTkpcwPSuIfAga6wf4nXc9m6JAw8AuMLaiWN/r/2s4zJsUHYERJEu
   gZGm4JqtuSg8pYjPeIJxS960owq+SfuC+jxqmRA54BisFCv/0VOJi7tiJVY=
   -----END CERTIFICATE-----
-date: 2024-08-28 00:00:00.000000000 Z
+date: 2024-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: core
@@ -43,28 +43,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: refinements
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.7'
+        version: '12.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.7'
+        version: '12.8'
 - !ruby/object:Gem::Dependency
   name: tone
   requirement: !ruby/object:Gem::Requirement
@@ -118,11 +118,11 @@ files:
 - lib/cogger/formatters/parsers/element.rb
 - lib/cogger/formatters/parsers/emoji.rb
 - lib/cogger/formatters/parsers/key.rb
-- lib/cogger/formatters/parsers/key_extractor.rb
+- lib/cogger/formatters/parsers/position.rb
 - lib/cogger/formatters/property.rb
-- lib/cogger/formatters/sanitizers/date_time.rb
 - lib/cogger/formatters/sanitizers/escape.rb
 - lib/cogger/formatters/sanitizers/filter.rb
+- lib/cogger/formatters/sanitizers/format_time.rb
 - lib/cogger/formatters/simple.rb
 - lib/cogger/formatters/transformers/color.rb
 - lib/cogger/formatters/transformers/emoji.rb
@@ -143,7 +143,7 @@ licenses:
 metadata:
   bug_tracker_uri: https://github.com/bkuhlmann/cogger/issues
   changelog_uri: https://alchemists.io/projects/cogger/versions
-  documentation_uri: https://alchemists.io/projects/cogger
+  homepage_uri: https://alchemists.io/projects/cogger
   funding_uri: https://github.com/sponsors/bkuhlmann
   label: Cogger
   rubygems_mfa_required: 'true'
@@ -154,9 +154,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
       version: '3.3'
+  - - "<="
+    - !ruby/object:Gem::Version
+      version: '3.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="