finishing_moves 0.20 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e4efbdd6bdfc892e6ae09dc64b5617da8413ccf3
-  data.tar.gz: 340d5694613b94e1d7d3cea866d75e47525f1c64
+SHA256:
+  metadata.gz: a791dce174d28e7ddf84f7a277f928ad75e5fafe2077d0be9f7650fb05cd56ab
+  data.tar.gz: 85b42fa2e461a88cb3a3a733422b27907ed1a17fedfdb8473f27afc6206c3404
 SHA512:
-  metadata.gz: ac8ce0578d278efa3b827aa7694e858bf1ff8cc2528af711a75da099aa0edf05aef6c126222c902796fe94a662ee01efc0600070a58b28001525bd20c8d27cdb
-  data.tar.gz: b0b454beb0eb14676f4100e01ef03cf4ce01b9d5b57f8b99a9a3f9e6648aa844b69c88e7009559ac52ffc300a33c86acdd32c4264f6bcea27d3330a96a50a592
+  metadata.gz: 54f153a89bbdbc16aaaae04f935b2a405b15e8a61885ab509558212010dff1775d2a6957628f9faddd65a03134b0308ce1cb1a3a59a123dda616145415dcde1d
+  data.tar.gz: d21e8d643d14e507714d95f622c3a95bb61d5c31f4f6549ae52dfb249041e324beed6aeff0eedd49da2bf86a8becb9ee64d4cffbd4dab43689ef214b7d49e476

data/.travis.yml

@@ -3,11 +3,11 @@ language: ruby
 cache: bundler
 
 rvm:
-  - 2.0.0
-  - 2.1.0
-  - 2.2.0
-  - 2.3.0
-  - 2.4.0
+  - 2.7.6
+  - 3.0.4
+  - 3.1.0
+  - 3.1.1
+  - 3.1.2
   - ruby-head
 
 script: bundle exec rspec spec

data/README.md

