name-tamer 0.2.14 → 0.2.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5db87ceb78cbdd1c4f46a674c0514430799dac05
-  data.tar.gz: 9269bd1897a577ec14ba3b8f792060ef27b5ccc0
+  metadata.gz: 8dece3dacb2fbd41e1c31931973b534a36868789
+  data.tar.gz: bc65a4149e6d28126cab01d3093bbfdb9670e46e
 SHA512:
-  metadata.gz: 76db6dcdfb49fcd3cc449df4bcad7cfecef6a2bae6753b9799794866938e7ac571c9f3b7a424e3c119828814fca3a759296f9af4a51c2c12482801066920a440
-  data.tar.gz: 2523f85e57a9fb721cb91f099a4a844fddd3be306b911ae7799f96bd42cd5bad99b582de0967a74d04feaa1fe66b014e3137a98b504103231eac3d33d1e44ff0
+  metadata.gz: 951fce5bc9a6493145c24ebb8cc08791b5941334f5c38ea649d4e12d5f5e0ba3ec849486a40ef2916d7eb3f7d3da77215df38008f490b9627620e3f8a6408caa
+  data.tar.gz: 7297d3ac2c61e7907d117d0ed6d0548c26f283cb08029cf4bd5bcd9c6cee274c4e7b71cb6ba4994dc1a8b3d776fc2df4c27f44161f10a0ec3c161a3ed318f34d

data/.hound.yml

@@ -1,27 +1,6 @@
-LineLength:
-  Description: 'Limit lines to 120 characters.'
-  Max: 120
-  Enabled: true
-
-MethodLength:
-  Description: 'Avoid methods longer than 10 lines of code.'
-  Max: 23
-  Enabled: true
-
-Documentation:
-  Description: 'Document classes and non-namespace modules.'
-  Enabled: false
-
-FileName:
-  Description: 'Use snake_case for source file names.'
-  Enabled: false
-
-DotPosition:
-  Description: 'Checks the position of the dot in multi-line method calls.'
-  EnforcedStyle: leading
-  # EnforcedStyle: trailing
-  Enabled: true
-
-StringLiterals:
-  EnforcedStyle: single_quotes
-  Enabled: true
+---
+ruby:
+  enabled: true
+  config_file: .rubocop.yml
+coffee_script:
+  enabled: true

data/.rubocop.yml

@@ -1,4 +1,30 @@
-inherit_from: .hound.yml
+LineLength:
+  Description: 'Limit lines to 120 characters.'
+  Max: 120
+  Enabled: true
+
+MethodLength:
+  Description: 'Avoid methods longer than 10 lines of code.'
+  Max: 23
+  Enabled: true
+
+Documentation:
+  Description: 'Document classes and non-namespace modules.'
+  Enabled: false
+
+FileName:
+  Description: 'Use snake_case for source file names.'
+  Enabled: false
+
+DotPosition:
+  Description: 'Checks the position of the dot in multi-line method calls.'
+  EnforcedStyle: leading
+  # EnforcedStyle: trailing
+  Enabled: true
+
+StringLiterals:
+  EnforcedStyle: single_quotes
+  Enabled: true
 
 CyclomaticComplexity:
   Description: 'Avoid complex methods.'
@@ -7,4 +33,4 @@ CyclomaticComplexity:
 ClassLength:
   Description: 'Avoid classes longer than 100 lines of code.'
   CountComments: false  # count full line comments?
-  Max: 321
+  Max: 331

data/.ruby-version

@@ -1 +1 @@
-2.1.2
+2.2.0

data/Gemfile.lock

@@ -1,25 +1,34 @@
 PATH
   remote: .
   specs:
-    name-tamer (0.2.13)
+    name-tamer (0.2.14)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    coveralls (0.7.2)
-      multi_json (~> 1.3)
-      rest-client (= 1.6.7)
-      simplecov (>= 0.7)
-      term-ansicolor (= 1.2.2)
-      thor (= 0.18.1)
+    ast (2.0.0)
+    astrolabe (1.3.0)
+      parser (>= 2.2.0.pre.3, < 3.0)
+    coveralls (0.7.11)
+      multi_json (~> 1.10)
+      rest-client (>= 1.6.8, < 2)
+      simplecov (~> 0.9.1)
+      term-ansicolor (~> 1.3)
+      thor (~> 0.19.1)
     diff-lcs (1.2.5)
     docile (1.1.5)
     gem-release (0.7.3)
     mime-types (2.4.3)
     multi_json (1.10.1)
