random-words 1.0.12 → 1.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2d912535417fcff1c87d761381383f776bbf8f80fcc8dea66aa246768cab424
-  data.tar.gz: 1612bc59a7c8dc89b22812f597bf24be952707c382358eff61675e88dc429386
+  metadata.gz: 31da4c2eaac6cfdd53576f5453621759a9f17d36dc68abca44d4d70abeb281f8
+  data.tar.gz: 436e1f6aa43654687fb2eb2a7920446ee1ab0815bb1d8d6508cd25e423e9998a
 SHA512:
-  metadata.gz: 3a7a84b18d023cec1cf90accb12d3716bc2a61040e58bbcf152c08ca04fda1db586781e5db0fda082b1ec43ee9509bd057eb35292a0eaf895956833f98986e24
-  data.tar.gz: 64b04ae1a6f5039acffffe3c29c6ee1ce33f97efd9d357f23f2125c69418648ea3703afe0f241ca6cbc7cc851d9fb0ce5dabfd304c9d041135842e99ca7a3b72
+  metadata.gz: f643e4685954135a314fe45835320b316fd68a04edc4d41dd4a6bc5cd13041f1cd79816e3453ab83db048f295bba5dfa514a67e7cd5b1bd088374149804ac08a
+  data.tar.gz: b934b0cf6d354b513e8c7d58d7b272576054c8ac256fd704711f28a9f2bceed1951a50971e4ab0604fafb5710dc96fffb39465ce7f971b7b0b45b0081edfeefc

data/.rubocop.yml

@@ -2,6 +2,7 @@ inherit_from: .rubocop_todo.yml
 
 AllCops:
   NewCops: enable
+  SuggestExtensions: false
 
 # Offense count: 3
 # This cop supports safe autocorrection (--autocorrect).
@@ -21,35 +22,27 @@ Lint/UselessAssignment:
 # Offense count: 3
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
 Metrics/AbcSize:
-  Max: 39
-
-# Offense count: 1
-# Configuration parameters: CountComments, CountAsOne.
-Metrics/ClassLength:
-  Max: 350
+  Max: 60
+  Exclude:
+    - 'lib/random-words/lorem_html.rb'
+    - 'lib/random-words/html2markdown.rb'
 
 # Offense count: 2
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/CyclomaticComplexity:
-  Max: 10
-
-# Offense count: 3
-# Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
-Metrics/MethodLength:
-  Max: 50
+  Max: 20
+  Exclude:
+    - 'lib/random-words/html2markdown.rb'
 
 # Offense count: 1
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/PerceivedComplexity:
-  Max: 11
-
-# Offense count: 1
-# Configuration parameters: AllowedConstants.
-Style/Documentation:
+  Max: 20
   Exclude:
-    - 'spec/**/*'
-    - 'test/**/*'
-    - 'lib/random-words/string.rb'
+    - 'lib/random-words/html2markdown.rb'
+
+Metrics/ParameterLists:
+  Max: 10
 
 # Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
@@ -63,18 +56,14 @@ Style/SpecialGlobalVars:
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns, SplitStrings.
 # URISchemes: http, https
 Layout/LineLength:
-  Max: 135
+  Max: 150
   Exclude:
     - bin/randw
 
 Metrics/MethodLength:
-  Max: 50
+  Max: 100
   Exclude:
-    - lib/random-words/generator.rb
-    - lib/random-words/lorem-markdown.rb
-    - lib/random-words/string.rb
-    - lib/random-words/table-cleanup.rb
-    - lib/random-words/html2markdown.rb
+    - 'lib/random-words/html2markdown.rb'
 
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
@@ -100,16 +89,6 @@ Layout/EndAlignment:
   Exclude:
     - 'bin/randw'
 
-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: Max, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns, SplitStrings.
-# URISchemes: http, https
-Layout/LineLength:
-  Exclude:
-    - 'bin/randw'
-    - 'lib/random-words/generator.rb'
-    - 'random-words.gemspec'
-
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
 Lint/AmbiguousOperatorPrecedence:
