xkpassword 0.3.3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8cef9e3a5c2d5e5b5c1e0fc020c5452cc124e3e2621dbaef3d2e8534a8d32fc7
-  data.tar.gz: d3505fb27f342fd47d4eabe8908be4512548d73c1415370cdf161027cf1ffca3
+  metadata.gz: 9feced30408ade895b492ff621703dd5d6a1cb6f6d4aaa6fe195534a249cb519
+  data.tar.gz: 8f7bde17464c36aba01028a650daaa3e37d357018e5892bd9331384f25068a6a
 SHA512:
-  metadata.gz: 2de3ac2952363281897ba7b7ff0a360ab33a5a1802d0f27df6fe3b8662a68e8ecd20265a21879e172528bee87862e0cfe10e36b05844415fe0c0f273630b8339
-  data.tar.gz: 41ead76491703805aefc73a7a7e9d2351293e59e19d9493e83b4b9886b0aaa18e57101dd10067f1624db3b0764bcdce48bfa7746a30ca97c070e9fbb1c4bb00b
+  metadata.gz: 158d3daab0101987cb7062a907125d80858aa7dbfdea51c6448ade83d4e155e5af31a87e37715ebde7a1965572008d2f56e64d747e53eb21a9a51e66c948d95b
+  data.tar.gz: cfa02254cb10af01efe5387605d9036750c419031e40bb47cb8a2b23f97c4364ba534f66e3629b3b335dc450fb99d965f5827b654e0e5556d81a2f202eae7664

data/Gemfile

@@ -6,4 +6,5 @@ gemspec
 group :development do
   gem 'yard'
   gem 'pry'
+  gem 'rubocop', require: false
 end

data/README.md

@@ -53,7 +53,7 @@ Or install it yourself as:
 ## Usage
 
 You can use this app stand-alone in the command line or include it in any of your Ruby
-applications.
+applications. For a fuller guide to presets and examples, see [doc/README.md](doc/README.md).
 
 ### Comamnd Line
 The commandline application accepts the same collection of configuration options as would
@@ -71,10 +71,7 @@ full list of options.
 require 'xkpassword'
 
 options = {
-  max_length: 8,
-  min_length: 4,
-  separator: '-',
-  words: 4,
+  preset: :security,
 }
 
 XKPassword.generate(options)
@@ -87,10 +84,7 @@ the following as then it will only load and parse the databse once.
 require 'xkpassword/generator'
 
 options = {
-  max_length: 8,
-  min_length: 4,
-  separator: '-',
-  words: 4,
+  preset: :wifi,
 }
   
 generator = XKPassword::Generator.new
