random-words 1.0.15 → 1.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec6fdccaead17ac26e6b2633dacce1d59711a5f1d382f60ab0c7e088222a2c2a
-  data.tar.gz: 5ca75c88a7ce3f49a4cd0e9f9909d27ab3bd13bb570f11ae501bf59d6157578d
+  metadata.gz: cb7dd16845d6ce75d9f10a8e5005636cf13e4060965273bf305ce34980975d95
+  data.tar.gz: ff992ec57cc8cddcad1fa016a25929ecbc5c4d124601e6873f9f5e634c503be3
 SHA512:
-  metadata.gz: 756051b7ac36f7ee90c57701428766eecd54a1a9e3727c7476fab76a7322d9d3dfa2c52a6eb65b1b5e0a3b7cdb473902b76d6168d72a43a89843a54b98b1212b
-  data.tar.gz: 33f3b12ea83c6014fc27ff0b8f51ae13be8179d3589e435c67784d8d6c63a659af2d8cfbfdc30b7fc60da7c766652257ccecb21c8b2e4ed6042e81cbcd3c0aca
+  metadata.gz: ac1670432a510e98b3b91bca1fdcc0eb7aefa58a9d0b98b50e28a8e0d4848e93866fcc9b2f9e7c6347a66ef4bb579904db3bc71424be9baf47fcda64c4375543
+  data.tar.gz: 61b5b0d50ca33fe03da311c69e63f318fb0585c35cb6b3a39185a3c4c149b63f2c92d5ccaecd83db86b669cb7ac3693d50e0fd596ff09fbd095ad5e526857059

data/CHANGELOG.md

@@ -1,3 +1,20 @@
+### 1.0.17
+
+2025-05-24 10:47
+
+#### FIXED
+
+- More encoding fixes
+
+### 1.0.16
+
+2025-05-24 09:19
+
+#### FIXED
+
+- Improve Ruby 2.x compatibility
+- Encoding error
+
 ### 1.0.15
 
 2025-04-29 12:59

data/Gemfile

@@ -16,6 +16,7 @@ gem "simplecov", "~> 0.21"
 gem "simplecov-console", "~> 0.9"
 gem "standard", "~> 1.3"
 gem "yard", "~> 0.9", ">= 0.9.36"
-gem "rubocop", "~> 1.75.2"
-gem "rubocop-performance", "~> 1.25.0"
-gem "rubocop-rspec", "~> 2.0"
+# gem "rubocop", "~> 1.75.2"
+# gem "rubocop-performance", "~> 1.25.0"
+# gem "rubocop-rspec", "~> 2.0"
+gem "tty-spinner", "~> 0.9", ">= 0.9.0"

data/Rakefile

@@ -3,6 +3,18 @@ require 'rspec/core/rake_task'
 require 'rdoc/task'
 require 'standard/rake'
 require 'yard'
+require 'tty-spinner'
+require 'English'
+
+## Docker error class
+class DockerError < StandardError
+  def initialize(msg = nil)
+    msg = msg ? "Docker error: #{msg}" : 'Docker error'
+    super
+  end
+end
+
+# task :doc, [*Rake.application[:yard].arg_names] => [:yard]
 
 Rake::RDocTask.new do |rd|
   rd.main = 'README.rdoc'
@@ -83,3 +95,87 @@ task :bump, :type do |_, args|
   end
   File.open(version_file, 'w+') { |f| f.puts content }
 end
