primer_view_components 0.0.23 → 0.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c3deb4c623c9f6825193924584857ead4554a0a78003d60ed901f100bf454e3
-  data.tar.gz: d21529682ea0c4dabddb193d4f86bab373636f1f407a66945723d36339faa7d7
+  metadata.gz: fbd4dec44b8225065e2087b90d0e1fb26c9a883635129c2161c3feaf6a72decc
+  data.tar.gz: b441554ed718efc5d0884a7cabcc05c1aba7ad07e1eb269c4772a11dc7baeff3
 SHA512:
-  metadata.gz: 2ea036cc17c4167cbf88306c9626e1a590ff668cde1eebf8aaba01d7a6f3c10d271dd74b16b362c83ecfe7fdc6be26000a0583c10aa6cf0d83ad7cc2f949ae53
-  data.tar.gz: 1bb92eb17ed62a6c718aff864fd3dea932de727cd08c8663116331b82b8cf07664cf223a0653c157b4553947151cbbf44a80812ec3594ac87a572b6e3267c1a9
+  metadata.gz: 89b5aa5fb510b720756782bde172a510c039c0a5907f1225a433d4ff39eeea9ad92149fe9ba473796dfd33997650c9a791171e16e451925038316c20f0df9079
+  data.tar.gz: 6b0dc8e39581f66a08689206ada93f1791f14b26f3b5ac851e340ba403ad1fdeec9bb26d6d37c04c5f3d25d924c2d4ceb7eb0df60fc5e0e6322c9c507bf2fcae

data/CHANGELOG.md

@@ -1,6 +1,20 @@
 # CHANGELOG
 
 ## main
+  
+## 0.0.24
+
+* Fix zeitwerk autoload integration.
+
+    *Manuel Puyol*
+
+* **Breaking change**: Upgrade `ProgressBarComponent` to use Slots V2.
+
+  *Simon Taranto*
+
+* **Breaking change**: Upgrade `BreadcrumbComponent` to use Slots V2.
+
+    *Manuel Puyol*
 
 ## 0.0.23
 

data/app/components/primer/breadcrumb_component.html.erb

@@ -1,8 +1,7 @@
 <%= render Primer::BaseComponent.new(**@system_arguments) do %>
   <ol>
     <% items.each do |item| %>
-      <%# The <li> and <a> need to be on the same line to prevent unwanted whitespace %>
-      <%= render Primer::BaseComponent.new(**item.system_arguments) do %><%- if item.href.present? %><a href="<%= item.href %>"><%= item.content %></a><%- else %><%= item.content %><%- end %><%- end %>
+      <%= item %>
     <% end %>
   </ol>
 <% end %>

data/app/components/primer/breadcrumb_component.rb

@@ -3,15 +3,20 @@
 module Primer
   # Use breadcrumbs to display page hierarchy within a section of the site. All of the items in the breadcrumb "trail" are links except for the final item, which is a plain string indicating the current page.
   class BreadcrumbComponent < Primer::Component
-    include ViewComponent::Slotable
+    include ViewComponent::SlotableV2
 
-    with_slot :item, collection: true, class_name: "BreadcrumbItem"
+    # _Note: if both `href` and `selected: true` are passed in, `href` will be ignored and the item will not be rendered as a link._
+    #
+    # @param href [String] The URL to link to.
+    # @param selected [Boolean] Whether or not the item is selected and not rendered as a link.
+    # @param system_arguments [Hash] <%= link_to_system_arguments_docs %>
+    renders_many :items, "ItemComponent"
 
     # @example Basic
     #   <%= render(Primer::BreadcrumbComponent.new) do |component| %>
-    #     <% component.slot(:item, href: "/") do %>Home<% end %>
-    #     <% component.slot(:item, href: "/about") do %>About<% end %>
-    #     <% component.slot(:item, selected: true) do %>Team<% end %>
+    #     <% component.item(href: "/") do %>Home<% end %>
+    #     <% component.item(href: "/about") do %>About<% end %>
+    #     <% component.item(selected: true) do %>Team<% end %>
     #   <% end %>
     #
     # @param system_arguments [Hash] <%= link_to_system_arguments_docs %>
@@ -25,13 +30,9 @@ module Primer
       items.any?
     end
 
-    # _Note: if both `href` and `selected: true` are passed in, `href` will be ignored and the item will not be rendered as a link._
-    class BreadcrumbItem < Primer::Slot
-      attr_reader :href, :system_arguments
-
-      # @param href [String] The URL to link to.
-      # @param selected [Boolean] Whether or not the item is selected and not rendered as a link.
-      # @param system_arguments [Hash] <%= link_to_system_arguments_docs %>
+    # This component is part of `Primer::BreadcrumbComponent` and should not be
+    # used as a standalone component.
+    class ItemComponent < Primer::Component
       def initialize(href: nil, selected: false, **system_arguments)
         @href = href
         @system_arguments = system_arguments
