protos 0.3.0 → 0.4.0

data/lib/protos/tabs/tab.rb

@@ -5,12 +5,12 @@ module Protos
     class Tab < Component
       # DOCS: A single tab in a tabs component
 
-      param :id
+      option :id
       option :label
       option :active, default: -> { false }
       option :disabled, default: -> { false }
 
-      def view_template(&block)
+      def view_template(&)
         input(
           type: :radio,
           class: css[:input],
@@ -19,7 +19,7 @@ module Protos
           aria_label: label,
           autocomplete: :off
         )
-        div(**attrs, &block)
+        div(**attrs, &)
       end
 
       private

data/lib/protos/tabs.rb

@@ -24,13 +24,11 @@ module Protos
              :lg
            )
 
-    def view_template(&block)
-      div(**attrs, &block)
+    def view_template(&)
+      div(**attrs, &)
     end
 
-    def tab(...)
-      Tab.new(...)
-    end
+    def tab(...) = render Tab.new(...)
 
     private
 

data/lib/protos/theme.rb

@@ -13,13 +13,24 @@ module Protos
       end
     end
 
-    def initialize(theme = {}, **kwargs)
-      @theme = theme.merge(kwargs)
+    def initialize(theme = {}, tailwind_merge: true, **kwargs)
+      @tailwind_merge = tailwind_merge
+
+      @theme = Hash.new do |hash, key|
+        hash[key] = TokenList.new
+      end
+
+      theme.merge!(kwargs).each do |key, value|
+        @theme[key].add(value)
+      end
     end
 
     def [](key)
-      value = @theme[key]
-      return value unless value.is_a?(String)
+      return nil unless key?(key)
+
+      value = @theme[key].to_s
+      return nil if value.empty?
+      return value unless @tailwind_merge
 
       self.class.merger.merge(value)
     end
@@ -29,66 +40,44 @@ module Protos
     end
 
     def add(key, value)
-      TokenList.new
-        .add(@theme.fetch(key, ""))
-        .add(value)
-        .to_s
-        .tap do |tokens|
-          @theme[key] = tokens
-        end
+      @theme[key].add(value)
     end
 
     def remove(key, value)
-      TokenList.new
-        .add(@theme.fetch(key, ""))
-        .remove(value)
-        .to_s
-        .tap do |tokens|
-          @theme[key] = tokens
-        end
+      @theme[key].remove(value)
+      @theme.delete(key) if @theme[key].empty?
     end
 
     def set(key, value)
-      if value.is_a?(Hash)
-        @theme[key] = value
-      else
-        TokenList
-          .parse(value)
-          .to_s
-          .tap do |tokens|
-            @theme[key] = tokens
-          end
-      end
+      @theme[key].clear.add(value)
     end
 
     def merge(hash)
-      hash ||= {}
-
-      tap do
-        hash.each_key do |key|
-          if key?(key)
-            add(key, hash[key])
-          elsif negation?(key)
-            no_bang = key.to_s[1..].to_sym
-            remove(no_bang, hash[key])
-          elsif override?(key)
-            no_bang = key.to_s.chomp("!").to_sym
-            set(no_bang, hash[key])
-          else
-            set(key, hash[key])
-          end
+      return self unless hash
+
+      hash.each do |key, value|
+        if key?(key)
+          add(key, value)
+        elsif negation?(key)
+          remove(key[1..].to_sym, value)
+        elsif override?(key)
+          set(key[..-2].to_sym, value)
+        else
+          set(key, value)
         end
       end
+
+      self
     end
 
     private
 
     def negation?(key)
-      key.to_s.start_with?("!")
+      key.start_with?("!")
     end
 
     def override?(key)
-      key.to_s.end_with?("!")
+      key.end_with?("!")
     end
   end
 end

data/lib/protos/timeline/center.rb

@@ -6,8 +6,8 @@ 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 view_template(&block)
-        div(**attrs, &block)
+      def view_template(&)
+        div(**attrs, &)
       end
 
       private

data/lib/protos/timeline/item.rb

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

data/lib/protos/timeline/left.rb

@@ -6,8 +6,8 @@ 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 view_template(&block)
-        div(**attrs, &block)
+      def view_template(&)
+        div(**attrs, &)
       end
 
       private

data/lib/protos/timeline/right.rb

@@ -6,8 +6,8 @@ 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 view_template(&block)
-        div(**attrs, &block)
+      def view_template(&)
+        div(**attrs, &)
       end
 
       private

data/lib/protos/timeline.rb

@@ -7,25 +7,17 @@ module Protos
 
     option :vertical, type: Types::Bool, default: -> { false }
 
-    def view_template(&block)
-      ul(**attrs, &block)
+    def view_template(&)
+      ul(**attrs, &)
     end
 
-    def item(...)
-      Item.new(...)
-    end
+    def item(...) = render Item.new(...)
 
-    def left(...)
-      Left.new(...)
-    end
+    def left(...) = render Left.new(...)
 
-    def center(...)
-      Center.new(...)
-    end
+    def center(...) = render Center.new(...)
 
-    def right(...)
-      Right.new(...)
-    end
+    def right(...) = render Right.new(...)
 
     private
 

data/lib/protos/toast/close_button.rb

@@ -10,6 +10,7 @@ module Protos
           button(
             autofocus: true,
             formmethod: :dialog,
+            formnovalidate: true,
             **attrs,
             &block
           )

data/lib/protos/toast.rb

@@ -23,13 +23,11 @@ module Protos
            default: -> { :bottom_end },
            reader: false
 