@@ -99,15 +93,18 @@ generator.generate(options)
 # 10.times { generator.generate(options) }
 ```
 
-## The GEM
+`preset` supports `:xkcd` (default), `:web32`, `:wifi`, `:security`, and `:apple_id`.
+You can still override any individual option in the selected preset.
+
+The default `:xkcd` preset keeps the gem's original behavior of generating 4 words.
 
-I run a policy of tagging any improvement done for the code base. For example, I just
-bumped a minor (resulting 0.2.3 ~> 0.3.0) for adding Travis CI which doesn't change any
-functional aspect of the app.
+`case_transform` supports `:upcase`, `:downcase`, and `:capitalize`, and applies the
+selected transform to every generated word in the password.
 
-I am thinking of releasing gems only on functional updates (real code changes) that
-happen with new features and bug fixes. So for now, there will be no 0.3.0v available
-in Ruby GEMs and the latest would be 0.2.3.
+## The GEM
+
+Releases are intended for functional updates such as new features and bug fixes.
+Check the Git tags or RubyGems release history for the latest published version.
 
 ## Development
 
@@ -140,4 +137,3 @@ conduct.
 ## License
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
-

data/exe/xkpassword

@@ -39,10 +39,10 @@ OptionParser.new do |opts|
   opts.on('--min-length [INTEGER]', 'Minimum length of a word') { |min| options[:min_length] = min.to_i }
   opts.on('--max-length [INTEGER]', 'Maximum length of a word') { |max| options[:max_length] = max.to_i }
   opts.on('--separator [STRING]', 'The separator to separate password') { |separator| options[:separator] = separator }
+  opts.on('--case-transform [STRING]', 'Transform each word using upcase, downcase, or capitalize') { |case_transform| options[:case_transform] = case_transform }
+  opts.on('--preset [STRING]', 'Preset to use: xkcd, web32, wifi, security, or apple_id') { |preset| options[:preset] = preset }
 end.parse!
 
 puts message if options[:info]
 puts XKPassword::VERSION if options[:version]
 puts XKPassword.generate(options) if !options[:info] && !options[:version]
-
-

data/lib/xkpassword/generator.rb

@@ -2,15 +2,60 @@ require 'xkpassword/words'
 
 # The Generator class which finds words based on the requirement and using the provided options to build a
 # new random passowrd.
+# Presets provide convenient defaults for common password styles, and callers can override any
+# preset-derived value by passing explicit generation options.
 # 
 # @attr_reader [XKPassword::Words] words  A word database that gen provide you words for the length required
 class XKPassword::Generator
-  DEFAULTS = {
-    max_length: 8,
-    min_length: 4,
-    separator: '-',
-    words: 4,
+  # The preset used when `:preset` is omitted.
+  DEFAULT_PRESET = :xkcd
+
+  # Built-in password presets.
+  #
+  # - `:xkcd` generates 4 words between 4 and 8 letters separated by `-`, preserving the gem's
+  #   original default behavior.
+  # - `:web32` generates 4 shorter words between 4 and 5 letters separated by `-`.
+  # - `:wifi` generates 6 words between 4 and 8 letters separated by `-`.
+  # - `:security` generates 6 lowercase words between 4 and 8 letters separated by spaces.
+  # - `:apple_id` generates 3 words between 4 and 7 letters separated by `-`.
+  PRESETS = {
+    xkcd: {
+      case_transform: nil,
+      max_length: 8,
+      min_length: 4,
+      separator: '-',
+      words: 4,
+    },
+    web32: {
+      case_transform: nil,
+      max_length: 5,
+      min_length: 4,
+      separator: '-',
+      words: 4,
+    },
+    wifi: {
+      case_transform: nil,
+      max_length: 8,
+      min_length: 4,
+      separator: '-',
+      words: 6,
+    },
+    security: {
+      case_transform: :downcase,
+      max_length: 8,
+      min_length: 4,
+      separator: ' ',
+      words: 6,
+    },
+    apple_id: {
+      case_transform: nil,
+      max_length: 7,
+      min_length: 4,
+      separator: '-',
+      words: 3,
+    },
   }
+  VALID_CASE_TRANSFORMS = [:upcase, :downcase, :capitalize]
 
   attr_reader :words
 
@@ -19,38 +64,96 @@ class XKPassword::Generator
   end
 
   # Generates a password absed on the configuration provided.
+  # A preset supplies a base configuration and any explicit options passed in `options` override
+  # those preset defaults.
   #
   # @param [Hash] options The options to populate a generator
+  # @option options [String, Symbol] :preset The preset to use. Supports `:xkcd`, `:web32`,
+  #                                          `:wifi`, `:security`, and `:apple_id`.
+  #                                          String values like `"apple_id"` and `"apple-id"`
+  #                                          are normalized to `:apple_id`. Defaults to `:xkcd`.
   # @option options [Integer] :words      The number of words to include in the generated password
   # @option options [String]  :separator  The separator symbol to use joining words used in password
   # @option options [Integer] :min_length The minimum length of a word to be used in the process
   # @option options [Integer] :max_length The maximum length of a word to be used in the process
+  # @option options [String, Symbol] :case_transform The transform to apply to every generated word
   #
   # @return [String]                      The generated password
   #
-  # @example Populating the method with all options (current default)
+  # @example Using the default xkcd preset
+  #   generator = XKPassword::Generator.new
+  #   generator.generate
+  #
+  # @example Using the security preset
+  #   generator = XKPassword::Generator.new
+  #   generator.generate(preset: :security)
+  #
+  # @example Populating the method with a preset and explicit overrides
   #   options = {
+  #     preset: :security,
   #     separator: ' ',
-  #     words: 4,
+  #     words: 6,
   #     min_length: 4,
-  #     max_length: 8
+  #     max_length: 8,
+  #     case_transform: :downcase
   #   }
   #
   #   generator = XKPassword::Generator.new
   #   generator.generate(options)
+  #
+  # @example Built-in preset defaults
+  #   :xkcd     # 4 words, 4..8 letters, "-" separator, random per-word uppercasing
+  #   :web32    # 4 words, 4..5 letters, "-" separator, random per-word uppercasing
+  #   :wifi     # 6 words, 4..8 letters, "-" separator, random per-word uppercasing
+  #   :security # 6 words, 4..8 letters, " " separator, lowercase
+  #   :apple_id # 3 words, 4..7 letters, "-" separator, random per-word uppercasing
   def generate(options = nil)
-    options ||= {}
-    options = DEFAULTS.merge(options)
+    options = (options || {}).dup
+    preset = normalize_preset(options.delete(:preset))
+    options = PRESETS.fetch(preset).merge(options)
+    case_transform = normalize_case_transform(options[:case_transform])
     length_vals = (options[:min_length]..options[:max_length]).to_a
 
     data = options[:words].times.map do
       word = words.random(length_vals.sample)
-      upcase = [true, false].sample
-      word = word.upcase if upcase
-      word
+      transform_word(word, case_transform)
     end
     
     data.join(options[:separator])
   end
-  
+
+  private
+
+  def transform_word(word, case_transform)
+    return randomly_upcase(word) unless case_transform
+
+    word.public_send(case_transform)
+  end
+
+  def randomly_upcase(word)
+    upcase = [true, false].sample
+    word = word.upcase if upcase
+    word
+  end
+
+  def normalize_case_transform(case_transform)
+    return nil if case_transform.nil?
+
+    case_transform = case_transform.to_sym if case_transform.is_a?(String)
+
+    return case_transform if VALID_CASE_TRANSFORMS.include?(case_transform)
+
+    fail ArgumentError, "case_transform should be one of: #{ VALID_CASE_TRANSFORMS.join(', ') }"
+  end
+
+  def normalize_preset(preset)
+    return DEFAULT_PRESET if preset.nil?
+
+    preset = preset.strip.downcase.tr(' -', '_').to_sym if preset.is_a?(String)
+
+    return preset if PRESETS.key?(preset)
+
+    fail ArgumentError, "preset should be one of: #{ PRESETS.keys.join(', ') }"
+  end
+
 end

data/lib/xkpassword/version.rb

@@ -1,3 +1,3 @@
 module XKPassword
-  VERSION = '0.3.3'
+  VERSION = '0.5.0'
 end

data/lib/xkpassword.rb

@@ -7,11 +7,29 @@ module XKPassword
   # use the `XKPassword::Generator` class as it will be faster since it will only need to load
   # the dictionary once.
   #
+  # Presets provide named defaults for common password styles, and any explicit options passed to
+  # this method override the selected preset.
+  #
   # @param [Hash] options The options to populate a generator
+  # @option options [String, Symbol] :preset The preset to use. Supports `:xkcd`, `:web32`,
+  #                                          `:wifi`, `:security`, and `:apple_id`.
+  #                                          Defaults to `:xkcd`.
+  #                                          - `:xkcd` uses 4 words of 4..8 letters joined by `-`
+  #                                          - `:web32` uses 4 words of 4..5 letters joined by `-`
+  #                                          - `:wifi` uses 6 words of 4..8 letters joined by `-`
+  #                                          - `:security` uses 6 lowercase words of 4..8 letters joined by spaces
+  #                                          - `:apple_id` uses 3 words of 4..7 letters joined by `-`
   # @option options [Integer] :words      The number of words to include in the generated password
   # @option options [String]  :separator  The separator symbol to use joining words used in password
   # @option options [Integer] :min_length The minimum length of a word to be used in the process
   # @option options [Integer] :max_length The maximum length of a word to be used in the process
+  # @option options [String, Symbol] :case_transform The transform to apply to every generated word
+  #
+  # @example Generate with the default preset
+  #   XKPassword.generate
+  #
+  # @example Generate with a preset and override one of its defaults
+  #   XKPassword.generate(preset: :apple_id, separator: '.')
   def self.generate(options = nil)
     generator = XKPassword::Generator.new
     generator.generate(options)
@@ -21,5 +39,3 @@ end
 
 require 'xkpassword/version'
 require 'xkpassword/generator'
-
-

data/mise.toml

@@ -0,0 +1,14 @@
+[tools]
+ruby = "3.3"
+
+[tasks.test]
+description = "Run the test suite"
+run = "bundle exec rspec"
+
+[tasks.format]
+description = "Format and lint the code with RuboCop"
+run = "bundle exec rubocop -a"
+
+[tasks.publish]
+description = "Build and publish the gem to RubyGems"
+run = "bundle exec rake release"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xkpassword
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.5.0
 platform: ruby
 authors:
 - Ziyan Junaideen
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-25 00:00:00.000000000 Z
+date: 2026-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: artii
@@ -81,8 +81,6 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
-- ".ruby-gemset"
-- ".ruby-version"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -99,6 +97,7 @@ files:
 - lib/xkpassword/store.rb
 - lib/xkpassword/version.rb
 - lib/xkpassword/words.rb
+- mise.toml
 - xkpassword.gemspec
 homepage: https://github.com/jdeen/xkpassword
 licenses:
@@ -119,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: Hard to crack - XKPassword Generator for Ruby

data/.ruby-gemset

@@ -1 +0,0 @@
-xkpassword_gem

data/.ruby-version

@@ -1 +0,0 @@
-2.3.0