random-words 1.0.16 → 1.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b39309d58668b2ae045ea68974a6281e6256f65a3810cddb75a808d6484a372
-  data.tar.gz: 67954ff10b5a2dd032bcbd1776444998c69eb5fb4e85bfb890477e9731ca67ed
+  metadata.gz: cb7dd16845d6ce75d9f10a8e5005636cf13e4060965273bf305ce34980975d95
+  data.tar.gz: ff992ec57cc8cddcad1fa016a25929ecbc5c4d124601e6873f9f5e634c503be3
 SHA512:
-  metadata.gz: c507cbb755b641f23b2249e4e989ee11fb65bcc61d628e453bdf6d7fd03f0859f064efe00c38ea848e42674b61b5c2264b51eb0b53e9875d746ec5f7bb8e37dc
-  data.tar.gz: bf006d722b68479d26fc7be323beb6c5cfd9548c4c71a3c63a2c462968df46f2971268ba4cd5c3292f3ed20cbb461c44f99123aed21b487bc1a2c1020f4392b0
+  metadata.gz: ac1670432a510e98b3b91bca1fdcc0eb7aefa58a9d0b98b50e28a8e0d4848e93866fcc9b2f9e7c6347a66ef4bb579904db3bc71424be9baf47fcda64c4375543
+  data.tar.gz: 61b5b0d50ca33fe03da311c69e63f318fb0585c35cb6b3a39185a3c4c149b63f2c92d5ccaecd83db86b669cb7ac3693d50e0fd596ff09fbd095ad5e526857059

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+### 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/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.17'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: random-words
 version: !ruby/object:Gem::Version
-  version: 1.0.16
+  version: 1.0.17
 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