random-words 1.0.16 → 1.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b39309d58668b2ae045ea68974a6281e6256f65a3810cddb75a808d6484a372
-  data.tar.gz: 67954ff10b5a2dd032bcbd1776444998c69eb5fb4e85bfb890477e9731ca67ed
+  metadata.gz: d01d64360e59eadf8e0578b1ef16d48d40a2eac57184071c45383e3133387f0e
+  data.tar.gz: 33b2fa7b4351254109916d6b5fb313d9e269a891481c172c417b0e333bd7db34
 SHA512:
-  metadata.gz: c507cbb755b641f23b2249e4e989ee11fb65bcc61d628e453bdf6d7fd03f0859f064efe00c38ea848e42674b61b5c2264b51eb0b53e9875d746ec5f7bb8e37dc
-  data.tar.gz: bf006d722b68479d26fc7be323beb6c5cfd9548c4c71a3c63a2c462968df46f2971268ba4cd5c3292f3ed20cbb461c44f99123aed21b487bc1a2c1020f4392b0
+  metadata.gz: 0b707d9517be318b909f9106d14e22bda99789c08918ddaa0a14214a4dded82719285e15b37c413c71d28bec4ea3cff3650f227abe6bd2c5f1110b3afc3bb4bd
+  data.tar.gz: 00cdb6e05557682584a0ec4e5b8ed31b9b527fe8f905fbd481b2b137622c8f3a3651d2628f8ea0bbc799f8aa98ce0dc37e635bb544df9847ae9d3feeb8cbb614

data/CHANGELOG.md

@@ -1,3 +1,24 @@
+### 1.0.18
+
+2025-05-28 07:16
+
+#### IMPROVED
+
+- More templates for sentence structure variety
+
+#### FIXED
+
+- Just remove a/an from articles to avoid article disagreement
+- Remove m-dash from separators as it was causing a double-space bug
+
+### 1.0.17
+
+2025-05-24 10:47
+
+#### FIXED
+
+- More encoding fixes
+
 ### 1.0.16
 
 2025-05-24 09:19

data/bin/randw

@@ -288,7 +288,7 @@ when :sentences
   s = @rw.sentences(@options[:count]).join(" ")
   total[:words] += s.split(/ /).count
   total[:characters] += s.length
-  print s
+  print s.clean_output
   debug "#{s.split(/ /).count}w, #{s.length}c"
   # end
   debug "Total: #{total[:sentences]}s, #{total[:words]}w, #{total[:characters]}c"
@@ -303,18 +303,18 @@ when :paragraphs
     total[:sentences] += p.scan(/[?.!]/).count
     total[:words] += p.split(/ /).count
     total[:characters] += p.length
-    print p
+    print p.clean_output
     debug "#{p.scan(/[?.!]/).count}s, #{p.split(/ /).count}w, #{p.length}c"
     puts "\n\n"
   end
   debug "Total: #{total[:sentences]}s, #{total[:words]}w, #{total[:characters]}c"
 when :words
   w = @rw.words(@options[:count])
-  print w
+  print w.clean_output
   debug "#{w.split(/ /).count}w, #{w.length}c"
 when :characters
   c = @rw.characters(@options[:count], whitespace: @options[:whitespace])
-  print c
+  print c.clean_output
   debug "#{c.split(/ /).count}w, #{c.length}c"
 when :markdown, :html
   settings = markdown_settings(@options[:markdown_settings])
@@ -326,9 +326,9 @@ when :markdown, :html
   settings[:extended] = @rw.use_extended_punctuation
 
   if @options[:method] == :markdown
-    puts @rw.markdown(settings)
+    puts @rw.markdown(settings).clean_output
   else
-    puts @rw.html(settings)
+    puts @rw.html(settings).clean_output
   end
 when :password
   p = @rw.characters(20, whitespace: @options[:whitespace], article: false)

data/lib/random-words/generator.rb

@@ -39,6 +39,58 @@ module RandomWords
     # These parts will be used to generate random sentences and character strings
     SENTENCE_PARTS = %w[random_article random_adjective random_noun random_adverb random_verb random_adjective
                         random_verb random_adverb random_phrase].freeze