@@ -149,63 +128,16 @@ Lint/UselessConstantScoping:
   Exclude:
     - 'lib/random-words/generator.rb'
 
-# Offense count: 12
-# Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes, Max.
-Metrics/AbcSize:
-  Exclude:
-    - 'bin/randw'
-    - 'lib/random-words/config.rb'
-    - 'lib/random-words/generator.rb'
-    - 'lib/random-words/html2markdown.rb'
-    - 'lib/random-words/lorem-markdown.rb'
-    - 'lib/random-words/source.rb'
-    - 'lib/random-words/table-cleanup.rb'
-
 # Offense count: 19
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 # AllowedMethods: refine
 Metrics/BlockLength:
-  Max: 250
+  Max: 300
 
 # Offense count: 1
 # Configuration parameters: CountComments, Max, CountAsOne.
 Metrics/ClassLength:
-  Exclude:
-    - 'lib/random-words/generator.rb'
-
-# Offense count: 9
-# Configuration parameters: AllowedMethods, AllowedPatterns, Max.
-Metrics/CyclomaticComplexity:
-  Exclude:
-    - 'bin/randw'
-    - 'lib/random-words/array.rb'
-    - 'lib/random-words/config.rb'
-    - 'lib/random-words/generator.rb'
-    - 'lib/random-words/html2markdown.rb'
-    - 'lib/random-words/lorem-markdown.rb'
-    - 'lib/random-words/table-cleanup.rb'
-
-# Offense count: 2
-# Configuration parameters: CountComments, Max, CountAsOne, AllowedMethods, AllowedPatterns.
-Metrics/MethodLength:
-  Exclude:
-    - 'bin/randw'
-    - 'lib/random-words/html2markdown.rb'
-
-# Offense count: 1
-# Configuration parameters: CountKeywordArgs, MaxOptionalParameters.
-Metrics/ParameterLists:
-  Max: 7
-
-# Offense count: 7
-# Configuration parameters: AllowedMethods, AllowedPatterns, Max.
-Metrics/PerceivedComplexity:
-  Exclude:
-    - 'lib/random-words/array.rb'
-    - 'lib/random-words/generator.rb'
-    - 'lib/random-words/html2markdown.rb'
-    - 'lib/random-words/lorem-markdown.rb'
-    - 'lib/random-words/table-cleanup.rb'
+  Max: 500
 
 # Offense count: 3
 # Configuration parameters: ExpectMatchingDefinition, CheckDefinitionPathHierarchy, CheckDefinitionPathHierarchyRoots, Regex, IgnoreExecutableScripts, AllowedAcronyms.

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+### 1.0.13
+
+2025-04-28 07:25
+
+#### NEW
+
+- Christopher Walken dictionary
+
+#### IMPROVED
+
+- Code cleanup
+
+#### FIXED
+
+- CLI outputting debug errantly
+
 ### 1.0.12
 
 2025-04-25 07:23

data/bin/randw

@@ -155,7 +155,7 @@ OptionParser.new do |opts|
 end.parse!
 
 def debug(msg)
-  return unless @options[:debug]
+  return unless @options[:debug] && @options[:debug_level]&.positive?
 
   # length = msg.length
   # message = RandomWords::Terminal.new.colorize_text(msg, :boldblack)
@@ -331,23 +331,36 @@ when :markdown, :html
     puts @rw.html(settings)
   end
 when :password
-  p = @rw.characters(20, whitespace: @options[:whitespace])
+  p = @rw.characters(20, whitespace: @options[:whitespace], article: false)
 
-  m = p.match(/[oleats]/i)
+  m = p.match(/[olzeasbtg]/i)
   if m
     num_char = m.begin(0)
-    char = m[0].tr("oleats", "013475")
+    char = m[0].tr("olzeasbtbg", "0123456789")
   else
     num_char = p.length
-    char = rand(10).to_s
+    char = rand(9).to_s
   end
   p[num_char] = char
 
