nanoid 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c430242702b77fa4e2feba4521d9f13c2c7bc4018f74f738701f6b9fc2ab64a
-  data.tar.gz: 0ead08a72370897eb4b32767d1216f814e1b97ad38ad3c3433a24031698d8270
+  metadata.gz: 87fdbe5ba4c21183b9da7d5a5d706c00f0f3b7647b82c8f7e63890d70d89ce04
+  data.tar.gz: 8b54115d83b84bd69b2893f23a772430de534edb4d1b63e4398ac12f9f9deff8
 SHA512:
-  metadata.gz: fbc9131545a9f0acaf81563a8b6631ec31d8b27e6ee9581cd3b62b3f12f2cd26f75300e6a3a939f95fb2e95d6fc7b1c0f23d69c48e2d77ce16f76e5936b91b61
-  data.tar.gz: ac0d65a40e60983b635f939fc455ab408435364ea76636a71c5df02d2e5b25b6a551d2ea1168c3e5e5c8ef97a39adea4df096e57e29295cab169c9d13806c1a1
+  metadata.gz: c39194cb3368b1663c77276998111a2cb41522a1dbbb23682675fa98b6239f1bc7c71c0feeb5870171f65cf034c6be3c0121d679b29d37670d007282f5b15671
+  data.tar.gz: d9340bfc477d2d629085c62c6737c280f653f10320942ea55f868e637bd493368324e391649e4ed8037e3e099797104357bdccd5d2e288cdd2c05a52510160b2

data/lib/nanoid/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module NanoId
-  VERSION = '2.0.0'
+  VERSION = '2.0.1'
 end

data/lib/nanoid.rb

@@ -1,37 +1,65 @@
-# frozen_string_literal: true
-
 require 'securerandom'
 
 module Nanoid
-  SAFE_ALPHABET = '_-0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
+  SAFE_ALPHABET = '_-0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'.freeze
 
   def self.generate(size: 21, alphabet: SAFE_ALPHABET, non_secure: false)
-    return non_secure_generate(size: size, alphabet: alphabet) if non_secure
+    size = normalize_size(size)
+    return '' if size.zero?
+
+    return non_secure_generate(size, alphabet) if non_secure
 
-    return simple_generate(size: size) if alphabet == SAFE_ALPHABET
+    return simple_generate(size) if alphabet == SAFE_ALPHABET
 
-    complex_generate(size: size, alphabet: alphabet)
+    complex_generate(size, alphabet)
   end
 
   private
 
-  def self.simple_generate(size:)
+  # Mirrors upstream NanoID's handling of a non-integer/negative `size`:
+  # truncate floats instead of looping forever, and fail fast on negative
+  # sizes instead of raising a cryptic SecureRandom error later on.
+  def self.normalize_size(size)
+    raise ArgumentError, "size must be a number, got #{size.class}" unless size.is_a?(Numeric)
+
+    size = size.to_i
+    # Integer#negative? arrived in Ruby 2.3.
+    raise ArgumentError, 'size must not be negative' if size < 0
+
+    size
+  end
+
+  def self.validate_alphabet!(alphabet)
+    raise ArgumentError, 'alphabet must not be empty' if alphabet.empty?
+  end
+
+  def self.simple_generate(size)
     bytes = random_bytes(size)
 
-    (0...size).reduce(''.dup) do |acc, i|
+    (0...size).reduce('') do |acc, i|
       acc << SAFE_ALPHABET[bytes[i] & 63]
     end
   end
 
-  def self.complex_generate(size:, alphabet:)
+  def self.complex_generate(size, alphabet)
+    validate_alphabet!(alphabet)
+
     alphabet_size = alphabet.size
-    mask = (2 << Math.log(alphabet_size - 1) / Math.log(2)) - 1
+    # A single-character alphabet has no entropy to extract a mask from
+    # (and would hit a Math::DomainError below), so short-circuit it.
+    return alphabet[0] * size if alphabet_size == 1
+
+    mask = alphabet_mask(alphabet_size)
     step = (1.6 * mask * size / alphabet_size).ceil
 
-    id = ''.dup
+    id = ''
 
     loop do
-      bytes = random_bytes(size)
+      # Request `step` bytes (not `size`), matching upstream: `step` is
+      # always >= the number of bytes actually consumed per iteration, so
+      # this avoids wasted extra loop iterations/SecureRandom calls caused
+      # by indexing past a too-small buffer (which silently yields `nil`).
+      bytes = random_bytes(step)
       (0...step).each do |idx|
         byte = bytes[idx] & mask
         character = byte && alphabet[byte]
@@ -43,10 +71,12 @@ module Nanoid
     end
   end
 
-  def self.non_secure_generate(size:, alphabet:)
+  def self.non_secure_generate(size, alphabet)
+    validate_alphabet!(alphabet)
+
     alphabet_size = alphabet.size
 
-    id = ''.dup
+    id = ''
 
     size.times do
       id << alphabet[(Random.rand * alphabet_size).floor]
@@ -58,4 +88,12 @@ module Nanoid
   def self.random_bytes(size)
     SecureRandom.random_bytes(size).bytes
   end
+
+  # Smallest bitmask of the form 2**n - 1 that covers every alphabet index.
+  # Integer shifts only: `2 << float` raises TypeError on Ruby 2.0.
+  def self.alphabet_mask(alphabet_size)
+    limit = 1
+    limit <<= 1 while limit <= alphabet_size - 1
+    limit - 1
+  end
 end

metadata

@@ -1,101 +1,59 @@
 --- !ruby/object:Gem::Specification
 name: nanoid
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Radovan Smitala
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-11-07 00:00:00.000000000 Z
+date: 2026-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: 2.7.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.15'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.15'
+        version: 2.7.2
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.10'
+        version: 5.11.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.10'
+        version: 5.11.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '12.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '12.0'
-- !ruby/object:Gem::Dependency
-  name: reek
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
-description: 
-email: 
+        version: 12.3.3
+description:
+email:
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -106,7 +64,7 @@ homepage: https://github.com/radeno/nanoid.rb
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -121,9 +79,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
-signing_key: 
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: Ruby implementation of Nanoid, secure URL-friendly unique ID generator
 test_files: []