lite-uxid 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c35d2426c2fffc91f8195a96c94ff26df0c41ffdb79041c5499952c93ccd240
-  data.tar.gz: 5a72d11d4fc6d3cec87411a623d072dec4ba1f17b810814b15c543da3a512d7b
+  metadata.gz: d000996f6e79fc0122e86a88c034391d9853146de2af1e44a1da19234ad538b1
+  data.tar.gz: 932aa03aeb3f62c58cb96328d38d9bc97ca09cc15f5f9a617147464448a45856
 SHA512:
-  metadata.gz: 0a84caf603e6393456ac15d30afaf23fda68eec1480997ce64a54339abefcfc5fadf1afe4fb505f6b3f54119188e3f3405e040771e4a76cc4cae3f8b7f842693
-  data.tar.gz: 0d345ae245719fcfe669230925aee58feab58153c978c6089379cc750ae417325d98bd6b660aba695e2df85d540d88a543bfd5a11ce88556fb2ef835f81a860d
+  metadata.gz: 1241d664904c1db3b9008bbd70bfb509070dc7adab95313ab5cac6a859fafeb6254f902ab0664086163bfa6d5998643d7f74f059525206d9354214f5595767ac
+  data.tar.gz: 51df74a8df875bbe8e67179960953d6ab54f8f49c11ab5783e90e5c31f6b8e8022ecf1074439083341cbdf9c40dce070c102d29bb947dd148b362f1dabdfc6a6

data/CHANGELOG.md

@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.5.2] - 2024-09-20
+### Changed
+- Fixed nanoid of differing length error
+
 ## [1.5.1] - 2024-09-20
 ### Changed
 - Use after commit on create instead of after create

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    lite-uxid (1.5.1)
+    lite-uxid (1.5.2)
 
 GEM
   remote: https://rubygems.org/

data/lib/lite/uxid/base/irreversible.rb

@@ -44,10 +44,6 @@ module Lite
           opts.delete(key) || Lite::Uxid.configuration.send(sym_key)
         end
 
-        def coder_bytes
-          @coder_bytes ||= SecureRandom.random_bytes(coder_size).bytes
-        end
-
         def coder_charset
           @coder_charset ||= coder_value_for(:charset)
         end

data/lib/lite/uxid/nanoid.rb

@@ -5,13 +5,38 @@ module Lite
     class Nanoid < Base::Irreversible
 
       def encode
-        uxid = (0...coder_size).each_with_object(+"") do |i, str|
-          str << coder_charset[coder_bytes[i] & 63]
+        uxid = +""
+
+        loop do
+          cached_bytes = bytes
+
+          (0...step).each do |idx|
+            byte = cached_bytes[idx] & mask
+            char = byte && coder_charset[byte]
+            next unless char
+
+            uxid << char
+            return uxid if uxid.size == coder_size
+          end
         end
 
         "#{coder_prefix}#{uxid}"
       end
 
+      private
+
+      def bytes
+        SecureRandom.random_bytes(coder_size).bytes
+      end
+
+      def mask
+        @mask ||= (2 << (Math.log(coder_length - 1) / Math.log(2))) - 1
+      end
+
+      def step
+        @step = (1.6 * mask * coder_size / coder_length).ceil
+      end
+
     end
   end
 end

data/lib/lite/uxid/version.rb

@@ -3,7 +3,7 @@
 module Lite
   module Uxid
 
-    VERSION = "1.5.1"
+    VERSION = "1.5.2"
 
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lite-uxid
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - Juan Gomez