name-tamer 0.2.15 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8dece3dacb2fbd41e1c31931973b534a36868789
-  data.tar.gz: bc65a4149e6d28126cab01d3093bbfdb9670e46e
+  metadata.gz: cbf8a73410b3e5575cf42adc919e7b42f23b080f
+  data.tar.gz: c27236356141b3023dc14aa5e590383f0662d8d2
 SHA512:
-  metadata.gz: 951fce5bc9a6493145c24ebb8cc08791b5941334f5c38ea649d4e12d5f5e0ba3ec849486a40ef2916d7eb3f7d3da77215df38008f490b9627620e3f8a6408caa
-  data.tar.gz: 7297d3ac2c61e7907d117d0ed6d0548c26f283cb08029cf4bd5bcd9c6cee274c4e7b71cb6ba4994dc1a8b3d776fc2df4c27f44161f10a0ec3c161a3ed318f34d
+  metadata.gz: 117f98cf5609b0811dc806d74383f94787cbd74293e51edbe2f9e78f26a0d877142119a77c93e3ffb4a74afbc04053110e66acf5032e26d4712e7862da72f331
+  data.tar.gz: da4f7a8598c5b05d60e947f1c94c93c55b838b91a8fc2f00c7e5774d288f613864bd8e440c279eef0ec9e134394e07774f8e9f3407a0d1a33b0a9573bcca32bb

data/.rubocop.yml

@@ -33,4 +33,7 @@ CyclomaticComplexity:
 ClassLength:
   Description: 'Avoid classes longer than 100 lines of code.'
   CountComments: false  # count full line comments?
-  Max: 331
+  Max: 334
+
+ExtraSpacing:
+  Enabled: true

data/.ruby-gemset

@@ -0,0 +1 @@
+name-tamer

data/.ruby-version

@@ -1 +1 @@
-2.2.0
+2.2.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    name-tamer (0.2.14)
+    name-tamer (0.3.0)
 
 GEM
   remote: https://rubygems.org/
@@ -9,60 +9,122 @@ GEM
     ast (2.0.0)
     astrolabe (1.3.0)
       parser (>= 2.2.0.pre.3, < 3.0)
-    coveralls (0.7.11)
-      multi_json (~> 1.10)
+    celluloid (0.16.0)
+      timers (~> 4.0.0)
+    coderay (1.1.0)
+    coveralls (0.8.2)
+      json (~> 1.8)
       rest-client (>= 1.6.8, < 2)
-      simplecov (~> 0.9.1)
+      simplecov (~> 0.10.0)
       term-ansicolor (~> 1.3)
       thor (~> 0.19.1)
     diff-lcs (1.2.5)
     docile (1.1.5)
+    domain_name (0.5.24)
+      unf (>= 0.0.5, < 1.0.0)
+    ffi (1.9.8)
+    formatador (0.2.5)
     gem-release (0.7.3)
-    mime-types (2.4.3)
-    multi_json (1.10.1)
+    guard (2.12.6)
+      formatador (>= 0.2.4)
+      listen (~> 2.7)
+      lumberjack (~> 1.0)
+      nenv (~> 0.1)
+      notiffany (~> 0.0)
+      pry (>= 0.9.12)
+      shellany (~> 0.0)
+      thor (>= 0.18.1)
+    guard-compat (1.2.1)
+    guard-rspec (4.5.2)
+      guard (~> 2.1)
+      guard-compat (~> 1.1)
+      rspec (>= 2.99.0, < 4.0)
+    guard-rubocop (1.2.0)
+      guard (~> 2.0)
+      rubocop (~> 0.20)
+    hitimes (1.2.2)
+    http-cookie (1.0.2)
+      domain_name (~> 0.5)
+    json (1.8.3)
+    listen (2.10.1)
+      celluloid (~> 0.16.0)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+    lumberjack (1.0.9)
+    method_source (0.8.2)
+    mime-types (2.6.1)
+    nenv (0.2.0)
     netrc (0.10.3)
-    parser (2.2.0.3)
+    notiffany (0.0.6)
+      nenv (~> 0.1)
+      shellany (~> 0.0)
+    parser (2.2.2.5)
       ast (>= 1.1, < 3.0)
-    powerpack (0.1.0)
+    powerpack (0.1.1)
+    pry (0.10.1)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
     rainbow (2.0.0)
     rake (10.4.2)
-    rest-client (1.7.3)
+    rb-fsevent (0.9.5)
+    rb-inotify (0.9.5)
+      ffi (>= 0.5.0)
+    rest-client (1.8.0)
+      http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
-    rspec (2.99.0)
-      rspec-core (~> 2.99.0)
-      rspec-expectations (~> 2.99.0)
-      rspec-mocks (~> 2.99.0)
-    rspec-core (2.99.2)
-    rspec-expectations (2.99.2)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.99.3)
-    rubocop (0.29.1)
+    rspec (3.3.0)
+      rspec-core (~> 3.3.0)
+      rspec-expectations (~> 3.3.0)
+      rspec-mocks (~> 3.3.0)
+    rspec-core (3.3.1)
+      rspec-support (~> 3.3.0)
+    rspec-expectations (3.3.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.3.0)
+    rspec-mocks (3.3.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.3.0)
+    rspec-support (3.3.0)
+    rubocop (0.32.1)
       astrolabe (~> 1.3)
-      parser (>= 2.2.0.1, < 3.0)
+      parser (>= 2.2.2.5, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.4)
-    ruby-progressbar (1.7.1)
-    simplecov (0.9.2)
+    ruby-progressbar (1.7.5)
+    shellany (0.0.1)
+    simplecov (0.10.0)
       docile (~> 1.1.0)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.9.0)
-    simplecov-html (0.9.0)
-    term-ansicolor (1.3.0)
+      json (~> 1.8)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
+    slop (3.6.0)
+    term-ansicolor (1.3.2)
       tins (~> 1.0)
     thor (0.19.1)
-    tins (1.3.4)
+    timers (4.0.1)
+      hitimes
+    tins (1.5.4)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1)
-  coveralls (~> 0)
-  gem-release (~> 0)
+  coveralls (~> 0.8)
+  gem-release (~> 0.7)
+  guard (~> 2.12)
+  guard-rspec (~> 4.5)
+  guard-rubocop (~> 1.2)
   name-tamer!
   rake (~> 10)
-  rspec (~> 2)
-  rubocop (~> 0)
-  simplecov (~> 0.7, >= 0.7.1)
+  rspec (~> 3.3)
+  rubocop (~> 0.32)
+  simplecov (~> 0.10)
+
+BUNDLED WITH
+   1.10.4

data/Guardfile