+    netrc (0.10.3)
+    parser (2.2.0.3)
+      ast (>= 1.1, < 3.0)
+    powerpack (0.1.0)
+    rainbow (2.0.0)
     rake (10.4.2)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
+    rest-client (1.7.3)
+      mime-types (>= 1.16, < 3.0)
+      netrc (~> 0.7)
     rspec (2.99.0)
       rspec-core (~> 2.99.0)
       rspec-expectations (~> 2.99.0)
@@ -27,16 +36,23 @@ GEM
     rspec-core (2.99.2)
     rspec-expectations (2.99.2)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.99.2)
-    simplecov (0.9.1)
+    rspec-mocks (2.99.3)
+    rubocop (0.29.1)
+      astrolabe (~> 1.3)
+      parser (>= 2.2.0.1, < 3.0)
+      powerpack (~> 0.1)
+      rainbow (>= 1.99.1, < 3.0)
+      ruby-progressbar (~> 1.4)
+    ruby-progressbar (1.7.1)
+    simplecov (0.9.2)
       docile (~> 1.1.0)
       multi_json (~> 1.0)
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
-    term-ansicolor (1.2.2)
-      tins (~> 0.8)
-    thor (0.18.1)
-    tins (0.13.2)
+      simplecov-html (~> 0.9.0)
+    simplecov-html (0.9.0)
+    term-ansicolor (1.3.0)
+      tins (~> 1.0)
+    thor (0.19.1)
+    tins (1.3.4)
 
 PLATFORMS
   ruby
@@ -48,4 +64,5 @@ DEPENDENCIES
   name-tamer!
   rake (~> 10)
   rspec (~> 2)
+  rubocop (~> 0)
   simplecov (~> 0.7, >= 0.7.1)

data/doc/maintenance.rake

@@ -1,31 +1,31 @@
-# encoding: utf-8
-require 'csv'
-
-desc 'Build prefixes and suffixes'
-  task :adfixes do
-    pp = []
-    po = []
-    sp = []
-    so = []
-
-    CSV.foreach("#{File.dirname(__FILE__)}/prefixes.csv", headers:true) do |row|
-      if row[2] == 'person'
-        pp << row[0]
-      else
-        po << row[0]
-      end
-    end
-
-    CSV.foreach("#{File.dirname(__FILE__)}/suffixes.csv", headers:true) do |row|
-      if row[2] == 'person'
-        sp << row[0]
-      else
-        so << row[0]
-      end
-    end
-
-    puts "'" + pp.join("', '") + "'"
-    puts "'" + po.join("', '") + "'"
-    puts "'" + sp.join("', '") + "'"
-    puts "'" + so.join("', '") + "'"
-  end
+# encoding: utf-8
+require 'csv'
+
+desc 'Build prefixes and suffixes'
+task :adfixes do
+  pp = []
+  po = []
+  sp = []
+  so = []
+
+  CSV.foreach("#{File.dirname(__FILE__)}/prefixes.csv", headers: true) do |row|
+    if row[2] == 'person'
+      pp << row[0]
+    else
+      po << row[0]
+    end
+  end
+
+  CSV.foreach("#{File.dirname(__FILE__)}/suffixes.csv", headers: true) do |row|
+    if row[2] == 'person'
+      sp << row[0]
+    else
+      so << row[0]
+    end
+  end
+
+  puts "'" + pp.join("', '") + "'"
+  puts "'" + po.join("', '") + "'"
+  puts "'" + sp.join("', '") + "'"
+  puts "'" + so.join("', '") + "'"
+end

data/lib/name-tamer.rb

@@ -211,24 +211,32 @@ class NameTamer
   def name_wrangle
     # Fix case if all caps or all lowercase
     if @last_name.nil?
-      lowercase = @nice_name.downcase
-      uppercase = @nice_name.upcase
-      fix_case = false
-
-      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
+      name_wrangle_single_name
+    else
+      name_wrangle_split_name
+    end
+  end
+
+  def name_wrangle_single_name
+    lowercase = @nice_name.downcase
+    uppercase = @nice_name.upcase
+    fix_case = false
 
-      @nice_name  = name_case(lowercase) if fix_case
+    if @contact_type == :organization
+      fix_case = true if @nice_name == uppercase && @nice_name.length > 4
     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 [uppercase, lowercase].include?(@last_name)
-      @nice_name  = "#{@remainder} #{@last_name}"
+      fix_case = true if [uppercase, lowercase].include?(@nice_name)
     end
+
+    @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}"
   end
 
   # Conjoin compound names with non-breaking spaces
@@ -256,30 +264,38 @@ class NameTamer
   def remove_middle_names
     return unless @contact_type == :person
 
-    parts       = @simple_name.split
-    first_name  = nil
-    last_name   = nil
+    first_name, parts = find_first_usable_name(@simple_name.split)
+    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}"
+  end
+
+  def find_first_usable_name(parts)
+    part = nil
 
-    # Find first usable name
     parts.each_index do |i|
       part = parts[i]
       next if part.gsub(FILTER_COMPAT, '').empty?
-      first_name  = part
-      parts       = parts.slice(i + 1, parts.length) # don't use "slice!"
+      parts = parts.slice(i + 1, parts.length) # don't use "slice!"
       break
     end
 
-    # Find last usable name
-    parts.reverse_each do |part|
-      next if part.gsub(FILTER_COMPAT, '').empty?
-      last_name = part
+    [part, parts]
+  end
+
+  def find_last_usable_name(parts)
+    part = nil
+
+    parts.reverse_each do |p|
+      next if p.gsub(FILTER_COMPAT, '').empty?
+      part = p
       break
     end
 
-    return unless first_name || last_name
-
-    separator     = first_name && last_name ? ' ' : ''
-    @simple_name  = "#{first_name}#{separator}#{last_name}"
+    part
   end
 
   def remove_periods_from_initials
@@ -299,17 +315,8 @@ class NameTamer
   #--------------------------------------------------------
 
   def initialize(new_name, args = {})
-    @name = new_name || ''
-    args_ct = args[:contact_type]
-
-    if args_ct
-      ct = args_ct.is_a?(Symbol) ? args_ct : args_ct.dup
-      ct = ct.to_s unless [String, Symbol].include? ct.class
-      ct.downcase! if ct.class == String
-      ct = ct.to_sym
-      ct = nil unless [:person, :organization].include? ct
-      @contact_type = ct
-    end
+    @name         = new_name || ''
+    @contact_type = contact_type_from args
 
     @tidy_name    = nil
     @nice_name    = nil
@@ -322,6 +329,19 @@ class NameTamer
     @adfix_found  = false
   end
 
+  def contact_type_from(args)
+    args_ct = args[:contact_type]
+    return unless args_ct
+
+    ct = args_ct.is_a?(Symbol) ? args_ct : args_ct.dup
+    ct = ct.to_s unless [String, Symbol].include? ct.class
+    ct.downcase! if ct.class == String
+    ct = ct.to_sym
+    ct = nil unless [:person, :organization].include? ct
+
+    ct
+  end
+
   # If we don't know the contact type, what's our best guess?
   def contact_type_best_effort
     if @contact_type
@@ -335,34 +355,33 @@ class NameTamer
 
   # We pass to this routine either prefixes or suffixes
   def remove_outermost_adfix(adfix_type, name_part)
-    adfixes       = ADFIX_PATTERNS[adfix_type]
+    ct, parts = find_contact_type_and_parts(ADFIX_PATTERNS[adfix_type], name_part)
+
+    return name_part unless @adfix_found
+
+    # If we've found a diagnostic adfix then set the contact type
+    self.contact_type = ct
+
+    # The remainder of the name will be in parts[0] or parts[2] depending
+    # on whether this is a prefix or a suffix.
+    # We'll also remove any trailing commas we've exposed.
+    (parts[0] + parts[2]).gsub(/\s*,\s*$/, '')
+  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?
 
+    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
-    if @contact_type.nil?
-      unless @adfix_found
-        ct            = :organization
-        parts         = name_part.partition adfixes[ct]
-        @adfix_found  = !parts[1].empty?
-      end
-    end
-
-    if @adfix_found
-      # If we've found a diagnostic adfix then set the contact type
-      self.contact_type = ct
-
-      # The remainder of the name will be in parts[0] or parts[2] depending
-      # on whether this is a prefix or a suffix.
-      # We'll also remove any trailing commas we've exposed.
-      result = (parts[0] + parts[2]).gsub(/\s*,\s*$/, '')
-    else
-      result = name_part
-    end
+    ct            = :organization
+    parts         = name_part.partition adfixes[ct]
+    @adfix_found  = !parts[1].empty?
 
-    result
+    [ct, parts]
   end
 
   # Original Version of NameCase:

data/lib/name-tamer/version.rb

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

data/lib/string_extras.rb

@@ -107,6 +107,11 @@ class String
       end
     end
 
+    fix_apostrophe_modifiers!
+    self # Allows chaining
+  end
+
+  def fix_apostrophe_modifiers!
     %w(Dell D).each do |modifier|
       gsub!(/(.#{modifier}')(\w)/) { |_| "#{Regexp.last_match[1].rstrip.downcase}#{Regexp.last_match[2]}" }
     end
@@ -229,10 +234,10 @@ class String
     '¼' => '¼', '½' => '½', '¾' => '¾', '¿' => '¿', 'À' => 'À',
     'Ã�' => 'Á', 'Â' => 'Â', 'Ã' => 'Ã', 'Ä' => 'Ä', 'Ã…' => 'Å',
     'Æ' => 'Æ', 'Ç' => 'Ç', 'È' => 'È', 'É' => 'É', 'Ê' => 'Ê',
-    'Ë' => 'Ë', 'ÃŒ' => 'Ì', 'Ã�' => 'Í', 'ÃŽ' => 'Î', 'Ã�' => 'Ï',
-    'Ã�' => 'Ð', 'Ñ' => 'Ñ', 'Ã’' => 'Ò', 'Ó' => 'Ó', 'Ô' => 'Ô',
+    'Ë' => 'Ë', 'ÃŒ' => 'Ì', "\xC3\x8D" => 'Í', 'ÃŽ' => 'Î', "\xC3\x8F" => 'Ï',
+    "\xC3\x90" => 'Ð', 'Ñ' => 'Ñ', 'Ã’' => 'Ò', 'Ó' => 'Ó', 'Ô' => 'Ô',
     'Õ' => 'Õ', 'Ö' => 'Ö', '×' => '×', 'Ø' => 'Ø', 'Ù' => 'Ù',
-    'Ú' => 'Ú', 'Û' => 'Û', 'Ãœ' => 'Ü', 'Ã�' => 'Ý', 'Þ' => 'Þ',
+    'Ú' => 'Ú', 'Û' => 'Û', 'Ãœ' => 'Ü', "\xC3\x9D" => 'Ý', 'Þ' => 'Þ',
     'ß' => 'ß', 'à' => 'à', 'á' => 'á', 'â' => 'â', 'ã' => 'ã',
     'ä' => 'ä', 'Ã¥' => 'å', 'æ' => 'æ', 'ç' => 'ç', 'è' => 'è',
     'é' => 'é', 'ê' => 'ê', 'ë' => 'ë', 'ì' => 'ì', 'í' => 'í',

data/name-tamer.gemspec

@@ -7,8 +7,8 @@ Gem::Specification.new do |spec|
   spec.version       = NameTamer::VERSION
   spec.authors       = ['Xenapto']
   spec.email         = ['developers@xenapto.com']
-  spec.description   = %q(Useful methods for taming names)
-  spec.summary       = %q(Example: NameTamer['Mr. John Q. Smith III, MD'].simple_name # => John Smith)
+  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'
 
@@ -23,4 +23,5 @@ Gem::Specification.new do |spec|
   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'
 end

data/spec/name_tamer_spec.rb

@@ -161,7 +161,7 @@ describe NameTamer do
       { n: 'Hermann Müller', t: :person, nn: 'Hermann Müller', sn: 'Hermann Müller', s: 'hermann-muller' },
       { n: 'b-to-v Partners AG', t: :organization, nn: 'b-to-v Partners', sn: 'b-to-v Partners', s: 'b-to-v-partners' },
       { n: '*', t: :person, nn: '*', sn: '*', s: '_' },
-      { n: '* *', t: :person, nn: '* *', sn: '* *', s: '_' },
+      { n: '* *', t: :person, nn: '* *', sn: '*', s: '_' },
       { n: '* Olga *', t: :person, nn: '* Olga *', sn: 'Olga', s: 'olga' },
       { n: '* Olga Bedia García *', t: :person, nn: '* Olga Bedia García *', sn: 'Olga García', s: 'olga-garcia' },
       { n: 'Jose “Pepe” García', t: :organization, nn: 'Jose “Pepe” García', sn: 'Jose Pepe García',
@@ -190,9 +190,9 @@ describe NameTamer do
       { n: '’%80', t: :person, nn: '’%80', sn: '’%80', s: '’80' }, # Encoding::CompatibilityError
       { 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: '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: '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' }
     ]
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: name-tamer
 version: !ruby/object:Gem::Version
-  version: 0.2.14
+  version: 0.2.15
 platform: ruby
 authors:
 - Xenapto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-10 00:00:00.000000000 Z
+date: 2015-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -100,6 +100,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  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'
 description: Useful methods for taming names
 email:
 - developers@xenapto.com
@@ -146,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: 'Example: NameTamer[''Mr. John Q. Smith III, MD''].simple_name # => John