milestoner 18.5.0 → 18.6.0

data/lib/milestoner/templates/milestones/_tag.md.erb

@@ -1,8 +1,4 @@
-<% if project_uri_logo %>
-  <p align="center">
-    <img src="<%= project_uri_logo %>" alt="Logo" width="100" height="100">
-  </p>
-<% end %>
+<%= scope(:logo).call %>
 
 <% if tag.empty? %>
 # [<%= project_label %>](<%= project_uri_home %>) (<%= tag.committed_date %>)
@@ -10,7 +6,7 @@
 **<%= tag.total_commits %>. <%= tag.total_files %>. <%= tag.total_deletions %>. <%= tag.total_insertions %>.**
 <% else %>
 # [<%= project_label %>](<%= project_uri_home %>) <%= tag.version %> (<%= tag.committed_date %>)
-<%= render :avatar, name: tag.author.name, url: tag.avatar_url(tag.author) %> <%= render :profile, name: tag.author.name, url: tag.profile_url(tag.author) %> | <%= tag.security %>
+<%= render :user, user: tag.author %> | <%= tag.security %>
 
 <% tag.commits.each do |commit| %><%= commit.render :commit %><% end %>
 

data/lib/milestoner/templates/milestones/_tag.xml.erb

@@ -1,14 +1,9 @@
 <section>
-  <p style="display: flex; align-items: center; justify-content: center;">
-    <img src="<%= project_uri_logo %>" alt="Logo" height=100 width=100>
-  </p>
+  <%= scope(:logo).call %>
 
   <% unless tag.empty? %>
     <p style="display: inline-flex; align-items: center; gap: 0.5rem; flex-wrap: wrap;">
-      <%= render :avatar, name: tag.author.name, url: tag.avatar_url(tag.author) %>
-      <%= render :profile, name: tag.author.name, url: tag.profile_url(tag.author) %>
-      |
-      <%= tag.security %>
+      <%= render :user, user: tag.author %> | <%= tag.security %>
     </p>
 
     <% tag.commits.each do |commit| %>

data/lib/milestoner/templates/milestones/_user.adoc.erb

@@ -0,0 +1 @@
+<%= render(:avatar, user:).strip %> <%= render(:profile, user:).strip %>

data/lib/milestoner/templates/milestones/_user.html.erb

@@ -0,0 +1 @@
+<%= render :avatar, user: %> <%= render :profile, user: %>

data/lib/milestoner/templates/milestones/_user.md.erb

@@ -0,0 +1 @@
+<%= render(:avatar, user:).strip.html_safe %> <%= render(:profile, user:).strip.html_safe %>

data/lib/milestoner/templates/milestones/_user.xml.erb

@@ -0,0 +1 @@
+<%= render :avatar, user: %> <%= render :profile, user: %>

data/lib/milestoner/templates/milestones/_users.adoc.erb

@@ -0,0 +1,3 @@
+<% users.each do |user| %>
+* <%= render :user, user: %>
+<% end %>

data/lib/milestoner/templates/milestones/_users.html.erb

@@ -0,0 +1,7 @@
+<ul class="list">
+  <% users.each do |user| %>
+    <li class="item">
+      <%= render :user, user: %>
+    </li>
+  <% end %>
+</ul>

data/lib/milestoner/templates/milestones/_users.md.erb

@@ -0,0 +1,3 @@
+<% users.each do |user| %>
+- <%= render :user, user: %>
+<% end %>

data/lib/milestoner/templates/milestones/_users.xml.erb

@@ -0,0 +1,7 @@
+<ul>
+  <% users.each do |user| %>
+    <li style="display: inline-flex; align-items: center; gap: 0.5rem;">
+      <%= render :user, user: %>
+    </li>
+  <% end %>
+</ul>

data/lib/milestoner/templates/public/page.css.erb

@@ -17,6 +17,7 @@
   --color-ink: hsl(210, 4%, 11%);
   --color-khaki: hsl(35, 26%, 75%);
   --color-lime: hsl(82, 100%, 58%);
+  --color-pink: hsl(342, 100%, 75%);
   --color-purple: hsl(259, 60%, 79.4%);
   --color-red: hsl(0, 100%, 73%);
   --color-sea: hsl(190, 100%, 60%);
