protos 0.2.2 → 0.3.0

data/lib/protos/dropdown/menu.rb

@@ -7,7 +7,7 @@ module Protos
       # Protos::Popover::Content component as the main functionality for
       # dropdowns comes from there.
 
-      def template(&block)
+      def view_template(&block)
         template_tag(**template_attrs) do
           ul(**attrs, &block)
         end

data/lib/protos/hero/content.rb

@@ -6,7 +6,7 @@ module Protos
       # DOCS: The content of a hero. This would be centered within the main
       # component container.
 
-      def template(&block)
+      def view_template(&block)
         div(**attrs, &block)
       end
 

data/lib/protos/hero/overlay.rb

@@ -7,7 +7,7 @@ module Protos
       # their opacity through the opacity of the overlay. This can be useful to
       # make text readable on noisy images.
 
-      def template(&block)
+      def view_template(&block)
         div(**attrs, &block)
       end
 

data/lib/protos/hero.rb

@@ -6,7 +6,7 @@ module Protos
     # optionally layout an image for a responsive layout.
     # https://daisyui.com/components/hero/
 
-    def template(&block)
+    def view_template(&block)
       div(**attrs, &block)
     end
 

data/lib/protos/list/item.rb

@@ -7,7 +7,7 @@ module Protos
       # work for list items, including border radius. E.g. only the first and
       # last items will have border radius on the top and bottom.
 
-      def template(&block)
+      def view_template(&block)
         li(**attrs, &block)
       end
 

data/lib/protos/list.rb

@@ -7,7 +7,7 @@ module Protos
 
     option :ordered, Types::Bool, default: -> { false }, reader: false
 
-    def template(&block)
+    def view_template(&block)
       send(element, **attrs, &block)
     end
 

data/lib/protos/modal/close_button.rb

@@ -5,7 +5,7 @@ module Protos
     class CloseButton < Component
       # DOCS: A close button for a modal
 
-      def template(&block)
+      def view_template(&block)
         form(method: :dialog, class: css[:form]) do
           button(
             **attrs,

data/lib/protos/modal/dialog.rb

@@ -6,7 +6,7 @@ module Protos
       # DOCS: A modal dialog. This is the place for the main content of the
       # modal that will be displayed when the trigger is clicked.
 
-      def template(&block)
+      def view_template(&block)
         dialog(**attrs) do
           div(class: css[:modal], &block)
         end

data/lib/protos/modal/trigger.rb

@@ -5,7 +5,7 @@ module Protos
     class Trigger < Component
       # DOCS: A trigger is a button that opens a modal
 
-      def template(&block)
+      def view_template(&block)
         button(**attrs, &block)
       end
 

data/lib/protos/modal.rb

@@ -5,7 +5,7 @@ module Protos
     # DOCS: A modal component that can be triggered by a button or a link and
     # will open a fullscreen modal, usually with a close button.
 
-    def template(&block)
+    def view_template(&block)
       div(**attrs, class: css[:container], &block)
     end
 

data/lib/protos/popover/content.rb

@@ -8,7 +8,7 @@ module Protos
       # This means content in here will not be available in system tests that
       # use rack_test.
 
-      def template(&block)
+      def view_template(&block)
         template_tag(**template_attrs) do
           div(**attrs, &block)
         end

data/lib/protos/popover/trigger.rb

@@ -6,7 +6,7 @@ module Protos
       # DOCS: The trigger of a popover. This is the element that you would hover
       # or click on to show the popover.
 
-      def template(&block)
+      def view_template(&block)
         div(**attrs, &block)
       end
 

data/lib/protos/popover.rb

@@ -80,7 +80,7 @@ module Protos
            reader: false,
            type: TriggerTypes | Types::Array.of(TriggerTypes)
 
-    def template(&block)
+    def view_template(&block)
       div(**attrs, &block)
     end
 

data/lib/protos/stats/actions.rb

@@ -5,7 +5,7 @@ module Protos
     class Actions < Component
       # DOCS: A container for the actions (e.g. buttons) for a group of stats
 
-      def template(&block)
+      def view_template(&block)
         div(**attrs, &block)
       end
 

data/lib/protos/stats/description.rb

@@ -5,7 +5,7 @@ module Protos
     class Description < Component
       # DOCS: A description for a group of stats
 
-      def template(&block)
+      def view_template(&block)
         div(**attrs, &block)
       end
 

data/lib/protos/stats/figure.rb

@@ -5,7 +5,7 @@ module Protos
     class Figure < Component
       # DOCS: A figure for a single stat
 
-      def template(&block)
+      def view_template(&block)
         div(**attrs, &block)
       end
 

data/lib/protos/stats/stat.rb

@@ -5,7 +5,7 @@ module Protos
     class Stat < Component
       # DOCS: A single stat container
 
-      def template(&block)
+      def view_template(&block)
         div(**attrs, &block)
       end
 

data/lib/protos/stats/title.rb

@@ -5,7 +5,7 @@ module Protos
     class Title < Component
       # DOCS: A title for a group of stats
 
-      def template(&block)
+      def view_template(&block)
         div(**attrs, &block)
       end
 

data/lib/protos/stats/value.rb

@@ -5,7 +5,7 @@ module Protos
     class Value < Component
       # DOCS: A value for a single stat
 
-      def template(&block)
+      def view_template(&block)
         div(**attrs, &block)
       end
 

data/lib/protos/stats.rb

@@ -5,7 +5,7 @@ module Protos
     # DOCS: Stats component that contains a collection of stats
     # https://daisyui.com/components/stat/
 
-    def template(&block)
+    def view_template(&block)
       div(**attrs, &block)
     end
 

data/lib/protos/swap/off.rb

@@ -5,7 +5,7 @@ module Protos
     class Off < Component
       # DOCS: The off state for a swap component. This is the default state.
 
-      def template(&block)
+      def view_template(&block)
         div(**attrs, &block)
       end
 

data/lib/protos/swap/on.rb

@@ -5,7 +5,7 @@ module Protos
     class On < Component
       # DOCS: The on state for a swap component. This is the active state.
 
-      def template(&block)
+      def view_template(&block)
         div(**attrs, &block)
       end
 

data/lib/protos/swap.rb

@@ -6,9 +6,9 @@ module Protos
     # display different content.
     # https://daisyui.com/components/swap/
 
-    def template
+    def view_template
       label(**attrs) do
-        input(type: :checkbox, class: css[:input])
+        input(type: :checkbox, class: css[:input], autocomplete: :off)
         yield if block_given?
       end
     end
@@ -25,8 +25,7 @@ module Protos
 
     def theme
       {
-        container: tokens("swap"),
-        input: tokens("hidden")
+        container: tokens("swap")
       }
     end
   end

data/lib/protos/table/body.rb

@@ -5,7 +5,7 @@ module Protos
     class Body < Component
       # DOCS: The body of a table
 
-      def template(&block)
+      def view_template(&block)
         tbody(**attrs, &block)
       end
     end

data/lib/protos/table/caption.rb

@@ -5,7 +5,7 @@ module Protos
     class Caption < Component
       # DOCS: The caption of a table
 
-      def template(&block)
+      def view_template(&block)
         caption(**attrs, &block)
       end
 

data/lib/protos/table/cell.rb

@@ -11,7 +11,7 @@ module Protos
                :left
              }
 
