zxcvbn 0.1.2 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d56d0f63e1c4c3aedf3155181de533b58d5dfc342daf383e6fcfffc9e9a4def4
-  data.tar.gz: 043e9ac637ff1932e204f842d8bd26b2089798ec2a455cfdbe3a4515025cef8f
+  metadata.gz: 497a8237437937a17ce899c92181dcc11f32e164ca5515ba2739ac02e59f79b2
+  data.tar.gz: 0e0ee12a70d1814db3178c9d925a43b22036c3c5c1444dd2ed38873c5c5686a7
 SHA512:
-  metadata.gz: f34c91177043d1f11c5f9a8514234e6ff9ebc1a8320a672debf8a531730ee16f1f1ac9229fc399a55eb0eef250defc08b2e42925ff18f1e00398a8bde13c877c
-  data.tar.gz: b24c9e9cbe8154befbcc1a818bbdd3b373fc3e33645087a96bd2ff2c58c6be46ff79f514ee27bbe79a4f1c5a5209abf1196c6389ed9bce16fb5388f818ca8851
+  metadata.gz: ab0bf4b0709602f08bdb20caae26f124487c3dac8d1f35ef04fb728a0bda822e68ad35db065d28be15745a7c61705ecb402cc7fb463209d8bbc24ca3d8edf379
+  data.tar.gz: e03692c3985a020195e1304451dcd3c91b847d9ef2c391ba62ce61b33f08251a73f195877618a649bd847dd4736769de0b31779a5a61e6b7ab2b23ca946cda81

data/.rubocop.yml

@@ -1,5 +1,31 @@
 AllCops:
   TargetRubyVersion: 2.5
+  NewCops: enable
+  SuggestExtensions: false
+
+Layout/EndAlignment:
+  EnforcedStyleAlignWith: start_of_line
+
+Layout/LineLength:
+  Max: 120
+
+Lint/UnderscorePrefixedVariableName:
+  Enabled: false
+
+Metrics:
+  Enabled: false
+
+Naming/VariableNumber:
+  Enabled: false
+
+Style/Documentation:
+  Enabled: false
+
+Style/Next:
+  Enabled: false
+
+Style/NumericPredicate:
+  Enabled: false
 
 Style/StringLiterals:
   Enabled: true
@@ -9,5 +35,11 @@ Style/StringLiteralsInInterpolation:
   Enabled: true
   EnforcedStyle: double_quotes
 
-Layout/LineLength:
-  Max: 120
+Style/NegatedIf:
+  Enabled: false
+
+Style/SymbolArray:
+  Enabled: false
+
+Style/WordArray:
+  Enabled: false

data/.travis.yml

@@ -2,5 +2,8 @@
 language: ruby
 cache: bundler
 rvm:
-  - 2.6.6
+  - 2.5.9
+  - 2.6.7
+  - 2.7.3
+  - 3.0.1
 before_install: gem install bundler -v 2.2.15

data/CHANGELOG.md

@@ -1,4 +1,18 @@
-## [Unreleased]
+## [0.1.7] - 2021-06-12
+- Ported original specs
+- Fix difference found on enumerate_l33t_subs
+- Setup to also test against current versions of ruby
+
+## [0.1.6] - 2021-05-28
+- Added test methods for compatibility with zxcvbn-js and zxcvbn-ruby.
+
+## [0.1.5] - 2021-05-27
+- Fix classification of scoring causing differences between js and ruby.
+
+## [0.1.4] - 2021-05-16
+
+- Bunch of fixes, all example passwords included have same result as js version.
+- consistent code style applied.
 
 ## [0.1.0] - 2021-05-16
 

data/Gemfile

@@ -6,10 +6,10 @@ source "https://rubygems.org"
 gemspec
 
 group :development do
+  gem "mini_racer"
   gem "rake", "~> 13.0"
   gem "rspec", "~> 3.0"
   gem "rubocop", "~> 1.7"
-  gem 'mini_racer'
 
   gem "pry"
   gem "pry-byebug"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    zxcvbn (0.1.2)
+    zxcvbn (0.1.7)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -1,7 +1,11 @@
 # Zxcvbn
 
-This is a direct Ruby port of Dropbox's [zxcvbn.js][zxcvbn.js] JavaScript library.
-The intention is to provide all the same features and same results as close to the original JS fucntion would do.
+[![Gem Version](https://badge.fury.io/rb/zxcvbn.svg)](https://badge.fury.io/rb/zxcvbn)
+[![Build Status](https://travis-ci.com/formigarafa/zxcvbn-rb.svg?branch=master)](https://travis-ci.com/formigarafa/zxcvbn-rb)
+
+Ruby port of Dropbox's [zxcvbn.js](https://github.com/dropbox/zxcvbn) JavaScript library running completely in Ruby (no need to load execjs or libv8).
+
+The intention is to provide an option 100% Ruby solution with all the same features and same results (or as close to the original JS function as possible).
 
 ## Installation
 
@@ -24,49 +28,53 @@ Or install it yourself as:
 ```
 Zxcvbn.zxcvbn("password")
 => {
-  :password => "pasword",
-  :guesses => 3566,
-  :guesses_log10 => 3.5521813388393357,
-  :sequence => [
+  "password" => "password",
+  "guesses" => 3,
+  "guesses_log10" => 0.47712125471966244,
+  "sequence" => [
     {
-      :pattern => "dictionary",
-      :i => 0,
-      :j => 6,
-      :token => "pasword",
-      :matched_word => "pasword",
-      :rank => 3565,
-      :dictionary_name => "passwords",
-      :reversed => false,
-      :l33t => false,
-      :base_guesses => 3565,
-      :uppercase_variations => 1,
-      :l33t_variations => 1,
-      :guesses => 3565,
-      :guesses_log10 => 3.5520595341878844
+      "pattern" => "dictionary",
+      "i" => 0,
+      "j" => 7,
+      "token" => "password",
+      "matched_word" => "password",
+      "rank" => 2,
+      "dictionary_name" => "passwords",
+      "reversed" => false,
+      "l33t" => false,
+      "base_guesses" => 2,
+      "uppercase_variations" => 1,
+      "l33t_variations" => 1,
+      "guesses" => 2,
+      "guesses_log10" => 0.3010299956639812
     }
   ],
-  :calc_time => 0,
-  :crack_times_seconds => {
-    :online_throttling_100_per_hour => 128376.0,
-    :online_no_throttling_10_per_second => 356.6,
-    :offline_slow_hashing_1e4_per_second => 0.3566,
-    :offline_fast_hashing_1e10_per_second => 3.566e-07
-  },
-  :crack_times_display => {
-    :online_throttling_100_per_hour => "1 day",
-    :online_no_throttling_10_per_second => "6 minutes",
-    :offline_slow_hashing_1e4_per_second => "less than a second",
-    :offline_fast_hashing_1e10_per_second => "less than a second"
+  "calc_time" => 1,
+  "crack_times_seconds" => {
+    "online_throttling_100_per_hour" => 108.0,
+    "online_no_throttling_10_per_second" => 0.3,
+    "offline_slow_hashing_1e4_per_second" => 0.0003,
+    "offline_fast_hashing_1e10_per_second" => 3.0e-10},
+  "crack_times_display" => {
+    "online_throttling_100_per_hour" => "2 minutes",
+    "online_no_throttling_10_per_second" => "less than a second",
+    "offline_slow_hashing_1e4_per_second" => "less than a second",
+    "offline_fast_hashing_1e10_per_second" => "less than a second"
   },
-  :score => 1,
-  :feedback =>
-  {
-    :warning => "This is a very common password",
-    :suggestions => ["Add another word or two. Uncommon words are better."]
+  "score" => 0,
+  "feedback" => {
+    "warning" => "This is a top-10 common password",
+    "suggestions" => [
+      "Add another word or two. Uncommon words are better."
+    ]
   }
 }
 ```
 
+### Compatible with `zxcvbn-js` and `zxcvbn-ruby`
+
+This gem include a compatible interface so it can be used as a drop-in substitution for `zxcvbn-js` or `zxcvbn-ruby`. You can just call `Zxcvbn.test` or use `Zxcvbn::Tester.new` the same way as you would if you were using `zxcvbn-js` or `zxcvbn-ruby`.
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/bin/console

@@ -14,5 +14,5 @@ require "zxcvbn"
 # require "irb"
 # IRB.start(__FILE__)
 
-require 'pry'
+require "pry"
 Pry.start("main")

data/lib/zxcvbn.rb

@@ -14,13 +14,11 @@ module Zxcvbn
   def self.zxcvbn(password, user_inputs = [])
     start = (Time.now.to_f * 1000).to_i
     # reset the user inputs matcher on a per-request basis to keep things stateless
-    sanitized_inputs = [];
+    sanitized_inputs = []
     user_inputs.each do |arg|
-      if arg.is_a?(String) || arg.is_a?(Numeric) || arg == true || arg == false
-        sanitized_inputs << arg.to_s.downcase
-      end
+      sanitized_inputs << arg.to_s.downcase if arg.is_a?(String) || arg.is_a?(Numeric) || arg == true || arg == false
     end
-    Matching.set_user_input_dictionary(sanitized_inputs)
+    Matching.user_input_dictionary = sanitized_inputs
     matches = Matching.omnimatch(password)
     result = Scoring.most_guessable_match_sequence(password, matches)
     result["calc_time"] = (Time.now.to_f * 1000).to_i - start
@@ -29,6 +27,16 @@ module Zxcvbn
       result[prop] = val
     end
     result["feedback"] = Feedback.get_feedback(result["score"], result["sequence"])
-    return result
+    result
+  end
+
+  def self.test(password, user_inputs = [])
+    OpenStruct.new(Zxcvbn.zxcvbn(password, user_inputs))
+  end
+
+  class Tester
+    def test(password, user_inputs = [])
+      Zxcvbn.test(password, user_inputs)
+    end
   end
 end

data/lib/zxcvbn/adjacency_graphs.rb

@@ -2,10 +2,12 @@
 
 # generated by scripts/build_keyboard_adjacency_graphs.py
 module Zxcvbn
+  # rubocop:disable Layout/SpaceInsideArrayLiteralBrackets
+  # rubocop:disable Layout/ExtraSpacing
   ADJACENCY_GRAPHS = {
     "qwerty" => {
       "!" => ["`~",  nil,  nil, "2@", "qQ",  nil],
-      "\"" => [";:", "[{", "]}",  nil,  nil, "/?"],
+      "\"" => [";:", "[{", "]}", nil,  nil, "/?"],
       "#" => ["2@",  nil,  nil, "4$", "eE", "wW"],
       "$" => ["3#",  nil,  nil, "5%", "rR", "eE"],
       "%" => ["4$",  nil,  nil, "6^", "tT", "rR"],
@@ -18,7 +20,7 @@ module Zxcvbn
       "," => ["mM", "kK", "lL", ".>",  nil,  nil],
       "-" => ["0)",  nil,  nil, "=+", "[{", "pP"],
       "." => [",<", "lL", ";:", "/?",  nil,  nil],
-      "/" => [".>", ";:", "'\"",  nil,  nil,  nil],
+      "/" => [".>", ";:", "'\"", nil,  nil,  nil],
       "0" => ["9(",  nil,  nil, "-_", "pP", "oO"],
       "1" => ["`~",  nil,  nil, "2@", "qQ",  nil],
       "2" => ["1!",  nil,  nil, "3#", "wW", "qQ"],
@@ -34,7 +36,7 @@ module Zxcvbn
       "<" => ["mM", "kK", "lL", ".>",  nil,  nil],
       "=" => ["-_",  nil,  nil,  nil, "]}", "[{"],
       ">" => [",<", "lL", ";:", "/?",  nil,  nil],
-      "?" => [".>", ";:", "'\"",  nil,  nil,  nil],
+      "?" => [".>", ";:", "'\"", nil,  nil,  nil],
       "@" => ["1!",  nil,  nil, "3#", "wW", "qQ"],
       "A" => [ nil, "qQ", "wW", "sS", "zZ",  nil],
       "B" => ["vV", "gG", "hH", "nN",  nil,  nil],
@@ -63,8 +65,8 @@ module Zxcvbn
       "Y" => ["tT", "6^", "7&", "uU", "hH", "gG"],
       "Z" => [ nil, "aA", "sS", "xX",  nil,  nil],
       "[" => ["pP", "-_", "=+", "]}", "'\"", ";:"],
-      "\\" => ["]}",  nil,  nil,  nil,  nil,  nil],
-      "]" => ["[{", "=+",  nil, "\\|",  nil, "'\""],
+      "\\" => ["]}", nil,  nil,  nil,  nil,  nil],
+      "]" => ["[{", "=+",  nil, "\\|", nil, "'\""],
       "^" => ["5%",  nil,  nil, "7&", "yY", "tT"],
       "_" => ["0)",  nil,  nil, "=+", "[{", "pP"],
       "`" => [ nil,  nil,  nil, "1!",  nil,  nil],
@@ -96,12 +98,12 @@ module Zxcvbn
       "z" => [ nil, "aA", "sS", "xX",  nil,  nil],
       "{" => ["pP", "-_", "=+", "]}", "'\"", ";:"],
       "|" => ["]}",  nil,  nil,  nil,  nil,  nil],
-      "}" => ["[{", "=+",  nil, "\\|",  nil, "'\""],
+      "}" => ["[{", "=+",  nil, "\\|", nil, "'\""],
       "~" => [ nil,  nil,  nil, "1!",  nil,  nil]
     },
     "dvorak" => {
-      "!" => ["`~",  nil,  nil, "2@", "'\"",  nil],
-      "\"" => [ nil, "1!", "2@", ",<", "aA",  nil],
+      "!" => ["`~",  nil,  nil, "2@", "'\"", nil],
+      "\"" => [ nil, "1!", "2@", ",<", "aA", nil],
       "#" => ["2@",  nil,  nil, "4$", ".>", ",<"],
       "$" => ["3#",  nil,  nil, "5%", "pP", ".>"],
       "%" => ["4$",  nil,  nil, "6^", "yY", "pP"],
@@ -110,13 +112,13 @@ module Zxcvbn
       "(" => ["8*",  nil,  nil, "0)", "rR", "cC"],
       ")" => ["9(",  nil,  nil, "[{", "lL", "rR"],
       "*" => ["7&",  nil,  nil, "9(", "cC", "gG"],
-      "+" => ["/?", "]}",  nil, "\\|",  nil, "-_"],
+      "+" => ["/?", "]}",  nil, "\\|", nil, "-_"],
       "," => ["'\"", "2@", "3#", ".>", "oO", "aA"],
       "-" => ["sS", "/?", "=+",  nil,  nil, "zZ"],
       "." => [",<", "3#", "4$", "pP", "eE", "oO"],
       "/" => ["lL", "[{", "]}", "=+", "-_", "sS"],
       "0" => ["9(",  nil,  nil, "[{", "lL", "rR"],
-      "1" => ["`~",  nil,  nil, "2@", "'\"",  nil],
+      "1" => ["`~",  nil,  nil, "2@", "'\"", nil],
       "2" => ["1!",  nil,  nil, "3#", ",<", "'\""],
       "3" => ["2@",  nil,  nil, "4$", ".>", ",<"],
       "4" => ["3#",  nil,  nil, "5%", "pP", ".>"],
@@ -132,7 +134,7 @@ module Zxcvbn
       ">" => [",<", "3#", "4$", "pP", "eE", "oO"],
       "?" => ["lL", "[{", "]}", "=+", "-_", "sS"],
       "@" => ["1!",  nil,  nil, "3#", ",<", "'\""],
-      "A" => [ nil, "'\"", ",<", "oO", ";:",  nil],
+      "A" => [ nil, "'\"", ",<", "oO", ";:", nil],
       "B" => ["xX", "dD", "hH", "mM",  nil,  nil],
       "C" => ["gG", "8*", "9(", "rR", "tT", "hH"],
       "D" => ["iI", "fF", "gG", "hH", "bB", "xX"],
@@ -159,12 +161,12 @@ module Zxcvbn
       "Y" => ["pP", "5%", "6^", "fF", "iI", "uU"],
       "Z" => ["vV", "sS", "-_",  nil,  nil,  nil],
       "[" => ["0)",  nil,  nil, "]}", "/?", "lL"],
-      "\\" => ["=+",  nil,  nil,  nil,  nil,  nil],
+      "\\" => ["=+", nil,  nil,  nil,  nil,  nil],
       "]" => ["[{",  nil,  nil,  nil, "=+", "/?"],
       "^" => ["5%",  nil,  nil, "7&", "fF", "yY"],
       "_" => ["sS", "/?", "=+",  nil,  nil, "zZ"],
       "`" => [ nil,  nil,  nil, "1!",  nil,  nil],
-      "a" => [ nil, "'\"", ",<", "oO", ";:",  nil],
+      "a" => [ nil, "'\"", ",<", "oO", ";:", nil],
       "b" => ["xX", "dD", "hH", "mM",  nil,  nil],
       "c" => ["gG", "8*", "9(", "rR", "tT", "hH"],
       "d" => ["iI", "fF", "gG", "hH", "bB", "xX"],
@@ -196,39 +198,41 @@ module Zxcvbn
       "~" => [ nil,  nil,  nil, "1!",  nil,  nil]
     },
     "keypad" => {
-      "*" => ["/",  nil,  nil,  nil, "-", "+", "9", "8"],
-      "+" => ["9", "*", "-",  nil,  nil,  nil,  nil, "6"],
-      "-" => ["*",  nil,  nil,  nil,  nil,  nil, "+", "9"],
-      "." => ["0", "2", "3",  nil,  nil,  nil,  nil,  nil],
-      "/" => [ nil,  nil,  nil,  nil, "*", "9", "8", "7"],
-      "0" => [ nil, "1", "2", "3", ".",  nil,  nil,  nil],
-      "1" => [ nil,  nil, "4", "5", "2", "0",  nil,  nil],
-      "2" => ["1", "4", "5", "6", "3", ".", "0",  nil],
-      "3" => ["2", "5", "6",  nil,  nil,  nil, ".", "0"],
-      "4" => [ nil,  nil, "7", "8", "5", "2", "1",  nil],
+      "*" => ["/", nil, nil, nil, "-", "+", "9", "8"],
+      "+" => ["9", "*", "-", nil, nil, nil, nil, "6"],
+      "-" => ["*", nil, nil, nil, nil, nil, "+", "9"],
+      "." => ["0", "2", "3", nil, nil, nil, nil, nil],
+      "/" => [nil, nil, nil, nil, "*", "9", "8", "7"],
+      "0" => [nil, "1", "2", "3", ".", nil, nil, nil],
+      "1" => [nil, nil, "4", "5", "2", "0", nil, nil],
+      "2" => ["1", "4", "5", "6", "3", ".", "0", nil],
+      "3" => ["2", "5", "6", nil, nil, nil, ".", "0"],
+      "4" => [nil, nil, "7", "8", "5", "2", "1", nil],
       "5" => ["4", "7", "8", "9", "6", "3", "2", "1"],
-      "6" => ["5", "8", "9", "+",  nil,  nil, "3", "2"],
-      "7" => [ nil,  nil,  nil, "/", "8", "5", "4",  nil],
-      "8" => ["7",  nil, "/", "*", "9", "6", "5", "4"],
-      "9" => ["8", "/", "*", "-", "+",  nil, "6", "5"]
+      "6" => ["5", "8", "9", "+", nil, nil, "3", "2"],
+      "7" => [nil, nil, nil, "/", "8", "5", "4", nil],
+      "8" => ["7", nil, "/", "*", "9", "6", "5", "4"],
+      "9" => ["8", "/", "*", "-", "+", nil, "6", "5"]
     },
     "mac_keypad" => {
-      "*" => ["/",  nil,  nil,  nil,  nil,  nil, "-", "9"],
-      "+" => ["6", "9", "-",  nil,  nil,  nil,  nil, "3"],
-      "-" => ["9", "/", "*",  nil,  nil,  nil, "+", "6"],
-      "." => ["0", "2", "3",  nil,  nil,  nil,  nil,  nil],
-      "/" => ["=",  nil,  nil,  nil, "*", "-", "9", "8"],
-      "0" => [ nil, "1", "2", "3", ".",  nil,  nil,  nil],
-      "1" => [ nil,  nil, "4", "5", "2", "0",  nil,  nil],
-      "2" => ["1", "4", "5", "6", "3", ".", "0",  nil],
-      "3" => ["2", "5", "6", "+",  nil,  nil, ".", "0"],
-      "4" => [ nil,  nil, "7", "8", "5", "2", "1",  nil],
+      "*" => ["/", nil, nil, nil, nil, nil, "-", "9"],
+      "+" => ["6", "9", "-", nil, nil, nil, nil, "3"],
+      "-" => ["9", "/", "*", nil, nil, nil, "+", "6"],
+      "." => ["0", "2", "3", nil, nil, nil, nil, nil],
+      "/" => ["=", nil, nil, nil, "*", "-", "9", "8"],
+      "0" => [nil, "1", "2", "3", ".", nil, nil, nil],
+      "1" => [nil, nil, "4", "5", "2", "0", nil, nil],
+      "2" => ["1", "4", "5", "6", "3", ".", "0", nil],
+      "3" => ["2", "5", "6", "+", nil, nil, ".", "0"],
+      "4" => [nil, nil, "7", "8", "5", "2", "1", nil],
       "5" => ["4", "7", "8", "9", "6", "3", "2", "1"],
-      "6" => ["5", "8", "9", "-", "+",  nil, "3", "2"],
-      "7" => [ nil,  nil,  nil, "=", "8", "5", "4",  nil],
-      "8" => ["7",  nil, "=", "/", "9", "6", "5", "4"],
+      "6" => ["5", "8", "9", "-", "+", nil, "3", "2"],
+      "7" => [nil, nil, nil, "=", "8", "5", "4", nil],
+      "8" => ["7", nil, "=", "/", "9", "6", "5", "4"],
       "9" => ["8", "=", "/", "*", "-", "+", "6", "5"],
-      "=" => [ nil,  nil,  nil,  nil, "/", "9", "8", "7"]
+      "=" => [nil, nil, nil, nil, "/", "9", "8", "7"]
     }
-  }
+  }.freeze
+  # rubocop:enable Layout/ExtraSpacing
+  # rubocop:enable Layout/SpaceInsideArrayLiteralBrackets
 end

data/lib/zxcvbn/feedback.rb

@@ -3,9 +3,9 @@
 module Zxcvbn
   module Feedback
     DEFAULT_FEEDBACK = {
-      "warning" => '',
+      "warning" => "",
       "suggestions" => ["Use a few words, avoid common phrases", "No need for symbols, digits, or uppercase letters"]
-    }
+    }.freeze
 
     def self.get_feedback(score, sequence)
       if sequence.empty?
@@ -16,91 +16,94 @@ module Zxcvbn
       # no feedback if score is good or great.
       if score > 2
         return {
-          "warning" => '',
+          "warning" => "",
           "suggestions" => []
         }
       end
 
-      longest_match = sequence.max_by{|match| match["token"].length }
+      longest_match = sequence.max_by { |match| match["token"].length }
       feedback = get_match_feedback(longest_match, sequence.size == 1)
-      extra_feedback = 'Add another word or two. Uncommon words are better.'
-      if !feedback.nil?
+      extra_feedback = "Add another word or two. Uncommon words are better."
+      if feedback
         feedback["suggestions"].unshift(extra_feedback)
-        if feedback["warning"].nil?
-          feedback["warning"] = ''
-        end
+        feedback["warning"] = "" if feedback["warning"].nil?
       else
         feedback = {
-          "warning" => '',
+          "warning" => "",
           "suggestions" => [extra_feedback]
         }
       end
-      return feedback
+      feedback
     end
 
     def self.get_match_feedback(match, is_sole_match)
       case match["pattern"]
-      when 'dictionary'
-        return get_dictionary_match_feedback(match, is_sole_match)
-      when 'spatial'
-        layout = match["graph.upcase"]
-        warning = match["turns"] == 1 ? 'Straight rows of keys are easy to guess' : 'Short keyboard patterns are easy to guess'
-        return {
+      when "dictionary"
+        get_dictionary_match_feedback(match, is_sole_match)
+      when "spatial"
+        warning = if match["turns"] == 1
+          "Straight rows of keys are easy to guess"
+        else
+          "Short keyboard patterns are easy to guess"
+        end
+        {
           "warning" => warning,
-          "suggestions" => ['Use a longer keyboard pattern with more turns']
+          "suggestions" => ["Use a longer keyboard pattern with more turns"]
         }
-      when 'repeat'
-        warning = match["base_token"].length == 1 ? 'Repeats like "aaa" are easy to guess' : 'Repeats like "abcabcabc" are only slightly harder to guess than "abc"'
-        return {
+      when "repeat"
+        warning = if match["base_token"].length == 1
+          'Repeats like "aaa" are easy to guess'
+        else
+          'Repeats like "abcabcabc" are only slightly harder to guess than "abc"'
+        end
+        {
           "warning" => warning,
-          "suggestions" => ['Avoid repeated words and characters']
+          "suggestions" => ["Avoid repeated words and characters"]
         }
-      when 'sequence'
-        return {
+      when "sequence"
+        {
           "warning" => "Sequences like abc or 6543 are easy to guess",
-          "suggestions" => ['Avoid sequences']
+          "suggestions" => ["Avoid sequences"]
         }
-      when 'regex'
-        if match["regex_name"] === 'recent_year'
-          return {
+      when "regex"
+        if match["regex_name"] == "recent_year"
+          {
             "warning" => "Recent years are easy to guess",
-            "suggestions" => ['Avoid recent years', 'Avoid years that are associated with you']
+            "suggestions" => ["Avoid recent years", "Avoid years that are associated with you"]
           }
         end
         # break
-      when 'date'
-        return {
+      when "date"
+        {
           "warning" => "Dates are often easy to guess",
-          "suggestions" => ['Avoid dates and years that are associated with you']
+          "suggestions" => ["Avoid dates and years that are associated with you"]
         }
       end
     end
 
     def self.get_dictionary_match_feedback(match, is_sole_match)
-      warning = if match["dictionary_name"] == 'passwords'
+      warning = if match["dictionary_name"] == "passwords"
         if is_sole_match && !match["l33t"] && !match["reversed"]
           if match["rank"] <= 10
-            'This is a top-10 common password'
+            "This is a top-10 common password"
           elsif match["rank"] <= 100
-            'This is a top-100 common password'
+            "This is a top-100 common password"
           else
-            'This is a very common password'
+            "This is a very common password"
           end
         elsif match["guesses_log10"] <= 4
-          'This is similar to a commonly used password'
-        end
-      elsif match["dictionary_name"] == 'english_wikipedia'
-        if is_sole_match
-          'A word by itself is easy to guess'
+          "This is similar to a commonly used password"
         end
-      elsif ['surnames', 'male_names', 'female_names'].include?(match["dictionary_name"])
+      elsif match["dictionary_name"] == "english_wikipedia"
+        "A word by itself is easy to guess" if is_sole_match
+      elsif ["surnames", "male_names", "female_names"].include?(match["dictionary_name"])
         if is_sole_match
-          'Names and surnames by themselves are easy to guess'
+          "Names and surnames by themselves are easy to guess"
         else
-          'Common names and surnames are easy to guess'
+          "Common names and surnames are easy to guess"
         end
       else
-        ''
+        ""
       end
       suggestions = []
       word = match["token"]
@@ -109,17 +112,12 @@ module Zxcvbn
       elsif word.match(Scoring::ALL_UPPER) && word.downcase != word
         suggestions << "All-uppercase is almost as easy to guess as all-lowercase"
       end
-      if match["reversed"] && match["token"].length >= 4
-        suggestions << "Reversed words aren't much harder to guess"
-      end
-      if match["l33t"]
-        suggestions << "Predictable substitutions like '@' instead of 'a' don't help very much"
-      end
-      result = {
+      suggestions << "Reversed words aren't much harder to guess" if match["reversed"] && match["token"].length >= 4
+      suggestions << "Predictable substitutions like '@' instead of 'a' don't help very much" if match["l33t"]
+      {
         "warning" => warning,
         "suggestions" => suggestions
       }
-      return result
     end
   end
 end