+
+desc 'Run tests in Docker'
+task :dockertest, :version, :login, :attempt do |_, args|
+  args.with_defaults(version: 'all', login: false, attempt: 1)
+  `open -a Docker`
+
+  Rake::Task['clobber'].reenable
+  Rake::Task['clobber'].invoke
+  Rake::Task['build'].reenable
+  Rake::Task['build'].invoke
+
+  case args[:version]
+  when /^a/
+    %w[26 27 30 33 34].each do |v|
+      Rake::Task['dockertest'].reenable
+      Rake::Task['dockertest'].invoke(v, false)
+    end
+    Process.exit 0
+  when /^3\.?4/
+    version = '3.4'
+    img = 'randwtest34'
+    file = 'docker/Dockerfile-3.4'
+  when /^3\.?3/
+    version = '3.3'
+    img = 'randwtest33'
+    file = 'docker/Dockerfile-3.3'
+  when /^2\.?6/
+    version = '2.6'
+    img = 'randwtest26'
+    file = 'docker/Dockerfile-2.6'
+  when /^2/
+    version = '2.7'
+    img = 'randwtest27'
+    file = 'docker/Dockerfile-2.7'
+  else
+    version = '3.0'
+    img = 'randwtest30'
+    file = 'docker/Dockerfile-3.0'
+  end
+
+  spinner = TTY::Spinner.new("[:spinner] Updating Docker image (#{version})...", hide_cursor: true)
+  `docker build . --file #{file} -t #{img} &> /dev/null`
+
+  unless $CHILD_STATUS.success?
+    spinner.error
+    spinner.stop
+    raise DockerError, 'Error building docker image'
+  end
+
+  spinner.success
+  spinner.stop
+
+  dirs = {
+    File.dirname(__FILE__) => '/randw',
+    File.expand_path('~/.config') => '/root/.config'
+  }
+  dir_args = dirs.map { |s, d| " -v '#{s}:#{d}'" }.join(' ')
+  exec "docker run #{dir_args} --name #{img} -it #{img} /bin/bash -l" if args[:login]
+
+  spinner = TTY::Spinner.new("[:spinner] Running tests (#{version})...", hide_cursor: true)
+
+  spinner.auto_spin
+  output = `docker run --name #{img} --rm #{dir_args} -it #{img} 2>&1`
+  if $CHILD_STATUS.success?
+    spinner.success
+    spinner.stop
+  else
+    spinner.error
+    spinner.stop
+    raise DockerError, 'Error running docker image'
+    puts output
+  end
+
+  # commit = puts `bash -c "docker commit $(docker ps -a|grep #{img}|awk '{print $1}'|head -n 1) #{img}"`.strip
+
+  # puts commit&.empty? ? "Error commiting Docker tag #{img}" : "Committed Docker tag #{img}"
+rescue DockerError
+  raise StandardError.new('Docker not responding') if args[:attempt] > 3
+
+  `open -a Docker`
+  sleep 3
+  Rake::Task['dockertest'].reenable
+  Rake::Task['dockertest'].invoke(args[:version], args[:login], args[:attempt] + 1)
+end

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/docker/Dockerfile

@@ -0,0 +1,12 @@
+FROM ruby:3.0.1
+# RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
+RUN mkdir /randw
+WORKDIR /randw
+RUN gem install bundler:2.2
+COPY ./docker/sources.list /etc/apt/sources.list
+RUN apt-get update -y --allow-insecure-repositories || true
+RUN apt-get install -y sudo || true
+RUN sudo apt-get install -y less vim || true
+COPY ./docker/inputrc /root/.inputrc
+COPY ./docker/bash_profile /root/.bash_profile
+CMD ["/randw/scripts/runtests.sh"]

data/docker/Dockerfile-2.6

@@ -0,0 +1,13 @@
+FROM ruby:2.6
+# RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
+RUN mkdir /randw
+WORKDIR /randw
+RUN gem install bundler:2.2
+RUN bundle config set force_ruby_platform true
+COPY ./docker/sources.list /etc/apt/sources.list
+RUN apt-get update -y --allow-insecure-repositories || true
+RUN apt-get install -y sudo || true
+RUN sudo apt-get install -y less vim || true
+COPY ./docker/inputrc /root/.inputrc
+COPY ./docker/bash_profile /root/.bash_profile
+CMD ["/randw/scripts/runtests.sh"]

data/docker/Dockerfile-2.7

@@ -0,0 +1,13 @@
+FROM ruby:2.7
+# RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
+RUN mkdir /randw
+WORKDIR /randw
+RUN gem install bundler:2.2
+RUN bundle config set force_ruby_platform true
+COPY ./docker/sources.list /etc/apt/sources.list
+RUN apt-get update -y --allow-insecure-repositories || true
+RUN apt-get install -y sudo || true
+RUN sudo apt-get install -y less vim || true
+COPY ./docker/inputrc /root/.inputrc
+COPY ./docker/bash_profile /root/.bash_profile
+CMD ["/randw/scripts/runtests.sh"]

data/docker/Dockerfile-3.0

