tail_merge 0.2.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff6ca50c862b6942ab07296b4111bc84928f960883f939e153069b926b51dc38
-  data.tar.gz: 853009b24fb888e2d0af540c274541fdebbad87aded06fbab79cfcb1061f469a
+  metadata.gz: df9120474172d53dc79d7592c20832032545e05572a437c63b7d342cfd2bb33a
+  data.tar.gz: 24e6b1bc37558804a3a4fa4afdd06b4a4d21e5ace5ed349def07a5d0b2768584
 SHA512:
-  metadata.gz: dc1d28edcf9b35ea2b98ba0a42821d932ad8109c21e818fa6b499fc8cdbca2db4dbe8c54540fb4d8c79dca2523f90a5883398e8736e4ef9f7693e855c956369c
-  data.tar.gz: 385cea35eb5451eb138557b3ec3312834fc4826449802f16f7f40531922ca38dc9fdd55c829fcdcc819820b7196cd10a26095ae65b5f252fc3c830d9eb380fdd
+  metadata.gz: 904e825d0f09aace9c811225fa59c455eb473d958843b587be89e91dcf2d080ac373c73147699ed3f93ebfed28f9570e2e58025d95eb48ebce4c92e889c25e53
+  data.tar.gz: 83604251ac57755a2106dfab3544379d8f234fffe3440599ea03a2c217085aa1b9dff583ba3a6041df9e2bffc72713f89aaaf6273c4942d1c1838ee0e622464e

data/Cargo.lock

@@ -141,6 +141,14 @@ version = "2.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
+[[package]]
+name = "merger"
+version = "0.1.0"
+dependencies = [
+ "magnus",
+ "rustui_merge",
+]
+
 [[package]]
 name = "minimal-lexical"
 version = "0.2.1"
@@ -278,14 +286,6 @@ dependencies = [
  "unicode-ident",
 ]
 
-[[package]]
-name = "tail_merge"
-version = "0.1.0"
-dependencies = [
- "magnus",
- "rustui_merge",
-]
-
 [[package]]
 name = "unicode-ident"
 version = "1.0.18"

data/Cargo.toml

@@ -5,3 +5,4 @@
 [workspace]
 members = ["./ext/tail_merge"]
 resolver = "2"
+

data/README.md

