lite-uxid 1.3.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e12d0fcd0ea1e1653d22eea382fb4d770aa50dda8d9cfebc3a0633e50e01c64d
-  data.tar.gz: 4eb22adb047d392dc1ee1645b9465c98940137f2b562635f8678d08398dc06af
+  metadata.gz: 750f76e67f536272728bf9234c0ad126f902dbd429a5b8d518af72f955b607dc
+  data.tar.gz: 5ac2699b92b9a12944d4cb83fa22b49ef63689567796fae7a563f943535ec86e
 SHA512:
-  metadata.gz: 831968f72b1e450f5caaa4b330f236b2c0b1c6780dfe4153d68265f7a53752e12090b589c7235e92c16fd2e1ce2e58da8df7ef6321b47d13c02d514c4bb9f7f1
-  data.tar.gz: d8491cec5de3a930c968992b2b159691b041549c890ed77a9369b5edaffda1bb6592cba992ad4f7284cd297cc7646c9b5dcefe6f64156fba08e959be57280c68
+  metadata.gz: 6b6bd1f1eae662b9a9c275f6acea8b7ca1e39d3e21614bdfdb46a648301f9da6f424655895a288eef683607ff94fd18bdcae88c346a2930f60f7748e778755fc
+  data.tar.gz: 6b9f3c95b1c8bbd801a50bdf8791fdb608702e3c65116af06a2be6a1f9112ceb77f8f9450ae612eb198e2c5645e4b9eaf6f38b88e45b64de431a0087bb637dfd

data/.rubocop.yml

@@ -6,6 +6,8 @@ AllCops:
   NewCops: enable
   DisplayCopNames: true
   DisplayStyleGuide: true
+Gemspec/DevelopmentDependencies:
+  EnforcedStyle: gemspec
 Gemspec/RequiredRubyVersion:
   Enabled: false
 Layout/EmptyLinesAroundAttributeAccessor:
@@ -33,6 +35,8 @@ Metrics/MethodLength:
   Enabled: false
 RSpec/MultipleExpectations:
   Enabled: false
+RSpec/MultipleMemoizedHelpers:
+  Enabled: false
 Style/ArgumentsForwarding:
   Enabled: false
 Style/Documentation:

data/CHANGELOG.md

@@ -6,13 +6,26 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.5.0] - 2024-09-20
+### Added
+- Added uuid version option
+- Added prefix option to hashid and nanoid
+### Changed
+- Move reversible and irreversible files to base namespace
+- Ruby send perf improvements
+
+## [1.4.0] - 2022-11-20
+### Changed
+- Improved global config flexibility
+- Update config generator to generate dynamic salt
+
 ## [1.3.0] - 2022-11-20
 ### Added
 - Added uuid option
 
 ## [1.2.0] - 2022-11-19
 ### Added
-- Added individual character and length options
+- Added individual character and size options
 ### Changed
 - Improved docs
 - Improved internal setup

data/Gemfile.lock

@@ -1,131 +1,169 @@
 PATH
   remote: .
   specs:
-    lite-uxid (1.3.0)
+    lite-uxid (1.5.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (7.0.4)
-      actionview (= 7.0.4)
-      activesupport (= 7.0.4)
-      rack (~> 2.0, >= 2.2.0)
+    actionpack (7.2.1)
+      actionview (= 7.2.1)
+      activesupport (= 7.2.1)
+      nokogiri (>= 1.8.5)
+      racc
+      rack (>= 2.2.4, < 3.2)
+      rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (7.0.4)
-      activesupport (= 7.0.4)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+      useragent (~> 0.16)
+    actionview (7.2.1)
+      activesupport (= 7.2.1)
       builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activemodel (7.0.4)
-      activesupport (= 7.0.4)
-    activerecord (7.0.4)
-      activemodel (= 7.0.4)
-      activesupport (= 7.0.4)
-    activesupport (7.0.4)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+      erubi (~> 1.11)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    activemodel (7.2.1)
+      activesupport (= 7.2.1)
+    activerecord (7.2.1)
+      activemodel (= 7.2.1)
+      activesupport (= 7.2.1)
+      timeout (>= 0.4.0)
+    activesupport (7.2.1)
+      base64
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
-      tzinfo (~> 2.0)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
     ast (2.4.2)
-    builder (3.2.4)
-    colorize (0.8.1)
-    concurrent-ruby (1.1.10)
+    base64 (0.2.0)
+    bigdecimal (3.1.8)
+    builder (3.3.0)
+    concurrent-ruby (1.3.4)
+    connection_pool (2.4.1)
     crass (1.0.6)
-    database_cleaner (2.0.1)
-      database_cleaner-active_record (~> 2.0.0)
-    database_cleaner-active_record (2.0.1)
+    database_cleaner (2.0.2)
+      database_cleaner-active_record (>= 2, < 3)
+    database_cleaner-active_record (2.2.0)
       activerecord (>= 5.a)
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
-    diff-lcs (1.5.0)
-    erubi (1.11.0)
-    fasterer (0.10.0)
-      colorize (~> 0.7)
+    diff-lcs (1.5.1)
+    drb (2.2.1)
+    erubi (1.13.0)
+    fasterer (0.11.0)
       ruby_parser (>= 3.19.1)
-    generator_spec (0.9.4)
+    generator_spec (0.10.0)
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
-    i18n (1.12.0)
+    i18n (1.14.6)
       concurrent-ruby (~> 1.0)
-    json (2.6.2)
-    loofah (2.19.0)
+    io-console (0.7.2)
+    irb (1.14.0)
+      rdoc (>= 4.0.0)
+      reline (>= 0.4.2)
+    json (2.7.2)
+    language_server-protocol (3.17.0.3)
+    logger (1.6.1)
+    loofah (2.22.0)
       crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    method_source (1.0.0)
-    mini_portile2 (2.8.0)
-    minitest (5.16.3)
-    nokogiri (1.13.9)
-      mini_portile2 (~> 2.8.0)
+      nokogiri (>= 1.12.0)
+    mini_portile2 (2.8.7)
+    minitest (5.25.1)
+    nokogiri (1.16.7)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    parallel (1.22.1)
-    parser (3.1.2.1)
+    parallel (1.26.3)
+    parser (3.3.5.0)
       ast (~> 2.4.1)
-    racc (1.6.0)
-    rack (2.2.4)
-    rack-test (2.0.2)
+      racc
+    psych (5.1.2)
+      stringio
+    racc (1.8.1)
+    rack (3.1.7)
+    rack-session (2.0.0)
+      rack (>= 3.0.0)
+    rack-test (2.1.0)
       rack (>= 1.3)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
+    rackup (2.1.0)
+      rack (>= 3)
+      webrick (~> 1.8)
+    rails-dom-testing (2.2.0)
+      activesupport (>= 5.0.0)
+      minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.3)
-      loofah (~> 2.3)
-    railties (7.0.4)
-      actionpack (= 7.0.4)
-      activesupport (= 7.0.4)
-      method_source
+    rails-html-sanitizer (1.6.0)
+      loofah (~> 2.21)
+      nokogiri (~> 1.14)
+    railties (7.2.1)
+      actionpack (= 7.2.1)
+      activesupport (= 7.2.1)
+      irb (~> 1.13)
+      rackup (>= 1.0.0)
       rake (>= 12.2)
-      thor (~> 1.0)
-      zeitwerk (~> 2.5)
+      thor (~> 1.0, >= 1.2.2)
+      zeitwerk (~> 2.6)
     rainbow (3.1.1)
-    rake (13.0.6)
-    regexp_parser (2.6.1)
-    rexml (3.2.5)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.0)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.0)
+    rake (13.2.1)
+    rdoc (6.7.0)
+      psych (>= 4.0.0)
+    regexp_parser (2.9.2)
+    reline (0.5.10)
+      io-console (~> 0.5)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.1)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.0)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-support (3.12.0)
-    rubocop (1.39.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
+    rubocop (1.66.1)
       json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.1.2.1)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.23.0, < 2.0)
+      regexp_parser (>= 2.4, < 3.0)
+      rubocop-ast (>= 1.32.2, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.23.0)
-      parser (>= 3.1.1.0)
-    rubocop-performance (1.15.1)
-      rubocop (>= 1.7.0, < 2.0)
-      rubocop-ast (>= 0.4.0)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.32.3)
+      parser (>= 3.3.1.0)
+    rubocop-performance (1.22.1)
+      rubocop (>= 1.48.1, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.15.0)
-      rubocop (~> 1.33)
-    ruby-progressbar (1.11.0)
-    ruby_parser (3.19.1)
+    rubocop-rspec (3.0.5)
+      rubocop (~> 1.61)
+    ruby-progressbar (1.13.0)
+    ruby_parser (3.21.1)
+      racc (~> 1.5)
       sexp_processor (~> 4.16)
