capitalize-names 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 75fa2857650e6d84b88143ebac713f71b98f3144
-  data.tar.gz: 376d9a6c349ca0f8537ada0a22ab07106eab87b5
+SHA256:
+  metadata.gz: a8e58cd8d2216549bc0bd47a2f3ce851abbcf8eed7e404a84ec43593b81fe959
+  data.tar.gz: 77f0ce726f15d3ca5e793be5485c282b71fac70a9b7bd01df4d0c648fcb4e66b
 SHA512:
-  metadata.gz: fb7ed73dac87a16ffa610e8aae8ccbd7c40a1095d337028471c9d0a538e1a49ef7165e71f7c33e7a4dfcb961865d665edb00cf6eedc60db17ad44d232c28acb5
-  data.tar.gz: d26ff4306c8f47912d8038276c82e4f8418b25f07fdc527727b0fccbb56bda63995aab13881df7a73620ff05f12d13cc81b86c5c7b7c51af6e72313474182029
+  metadata.gz: e6dd722c7e906cef3d58c203da2a52d2274ddc115dd902169b02f6f80c34f3ff81c2484a3f86ca11a6cf41f0ffabad3a3dbe48911daa2b899dc539cf0e0c4738
+  data.tar.gz: f438bda12d9d4eac554b297f9e4044f4c7663197e32ed355fcb2701a1d1048252088057f82b19c2c8b3838bfe64468e18857251e7f62d872065333dd615cbf7f

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,12 @@ module CapitalizeNames
   class Capitalizer
     attr_accessor :name
 
+    HYPHEN = /(\s*-\s*)/
+
+    MC = /^Mc(\w)(?=\w)/i 
+    MAC = /^Mac(\w)(?=\w)/i
+    O_APOSTROPHE = /^O'(\w)(?=\w)/i
+
     def initialize(name)
       @name = name
     end
@@ -14,7 +20,7 @@ module CapitalizeNames
     def capitalize
       begin
         capitalize!
-      rescue *CapitalizeNames::Errors.all_exceptions
+      rescue CapitalizeNames::Errors::GenericError
         name
       end
     end
@@ -25,59 +31,70 @@ 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
-        hyphens_index = []
-        while nm.index('-') do
-          index = nm.index('-')
-          hyphens_index << index
-          nm = nm[0...index] + ' ' + nm[index+1..-1]
-        end
+        _name = name
 
-        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 
+        hyphens = []
+
+        while (match = _name.match(HYPHEN)) do
+          _start = match.begin(1)
+          _end = match.end(1)
+          _value = match[1]
+
+          if _start == 0
+            _name = _name[_end..-1]
+          else
+            _name = _name[0..._start] << ' ' << _name[_end..-1]
           end
+
+          hyphens << [_start, _end, _value]
+        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(' ')
-        hyphens_index.each do |idx|
-          nm = nm[0...idx] + '-' + nm[idx+1..-1]
+        _name = _name.join(" ")
+
+        hyphens.reverse.each do |_start, _end, _value|
+          if _start == 0
+            _name = _value << _name
+          else
+            _name = _name[0..._start] << _value << (_name[_start+1..-1] || "")
+          end
         end
             
-        nm = nm.gsub("Van ", "van ").gsub("De ", "de ").gsub("Dit ", "dit ")
-        nm += ' '
-
-        (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
+        _name = _name.gsub("Van ", "van ").gsub("De ", "de ").gsub("Dit ", "dit ")
+        _name << " "
+
+        (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[0...-1]
       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.1.0"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capitalize-names
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Kyle Tate
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-17 00:00:00.000000000 Z
+date: 2017-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -24,20 +24,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3'
+- !ruby/object:Gem::Dependency
+  name: rake
+  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'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.8.4
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.8.4
+        version: '0'
 description: 'A simple gem to capitalize names, based off of: http://dzone.com/snippets/capitalize-proper-names'
 email: kbt.tate@gmail.com
 executables: []
@@ -49,6 +63,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
@@ -59,7 +74,7 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">"
     - !ruby/object:Gem::Version
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
@@ -69,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Capitalizes names; handles edge cases.