passweird 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f9ca1edca79f1e3509a577234b4bb273753f0a1ad7ec48ce245731a0ee10117
-  data.tar.gz: d10de41fe650f3d9f3549ef56ec954bd526ebedb943158d7d83ed95c6fea39b1
+  metadata.gz: 8a90a6f24240691ccdd65ca1185eeda32e95dfc65302d1eb4fa118a5b8e45504
+  data.tar.gz: 463bf49ad884574607e5682bd00de52008fca4ee272e9a49f4723c846d306d1c
 SHA512:
-  metadata.gz: 5fa8ea500a7c0303baa3f7f19764cef831b792fb508b400829cfd9d44d4d1a7a797db83abaaf2ee045b86471887f3c059baea54c245c1e21d9982b47ce776ea0
-  data.tar.gz: 66cb3443e86cad7ceb5f65fd7ad7ce1e641364a5430aa7fc8643052d447e698d324b63ef816ac701ec2663ff4f3d5f923c8ece1abcae0cbc8b5a4cda7ffa6c71
+  metadata.gz: 940795845301e0ca6c127c168b70b7731fbfba2c779a95bfacf56bdb830e3d1cedfbc79d95e846da41d558f763e7478402450c5fde7c5e24c524af6ef657d201
+  data.tar.gz: e20d91623ec83339f47f662f83787af532146c77964f67aa59f52c9ff584ef0d49ca825f33f588d870b803fb90ac17d6b65e0ed1b0d6ece93ffbcb8563289300

data/Gemfile

@@ -11,7 +11,7 @@ gem "rspec", "~> 3.0"
 
 gem "rubocop", "~> 1.21"
 
-gem "activerecord", "~> 6.0"
+gem "activerecord", ">= 7.0", "< 8.0"
 
 gem "sqlite3", "~> 1.4", ">= 1.4.2"
 

data/Gemfile.lock

@@ -1,25 +1,36 @@
 PATH
   remote: .
   specs:
-    passweird (0.1.2)
-      activerecord (~> 6.0)
+    passweird (0.2.0)
+      activerecord (>= 7.0, < 8.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.1.7.10)
-      activesupport (= 6.1.7.10)
-    activerecord (6.1.7.10)
-      activemodel (= 6.1.7.10)
-      activesupport (= 6.1.7.10)
-    activesupport (6.1.7.10)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+    activemodel (7.2.2.1)
+      activesupport (= 7.2.2.1)
+    activerecord (7.2.2.1)
+      activemodel (= 7.2.2.1)
+      activesupport (= 7.2.2.1)
+      timeout (>= 0.4.0)
+    activesupport (7.2.2.1)
+      base64
+      benchmark (>= 0.3)
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
-      tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
     ast (2.4.2)
+    base64 (0.2.0)
+    benchmark (0.4.0)
+    bigdecimal (3.1.9)
     concurrent-ruby (1.3.5)
+    connection_pool (2.5.0)
     database_cleaner (2.1.0)
       database_cleaner-active_record (>= 2, < 3)
     database_cleaner-active_record (2.2.0)
@@ -27,10 +38,12 @@ GEM
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
     diff-lcs (1.5.1)
+    drb (2.2.1)
     i18n (1.14.7)
       concurrent-ruby (~> 1.0)
     json (2.9.1)
     language_server-protocol (3.17.0.3)
+    logger (1.6.5)
     minitest (5.25.4)
     parallel (1.26.3)
     parser (3.3.7.0)
@@ -66,21 +79,22 @@ GEM
     rubocop-ast (1.37.0)
       parser (>= 3.3.1.0)
     ruby-progressbar (1.13.0)
+    securerandom (0.4.1)
     sqlite3 (1.7.3-arm64-darwin)
     sqlite3 (1.7.3-x86_64-linux)
+    timeout (0.4.3)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (3.1.4)
       unicode-emoji (~> 4.0, >= 4.0.4)
     unicode-emoji (4.0.4)
-    zeitwerk (2.6.18)
 
 PLATFORMS
   arm64-darwin-24
   x86_64-linux
 
 DEPENDENCIES
-  activerecord (~> 6.0)
+  activerecord (>= 7.0, < 8.0)
   database_cleaner (~> 2.1)
   passweird!
   rake (~> 13.0)

data/lib/passweird/checker.rb

@@ -24,7 +24,7 @@ module Passweird
     #
     # @return [Boolean] true if the password is blacklisted, false otherwise
     def blacklisted?
-      @blacklisted ||= BlacklistedTerm.where(term: possible_terms).exists?
+      @blacklisted ||= BlacklistedTerm.exists?(term: possible_terms)
     end
 
     # Retrieves the blacklisted terms that match the possible terms
@@ -47,6 +47,10 @@ module Passweird
       @all_substring_case_permutations ||= substrings + unleeted_substrings + downcased_substrings + upcased_substrings
     end
 
+    def all_substrings
+      @all_substrings ||= (substrings + unleeted_substrings).uniq
+    end
+
     def unleeted_substrings
       @unleeted_substrings ||= LeetSpeak.unleet_all(substrings)
     end
@@ -56,11 +60,11 @@ module Passweird
     end
 
     def downcased_substrings