-  cap_char = rand(20)
-  cap_char = rand(20) while p[cap_char] !~ /[a-z]/
+  m = p.match(/[hcigatsbp]/i)
+  if m
+    sp_char = m.begin(0)
+    char = m[0].tr("hcigatsbp", "#<!&@+$>?")
+  end
+  p[sp_char] = char
+
+  cap_char = rand(19)
+  cap_char = rand(19) while p[cap_char] !~ /[a-z]/
   p[cap_char] = p[cap_char].upcase
 
-  tail_char = /[^a-z0-9]/i.match?(p) ? "" : %w[! @ # $ % ^ & * ( ) _ + - = ; : < > , . ? /].sample
+  special = %w[! @ # $ % ^ & * ( ) _ + - = ; : < > , . ? /]
+
+  tail_char = if special.include?(@options[:separator]) || p =~ /#{Regexp.union(special)}/
+                ''
+              else
+                /[^a-z0-9 ]/i.match?(p) ? "" : special.sample
+              end
 
   print p.gsub(/ /, @options[:separator]) + tail_char
   debug "#{p.split(@options[:separator]).count}w, #{p.length}c"
@@ -355,5 +368,6 @@ when :test
   t = RandomWords::Terminal.new(@options[:source])
   t.print_test
 else
-  puts "Please specify a valid method: sentences, paragraphs, words, or characters."
+  puts "Please specify a valid method: "
+  puts "sentences, paragraphs, words, characters, password, markdown, html"
 end

data/generator.cgi

@@ -0,0 +1,155 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require 'cgi'
+require 'uri'
+
+require 'rubygems'
+require 'random-words'
+
+# Main script execution
+
+if __FILE__ == $PROGRAM_NAME
+  def param?(param)
+    # Returns true if the parameter is present.
+    @params.key?(param) && @params[param][0].trueish?
+  end
+
+  def markdown_settings(settings)
+    base_config = RandomWords::Config.new(:latin).config
+
+    defaults = {
+      source: base_config[:source].is_a?(String) ? base_config[:source].to_source : base_config[:source],
+      grafs: 10,
+      sentences: base_config[:paragraph_length],
+      length: base_config[:sentence_length],
+      decorate: false,
+      link: false,
+      ul: false,
+      ol: false,
+      dl: false,
+      bq: false,
+      code: false,
+      mark: false,
+      headers: false,
+      table: false,
+      extended: false,
+      footnote: false,
+      hr: false,
+      meta_type: nil,
+      complete: false,
+      style: 'style.css'
+    }
+    sources = []
+    RandomWords::Generator.new(:latin).sources.each { |k, v| sources.concat(v.names.map(&:to_s)) }
+
+    markdown_options = defaults.dup
+    settings = settings.split(%r{[,/\|]}).map(&:strip)
+
+    settings.each do |setting|
+      case setting
+      when /^all$/
+        new_options = {
+          decorate: true,
+          link: true,
+          ul: true,
+          ol: true,
+          dl: true,
+          bq: true,
+          code: true,
+          mark: true,
+          headers: true,
+          image: true,
+          table: true,
+          extended: true,
+          footnote: true,
+          hr: true
+        }
+        markdown_options.merge!(new_options)
+      when Regexp.union(sources)
+        markdown_options[:source] = setting.to_source
+      when /^\d+$/
+        markdown_options[:grafs] = setting.to_i
+      when 'dec', 'decorate'
+        markdown_options[:decorate] = true
+      when 'link'
+        markdown_options[:link] = true
+      when 'ul'
+        markdown_options[:ul] = true
+      when 'ol'
+        markdown_options[:ol] = true
+      when 'dl'
+        markdown_options[:dl] = true
+      when 'bq', 'blockquote'
+        markdown_options[:bq] = true
+      when 'code'
+        markdown_options[:code] = true
+      when 'mark'
+        markdown_options[:mark] = true
+      when 'header', 'h'
+        markdown_options[:headers] = true
+      when 'table', 't'
+        markdown_options[:table] = true
+      when 'short', 's', 'medium', 'med', 'm', 'long', 'l', 'very_long', 'vl'
+        markdown_options[:length] = setting.to_length
+      when 'x', 'extended'
+        markdown_options[:extended] = true
+      when 'fn', 'footnotes'
+        markdown_options[:footnote] = true
+      when 'img', 'image'
+        markdown_options[:image] = true
+      when 'hr'
+        markdown_options[:hr] = true
+      when 'comp', 'complete'
+        markdown_options[:complete] = true
+      when /^(style|css):(.*)$/i
+        markdown_options[:style] = Regexp.last_match(2)
+      when /^meta:(.*?)$/i
+        case Regexp.last_match(1)
+        when 'mmd', 'multimarkdown'
+          markdown_options[:meta_type] = :multimarkdown
+        when 'yaml'
+          markdown_options[:meta_type] = :yaml
+        end
+      else
+        markdown_options[:source] = setting.to_source
+      end
+    end
+
+    markdown_options
+  end
+
+  cgi = CGI.new
+  args = ENV.fetch('REQUEST_URI', nil)
+  args = args.sub(%r{^/md-lipsum/api/4}, '') unless args.nil?
+  args = 'all' if args.nil?
+
+  settings = markdown_settings(args)
+  @rw.source = settings[:source]
+  @rw.sentence_length = settings[:length] || :medium
+  @rw.paragraph_length = settings[:sentences] || 5
+
+  @rw.use_extended_punctuation = settings[:extended] ? true : false
+  settings[:extended] = @rw.use_extended_punctuation
+
+  @params = cgi.params
+  settings[:complete] = true if param?('complete')
+  settings[:style] = @params['style'][0] if @params.key?('style')
+  # credit = "\n\n<!-- Generated by [md-lipsum](https://brettterpstra.com/md-lipsum/) -->\n"
+
+  settings[:source] = @params['source'][0].to_source if @params.key?('source')
+
+  if param?('html') || param?('preview') || param?('complete')
+    if param?('preview')
+      print cgi.header('type' => 'text/html', 'expires' => Time.now - 180)
+      puts @rw.html(settings)
+    else
+      print cgi.header('type' => 'text/plain', 'expires' => Time.now - 180)
+      puts @rw.html(settings)
+    end
+  else
+    print cgi.header('type' => 'text/plain', 'expires' => Time.now - 180)
+
+    puts @rw.markdown(settings)
+  end
+end

data/lib/random-words/array.rb

@@ -34,8 +34,6 @@ module RandomWords
       first_names = []
       last_names = []
       full_names = []
-      first_names_ended = false
-      last_names_ended = false
 
       sections = [[]]
       idx = 0

data/lib/random-words/boolean.rb

@@ -57,4 +57,4 @@ module RandomWords
       true
     end
   end
-end
+end

data/lib/random-words/config.rb

@@ -34,9 +34,6 @@ module RandomWords
     # Source directory for languages
     attr_reader :source_dir
 
-    # Base config
-    attr_reader :config
-
     # Initialize the config with the given language
     # @param lang [Symbol] The language to use
     # @raise [RuntimeError] if no dictionary is found for the given language
@@ -117,7 +114,9 @@ module RandomWords
     # @return [Symbol, nil] The language symbol if successful, nil otherwise
     def create_user_dictionary(lang = nil)
       return lang.to_sym if File.directory?(File.join(config_dir, 'words',
-                                                      lang)) && all_parts_of_speech?(File.join(config_dir, 'words', lang), lang)
+                                                      lang)) && all_parts_of_speech?(
+                                                        File.join(config_dir, 'words', lang), lang
+                                                      )
 
       lang_dir = File.join(config_dir, 'words', lang)
 
