name-tamer 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8e5bd6a935818948438315fc5f7a1a2ff90e173
-  data.tar.gz: c6b2f73fa732939faa8e0eef6c680d852374b7c2
+  metadata.gz: 5238d58c1fd96ae9b61193c2b4e6b64deb1a7866
+  data.tar.gz: c881c108d88814dcf2cb76dc610a3581cdfb5204
 SHA512:
-  metadata.gz: dca80914cdbb4d1e6d254e51c2c9104ea18410424cd75663800564ac9c597cfe19c16651467cebc20883f4359b9e394ee23fbc0291cd6dad293c801db862ec84
-  data.tar.gz: 4cfadfe895919caf36468c5dc2c243054db0be686f8a6bb8500c69f4f7b39aeb00e9c32e6d358eb088e6e39c36ce1f9eb2d3d2ebce5806f5618aa8ee41832b75
+  metadata.gz: ad2db97d850d80e73281f707b4d0a9ad27e1b23dd6d13ca5a389934a1c0cc1c73dfd5b20368c4b2306460216941ad55ac76d5a1f2e14f596c23a1dd0f46eeaba
+  data.tar.gz: e8817a9dcab4a62e7846b151b7bf9b45c5726ee409c1d01d54aa065ecce29a2ad7220e215a10d3ea4e32ad630a398fa5f50fb856b313830d48402e2eb303d2ac

data/.rubocop.yml

@@ -7,4 +7,4 @@ CyclomaticComplexity:
 ClassLength:
   Description: 'Avoid classes longer than 100 lines of code.'
   CountComments: false  # count full line comments?
-  Max: 301
+  Max: 305

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    name-tamer (0.1.6)
+    name-tamer (0.1.7)
 
 GEM
   remote: https://rubygems.org/

data/lib/name-tamer.rb

@@ -26,7 +26,7 @@ class NameTamer
       @nice_name = name.dup          # Start with the name we've received
 
       tidy_spacing                    # " John   Smith " -> "John Smith"
-      fix_encoding_errors             # "René Descartes" -> "René Descartes"
+      fix_encoding_errors             # "Ren\u00c3\u00a9 Descartes" -> "Ren\u00e9 Descartes"
       consolidate_initials            # "I. B. M." -> "I.B.M."
       remove_adfixes                  # prefixes and suffixes: "Smith, John, Jr." -> "Smith, John"
       fixup_last_name_first           # "Smith, John" -> "John Smith"
@@ -177,15 +177,20 @@ class NameTamer
     if @last_name.nil?
       lowercase = @nice_name.downcase
       uppercase = @nice_name.upcase
+      fix_case = false
 
-      # Some companies like to be all lowercase so don't mess with them
-      @nice_name  = name_case(lowercase)  if @nice_name == uppercase ||
-                                           ( @nice_name == lowercase && @contact_type != :organization)
+      if @contact_type == :organization
+        fix_case = true if @nice_name == uppercase && @nice_name.length > 4
+      else
+        fix_case = true if [uppercase, lowercase].include?(@nice_name)
+      end
+
+      @nice_name  = name_case(lowercase) if fix_case
     else
+      # It's a person if we've split the name, so no organization logic here
       lowercase = @last_name.downcase
       uppercase = @last_name.upcase
-      @last_name  = name_case(lowercase) if @last_name == uppercase || @last_name == lowercase
-
+      @last_name  = name_case(lowercase) if [uppercase, lowercase].include?(@last_name)
       @nice_name  = "#{@remainder} #{@last_name}"
     end
   end

data/lib/name-tamer/version.rb

@@ -1,3 +1,3 @@
 class NameTamer
-  VERSION = '0.1.7'
+  VERSION = '0.1.8'
 end

data/spec/name_tamer_spec.rb

@@ -88,7 +88,7 @@ describe NameTamer do
       { n: 'MACKENZIE, Doug', t: :person, nn: 'Doug Mackenzie', sn: 'Doug Mackenzie', s: 'doug-mackenzie' },
       { n: 'Up + Down', t: :organization, nn: 'Up + Down', sn: 'Up plus Down', s: 'up-plus-down' },
       { n: 'San Francisco Ltd', t: :organization, nn: 'San Francisco', sn: 'San Francisco', s: 'san-francisco' },
-      { n: 'AT&T', t: :organization, nn: 'At&T', sn: 'At and T', s: 'at-and-t' },
+      { n: 'AT&T', t: :organization, nn: 'AT&T', sn: 'AT and T', s: 'at-and-t' },
       { n: 'SMITH, John, Jr.', t: :person, nn: 'John Smith', sn: 'John Smith', s: 'john-smith' },
       { n: 'I Heart Movies', t: :organization, nn: 'I Heart Movies', sn: 'I Heart Movies', s: 'i-heart-movies' },
       { n: 'Y Combinator', t: :organization, nn: 'Y Combinator', sn: 'Y Combinator', s: 'y-combinator' },
@@ -167,7 +167,8 @@ describe NameTamer do
       { n: 'Jose “Pepe” García', t: :organization, nn: 'Jose “Pepe” García', sn: 'Jose Pepe García',
         s: 'jose-pepe-garcia' },
       { n: 'John Smith M.A. (Oxon)', t: :person, nn: 'John Smith', sn: 'John Smith', s: 'john-smith' },
-      { n: 'I B M', t: :organization, nn: 'Ibm', sn: 'Ibm', s: 'ibm' },
+      { n: 'IBM', t: :organization, nn: 'IBM', sn: 'IBM', s: 'ibm' },
+      { n: 'I B M', t: :organization, nn: 'IBM', sn: 'IBM', s: 'ibm' },
       { n: 'I-B-M', t: :organization, nn: 'I-B-M', sn: 'I-B-M', s: 'i-b-m' },
       { n: 'I.B.M.', t: :organization, nn: 'I.B.M.', sn: 'IBM', s: 'ibm' },
       { n: 'Unusuals — the ad industry network', t: :organization,
@@ -186,7 +187,7 @@ describe NameTamer do
         t: :person,
         nn: 'René Descartes',
         sn: 'René Descartes',
-        s:'rene-descartes'
+        s: 'rene-descartes'
       }
     ]
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: name-tamer
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Xenapto