@@ -148,10 +149,14 @@
   }
 
   .o {
-    color: var(--color-blue);
+    color: var(--color-pink);
     font-weight: bold;
   }
 
+  .p {
+    color: var(--color-pink);
+  }
+
   .mf {
     color: var(--color-ice);
   }
@@ -201,7 +206,7 @@
   }
 
   .si {
-    color: var(--color-purple);
+    color: var(--color-pink);
   }
 
   .sx {
@@ -365,7 +370,7 @@
     border-radius: 0.3rem;
     color: var(--color-white);
     font-size: 0.95rem;
-    padding: 0.1rem 0.3rem;
+    padding: 0.1rem 0.2rem;
   }
 
   pre:not([class^=language]) {
@@ -381,6 +386,7 @@
     border-radius: 0.5rem;
     font-weight: 400;
     padding: 0.5rem;
+    word-break: break-word;
   }
 
   img, video {
@@ -415,6 +421,7 @@
   }
 
   .popover {
+    border-color: var(--color-black);
     border-radius: 0.5rem;
     padding: 1rem;
     max-width: calc(100vw - 20%);
@@ -460,21 +467,11 @@
   .secure {
     background-color: var(--color-green);
     color: var(--color-white);
-
-    .signature::before {
-      content: "\1F512";
-      margin-right: 0.5rem;
-    }
   }
 
   .insecure {
     background-color: var(--color-red);
     color: var(--color-white);
-
-    .signature::before {
-      content: "\1F513";
-      margin-right: 0.5rem;
-    }
   }
 
   .header {
@@ -562,11 +559,32 @@
     }
 
     &::before {
+      color: var(--color-carbon);
       content: "\25B6";
       cursor: pointer;
       width: 0.5rem;
     }
 
+    &:has(~ * .major)::before {
+      color: var(--color-major);
+    }
+
+    &:has(~ * .minor)::before {
+      color: var(--color-minor);
+    }
+
+    &:has(~ * .patch)::before {
+      color: var(--color-patch);
+    }
+
+    &:has(~ * .rebase)::before {
+      color: var(--color-orange);
+    }
+
+    &:has(~ * .invalid)::before {
+      color: var(--color-red);
+    }
+
     &:hover {
       background-color: var(--color-powder);
     }
@@ -622,12 +640,14 @@
 
     .tag {
       align-self: stretch;
+      border-radius: 0.3rem;
       grid-area: tag;
+      margin: 1rem 0;
+      padding: 0 0.2rem;
       padding: 0.5rem 0.2rem 0.5rem 0.1rem;
       text-align: center;
       text-transform: capitalize;
       writing-mode: vertical-lr;
-      padding: 0 0.2rem;
     }
 
     .major {
@@ -675,6 +695,11 @@
       padding: 0 0.5rem 0.5rem 0.5rem;
     }
 
+    .content {
+      margin: 0 0.5rem;
+      word-break: break-word;
+    }
+
     .message {
       background-color: var(--color-grey);
       border-radius: 0.5rem;
@@ -684,11 +709,6 @@
       .bar {
         background-color: var(--color-smoke);
       }
-
-      .content {
-        margin: 0 0.5rem;
-        word-break: break-word;
-      }
     }
 
     .notes {
@@ -700,9 +720,17 @@
       .bar {
         background-color: var(--color-butter);
       }
+    }
 
-      .content {
-        margin: 0 0.5rem;
+    .list {
+      list-style: none;
+      padding: 0;
+      margin: 0;
+
+      .item {
+        align-items: center;
+        display: flex;
+        gap: 0.5rem;
       }
     }
 

data/lib/milestoner/views/context.rb

@@ -6,7 +6,7 @@ require "hanami/view"
 
 module Milestoner
   module Views
-    # Provides a common context for all views.
+    # Provides a custom context.
     class Context < Hanami::View::Context
       extend Forwardable
 

data/lib/milestoner/views/milestones/show.rb

@@ -12,6 +12,8 @@ module Milestoner
         config.default_context = Context.new
         config.part_namespace = Parts
         config.paths = Container[:settings].build_template_paths
+        config.scope_namespace = Scopes
+        config.scope_builder = Milestoner::Views::ScopeBuilder
         config.template = "milestones/show"
 
         expose :tag

data/lib/milestoner/views/parts/commit.rb

@@ -6,22 +6,36 @@ require "refinements/array"
 module Milestoner
   module Views
     module Parts
-      # Represents an individual commit.
+      # Provides commit presentation logic.
       # :reek:RepeatedConditional
       class Commit < Hanami::View::Part
         include Import[:settings, :sanitizer]
 
         using Refinements::Array
 
+        decorate :author, as: :user
+        decorate :collaborators, as: :users
+        decorate :signers, as: :users
+
         def initialize(**)
           super
           @prefixes = settings.commit_categories.pluck :label
           @authored_at = Time.at(value.authored_at.to_i).utc
         end
 
-        def avatar_url(user) = format settings.avatar_uri, id: user.external_id
+        def avatar_url user
+          warn "`#{self.class}##{__method__}` is deprecated, use user scope instead.",
+               category: :deprecated
+
+          format settings.avatar_uri, id: user.external_id
+        end
 
-        def profile_url(user) = format settings.profile_uri, id: user.handle
+        def profile_url user
+          warn "`#{self.class}##{__method__}` is deprecated, use user scope instead.",
+               category: :deprecated
+
+          format settings.profile_uri, id: user.handle
+        end
 
         def kind
           if prefixes.include? prefix then "normal"
@@ -61,8 +75,18 @@ module Milestoner
           value.milestone
         end
 
+        def popover_id = "po-#{value.sha}"
+
         def security = value.signature == "Good" ? "secure" : "insecure"
 
+        def signature_label
+          value.signature.then { |kind| kind == "Good" ? "🔒 #{kind}" : "🔓 #{kind}" }
+        end
+
+        def fingerprint = value.fingerprint.then { |text| text.empty? ? "N/A" : text }
+
+        def fingerprint_key = value.fingerprint_key.then { |text| text.empty? ? "N/A" : text }
+
         def at = authored_at.strftime "%Y-%m-%dT%H:%M:%S%z"
 
         def datetime = authored_at.strftime "%Y-%m-%d (%A) at %H:%M %p %Z"

data/lib/milestoner/views/parts/tag.rb

@@ -6,15 +6,21 @@ require "refinements/string"
 module Milestoner
   module Views
     module Parts
-      # Represents an individual tag.
+      # Provides tag presentation logic.
       class Tag < Hanami::View::Part
         include Import[:settings]
 
         using Refinements::String
 
         decorate :commits
+        decorate :author, as: :user
 
-        def avatar_url(user) = format settings.avatar_uri, id: user.external_id
+        def avatar_url user
+          warn "`#{self.class}##{__method__}` is deprecated, use user scope instead.",
+               category: :deprecated
+
+          format settings.avatar_uri, id: user.external_id
+        end
 
         def committed_at fallback: Time.now.utc
           value.committed_at.then { |at| at ? Time.at(at) : fallback }
@@ -26,9 +32,14 @@ module Milestoner
 
         def empty? = value.commits.empty?
 
-        def profile_url(user) = format settings.profile_uri, id: user.handle
+        def profile_url user
+          warn "`#{self.class}##{__method__}` is deprecated, use user scope instead.",
+               category: :deprecated
+
+          format settings.profile_uri, id: user.handle
+        end
 
-        def security = value.signature ? "🔒 Tag (valid)" : "🔓 Tag (invalid)"
+        def security = value.signature ? "🔒 Tag (secure)" : "🔓 Tag (insecure)"
 
         def total_commits
           value.commits.size.then { |total| "#{total} commit".pluralize "s", total }

data/lib/milestoner/views/parts/user.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require "hanami/view"
+
+module Milestoner
+  module Views
+    module Parts
+      # Provides user presentation logic.
+      class User < Hanami::View::Part
+        include Import[:settings]
+
+        def name = value.name.then { |text| text || "Unknown" }
+
+        def image_alt = value.name.then { |name| name || "missing" }
+
+        def avatar_url
+          value.name.then do |name|
+            return format settings.avatar_uri, id: value.external_id if name
+
+            "https://alchemists.io/images/projects/milestoner/icons/missing.png"
+          end
+        end
+
+        def profile_url
+          value.name.then do |name|
+            name ? format(settings.profile_uri, id: value.handle) : "/#unknown"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/milestoner/views/scope_builder.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require "hanami/view"
+
+module Milestoner
+  module Views
+    # A scope builder which is meant to replace and fix the default scope builder.
+    module ScopeBuilder
+      def self.call name = nil, locals:, rendering:
+        scope_for(name, rendering).new name:, locals:, rendering:
+      end
+
+      def self.scope_for name, rendering
+        case name
+          in nil then rendering.config.scope_class
+          in Class then name
+          else fetch_or_store name, rendering
+        end
+      end
+
+      def self.fetch_or_store name, rendering
+        config = rendering.config
+
+        Hanami::View.cache.fetch_or_store name, config do
+          constant = constant_for name, rendering
+          constant && constant < Hanami::View::Scope ? constant : config.scope_class
+        end
+      end
+
+      def self.constant_for name, rendering
+        name = rendering.inflector.camelize name.to_s
+        namespace = rendering.config.scope_namespace || Object
+
+        namespace.const_get name if namespace.const_defined? name, false
+      end
+
+      private_class_method :scope_for, :fetch_or_store, :constant_for
+    end
+  end
+end

data/lib/milestoner/views/scopes/content.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require "core"
+require "hanami/view"
+
+module Milestoner
+  module Views
+    module Scopes
+      # Provides content specific behavior for partials.
+      class Content < Hanami::View::Scope
+        def content = String locals.fetch(:content, Core::EMPTY_STRING)
+
+        def call = content.empty? ? render("milestones/none") : render("milestones/content")
+      end
+    end
+  end
+end

data/lib/milestoner/views/scopes/logo.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require "core"
+require "hanami/view"
+
+module Milestoner
+  module Views
+    module Scopes
+      # Provides logo specific behavior for partials.
+      class Logo < Hanami::View::Scope
+        def call = project_uri_logo ? render("milestones/logo") : Core::EMPTY_STRING
+      end
+    end
+  end
+end

data/lib/milestoner/views/scopes/tag_signature.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require "hanami/view"
+
+module Milestoner
+  module Views
+    module Scopes
+      # Provides tag signature specific behavior for partials.
+      class TagSignature < Hanami::View::Scope
+        def initialize(part: Parts::Tag.new(value: Models::Tag.new), **)
+          @part = part
+          super(**)
+        end
+
+        def tag = locals.fetch :tag, part
+
+        def call
+          tag.signature ? render("milestones/tag-secure") : render("milestones/tag-insecure")
+        end
+
+        private
+
+        attr_reader :part
+      end
+    end
+  end
+end

data/lib/milestoner/views/scopes/users.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require "hanami/view"
+
+module Milestoner
+  module Views
+    module Scopes
+      # Provides users specific behavior for partials.
+      class Users < Hanami::View::Scope
+        def call = users.any? ? render("milestones/users", users:) : render("milestones/none")
+      end
+    end
+  end
+end

data/milestoner.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name = "milestoner"
-  spec.version = "18.5.0"
+  spec.version = "18.6.0"
   spec.authors = ["Brooke Kuhlmann"]
   spec.email = ["brooke@alchemists.io"]
   spec.homepage = "https://alchemists.io/projects/milestoner"
@@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "lode", "~> 1.8"
   spec.add_dependency "redcarpet", "~> 3.6"
   spec.add_dependency "refinements", "~> 12.8"
-  spec.add_dependency "rouge", "~> 4.3"
+  spec.add_dependency "rouge", "~> 4.4"
   spec.add_dependency "rss", "~> 0.3"
   spec.add_dependency "runcom", "~> 11.5"
   spec.add_dependency "sanitize", "~> 6.1"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: milestoner
 version: !ruby/object:Gem::Version
-  version: 18.5.0
+  version: 18.6.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-15 00:00:00.000000000 Z
+date: 2024-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -239,14 +239,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '4.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '4.4'
 - !ruby/object:Gem::Dependency
   name: rss
   requirement: !ruby/object:Gem::Requirement
@@ -450,19 +450,35 @@ files:
 - lib/milestoner/templates/milestones/_commit.md.erb
 - lib/milestoner/templates/milestones/_commit.stream.erb
 - lib/milestoner/templates/milestones/_commit.xml.erb
-- lib/milestoner/templates/milestones/_icon.adoc.erb
-- lib/milestoner/templates/milestones/_icon.html.erb
-- lib/milestoner/templates/milestones/_icon.md.erb
-- lib/milestoner/templates/milestones/_icon.xml.erb
+- lib/milestoner/templates/milestones/_content.adoc.erb
+- lib/milestoner/templates/milestones/_content.html.erb
+- lib/milestoner/templates/milestones/_content.xml.erb
+- lib/milestoner/templates/milestones/_logo.adoc.erb
+- lib/milestoner/templates/milestones/_logo.html.erb
+- lib/milestoner/templates/milestones/_logo.md.erb
+- lib/milestoner/templates/milestones/_logo.xml.erb
+- lib/milestoner/templates/milestones/_none.adoc.erb
+- lib/milestoner/templates/milestones/_none.html.erb
+- lib/milestoner/templates/milestones/_none.xml.erb
 - lib/milestoner/templates/milestones/_profile.adoc.erb
 - lib/milestoner/templates/milestones/_profile.html.erb
 - lib/milestoner/templates/milestones/_profile.md.erb
 - lib/milestoner/templates/milestones/_profile.xml.erb
+- lib/milestoner/templates/milestones/_tag-insecure.html.erb
+- lib/milestoner/templates/milestones/_tag-secure.html.erb
 - lib/milestoner/templates/milestones/_tag.adoc.erb
 - lib/milestoner/templates/milestones/_tag.html.erb
 - lib/milestoner/templates/milestones/_tag.md.erb
 - lib/milestoner/templates/milestones/_tag.stream.erb
 - lib/milestoner/templates/milestones/_tag.xml.erb
+- lib/milestoner/templates/milestones/_user.adoc.erb
+- lib/milestoner/templates/milestones/_user.html.erb
+- lib/milestoner/templates/milestones/_user.md.erb
+- lib/milestoner/templates/milestones/_user.xml.erb
+- lib/milestoner/templates/milestones/_users.adoc.erb
+- lib/milestoner/templates/milestones/_users.html.erb
+- lib/milestoner/templates/milestones/_users.md.erb
+- lib/milestoner/templates/milestones/_users.xml.erb
 - lib/milestoner/templates/milestones/show.adoc.erb
 - lib/milestoner/templates/milestones/show.html.erb
 - lib/milestoner/templates/milestones/show.md.erb
@@ -473,6 +489,12 @@ files:
 - lib/milestoner/views/milestones/show.rb
 - lib/milestoner/views/parts/commit.rb
 - lib/milestoner/views/parts/tag.rb
+- lib/milestoner/views/parts/user.rb
+- lib/milestoner/views/scope_builder.rb
+- lib/milestoner/views/scopes/content.rb
+- lib/milestoner/views/scopes/logo.rb
+- lib/milestoner/views/scopes/tag_signature.rb
+- lib/milestoner/views/scopes/users.rb
 - milestoner.gemspec
 homepage: https://alchemists.io/projects/milestoner
 licenses:
@@ -503,7 +525,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.18
+rubygems_version: 3.5.19
 signing_key:
 specification_version: 4
 summary: A command line interface for automated Git repository milestones.

data/lib/milestoner/templates/milestones/_icon.adoc.erb

@@ -1 +0,0 @@
-image::https://alchemists.io/images/projects/milestoner/icons/<%= name %>[<%= alt %>,24,24]

data/lib/milestoner/templates/milestones/_icon.html.erb

@@ -1,6 +0,0 @@
-<img src="https://alchemists.io/images/projects/milestoner/icons/<%= name %>.png"
-     alt="<%= alt %>"
-     class="icon"
-     width="24"
-     height="24"
-     loading="lazy">

data/lib/milestoner/templates/milestones/_icon.md.erb

@@ -1,5 +0,0 @@
-<img src="https://alchemists.io/images/projects/milestoner/icons/<%= name %>.png"
-     alt="<%= alt %>"
-     width="24"
-     height="24"
-     loading="lazy">

data/lib/milestoner/templates/milestones/_icon.xml.erb

@@ -1,5 +0,0 @@
-<img src="https://alchemists.io/images/projects/milestoner/icons/<%= name %>.png"
-     alt="<%= alt %>"
-     width="24"
-     height="24"
-     loading="lazy">