zxcvbn-ruby 1.2.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa14ec0484793f1034f5dda8b84c6265e2fc8b161e47fa323be7e78dc3223cc4
-  data.tar.gz: e42207b60f1d6b1c4a198e6e7b466e7dcc68caaaf610bdf6e4d29a85978da58d
+  metadata.gz: 43a759e1040848c8da4bea8d1e871eb7d811d5cab0ebf962255990963b796f75
+  data.tar.gz: c78d0453bb8c92d1f3b21c37f1493f305a6667f24e6ae85a621841a9396fb584
 SHA512:
-  metadata.gz: d6b789be21697b782a87bc8c946fed85e8f088d8097f75f2e50ae8f9f95954c01dd1df76d8eb58f031b5b6e4ee43bbb14e15264c102371cdbb20696b50e0f3c1
-  data.tar.gz: a9a0fa505d0896c58cd1e34780ddd07a37d1d5fe34e103c09c86c4b9bdff3d8ddb78c607e2c158ef4d562f93b5a16f20e0f41b0db89dfddc1b7522c4467f1171
+  metadata.gz: 552d40a11c071613eefb14819b4dabbd3abc6a1f2d336e6bf9bfbc873a34640a229b3bedcc0bd77aca6ffe5e43e31fefec74fe94d74f3cdaebd4e7169610ec02
+  data.tar.gz: 84c006df22e0224da4a891f8fa923c81b69229f2b99e5d60ba29104473e566c83a36fbcc404defe980d80cfb176964864f00dbdfa02d655e05eaac7753e64360

data/CHANGELOG.md

@@ -6,7 +6,77 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-[Unreleased]: https://github.com/envato/zxcvbn-ruby/compare/v1.2.0...HEAD
+[Unreleased]: https://github.com/envato/zxcvbn-ruby/compare/v1.4.0...HEAD
+
+## [1.4.0] - 2026-01-15
+
+### Added
+ - RBS type signatures for improved type checking and IDE support ([#68])
+
+### Changed
+ - Minor fixups in gem metadata ([#67]).
+
+[1.4.0]: https://github.com/envato/zxcvbn-ruby/compare/v1.3.0...v1.4.0
+[#67]: https://github.com/envato/zxcvbn-ruby/pull/67
+[#68]: https://github.com/envato/zxcvbn-ruby/pull/68
+
+## [1.3.0] - 2026-01-02
+
+### Changed
+ - Replace OpenStruct with regular class in `Zxcvbn::Match` for 2x performance improvement ([#61])
+ - Implement Trie data structure for dictionary matching with 1.4x additional performance improvement ([#62])
+ - Replace range operators with `String#slice` for string slicing operations ([#63])
+ - Optimise L33t matcher with early bailout and improved deduplication ([#64])
+ - Pre-compute spatial graph statistics during data initialisation ([#65])
+ - Optimise nCk calculation using symmetry property ([#66])
+
+Overall performance improvement: 4.1x faster than v1.2.4 (0.722ms → 0.176ms per password)
+
+[1.3.0]: https://github.com/envato/zxcvbn-ruby/compare/v1.2.4...v1.3.0
+[#61]: https://github.com/envato/zxcvbn-ruby/pull/61
+[#62]: https://github.com/envato/zxcvbn-ruby/pull/62
+[#63]: https://github.com/envato/zxcvbn-ruby/pull/63
+[#64]: https://github.com/envato/zxcvbn-ruby/pull/64
+[#65]: https://github.com/envato/zxcvbn-ruby/pull/65
+[#66]: https://github.com/envato/zxcvbn-ruby/pull/66
+
+## [1.2.4] - 2025-12-07
+
+### Changed
+ - Address security issues found by RuboCop ([#57])
+
+[1.2.4]: https://github.com/envato/zxcvbn-ruby/compare/v1.2.3...v1.2.4
+[#57]: https://github.com/envato/zxcvbn-ruby/pull/57
+
+## [1.2.3] - 2025-12-07
+
+### Changed
+ - Address linting issues found by RuboCop ([#52])
+ - Address style issues found by RuboCop ([#53], [#54], [#55])
+
+[1.2.3]: https://github.com/envato/zxcvbn-ruby/compare/v1.2.2...v1.2.3
+[#52]: https://github.com/envato/zxcvbn-ruby/pull/52
+[#53]: https://github.com/envato/zxcvbn-ruby/pull/53
+[#54]: https://github.com/envato/zxcvbn-ruby/pull/54
+[#55]: https://github.com/envato/zxcvbn-ruby/pull/55
+
+## [1.2.2] - 2025-12-06
+
+### Changed
+ - Address layout and frozen string literal issues ([#49])
+
+[1.2.2]: https://github.com/envato/zxcvbn-ruby/compare/v1.2.1...v1.2.2
+[#49]: https://github.com/envato/zxcvbn-ruby/pull/49
+
+## [1.2.1] - 2025-12-05
+
+### Removed
+- Removed the dependency on the Ruby `benchmark` module ([#44]).
+- Tests are no longer included in the gem package ([#45]).
+
+[1.2.1]: https://github.com/envato/zxcvbn-ruby/compare/v1.2.0...v1.2.1
+[#44]: https://github.com/envato/zxcvbn-ruby/pull/44
+[#45]: https://github.com/envato/zxcvbn-ruby/pull/45
 
 ## [1.2.0] - 2021-01-05
 
@@ -17,7 +87,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
  - Use [mini\_racer] for running JavaScript specs (thanks [@RSO] ([#33]))
  - Moved CI to GitHub Actions ([#34])
 
-[1.2.0]: https://github.com/envato/zxcvbn-ruby/compare/v1.1.0...v.1.2.0
+[1.2.0]: https://github.com/envato/zxcvbn-ruby/compare/v1.1.0...v1.2.0
 [@rso]: https://github.com/RSO
 [mini\_racer]: https://rubygems.org/gems/mini_racer/
 [#32]: https://github.com/envato/zxcvbn-ruby/pull/32

data/README.md

@@ -119,18 +119,13 @@ $ irb
 **Note**: Storing the entropy of an encrypted or hashed value provides
 information that can make cracking the value orders of magnitude easier for an
 attacker. For this reason we advise you not to store the results of
-`Zxcvbn::Tester#test`. Further reading: [A Tale of Security Gone Wrong](http://gavinmiller.io/2016/a-tale-of-security-gone-wrong/).
+`Zxcvbn::Tester#test`. Further reading: [A Tale of Security Gone Wrong](https://web.archive.org/web/20240715041147/http://gavinmiller.io/2016/a-tale-of-security-gone-wrong/).
 
 ## Contact
 
  - [GitHub project](https://github.com/envato/zxcvbn-ruby)
  - Bug reports and feature requests are welcome via [GitHub Issues](https://github.com/envato/zxcvbn-ruby/issues)
 
-## Maintainers
-
- - [Pete Johns](https://github.com/johnsyweb)
- - [Steve Hodgkiss](https://github.com/stevehodgkiss)
-
 ## Authors
 
  - [Steve Hodgkiss](https://github.com/stevehodgkiss)
@@ -162,18 +157,14 @@ For larger new features: Do everything as above, but first also make contact wit
 
 ## About [![code with heart by Envato](https://img.shields.io/badge/%3C%2F%3E%20with%20%E2%99%A5%20by-Envato-ff69b4.svg?style=flat-square)](https://github.com/envato/zxcvbn-ruby)
 
-This project is maintained by the [Envato engineering team][webuild] and funded by [Envato][envato].
-
-[<img src="http://opensource.envato.com/images/envato-oss-readme-logo.png" alt="Envato logo">][envato]
+This project is maintained by the Envato engineering team and funded by [Envato][envato].
 
 Encouraging the use and creation of open source software is one of the ways we
-serve our community. See [our other projects][oss] or [come work with us][careers]
+serve our community. Perhaps [come work with us][careers]
 where you'll find an incredibly diverse, intelligent and capable group of people
 who help make our company succeed and make our workplace fun, friendly and
 happy.
 
  [careers]: https://envato.com/careers/?utm_source=github
  [envato]: https://envato.com?utm_source=github
- [oss]: https://opensource.envato.com/?utm_source=github
- [webuild]: https://webuild.envato.com?utm_source=github
  [zxcvbn.js]: https://github.com/dropbox/zxcvbn

data/lib/zxcvbn/clock.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Zxcvbn
+  module Clock
+    def self.realtime
+      start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+      yield
+      Process.clock_gettime(Process::CLOCK_MONOTONIC) - start
+    end
+  end
+end

data/lib/zxcvbn/crack_time.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Zxcvbn
   module CrackTime
     SINGLE_GUESS = 0.010
@@ -6,18 +8,17 @@ module Zxcvbn
     SECONDS_PER_GUESS = SINGLE_GUESS / NUM_ATTACKERS
 
     def entropy_to_crack_time(entropy)
-      0.5 * (2 ** entropy) * SECONDS_PER_GUESS
+      0.5 * (2**entropy) * SECONDS_PER_GUESS
     end
 
     def crack_time_to_score(seconds)
-      case
-      when seconds < 10**2
+      if seconds < 10**2
         0
-      when seconds < 10**4
+      elsif seconds < 10**4
         1
-      when seconds < 10**6
+      elsif seconds < 10**6
         2
-      when seconds < 10**8
+      elsif seconds < 10**8
         3
       else
         4
@@ -32,22 +33,21 @@ module Zxcvbn
       year    = month * 12
       century = year * 100
 
-      case
-      when seconds < minute
+      if seconds < minute
         'instant'
-      when seconds < hour
+      elsif seconds < hour
         "#{1 + (seconds / minute).ceil} minutes"
-      when seconds < day
+      elsif seconds < day
         "#{1 + (seconds / hour).ceil} hours"
-      when seconds < month
+      elsif seconds < month
         "#{1 + (seconds / day).ceil} days"
-      when seconds < year
+      elsif seconds < year
         "#{1 + (seconds / month).ceil} months"
-      when seconds < century
+      elsif seconds < century
         "#{1 + (seconds / year).ceil} years"
       else
         'centuries'
       end
     end
   end
-end
+end

data/lib/zxcvbn/data.rb

@@ -1,29 +1,62 @@
+# frozen_string_literal: true
+
 require 'json'
 require 'zxcvbn/dictionary_ranker'
+require 'zxcvbn/trie'
 
 module Zxcvbn
   class Data
     def initialize
       @ranked_dictionaries = DictionaryRanker.rank_dictionaries(
-        "english" =>      read_word_list("english.txt"),
-        "female_names" => read_word_list("female_names.txt"),
-        "male_names" =>   read_word_list("male_names.txt"),
-        "passwords" =>    read_word_list("passwords.txt"),
-        "surnames" =>     read_word_list("surnames.txt")
+        'english' => read_word_list('english.txt'),
+        'female_names' => read_word_list('female_names.txt'),
+        'male_names' => read_word_list('male_names.txt'),
+        'passwords' => read_word_list('passwords.txt'),
+        'surnames' => read_word_list('surnames.txt')
       )
-      @adjacency_graphs = JSON.load(DATA_PATH.join('adjacency_graphs.json').read)
+      @adjacency_graphs = JSON.parse(DATA_PATH.join('adjacency_graphs.json').read)
+      @dictionary_tries = build_tries
+      @graph_stats = compute_graph_stats
     end
 
-    attr_reader :ranked_dictionaries, :adjacency_graphs
+    attr_reader :ranked_dictionaries, :adjacency_graphs, :dictionary_tries, :graph_stats
 
     def add_word_list(name, list)
-      @ranked_dictionaries[name] = DictionaryRanker.rank_dictionary(list)
+      ranked_dict = DictionaryRanker.rank_dictionary(list)
+      @ranked_dictionaries[name] = ranked_dict
+      @dictionary_tries[name] = build_trie(ranked_dict)
     end
 
     private
 
     def read_word_list(file)
-      DATA_PATH.join("frequency_lists", file).read.split
+      DATA_PATH.join('frequency_lists', file).read.split
+    end
+
+    def build_tries
+      @ranked_dictionaries.transform_values { |dict| build_trie(dict) }
+    end
+
+    def build_trie(ranked_dictionary)
+      trie = Trie.new
+      ranked_dictionary.each { |word, rank| trie.insert(word, rank) }
+      trie
+    end
+
+    def compute_graph_stats
+      stats = {}
+      @adjacency_graphs.each do |graph_name, graph|
+        degrees = graph.map { |_, neighbors| neighbors.compact.size }
+        sum = degrees.inject(0, :+)
+        average_degree = sum.to_f / graph.size
+        starting_positions = graph.length
+
+        stats[graph_name] = {
+          average_degree: average_degree,
+          starting_positions: starting_positions
+        }
+      end
+      stats
     end
   end
 end

data/lib/zxcvbn/dictionary_ranker.rb

@@ -1,16 +1,17 @@
+# frozen_string_literal: true
+
 module Zxcvbn
   class DictionaryRanker
     def self.rank_dictionaries(lists)
-      lists.each_with_object({}) do |(dict_name, words), dictionaries|
-        dictionaries[dict_name] = rank_dictionary(words)
+      lists.transform_values do |words|
+        rank_dictionary(words)
       end
     end
 
     def self.rank_dictionary(words)
-      words.each_with_index
-           .with_object({}) do |(word, i), dictionary|
-        dictionary[word.downcase] = i + 1
-      end
+      words
+        .each_with_index
+        .with_object({}) { |(word, i), dictionary| dictionary[word.downcase] = i + 1 }
     end
   end
 end

data/lib/zxcvbn/entropy.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'zxcvbn/math'
 
 module Zxcvbn::Entropy
@@ -6,24 +8,25 @@ module Zxcvbn::Entropy
   def calc_entropy(match)
     return match.entropy unless match.entropy.nil?
 
-    match.entropy = case match.pattern
-                    when 'repeat'
-                      repeat_entropy(match)
-                    when 'sequence'
-                      sequence_entropy(match)
-                    when 'digits'
-                      digits_entropy(match)
-                    when 'year'
-                      year_entropy(match)
-                    when 'date'
-                      date_entropy(match)
-                    when 'spatial'
-                      spatial_entropy(match)
-                    when 'dictionary'
-                      dictionary_entropy(match)
-                    else
-                      0
-                    end
+    match.entropy =
+      case match.pattern
+      when 'repeat'
+        repeat_entropy(match)
+      when 'sequence'
+        sequence_entropy(match)
+      when 'digits'
+        digits_entropy(match)
+      when 'year'
+        year_entropy(match)
+      when 'date'
+        date_entropy(match)
+      when 'spatial'
+        spatial_entropy(match)
+      when 'dictionary'
+        dictionary_entropy(match)
+      else
+        0
+      end
   end
 
   def repeat_entropy(match)
@@ -33,41 +36,41 @@ module Zxcvbn::Entropy
 
   def sequence_entropy(match)
     first_char = match.token[0]
-    base_entropy = if ['a', '1'].include?(first_char)
-      1
-    elsif first_char.match(/\d/)
-      lg(10)
-    elsif first_char.match(/[a-z]/)
-      lg(26)
-    else
-      lg(26) + 1
-    end
+    base_entropy =
+      if ['a', '1'].include?(first_char)
+        1
+      elsif first_char.match(/\d/)
+        lg(10)
+      elsif first_char.match(/[a-z]/)
+        lg(26)
+      else
+        lg(26) + 1
+      end
     base_entropy += 1 unless match.ascending
     base_entropy + lg(match.token.length)
   end
 
   def digits_entropy(match)
-    lg(10 ** match.token.length)
+    lg(10**match.token.length)
   end
 
   NUM_YEARS = 119 # years match against 1900 - 2019
   NUM_MONTHS = 12
   NUM_DAYS = 31
 
-  def year_entropy(match)
+  def year_entropy(_match)
     lg(NUM_YEARS)
   end
 
   def date_entropy(match)
-    if match.year < 100
-      entropy = lg(NUM_DAYS * NUM_MONTHS * 100)
-    else
-      entropy = lg(NUM_DAYS * NUM_MONTHS * NUM_YEARS)
-    end
+    entropy =
+      if match.year < 100
+        lg(NUM_DAYS * NUM_MONTHS * 100)
+      else
+        lg(NUM_DAYS * NUM_MONTHS * NUM_YEARS)
+      end
 
-    if match.separator
-      entropy += 2
-    end
+    entropy += 2 if match.separator
 
     entropy
   end
@@ -80,18 +83,18 @@ module Zxcvbn::Entropy
     match.base_entropy + match.uppercase_entropy + match.l33t_entropy
   end
 
-  START_UPPER = /^[A-Z][^A-Z]+$/
-  END_UPPER   = /^[^A-Z]+[A-Z]$/
-  ALL_UPPER   = /^[A-Z]+$/
-  ALL_LOWER   = /^[a-z]+$/
+  START_UPPER = /^[A-Z][^A-Z]+$/.freeze
+  END_UPPER   = /^[^A-Z]+[A-Z]$/.freeze
+  ALL_UPPER   = /^[A-Z]+$/.freeze
+  ALL_LOWER   = /^[a-z]+$/.freeze
 
   def extra_uppercase_entropy(match)
     word = match.token
     [START_UPPER, END_UPPER, ALL_UPPER].each do |regex|
       return 1 if word.match(regex)
     end
-    num_upper = word.chars.count{|c| c.match(/[A-Z]/) }
-    num_lower = word.chars.count{|c| c.match(/[a-z]/) }
+    num_upper = word.chars.count { |c| c.match(/[A-Z]/) }
+    num_lower = word.chars.count { |c| c.match(/[a-z]/) }
     possibilities = 0
     (0..[num_upper, num_lower].min).each do |i|
       possibilities += nCk(num_upper + num_lower, i)
@@ -102,20 +105,21 @@ module Zxcvbn::Entropy
   def extra_l33t_entropy(match)
     word = match.token
     return 0 unless match.l33t
+
     possibilities = 0
     match.sub.each do |subbed, unsubbed|
-      num_subbed = word.chars.count{|c| c == subbed}
-      num_unsubbed = word.chars.count{|c| c == unsubbed}
+      num_subbed = word.chars.count { |c| c == subbed }
+      num_unsubbed = word.chars.count { |c| c == unsubbed }
       (0..[num_subbed, num_unsubbed].min).each do |i|
         possibilities += nCk(num_subbed + num_unsubbed, i)
       end
     end
     entropy = lg(possibilities)
-    entropy == 0 ? 1 : entropy
+    entropy.zero? ? 1 : entropy
   end
 
   def spatial_entropy(match)
-    if %w|qwerty dvorak|.include? match.graph
+    if %w[qwerty dvorak].include? match.graph
       starting_positions = starting_positions_for_graph('qwerty')
       average_degree     = average_degree_for_graph('qwerty')
     else
@@ -131,7 +135,7 @@ module Zxcvbn::Entropy
     (2..token_length).each do |i|
       possible_turns = [turns, i - 1].min
       (1..possible_turns).each do |j|
-        possibilities += nCk(i - 1, j - 1) * starting_positions * average_degree ** j
+        possibilities += nCk(i - 1, j - 1) * starting_positions * average_degree**j
       end
     end
 

data/lib/zxcvbn/feedback.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Zxcvbn
   class Feedback
     attr_accessor :warning, :suggestions

data/lib/zxcvbn/feedback_giver.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'zxcvbn/entropy'
 require 'zxcvbn/feedback'
 
@@ -16,14 +18,14 @@ module Zxcvbn
 
     def self.get_feedback(score, sequence)
       # starting feedback
-      return DEFAULT_FEEDBACK if sequence.length.zero?
+      return DEFAULT_FEEDBACK if sequence.empty?
 
       # no feedback if score is good or great.
       return EMPTY_FEEDBACK if score > 2
 
       # tie feedback to the longest match for longer sequences
       longest_match = sequence[0]
-      for match in sequence[1..-1]
+      sequence[1..-1].each do |match|
         longest_match = match if match.token.length > longest_match.token.length
       end
 
@@ -45,7 +47,6 @@ module Zxcvbn
         get_dictionary_match_feedback match, is_sole_match
 
       when 'spatial'
-        layout = match.graph.upcase
         warning = if match.turns == 1
                     'Straight rows of keys are easy to guess'
                   else

data/lib/zxcvbn/match.rb

@@ -1,10 +1,24 @@
-require 'ostruct'
+# frozen_string_literal: true
 
 module Zxcvbn
-  class Match < OpenStruct
+  class Match
+    attr_accessor :pattern, :i, :j, :token, :matched_word, :rank,
+                  :dictionary_name, :reversed, :l33t, :sub, :sub_display,
+                  :l, :entropy, :base_entropy, :uppercase_entropy, :l33t_entropy,
+                  :repeated_char, :sequence_name, :sequence_space, :ascending,
+                  :graph, :turns, :shifted_count, :shiffted_count,
+                  :year, :month, :day, :separator, :cardinality, :offset
+
+    def initialize(**attributes)
+      attributes.each do |key, value|
+        instance_variable_set("@#{key}", value)
+      end
+    end
+
     def to_hash
-      @table.keys.sort.each_with_object({}) do |key, hash|
-        hash[key.to_s] = @table[key]
+      instance_variables.sort.each_with_object({}) do |var, hash|
+        key = var.to_s.delete_prefix('@')
+        hash[key] = instance_variable_get(var)
       end
     end
   end

data/lib/zxcvbn/matchers/date.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'zxcvbn/matchers/regex_helpers'
 
 module Zxcvbn
@@ -5,23 +7,23 @@ module Zxcvbn
     class Date
       include RegexHelpers
 
-      YEAR_SUFFIX = /
+      YEAR_SUFFIX = %r{
         ( \d{1,2} )                         # day or month
-        ( \s | \- | \/ | \\ | \_ | \. )     # separator
+        ( \s | - | / | \\ | _ | \. )        # separator
         ( \d{1,2} )                         # month or day
         \2                                  # same separator
         ( 19\d{2} | 200\d | 201\d | \d{2} ) # year
-      /x
+      }x.freeze
 
-      YEAR_PREFIX = /
+      YEAR_PREFIX = %r{
         ( 19\d{2} | 200\d | 201\d | \d{2} ) # year
-        ( \s | - | \/ | \\ | _ | \. )       # separator
+        ( \s | - | / | \\ | _ | \. )        # separator
         ( \d{1,2} )                         # day or month
         \2                                  # same separator
         ( \d{1,2} )                         # month or day
-      /x
+      }x.freeze
 
-      WITHOUT_SEPARATOR = /\d{4,8}/
+      WITHOUT_SEPARATOR = /\d{4,8}/.freeze
 
       def matches(password)
         match_with_separator(password) + match_without_separator(password)
@@ -52,9 +54,11 @@ module Zxcvbn
 
       def match_without_separator(password)
         result = []
-        re_match_all(WITHOUT_SEPARATOR, password) do |match, re_match|
+        re_match_all(WITHOUT_SEPARATOR, password) do |match, _re_match|
           extract_dates(match.token).each do |candidate|
-            day, month, year = candidate[:day], candidate[:month], candidate[:year]
+            day = candidate[:day]
+            month = candidate[:month]
+            year = candidate[:year]
 
             match.pattern = 'date'
             match.day = day
@@ -71,11 +75,11 @@ module Zxcvbn
         dates = []
         date_patterns_for_length(token.length).map do |pattern|
           candidate = {
-            :year => '',
-            :month => '',
-            :day => ''
+            year: +'',
+            month: +'',
+            day: +''
           }
-          for i in 0...token.length
+          (0...token.length).each do |i|
             candidate[PATTERN_CHAR_TO_SYM[pattern[i]]] << token[i]
           end
           candidate.each do |component, value|
@@ -92,18 +96,18 @@ module Zxcvbn
       end
 
       DATE_PATTERN_FOR_LENGTH = {
-        8 => %w[ yyyymmdd ddmmyyyy mmddyyyy ],
-        7 => %w[ yyyymdd yyyymmd ddmyyyy dmmyyyy ],
-        6 => %w[ yymmdd ddmmyy mmddyy ],
-        5 => %w[ yymdd yymmd ddmyy dmmyy mmdyy mddyy ],
-        4 => %w[ yymd dmyy mdyy ]
-      }
+        8 => %w[yyyymmdd ddmmyyyy mmddyyyy].freeze,
+        7 => %w[yyyymdd yyyymmd ddmyyyy dmmyyyy].freeze,
+        6 => %w[yymmdd ddmmyy mmddyy].freeze,
+        5 => %w[yymdd yymmd ddmyy dmmyy mmdyy mddyy].freeze,
+        4 => %w[yymd dmyy mdyy].freeze
+      }.freeze
 
       PATTERN_CHAR_TO_SYM = {
         'y' => :year,
         'm' => :month,
         'd' => :day
-      }
+      }.freeze
 
       def date_patterns_for_length(length)
         DATE_PATTERN_FOR_LENGTH[length] || []
@@ -112,6 +116,7 @@ module Zxcvbn
       def valid_date?(day, month, year)
         return false if day > 31 || month > 12
         return false unless year >= 1900 && year <= 2019
+
         true
       end
 
@@ -120,7 +125,7 @@ module Zxcvbn
       end
 
       def expand_year(year)
-        return year
+        year
         # Block dates with 2 digit years for now to be compatible with the JS version
         # return year unless year < 100
         # now = Time.now.year