@@ -153,7 +152,8 @@ module RandomWords
         warn "Created #{target_file}"
       end
 
-      unless all_parts_of_speech?(lang_dir, lang) || (RandomWords.testing && !RandomWords.tested.include?('create_user_dictionary'))
+      unless all_parts_of_speech?(lang_dir,
+                                  lang) || (RandomWords.testing && !RandomWords.tested.include?('create_user_dictionary'))
         return
       end
 
@@ -212,7 +212,7 @@ module RandomWords
         source: configuration[:source].to_source || :latin,
         sentence_length: configuration[:length].to_length || :medium,
         paragraph_length: configuration[:paragraph_length].to_i || 5,
-        use_extended_punctuation: (ext_punc && ext_punc.trueish?) || false
+        use_extended_punctuation: ext_punc&.trueish? || false
       }
     end
 

data/lib/random-words/generator.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+# !/usr/bin/env ruby
 # frozen_string_literal: true
 
 # Random Sentence Generator
@@ -92,7 +92,7 @@ module RandomWords
     end
 
     # Display debug message
-    def debug(msg)
+    def dbg(msg)
       return unless @debug
 
       "%#{msg}%"
@@ -241,7 +241,7 @@ module RandomWords
       result = SENTENCE_PARTS.cycle.take(number).map { |part| send(part.to_sym) }.take(number)
       result.map do |word|
         word.split(/ /).last