@@ -1,7 +1,7 @@
 # Finishing Moves
 [![Gem Version](https://badge.fury.io/rb/finishing_moves.svg)](https://rubygems.org/gems/finishing_moves)
 [![Build Status](https://travis-ci.org/forgecrafted/finishing_moves.svg?branch=master)](https://travis-ci.org/forgecrafted/finishing_moves)
-[![Coverage Status](https://coveralls.io/repos/forgecrafted/finishing_moves/badge.svg?branch=master)](https://coveralls.io/r/forgecrafted/finishing_moves?branch=master)
+[![Mentioned in Awesome Ruby](https://awesome.re/mentioned-badge.svg)](https://github.com/markets/awesome-ruby)
 
 Ruby includes a huge amount of default awesomeness that tackles most common development challenges. But every now and then, you find yourself performing contortions to achieve results that, honestly, **should feel more natural** given the language's design elegance. Finishing Moves is a collection of methods designed to assist in those "why is this awkward?" scenarios.
 
@@ -26,6 +26,8 @@ gem install 'finishing_moves'
   - [`Array#to_hash_values`](https://github.com/forgecrafted/finishing_moves/wiki/Array#arrayto_hash_values) :boom:
   - [`Array#to_indexed_hash`](https://github.com/forgecrafted/finishing_moves/wiki/Array#arrayto_indexed_hash)
   - [`Array#to_hash_keys`](https://github.com/forgecrafted/finishing_moves/wiki/Array#arrayto_hash_keys)
+  - [`Array#to_sym_strict`](https://github.com/forgecrafted/finishing_moves/wiki/Array#arrayto_sym_strict)
+  - [`Array#to_sym_loose`](https://github.com/forgecrafted/finishing_moves/wiki/Array#arrayto_sym_loose)
   - [`Enumerable#key_map`](https://github.com/forgecrafted/finishing_moves/wiki/Enumerable#enumerablekey_map) :boom:
   - [`Enumerable#key_map_reduce`](https://github.com/forgecrafted/finishing_moves/wiki/Enumerable#enumerablekey_map_reduce)
   - [`Hash#delete!`](https://github.com/forgecrafted/finishing_moves/wiki/Hash#hashdelete)
@@ -33,6 +35,8 @@ gem install 'finishing_moves'
   - [`Hash#delete_each!`](https://github.com/forgecrafted/finishing_moves/wiki/Hash#hashdelete_each-1)
   - [`Integer#length`](https://github.com/forgecrafted/finishing_moves/wiki/Numeric#integerlength)
   - [`Kernel#nil_chain`](https://github.com/forgecrafted/finishing_moves/wiki/Kernel#kernelnil_chain) :boom::boom:
+  - [`Kernel#bool_chain`](https://github.com/forgecrafted/finishing_moves/wiki/Kernel#kernelbool_chain)
+  - [`Kernel#silently`](https://github.com/forgecrafted/finishing_moves/wiki/Kernel#kernelsilently)
   - [`Kernel#cascade`](https://github.com/forgecrafted/finishing_moves/wiki/Kernel#kernelcascade)
   - [`Kernel#class_exists?`](https://github.com/forgecrafted/finishing_moves/wiki/Kernel#kernelclass_exists)
   - [`Numeric#add_percent`](https://github.com/forgecrafted/finishing_moves/wiki/Numeric#numericadd_percent)
@@ -57,15 +61,12 @@ gem install 'finishing_moves'
   - [`String#remove_whitespace`](https://github.com/forgecrafted/finishing_moves/wiki/String#stringremove_whitespace)
   - [`String#replace_whitespace`](https://github.com/forgecrafted/finishing_moves/wiki/String#stringreplace_whitespace)
   - [`String#strip_all`](https://github.com/forgecrafted/finishing_moves/wiki/String#stringstrip_all) :boom:
-
-*Multi-class logic enhancements*
-
-  - ~Fiscal Calendar Calculations~ Moved to its own gem! [Check out Fiscally.](https://github.com/forgecrafted/fiscally)
-  - [Boolean Typecasting](https://github.com/forgecrafted/finishing_moves/wiki/Boolean-Typecasting)
+  - [`String#to_uuid`](https://github.com/forgecrafted/finishing_moves/wiki/String#stringto_uuid)
+  - [Boolean Typecasting](https://github.com/forgecrafted/finishing_moves/wiki/Boolean-Typecasting) (*multi-class enhancement*)
 
 ### Ruby Version
 
-Tested against **`2.0.0` and above**. Probably works in `1.9.3`.
+Tested against all supported versions of official RVM, currently **`2.5.0` and above**.
 
 ## Development approach
 
@@ -73,7 +74,6 @@ Tested against **`2.0.0` and above**. Probably works in `1.9.3`.
 - Follow the Unix philosophy of *"Do one job really well."*
 - Minimize assumptions, e.g. avoid formatting output, mutating values, and conditional logic flows.
 - Play nice with major Ruby players like Rake, Rails, and Sinatra.
-- Never duplicate existing methods from Rails and the like.
 - Test all the things.
 
 ## Bug Reports

data/Vagrantfile

@@ -6,7 +6,7 @@ FQDN = "#{NAME}.example.com"
 
 Vagrant.configure("2") do |config|
   # "trusty" is 14.04
-  config.vm.box = "ubuntu/trusty64"
+  config.vm.box = "ubuntu/focal64"
 
   # Use the normal insecure key
   # https://github.com/mitchellh/vagrant/issues/2608
@@ -18,7 +18,7 @@ Vagrant.configure("2") do |config|
       "--name",       NAME,
       "--memory",     4096,
       # I/O APIC must be enabled to support a multi-core guest.
-      "--cpus",       4,
+      "--cpus",       2,
       "--ioapic",     "on",
       # Enable native host virtualization features (yields better performance).
       "--pae",        "on",

data/finishing_moves.gemspec

@@ -19,13 +19,10 @@ Gem::Specification.new do |s|
   s.files       = `git ls-files -z`.split("\x0")
   s.test_files  = Dir["spec/**/*"]
 
-  s.add_development_dependency 'rb-readline', '>= 0'
   s.add_development_dependency 'rspec', '~> 3.1.0'
-  s.add_development_dependency 'priscilla', '>= 0'
-  s.add_development_dependency 'pry-byebug', '>= 0'
   s.add_development_dependency 'fuubar', '>= 0'
-  s.add_development_dependency 'coveralls', '>= 0.8.0'
+  s.add_development_dependency 'coveralls', '>= 0'
 
-  s.required_ruby_version = '>= 2.0.0'
+  s.required_ruby_version = '>= 2.7.0'
 
 end

data/lib/finishing_moves/array.rb

@@ -27,13 +27,34 @@ class Array
   end
   alias_method :to_hash_as_keys, :to_hash_keys
 
-  # remove all nil's and empty strings
-  def crush
-    reject { |item| item.nil? || bool_chain{item.strip.empty?} }
+  def to_sym_strict
+    map { |x| x.to_sym }
   end
 
-  def crush!
-    reject! { |item| item.nil? || bool_chain{item.strip.empty?} }
+  def to_sym_strict!
+    map! { |x| x.to_sym }
+  end
+
+  def to_sym_loose
+    map do |x|
+      if x.respond_to?(:to_sym)
+        x.to_sym
+      else
+        x
+      end
+    end
+  end
+
+  def to_sym_loose!
+    map! do |x|
+      begin
+        x.to_sym
+      rescue NoMethodError => e
+        x
+      rescue Exception
+        raise
+      end
+    end
   end
 
 end

data/lib/finishing_moves/hash.rb

@@ -24,13 +24,11 @@ class Hash
     return self
   end
 
-  # remove all nil's and empty strings
-  def crush
-    reject { |item| item.nil? || bool_chain{item.strip.empty?} }
-  end
-
-  def crush!
-    reject! { |item| item.nil? || bool_chain{item.strip.empty?} }
+  # TODO
+  # Replicate `sample` method functionality from Array
+  def sample
+    key = self.keys.sample
+    return {:"#{key}" => self[key]}
   end
 
 end

data/lib/finishing_moves/string.rb

@@ -94,6 +94,17 @@ class String
     match(pattern, pos).not_nil?
   end
 
+  def to_uuid
+    if length == 36 && self.match?(/^[0-9A-F-]+$/i)
+      return self
+    elsif length == 32 && self.match?(/^[0-9A-F]+$/i)
+      str = self.dup
+      return str[0,8] + '-' +str[8,4] + '-' +str[12,4] + '-' +str[16,4] + '-' +str[20,12]
+    else
+      raise ArgumentError, "#{self} is not a valid UUID"
+    end
+  end
+
   # TODO
   # def each_char_index(&block)
     # how to return enumerator if no block given?

data/lib/finishing_moves/version.rb

@@ -1,3 +1,3 @@
 module FinishingMoves
-  VERSION = "0.20"
+  VERSION = "1.2.0"
 end

data/provision.sh

@@ -3,7 +3,7 @@
 # Shell user settings.
 USER_NAME=vagrant
 USER_HOME=/home/$USER_NAME
-DEFAULT_RUBY='2.4.1'
+DEFAULT_RUBY='3.1.2'
 
 ###############################################################################
 # Functions
@@ -27,7 +27,7 @@ apt-get -yfV dist-upgrade
 ###############################################################################
 
 # Install dependencies.
-apt-get install -yfV         \
+sudo apt-get install -yfV         \
   build-essential            \
   curl                       \
   git-core                   \
@@ -38,9 +38,18 @@ apt-get install -yfV         \
   libxml2-dev                \
   libxslt1-dev               \
   libyaml-dev                \
-  python-software-properties \
+  software-properties-common \
   sqlite3                    \
   zlib1g-dev                 \
+  autoconf                   \
+  bison                      \
+  libreadline6-dev           \
+  libncurses5-dev            \
+  libffi-dev                 \
+  libgdbm6                   \
+  libgdbm-dev                \
+  libdb-dev                  \
+  uuid-dev
 
 # Install rbenv and ruby-build.
 as_user "git clone https://github.com/sstephenson/rbenv.git $USER_HOME/.rbenv"

data/spec/array_spec.rb

@@ -99,6 +99,32 @@ describe Array do
     end
   end
 
+  it '#to_sym_strict' do
+    test = ['FOO', 'bar', :baz]
+    expect(test.to_sym_strict).to eq [:FOO, :bar, :baz]
+    expect(test).to eq ['FOO', 'bar', :baz]
+    expect{ [1].to_sym_strict }.to raise_error NoMethodError
+  end
+
+  it '#to_sym_strict!' do
+    test = ['FOO', 'bar', :baz]
+    expect(test.to_sym_strict!).to eq [:FOO, :bar, :baz]
+    expect(test).to eq [:FOO, :bar, :baz]
+    expect{ [1].to_sym_strict! }.to raise_error NoMethodError
+  end
+
+  it '#to_sym_loose' do
+    test = ['FOO', 'bar', :baz, 1, {bat: 'bat'}, /hay/]
+    expect(test.to_sym_loose).to eq [:FOO, :bar, :baz, 1, {bat: 'bat'}, /hay/]
+    expect(test).to eq ['FOO', 'bar', :baz, 1, {bat: 'bat'}, /hay/]
+  end
+
+  it '#to_sym_loose!' do
+    test = ['FOO', 'bar', :baz, 1, {bat: 'bat'}, /hay/]
+    expect(test.to_sym_loose!).to eq [:FOO, :bar, :baz, 1, {bat: 'bat'}, /hay/]
+    expect(test).to eq [:FOO, :bar, :baz, 1, {bat: 'bat'}, /hay/]
+  end
+
 end
 
 class SageElements

data/spec/hash_spec.rb

@@ -27,4 +27,18 @@ describe Hash do
     expect(test_hash.delete_each!(:baz)).to eq({ })
   end
 
+  it '#sample' do
+    test_hash = {
+      "Eastern Time (US & Canada)"  => "America/New_York",
+      "Central Time (US & Canada)"  => "America/Chicago",
+      "Mountain Time (US & Canada)" => "America/Denver",
+      "Pacific Time (US & Canada)"  => "America/Los_Angeles",
+      "Indiana (East)"              => "America/Indiana/Indianapolis",
+      "Arizona"                     => "America/Phoenix",
+    }
+    test_hash_clone = test_hash.dup
+    test_hash.sample
+
+  end
+
 end

data/spec/spec_helper.rb

@@ -3,10 +3,6 @@ require 'rubygems'
 require 'bundler/setup'
 Bundler.setup
 
-require 'priscilla'
-require 'pry'
-require 'byebug'
-
 require 'coveralls'
 Coveralls.wear!
 

data/spec/string_spec.rb

@@ -1,259 +1,280 @@
-require 'spec_helper'
-
-describe String do
-
-  it '#dedupe' do
-    expect('___foo___'.dedupe('_')).to eq '_foo_'
-    expect('---foo---'.dedupe('-')).to eq '-foo-'
-    expect('___foo---'.dedupe('_-')).to eq '_foo-'
-    expect('___foo__bar_baz--bing'.dedupe('_')).to eq '_foo_bar_baz--bing'
-    expect('foo'.dedupe('o')).to eq 'fo'
-    expect('foo'.dedupe('O')).to eq 'foo'
-    expect('[[foo]]]'.dedupe('[]')).to eq '[foo]'
-    expect('/crazy//concatenated////file/path'.dedupe('/')).to eq '/crazy/concatenated/file/path'
-
-    # make sure our use of gsub! isn't screwing us over
-    orig = '___foo___'
-    modified = orig.dedupe('_')
-    expect(modified).to eq '_foo_'
-    expect(orig).to eq '___foo___'
-  end
-
-  it '#dedupe!' do
-    str = '___foo___'
-    str.dedupe!('_')
-    expect(str).to eq '_foo_'
-  end
-
-  it '#strip_all (incl _strip_all_prep)' do
-    expect('___foo___'.strip_all).to eq 'foo'
-    expect('---foo---'.strip_all).to eq 'foo'
-    expect('-_-foo-_-'.strip_all).to eq 'foo'
-    expect('_-_8-foo-8_-_'.strip_all).to eq '8-foo-8'
-    expect('0123456789-foo-9876543210'.strip_all('0-9')).to eq '-foo-'
-    expect('0123-foo-3210'.strip_all('0-9-')).to eq 'foo'
-    expect('0123-foo-3210'.strip_all('a-z')).to eq '0123-foo-3210'
-    expect('foo-314-foo'.strip_all('a-z')).to eq '-314-'
-    expect('foo-314-foo'.strip_all('a-z-')).to eq '314'
-    expect('foo-314-foo'.strip_all('A-Z')).to eq 'foo-314-foo'
-    expect('FOO-314-FOO'.strip_all('A-Z')).to eq '-314-'
-    expect('FOO  314  FOO'.strip_all('A-Z')).to eq '314'
-
-    expect('abcdefghijklmnopqrstuvwxyz'.strip_all('a-z')).to eq ''
-    expect('ABCDEFGHIJKLMNOPQRSTUVWXYZ'.strip_all('A-Z')).to eq ''
-    expect('ABCDEFGHIJKLM   FOO   NOPQRSTUVWXYZ'.strip_all('A-Z')).to eq ''
-
-    expect('000000'.strip_all('0')).to eq ''
-    expect('[[000]]'.strip_all('[0]')).to eq ''
-    expect('. $ ^ { [ ( | ) * + ? \ '.strip_all('. $ ^ { [ ( | ) * + ? \ ')).to eq ''
-    expect('/[a|valid|regex]+/'.strip_all('/[]+')).to eq 'a|valid|regex'
-
-    expect('_1 0__spaces_incl__0 1_'.strip_all('0-9_')).to eq 'spaces_incl'
-    expect('  _spaces_incl_  '.strip_all).to eq 'spaces_incl'
-
-    expect("__'''foo__'".strip_all('_\'') ).to eq 'foo'
-    expect('abcdefghijklm   foo123   nopqrstuvwxyz'.strip_all('a-z0-9')).to eq ''
-    expect('hello world'.strip_all('a-z')).to eq ''
-
-    expect{'bad call'.strip_all(101)}.to raise_error(ArgumentError)
-  end
-
-  it '#strip_all!' do
-    str = '___foo___'
-    str.strip_all!
-    expect(str).to eq 'foo'
-  end
-
-  it '#lstrip_all' do
-    expect('___foo___'.lstrip_all).to eq 'foo___'
-  end
-
-  it '#lstrip_all!' do
-    str = '___foo___'
-    str.lstrip_all!
-    expect(str).to eq 'foo___'
-  end
-
-  it '#rstrip_all' do
-    expect('___foo___'.rstrip_all).to eq '___foo'
-  end
-
-  it '#rstrip_all!' do
-    str = '___foo___'
-    str.rstrip_all!
-    expect(str).to eq '___foo'
-  end
-
-  it '#match?' do
-    expect('hello'.match?('he')).to be true
-    expect('hello'.match?('he', 1)).to be false
-    expect('hello'.match?('o')).to be true
-    expect('hello'.match?('ol')).to be false
-    expect('hello'.match?('(.)')).to be true
-    expect('hello'.match?(/(.)/)).to be true
-    expect('hello'.match?('xx')).to be false
-  end
-
-  it '#remove_whitespace' do
-    expect('   a b c d     e'.remove_whitespace).to eq 'abcde'
-    expect(' [  foo ]   '.remove_whitespace).to eq '[foo]'
-    expect('   '.remove_whitespace).to eq ''
-    expect('. $ ^ { [ ( | ) * + ? \ '.remove_whitespace).to eq '.$^{[(|)*+?\\'
-    expect('a b c d e'.remove_whitespace('+')).to eq 'abcde'
-    expect('a  b c d e'.remove_whitespace('+')).to eq 'abcde'
-    expect('a b c d e'.remove_whitespace('__')).to eq 'abcde'
-  end
-
-  it '#remove_whitespace!' do
-    str = '   a b c d     e'
-    str.remove_whitespace!
-    expect(str).to eq 'abcde'
-  end
-
-  it '#replace_whitespace' do
-    expect('   a b c d     e'.replace_whitespace).to eq 'abcde'
-    expect('a b c d e'.replace_whitespace('+')).to eq 'a+b+c+d+e'
-    expect('a  b c d e'.replace_whitespace('+')).to eq 'a++b+c+d+e'
-    expect('a b c d e'.replace_whitespace('__')).to eq 'a__b__c__d__e'
-  end
-
-  it '#replace_whitespace!' do
-    str = 'a b c d e'
-    str.replace_whitespace!('-')
-    expect(str).to eq 'a-b-c-d-e'
-  end
-
-  it '#nl2br' do
-    expect("\n".nl2br).to       eq "<br />\n"
-    expect("\n\r".nl2br).to     eq "<br />\n"
-    expect("\r\n".nl2br).to     eq "<br />\n"
-    expect("\n\r\n".nl2br).to   eq "<br />\n<br />\n"
-    expect("\r\n\r\n".nl2br).to eq "<br />\n<br />\n"
-    expect("\r\r\n".nl2br).to   eq "<br />\n<br />\n"
-    expect("\r\r".nl2br).to     eq "<br />\n<br />\n"
-    expect("\n\r\r".nl2br).to   eq "<br />\n<br />\n"
-
-    expect("Let's play Global Thermonuclear War.\n\r".nl2br).to eq "Let's play Global Thermonuclear War.<br />\n"
-    expect("A strange game.\n\nThe only winning move is not to play.\r\nHow about a nice game of chess?\r".nl2br).
-      to eq "A strange game.<br />\n<br />\nThe only winning move is not to play.<br />\nHow about a nice game of chess?<br />\n"
-  end
-
-  it "#newline_to" do
-    expect("\n".newline_to).to       eq " "
-    expect("\n\r".newline_to).to     eq " "
-    expect("\r\n".newline_to).to     eq " "
-    expect("\n\r\n".newline_to).to   eq "  "
-    expect("\r\n\r\n".newline_to).to eq "  "
-    expect("\r\r\n".newline_to).to   eq "  "
-    expect("\r\r".newline_to).to     eq "  "
-    expect("\n\r\r".newline_to).to   eq "  "
-
-    # replacements should end up as strings
-    expect("\n".newline_to(:bar)).to eq 'bar'
-    expect("\n\n".newline_to('+')).to eq '++'
-    expect("\n\n".newline_to(0)).to eq '00'
-    expect("\n\n".newline_to(true)).to eq 'truetrue'
-
-    # should return a modified object, leaving original intact
-    newline = "\n"
-    bar = newline.newline_to(:bar)
-    expect(newline).to eq "\n"
-    expect(bar).to eq 'bar'
-
-    expect("Let's play Global Thermonuclear War.\n\r".newline_to).to eq "Let's play Global Thermonuclear War. "
-    expect("A strange game.\n\nThe only winning move is not to play.\r\nHow about a nice game of chess?\r".newline_to).
-      to eq "A strange game.  The only winning move is not to play. How about a nice game of chess? "
-  end
-
-  it "#newline_to!" do
-    var = "\n"
-    var.newline_to! :foo
-    expect(var).to eq 'foo'
-  end
-
-  keyify_sets = [
-    [Integer, :integer],
-    [Math::DomainError, :math_domain_error],
-    ['FooBarBaz', :foo_bar_baz],
-    [:FooBarBaz, :foo_bar_baz],
-    ["Foo-Bar'Baz", :foo_bar_baz],
-    ['(Foo*&Bar!Baz?', :foo_bar_baz],
-    ['1234FooBAR', :foo_bar],
-    ['!@#$Foo0987', :foo0987],
-    ["Bill O'Shea", :bill_o_shea],
-    ["Bill O Shea", :bill_o_shea],
-    ["Bill O   Shea", :bill_o_shea],
-  ]
-
-  it '#keyify' do
-    keyify_sets.each do |set|
-      inc, out = set
-      expect(inc.keyify).to eq out
-    end
-    expect('!@#$%^'.keyify).to eq nil
-    expect('12345678'.keyify).to eq nil
-    # make sure we're not performing in place
-    str = 'FooBarBaz'
-    expect(str.keyify).to eq :foo_bar_baz
-    expect(str).to eq 'FooBarBaz'
-    # should work on frozen values
-    expect('FooBarBaz'.freeze.keyify).to eq :foo_bar_baz
-  end
-
-  it '#keyify!' do
-    keyify_sets.each do |set|
-      inc, out = set
-      expect(inc.keyify!).to eq out
-    end
-    expect{ '!@#$%^'.keyify! }.to raise_error(ArgumentError)
-    expect{ '12345678'.keyify! }.to raise_error(ArgumentError)
-  end
-
-  it "dedupe + remove_whitespace" do
-    expect('1   2 3 4  5'.dedupe(' ').remove_whitespace('+')).to eq '12345'
-    expect('1   2 3 4  5'.dedupe(' ').replace_whitespace('+')).to eq '1+2+3+4+5'
-  end
-
-  slugify_sets = [
-    [Integer, 'integer'],
-    [Math::DomainError, 'math-domain-error'],
-    ['FooBarBaz', 'foo-bar-baz'],
-    [:FooBarBaz, 'foo-bar-baz'],
-    ["Foo-Bar'Baz", 'foo-bar-baz'],
-    ['(Foo*&Bar!Baz?', 'foo-bar-baz'],
-    ["Bill O'Shea", 'bill-o-shea'],
-    ["Bill O Shea", 'bill-o-shea'],
-    ["Bill O   Shea", 'bill-o-shea'],
-  ]
-
-  it '#slugify' do
-    slugify_sets.each do |set|
-      inc, out = set
-      expect(inc.slugify).to eq out
-    end
-    expect('!@#$Foo0987'.slugify).to eq 'foo0987'
-    expect('!@#$%^'.slugify).to eq nil
-    # make sure we're not performing in place
-    str = 'FooBarBaz'
-    expect(str.slugify).to eq 'foo-bar-baz'
-    expect(str).to eq 'FooBarBaz'
-
-    # we permit leading numbers, unlike keyify
-    expect('!1234FooBAR'.slugify).to eq '1234-foo-bar'
-    expect('1234FooBAR'.slugify).to eq '1234-foo-bar'
-    expect('12345678'.slugify).to eq '12345678'
-
-    # should work on frozen values
-    expect('FooBarBaz'.freeze.slugify).to eq 'foo-bar-baz'
-  end
-
-  it '#slugify!' do
-    slugify_sets.each do |set|
-      inc, out = set
-      expect(inc.slugify!).to eq out
-    end
-    expect{ '!@#$%^'.slugify! }.to raise_error(ArgumentError)
-    expect{ '12345678'.slugify! }.not_to raise_error
-  end
-
-end
+require 'spec_helper'
+
+describe String do
+
+  it '#dedupe' do
+    expect('___foo___'.dedupe('_')).to eq '_foo_'
+    expect('---foo---'.dedupe('-')).to eq '-foo-'
+    expect('___foo---'.dedupe('_-')).to eq '_foo-'
+    expect('___foo__bar_baz--bing'.dedupe('_')).to eq '_foo_bar_baz--bing'
+    expect('foo'.dedupe('o')).to eq 'fo'
+    expect('foo'.dedupe('O')).to eq 'foo'
+    expect('[[foo]]]'.dedupe('[]')).to eq '[foo]'
+    expect('/crazy//concatenated////file/path'.dedupe('/')).to eq '/crazy/concatenated/file/path'
+
+    # make sure our use of gsub! isn't screwing us over
+    orig = '___foo___'
+    modified = orig.dedupe('_')
+    expect(modified).to eq '_foo_'
+    expect(orig).to eq '___foo___'
+  end
+
+  it '#dedupe!' do
+    str = '___foo___'
+    str.dedupe!('_')
+    expect(str).to eq '_foo_'
+  end
+
+  it '#strip_all (incl _strip_all_prep)' do
+    expect('___foo___'.strip_all).to eq 'foo'
+    expect('---foo---'.strip_all).to eq 'foo'
+    expect('-_-foo-_-'.strip_all).to eq 'foo'
+    expect('_-_8-foo-8_-_'.strip_all).to eq '8-foo-8'
+    expect('0123456789-foo-9876543210'.strip_all('0-9')).to eq '-foo-'
+    expect('0123-foo-3210'.strip_all('0-9-')).to eq 'foo'
+    expect('0123-foo-3210'.strip_all('a-z')).to eq '0123-foo-3210'
+    expect('foo-314-foo'.strip_all('a-z')).to eq '-314-'
+    expect('foo-314-foo'.strip_all('a-z-')).to eq '314'
+    expect('foo-314-foo'.strip_all('A-Z')).to eq 'foo-314-foo'
+    expect('FOO-314-FOO'.strip_all('A-Z')).to eq '-314-'
+    expect('FOO  314  FOO'.strip_all('A-Z')).to eq '314'
+
+    expect('abcdefghijklmnopqrstuvwxyz'.strip_all('a-z')).to eq ''
+    expect('ABCDEFGHIJKLMNOPQRSTUVWXYZ'.strip_all('A-Z')).to eq ''
+    expect('ABCDEFGHIJKLM   FOO   NOPQRSTUVWXYZ'.strip_all('A-Z')).to eq ''
+
+    expect('000000'.strip_all('0')).to eq ''
+    expect('[[000]]'.strip_all('[0]')).to eq ''
+    expect('. $ ^ { [ ( | ) * + ? \ '.strip_all('. $ ^ { [ ( | ) * + ? \ ')).to eq ''
+    expect('/[a|valid|regex]+/'.strip_all('/[]+')).to eq 'a|valid|regex'
+
+    expect('_1 0__spaces_incl__0 1_'.strip_all('0-9_')).to eq 'spaces_incl'
+    expect('  _spaces_incl_  '.strip_all).to eq 'spaces_incl'
+
+    expect("__'''foo__'".strip_all('_\'') ).to eq 'foo'
+    expect('abcdefghijklm   foo123   nopqrstuvwxyz'.strip_all('a-z0-9')).to eq ''
+    expect('hello world'.strip_all('a-z')).to eq ''
+
+    expect{'bad call'.strip_all(101)}.to raise_error(ArgumentError)
+  end
+
+  it '#strip_all!' do
+    str = '___foo___'
+    str.strip_all!
+    expect(str).to eq 'foo'
+  end
+
+  it '#lstrip_all' do
+    expect('___foo___'.lstrip_all).to eq 'foo___'
+  end
+
+  it '#lstrip_all!' do
+    str = '___foo___'
+    str.lstrip_all!
+    expect(str).to eq 'foo___'
+  end
+
+  it '#rstrip_all' do
+    expect('___foo___'.rstrip_all).to eq '___foo'
+  end
+
+  it '#rstrip_all!' do
+    str = '___foo___'
+    str.rstrip_all!
+    expect(str).to eq '___foo'
+  end
+
+  it '#match?' do
+    expect('hello'.match?('he')).to be true
+    expect('hello'.match?('he', 1)).to be false
+    expect('hello'.match?('o')).to be true
+    expect('hello'.match?('ol')).to be false
+    expect('hello'.match?('(.)')).to be true
+    expect('hello'.match?(/(.)/)).to be true
+    expect('hello'.match?('xx')).to be false
+  end
+
+  it '#remove_whitespace' do
+    expect('   a b c d     e'.remove_whitespace).to eq 'abcde'
+    expect(' [  foo ]   '.remove_whitespace).to eq '[foo]'
+    expect('   '.remove_whitespace).to eq ''
+    expect('. $ ^ { [ ( | ) * + ? \ '.remove_whitespace).to eq '.$^{[(|)*+?\\'
+    expect('a b c d e'.remove_whitespace('+')).to eq 'abcde'
+    expect('a  b c d e'.remove_whitespace('+')).to eq 'abcde'
+    expect('a b c d e'.remove_whitespace('__')).to eq 'abcde'
+  end
+
+  it '#remove_whitespace!' do
+    str = '   a b c d     e'
+    str.remove_whitespace!
+    expect(str).to eq 'abcde'
+  end
+
+  it '#replace_whitespace' do
+    expect('   a b c d     e'.replace_whitespace).to eq 'abcde'
+    expect('a b c d e'.replace_whitespace('+')).to eq 'a+b+c+d+e'
+    expect('a  b c d e'.replace_whitespace('+')).to eq 'a++b+c+d+e'
+    expect('a b c d e'.replace_whitespace('__')).to eq 'a__b__c__d__e'
+  end
+
+  it '#replace_whitespace!' do
+    str = 'a b c d e'
+    str.replace_whitespace!('-')
+    expect(str).to eq 'a-b-c-d-e'
+  end
+
+  it '#nl2br' do
+    expect("\n".nl2br).to       eq "<br />\n"
+    expect("\n\r".nl2br).to     eq "<br />\n"
+    expect("\r\n".nl2br).to     eq "<br />\n"
+    expect("\n\r\n".nl2br).to   eq "<br />\n<br />\n"
+    expect("\r\n\r\n".nl2br).to eq "<br />\n<br />\n"
+    expect("\r\r\n".nl2br).to   eq "<br />\n<br />\n"
+    expect("\r\r".nl2br).to     eq "<br />\n<br />\n"
+    expect("\n\r\r".nl2br).to   eq "<br />\n<br />\n"
+
+    expect("Let's play Global Thermonuclear War.\n\r".nl2br).to eq "Let's play Global Thermonuclear War.<br />\n"
+    expect("A strange game.\n\nThe only winning move is not to play.\r\nHow about a nice game of chess?\r".nl2br).
+      to eq "A strange game.<br />\n<br />\nThe only winning move is not to play.<br />\nHow about a nice game of chess?<br />\n"
+  end
+
+  it "#newline_to" do
+    expect("\n".newline_to).to       eq " "
+    expect("\n\r".newline_to).to     eq " "
+    expect("\r\n".newline_to).to     eq " "
+    expect("\n\r\n".newline_to).to   eq "  "
+    expect("\r\n\r\n".newline_to).to eq "  "
+    expect("\r\r\n".newline_to).to   eq "  "
+    expect("\r\r".newline_to).to     eq "  "
+    expect("\n\r\r".newline_to).to   eq "  "
+
+    # replacements should end up as strings
+    expect("\n".newline_to(:bar)).to eq 'bar'
+    expect("\n\n".newline_to('+')).to eq '++'
+    expect("\n\n".newline_to(0)).to eq '00'
+    expect("\n\n".newline_to(true)).to eq 'truetrue'
+
+    # should return a modified object, leaving original intact
+    newline = "\n"
+    bar = newline.newline_to(:bar)
+    expect(newline).to eq "\n"
+    expect(bar).to eq 'bar'
+
+    expect("Let's play Global Thermonuclear War.\n\r".newline_to).to eq "Let's play Global Thermonuclear War. "
+    expect("A strange game.\n\nThe only winning move is not to play.\r\nHow about a nice game of chess?\r".newline_to).
+      to eq "A strange game.  The only winning move is not to play. How about a nice game of chess? "
+  end
+
+  it "#newline_to!" do
+    var = "\n"
+    var.newline_to! :foo
+    expect(var).to eq 'foo'
+  end
+
+  keyify_sets = [
+    [Integer, :integer],
+    [Math::DomainError, :math_domain_error],
+    ['FooBarBaz', :foo_bar_baz],
+    [:FooBarBaz, :foo_bar_baz],
+    ["Foo-Bar'Baz", :foo_bar_baz],
+    ['(Foo*&Bar!Baz?', :foo_bar_baz],
+    ['1234FooBAR', :foo_bar],
+    ['!@#$Foo0987', :foo0987],
+    ["Bill O'Shea", :bill_o_shea],
+    ["Bill O Shea", :bill_o_shea],
+    ["Bill O   Shea", :bill_o_shea],
+  ]
+
+  it '#keyify' do
+    keyify_sets.each do |set|
+      inc, out = set
+      expect(inc.keyify).to eq out
+    end
+    expect('!@#$%^'.keyify).to eq nil
+    expect('12345678'.keyify).to eq nil
+    # make sure we're not performing in place
+    str = 'FooBarBaz'
+    expect(str.keyify).to eq :foo_bar_baz
+    expect(str).to eq 'FooBarBaz'
+    # should work on frozen values
+    expect('FooBarBaz'.freeze.keyify).to eq :foo_bar_baz
+  end
+
+  it '#keyify!' do
+    keyify_sets.each do |set|
+      inc, out = set
+      expect(inc.keyify!).to eq out
+    end
+    expect{ '!@#$%^'.keyify! }.to raise_error(ArgumentError)
+    expect{ '12345678'.keyify! }.to raise_error(ArgumentError)
+  end
+
+  it "dedupe + remove_whitespace" do
+    expect('1   2 3 4  5'.dedupe(' ').remove_whitespace('+')).to eq '12345'
+    expect('1   2 3 4  5'.dedupe(' ').replace_whitespace('+')).to eq '1+2+3+4+5'
+  end
+
+  slugify_sets = [
+    [Integer, 'integer'],
+    [Math::DomainError, 'math-domain-error'],
+    ['FooBarBaz', 'foo-bar-baz'],
+    [:FooBarBaz, 'foo-bar-baz'],
+    ["Foo-Bar'Baz", 'foo-bar-baz'],
+    ['(Foo*&Bar!Baz?', 'foo-bar-baz'],
+    ["Bill O'Shea", 'bill-o-shea'],
+    ["Bill O Shea", 'bill-o-shea'],
+    ["Bill O   Shea", 'bill-o-shea'],
+  ]
+
+  it '#slugify' do
+    slugify_sets.each do |set|
+      inc, out = set
+      expect(inc.slugify).to eq out
+    end
+    expect('!@#$Foo0987'.slugify).to eq 'foo0987'
+    expect('!@#$%^'.slugify).to eq nil
+    # make sure we're not performing in place
+    str = 'FooBarBaz'
+    expect(str.slugify).to eq 'foo-bar-baz'
+    expect(str).to eq 'FooBarBaz'
+
+    # we permit leading numbers, unlike keyify
+    expect('!1234FooBAR'.slugify).to eq '1234-foo-bar'
+    expect('1234FooBAR'.slugify).to eq '1234-foo-bar'
+    expect('12345678'.slugify).to eq '12345678'
+
+    # should work on frozen values
+    expect('FooBarBaz'.freeze.slugify).to eq 'foo-bar-baz'
+  end
+
+  it '#slugify!' do
+    slugify_sets.each do |set|
+      inc, out = set
+      expect(inc.slugify!).to eq out
+    end
+    expect{ '!@#$%^'.slugify! }.to raise_error(ArgumentError)
+    expect{ '12345678'.slugify! }.not_to raise_error
+  end
+
+  it '#to_uuid' do
+    str = "5062754996b140c8b5dde7ffc23376a1"
+    expect(str.to_uuid).to eq "50627549-96b1-40c8-b5dd-e7ffc23376a1"
+    # too long
+    expect{ (str + '1').to_uuid }.to raise_error(ArgumentError)
+    # not hex
+    expect{ (str[0,31] + 'k').to_uuid }.to raise_error(ArgumentError)
+    # just bad
+    expect{ ("just some writing 123!").to_uuid }.to raise_error(ArgumentError)
+
+    formatted_uuid = "5a658838-7aa4-488c-98f1-21805a5d2021"
+    expect(formatted_uuid.to_uuid).to eq formatted_uuid
+    # Only dashes are accepted as separators
+    expect{ formatted_uuid.gsub('-', ' ').to_uuid }.to raise_error(ArgumentError)
+    expect{ formatted_uuid.gsub('-', '.').to_uuid }.to raise_error(ArgumentError)
+
+    random_uuid = SecureRandom.uuid
+    no_dashes = random_uuid.delete('-')
+    expect(no_dashes.to_uuid).to eq random_uuid
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: finishing_moves
 version: !ruby/object:Gem::Version
-  version: '0.20'
+  version: 1.2.0
 platform: ruby
 authors:
 - Frank Koehl
@@ -9,22 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-23 00:00:00.000000000 Z
+date: 2022-08-29 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rb-readline
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -39,34 +25,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.0
-- !ruby/object:Gem::Dependency
-  name: priscilla
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry-byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: fuubar
   requirement: !ruby/object:Gem::Requirement
@@ -87,16 +45,21 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.0
-description: |2
-      Ruby includes a huge amount of default awesomeness that tackles most common development challenges. But every now and then, you find yourself performing contortions to achieve results that, honestly, should feel more natural given the language's design elegance. Finishing Moves is a collection of methods designed to assist in those "why is this awkward?" scenarios.
+        version: '0'
+description: '    Ruby includes a huge amount of default awesomeness that tackles
+  most common development challenges. But every now and then, you find yourself performing
+  contortions to achieve results that, honestly, should feel more natural given the
+  language''s design elegance. Finishing Moves is a collection of methods designed
+  to assist in those "why is this awkward?" scenarios.
+
+  '
 email:
 - frank@forgecrafted.com
 - chris@forgecrafted.com
@@ -148,15 +111,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: Small, focused, incredibly useful methods added to core Ruby classes.