-      def template(&block)
+      def view_template(&block)
         td(**attrs, &block)
       end
 

data/lib/protos/table/footer.rb

@@ -5,7 +5,7 @@ module Protos
     class Footer < Component
       # DOCS: The footer of a table
 
-      def template(&block)
+      def view_template(&block)
         tfoot(**attrs, &block)
       end
     end

data/lib/protos/table/head.rb

@@ -11,7 +11,7 @@ module Protos
                :left
              }
 
-      def template(&block)
+      def view_template(&block)
         th(**attrs, &block)
       end
 

data/lib/protos/table/header.rb

@@ -6,7 +6,7 @@ module Protos
       # DOCS: The header of a table that contains many Protos::Table::Head
       # components
 
-      def template(&block)
+      def view_template(&block)
         thead(**attrs, &block)
       end
     end

data/lib/protos/table/row.rb

@@ -5,7 +5,7 @@ module Protos
     class Row < Component
       # DOCS: The row of a table
 
-      def template(&block)
+      def view_template(&block)
         tr(**attrs, &block)
       end
     end

data/lib/protos/table.rb

@@ -18,7 +18,7 @@ module Protos
              :lg
            )
 
-    def template(&block)
+    def view_template(&block)
       div(**attrs) do
         table(class: css[:table], &block)
       end

data/lib/protos/tabs/tab.rb

@@ -10,13 +10,14 @@ module Protos
       option :active, default: -> { false }
       option :disabled, default: -> { false }
 
-      def template(&block)
+      def view_template(&block)
         input(
           type: :radio,
           class: css[:input],
           name: id,
           role: :tab,
-          aria_label: label
+          aria_label: label,
+          autocomplete: :off
         )
         div(**attrs, &block)
       end

data/lib/protos/tabs.rb

@@ -24,7 +24,7 @@ module Protos
              :lg
            )
 
-    def template(&block)
+    def view_template(&block)
       div(**attrs, &block)
     end
 

data/lib/protos/theme.rb

@@ -7,12 +7,21 @@ module Protos
     # This is the object that is returned by `css` and used to set slots for
     # a component style.
 
