lite-uxid 1.5.0 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 750f76e67f536272728bf9234c0ad126f902dbd429a5b8d518af72f955b607dc
-  data.tar.gz: 5ac2699b92b9a12944d4cb83fa22b49ef63689567796fae7a563f943535ec86e
+  metadata.gz: d000996f6e79fc0122e86a88c034391d9853146de2af1e44a1da19234ad538b1
+  data.tar.gz: 932aa03aeb3f62c58cb96328d38d9bc97ca09cc15f5f9a617147464448a45856
 SHA512:
-  metadata.gz: 6b6bd1f1eae662b9a9c275f6acea8b7ca1e39d3e21614bdfdb46a648301f9da6f424655895a288eef683607ff94fd18bdcae88c346a2930f60f7748e778755fc
-  data.tar.gz: 6b9f3c95b1c8bbd801a50bdf8791fdb608702e3c65116af06a2be6a1f9112ceb77f8f9450ae612eb198e2c5645e4b9eaf6f38b88e45b64de431a0087bb637dfd
+  metadata.gz: 1241d664904c1db3b9008bbd70bfb509070dc7adab95313ab5cac6a859fafeb6254f902ab0664086163bfa6d5998643d7f74f059525206d9354214f5595767ac
+  data.tar.gz: 51df74a8df875bbe8e67179960953d6ab54f8f49c11ab5783e90e5c31f6b8e8022ecf1074439083341cbdf9c40dce070c102d29bb947dd148b362f1dabdfc6a6

data/CHANGELOG.md

@@ -6,6 +6,14 @@ 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
+
 ## [1.5.0] - 2024-09-20
 ### Added
 - Added uuid version option

data/Gemfile.lock

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

data/README.md

@@ -126,7 +126,15 @@ Passable options are:
 Add the following attribute to all corresponding tables.
 
 ```ruby
-t.string :uxid, index: { unique: true }
+# NOTE: null: true has to be set for HashID's
+# since an ID must exist before it gets created.
+t.string :uxid, null: false, index: { unique: true }
+```
+
+If using UUID and your database supports it:
+
+```ruby
+t.uuid :uxid, null: false, index: { unique: true }
 ```
 
 **Setup**

data/lib/generators/lite/uxid/templates/install.rb

@@ -8,4 +8,5 @@ Lite::Uxid.configure do |config|
   config.nanoid_size = 21
   config.ulid_charset = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"
   config.ulid_size = 26
+  config.uuid_version = 4
 end

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/record/hashid.rb

@@ -10,7 +10,9 @@ module Lite
         extend ActiveSupport::Concern
 
         included do
-          after_create :callback_generate_uxid!, if: proc { respond_to?(:uxid) && !uxid? }
+          after_commit :callback_generate_uxid!,
+                       if: proc { respond_to?(:uxid) && !uxid? },
+                       on: :create
         end
 
         class_methods do

data/lib/lite/uxid/record/nanoid.rb

@@ -10,7 +10,8 @@ module Lite
         extend ActiveSupport::Concern
 
         included do
-          before_create :callback_generate_uxid!, if: proc { respond_to?(:uxid) && !uxid? }
+          before_create :callback_generate_uxid!,
+                        if: proc { respond_to?(:uxid) && !uxid? }
         end
 
         def uxid_prefix

data/lib/lite/uxid/record/ulid.rb

@@ -10,7 +10,8 @@ module Lite
         extend ActiveSupport::Concern
 
         included do
-          before_create :callback_generate_uxid!, if: proc { respond_to?(:uxid) && !uxid? }
+          before_create :callback_generate_uxid!,
+                        if: proc { respond_to?(:uxid) && !uxid? }
         end
 
         private

data/lib/lite/uxid/record/uuid.rb

@@ -10,7 +10,8 @@ module Lite
         extend ActiveSupport::Concern
 
         included do
-          before_create :callback_generate_uxid!, if: proc { respond_to?(:uxid) && !uxid? }
+          before_create :callback_generate_uxid!,
+                        if: proc { respond_to?(:uxid) && !uxid? }
         end
 
         private

data/lib/lite/uxid/version.rb

@@ -3,7 +3,7 @@
 module Lite
   module Uxid
 
-    VERSION = "1.5.0"
+    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.0
+  version: 1.5.2
 platform: ruby
 authors:
 - Juan Gomez