capitalize-names 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73e890e61b19c63e68a8602c12d3142cee3ca99f
-  data.tar.gz: 97ecd4a272ec1243111f19760f5622e1cee0135d
+  metadata.gz: 952173c8584a6003c41afbb6fed489192388cd33
+  data.tar.gz: 0d041067c287a94e95b37793a937049cf1968dcd
 SHA512:
-  metadata.gz: 363f3b82f8ddab0779b590e16c9b8d4b0e730ca7046b04f04ff2805bb6d45471594e8b8de0db109817bfef1506f021626c0fdf0fb10227455eedc283866ddfad
-  data.tar.gz: dee6a9caba153004ae269987ccf080ac6a0a536bc54aeb2aa7f35170b845880db85dc817c1503ed77cfbfc15d34646d49de88dcfdbefe177069af21349f8277d
+  metadata.gz: 13356663ebb5fc5153cecb45dfe0222061bcefe27a21ec4c93c9e5abad001dac72f235215c2ec1927690a4e0904952675096661df6e0b49a96793b03e6238f4e
+  data.tar.gz: 9733023e31a9859ba77b4c4f04e9ff872be83d7cb2c13b4801ecf29c6f705529e7dc4620e10a0a2206075c29b2283794f69ce4a280b8aa78bcf2dbd39d6a1456

data/lib/capitalize_names.rb

@@ -3,7 +3,7 @@ require 'capitalize_names/errors'
 require 'capitalize_names/capitalizer'
 require 'capitalize_names/suffixes'
 require 'capitalize_names/surnames'
-require 'active_support/all'
+require 'active_support/core_ext/string/multibyte'
 
 module CapitalizeNames
 

data/lib/capitalize_names/capitalizer.rb

@@ -2,6 +2,10 @@ module CapitalizeNames
   class Capitalizer
     attr_accessor :name
 
+    MC = /^Mc(\w)(?=\w)/i 
+    MAC = /^Mac(\w)(?=\w)/i
+    O_APOSTROPHE = /^O'(\w)(?=\w)/i
+
     def initialize(name)
       @name = name
     end
@@ -14,7 +18,7 @@ module CapitalizeNames
     def capitalize
       begin
         capitalize!
-      rescue *CapitalizeNames::Errors.all_exceptions
+      rescue CapitalizeNames::Errors::GenericError
         name
       end
     end
@@ -25,59 +29,56 @@ module CapitalizeNames
         true
       end
 
+      def surname_suffix_position?(position, name, surname_or_suffix)
+        # surname/suffix must be:
+        # 1. at start of name or after a space or a -
+        #          -and-
+        # 2. followed by the end of string or a space or a -
+        (
+          (position == 0) || \
+          (
+            position > 0 && (name[position-1] == ' ' || name[position-1] == '-')
+          )
+        ) && (
+          (name.length == position+surname_or_suffix.length) || \
+          (name[position+surname_or_suffix.length] == ' ') || (name[position+surname_or_suffix.length] == '-')
+        )
+      end
+
       def _capitalize
-        nm = name.mb_chars
-        mc = /^Mc(\w)(?=\w)/i 
-        mac = /^Mac(\w)(?=\w)/i
-        oap = /^O'(\w)(?=\w)/i
+        _name = name
+
         hyphens_index = []
-        while nm.index('-') do
-          index = nm.index('-')
+
+        while _name.index('-') do
+          index = _name.index('-')
           hyphens_index << index
-          nm = nm[0...index] + ' ' + nm[index+1..-1]
+          _name = _name[0...index] << ' ' << _name[index+1..-1]
         end
 
-        nm = nm.split.map{|w| w.capitalize}.map{ |w| 
-          begin 
-            w.gsub(mc, "Mc" + w[2].upcase)
-          rescue
-            w 
-          end
-        }.map{|w| 
-          begin 
-            w.gsub(mac, "Mac" + w[3].upcase)
-          rescue
-            w 
-          end
-        }.map{|w| 
-          begin 
-            w.gsub(oap, "O'" + w[2].upcase)
-          rescue
-            w 
-          end
+        _name = _name.split.map{ |w| 
+          w.mb_chars.capitalize.to_str 
+        }.map{ |w|
+          w.gsub(MC) { "Mc#{$1.upcase}" }\
+           .gsub(MAC) { "Mac#{$1.upcase}" }\
+           .gsub(O_APOSTROPHE) { "O'#{$1.upcase}" }
         }
 
-        nm = nm.join(' ')
+        _name = _name.join(' ')
         hyphens_index.each do |idx|
-          nm = nm[0...idx] + '-' + (nm[idx+1..-1] || "")
+          _name = _name[0...idx] << '-' << (_name[idx+1..-1] || "")
         end
             
-        nm = nm.gsub("Van ", "van ").gsub("De ", "de ").gsub("Dit ", "dit ")
-        nm += ' '
+        _name = _name.gsub("Van ", "van ").gsub("De ", "de ").gsub("Dit ", "dit ")
+        _name << ' '
 
-        (CapitalizeNames::SURNAMES + CapitalizeNames::SUFFIXES).each do |surname|
-          pos = nm.downcase.index(surname.downcase)
-          if pos 
-            # surname/suffix must be:
-            # 1. at start of name or after a space or a -
-            #          -and-
-            # 2. followed by the end of string or a space or a -
-            if ( ((pos == 0) or (pos > 0 and (nm[pos-1] == ' ' or nm[pos-1] == '-'))) and ((nm.length == pos+surname.length) or (nm[pos+surname.length] == ' ') or (nm[pos+surname.length] == '-')) )
-              nm = nm[0...pos] + surname + nm[pos+surname.length..-1]
-            end
+        (CapitalizeNames::SURNAMES + CapitalizeNames::SUFFIXES).each do |surname_or_suffix|
+          position = _name.downcase.index(surname_or_suffix.downcase)
+          if position and surname_suffix_position?(position, _name, surname_or_suffix)
+            _name = _name[0...position] << surname_or_suffix << _name[position+surname_or_suffix.length..-1]
           end
         end
-        nm.strip
+        _name.strip
       end
   end
 end

data/lib/capitalize_names/errors.rb

@@ -1,13 +1,6 @@
 module CapitalizeNames
   module Errors
-    class << self
-      def all_exceptions
-        self.constants
-          .map { |c| self.const_get(c) }
-          .select{ |c| c < Exception }
-      end
-    end
-
-    class InvalidName < Exception; end;
+    class GenericError < Exception; end
+    class InvalidName < GenericError; end
   end
-end
+end

data/lib/capitalize_names/version.rb

@@ -0,0 +1,3 @@
+module CapitalizeNames
+  VERSION = "1.0.5"
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capitalize-names
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Kyle Tate
@@ -49,6 +49,7 @@ files:
 - lib/capitalize_names/errors.rb
 - lib/capitalize_names/suffixes.rb
 - lib/capitalize_names/surnames.rb
+- lib/capitalize_names/version.rb
 homepage: http://github.com/infiton/capitalize-names
 licenses:
 - MIT