-      @downcased_substrings ||= substrings.map(&:downcase)
+      @downcased_substrings ||= all_substrings.map(&:downcase)
     end
 
     def upcased_substrings
-      @upcased_substrings ||= substrings.map(&:upcase)
+      @upcased_substrings ||= all_substrings.map(&:upcase)
     end
   end
 end

data/lib/passweird/leet_speak.rb

@@ -8,41 +8,92 @@ module Passweird
   #   leet_speak = Passweird::LeetSpeak.new("example")
   #   leet_string = leet_speak.leet
   #   # => "3x4mpl3"
-  #   normal_string = leet_speak.unleeted
+  #   normal_string = leet_speak.unleet
   #   # => "example"
   class LeetSpeak
     attr_reader :given_string
 
-    LEET_CHAR_EQUIVALENTS = {
-      "T" => "7", "t" => "7",
-      "E" => "3", "e" => "3",
-      "I" => "1", "i" => "1",
-      "L" => "1", "l" => "1",
-      "O" => "0", "o" => "0",
-      "S" => "5", "s" => "5",
-      "A" => "4", "a" => "4",
-      "G" => "6", "g" => "6",
-      "B" => "8", "b" => "8"
+    ALPHABET_TO_SIMPLE_LEET = {
+      # Uppercase
+      "A" => "4",
+      "B" => "8",
+      "C" => "(",
+      "E" => "3",
+      "F" => "ƒ",
+      "G" => "6",
+      "H" => "#",
+      "I" => "1",
+      "N" => "И",
+      "O" => "0",
+      "R" => "Я",
+      "S" => "5",
+      "T" => "7",
+      "U" => "U",
+      "Y" => "¥",
+      "Z" => "2",
+      # Downcase
+      "a" => "4",
+      "b" => "8",
+      "c" => "(",
+      "e" => "3",
+      "f" => "ƒ",
+      "g" => "6",
+      "h" => "#",
+      "i" => "1",
+      "n" => "и",
+      "o" => "0",
+      "r" => "я",
+      "s" => "5",
+      "t" => "7",
+      "u" => "u",
+      "y" => "¥",
+      "z" => "2"
     }.freeze
 
+    # Reference: https://en.wikipedia.org/wiki/Leet#Table_of_leet-speak_substitutes_for_normal_letters
+    # Excluded leet speak equivalents that has 3 or more characters
+    LEET_TO_ALPHABET = {
+      "4" => "A", "@" => "A", "Д" => "A",
+      "8" => "B", "ß" => "B",
+      "(" => "C", "{" => "C",
+      "3" => "E", "£" => "E", "€" => "E",
+      "ƒ" => "F",
+      "6" => "G", "9" => "G",
+      "#" => "H",
+      "1" => "I", "!" => "I",
+      "И" => "N", "ท" => "N",
+      "0" => "O", "Ø" => "O",
+      "Я" => "R",
+      "5" => "S", "$" => "S",
+      "7" => "T",
+      "พ" => "W", "₩" => "W", "ω" => "W",
+      "¥" => "Y",
+      "2" => "Z"
+    }.freeze
+
+
     def self.leet(given_string)
       new(given_string).leet
     end
 
+    def self.leet?(given_string)
+      new(given_string).leet?
+    end
+
     def self.leet_all(array_of_strings)
       raise ArgumentError, "array_of_strings must be an Array" unless array_of_strings.is_a?(Array)
 
       array_of_strings.map { |string| leet(string) }
     end
 
-    def self.unleeted(given_string)
-      new(given_string).unleeted
+    def self.unleet(given_string)
+      new(given_string).unleet
     end
 
     def self.unleet_all(array_of_strings)
       raise ArgumentError, "array_of_strings must be an Array" unless array_of_strings.is_a?(Array)
 
-      array_of_strings.map { |string| unleeted(string) }
+      array_of_strings.map { |string| unleet(string) }
     end
 
     def initialize(given_string)
@@ -55,7 +106,7 @@ module Passweird
     #
     # @return [String] the converted leet speak string
     def leet
-      given_string.gsub(/[#{LEET_CHAR_EQUIVALENTS.keys.join}]/, LEET_CHAR_EQUIVALENTS)
+      given_string.gsub(/[#{ALPHABET_TO_SIMPLE_LEET.keys.join}]/, ALPHABET_TO_SIMPLE_LEET)
     end
 
     def leet?
@@ -65,8 +116,8 @@ module Passweird
     # Converts the leet speak string back to normal text
     #
     # @return [String] the converted normal text string
-    def unleeted
-      given_string.gsub(/[#{LEET_CHAR_EQUIVALENTS.values.join}]/, LEET_CHAR_EQUIVALENTS.invert)
+    def unleet
+      given_string.upcase.gsub(/[#{LEET_TO_ALPHABET.keys.join}]/, LEET_TO_ALPHABET)
     end
   end
 end

data/lib/passweird/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Passweird
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

data/passweird.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activerecord", "~> 6.0"
+  spec.add_dependency "activerecord", ">= 7.0", "< 8.0"
 
   # For more information and examples about making a new gem, check out our
   # guide at: https://bundler.io/guides/creating_gem.html

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: passweird
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Rupert Señga
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-01-23 00:00:00.000000000 Z
+date: 2025-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '7.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '8.0'
 description:
 email:
 - pertsenga@gmail.com