gitt 3.8.1 → 3.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 011f24d793d2565425982cb6eeb0d8efc3a9f954590bf86750495c6b97792873
-  data.tar.gz: ee9f64d17e334f1aa6827c085fb1059b453209f4b5397e7ac400e598de18960e
+  metadata.gz: '089dc63b1472c88edd6c3135f33cf1888ff2e8c2a2c7653ed274fb76b0758bec'
+  data.tar.gz: 0e0f51674ebb293d760b5a9c7f07716e8a3d277ca25823a24decb7d57239bc86
 SHA512:
-  metadata.gz: efe9288bf28a4eac998226055f15bf1ddedeae39dbf4e95c77a6da23faedcd9a3c3b88d8a29db5d7cde1f60273e1bce6c6c2e0d0734964d14e520790b8463d0f
-  data.tar.gz: '089f62916bc44d0634f408a111163bda264a13ad236ce8156484c096e5d595deae0b2c14466885d084647a3ac23d50a8005546e8f75b1d2847fd4b7239d2dcb5'
+  metadata.gz: 918247b90b31936c807ad6643c3fdd31f6ba873599c83ce609b64c897ddc9e95bb3b323caa715a03737ed164ceca6be4fc7ea80b56dcb1550425da1d27bc2c29
+  data.tar.gz: 458707c1d8fdfa687ca9d3939da56192199e8bfe3ec050285003062e0a2febb62ee8247dc3668faed3755fc8d89f2b7b74ce99f86bf392b7eaa9f7d9701ebf9a

data/gitt.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name = "gitt"
-  spec.version = "3.8.1"
+  spec.version = "3.9.0"
   spec.authors = ["Brooke Kuhlmann"]
   spec.email = ["brooke@alchemists.io"]
   spec.homepage = "https://alchemists.io/projects/gitt"

data/lib/gitt/commands/log.rb

@@ -58,8 +58,8 @@ module Gitt
       attr_reader :shell, :key_map, :parser
 
       def pretty_format
-        key_map.reduce("") { |string, (key, value)| string + "<#{key}>#{value}</#{key}>%n" }
-               .then { |structure| %(--pretty=format:"#{structure}") }
+        key_map.reduce(+"") { |format, (key, value)| format << "<#{key}>#{value}</#{key}>%n" }
+               .then { |format| %(--pretty=format:"#{format}") }
       end
 
       def build_records entries

data/lib/gitt/commands/tag.rb

@@ -23,6 +23,7 @@ module Gitt
         sha: "%(objectname)",
         signature: "%(contents:signature)",
         subject: "%(subject)",
+        trailers: "%(trailers)",
         version: "%(refname)"
       }.freeze
 
@@ -88,7 +89,7 @@ module Gitt
       attr_reader :shell, :key_map, :parser
 
       def pretty_format
-        key_map.reduce("") { |content, (key, value)| content + "<#{key}>#{value}</#{key}>%n" }
+        key_map.reduce(+"") { |format, (key, value)| format << "<#{key}>#{value}</#{key}>%n" }
                .then { |format| %(--format="#{format}") }
       end
 

data/lib/gitt/models/commit.rb

@@ -32,30 +32,13 @@ module Gitt
       :trailers
     ) do
       include Directable
+      include Trailable
       include Dry::Monads[:result]
 
       def initialize(**)
         super
         freeze
       end
-
-      def find_trailer key
-        trailers.find { |trailer| trailer.key == key }
-                .then do |trailer|
-                  return Success trailer if trailer
-
-                  Failure "Unable to find trailer for key: #{key.inspect}."
-                end
-      end
-
-      def find_trailers key
-        trailers.select { |trailer| trailer.key == key }
-                .then { |trailers| Success trailers }
-      end
-
-      def trailer_value_for(key) = find_trailer(key).fmap(&:value)
-
-      def trailer_values_for(key) = find_trailers(key).fmap { |trailers| trailers.map(&:value) }
     end
   end
 end

data/lib/gitt/models/tag.rb

@@ -16,8 +16,11 @@ module Gitt
       :sha,
       :signature,
       :subject,
+      :trailers,
       :version
     ) do
+      include Trailable
+
       def initialize(**)
         super
         freeze

data/lib/gitt/parsers/tag.rb

@@ -16,13 +16,16 @@ module Gitt
         @model = model
       end
 
+      # :reek:TooManyStatements
       def call content
         attributes = attributer.call content