@@ -41,6 +42,16 @@ module Primer
         @system_arguments[:"aria-current"] = "page" if selected
         @system_arguments[:classes] = "breadcrumb-item #{@system_arguments[:classes]}"
       end
+
+      def call
+        render(Primer::BaseComponent.new(**@system_arguments)) do
+          if @href.present?
+            render(Primer::LinkComponent.new(href: @href)) { content }
+          else
+            content
+          end
+        end
+      end
     end
   end
 end

data/app/components/primer/component.rb

@@ -9,7 +9,7 @@ module Primer
     include FetchOrFallbackHelper
     include OcticonsHelper
     include JoinStyleArgumentsHelper
-    include ViewHelper::DSL
+    include ViewHelper::Dsl
     include ViewHelper
 
     # sourced from https://primer.style/doctocat/usage/front-matter#status

data/app/components/primer/progress_bar_component.html.erb

@@ -1,5 +1,5 @@
 <%= render Primer::BaseComponent.new(**@system_arguments) do %>
   <% items.each do |item| %>
-    <%= render Primer::BaseComponent.new(**item.system_arguments) %>
+    <%= item %>
   <% end %>
 <% end %>

data/app/components/primer/progress_bar_component.rb

@@ -3,9 +3,24 @@
 module Primer
   # Use ProgressBar to visualize task completion.
   class ProgressBarComponent < Primer::Component
-    include ViewComponent::Slotable
+    include ViewComponent::SlotableV2
 
-    with_slot :item, collection: true, class_name: "Item"
+    # Use the Item slot to add an item to the progress bas
+    #
+    # @param percentage [Integer] The percent complete
+    # @param bg [Symbol] The background color
+    # @param kwargs [Hash] The same arguments as <%= link_to_system_arguments_docs %>.
+    renders_many :items, lambda { |percentage: 0, bg: :green, **system_arguments|
+      percentage = percentage
+      system_arguments = system_arguments
+
+      system_arguments[:tag] = :span
+      system_arguments[:bg] = bg
+      system_arguments[:style] = join_style_arguments(system_arguments[:style], "width: #{percentage}%;")
+      system_arguments[:classes] = class_names("Progress-item", system_arguments[:classes])
+
+      Primer::BaseComponent.new(**system_arguments)
+    }
 
     SIZE_DEFAULT = :default
 
@@ -18,24 +33,24 @@ module Primer
     SIZE_OPTIONS = SIZE_MAPPINGS.keys
     # @example Default
     #   <%= render(Primer::ProgressBarComponent.new) do |component| %>
-    #     <% component.slot(:item, percentage: 25) %>
+    #     <% component.item(percentage: 25) %>
     #   <% end %>
     #
     # @example Small
     #   <%= render(Primer::ProgressBarComponent.new(size: :small)) do |component| %>
-    #     <% component.slot(:item, bg: :blue_4, percentage: 50) %>
+    #     <% component.item(bg: :blue_4, percentage: 50) %>
     #   <% end %>
     #
     # @example Large
     #   <%= render(Primer::ProgressBarComponent.new(size: :large)) do |component| %>
-    #     <% component.slot(:item, bg: :red_4, percentage: 75) %>
+    #     <% component.item(bg: :red_4, percentage: 75) %>
     #   <% end %>
     #
     # @example Multiple items
     #   <%= render(Primer::ProgressBarComponent.new) do |component| %>
-    #     <% component.slot(:item, percentage: 10) %>
-    #     <% component.slot(:item, bg: :blue_4, percentage: 20) %>
-    #     <% component.slot(:item, bg: :red_4, percentage: 30) %>
+    #     <% component.item(percentage: 10) %>
+    #     <% component.item(bg: :blue_4, percentage: 20) %>
+    #     <% component.item(bg: :red_4, percentage: 30) %>
     #   <% end %>
     #
     # @param size [Symbol] <%= one_of(Primer::ProgressBarComponent::SIZE_OPTIONS) %> Increases height.
@@ -53,24 +68,5 @@ module Primer
     def render?
       items.any?
     end
-
-    # :nodoc:
-    class Item < Primer::Slot
-      attr_reader :system_arguments
-
-      # @param percentage [Integer] Percentage completion of item.
-      # @param bg [Symbol] Color of item.
-      # @param system_arguments [Hash] <%= link_to_system_arguments_docs %>
-      def initialize(percentage: 0, bg: :green, **system_arguments)
-        @percentage = percentage
-        @system_arguments = system_arguments
-
-        @system_arguments[:tag] = :span
-        @system_arguments[:bg] = bg
-        @system_arguments[:style] =
-          join_style_arguments(@system_arguments[:style], "width: #{@percentage}%;")
-        @system_arguments[:classes] = class_names("Progress-item", @system_arguments[:classes])
-      end
-    end
   end
 end