@@ -0,0 +1,13 @@
+FROM ruby:3.0.1
+# RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
+RUN mkdir /randw
+WORKDIR /randw
+RUN gem install bundler:2.2
+RUN bundle config set force_ruby_platform true
+COPY ./docker/sources.list /etc/apt/sources.list
+RUN apt-get update -y --allow-insecure-repositories || true
+RUN apt-get install -y sudo || true
+RUN sudo apt-get install -y less vim || true
+COPY ./docker/inputrc /root/.inputrc
+COPY ./docker/bash_profile /root/.bash_profile
+CMD ["/randw/scripts/runtests.sh"]

data/docker/Dockerfile-3.3

@@ -0,0 +1,13 @@
+FROM ruby:3.3.0
+# RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
+RUN mkdir /randw
+WORKDIR /randw
+RUN gem install bundler:2.6.8
+RUN bundle config set force_ruby_platform true
+COPY ./docker/sources.list /etc/apt/sources.list
+RUN apt-get update -y --allow-insecure-repositories || true
+RUN apt-get install -y sudo || true
+RUN sudo apt-get install -y less vim || true
+COPY ./docker/inputrc /root/.inputrc
+COPY ./docker/bash_profile /root/.bash_profile
+CMD ["/randw/scripts/runtests.sh"]

data/docker/Dockerfile-3.4

@@ -0,0 +1,13 @@
+FROM ruby:3.4.4
+# RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
+RUN mkdir /randw
+WORKDIR /randw
+RUN gem install bundler:2.6.8
+RUN bundle config set force_ruby_platform true
+COPY ./docker/sources.list /etc/apt/sources.list
+RUN apt-get update -y --allow-insecure-repositories || true
+RUN apt-get install -y sudo || true
+RUN sudo apt-get install -y less vim || true
+COPY ./docker/inputrc /root/.inputrc
+COPY ./docker/bash_profile /root/.bash_profile
+CMD ["/randw/scripts/runtests.sh"]

data/docker/bash_profile