-      end.join(' ').compress
+      end.join(' ').article_agree.compress
     end
 
     # Generate a series of random words up to a specified length
@@ -254,7 +254,7 @@ module RandomWords
     #   characters(50) # Generates a string with at least 50 characters
     #   characters(50, 100) # Generates a string with between 50 and 100 characters
     #   characters(50, whole_words: false) # Generates a string with 50 characters allowing word truncation
-    def characters(min, max = nil, whole_words: true, whitespace: true, dead_switch: 0)
+    def characters(min, max = nil, whole_words: true, whitespace: true, article: true, dead_switch: 0)
       result = ''
       max ||= min
       raise ArgumentError, 'Infinite loop detected' if dead_switch > 40
@@ -262,7 +262,7 @@ module RandomWords
       whole_words = false if dead_switch > 15
 
       space = whitespace ? ' ' : ''
-      current_part = 0
+      current_part = article ? 0 : 1
       while result.length < max && result.length < min
         word = send(SENTENCE_PARTS[current_part].to_sym)
         word.gsub!(/ +/, '') unless whitespace
@@ -342,7 +342,6 @@ module RandomWords
       code_langs[Random.rand(code_langs.count)]
     end
 
-    # rubocop:disable Layout/LineLength
     # Return random code snippet
     # @param lang [Symbol] The language of the code snippet
     # @return [String] A randomly generated code snippet
@@ -360,7 +359,6 @@ module RandomWords
       lang ||= code_lang
       code_snippets[lang.to_sym]
     end
-    # rubocop:enable Layout/LineLength
 
     # Generate random markdown
     # @param settings [Hash] Settings for generating markdown
@@ -406,7 +404,7 @@ module RandomWords
     # Generate a random name
     # @return [String] A randomly generated name
     def name
-      "#{debug('NAM')}#{random_name}"
+      "#{dbg('NAM')}#{random_name}"
     end
 
     private
@@ -539,7 +537,7 @@ module RandomWords
     # @example
     #  random_conjunction # Returns a random conjunction
     def random_conjunction
-      "#{debug('COC')}#{coordinating_conjunctions.sample}"
+      "#{dbg('COC')}#{coordinating_conjunctions.sample}"
     end
 
     # Generate a random number with a plural noun
@@ -556,65 +554,65 @@ module RandomWords
                end
       if num == 1 || (RandomWords.testing && !RandomWords.tested.include?('random_noun'))
         RandomWords.tested << 'random_noun' if RandomWords.testing
-        "#{debug('NUM')}#{number} #{random_noun}"
+        "#{dbg('NUM')}#{number} #{random_noun}"
       else
         RandomWords.tested << 'random_plural_noun' if RandomWords.testing
-        "#{debug('NUM')}#{number} #{random_plural_noun}"
+        "#{dbg('NUM')}#{number} #{random_plural_noun}"
       end
     end
 
     # Generate a random phrase
     # @return [String] A randomly selected phrase
     def random_phrase