-    def view_template(&block)
-      dialog(**attrs, &block)
+    def view_template(&)
+      dialog(**attrs, &)
     end
 
-    def close_button(...)
-      CloseButton.new(...)
-    end
+    def close_button(...) = render CloseButton.new(...)
 
     private
 

data/lib/protos/token_list.rb

@@ -3,19 +3,7 @@
 module Protos
   class TokenList
     # DOCS: A list of utility tokens that can handle parsing and merging sets of
-    # tokens together safely. It uses TailwindMerge to merge the tokens together
-    # while accounting for their conflicts.
-
-    def self.parse(input)
-      case input
-      when String then new(input.split)
-      when Array then new(input)
-      when TokenList then input
-      when NilClass then new
-      else raise ArgumentError,
-                 "Invalid input for #{self.class.name}: #{input.inspect}"
-      end
-    end
+    # tokens together safely.
 
     attr_reader :tokens
 
@@ -23,34 +11,33 @@ module Protos
       @tokens = Set.new(tokens)
     end
 
+    def empty?
+      @tokens.empty?
+    end
+
     def to_s
       @tokens.join(" ")
     end
 
-    def -(other)
-      other = TokenList.parse(other)
-      self.class.new(@tokens - other.tokens)
+    def remove(tokens)
+      @tokens.subtract(parse(tokens))
+      self
     end
 
-    def +(other)
-      other = TokenList.parse(other)
-      self.class.new(@tokens + other.tokens)
+    def add(tokens)
+      @tokens.merge(parse(tokens))
+      self
     end
 
-    def remove(token)
-      tap do
-        self.class.parse(token).tokens.each do |token|
-          @tokens.delete(token)
-        end
-      end
+    def clear
+      @tokens.clear
+      self
     end
 
-    def add(input)
-      tap do
-        self.class.parse(input).tokens.each do |token|
-          @tokens.add(token)
-        end
-      end
+    private
+
+    def parse(tokens)
+      tokens.split
     end
   end
 end

data/lib/protos/typography/heading.rb

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

data/lib/protos/typography/inline_link.rb

@@ -5,8 +5,8 @@ module Protos
     class InlineLink < Component
       # DOCS: A link that is styled to be inline with text
 
-      def view_template(&block)
-        a(**attrs, &block)
+      def view_template(&)
+        a(**attrs, &)
       end
 
       private
@@ -14,7 +14,7 @@ module Protos
       def theme
         {
           container: tokens(
-            "font-medium",
+            "font-semibold",
             "hover:underline",
             "underline-offset-4",
             "cursor-pointer"

data/lib/protos/typography/paragraph.rb

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

data/lib/protos/typography.rb

@@ -5,28 +5,28 @@ module Protos
     # DOCS: The core typography module that can be mixedin to override the
     # default elements with custom elements.
 
-    def h1(**options, &block)
-      render(Heading.new(level: 1, size: :xl, **options), &block)
+    def h1(**, &)
+      render Heading.new(level: 1, size: :xl, **, &)
     end
 
-    def h2(**options, &block)
-      render(Heading.new(level: 2, size: :lg, **options), &block)
+    def h2(**, &)
+      render Heading.new(level: 2, size: :lg, **, &)
     end
 
-    def h3(**options, &block)
-      render(Heading.new(level: 3, size: :md, **options), &block)
+    def h3(**, &)
+      render Heading.new(level: 3, size: :md, **, &)
     end
 
-    def h4(**options, &block)
-      render(Heading.new(level: 4, size: :sm, **options), &block)
+    def h4(**, &)
+      render Heading.new(level: 4, size: :sm, **, &)
     end
 
-    def p(**options, &block)
-      render(Paragraph.new(**options), &block)
+    def p(**, &)
+      render Paragraph.new(**, &)
     end
 
-    def inline_a(**options, &block)
-      render(InlineLink.new(**options), &block)
+    def inline_a(**, &)
+      render InlineLink.new(**, &)
     end
   end
 end

data/lib/protos/version.rb

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

data/protos.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.description = "A UI component library built with phlex and daisyui"
   spec.homepage = "https://github.com/inhouse-work/protos"
   spec.license = "MIT"
-  spec.required_ruby_version = ">= 3.1"
+  spec.required_ruby_version = ">= 3.2"
   spec.requirements << "tailwindcss"
   spec.requirements << "daisyui"
   spec.requirements << "protos-stimulus"
@@ -26,7 +26,19 @@ Gem::Specification.new do |spec|
   spec.files = Dir.chdir(__dir__) do
     `git ls-files -z`.split("\x0").reject do |f|
       (File.expand_path(f) == __FILE__) ||
-        f.start_with?(*%w[bin/ test/ spec/ features/ .git appveyor Gemfile])
+        f.start_with?(
+          *%w[
+            bin/
+            test/
+            spec/
+            features/
+            rakelib/
+            benchmark/
+            .git
+            appveyor
+            Gemfile
+          ]
+        )
     end
   end
   spec.bindir = "exe"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: protos
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Nolan J Tait
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-04-07 00:00:00.000000000 Z
+date: 2024-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-core
@@ -93,6 +93,8 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- benchmarks/.keep
+- benchmarks/table.txt
 - examples/list.rb
 - examples/navbar.rb
 - lib/protos.rb
@@ -205,7 +207,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.1'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -215,7 +217,7 @@ requirements:
 - tailwindcss
 - daisyui
 - protos-stimulus
-rubygems_version: 3.5.3
+rubygems_version: 3.5.7
 signing_key:
 specification_version: 4
 summary: A UI component library built with phlex and daisyui