@@ -102,6 +102,48 @@ TailMerge.merge "px-2 py-1 bg-red hover:bg-dark-red p-3 bg-[#B91C1C]"
 => "hover:bg-dark-red p-3 bg-[#B91C1C]"
 ```
 
+## More speed?
+
+You can create an instance of TailMerge and call `merge` on it instead of on the `TailMerge` class. This will cache the results of the merge.
+
+```ruby
+tail_merge_instance = TailMerge.new
+tail_merge_instance.merge %w[px-2 py-1 bg-red hover:bg-dark-red p-3 bg-[#B91C1C]]
+=> "hover:bg-dark-red p-3 bg-[#B91C1C]" # Write to cache, still fast though
+
+# Second time, same key, read from cache
+tail_merge_instance.merge %w[px-2 py-1 bg-red hover:bg-dark-red p-3 bg-[#B91C1C]]
+=> "hover:bg-dark-red p-3 bg-[#B91C1C]" # Read from cache, much faster!
+
+# Third time, string key instead of array, read from same cache
+tail_merge_instance.merge "px-2 py-1 bg-red hover:bg-dark-red p-3 bg-[#B91C1C]"
+=> "hover:bg-dark-red p-3 bg-[#B91C1C]" # Read from cache, much faster!
+```
+
+This caching technique was inspired by [[Tailwind Merge](https://github.com/dcastil/tailwind-merge)](https://github.com/gjtorikian/tailwind_merge).
+
+## Benchmark
+
+So how fast/much faster is TailMerge?
+
+I've benchmarked TailMerge with an instance (cached) and without an instance against Tailwind Merge with (cached) and without a merger instance, and these are the results:
+
+```
+                                                  user     system      total        real
+Rust: TailMerge.merge (all samples):          0.216178   0.001744   0.217922 (  0.219441)
+Rust: Cached TailMerge.merge (all samples):   0.005465   0.000092   0.005557 (  0.005581)
+Ruby: TailwindMerge each time (all samples): 50.391383   0.494058  50.885441 ( 52.272354)
+Ruby:Cached TailwindMerge (all samples):      0.011672   0.000140   0.011812 (  0.011813)
+```
+
+As you can see TailMerge is much faster using pure Ruby to merge classes.
+
+The benchmark loops through an array of strings and arrays and merges them 1000 times.
+
+The difference between the cached runs, obviously, is much smaller as we are basically benchmarking the cache lookup and not the actual merge.
+
+In reality we will not deal with 1000 merges to be done per page and I suspect you'd be much closer to the non-cached runs.
+
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/abuisman/tail_merge.
+Bug reports and pull requests are welcome on GitHub at https://github.com/abuisman/tail_merge . Merging will be done at my own pace and discretion.

data/Rakefile

@@ -15,7 +15,7 @@ task build: :compile
 
 GEMSPEC = Gem::Specification.load("tail_merge.gemspec")
 
-RbSys::ExtensionTask.new("tail_merge", GEMSPEC) do |ext|
+RbSys::ExtensionTask.new("merger", GEMSPEC) do |ext|
   ext.lib_dir = "lib/tail_merge"
 end
 

data/benchmark/benchmark.rb

@@ -0,0 +1,98 @@
+# frozen_string_literal: true
+
+require "benchmark"
+require "tailwind_merge"
+
+require "bundler/setup"
+require "tail_merge"
+
+samples = [
+  ["relative"],
+  ["self-center"],
+  ["self-start"],
+  ["shadow-inner", "size-4", "text-xs"],
+  ["shadow-inner", "size-7"],
+  ["size-10"],
+  ["static"],
+  ["upload-attachment", "flex-none", "rounded-3xl", "min-h-16", "group", "relative"],
+  ["w-full", "py-2", "px-2", "rounded-md", "w-44"],
+  "relative",
+  "self-center",
+  "self-start",
+  "shadow-inner size-4 text-xs",
+  "shadow-inner size-7",
+  "size-10",
+  "static",
+  "upload-attachment flex-none rounded-3xl min-h-16 group relative",
+  "w-full py-2 px-2 rounded-md w-44",
+  ["p-4", "px-2", "py-6", "m-3", "mx-8", "my-2", "bg-blue-500", "bg-red-600", "text-sm", "text-lg", "font-bold", "font-normal", "rounded-lg", "rounded-xl", "shadow-md", "shadow-lg", "hover:bg-blue-700", "hover:bg-red-800", "focus:ring-2", "focus:ring-4"],
+  ["grid", "flex", "inline-flex", "grid-cols-3", "grid-cols-4", "gap-2", "gap-4", "items-center", "items-start", "justify-between", "justify-center", "p-8", "p-4", "bg-gray-100", "bg-white", "border", "border-2", "rounded-full", "rounded-md"],
+  ["transform", "scale-100", "scale-110", "rotate-45", "rotate-90", "translate-x-2", "translate-x-4", "skew-y-3", "skew-y-6", "transition", "duration-200", "duration-500", "ease-in", "ease-out", "delay-150", "delay-300"],
+  ["w-full", "w-1/2", "w-3/4", "h-screen", "h-full", "h-32", "min-h-0", "min-h-full", "max-w-xs", "max-w-xl", "overflow-hidden", "overflow-scroll", "object-cover", "object-contain", "opacity-75", "opacity-100"],
+  ["text-left", "text-center", "text-right", "text-justify", "tracking-wide", "tracking-wider", "leading-tight", "leading-loose", "uppercase", "lowercase", "capitalize", "normal-case", "truncate", "line-clamp-2", "line-clamp-3"],
+  ["border-t", "border-b", "border-l", "border-r", "border-solid", "border-dashed", "border-red-500", "border-blue-600", "divide-y", "divide-x", "divide-gray-200", "divide-blue-300", "ring-2", "ring-4", "ring-offset-2"],
+  ["cursor-pointer", "cursor-wait", "select-none", "select-text", "resize", "resize-none", "z-10", "z-50", "float-left", "float-right", "clear-both", "clear-none", "box-border", "box-content"],
+  ["bg-opacity-50", "bg-opacity-75", "backdrop-blur-sm", "backdrop-blur-lg", "backdrop-filter", "filter", "brightness-90", "brightness-110", "contrast-75", "contrast-125", "saturate-50", "saturate-200"],
+  ["focus:outline-none", "focus:ring-2", "focus:ring-offset-2", "focus:border-blue-500", "hover:scale-105", "hover:rotate-3", "active:scale-95", "disabled:opacity-50", "disabled:cursor-not-allowed"],
+  ["sm:text-lg", "md:text-xl", "lg:text-2xl", "xl:text-3xl", "2xl:text-4xl", "sm:w-1/2", "md:w-2/3", "lg:w-3/4", "xl:w-full", "2xl:max-w-screen-xl", "sm:p-4", "md:p-6", "lg:p-8", "xl:p-10"],
+  ["dark:bg-gray-800", "dark:text-white", "dark:border-gray-600", "dark:hover:bg-gray-700", "dark:focus:ring-blue-800", "bg-white", "text-black", "border-gray-200", "hover:bg-gray-100"],
+  ["group-hover:scale-110", "group-hover:rotate-6", "group-focus:outline-none", "group-active:scale-95", "peer-checked:bg-blue-500", "peer-checked:text-white", "peer-disabled:opacity-50"],
+  ["animate-spin", "animate-pulse", "animate-bounce", "animate-ping", "motion-safe:animate-spin", "motion-reduce:animate-none", "transition-all", "duration-300", "ease-in-out", "delay-150"],
+  ["space-x-4", "space-x-reverse", "space-y-6", "space-y-reverse", "gap-x-4", "gap-y-6", "place-items-center", "place-content-center", "place-self-center", "content-center"],
+  ["from-blue-500", "to-purple-500", "via-pink-500", "bg-gradient-to-r", "bg-gradient-to-br", "text-transparent", "bg-clip-text", "bg-origin-border", "bg-no-repeat", "bg-cover"],
+  ["columns-2", "columns-3", "break-inside-avoid", "break-after-column", "aspect-square", "aspect-video", "object-right-top", "object-left-bottom", "isolation-auto", "mix-blend-multiply"],
+  ["first:pt-0", "last:pb-0", "odd:bg-gray-50", "even:bg-white", "first-letter:text-7xl", "first-line:uppercase", "selection:bg-yellow-200", "selection:text-black"],
+  ["[mask-type:luminance]", "[mask-type:alpha]", "[transform-style:preserve-3d]", "[clip-path:circle(50%)]", "[-webkit-text-stroke:2px]", "[text-align-last:justify]"],
+  ["will-change-scroll", "will-change-transform", "scroll-smooth", "scroll-mt-2", "scroll-pb-4", "overscroll-contain", "touch-pan-right", "touch-manipulation"],
+  ["hyphens-auto", "hyphens-manual", "text-underline-offset-2", "text-decoration-thickness-2", "indent-8", "indent-16", "vertical-align-sub", "vertical-align-super"]
+]
+
+require 'benchmark'
+require 'tail_merge'
+require 'tailwind_merge'
+
+# Pre-initialize cached mergers
+cached_merger = TailwindMerge::Merger.new
+
+tail_merge_instance = TailMerge.new
+
+# Normalize all samples to strings
+normalized_samples = samples.map { |classes| classes.is_a?(Array) ? classes.join(' ') : classes }
+
+puts "Benchmarking class merging strategies (whole set)..."
+puts "-" * 50
+puts
+
+Benchmark.bm(30) do |x|
+  x.report("Rust: TailMerge.merge (all samples):") do
+    1000.times do
+      normalized_samples.each do |classes|
+        TailMerge.merge(classes)
+      end
+    end
+  end
+
+  x.report("Rust: Cached TailMerge.merge (all samples):") do
+    1000.times do
+      normalized_samples.each do |classes|
+        tail_merge_instance.merge(classes)
+      end
+    end
+  end
+
+  x.report("Ruby: TailwindMerge each time (all samples):") do
+    1000.times do
+      normalized_samples.each do |classes|
+        TailwindMerge::Merger.new.merge(classes)
+      end
+    end
+  end
+
+  x.report("Ruby:Cached TailwindMerge (all samples):") do
+    1000.times do
+      normalized_samples.each do |classes|
+        cached_merger.merge(classes)
+      end
+    end
+  end
+end

data/ext/tail_merge/Cargo.toml

@@ -1,11 +1,12 @@
 [package]
-name = "tail_merge"
+name = "merger"
 version = "0.1.0"
 edition = "2021"
 authors = ["Achilleas Buisman <accounts@abuisman.nl>"]
 publish = false
 
 [lib]
+name = "merger"
 crate-type = ["cdylib"]
 
 [dependencies]

data/ext/tail_merge/extconf.rb

@@ -3,4 +3,4 @@
 require "mkmf"
 require "rb_sys/mkmf"
 
-create_rust_makefile("tail_merge/tail_merge")
+create_rust_makefile("tail_merge/merger")

data/ext/tail_merge/src/lib.rs

@@ -14,6 +14,7 @@ fn merge_tailwind_classes(args: &[Value]) -> Result<RString, Error> {
 
     // ---------- 2. collect class tokens ------------------------------------
     let mut tokens = Vec::<String>::new();
+    let is_string_input = matches!(args[0].clone().try_convert::<RString>(), Ok(_));
     match args[0].clone().try_convert::<RString>() {
         Ok(rstr) => tokens.extend(rstr.to_string()?.split_whitespace().map(str::to_owned)),
         Err(_) => {
@@ -25,6 +26,24 @@ fn merge_tailwind_classes(args: &[Value]) -> Result<RString, Error> {
         }
     }
 
+    // Early returns for simple cases
+    if is_string_input {
+        let rstr: RString = args[0].clone().try_convert()?;
+        let s = rstr.to_string()?;
+        if !s.contains(' ') {
+            // Single class string, return as-is
+            return Ok(RString::new(&s));
+        }
+    } else {
+        // Array input
+        if tokens.is_empty() {
+            return Ok(RString::new(""));
+        }
+        if tokens.len() == 1 {
+            return Ok(RString::new(&tokens[0]));
+        }
+    }
+
     // ---------- 3. extract options -----------------------------------------
     let mut prefix: Option<String> = None;
     let mut separator: Option<String> = None;
@@ -100,8 +119,10 @@ fn merge_tailwind_classes(args: &[Value]) -> Result<RString, Error> {
 
 #[magnus::init]
 fn init() -> Result<(), Error> {
-    let module = define_module("TailMerge")?;
-    // -1 = variable arity (positional + kw-hash)
-    module.define_singleton_method("merge", function!(merge_tailwind_classes, -1))?;
+    let ruby = Ruby::get().unwrap();
+    let tail_merge_class: magnus::RClass = ruby.class_object().const_get("TailMerge")?;
+    let merger_module = tail_merge_class.define_module("Merger")?;
+    // Assuming merge_tailwind_classes is your target function
+    merger_module.define_singleton_method("perform", function!(merge_tailwind_classes, -1))?;
     Ok(())
 }

data/lib/tail_merge/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
-module TailMerge
-  VERSION = "0.2.0"
+class TailMerge
+  VERSION = "0.4.0"
 end

data/lib/tail_merge.rb

@@ -1,9 +1,27 @@
 # frozen_string_literal: true
 
 require_relative "tail_merge/version"
-require_relative "tail_merge/tail_merge"
+require_relative "tail_merge/merger"
 
-module TailMerge
+# Main class for merging tailwind classes.
+class TailMerge
   class Error < StandardError; end
-  # Your code goes here...
+
+  def self.merge(classes, options = {})
+    Merger.perform(classes, options)
+  end
+
+  attr_reader :options
+
+  def initialize(options = {})
+    @options = options
+    @class_hash = {}
+  end
+
+  def merge(classes)
+    return "" if classes.empty?
+
+    classes = classes.join(" ") if classes.is_a?(Array)
+    @class_hash[classes] ||= Merger.perform(classes, options)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tail_merge
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Achilleas Buisman
@@ -36,6 +36,7 @@ files:
 - Cargo.toml
 - README.md
 - Rakefile
+- benchmark/benchmark.rb
 - ext/tail_merge/Cargo.toml
 - ext/tail_merge/extconf.rb
 - ext/tail_merge/src/lib.rs