data/app/lib/primer/view_helper/dsl.rb

@@ -10,10 +10,10 @@ module Primer
     # Example:
     #
     # class MyComponent < ViewComponent::Base
-    #   include Primer::ViewHelper::DSL
+    #   include Primer::ViewHelper::Dsl
     #   view_helper :my_component
     # end
-    module DSL
+    module Dsl
       extend ActiveSupport::Concern
 
       class ViewHelperAlreadyDefined < StandardError; end

data/lib/primer/view_components/version.rb

@@ -5,7 +5,7 @@ module Primer
     module VERSION
       MAJOR = 0
       MINOR = 0
-      PATCH = 23
+      PATCH = 24
 
       STRING = [MAJOR, MINOR, PATCH].join(".")
     end

data/static/statuses.json

@@ -1 +1 @@
-{"Primer::AvatarComponent":"beta","Primer::AvatarStackComponent":"alpha","Primer::BaseComponent":"alpha","Primer::BlankslateComponent":"alpha","Primer::BorderBoxComponent":"beta","Primer::BoxComponent":"stable","Primer::BreadcrumbComponent":"alpha","Primer::ButtonComponent":"alpha","Primer::ButtonGroupComponent":"alpha","Primer::ButtonMarketingComponent":"alpha","Primer::CounterComponent":"beta","Primer::DetailsComponent":"alpha","Primer::Dropdown::MenuComponent":"alpha","Primer::DropdownComponent":"alpha","Primer::DropdownMenuComponent":"deprecated","Primer::FlashComponent":"beta","Primer::FlexComponent":"alpha","Primer::FlexItemComponent":"alpha","Primer::HeadingComponent":"alpha","Primer::LabelComponent":"beta","Primer::LayoutComponent":"alpha","Primer::LinkComponent":"beta","Primer::MarkdownComponent":"alpha","Primer::MenuComponent":"alpha","Primer::OcticonComponent":"beta","Primer::PopoverComponent":"alpha","Primer::ProgressBarComponent":"alpha","Primer::SpinnerComponent":"beta","Primer::StateComponent":"beta","Primer::SubheadComponent":"alpha","Primer::TabContainerComponent":"alpha","Primer::TabNavComponent":"alpha","Primer::TabNavComponent::TabComponent":"alpha","Primer::TextComponent":"alpha","Primer::TimelineItemComponent":"alpha","Primer::TimelineItemComponent::BadgeComponent":"alpha","Primer::TooltipComponent":"alpha","Primer::TruncateComponent":"alpha","Primer::UnderlineNavComponent":"alpha"}
+{"Primer::AvatarComponent":"beta","Primer::AvatarStackComponent":"alpha","Primer::BaseComponent":"alpha","Primer::BlankslateComponent":"alpha","Primer::BorderBoxComponent":"beta","Primer::BoxComponent":"stable","Primer::BreadcrumbComponent":"alpha","Primer::BreadcrumbComponent::ItemComponent":"alpha","Primer::ButtonComponent":"alpha","Primer::ButtonGroupComponent":"alpha","Primer::ButtonMarketingComponent":"alpha","Primer::CounterComponent":"beta","Primer::DetailsComponent":"alpha","Primer::Dropdown::MenuComponent":"alpha","Primer::DropdownComponent":"alpha","Primer::DropdownMenuComponent":"deprecated","Primer::FlashComponent":"beta","Primer::FlexComponent":"alpha","Primer::FlexItemComponent":"alpha","Primer::HeadingComponent":"alpha","Primer::LabelComponent":"beta","Primer::LayoutComponent":"alpha","Primer::LinkComponent":"beta","Primer::MarkdownComponent":"alpha","Primer::MenuComponent":"alpha","Primer::OcticonComponent":"beta","Primer::PopoverComponent":"alpha","Primer::ProgressBarComponent":"alpha","Primer::SpinnerComponent":"beta","Primer::StateComponent":"beta","Primer::SubheadComponent":"alpha","Primer::TabContainerComponent":"alpha","Primer::TabNavComponent":"alpha","Primer::TabNavComponent::TabComponent":"alpha","Primer::TextComponent":"alpha","Primer::TimelineItemComponent":"alpha","Primer::TimelineItemComponent::BadgeComponent":"alpha","Primer::TooltipComponent":"alpha","Primer::TruncateComponent":"alpha","Primer::UnderlineNavComponent":"alpha"}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: primer_view_components
 version: !ruby/object:Gem::Version
-  version: 0.0.23
+  version: 0.0.24
 platform: ruby
 authors:
 - GitHub Open Source
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-01 00:00:00.000000000 Z
+date: 2021-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octicons_helper