nanoid 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b4bc9b383a529f747be9817cd0c3c6991b4f23a
-  data.tar.gz: c78ba7699645c46b0e54ffde520946b42a9ae241
+  metadata.gz: 73d89528124fe3ce6e356621bdd47dafb3c0d63e
+  data.tar.gz: 92595e297bdad2d9608b03c67434e75848ac2ee1
 SHA512:
-  metadata.gz: 88ebff8d8b2785e0e1102b25d173f20bc57605124bb3a6227ac202ed84f3ebb17360d6ab0648ad638326fd58bd8c44637eb87acd9aa0e702a37d7d3ac1a5219e
-  data.tar.gz: c5524dcda652475be03f045c4c0f41ffbac0ed7335fa1bafe8e376a09e996e24547fbe6d67339213aacccdc8bff8f0b8ae022dfa36901ef551437587b5eeea6d
+  metadata.gz: 28c149c686bea5f5c7ec5a9c59d819f014c2ac17b9a7be70200eb21d8cb1e203395dab02de49b67dc956ffd51cb57bee23f6ec86a52bdeb7d18c252a51ffcec0
+  data.tar.gz: cda8cfada149a6065ae8cd9f10a67858cc22af1e80e14d445b1701c34e643bd7de7373cdc3048568d534e8b80d6c26f1c5e4bcdd7f262ae6a4d8f0a0b2eaf8d1

data/lib/nanoid.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
+
 require 'securerandom'
 
 module Nanoid
-  MASKS = [15, 31, 63, 127, 255].freeze
-  SAFE_ALPHABET = '_~0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'.freeze
+  SAFE_ALPHABET = '_~0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
 
-  def self.generate(size: 22, alphabet: SAFE_ALPHABET)
+  def self.generate(size: 21, alphabet: SAFE_ALPHABET)
     return simple_generate(size: size) if alphabet == SAFE_ALPHABET
 
     complex_generate(size: size, alphabet: alphabet)
@@ -13,23 +14,25 @@ module Nanoid
   def self.simple_generate(size:)
     bytes = random_bytes(size)
 
-    (0...size).inject('') do |acc, i|
+    (0...size).reduce('') do |acc, i|
       acc + SAFE_ALPHABET[bytes[i] & 63]
     end
   end
 
   def self.complex_generate(size:, alphabet:)
-    mask = MASKS.find { |i| i >= alphabet.size - 1 }
-    step = (1.6 * mask * size / alphabet.size).ceil
+    alphabet_size = alphabet.size
+    mask = (2 << Math.log(alphabet_size - 1) / Math.log(2)) - 1
+    step = (1.6 * mask * size / alphabet_size).ceil
 
     id = ''
-    catch (:computed) do
+    catch :computed do
       loop do
         bytes = random_bytes(size)
         (0...step).each do |i|
           byte = bytes[i] & mask
-          if byte && alphabet[byte]
-            id += alphabet[byte]
+          character = byte && alphabet[byte]
+          if character
+            id = "#{id}#{character}"
             throw :computed if id.size == size
           end
         end

data/lib/nanoid/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module NanoId
-  VERSION = '0.1.0'.freeze
+  VERSION = '0.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoid
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Radovan Smitala
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-16 00:00:00.000000000 Z
+date: 2017-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,70 +16,70 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.15'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.10'
 - !ruby/object:Gem::Dependency
   name: reek
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.5'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.5'
 description: 
 email: 
 executables: []
@@ -108,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Ruby implementation of Nanoid, secure URL-friendly unique ID generator