-    sexp_processor (4.16.1)
-    sqlite3 (1.5.4)
+    securerandom (0.3.1)
+    sexp_processor (4.17.2)
+    sqlite3 (2.0.4)
       mini_portile2 (~> 2.8.0)
-    thor (1.2.1)
-    tzinfo (2.0.5)
+    stringio (3.1.1)
+    thor (1.3.2)
+    timeout (0.4.1)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.3.0)
-    zeitwerk (2.6.6)
+    unicode-display_width (2.6.0)
+    useragent (0.16.10)
+    webrick (1.8.1)
+    zeitwerk (2.6.18)
 
 PLATFORMS
   ruby
@@ -147,4 +185,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   2.3.26
+   2.5.19

data/README.md

@@ -5,6 +5,7 @@
 
 Lite::Uxid is a library for generating or obfuscating ID's based on different patterns.
 It's very useful to hide the number of resources in your database and protect against enumeration attacks.
+By default, it implements websafe variants of each type.
 
 ## Installation
 
@@ -25,6 +26,7 @@ Or install it yourself as:
 ## Table of Contents
 
 * [Configuration](#configuration)
+* [Usage](#usage)
 * [Hashid](#hashid)
 * [NanoID](#nanoid)
 * [ULID](#ulid)
@@ -40,21 +42,37 @@ Or install it yourself as:
 
 ```ruby
 Lite::Uxid.configure do |config|
-  config.encoding_chars = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
-  config.encoding_salt = 1_369_136
-  config.hashid_length = 12
-  config.nanoid_length = 21
-  config.ulid_length = 26
+  config.hashid_charset = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
+  config.hashid_salt = 1_369_136
+  config.hashid_size = 16
+  config.nanoid_charset = "_-0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
+  config.nanoid_size = 21
+  config.ulid_charset = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+  config.ulid_size = 26
+  config.uuid_version = 4
 end
 ```
 
+## Usage
+
+#### Instance
+```ruby
+coder = Lite::Uxid::Hashid.new(10, size: 12)
+coder.encode #=> '67wGI0'
+```
+
+#### Class
+```ruby
+Lite::Uxid::Hashid.decode('67wGI0', size: 12) #=> 10
+```
+
 ## Hashid
 
 [More information](https://hashids.org)
 
 ```ruby
-Lite::Uxid::Hashid.encode(10)       #=> '67wGI0'
-Lite::Uxid::Hashid.decode('67wGI0') #=> 10
+Lite::Uxid::Hashid.encode(10)        #=> '1zWr1m0'
+Lite::Uxid::Hashid.decode('1zWr1m0') #=> 10
 ```
 
 ## NanoID
@@ -70,12 +88,12 @@ Lite::Uxid::Nanoid.encode #=> 'sMuNUa3Cegn6r5GRQ4Ij2'
 [More information](https://github.com/ulid/spec)
 
 ```ruby
-Lite::Uxid::Ulid.encode #=> '01gial8st6qrroptaks2tj4smq'
+Lite::Uxid::Ulid.encode #=> '01GJAY9KGR539EZF4QWYEJGSN7'
 ```
 
 ## UUID
 
-[More information](https://en.wikipedia.org/wiki/Universally_unique_identifier)
+Implements `v4` and `v7` of the specification. [More information](https://en.wikipedia.org/wiki/Universally_unique_identifier)
 
 ```ruby
 Lite::Uxid::Uuid.encode #=> '4376a67e-1189-44b3-a599-7f7566bf105b'
@@ -86,7 +104,19 @@ Lite::Uxid::Uuid.encode #=> '4376a67e-1189-44b3-a599-7f7566bf105b'
 Local options can be passed to override global options.
 
 ```ruby
-Lite::Uxid::Ulid.encode(chars: 'abc123', length: 12) #=> 'a3b12c12c3ca'
+Lite::Uxid::Ulid.encode(charset: 'abc123', size: 12) #=> 'a3b12c12c3ca'
+```
+
+Passable options are:
+
+```ruby
+{
+  charset: 'string',  # Available for: hashid, nanoid, ulid
+  salt:    'string',  # Available for: hashid
+  size:    'integer', # Available for: hashid, nanoid, ulid
+  version: 'integer', # Available for: uuid
+  prefix:  'string'   # Available for: hashid, nanoid
+}
 ```
 
 ## ActiveRecord
@@ -131,6 +161,18 @@ class User < ActiveRecord::Base
 end
 ```
 
+Add a prefix to `hashid` and `nanoid` record types by adding a `uxid_prefix` method.
+
+```ruby
+class User < ActiveRecord::Base
+  include Lite::Uxid::Record::Hashid
+
+  def uxid_prefix
+    "sub_"
+  end
+end
+```
+
 **Usage**
 
 Using one of the mixins above provides a handy method to find records by uxid.

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

@@ -1,9 +1,11 @@
 # frozen_string_literal: true
 
 Lite::Uxid.configure do |config|
-  config.encoding_chars = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
-  config.encoding_salt = 1_369_136
-  config.hashid_length = 12
-  config.nanoid_length = 21
-  config.ulid_length = 26
+  config.hashid_charset = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
+  config.hashid_salt = 1_369_136
+  config.hashid_size = 16
+  config.nanoid_charset = "_-0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
+  config.nanoid_size = 21
+  config.ulid_charset = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+  config.ulid_size = 26
 end

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

@@ -0,0 +1,82 @@
+# frozen_string_literal: true
+
+require "securerandom" unless defined?(SecureRandom)
+
+module Lite
+  module Uxid
+    module Base
+      class Irreversible
+
+        attr_reader :opts
+
+        def initialize(opts = {})
+          @opts = opts
+        end
+
+        class << self
+
+          def encode(opts = {})
+            klass = new(opts)
+            klass.encode
+          end
+
+          def decode(opts = {})
+            klass = new(opts)
+            klass.decode
+          end
+
+        end
+
+        def encode
+          raise NotImplementedError, "override method in #{coder_class}"
+        end
+
+        def decode
+          raise NotImplementedError, "coder does not support decoding"
+        end
+
+        private
+
+        def coder_value_for(key)
+          sym_key = :"#{coder_class.downcase}_#{key}"
+          return unless Lite::Uxid.configuration.respond_to?(sym_key)
+
+          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
+
+        def coder_class
+          @coder_class ||= self.class.name.split("::").last
+        end
+
+        def coder_length
+          @coder_length ||= coder_charset.size
+        end
+
+        def coder_prefix
+          @coder_prefix ||= opts.delete(:prefix)
+        end
+
+        def coder_salt
+          @coder_salt ||= coder_value_for(:salt)
+        end
+
+        def coder_size
+          @coder_size ||= coder_value_for(:size)
+        end
+
+        def coder_version
+          @coder_version ||= coder_value_for(:version)
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Lite
+  module Uxid
+    module Base
+      class Reversible < Irreversible
+
+        attr_reader :id
+
+        def initialize(id, opts = {})
+          @id = id
+          super(opts)
+        end
+
+        class << self
+
+          def encode(id, opts = {})
+            klass = new(id, opts)
+            klass.encode
+          end
+
+          def decode(id, opts = {})
+            klass = new(id, opts)
+            klass.decode
+          end
+
+        end
+
+        def decode
+          raise NotImplementedError, "override method in #{coder_class}"
+        end
+
+      end
+    end
+  end
+end

data/lib/lite/uxid/configuration.rb

@@ -5,14 +5,20 @@ module Lite
 
     class Configuration
 
-      attr_accessor :encoding_chars, :encoding_salt, :hashid_length, :nanoid_length, :ulid_length
+      attr_accessor :hashid_charset, :hashid_size, :hashid_salt,
+                    :nanoid_charset, :nanoid_size,
+                    :ulid_charset,   :ulid_size,
+                    :uuid_version
 
       def initialize
-        @encoding_chars = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
-        @encoding_salt = 1_369_136
-        @hashid_length = 12
-        @nanoid_length = 21
-        @ulid_length = 26
+        @hashid_charset = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
+        @hashid_salt = 1_369_136
+        @hashid_size = 16
+        @nanoid_charset = "_-0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
+        @nanoid_size = 21
+        @ulid_charset = "0123456789ABCDEFGHJKMNPQRSTVWXYZ"
+        @ulid_size = 26
+        @uuid_version = 4
       end
 
     end

data/lib/lite/uxid/hashid.rb

@@ -2,14 +2,16 @@
 
 module Lite
   module Uxid
-    class Hashid < Reversible
+    class Hashid < Base::Reversible
 
       def encode
-        encode_chars((id + coder_salt) << coder_length)
+        uxid = encode_chars((id + coder_salt) << coder_size)
+        "#{coder_prefix}#{uxid}"
       end
 
       def decode
-        (decode_chars(id) >> coder_length) - coder_salt
+        uxid = id.delete_prefix(coder_prefix.to_s)
+        (decode_chars(uxid) >> coder_size) - coder_salt
       end
 
       private
@@ -21,8 +23,8 @@ module Lite
         str = ""
 
         while decoded_id.positive?
-          str = "#{coder_chars[decoded_id % coder_base]}#{str}"
-          decoded_id /= coder_base
+          str = "#{coder_charset[decoded_id % coder_length]}#{str}"
+          decoded_id /= coder_length
         end
 
         str
@@ -31,12 +33,12 @@ module Lite
       def decode_chars(encoded_id)
         pos = 0
         num = 0
-        len = encoded_id.length
+        len = encoded_id.size
         max = len - 1
 
         while pos < len
-          pow = coder_base**(max - pos)
-          num += coder_chars.index(encoded_id[pos]) * pow
+          pow = coder_length**(max - pos)
+          num += coder_charset.index(encoded_id[pos]) * pow
           pos += 1
         end
 

data/lib/lite/uxid/nanoid.rb

@@ -2,10 +2,14 @@
 
 module Lite
   module Uxid
-    class Nanoid < Irreversible
+    class Nanoid < Base::Irreversible
 
       def encode
-        coder_chars.chars.sample(coder_length).join
+        uxid = (0...coder_size).each_with_object(+"") do |i, str|
+          str << coder_charset[coder_bytes[i] & 63]
+        end
+
+        "#{coder_prefix}#{uxid}"
       end
 
     end

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

@@ -15,7 +15,7 @@ module Lite
 
         class_methods do
           def find_by_uxid(uxid)
-            decoded_id = Lite::Uxid::Hashid.decode(uxid)
+            decoded_id = Lite::Uxid::Hashid.decode(uxid, prefix: new.uxid_prefix)
             find_by(id: decoded_id)
           end
 
@@ -30,13 +30,17 @@ module Lite
         def id_to_uxid
           return unless respond_to?(:uxid)
 
-          Lite::Uxid::Hashid.encode(id)
+          Lite::Uxid::Hashid.encode(id, prefix: uxid_prefix)
         end
 
         def uxid_to_id
           return unless respond_to?(:uxid)
 
-          Lite::Uxid::Hashid.decode(uxid)
+          Lite::Uxid::Hashid.decode(uxid, prefix: uxid_prefix)
+        end
+
+        def uxid_prefix
+          nil
         end
 
         private

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

@@ -13,13 +13,17 @@ module Lite
           before_create :callback_generate_uxid!, if: proc { respond_to?(:uxid) && !uxid? }
         end
 
+        def uxid_prefix
+          nil
+        end
+
         private
 
         def callback_generate_uxid!
           random_nanoid = nil
 
           loop do
-            random_nanoid = Lite::Uxid::Nanoid.encode
+            random_nanoid = Lite::Uxid::Nanoid.encode(prefix: uxid_prefix)
             break unless self.class.exists?(uxid: random_nanoid)
           end
 

data/lib/lite/uxid/ulid.rb

@@ -1,20 +1,18 @@
 # frozen_string_literal: true
 
-require "securerandom" unless defined?(SecureRandom)
-
 module Lite
   module Uxid
-    class Ulid < Irreversible
+    class Ulid < Base::Irreversible
 
       MASK = 0x1f
 
       def encode
         oct = octect
-        ele = "0" * coder_length
-        pos = coder_length - 1
+        ele = "0" * coder_size
+        pos = coder_size - 1
 
         while oct.positive?
-          ele[pos] = coder_chars[oct & MASK]
+          ele[pos] = coder_charset[oct & MASK]
           oct >>= 5
           pos -= 1
         end
@@ -35,7 +33,7 @@ module Lite
 
       def unixtime_ms
         time = Time.respond_to?(:current) ? Time.current : Time.now
-        (time.to_f * 1_000).to_i
+        time.to_i * 1_000
       end
 
       def unixtime_48bit

data/lib/lite/uxid/uuid.rb

@@ -1,13 +1,16 @@
 # frozen_string_literal: true
 
-require "securerandom" unless defined?(SecureRandom)
-
 module Lite
   module Uxid
-    class Uuid < Irreversible
+    class Uuid < Base::Irreversible
 
       def encode
-        SecureRandom.uuid
+        case coder_version
+        when 7
+          SecureRandom.uuid_v7
+        else
+          SecureRandom.uuid
+        end
       end
 
     end

data/lib/lite/uxid/version.rb

@@ -3,7 +3,7 @@
 module Lite
   module Uxid
 
-    VERSION = "1.3.0"
+    VERSION = "1.5.0"
 
   end
 end

data/lib/lite/uxid.rb

@@ -4,8 +4,8 @@ require "generators/lite/uxid/install_generator" if defined?(Rails::Generators)
 
 require "lite/uxid/version"
 require "lite/uxid/configuration"
-require "lite/uxid/irreversible"
-require "lite/uxid/reversible"
+require "lite/uxid/base/irreversible"
+require "lite/uxid/base/reversible"
 require "lite/uxid/record/hashid"
 require "lite/uxid/record/nanoid"
 require "lite/uxid/record/ulid"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lite-uxid
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Juan Gomez
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-11-20 00:00:00.000000000 Z
+date: 2024-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -217,15 +217,15 @@ files:
 - lib/generators/lite/uxid/install_generator.rb
 - lib/generators/lite/uxid/templates/install.rb
 - lib/lite/uxid.rb
+- lib/lite/uxid/base/irreversible.rb
+- lib/lite/uxid/base/reversible.rb
 - lib/lite/uxid/configuration.rb
 - lib/lite/uxid/hashid.rb
-- lib/lite/uxid/irreversible.rb
 - lib/lite/uxid/nanoid.rb
 - lib/lite/uxid/record/hashid.rb
 - lib/lite/uxid/record/nanoid.rb
 - lib/lite/uxid/record/ulid.rb
 - lib/lite/uxid/record/uuid.rb
-- lib/lite/uxid/reversible.rb
 - lib/lite/uxid/ulid.rb
 - lib/lite/uxid/uuid.rb
 - lib/lite/uxid/version.rb
@@ -254,7 +254,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.5.19
 signing_key:
 specification_version: 4
 summary: Generate or obfuscate Id's using different patterns

data/lib/lite/uxid/irreversible.rb

@@ -1,65 +0,0 @@
-# frozen_string_literal: true
-
-module Lite
-  module Uxid
-    class Irreversible
-
-      attr_reader :opts
-
-      def initialize(opts = {})
-        @opts = opts
-      end
-
-      class << self
-
-        def encode(opts = {})
-          klass = new(opts)
-          klass.encode
-        end
-
-        def decode(opts = {})
-          klass = new(opts)
-          klass.decode
-        end
-
-      end
-
-      def encode
-        raise NotImplementedError, "override method in #{coder_class}"
-      end
-
-      def decode
-        raise NotImplementedError, "coder does not support decoding"
-      end
-
-      private
-
-      def coder_base
-        @coder_base ||= coder_chars.length
-      end
-
-      def coder_chars
-        @coder_chars ||=
-          opts.delete(:chars) ||
-          Lite::Uxid.configuration.encoding_chars
-      end
-
-      def coder_class
-        @coder_class ||= self.class.name.split("::").last
-      end
-
-      def coder_length
-        @coder_length ||=
-          opts.delete(:length) ||
-          Lite::Uxid.configuration.send("#{coder_class.downcase}_length")
-      end
-
-      def coder_salt
-        @coder_salt ||=
-          opts.delete(:salt) ||
-          Lite::Uxid.configuration.encoding_salt
-      end
-
-    end
-  end
-end

data/lib/lite/uxid/reversible.rb

@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-module Lite
-  module Uxid
-    class Reversible < Irreversible
-
-      attr_reader :id
-
-      def initialize(id, opts = {})
-        @id = id
-        super(opts)
-      end
-
-      class << self
-
-        def encode(id, opts = {})
-          klass = new(id, opts)
-          klass.encode
-        end
-
-        def decode(id, opts = {})
-          klass = new(id, opts)
-          klass.decode
-        end
-
-      end
-
-      def decode
-        raise NotImplementedError, "override method in #{coder_class}"
-      end
-
-    end
-  end
-end