pwqgen 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64338058b67c43e96abc7538837c9b43b6f3cb3a
-  data.tar.gz: 9e95480a1c72b8e0fa6514da1e0a853ed571fc27
+  metadata.gz: 3ab97bc484da2c721abec88ad2f675bce06d0abf
+  data.tar.gz: 619c2e93073ba7d15d6c04b6c959cec90d76e49d
 SHA512:
-  metadata.gz: 8995d997aa7303d90c46229dab9d28c4e918711cc8d69691678ff14bae2c4a5a6f2564f1ea1a40d5e558aeba2cf92a72f2f16e3ea7992baebeda0963ce928181
-  data.tar.gz: be2cdf114a7d98bd29876c0e681f61182a7a2a29e3e066d5648f5afc29abd954576488dc50dabc14a5eddbc2b9222fa13047a5e17713c5b4ac768bc0edbef266
+  metadata.gz: e27b701ed641e201cc0544202a89228f2b14291b8674a29eba211d7ab677a9175cb392840e8fa53f18ea4372de93efb6b51957019f724deaaf07dd9a51005a15
+  data.tar.gz: 6176509bc4b036a64c287734a4a1460eee1640eab8c5363722eded377d9530cc871226dea64d87b54df34db9c43af690f8d7f8acac865656a575957d9dda7cb5

data/lib/pwqgen/pwqgen.rb

@@ -10,23 +10,6 @@ module Pwqgen
   NUMERIC_SEPARATORS = '23456789'.each_char.to_a # less entropy, but for sites that cannot use chatacters like _-, etc.
 
   class << self
-    # for calculating base 2 log without any worry about floating point errors
-    LOG2_TABLE = {
-      1 => 0,
-      2 => 1,
-      4 => 2,
-      8 => 3,
-      16 => 4,
-      32 => 5,
-      64 => 6,
-      128 => 7,
-      256 => 8,
-      512 => 9,
-      1024 => 10,
-      2048 => 11,
-      4096 => 12
-    }.freeze
-
     # Pwqgen.pwqgen - generate a random passphrase using the pwqgen algorithm
     #
     # Arguments:
@@ -70,7 +53,7 @@ module Pwqgen
       raise ArgumentError, "invalid random_generator: #{random_generator.inspect}" unless random_generator.respond_to? :call
       raise ArgumentError, "separators must be Array of length 2**n n<=12, of one characters strings: #{separators.inspect}" \
         unless (separators.is_a? Array) && separators.inject(true) { |a, e| a && (e.is_a? String) && e.length == 1 } \
-        && LOG2_TABLE[separators.length]
+        && log2(separators.length)
 
       random_separators = Array.new(n_words - 1) { random_separator(random_generator: random_generator, separators: separators) }
       random_words = Array.new(n_words) { random_word(random_generator: random_generator, random_capitalize: random_capitalize) }
@@ -81,6 +64,29 @@ module Pwqgen
       end
     end
 
+    # if n is a power of 2, return log2(n), else return nil
+    # Arguments:
+    #  n: (Integer)
+    def log2(n)
+      return nil if n <= 0
+
+      # return nil unless n is a power of 2
+      return nil unless (n & (n - 1)).zero?
+
+      bits = 0
+
+      while n > 255
+        n >>= 8
+        bits += 8
+      end
+
+      while n > 0
+        n >>= 1
+        bits += 1
+      end
+      bits - 1
+    end
+
     private
 
     # Get n_bits bits from the random generator. This squanders some randomness,
@@ -98,14 +104,14 @@ module Pwqgen
     # generate a single word "randomly" chosen from WORDSET
     # with the option to capitalize "randomly"
     def random_word(random_generator:, random_capitalize: true) # :nodoc:
-      random_word = WORDSET[random_bits(random_generator: random_generator, n_bits: LOG2_TABLE[WORDSET.length])].dup
+      random_word = WORDSET[random_bits(random_generator: random_generator, n_bits: log2(WORDSET.length))].dup
       random_word.capitalize! if random_capitalize && (random_bits(random_generator: random_generator, n_bits: 1) == 1)
       random_word
     end
 
     # generate a separator "randomly" chosen from separators
     def random_separator(random_generator:, separators:)
-      separators[random_bits(random_generator: random_generator, n_bits: LOG2_TABLE[separators.length])]
+      separators[random_bits(random_generator: random_generator, n_bits: log2(separators.length))]
     end
   end
 end

data/lib/pwqgen/version.rb

@@ -1,5 +1,5 @@
 # vim: set expandtab sw=2 ts=2:ft=ruby
 module Pwqgen
   # version number
-  VERSION = '2.0.2'.freeze
+  VERSION = '2.0.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pwqgen
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Mark Henderson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-31 00:00:00.000000000 Z
+date: 2017-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sysrandom