capitalize-names 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 952173c8584a6003c41afbb6fed489192388cd33
-  data.tar.gz: 0d041067c287a94e95b37793a937049cf1968dcd
+  metadata.gz: 19375472b9eb965ff52981e5638129857a205d50
+  data.tar.gz: 04c36cf94f3fd1d87ac14863ee14883e3027de1b
 SHA512:
-  metadata.gz: 13356663ebb5fc5153cecb45dfe0222061bcefe27a21ec4c93c9e5abad001dac72f235215c2ec1927690a4e0904952675096661df6e0b49a96793b03e6238f4e
-  data.tar.gz: 9733023e31a9859ba77b4c4f04e9ff872be83d7cb2c13b4801ecf29c6f705529e7dc4620e10a0a2206075c29b2283794f69ce4a280b8aa78bcf2dbd39d6a1456
+  metadata.gz: de9593fe3c2e9f90e1d0124d979cf9409b6980b3f817765ae71b2eaeb7829a2bec6f2ff9f7827480b2c9428e14e50250cd61ec7ead340f52c192f6d4847fffb1
+  data.tar.gz: fe77a40c783cb837fba98d0e68358bb10afb42a8470793e6b2802352d46b8e8d0eb7012b8e806158919deb81acc9313f202606005a2a26e8454860d2e7e7aa35

data/lib/capitalize_names/capitalizer.rb

@@ -2,6 +2,8 @@ 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
@@ -48,12 +50,20 @@ module CapitalizeNames
       def _capitalize
         _name = name
 
-        hyphens_index = []
+        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
 
-        while _name.index('-') do
-          index = _name.index('-')
-          hyphens_index << index
-          _name = _name[0...index] << ' ' << _name[index+1..-1]
+          hyphens << [_start, _end, _value]
         end
 
         _name = _name.split.map{ |w| 
@@ -64,13 +74,18 @@ module CapitalizeNames
            .gsub(O_APOSTROPHE) { "O'#{$1.upcase}" }
         }
 
-        _name = _name.join(' ')
-        hyphens_index.each do |idx|
-          _name = _name[0...idx] << '-' << (_name[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
             
         _name = _name.gsub("Van ", "van ").gsub("De ", "de ").gsub("Dit ", "dit ")
-        _name << ' '
+        _name << " "
 
         (CapitalizeNames::SURNAMES + CapitalizeNames::SUFFIXES).each do |surname_or_suffix|
           position = _name.downcase.index(surname_or_suffix.downcase)
@@ -78,7 +93,8 @@ module CapitalizeNames
             _name = _name[0...position] << surname_or_suffix << _name[position+surname_or_suffix.length..-1]
           end
         end
-        _name.strip
+
+        _name[0...-1]
       end
   end
 end

data/lib/capitalize_names/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capitalize-names
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 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