random-words 1.0.17 → 1.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb7dd16845d6ce75d9f10a8e5005636cf13e4060965273bf305ce34980975d95
-  data.tar.gz: ff992ec57cc8cddcad1fa016a25929ecbc5c4d124601e6873f9f5e634c503be3
+  metadata.gz: d01d64360e59eadf8e0578b1ef16d48d40a2eac57184071c45383e3133387f0e
+  data.tar.gz: 33b2fa7b4351254109916d6b5fb313d9e269a891481c172c417b0e333bd7db34
 SHA512:
-  metadata.gz: ac1670432a510e98b3b91bca1fdcc0eb7aefa58a9d0b98b50e28a8e0d4848e93866fcc9b2f9e7c6347a66ef4bb579904db3bc71424be9baf47fcda64c4375543
-  data.tar.gz: 61b5b0d50ca33fe03da311c69e63f318fb0585c35cb6b3a39185a3c4c149b63f2c92d5ccaecd83db86b669cb7ac3693d50e0fd596ff09fbd095ad5e526857059
+  metadata.gz: 0b707d9517be318b909f9106d14e22bda99789c08918ddaa0a14214a4dded82719285e15b37c413c71d28bec4ea3cff3650f227abe6bd2c5f1110b3afc3bb4bd
+  data.tar.gz: 00cdb6e05557682584a0ec4e5b8ed31b9b527fe8f905fbd481b2b137622c8f3a3651d2628f8ea0bbc799f8aa98ce0dc37e635bb544df9847ae9d3feeb8cbb614

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+### 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

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/version.rb

@@ -1,4 +1,4 @@
 module RandomWords
   # The version of the RandomWords gem.
-  VERSION = '1.0.17'
+  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.17
+  version: 1.0.18
 platform: ruby
 authors:
 - Brett Terpstra