+    TEMPLATES = [
+      # Simple declarative
+      %i[random_article random_adjective random_noun random_verb],
+      %i[random_plural_article random_adjective random_plural_noun random_plural_verb],
+
+      # With adverb
+      %i[random_article random_adjective random_noun random_adverb random_verb],
+      %i[random_name random_adverb random_verb],
+
+      # Passive voice
+      %i[random_article random_noun random_passive_verb random_preposition random_article random_noun],
+
+      # With prepositional phrase
+      %i[random_article random_adjective random_noun random_verb random_preposition random_article random_noun],
+
+      # Compound sentence
+      %i[random_article random_noun random_verb random_coordinating_conjunction random_article random_noun random_verb],
+
+      # Subordinate clause
+      %i[random_clause random_article random_noun random_verb],
+
+      # With phrase
+      %i[random_phrase],
+
+      # Name as subject
+      %i[random_name random_verb random_article random_noun],
+
+      # Plural with adverb and preposition
+      %i[random_plural_article random_plural_noun random_adverb random_plural_verb random_preposition random_article random_noun],
+
+      # Coordinating conjunction joining two clauses
+      %i[random_article random_noun random_verb random_coordinating_conjunction random_plural_article random_plural_noun random_plural_verb
+         random_phrase],
+
+      # Subordinate conjunction
+      %i[random_subordinate_conjunction random_article random_noun random_verb random_article random_noun random_verb],
+
+      # With random_adjective and random_adverb in various places
+      %i[random_adverb random_article random_adjective random_noun random_verb],
+      %i[random_article random_noun random_verb random_adverb],
+
+      # Name with phrase
+      %i[random_name random_verb random_phrase],
+
+      # Plural passive
+      %i[random_plural_article random_plural_noun random_passive_verb random_preposition random_article random_noun],
+
+      # Name with subordinate clause
+      %i[random_name random_verb random_subordinate_conjunction random_article random_noun random_verb]
+    ].freeze
+
+    OPTIONAL_PARTS = %i[adjectives adverbs].freeze
 
     # Initialize the generator with a source and options
     # @param source [Symbol] The source of the words (e.g., :english)
@@ -649,13 +701,14 @@ module RandomWords
 
     # Generate a random set of separators
     def random_separators
-      [',', ',', ',', ';', ':', ' —']
+      [',', ',', ',', ';', ':']
     end
 
     # Generate a random separator
     # @return [String] A randomly selected separator
     def random_separator
-      "#{dbg('SEP')}#{random_separators.sample}"
+      sep = random_separators.sample
+      "#{dbg('SEP')}#{sep}"
     end
 
     # Generate a random subordinate conjunction
@@ -726,18 +779,16 @@ module RandomWords
                     "#{random_number_with_plural} #{random_adverb} #{random_plural_verb}"
                   when 4..5
                     random_name
-                  when 6..7
-                    noun = random_noun
-                    "#{random_adverb}, #{random_article_for_word(noun)} #{noun} #{random_verb}"
+                  when 6
+                    "#{random_adverb}, #{random_article_for_word(random_noun)} #{random_noun} #{random_verb}"
                   else
-                    noun = random_noun
-                    adjective = random_adjective
-                    "#{random_article_for_word(adjective)} #{adjective} #{noun} #{random_adverb} #{random_verb}"
+                    TEMPLATES.sample.map { |part| send(part.to_sym) }.join(' ')
                   end
       tail = roll(50) ? " #{random_prepositional_phrase}" : ''
       separator = random_separator
+
       tail += roll(10) ? "#{separator} #{random_clause}" : ''
-      "#{beginning.strip.sub(/[#{Regexp.escape(separator)}]*$/, separator)}#{tail}"
+      "#{beginning.strip.sub(/([#{Regexp.escape(separator)}]|#{Regexp.escape(separator)})*$/, separator)}#{tail}"
     end
 
     # Simplified generate_additional_clauses

data/lib/random-words/lorem_html.rb

@@ -124,8 +124,8 @@ module RandomWords
       items = { short: 4, medium: 8, long: 10, very_long: 12 }[@options[:length]]
 
       if @options[:ul] && @options[:ol]