@@ -0,0 +1,17 @@
+#!/bin/bash
+export GLI_DEBUG=true
+export EDITOR="/usr/bin/vim"
+alias b="bundle exec bin/randw"
+alias be="bundle exec"
+alias quit="exit"
+
+shopt -s nocaseglob
+shopt -s histappend
+shopt -s histreedit
+shopt -s histverify
+shopt -s cmdhist
+
+cd /randw
+bundle update
+gem update --system
+gem install pkg/*.gem

data/docker/inputrc

@@ -0,0 +1,57 @@
+"\e[3~": delete-char
+"\ex": 'cd !$ \015ls\015'
+"\ez": 'cd -\015'
+"\e\C-m": '\C-a "$(\C-e|fzf)"\C-a'
+"\e/": '"$(!!|fzf)"\C-a \C-m\C-m'
+# these allow you to use alt+left/right arrow keys
+# to jump the cursor over words
+"\e[1;5C": forward-word
+"\e[1;5D": backward-word
+# "\e[D": backward-word
+# "\e[C": forward-word
+"\ea": menu-complete
+# TAB: menu-complete
+# "\e[Z": "\e-1\C-i"
+
+"\e\C-l": history-and-alias-expand-line
+
+# these allow you to start typing a command and
+# use the up/down arrow to auto complete from
+# commands in your history
+"\e[B": history-search-forward
+"\e[A": history-search-backward
+"\ew": history-search-backward
+"\es": history-search-forward
+# this lets you hit tab to auto-complete a file or
+# directory name ignoring case
+set completion-ignore-case On
+set mark-symlinked-directories On
+set completion-prefix-display-length 2
+set bell-style none
+# set bell-style visible
+set meta-flag on
+set convert-meta off
+set input-meta on
+set output-meta on
+set show-all-if-ambiguous on
+set show-all-if-unmodified on
+set completion-map-case on
+set visible-stats on
+
+# Do history expansion when space entered?
+$if bash
+	Space: magic-space
+$endif
+
+# Show extra file information when completing, like `ls -F` does
+set visible-stats on
+
+# Be more intelligent when autocompleting by also looking at the text after
+# the cursor. For example, when the current line is "cd ~/src/mozil", and
+# the cursor is on the "z", pressing Tab will not autocomplete it to "cd
+# ~/src/mozillail", but to "cd ~/src/mozilla". (This is supported by the
+# Readline used by Bash 4.)
+set skip-completed-text on
+
+# Use Alt/Meta + Delete to delete the preceding word
+"\e[3;3~": kill-word

data/docker/sources.list

@@ -0,0 +1,11 @@
+deb http://archive.ubuntu.com/ubuntu/ focal main restricted
+deb http://archive.ubuntu.com/ubuntu/ focal-updates main restricted
+deb http://archive.ubuntu.com/ubuntu/ focal universe
+deb http://archive.ubuntu.com/ubuntu/ focal-updates universe
+deb http://archive.ubuntu.com/ubuntu/ focal multiverse
+deb http://archive.ubuntu.com/ubuntu/ focal-updates multiverse
+deb http://archive.ubuntu.com/ubuntu/ focal-backports main restricted universe multiverse
+
+deb http://security.ubuntu.com/ubuntu focal-security main restricted
+deb http://security.ubuntu.com/ubuntu focal-security universe
+deb http://security.ubuntu.com/ubuntu focal-security multiversesudo apt update

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

@@ -78,7 +78,7 @@ module RandomWords
       filename = "#{filename.sub(/\.txt$/, '')}.txt"
       path = File.join(@path, filename)
 
-      File.read(path).strip.split("\n").map(&:strip) # Changed from split_lines to split("\n")
+      File.read(path).clean_encode.strip.split("\n").map(&:strip) # Changed from split_lines to split("\n")
     rescue Errno::ENOENT
       warn "File not found: #{path}"
       []

data/lib/random-words/string.rb

@@ -13,6 +13,24 @@ module RandomWords
   #   str.terminate(["", "."]) # => "Hello World."
   #
   class ::String
+    ##
+    ## Get a clean UTF-8 string by forcing an ISO encoding and then re-encoding
+    ##
+    ## @return     [String] UTF-8 string
+    ##
+    def clean_encode
+      force_encoding('ISO-8859-1').encode('utf-8', replace: nil)
+    end
+
+    ##
+    ## Destructive version of #clean_encode
+    ##
+    ## @return     [String] UTF-8 string, in place
+    ##
+    def clean_encode!
+      replace clean_encode
+    end
+
     # Remove unwanted characters and whitespace from a string.
     # @return [String] The string with unwanted characters removed.
     # @example
@@ -218,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)
@@ -337,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.15'
+  VERSION = '1.0.17'
 end

data/random-words.gemspec

@@ -34,5 +34,6 @@ Gem::Specification.new do |spec|
 
   spec.metadata['rubygems_mfa_required'] = 'true'
 
-  spec.add_dependency 'nokogiri', '~> 1.12'
+  spec.add_dependency 'json', '2.7.6'
+  spec.add_dependency 'nokogiri', '1.13.2'
 end

data/scripts/runtests.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+cd /randw
+bundle update
+rake test

metadata

@@ -1,28 +1,42 @@
 --- !ruby/object:Gem::Specification
 name: random-words
 version: !ruby/object:Gem::Version
-  version: 1.0.15
+  version: 1.0.17
 platform: ruby
 authors:
 - Brett Terpstra
 bindir: bin
 cert_chain: []
-date: 2025-04-29 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.7.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.7.6
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: 1.13.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: 1.13.2
 description: Generate random text (lorem ipsum) from a variety of sources.
 email: me@brettterpstra.com
 executables:
@@ -42,6 +56,15 @@ files:
 - README.md
 - Rakefile
 - bin/randw
+- docker/Dockerfile
+- docker/Dockerfile-2.6
+- docker/Dockerfile-2.7
+- docker/Dockerfile-3.0
+- docker/Dockerfile-3.3
+- docker/Dockerfile-3.4
+- docker/bash_profile
+- docker/inputrc
+- docker/sources.list
 - generator.cgi
 - lib/random-words.rb
 - lib/random-words/array.rb
@@ -50,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
@@ -275,6 +299,7 @@ files:
 - lib/random-words/words/walken/verbs-plural.txt
 - lib/random-words/words/walken/verbs-singular.txt
 - random-words.gemspec
+- scripts/runtests.sh
 - src/_README.md
 homepage: https://github.com/ttscoff/random-words
 licenses:
@@ -307,7 +332,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.6
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Random words generator
 test_files: []