-      "#{debug('PHR')}#{phrases.sample}"
+      "#{dbg('PHR')}#{phrases.sample}"
     end
 
     # Generate a random noun
     # @return [String] A randomly selected noun
     def random_noun
-      "#{debug('NOU')}#{nouns.sample}"
+      "#{dbg('NOU')}#{nouns.sample}"
     end
 
     # Generate a random plural noun
     # @return [String] A randomly selected plural noun
     def random_plural_noun
-      "#{debug('PLN')}#{plural_nouns.sample}"
+      "#{dbg('PLN')}#{plural_nouns.sample}"
     end
 
     # Generate a random verb
     # @return [String] A randomly selected verb
     def random_verb
-      "#{debug('VER')}#{verbs.sample}"
+      "#{dbg('VER')}#{verbs.sample}"
     end
 
     # Generate a random plural verb
     # @return [String] A randomly selected plural verb
     def random_plural_verb
-      "#{debug('PLV')}#{plural_verbs.sample}"
+      "#{dbg('PLV')}#{plural_verbs.sample}"
     end
 
     # Generate a random passive verb
     # @return [String] A randomly selected passive verb
     def random_passive_verb
-      "#{debug('PAV')}#{passive_verbs.sample}"
+      "#{dbg('PAV')}#{passive_verbs.sample}"
     end
 
     # Generate a random adverb
     # @return [String] A randomly selected adverb
     def random_adverb
-      "#{debug('ADV')}#{adverbs.sample}"
+      "#{dbg('ADV')}#{adverbs.sample}"
     end
 
     # Generate a random adjective
     # @return [String] A randomly selected adjective
     def random_adjective
-      "#{debug('ADJ')}#{adjectives.sample}"
+      "#{dbg('ADJ')}#{adjectives.sample}"
     end
 
     # Generate a random article
     # @return [String] A randomly selected article
     def random_article
-      "#{debug('ART')}#{articles.rotate[0]}"
+      "#{dbg('ART')}#{articles.rotate[0]}"
     end
 
     # Generate a random article for a noun
@@ -640,13 +638,13 @@ module RandomWords
     # Generate a random plural article
     # @return [String] A randomly selected plural article
     def random_plural_article
-      "#{debug('PLA')}#{plural_articles.rotate[0]}"
+      "#{dbg('PLA')}#{plural_articles.rotate[0]}"
     end
 
     # Generate a random clause
     # @return [String] A randomly selected clause
     def random_clause
-      "#{debug('CLA')}#{clauses.sample}"
+      "#{dbg('CLA')}#{clauses.sample}"
     end
 
     # Generate a random set of separators
@@ -657,25 +655,25 @@ module RandomWords
     # Generate a random separator
     # @return [String] A randomly selected separator
     def random_separator
-      "#{debug('SEP')}#{random_separators.sample}"
+      "#{dbg('SEP')}#{random_separators.sample}"
     end
 
     # Generate a random subordinate conjunction
     # @return [String] A randomly selected subordinate conjunction
     def random_subordinate_conjunction
-      "#{debug('SUC')}#{subordinate_conjunctions.rotate[0]}"
+      "#{dbg('SUC')}#{subordinate_conjunctions.rotate[0]}"
     end
 
     # Generate a random coordinating conjunction
     # @return [String] A randomly selected coordinating conjunction
     def random_coordinating_conjunction
-      "#{debug('COC')}#{coordinating_conjunctions.rotate[0]}"
+      "#{dbg('COC')}#{coordinating_conjunctions.rotate[0]}"
     end
 
     # Generate a random preposition
     # @return [String] A randomly selected preposition
     def random_preposition
-      "#{debug('PRE')}#{prepositions.rotate[0]}"
+      "#{dbg('PRE')}#{prepositions.rotate[0]}"
     end
 
     # Generate a random prepositional phrase
@@ -692,7 +690,7 @@ module RandomWords
                  "#{random_article_for_word(noun)} #{noun}"
                end
 
-      "#{debug('PRP')}#{preposition} #{phrase}"
+      "#{dbg('PRP')}#{preposition} #{phrase}"
     end
 
     # Generate a random terminator