+    class << self
+      def merger
+        @merger ||= TailwindMerge::Merger.new
+      end
+    end
+
     def initialize(theme = {}, **kwargs)
       @theme = theme.merge(kwargs)
     end
 
     def [](key)
-      @theme[key]
+      value = @theme[key]
+      return value unless value.is_a?(String)
+
+      self.class.merger.merge(value)
     end
 
     def key?(key)

data/lib/protos/timeline/center.rb

@@ -6,7 +6,7 @@ module Protos
       # DOCS: The center of a timeline. This would usually be an icon or
       # something small that shows a point on the timeline.
 
-      def template(&block)
+      def view_template(&block)
         div(**attrs, &block)
       end
 

data/lib/protos/timeline/item.rb

@@ -7,7 +7,7 @@ module Protos
       # right and depending on its position in the list, an hr at the beginning
       # or end.
 
-      def template(&block)
+      def view_template(&block)
         li(**attrs, &block)
       end
     end

data/lib/protos/timeline/left.rb

@@ -6,7 +6,7 @@ module Protos
       # DOCS: Content on the left (on daisyui "start") side of a timeline.
       # We chose not to use start/end because of the keywork conflict with ruby.
 
-      def template(&block)
+      def view_template(&block)
         div(**attrs, &block)
       end
 

data/lib/protos/timeline/right.rb

@@ -6,7 +6,7 @@ module Protos
       # DOCS: Content on the right (on daisyui "end") side of a timeline.
       # We chose not to use start/end because of the keywork conflict with ruby.
 
-      def template(&block)
+      def view_template(&block)
         div(**attrs, &block)
       end
 

data/lib/protos/timeline.rb

@@ -7,7 +7,7 @@ module Protos
 
     option :vertical, type: Types::Bool, default: -> { false }
 
-    def template(&block)
+    def view_template(&block)
       ul(**attrs, &block)
     end
 

data/lib/protos/toast/close_button.rb

@@ -5,7 +5,7 @@ module Protos
     class CloseButton < Component
       # DOCS: A close button for a toast
 
-      def template(&block)
+      def view_template(&block)
         form(method: :dialog, class: css[:form]) do
           button(
             autofocus: true,

data/lib/protos/toast.rb

@@ -23,7 +23,7 @@ module Protos
            default: -> { :bottom_end },
            reader: false
 
-    def template(&block)
+    def view_template(&block)
       dialog(**attrs, &block)
     end
 

data/lib/protos/token_list.rb

@@ -24,7 +24,7 @@ module Protos
     end
 
     def to_s
-      merge(@tokens.to_a.join(" "))
+      @tokens.join(" ")
     end
 
     def -(other)
@@ -52,21 +52,5 @@ module Protos
         end
       end
     end
-
-    private
-
-    def merge(tokens)
-      TailwindMerge::Merger.new(
-        config: {
-          theme: {
-            # Not currently working in the gem.
-            # "spacing" => %w[xs sm md lg xl],
-            # "padding" => %w[xs sm md lg xl],
-            # "margin" => %w[xs sm md lg xl]
-          }
-        }
-      )
-        .merge(tokens)
-    end
   end
 end

data/lib/protos/typography/heading.rb

@@ -12,7 +12,7 @@ module Protos
       option :size, type: SizeTypes, default: -> { "md" }, reader: false
       option :level, type: LevelTypes, default: -> { 1 }, reader: false
 
-      def template(&block)
+      def view_template(&block)
         send(element, **attrs, &block)
       end
 

data/lib/protos/typography/inline_link.rb

@@ -5,7 +5,7 @@ module Protos
     class InlineLink < Component
       # DOCS: A link that is styled to be inline with text
 
-      def template(&block)
+      def view_template(&block)
         a(**attrs, &block)
       end
 

data/lib/protos/typography/paragraph.rb

@@ -5,7 +5,7 @@ module Protos
     class Paragraph < Component
       # DOCS: A paragraph of text
 
-      def template(&block)
+      def view_template(&block)
         p(**attrs, &block)
       end
 

data/lib/protos/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Protos
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

data/protos.gemspec

@@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "dry-core", "~> 1.0"
   spec.add_dependency "dry-initializer", "~> 3.1"
   spec.add_dependency "dry-types", "~> 1.7"
-  spec.add_dependency "phlex", "~> 1.9"
+  spec.add_dependency "phlex", "~> 1.10"
   spec.add_dependency "tailwind_merge", "~> 0.10"
 
   # For more information and examples about making a new gem, check out our

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: protos
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Nolan J Tait
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-03-10 00:00:00.000000000 Z
+date: 2024-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-core
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '1.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: tailwind_merge
   requirement: !ruby/object:Gem::Requirement