-        inject_block(1, -> { list(items, :ul) })
-        inject_block(1, -> { list(items, :ol) })
+        inject_block(1, -> { list(items, :ul, rule: true) })
+        inject_block(1, -> { list(items, :ol, rule: true) })
       elsif @options[:ul]
         inject_block(2, -> { list(items, :ul) })
       elsif @options[:ol]
@@ -189,9 +189,10 @@ module RandomWords
     # Generates a list of items.
     # @param [Integer] count The number of items to generate.
     # @param [Symbol] type The type of list to generate (:ul, :ol, :dl).
+    # @param [Boolean] hr whether to add a horizontal rule after list
     #
     # @return [String] The generated list.
-    def list(count, type)
+    def list(count, type, rule: false)
       ul = "\n\n<#{type}>\n"
 
       count.times do
@@ -217,7 +218,9 @@ module RandomWords
           ul += "\t<li>#{long_frag}</li>\n"
         end
       end
-      ul + "</#{type}>\n\n"
+      ul += "</#{type}>\n\n"
+      ul += "<hr>\n\n" if rule
+      ul
     end
 
     # Generates a blockquote.
@@ -376,7 +379,6 @@ module RandomWords
 
       @output = "#{grafs.slice!(0, len).join("\n\n")}\n\n"
 
-      # count = { short: 4, medium: 8, long: 10, very_long: 12 }[@options[:length]]
       @output += block.call
       added = 1
       while grafs.any?

data/lib/random-words/string.rb

@@ -236,6 +236,8 @@ module RandomWords
       new_source = nil
       sources = RandomWords::Generator.new.sources
 
+      return sources.map { |k, v| v.name }.sample if /^(random|any)$/i.match?(self)
+
       sources.each do |_k, v|
         v.names.each do |name|
           next unless /^#{self}/i.match?(name.to_s)
@@ -355,5 +357,9 @@ module RandomWords
         /\A[aeiou]/i.match?(word) ? "an #{word}" : "a #{word}"
       end
     end
+
+    def clean_output
+      encode('iso-8859-1', undef: :replace, invalid: :replace, replace: '').force_encoding('UTF-8')
+    end
   end
 end

data/lib/random-words/version.rb

@@ -1,4 +1,4 @@
 module RandomWords
   # The version of the RandomWords gem.
-  VERSION = '1.0.16'
+  VERSION = '1.0.18'
 end

data/lib/random-words/words/1984/articles-singular.txt

@@ -1,5 +1,3 @@
-a
-an
 the
 each
 every

data/lib/random-words/words/alice/articles-singular.txt

@@ -1,5 +1,3 @@
-a
-an
 the
 each
 every

data/lib/random-words/words/bacon/articles-singular.txt

@@ -1,5 +1,3 @@
-a
-an
 the
 each
 every

data/lib/random-words/words/corporate/articles-singular.txt

@@ -1,5 +1,3 @@
-a
-an
 the
 each
 every

data/lib/random-words/words/doctor/articles-singular.txt

@@ -1,5 +1,3 @@
-a
-an
 the
 each
 every

data/lib/random-words/words/english/articles-singular.txt

@@ -1,5 +1,3 @@
-a
-an
 the
 each
 every

data/lib/random-words/words/foulmouth/articles-singular.txt

@@ -1,5 +1,3 @@
-a
-an
 the
 each
 every

data/lib/random-words/words/hipster/articles-singular.txt

@@ -1,5 +1,3 @@
-a
-an
 the
 each
 every

data/lib/random-words/words/veggie/articles-singular.txt

@@ -1,5 +1,3 @@
-a
-an
 the
 each
 every

data/lib/random-words/words/walken/articles-singular.txt

@@ -1,5 +1,3 @@
-a
-an
 the
 each
 every

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: random-words
 version: !ruby/object:Gem::Version
-  version: 1.0.16
+  version: 1.0.18
 platform: ruby
 authors:
 - Brett Terpstra
@@ -73,6 +73,7 @@ files:
 - lib/random-words/generator.rb
 - lib/random-words/hash.rb
 - lib/random-words/html2markdown.rb
+- lib/random-words/lorem-markdown.rb
 - lib/random-words/lorem_html.rb
 - lib/random-words/number_to_word.rb
 - lib/random-words/numeric.rb