duffy 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9786d17563ae9168426b6f8f6ecc2cf9b4f8480789dd51a14f1f86d39d8be64
-  data.tar.gz: 3d43f1c5969e3ac08c4abc78339161bfe8368c53fd709fdaabb6395be2458d2b
+  metadata.gz: 73762eee91c5b809fa97cbecf522816e751d80d87ab085d8ba29a7aa0971dd37
+  data.tar.gz: 41d570f9aa5e93fcf875567f0a689db05770ed58d293aab8997c86860635ec5e
 SHA512:
-  metadata.gz: 1b95b5a3a177fd400e583e5550d9542780d3aef2e43b95a7764d456008efc697eeacbbe55fc499e5114bdc263c08a8267650d56319ae306202d9d6bff7fc29bd
-  data.tar.gz: 735886457662bdbb294bcb4f4b91fa688018698b74a52758e559febac35ba43002c8ce4b0e96477dadcaa2447c28da048f9b8c61efbf684bd21781b1d564a94f
+  metadata.gz: 68ba4df32be9196d43b56b30c4ec97c39ae6794cac761f3fc2f5cbd622967a65bec9b1b138664569a153c66e4113ed9988f4547910a8e785f82f5a35e62167b8
+  data.tar.gz: 22616030c9bedd21996236912e0eab43d53ad617c5361b4bff7d8ff20b7d6ec95275e951e16883a601d7d92860f9d50448c8e4b3c968b6455f769db1889edc48

data/lib/duffy/string.rb

@@ -113,11 +113,11 @@ class String
     string = (self.upcase == self)? self.downcase : self
 
     result = ""
-    string.gsub(/[_-]/, ' ').split(/( [:.;?!][ ] | (?:[ ]|^)[""] )/x).each do |s|
+    string.gsub('_', ' ').split(/( [:.;?!][ ] | (?:[ ]|^)[""] )/x).each do |s|
       s.gsub!(/ \b( [[:alpha:]] [[:lower:].'']* )\b /x) do |w|
         # Skip words with inresult dots, e.g. "del.icio.us" or "example.com"
         (w =~ / [[:alpha:]] [.] [[:alpha:]] /x) ? w : w.capitalize
-      end #gsub!
+      end
 
       # Lowercase our list of small words:
       s.gsub!(/\b(#{small_re})\b/io) { |w| w.downcase }
@@ -135,9 +135,19 @@ class String
     # Special Cases:
     upcase_re = (Array(Duffy.configuration.upcase_custom) + Array(Duffy.configuration.upcase_default)).uniq.join("|")
 
+    # Names with apostrophes; O'Brian, De'Wayne. 3+ Skips "I've" "Haven't" etc.
+    result.gsub!(/([A-Z][a-z]*)'([a-z]{3,})/) { "#{$1}'#{$2.capitalize}" }
+
     result.gsub!(/ V(s?)\. /, ' v\1. ') # "v." and "vs."
+
     result.gsub!(/([''])S\b/, '\1s') # 'S (otherwise you get "the SEC'S decision")
+
     result.gsub!(/\b(#{upcase_re})\b/i) { |w| w.upcase } unless upcase_re.blank?
-    result
+
+    # Squash repeated whitespace characters
+    result.gsub!(/\s+/, ' ')
+
+    # Strip leading / tailing whitespace and return
+    result.strip
   end
 end

data/lib/duffy/version.rb

@@ -1,8 +1,9 @@
 module Duffy
-  VERSION = '1.0.4'
+  VERSION = '1.0.5'
 end
 
 # History
+# 1.0.5 - Update smart_titlecase to better accommodate names.
 # 1.0.4 - Added battery_percent method.
 # 1.0.3 - to_box methods now accept ANSI colored strings.
 # 1.0.2 - Added SimpleCov and added some more String tests.

data/spec/string_spec.rb

@@ -27,15 +27,51 @@ describe String do
   end
 
   describe "smart_titlecase" do
-    { "foo"                     => "Foo",
-      "IMPORTANT STUFF"         => "Important Stuff",
-      "123 main st."            => "123 Main St.",
-      "a tale of two cities"    => "A Tale of Two Cities"
+    {
+      "123 Main St."            => "123 Main St.",            # Numbers are allowed
+      "A Tale Of Two Cities"    => "A Tale of Two Cities",    # Articles are only capitalized if first
+      "At mt. Kilimanjaro"      => "At Mt. Kilimanjaro",      # Small non-articles are capitalized
+      "De'wayne"                => "De'Wayne",                # Names with apostrophes (longer first half)
+      "Hyphenated-Lastname"     => "Hyphenated-Lastname",     # Hyphenated words retain hyphen and capitalize
+      "I'm Here Ma'am"          => "I'm Here Ma'am",          # Contractions are treated as a single word
+      "Miller (Smith)"          => "Miller (Smith)",          # Parentheses are allowed
+      "O'brian"                 => "O'Brian",                 # Names with apostrophes (single character first half)
+      "Sample"                  => "Sample",                  # Already Capitalized, all lower, all upper okay
+      "Under_scores"            => "Under Scores",            # Underscores are treated as spaces
+
+      "Double  Space"           => "Double Space",            # Clear duplicated whitespace
+      "  Leading Space"         => "Leading Space",           # Remove leading whitespace
+      "Trailing Space  "        => "Trailing Space",          # Remove trailing whitespace
     }.each do |before, after|
-      it "#{before.ljust(20)} => #{after}" do
+
+      # As typed above
+      it "#{before.strip.ljust(22)} => #{after}" do
+        expect(before.smart_titlecase).to eq after
+      end
+
+      # As all-lowercase
+      it "#{before.strip.downcase.ljust(22)} => #{after}" do
+        expect(before.downcase.smart_titlecase).to eq after
+      end
+
+      # As all-uppercase
+      it "#{before.strip.upcase.ljust(22)} => #{after}" do
+        expect(before.upcase.smart_titlecase).to eq after
+      end
+    end
+
+    # CamelCase words will be preserved.
+    {
+      "DreamWorks"              => "DreamWorks",
+      "McDonald's happy-meal"   => "McDonald's Happy-Meal",
+    }.each do |before, after|
+
+      # As typed above
+      it "#{before.ljust(22)} => #{after}" do
         expect(before.smart_titlecase).to eq after
       end
     end
+
   end
 
   describe "to_alpha" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: duffy
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Jacob Duffy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-20 00:00:00.000000000 Z
+date: 2019-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -154,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Library of things