@@ -0,0 +1,16 @@
+guard :rubocop do
+  watch(/.+\.rb$/)
+  watch(%r{(?:.+/)?\.rubocop\.yml$}) { |m| File.dirname(m[0]) }
+end
+
+guard(
+  :rspec,
+  all_after_pass: true,
+  all_on_start: true,
+  cmd: 'bundle exec rspec --fail-fast --format documentation'
+) do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$}) { |m| "spec/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb') { 'spec' }
+  watch(%r{^spec/support/.+\.rb$}) { 'spec' }
+end

data/doc/maintenance.rake

@@ -1,5 +1,9 @@
 # encoding: utf-8
+lib = File.expand_path('../../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
 require 'csv'
+require 'name-tamer'
 
 desc 'Build prefixes and suffixes'
 task :adfixes do
@@ -29,3 +33,44 @@ task :adfixes do
   puts "'" + sp.join("', '") + "'"
   puts "'" + so.join("', '") + "'"
 end
+
+task :check_existing do
+  [
+    'Chartered F.C.S.I.',
+    'C.I.S.S.P.', 'T.M.I.E.T.', 'A.C.C.A.', 'C.I.T.P.', 'F.B.C.S.', 'F.C.C.A.', 'F.C.M.I.', 'F.I.E.T.', 'F.I.R.P.',
+    'M.I.E.T.', 'B.Tech.',
+    'Cantab.', 'D.Phil.', 'I.T.I.L. v3', 'B.Eng.', 'C.Eng.', 'M.Jur.', 'C.F.A.', 'D.B.E.', 'C.L.P.',
+    'D.D.S.', 'D.V.M.', 'Eng.D.', 'A.C.A.', 'C.T.A.', 'E.R.P.', 'F.C.A.', 'F.P.C.', 'F.R.M.', 'M.B.A.', 'M.B.E.',
+    'M.E.P.', 'M.Eng.', 'M.Jur.', 'M.S.P.', 'O.B.E.', 'P.M.C.', 'P.M.P.', 'P.S.P.', 'V.M.D.', 'B.Ed.', 'B.Sc.',
+    'Ed.D.', 'Hons.', 'LL.B.',
+    'LL.D.', 'LL.M.', 'M.Ed.', 'M.Sc.', 'Oxon.', 'Ph.D.', 'B.A.', 'Esq.', 'J.D.', 'K.C.', 'M.A.', 'M.D.', 'M.P.',
+    'O.K.', 'P.A.', 'Q.C.', 'III', 'Jr.', 'Sr.', 'II', 'IV', 'V'
+  ].each do |suffix|
+    fail suffix unless NameTamer::ADFIXES[:suffix][:person].include? suffix
+  end
+
+  [
+    'S. de R.L. de C.V.', 'S.A.P.I. de C.V.', 'y. Cía. S. en C.', 'Private Limited', 'S.M. Pte. Ltd.', 'Cía. S. C. A.',
+    'y. Cía. S. C.', 'S.A. de C.V.', 'spol. s.r.o.', '(Pty.) Ltd.', '(Pvt.) Ltd.', 'A.D.S.I.Tz.', 'S.p. z.o.o.',
+    '(Pvt.)Ltd.', 'akc. spol.', 'Cía. Ltda.', 'E.B.V.B.A.', 'P. Limited', 'S. de R.L.', 'S.I.C.A.V.', 'S.P.R.L.U.',
+    'А.Д.С.И.Ц.', '(P.) Ltd.', 'C. por A.', 'Comm.V.A.', 'Ltd. Şti.', 'Plc. Ltd.', 'Pte. Ltd.', 'Pty. Ltd.',
+    'Pvt. Ltd.', 'Soc. Col.', 'A.M.B.A.', 'A.S.B.L.', 'A.V.E.E.', 'B.V.B.A.', 'B.V.I.O.', 'C.V.B.A.', 'C.V.O.A.',
+    'E.E.I.G.', 'E.I.R.L.', 'E.O.O.D.', 'E.U.R.L.', 'F.M.B.A.', 'G.m.b.H.', 'Ges.b.R.', 'K.G.a.A.', 'L.L.L.P.',
+    'Ltd. Co.', 'Ltd. Co.', 'M.E.P.E.', 'n.y.r.t.', 'O.V.E.E.', 'P.E.E.C.', 'P.L.L.C.', 'P.L.L.C.', 'S. en C.',
+    'S.a.p.a.', 'S.A.R.L.', 'S.à.R.L.', 'S.A.S.U.', 'S.C.e.I.', 'S.C.O.P.', 'S.C.p.A.', 'S.C.R.I.', 'S.C.R.L.',
+    'S.M.B.A.', 'S.P.R.L.', 'Е.О.О.Д.', '&. Cie.', 'and Co.', 'Comm.V.', 'Limited', 'P. Ltd.', 'Part.G.', 'Sh.p.k.',
+    '&. Co.', 'C.X.A.', 'd.n.o.', 'd.o.o.', 'E.A.D.', 'e.h.f.', 'E.P.E.', 'E.S.V.', 'F.C.P.', 'F.I.E.', 'G.b.R.',
+    'G.I.E.', 'G.M.K.', 'G.S.K.', 'H.U.F.', 'K.D.A.', 'k.f.t.', 'k.h.t.', 'k.k.t.', 'L.L.C.', 'L.L.P.', 'o.h.f.',
+    'O.H.G.', 'O.O.D.', 'O.y.j.', 'p.l.c.', 'P.S.U.', 'S.A.E.', 'S.A.S.', 'S.C.A.', 'S.C.E.', 'S.C.S.', 'S.E.M.',
+    'S.E.P.', 's.e.s.', 'S.G.R.', 'S.N.C.', 'S.p.A.', 'S.P.E.', 'S.R.L.', 's.r.o.', 'Unltd.', 'V.O.F.', 'V.o.G.',
+    'v.o.s.', 'V.Z.W.', 'z.r.t.', 'А.А.Т.', 'Е.А.Д.', 'З.А.Т.', 'К.Д.А.', 'О.О.Д.', 'Т.А.А.', '股份有限公司', 'Ap.S.',
+    'Corp.', 'ltda.', 'Sh.A.', 'st.G.', 'Ultd.', 'a.b.', 'A.D.', 'A.E.', 'A.G.', 'A.S.', 'A.Ş.', 'A.y.', 'B.M.', 'b.t.',
+    'B.V.', 'C.A.', 'C.V.', 'd.d.', 'e.c.', 'E.E.', 'e.G.', 'E.I.', 'E.P.', 'E.T.', 'E.U.', 'e.v.', 'G.K.', 'G.P.',
+    'h.f.', 'Inc.', 'K.D.', 'K.G.', 'K.K.', 'k.s.', 'k.v.', 'K.y.', 'L.C.', 'L.P.', 'Ltd.', 'N.K.', 'N.L.', 'N.V.',
+    'O.E.', 'O.G.', 'O.Ü.', 'O.y.', 'P.C.', 'p.l.', 'Pty.', 'PUP.', 'Pvt.', 'r.t.', 'S.A.', 'S.D.', 'S.E.', 's.f.',
+    'S.L.', 'S.P.', 'S.s.', 'T.K.', 'T.Ü.', 'U.Ü.', 'Y.K.', 'А.Д.', 'І.П.', 'К.Д.', 'ПУП.', 'С.Д.', 'בע"מ', '任意組合',
+    '匿名組合', '合同会社', '合名会社', '合資会社', '有限会社', '有限公司', '株式会社', 'A/S', 'G/S', 'I/S', 'K/S', 'P/S', 'S/A'
+  ].each do |suffix|
+    fail suffix unless NameTamer::ADFIXES[:suffix][:organization].include? suffix
+  end
+end

data/doc/suffixes.csv

@@ -67,6 +67,7 @@ S.C.R.L.,,organization,100,,8
 S.M.B.A.,Selskab med begrænset ansvar,organization,100,Denmark,8
 S.P.R.L.,société privée à responsabilité limitée,organization,100,Belgium,8
 Е.О.О.Д.,ednolichno druzhestvo s ogranichena otgovornost,organization,100,Bulgaria,8
+&. Cie.,,organization,100,,7
 and Co.,,organization,100,,7
 Comm.V.,gewone commanditaire vennootschap,organization,100,Belgium,7
 Limited,Limited,organization,100,,7
@@ -143,7 +144,7 @@ A.y.,avoin yhtiö,organization,80,Finland,4
 B.M.,Be'eravon Mugbal,organization,100,Israel,4
 b.t.,betéti társaság,organization,100,Hungary,4
 B.V.,Besloten vennootschap,organization,100,Netherlands,4
-C.A.,Compañía Anónima,organization,75,Ecuador,4
+C.A.,Compañía Anónima,organization,50,Ecuador,4
 C.V.,Commanditaire vennootschap,organization,100,Netherlands,4
 d.d.,dioničko društvo,organization,100,Bosnia & Herzegovina,4
 e.c.,egyéni cég,organization,100,Hungary,4
@@ -210,72 +211,135 @@ G/S,Gensidigt selskab,organization,100,Denmark,3
 I/S,Interessentskab,organization,100,Denmark,3
 K/S,Kommanditselskab,organization,100,Denmark,3
 P/S,Partnerselskab ,organization,100,Denmark,3
+S/A,,organization,100,,3
+Chartered F.C.S.I.,,person,100,,18
+Chartered M.C.S.I.,,person,100,,18
+I.F.R.S. Certified,,person,100,,18
+F.Inst.L.M.,,person,100,,11
 C.I.S.S.P.,,person,100,,10
+F.C.I.P.S.,,person,100,,10
+M.R.I.C.S.,,person,100,,10
+T.M.I.E.T.,Member of the Institution of Engineering and Technology,person,100,,10
+Dip. D.M.,,person,100,,9
+A.A.M.S.,,person,100,,8
+A.C.C.A.,Association of Chartered Certified Accountants,person,100,,8
+A.C.M.A.,,person,100,,8
+A.I.F.A.,,person,100,,8
+A.W.M.A.,,person,100,,8
+C.A.I.A.,,person,100,,8
+C.A.P.M.,,person,100,,8
+C.C.I.M.,,person,100,,8
+C.D.F.A.,,person,100,,8
+C.E.P.P.,,person,100,,8
+C.F.B.S.,,person,100,,8
+C.G.M.A.,,person,100,,8
+C.I.T.P.,,person,100,,8
+C.L.T.C.,,person,100,,8
+C.P.C.C.,,person,100,,8
+C.R.P.C.,,person,100,,8
+C.R.P.S.,,person,100,,8
+C.S.O.X.,,person,100,,8
+C.S.S.D.,,person,100,,8
+F.B.C.S.,,person,100,,8
+F.C.C.A.,Fellow of the Association of Chartered Certified Accountants,person,100,,8
+F.C.M.I.,Fellow of the Chartered Management Institute,person,100,United Kingdom,8
+F.C.S.I.,,person,100,,8
+F.I.E.T.,Fellow of the Institution of Engineering and Technology,person,100,,8
+F.I.R.P.,,person,100,,8
+M.I.E.T.,Member of the Institution of Engineering and Technology,person,100,,8
+M.S.F.S.,,person,100,,8
+M.Sc. D.,,person,100,,8
+O.R.S.C.,,person,100,,8
+R.I.C.P.,,person,100,,8
 B.Tech.,Bachelor of Technology,person,100,,7
+Cantab.,,person,100,,7
+Ch.F.C.,,person,100,,7
 D.Phil.,Doctor of Philosophy,person,100,,7
+I.T.I.L. v3,,person,100,,7
+M.Io.D.,,person,100,,7
+S.C.M.P,,person,100,,7
+A.C.A.,Associate of the Institute of Chartered Accountants in England and Wales,person,100,United Kingdom,6
+A.C.C.,,person,100,,6
+A.E.P.,,person,100,,6
+A.I.F.,,person,100,,6
+A.S.A.,,person,100,,6
 B.Eng.,Bachelor of Engineering,person,100,,6
+C.B.V.,,person,100,,6
+C.E.M.,,person,100,,6
+C.Eng.,,person,100,,6
 C.F.A.,,person,100,,6
+C.F.F.,,person,100,,6
+C.F.P.,,person,100,,6
+C.F.S.,,person,100,,6
+C.G.A.,,person,100,,6
+C.G.B.,,person,100,,6
+C.G.P.,,person,100,,6
+C.I.M.,,person,100,,6
 C.L.P.,,person,100,,6
+C.L.U.,,person,100,,6
+C.M.A.,,person,100,,6
+C.M.T.,,person,100,,6
+C.P.A.,,person,100,,6
+C.T.A.,Chartered Tax Adviser,person,100,,6
+C.W.S.,,person,100,,6
 D.B.E.,Dame of the British Empire,person,100,,6
 D.D.S.,Doctor of Dental Surgery,person,100,,6
+D.V.M.,Doctor of Veterinary Medecine,person,100,,6
+E.R.P.,Energy Risk Professional,person,100,,6
 Eng.D.,Doctor of Engineering,person,100,,6
+F.C.A.,Fellow of the Institute of Chartered Accountants in England and Wales,person,100,United Kingdom,6
+F.P.C.,,person,100,,6
+F.R.M.,,person,100,,6
+F.R.M.,,person,100,,6
+G.S.P.,,person,100,,6
+L.P.S.,,person,100,,6
 M.B.A.,Master of Business Administration,person,100,,6
 M.B.E.,Member of the Order of the British Empire,person,100,,6
 M.E.P.,Member of the European Parliament,person,100,,6
 M.Eng.,Master of Engineering,person,100,,6
+M.Jur.,Master of Jurisprudence,person,100,United Kingdom,6
+M.P.A.,,person,100,,6
+M.S.F.,,person,100,,6
 M.S.P.,Member of the Scottish Parliament,person,100,,6
 O.B.E.,Order of the British Empire,person,100,,6
+P.C.C.,,person,100,,6
+P.F.S.,,person,100,,6
+P.H.R.,,person,100,,6
 P.M.C.,,person,100,,6
 P.M.P.,,person,100,,6
+P.M.P.,,person,100,,6
 P.S.P.,,person,100,,6
+R.F.C.,,person,100,,6
+V.M.D.,Doctor of Veterinary Medecine,person,100,,6
 B.Ed.,Bachelor of Education,person,20,,5
 B.Sc.,Bachelor of Science,person,100,,5
 Ed.D.,Doctor of Education,person,100,,5
+Ed.M.,,person,100,,5
+Hons.,,person,100,,5
 LL.B.,Bachelor of Laws,person,100,,5
 LL.D.,Doctor of Laws,person,100,,5
+LL.M.,Master of Laws,person,100,,5
 M.Ed.,Master of Education,person,100,,5
 M.Sc.,Master of Science,person,100,,5
+Oxon.,,person,100,,5
 Ph.D.,Doctor of Philosophy,person,100,,5
 B.A.,Bachelor of Arts,person,100,,4
+C.A.,,person,50,,4
+E.A.,,person,100,,4
 Esq.,Esquire,person,100,,4
 J.D.,Juris Doctor,person,100,,4
 K.C.,King's Counsel,person,100,,4
 M.A.,Master of Arts,person,100,,4
 M.D.,Doctor of Medicine,person,100,,4
 M.P.,Member of Parliament,person,100,,4
+M.S.,,person,100,,4
 O.K.,"(unknown personal suffix, poss. Oklahoma-related)",person,20,,4
 P.A.,Physician Assistant,person,100,,4
 Q.C.,Queen's Counsel,person,100,,4
+R.D.,,person,100,,4
 III,The Third,person,100,,3
 Jr.,Junior,person,100,,3
 Sr.,Senior,person,100,,3
 II,The Second,person,100,,2
 IV,The Fourth,person,100,,2
 V,The Fifth,person,20,,1
-D.V.M.,Doctor of Veterinary Medecine,person,100,,6
-V.M.D.,Doctor of Veterinary Medecine,person,100,,6
-M.I.E.T.,Member of the Institution of Engineering and Technology,person,100,,8
-T.M.I.E.T.,Member of the Institution of Engineering and Technology,person,100,,10
-F.I.E.T.,Fellow of the Institution of Engineering and Technology,person,100,,8
-E.R.P.,Energy Risk Professional,person,100,,6
-A.C.A.,Associate of the Institute of Chartered Accountants in England and Wales,person,100,United Kingdom,6
-C.T.A.,Chartered Tax Adviser,person,100,,6
-F.C.A.,Fellow of the Institute of Chartered Accountants in England and Wales,person,100,United Kingdom,6
-M.Jur.,Master of Jurisprudence,person,100,United Kingdom,6
-F.C.M.I.,Fellow of the Chartered Management Institute,person,100,United Kingdom,8
-F.C.C.A.,Fellow of the Association of Chartered Certified Accountants,person,100,,8
-A.C.C.A.,Association of Chartered Certified Accountants,person,100,,8
-&. Cie.,,organization,100,,7
-I.T.I.L. v3,,person,100,,7
-P.M.P.,,person,100,,6
-F.I.R.P.,,person,100,,8
-C.Eng.,,person,100,,6
-S/A,,organization,100,,3
-Chartered F.C.S.I.,,person,100,,18
-F.P.C.,,person,100,,6
-F.R.M.,,person,100,,6
-Oxon.,,person,100,,5
-Cantab.,,person,100,,7
-C.I.T.P.,,person,100,,8
-F.B.C.S.,,person,100,,8
-Hons.,,person,100,5

data/lib/name-tamer.rb

@@ -22,9 +22,9 @@ class NameTamer
 
     # Make a slug from a string
     def parameterize(string, args = {})
-      sep     = args[:sep]      || SLUG_DELIMITER
-      rfc3987 = args[:rfc3987]  || false
-      filter  = args[:filter]   || (rfc3987 ? FILTER_RFC3987 : FILTER_COMPAT)
+      sep = args[:sep] || SLUG_DELIMITER
+      rfc3987 = args[:rfc3987] || false
+      filter = args[:filter] || (rfc3987 ? FILTER_RFC3987 : FILTER_COMPAT)
 
       new_string = string.dup
 
@@ -47,11 +47,11 @@ class NameTamer
     unless @tidy_name
       @tidy_name = name.dup # Start with the name we've received
 
-      unescape              # Unescape percent-encoded characters and fix UTF-8 encoding
-      remove_zero_width     # remove zero-width characters
-      tidy_spacing          # " John   Smith " -> "John Smith"
-      fix_encoding_errors   # "Ren\u00c3\u00a9 Descartes" -> "Ren\u00e9 Descartes"
-      consolidate_initials  # "I. B. M." -> "I.B.M."
+      unescape # Unescape percent-encoded characters and fix UTF-8 encoding
+      remove_zero_width # remove zero-width characters
+      tidy_spacing # " John   Smith " -> "John Smith"
+      fix_encoding_errors # "Ren\u00c3\u00a9 Descartes" -> "Ren\u00e9 Descartes"
+      consolidate_initials # "I. B. M." -> "I.B.M."
     end
 
     @tidy_name
@@ -59,13 +59,13 @@ class NameTamer
 
   def nice_name
     unless @nice_name
-      @nice_name = tidy_name.dup      # Start with the tidied name
+      @nice_name = tidy_name.dup # Start with the tidied name
 
-      remove_adfixes                  # prefixes and suffixes: "Smith, John, Jr." -> "Smith, John"
-      fixup_last_name_first           # "Smith, John" -> "John Smith"
-      fixup_mismatched_braces         # "Ceres (AZ" -> "Ceres (AZ)"
-      remove_adfixes                  # prefixes and suffixes: "Mr John Smith Jr." -> "John Smith"
-      name_wrangle                    # proper name case and non-breaking spaces
+      remove_adfixes # prefixes and suffixes: "Smith, John, Jr." -> "Smith, John"
+      fixup_last_name_first # "Smith, John" -> "John Smith"
+      fixup_mismatched_braces # "Ceres (AZ" -> "Ceres (AZ)"
+      remove_adfixes # prefixes and suffixes: "Mr John Smith Jr." -> "John Smith"
+      name_wrangle # proper name case and non-breaking spaces
       use_nonbreaking_spaces_in_compound_names
     end
 
@@ -74,12 +74,12 @@ class NameTamer
 
   def simple_name
     unless @simple_name
-      @simple_name = nice_name.dup    # Start with nice name
+      @simple_name = nice_name.dup # Start with nice name
 
-      remove_initials               # "John Q. Doe" -> "John Doe"
-      remove_middle_names           # "Philip Seymour Hoffman" -> "Philip Hoffman"
-      remove_periods_from_initials  # "J.P.R. Williams" -> "JPR Williams"
-      standardize_words             # "B&Q Intl" -> "B and Q International"
+      remove_initials # "John Q. Doe" -> "John Doe"
+      remove_middle_names # "Philip Seymour Hoffman" -> "Philip Hoffman"
+      remove_periods_from_initials # "J.P.R. Williams" -> "JPR Williams"
+      standardize_words # "B&Q Intl" -> "B and Q International"
 
       @simple_name.whitespace_to!(ASCII_SPACE)
     end
@@ -191,14 +191,14 @@ class NameTamer
 
     return unless parts.count == 2
 
-    @last_name    = parts[0] # Sometimes the last name alone is all caps and we can name-case it
-    @remainder    = parts[1]
+    @last_name = parts[0] # Sometimes the last name alone is all caps and we can name-case it
+    @remainder = parts[1]
   end
 
   # Sometimes we end up with mismatched braces after adfix stripping
   # e.g. "Ceres (Ceres Holdings LLC)" -> "Ceres (Ceres Holdings"
   def fixup_mismatched_braces
-    left_brace_count  = @nice_name.count '('
+    left_brace_count = @nice_name.count '('
     right_brace_count = @nice_name.count ')'
 
     if left_brace_count > right_brace_count
@@ -228,15 +228,15 @@ class NameTamer
       fix_case = true if [uppercase, lowercase].include?(@nice_name)
     end
 
-    @nice_name  = name_case(lowercase) if fix_case
+    @nice_name = name_case(lowercase) if fix_case
   end
 
   def name_wrangle_split_name
     # 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 [uppercase, lowercase].include?(@last_name)
-    @nice_name  = "#{@remainder} #{@last_name}"
+    @last_name = name_case(lowercase) if [uppercase, lowercase].include?(@last_name)
+    @nice_name = "#{@remainder} #{@last_name}"
   end
 
   # Conjoin compound names with non-breaking spaces
@@ -265,12 +265,12 @@ class NameTamer
     return unless @contact_type == :person
 
     first_name, parts = find_first_usable_name(@simple_name.split)
-    last_name, _      = find_last_usable_name(parts)
+    last_name, = find_last_usable_name(parts)
 
     return unless first_name || last_name
 
-    separator     = first_name && last_name ? ' ' : ''
-    @simple_name  = "#{first_name}#{separator}#{last_name}"
+    separator = first_name && last_name ? ' ' : ''
+    @simple_name = "#{first_name}#{separator}#{last_name}"
   end
 
   def find_first_usable_name(parts)
@@ -303,11 +303,11 @@ class NameTamer
   end
 
   def standardize_words
-    @simple_name.gsub!(/ *& */, ' and ')                 # replace ampersand characters with ' and '
-    @simple_name.gsub!(/ *\+ */, ' plus ')               # replace plus signs with ' plus '
-    @simple_name.gsub!(/\bintl\b/i, 'International')     # replace 'intl' with 'International'
+    @simple_name.gsub!(/ *& */, ' and ') # replace ampersand characters with ' and '
+    @simple_name.gsub!(/ *\+ */, ' plus ') # replace plus signs with ' plus '
+    @simple_name.gsub!(/\bintl\b/i, 'International') # replace 'intl' with 'International'
     @simple_name.gsub!(/[־‐‑‒–—―−﹘﹣－]/, SLUG_DELIMITER) # Replace Unicode dashes with ASCII hyphen
-    @simple_name.strip_unwanted!(/["“”™℠®©℗]/)           # remove quotes and commercial decoration
+    @simple_name.strip_unwanted!(/["“”™℠®©℗]/) # remove quotes and commercial decoration
   end
 
   #--------------------------------------------------------
@@ -315,18 +315,18 @@ class NameTamer
   #--------------------------------------------------------
 
   def initialize(new_name, args = {})
-    @name         = new_name || ''
+    @name = new_name || ''
     @contact_type = contact_type_from args
 
-    @tidy_name    = nil
-    @nice_name    = nil
-    @simple_name  = nil
-    @slug         = nil
+    @tidy_name = nil
+    @nice_name = nil
+    @simple_name = nil
+    @slug = nil
 
-    @last_name    = nil
-    @remainder    = nil
+    @last_name = nil
+    @remainder = nil
 
-    @adfix_found  = false
+    @adfix_found = false
   end
 
   def contact_type_from(args)
@@ -369,17 +369,17 @@ class NameTamer
   end
 
   def find_contact_type_and_parts(adfixes, name_part)
-    ct            = contact_type_best_effort
-    parts         = name_part.partition adfixes[ct]
-    @adfix_found  = !parts[1].empty?
+    ct = contact_type_best_effort
+    parts = name_part.partition adfixes[ct]
+    @adfix_found = !parts[1].empty?
 
     return [ct, parts] if @contact_type || @adfix_found
 
     # If the contact type is indeterminate and we didn't find a diagnostic adfix
     # for a person then try again for an organization
-    ct            = :organization
-    parts         = name_part.partition adfixes[ct]
-    @adfix_found  = !parts[1].empty?
+    ct = :organization
+    parts = name_part.partition adfixes[ct]
+    @adfix_found = !parts[1].empty?
 
     [ct, parts]
   end
@@ -413,9 +413,9 @@ class NameTamer
   #--------------------------------------------------------
 
   NONBREAKING_SPACE = "\u00a0"
-  ASCII_SPACE       = "\u0020"
-  ADFIX_JOINERS     = "[#{ASCII_SPACE}-]"
-  SLUG_DELIMITER    = '-'
+  ASCII_SPACE = "\u0020"
+  ADFIX_JOINERS = "[#{ASCII_SPACE}-]"
+  SLUG_DELIMITER = '-'
   ZERO_WIDTH_FILTER = /[\u180E\u200B\u200C\u200D\u2063\uFEFF]/
 
   # Constants for parameterizing Unicode strings for IRIs
@@ -447,14 +447,14 @@ class NameTamer
   # We're using the most restrictive segment definition (isegment-nz-nc)
   # to avoid any possible problems with the IRI that it one day might
   # get placed in.
-  ALPHA           = 'A-Za-z'
-  DIGIT           = '0-9'
-  UCSCHAR         = '\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF'
-  IUNRESERVED     = "#{ALPHA}#{DIGIT}\\-\\._~#{UCSCHAR}"
-  SUBDELIMS       = '!$&\'\(\)\*+,;='
-  ISEGMENT_NZ_NC  = "#{IUNRESERVED}#{SUBDELIMS}@" # pct-encoded not needed
-  FILTER_RFC3987  = /[^#{ISEGMENT_NZ_NC}]/
-  FILTER_COMPAT   = /[^#{ALPHA}#{DIGIT}\-_#{UCSCHAR}]/
+  ALPHA = 'A-Za-z'
+  DIGIT = '0-9'
+  UCSCHAR = '\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF'
+  IUNRESERVED = "#{ALPHA}#{DIGIT}\\-\\._~#{UCSCHAR}"
+  SUBDELIMS = '!$&\'\(\)\*+,;='
+  ISEGMENT_NZ_NC = "#{IUNRESERVED}#{SUBDELIMS}@" # pct-encoded not needed
+  FILTER_RFC3987 = /[^#{ISEGMENT_NZ_NC}]/
+  FILTER_COMPAT = /[^#{ALPHA}#{DIGIT}\-_#{UCSCHAR}]/
 
   # These are the prefixes and suffixes we want to remove
   # If you add to the list, you can use spaces and dots where appropriate
@@ -478,15 +478,19 @@ class NameTamer
     },
     suffix: {
       person: [
-        'Chartered F.C.S.I.',
-        'C.I.S.S.P.', 'T.M.I.E.T.', 'A.C.C.A.', 'C.I.T.P.', 'F.B.C.S.', 'F.C.C.A.', 'F.C.M.I.', 'F.I.E.T.', 'F.I.R.P.',
-        'M.I.E.T.', 'B.Tech.',
-        'Cantab.', 'D.Phil.', 'I.T.I.L. v3', 'B.Eng.', 'C.Eng.', 'M.Jur.', 'C.F.A.', 'D.B.E.', 'C.L.P.',
-        'D.D.S.', 'D.V.M.', 'Eng.D.', 'A.C.A.', 'C.T.A.', 'E.R.P.', 'F.C.A', 'F.P.C.', 'F.R.M.', 'M.B.A.', 'M.B.E.',
-        'M.E.P.', 'M.Eng.', 'M.Jur.', 'M.S.P.', 'O.B.E.', 'P.M.C.', 'P.M.P.', 'P.S.P.', 'V.M.D.', 'B.Ed.', 'B.Sc.',
-        'Ed.D.', 'Hons.', 'LL.B.',
-        'LL.D.', 'LL.M.', 'M.Ed.', 'M.Sc.', 'Oxon.', 'Ph.D.', 'B.A.', 'Esq.', 'J.D.', 'K.C.', 'M.A.', 'M.D.', 'M.P.',
-        'O.K.', 'P.A.', 'Q.C.', 'III', 'Jr.', 'Sr.', 'II', 'IV', 'I', 'V'
+        'Chartered F.C.S.I.', 'Chartered M.C.S.I.', 'I.F.R.S. Certified', 'F.Inst.L.M.', 'C.I.S.S.P.', 'F.C.I.P.S.',
+        'M.R.I.C.S.', 'T.M.I.E.T.', 'Dip. D.M.', 'A.A.M.S.', 'A.C.C.A.', 'A.C.M.A.', 'A.I.F.A.', 'A.W.M.A.', 'C.A.I.A.',
+        'C.A.P.M.', 'C.C.I.M.', 'C.D.F.A.', 'C.E.P.P.', 'C.F.B.S.', 'C.G.M.A.', 'C.I.T.P.', 'C.L.T.C.', 'C.P.C.C.',
+        'C.R.P.C.', 'C.R.P.S.', 'C.S.O.X.', 'C.S.S.D.', 'F.B.C.S.', 'F.C.C.A.', 'F.C.M.I.', 'F.C.S.I.', 'F.I.E.T.',
+        'F.I.R.P.', 'M.I.E.T.', 'M.S.F.S.', 'M.Sc. D.', 'O.R.S.C.', 'R.I.C.P.', 'B.Tech.', 'Cantab.', 'Ch.F.C.',
+        'D.Phil.', 'I.T.I.L. v3', 'M.Io.D.', 'S.C.M.P', 'A.C.A.', 'A.C.C.', 'A.E.P.', 'A.I.F.', 'A.S.A.', 'B.Eng.',
+        'C.B.V.', 'C.E.M.', 'C.Eng.', 'C.F.A.', 'C.F.F.', 'C.F.P.', 'C.F.S.', 'C.G.A.', 'C.G.B.', 'C.G.P.', 'C.I.M.',
+        'C.L.P.', 'C.L.U.', 'C.M.A.', 'C.M.T.', 'C.P.A.', 'C.T.A.', 'C.W.S.', 'D.B.E.', 'D.D.S.', 'D.V.M.', 'E.R.P.',
+        'Eng.D.', 'F.C.A.', 'F.P.C.', 'F.R.M.', 'F.R.M.', 'G.S.P.', 'L.P.S.', 'M.B.A.', 'M.B.E.', 'M.E.P.', 'M.Eng.',
+        'M.Jur.', 'M.P.A.', 'M.S.F.', 'M.S.P.', 'O.B.E.', 'P.C.C.', 'P.F.S.', 'P.H.R.', 'P.M.C.', 'P.M.P.', 'P.M.P.',
+        'P.S.P.', 'R.F.C.', 'V.M.D.', 'B.Ed.', 'B.Sc.', 'Ed.D.', 'Ed.M.', 'Hons.', 'LL.B.', 'LL.D.', 'LL.M.', 'M.Ed.',
+        'M.Sc.', 'Oxon.', 'Ph.D.', 'B.A.', 'C.A.', 'E.A.', 'Esq.', 'J.D.', 'K.C.', 'M.A.', 'M.D.', 'M.P.', 'M.S.',
+        'O.K.', 'P.A.', 'Q.C.', 'R.D.', 'III', 'Jr.', 'Sr.', 'II', 'IV', 'V'
       ],
       organization: [
         'S. de R.L. de C.V.', 'S.A.P.I. de C.V.', 'y. Cía. S. en C.', 'Private Limited', 'S.M. Pte. Ltd.',
@@ -494,12 +498,11 @@ class NameTamer
         'S.p. z.o.o.', '(Pvt.)Ltd.', 'akc. spol.', 'Cía. Ltda.', 'E.B.V.B.A.', 'P. Limited', 'S. de R.L.', 'S.I.C.A.V.',
         'S.P.R.L.U.', 'А.Д.С.И.Ц.', '(P.) Ltd.', 'C. por A.', 'Comm.V.A.', 'Ltd. Şti.', 'Plc. Ltd.', 'Pte. Ltd.',
         'Pty. Ltd.', 'Pvt. Ltd.', 'Soc. Col.', 'A.M.B.A.', 'A.S.B.L.', 'A.V.E.E.', 'B.V.B.A.', 'B.V.I.O.', 'C.V.B.A.',
-        'C.V.O.A.', 'E.E.I.G.', 'E.I.R.L.', 'E.O.O.D.', 'E.U.R.L.', 'F.M.B.A.', 'G.m.b.H.', 'Ges.b.R.', 'I.L.L.C.',
-        'K.G.a.A.', 'L.L.L.P.', 'Ltd. Co.', 'Ltd. Co.', 'M.E.P.E.', 'n.y.r.t.', 'O.V.E.E.', 'P.E.E.C.', 'P.L.L.C.',
-        'P.L.L.C.', 'S. en C.', 'S.a.p.a.', 'S.A.R.L.', 'S.à.R.L.', 'S.A.S.U.', 'S.C.e.I.', 'S.C.O.P.', 'S.C.p.A.',
-        'S.C.R.I.', 'S.C.R.L.', 'S.M.B.A.', 'S.P.R.L.', 'Е.О.О.Д.', 'and Co.', 'Comm.V.', 'Limited', 'P. Ltd.',
-        'Part.G.', 'Sh.p.k.', '&. Co.', '&. Cie.', 'C.X.A.', 'd.n.o.', 'd.o.o.', 'E.A.D.', 'e.h.f.', 'E.P.E.', 'E.S.V.',
-        'F.C.P.',
+        'C.V.O.A.', 'E.E.I.G.', 'E.I.R.L.', 'E.O.O.D.', 'E.U.R.L.', 'F.M.B.A.', 'G.m.b.H.', 'Ges.b.R.', 'K.G.a.A.',
+        'L.L.L.P.', 'Ltd. Co.', 'Ltd. Co.', 'M.E.P.E.', 'n.y.r.t.', 'O.V.E.E.', 'P.E.E.C.', 'P.L.L.C.', 'P.L.L.C.',
+        'S. en C.', 'S.a.p.a.', 'S.A.R.L.', 'S.à.R.L.', 'S.A.S.U.', 'S.C.e.I.', 'S.C.O.P.', 'S.C.p.A.', 'S.C.R.I.',
+        'S.C.R.L.', 'S.M.B.A.', 'S.P.R.L.', 'Е.О.О.Д.', '&. Cie.', 'and Co.', 'Comm.V.', 'Limited', 'P. Ltd.',
+        'Part.G.', 'Sh.p.k.', '&. Co.', 'C.X.A.', 'd.n.o.', 'd.o.o.', 'E.A.D.', 'e.h.f.', 'E.P.E.', 'E.S.V.', 'F.C.P.',
         'F.I.E.', 'G.b.R.', 'G.I.E.', 'G.M.K.', 'G.S.K.', 'H.U.F.', 'K.D.A.', 'k.f.t.', 'k.h.t.', 'k.k.t.', 'L.L.C.',
         'L.L.P.', 'o.h.f.', 'O.H.G.', 'O.O.D.', 'O.y.j.', 'p.l.c.', 'P.S.U.', 'S.A.E.', 'S.A.S.', 'S.C.A.', 'S.C.E.',
         'S.C.S.', 'S.E.M.', 'S.E.P.', 's.e.s.', 'S.G.R.', 'S.N.C.', 'S.p.A.', 'S.P.E.', 'S.R.L.', 's.r.o.', 'Unltd.',
@@ -519,13 +522,13 @@ class NameTamer
   ADFIX_PATTERNS = {}
 
   [:prefix, :suffix].each do |adfix_type|
-    patterns  = {}
-    adfix     = ADFIXES[adfix_type]
+    patterns = {}
+    adfix = ADFIXES[adfix_type]
 
     [:person, :organization].each do |ct|
-      with_optional_spaces    = adfix[ct].map { |p| p.gsub(ASCII_SPACE, ' *') }
-      pattern_string          = with_optional_spaces.join('|').gsub('.', '\.*')
-      patterns[ct]  = /#{adfix[:before]}\(*(?:#{pattern_string})\)*#{adfix[:after]}/i
+      with_optional_spaces = adfix[ct].map { |p| p.gsub(ASCII_SPACE, ' *') }
+      pattern_string = with_optional_spaces.join('|').gsub('.', '\.*')
+      patterns[ct] = /#{adfix[:before]}\(*(?:#{pattern_string})[®™\)]*#{adfix[:after]}/i
     end
 
     ADFIX_PATTERNS[adfix_type] = patterns

data/lib/name-tamer/version.rb

@@ -1,3 +1,3 @@
 class NameTamer
-  VERSION = '0.2.15'
+  VERSION = '0.3.0'
 end

data/lib/string_extras.rb

@@ -22,7 +22,7 @@ class String
   # Change some characters embedded in words to our separator character
   # e.g. example.com -> example-com
   def invalid_chars_to!(separator)
-    substitute!(/(?<![[:space:]])[\.\/](?![[:space:]])/, separator)
+    substitute!(%r{(?<![[:space:]])[\.\/](?![[:space:]])}, separator)
   end
 
   # Unescape percent-encoded characters
@@ -166,15 +166,15 @@ class String
   end
 
   NONBREAKING_SPACE = "\u00a0"
-  ASCII_SPACE       = "\u0020"
+  ASCII_SPACE = "\u0020"
 
-  COMPOUND_NAMES  = [
+  COMPOUND_NAMES = [
     'Lane Fox', 'Bonham Carter', 'Pitt Rivers', 'Lloyd Webber', 'Sebag Montefiore', 'Holmes à Court', 'Holmes a Court',
     'Baron Cohen', 'Strang Steel',
     'Service Company', 'Corporation Company', 'Corporation System', 'Incorporations Limited'
   ]
 
-  NAME_MODIFIERS  = [
+  NAME_MODIFIERS = [
     'Al', 'Ap', 'Ben', 'Dell[ae]', 'D[aeiou]', 'De[lrn]', 'D[ao]s', 'El', 'La', 'L[eo]', 'V[ao]n', 'Of', 'San',
     'St[\.]?', 'Zur'
   ]

data/name-tamer.gemspec

@@ -3,25 +3,28 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'name-tamer/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = 'name-tamer'
-  spec.version       = NameTamer::VERSION
-  spec.authors       = ['Xenapto']
-  spec.email         = ['developers@xenapto.com']
-  spec.description   = 'Useful methods for taming names'
-  spec.summary       = "Example: NameTamer['Mr. John Q. Smith III, MD'].simple_name # => John Smith"
-  spec.homepage      = 'https://github.com/Xenapto/name-tamer'
-  spec.license       = 'MIT'
+  spec.name = 'name-tamer'
+  spec.version = NameTamer::VERSION
+  spec.authors = ['Xenapto']
+  spec.email = ['developers@xenapto.com']
+  spec.description = 'Useful methods for taming names'
+  spec.summary = "Example: NameTamer['Mr. John Q. Smith III, MD'].simple_name # => John Smith"
+  spec.homepage = 'https://github.com/Xenapto/name-tamer'
+  spec.license = 'MIT'
 
-  spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
-  spec.executables   = spec.files.grep(/^bin\//) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(/^(test|spec|features|coverage)\//)
+  spec.files = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
+  spec.executables = spec.files.grep(%r{^bin\/}) { |f| File.basename(f) }
+  spec.test_files = spec.files.grep(%r{^(test|spec|features|coverage)\/})
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1'
+  #- spec.add_development_dependency 'bundler', '~> 1.10'
   spec.add_development_dependency 'rake', '~> 10'
-  spec.add_development_dependency 'rspec', '~> 2'
-  spec.add_development_dependency 'gem-release', '~> 0'
-  spec.add_development_dependency 'simplecov', '~> 0.7', '>= 0.7.1' # https://github.com/colszowka/simplecov/issues/281
-  spec.add_development_dependency 'coveralls', '~> 0'
-  spec.add_development_dependency 'rubocop', '~> 0'
+  spec.add_development_dependency 'rspec', '~> 3.3'
+  spec.add_development_dependency 'gem-release', '~> 0.7'
+  spec.add_development_dependency 'simplecov', '~> 0.10'
+  spec.add_development_dependency 'coveralls', '~> 0.8'
+  spec.add_development_dependency 'rubocop', '~> 0.32'
+  spec.add_development_dependency 'guard', '~> 2.12'
+  spec.add_development_dependency 'guard-rspec', '~> 4.5'
+  spec.add_development_dependency 'guard-rubocop', '~> 1.2'
 end

data/spec/name_tamer_spec.rb

@@ -191,48 +191,59 @@ describe NameTamer do
       { n: "John Smith\u{FEFF}\u{200B}\u{200C}\u{200D}\u{2063}", t: :person,
         nn: 'John Smith', sn: 'John Smith', s: 'john-smith' }, # Zero-width characters
       { n: 'Herman Melville ,CLP', t: :person, nn: 'Herman Melville', sn: 'Herman Melville', s: 'herman-melville' },
+      { n: 'Herman Melville, CLP®', t: :person, nn: 'Herman Melville', sn: 'Herman Melville', s: 'herman-melville' },
+      { n: 'Herman Melville, CLP™', t: :person, nn: 'Herman Melville', sn: 'Herman Melville', s: 'herman-melville' },
+      { n: 'Herman Melville, CLP®™', t: :person, nn: 'Herman Melville', sn: 'Herman Melville', s: 'herman-melville' },
+      { n: 'Herman Melville, CLP™®', t: :person, nn: 'Herman Melville', sn: 'Herman Melville', s: 'herman-melville' },
       { n: 'Melville ,Herman', t: :person, nn: 'Herman Melville', sn: 'Herman Melville', s: 'herman-melville' },
-      { n: "John\x00 Smith", t: :person, nn: 'John Smith', sn: 'John Smith', s: 'john-smith' }
+      { n: "John\x00 Smith", t: :person, nn: 'John Smith', sn: 'John Smith', s: 'john-smith' },
+      {
+        n: 'Janen Moyer-Pesso, AWMA, CDFA, LPS',
+        t: :person,
+        nn: 'Janen Moyer-Pesso',
+        sn: 'Janen Moyer-Pesso',
+        s: 'janen-moyer-pesso'
+      }
     ]
   end
 
   it 'makes a slug' do
     names.each do |name_data|
       name = name_data[:n]
-      NameTamer[name, contact_type: name_data[:t]].slug.should == name_data[:s]
+      expect(NameTamer[name, contact_type: name_data[:t]].slug).to eq(name_data[:s])
     end
   end
 
   it 'makes a nice name' do
     names.each do |name_data|
-      name      = name_data[:n]
+      name = name_data[:n]
       nice_name = NameTamer[name, contact_type: name_data[:t]].nice_name
-      nice_name.should == name_data[:nn]
+      expect(nice_name).to eq(name_data[:nn])
     end
   end
 
   it 'makes a searchable name' do
     names.each do |name_data|
       name = name_data[:n]
-      NameTamer[name, contact_type: name_data[:t]].simple_name.should == name_data[:sn]
+      expect(NameTamer[name, contact_type: name_data[:t]].simple_name).to eq(name_data[:sn])
     end
   end
 end
 
 describe 'contact type inference' do
   it 'infers that "Mr. John Smith" is a person' do
-    NameTamer['Mr. John Smith'].contact_type.should eq(:person)
+    expect(NameTamer['Mr. John Smith'].contact_type).to eq(:person)
   end
 
   it 'infers that "Di Doo Doo d.o.o." is an organization' do
-    NameTamer['Di Doo Doo d.o.o.'].contact_type.should eq(:organization)
+    expect(NameTamer['Di Doo Doo d.o.o.'].contact_type).to eq(:organization)
   end
 
   it 'infers that "DiDooDoo" is an organization' do
-    NameTamer['DiDooDoo'].contact_type.should eq(:organization)
+    expect(NameTamer['DiDooDoo'].contact_type).to eq(:organization)
   end
 
   it 'infers that "John Smith" is a person' do
-    NameTamer['John Smith'].contact_type.should eq(:person)
+    expect(NameTamer['John Smith'].contact_type).to eq(:person)
   end
 end

metadata

@@ -1,119 +1,141 @@
 --- !ruby/object:Gem::Specification
 name: name-tamer
 version: !ruby/object:Gem::Version
-  version: 0.2.15
+  version: 0.3.0
 platform: ruby
 authors:
 - Xenapto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-25 00:00:00.000000000 Z
+date: 2015-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '10'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10'
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: gem-release
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
-  name: gem-release
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.10'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
-    - - ">="
+        version: '0.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: '0.32'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
-    - - ">="
+        version: '0.32'
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.12'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: '2.12'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.5'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: guard-rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
 description: Useful methods for taming names
 email:
 - developers@xenapto.com
@@ -125,9 +147,11 @@ files:
 - ".gitignore"
 - ".hound.yml"
 - ".rubocop.yml"
+- ".ruby-gemset"
 - ".ruby-version"
 - Gemfile
 - Gemfile.lock
+- Guardfile
 - LICENSE
 - README.md
 - Rakefile
@@ -160,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: 'Example: NameTamer[''Mr. John Q. Smith III, MD''].simple_name # => John
@@ -168,3 +192,4 @@ summary: 'Example: NameTamer[''Mr. John Q. Smith III, MD''].simple_name # => Joh
 test_files:
 - spec/name_tamer_spec.rb
 - spec/spec_helper.rb
+has_rdoc: