protos 0.2.3 → 0.4.0

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 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 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 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.2.3"
+  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"
@@ -37,7 +49,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.3
+  version: 0.4.0
 platform: ruby
 authors:
 - Nolan J Tait
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-03-14 00:00:00.000000000 Z
+date: 2024-04-09 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
@@ -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