-        attributes.transform_with! author_email: email_sanitizer,
-                                   authored_at: date_sanitizer,
-                                   committed_at: date_sanitizer,
-                                   committer_email: email_sanitizer,
-                                   version: version_serializer
+        body, trailers = attributes.values_at :body, :trailers
+        sanitize attributes
+
+        attributes[:body] = (
+          trailers ? body.sub(/\n??#{Regexp.escape trailers}\n??/, "") : body
+        ).to_s.chomp
+
         model[**attributes]
       end
 
@@ -30,10 +33,21 @@ module Gitt
 
       attr_reader :attributer, :sanitizers, :model
 
+      def sanitize attributes
+        attributes.transform_with! author_email: email_sanitizer,
+                                   authored_at: date_sanitizer,
+                                   committed_at: date_sanitizer,
+                                   committer_email: email_sanitizer,
+                                   trailers: trailers_sanitizer,
+                                   version: version_serializer
+      end
+
       def date_sanitizer = sanitizers.fetch :date
 
       def email_sanitizer = sanitizers.fetch :email
 
+      def trailers_sanitizer = sanitizers.fetch :trailers
+
       def version_serializer = sanitizers.fetch :version
     end
   end

data/lib/gitt/sanitizers/container.rb

@@ -6,7 +6,7 @@ module Gitt
       date: Date,
       email: Email,
       lines: Lines,
-      paragraphs: Paragraphs,
+      paragraphs: Paragraphs.new,
       scissors: Scissors,
       signature: Signature,
       statistic: Statistic.new,

data/lib/gitt/sanitizers/paragraphs.rb

@@ -1,9 +1,53 @@
 # frozen_string_literal: true
 
 require "core"
+require "refinements/array"
+require "strscan"
 
 module Gitt
   module Sanitizers
-    Paragraphs = -> text { text ? text.split("\n\n").map(&:chomp) : Core::EMPTY_ARRAY }
+    # Detects and parses paragraphs (including code blocks).
+    class Paragraphs
+      using Refinements::Array
+
+      PATTERN = /
+        (              # Condition start.
+        (?:\..*?\n)?   # Optional ASCII Doc label.
+        (?:\[.*\]\n)?  # Optional ASCII Doc directive.
+        [-_=+\.\*]{4}  # ASCII Doc block start.
+        [\s\S]*?       # Lazy block content of any character.
+        [-_=+\.\*]{4}  # ASCII Doc block end.
+        |              # Or.
+        ```            # Markdown start.
+        [\s\S]*?       # Lazy block content of any character.
+        ```            # Markdown end.
+        )              # Condition end.
+      /mx
+
+      def initialize pattern: PATTERN, client: StringScanner
+        @pattern = pattern
+        @client = client
+      end
+
+      def call(text) = scan(client.new(text.to_s))
+
+      private
+
+      attr_reader :pattern, :client
+
+      # :reek:FeatureEnvy
+      def scan scanner, collection = []
+        until scanner.eos?
+          match = scanner.scan_until pattern
+
+          break collection << scanner.string[scanner.rest].tap(&:strip!).split("\n\n") unless match
+
+          collection << scanner.pre_match.strip
+          collection << scanner.captures
+        end
+
+        collection.tap(&:flatten!).tap(&:compress!)
+      end
+    end
   end
 end

data/lib/gitt/trailable.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Gitt
+  # Provides shared behavior for objects that have trailers.
+  module Trailable
+    def find_trailer key
+      trailers.find { |trailer| trailer.key == key }
+              .then do |trailer|
+                return Success trailer if trailer
+
+                Failure "Unable to find trailer for key: #{key.inspect}."
+              end
+    end
+
+    def find_trailers key
+      trailers.select { |trailer| trailer.key == key }
+              .then { |trailers| Success trailers }
+    end
+
+    def trailer_value_for(key) = find_trailer(key).fmap(&:value)
+
+    def trailer_values_for(key) = find_trailers(key).fmap { |trailers| trailers.map(&:value) }
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitt
 version: !ruby/object:Gem::Version
-  version: 3.8.1
+  version: 3.9.0
 platform: ruby
 authors:
 - Brooke Kuhlmann
@@ -35,7 +35,7 @@ cert_chain:
   3n5C8/6Zh9DYTkpcwPSuIfAga6wf4nXc9m6JAw8AuMLaiWN/r/2s4zJsUHYERJEu
   gZGm4JqtuSg8pYjPeIJxS960owq+SfuC+jxqmRA54BisFCv/0VOJi7tiJVY=
   -----END CERTIFICATE-----
-date: 2024-09-04 00:00:00.000000000 Z
+date: 2024-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: core
@@ -135,6 +135,7 @@ files:
 - lib/gitt/sanitizers/trailers.rb
 - lib/gitt/sanitizers/version.rb
 - lib/gitt/shell.rb
+- lib/gitt/trailable.rb
 homepage: https://alchemists.io/projects/gitt
 licenses:
 - Hippocratic-2.1