icu_name 1.1.1 → 1.2.0

data/README.rdoc

@@ -51,10 +51,11 @@ The method <tt>alternatives</tt> can be used to list alternatives to a given fir
 
   Name.new('Stephen', 'Orr').alternatives(:first)             # => ["Steve"]
   Name.new('Michael Stephen', 'Orr').alternatives(:first)     # => ["Steve", "Mike", "Mick", "Mikey"],
+  Name.new('Oissine', 'Murphy').alternatives(:last)           # => ["Murchadha"],
   Name.new('Mark', 'Orr').alternatives(:first)                # => []
   
-By default the class is only aware of a few common alternatives for first names (e.g. _Bobby_ and _Robert_,
-_Bill_ and _William_, etc). However, this can be customized (see below).
+By default the class uses a set of first and last name alternatives curated for the ICU.
+However, this can be customized (see below).
 
 Supplying the <tt>match</tt> method with strings is equivalent to instantiating an instance with the same
 strings and then matching it. So, for example the following are equivalent:
@@ -109,7 +110,7 @@ The same option also relaxes the need for accented characters to match exactly:
 We saw above how _Bobby_ and _Robert_ were able to match because, by default, the
 matcher is aware of some common English nicknames. These name alternatives can be
 customised to handle additional nicknames and other types of alternative names
-such as common spelling error and player name changes.
+such as common spelling errors and player name changes.
 
 The alternative names consist of two arrays, one for first names and
 one for last names. Each array element is itself an array of strings
@@ -117,58 +118,33 @@ representing a set of equivalent names. Here, for example, are some
 of the default first name alternatives:
 
   ["Anthony", "Tony"]
-  ["James", "Jim", "Jimmy"]
-  ["Michael", "Mike", "Mick", "Mikey"]
+  ["James", "Jim", "Jimmy", "Jamie"]
   ["Robert", "Bob", "Bobby"]
-  ["Stephen", "Steve"]
-  ["Steven", "Steve"]
+  ["Stephen", "Steve", "Steven"]
   ["Thomas", "Tom", "Tommy"]
-  ["William", "Will", "Willy", "Willie", "Bill"]
 
 The first of these means that _Anthony_ and _Tony_ are considered equivalent and can match.
 
-  Name.new("Tony", "Miles").match("Anthony", "Miles")         # => true
-
-Note that both _Steven_ and _Stephen_ match _Steve_ but, because they don't occur in the
-same group, they don't match each other.
-
-  Name.new("Steven", "Hanly").match("Steve", "Hanly")         # => true
-  Name.new("Stephen", "Hanly").match("Steve", "Hanly")        # => true
-  Name.new("Stephen", "Hanly").match("Steven", "Hanly")       # => false
+  ICU::Name.new("Tony", "Miles").match("Anthony", "Miles")    # => true
 
 To change alternative name behaviour, you can replace the default alternatives
 with a customized set perhaps stored in a database or a YAML file, as illustrated below:
 
+  ICU::Name.reset_alternatives
   data = YAML.load(File open "my_last_name_alternatives.yaml")
-  Name.load_alternatives(:last, data)
+  ICU::Name.load_alternatives(:last, data)
   data = YAML.load(File open "my_first_name_alternatives.yaml")
-  Name.load_alternatives(:first, data)
-
-An example of one way in which you might want to customize the alternatives is to
-cater for common spelling mistakes such as _Steven_ and _Stephen_. These two names
-don't match by default, but you can make them so by replacing the two default rules:
-
-  ["Stephen", "Steve"]
-  ["Steven", "Steve"]
-
-with the following single rule:
-
-  ["Stephen", "Steven", "Steve"]
-
-so that now:
-
-  Name.new("Stephen", "Hanly").match("Steven", "Hanly")       # => true
+  ICU::Name.load_alternatives(:first, data)
 
-This kind of rule risks producing false positives - you must judge
-whether that risk is outweighed by the benefits of being able to overcome
-spelling mistakes in the context of your application.
+Note that without the call to <tt>reset_alternatives</tt>, the new loaded alternatives
+add to, rather than replace, the defaults.
 
-Another use is to cater for English and Irish versions of the same name.
-For example, for last names:
+Other uses of alternatives is to cater for English and Irish versions of the same name,
+for example (last names):
 
   [Murphy, Murchadha]
 
-or for first names, including spelling variations:
+or for variations including spelling variations, for example (first names):
 
   [Patrick, Pat, Paddy, Padraig, Padraic, Padhraig, Padhraic]
 

data/config/first_alternatives.yaml

@@ -1,37 +1,50 @@
 ---
+  - [Abdul, Abul]
   - [Alexander, Alex]
+  - [Anandagopal, Ananda]
   - [Andrew, Andy]
+  - [Anne, Ann]
   - [Anthony, Tony]
   - [Benjamin, Ben]
-  - [Catherine, Cathy, Cath]
-  - [Daniel, Danny, Dan]
+  - [Catherine, Cathy, Cath, Cate, Katherine, Kathy, Kath, Kate]
+  - [Charlie, Charles]
+  - [Chris, Christopher]
+  - [Daniel, Danial, Danny, Dan]
   - [David, Dave]
   - [Deborah, Debbie]
   - [Des, Desmond]
-  - [Edward, Eddie, Eddy, Ed]
-  - [Frederick, Fred]
-  - [Frederic, Fred]
+  - [Douglas, Dougie]
+  - [Eamonn, Eamon]
+  - [Edward, Eddie, Eddy, Ed, Ned]
+  - [Eric, Erick, Erik]
+  - [Frederick, Frederic, Fred]
   - [Gerald, Gerry]
-  - [Gerard, Gerry]
-  - [James, Jim, Jimmy]
+  - [Gerhard, Gerard, Ger, Gerry]
+  - [James, Jim, Jimmy, Jamie]
+  - [Joanna, Joan, Joanne]
+  - [Joe, Joseph]
   - [John, Johnny]
   - [Jonathan, Jon]
-  - [Kenneth, Ken, Kenny]
   - [Lyubomir, Lubomir]
-  - [Michael, Mike, Mick, Mikey]
-  - [Nic, Nick, Nicolas]
+  - [Kenneth, Ken, Kenny]
+  - [Michael, Mike, Mick, Micky, Mickie, Mikey, Micheal]
+  - [Muthu, Muthukumaran]
+  - [Nicholas, Nick, Nicolas]
   - [Nicola, Nickie, Nicky]
-  - [Patrick, Pat]
-  - [Patricia, Patty, Pat]
+  - [Patrick, Pat, Paddy, Padraig, Padraic, Padhraig, Padhraic]
+  - [Patricia, Paddy, Patty, Pat]
   - [Peter, Pete]
-  - [Philip, Phil]
-  - [Phillip, Phil]
+  - [Philip, Phillip, Phil]
+  - [Philippe, Phillippe, Phil]
+  - [Raymond, Ray]
   - [Rick, Ricky]
   - [Robert, Bob, Bobby]
-  - [Samual, Sam]
-  - [Samuel, Sam]
-  - [Stephen, Steve]
-  - [Steven, Steve]
+  - [Rodney, Rod]
+  - [Samual, Sam, Samuel]
+  - [Stef, Stefan, Stephan, Stefen, Stephen]
+  - [Steffy, Stefanie, Stephanie, Stefenie, Stephenie]
+  - [Stephen, Steve, Steven]
   - [Terence, Terry]
   - [Thomas, Tom, Tommy]
   - [William, Will, Willy, Willie, Bill]
+  - [Sean, John, !ruby/regexp /^Bradley$/]

data/config/last_alternatives.yaml

@@ -1 +1,7 @@
---- []
+---
+  - [Ffrench, French]
+  - [Murchadha, Murphy]
+  - [Quinn, Benjamin, !ruby/regexp /^(Debbie|Deborah)$/]
+  - [Astaneh Lopez, Lopez, !ruby/regexp /^Alex$/]
+  - [Gardenes Santiago, Gardenes, !ruby/regexp /^Manuel$/]
+  - ["O'Siochru", King, !ruby/regexp /^Mairead$/]

data/config/test_first_alts.yaml

@@ -1,42 +1,11 @@
 ---
-  - [Abdul, Abul]
-  - [Alexander, Alex]
-  - [Anandagopal, Ananda]
-  - [Andrew, Andy]
-  - [Anne, Ann]
-  - [Anthony, Tony]
-  - [Benjamin, Ben]
-  - [Catherine, Cathy, Cath]
-  - [Daniel, Danial, Danny, Dan]
-  - [David, Dave]
   - [Deborah, Debbie]
-  - [Des, Desmond]
-  - [Eamonn, Eamon]
-  - [Edward, Eddie, Eddy, Ed]
-  - [Eric, Erick, Erik]
-  - [Frederick, Frederic, Fred]
-  - [Gerald, Gerry]
-  - [Gerhard, Gerard, Ger, Gerry]
-  - [James, Jim, Jimmy]
-  - [Joanna, Joan, Joanne]
+  - [Demeter, Ceres]
   - [John, Johnny]
-  - [Jonathan, Jon]
-  - [Kenneth, Ken, Kenny]
   - [Lyubomir, Lubomir]
-  - [Michael, Mike, Mick, Micky, Mickie, Mikey]
-  - [Nicholas, Nick, Nicolas]
-  - [Nicola, Nickie, Nicky]
+  - [Michael, Mike]
   - [Patrick, Pat, Paddy, Padraig, Padraic, Padhraig, Padhraic]
-  - [Patricia, Paddy, Patty, Pat]
-  - [Peter, Pete]
   - [Philippe, Philip, Phillippe, Phillip]
-  - [Rick, Ricky]
-  - [Robert, Bob, Bobby]
-  - [Samual, Sam, Samuel]
-  - [Stef, Stefan, Stephan, Stefen, Stephen]
-  - [Steffy, Stefanie, Stephanie, Stefenie, Stephenie]
   - [Stephen, Steve, Steven]
-  - [Terence, Terry]
-  - [Thomas, Tom, Tommy]
   - [William, Will, Willy, Willie, Bill]
   - [Sean, John, !ruby/regexp /^Bradley$/]

data/config/test_last_alts.yaml

@@ -1,4 +1,5 @@
 ---
+  - [Ares, Mars]
   - [Ffrench, French]
   - [Murchadha, Murphy]
   - [Quinn, Benjamin, !ruby/regexp /^(Debbie|Deborah)$/]

data/lib/icu_name/name.rb

@@ -13,8 +13,8 @@ module ICU
 
     # Construct a new name from one or two strings or any objects that have a to_s method.
     def initialize(name1='', name2='')
-      @name1 = Util.to_utf8(name1.to_s)
-      @name2 = Util.to_utf8(name2.to_s)
+      @name1 = Util::String.to_utf8(name1.to_s)
+      @name2 = Util::String.to_utf8(name2.to_s)
       originalize
       canonicalize
       @first.freeze
@@ -69,10 +69,10 @@ module ICU
       match_first(first(opts), other.first(opts)) && match_last(last(opts), other.last(opts))
     end
 
-    # Load a set of first or last name alternatives. If the YAML file name is absent,
-    # the default set is loaded. <tt>type</tt> should be <tt>:first</tt> or <tt>:last</tt>.
-    def self.load_alternatives(type, file=nil)
-      compile_alts(check_type(type), file, true)
+    # Load a set of first or last name alternatives. If no data is absent, a default set will be loaded.
+    # <tt>type</tt> should be <tt>:first</tt> or <tt>:last</tt>.
+    def self.load_alternatives(type, data=nil)
+      compile_alts(check_type(type), data, true)
     end
 
     # Show first name or last name alternatives.
@@ -93,7 +93,7 @@ module ICU
     # Transliterate characters to ASCII.
     def transliterate(str, chars='US-ASCII')
       if chars.match(/ASCII/i)
-        Util.transliterate(str)
+        Util::String.transliterate(str)
       else
         str.dup
       end
@@ -139,12 +139,12 @@ module ICU
       name.gsub!(/\s*-\s*/, '-')
       name.gsub!(/'+/, "'")
       name.strip!
-      name = Util.downcase(name)
+      name = Util::String.downcase(name)
       name.split(/\s+/).map do |n|
         n.sub!(/^-+/, '')
         n.sub!(/-+$/, '')
         n.split(/-/).map do |p|
-          Util.capitalize(p)
+          Util::String.capitalize(p)
         end.join('-')
       end.join(' ')
     end
@@ -156,11 +156,11 @@ module ICU
 
     # Apply final touches to finish canonicalising a last name.
     def finish_last(names)
-      names.gsub!(/\b([A-Z\u{c0}-\u{de}]')([a-z\u{e0}-\u{ff}])/) { |m| $1 + Util.upcase($2) }
-      names.gsub!(/\b(Mc)([a-z\u{e0}-\u{ff}])/) { |m| $1 + Util.upcase($2) }
+      names.gsub!(/\b([A-Z\u{c0}-\u{de}]')([a-z\u{e0}-\u{ff}])/) { |m| $1 + Util::String.upcase($2) }
+      names.gsub!(/\b(Mc)([a-z\u{e0}-\u{ff}])/) { |m| $1 + Util::String.upcase($2) }
       names.gsub!(/\bMac([a-z\u{e0}-\u{ff}])/) do |m|
         letter = $1  # capitalize after "Mac" only if the original clearly indicates it
-        upper = Util.upcase(letter)
+        upper = Util::String.upcase(letter)
         'Mac'.concat(@original.match(/\bMac#{upper}/) ? upper : letter)
       end
       names.gsub!(/\bO ([A-Z\u{c0}-\u{de}])/) { |m| "O'" + $1 } # O Kelly => "O'Kelly"

data/lib/icu_name/util.rb

@@ -2,51 +2,77 @@
 
 module ICU
   module Util
-    LOWER_CHARS      = "àáâãäåæçèéêëìíîïñòóôõöøùúûüýþ"
-    UPPER_CHARS      = "ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÑÒÓÔÕÖØÙÚÛÜÝÞ"
-    ACCENTED_CHARS   = "ÀÁÂÃÄÅÈÉÊËÌÍÎÏÑÒÓÔÕÖÙÚÛÜÝàáâãäåèéêëìíîïñòóôõöùúûüý"
-    UNACCENTED_CHARS = "AAAAAAEEEEIIIINOOOOOUUUUYaaaaaaeeeeiiiinooooouuuuy"
+    
+    # For converting strings in various ways.
+    module String
+      LOWER_CHARS      = "àáâãäåæçèéêëìíîïñòóôõöøùúûüýþ"
+      UPPER_CHARS      = "ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÑÒÓÔÕÖØÙÚÛÜÝÞ"
+      ACCENTED_CHARS   = "ÀÁÂÃÄÅÈÉÊËÌÍÎÏÑÒÓÔÕÖÙÚÛÜÝàáâãäåèéêëìíîïñòóôõöùúûüý"
+      UNACCENTED_CHARS = "AAAAAAEEEEIIIINOOOOOUUUUYaaaaaaeeeeiiiinooooouuuuy"
 
-    # Decide if a string is valid UTF-8 or not, returning true or false.
-    def self.is_utf8(str)
-      dup = str.dup
-      dup.force_encoding("UTF-8")
-      dup.valid_encoding?
-    end
+      # Decide if a string is valid UTF-8 or not, returning true or false.
+      def self.is_utf8(str)
+        dup = str.dup
+        dup.force_encoding("UTF-8")
+        dup.valid_encoding?
+      end
     
-    # Try to convert any string to UTF-8.
-    def self.to_utf8(str)
-      utf8 = is_utf8(str)
-      dup = str.dup
-      return dup.force_encoding("UTF-8") if utf8
-      dup.force_encoding("Windows-1252") if dup.encoding.name.match(/^(ASCII-8BIT|UTF-8)$/)
-      dup.encode("UTF-8")
-    end
+      # Try to convert any string to UTF-8.
+      def self.to_utf8(str)
+        utf8 = is_utf8(str)
+        dup = str.dup
+        return dup.force_encoding("UTF-8") if utf8
+        dup.force_encoding("Windows-1252") if dup.encoding.name.match(/^(ASCII-8BIT|UTF-8)$/)
+        dup.encode("UTF-8")
+      end
 
-    # Upcase a UTF-8 string that might contain accented characters.
-    def self.upcase(str)
-      str = str.upcase
-      return str if str.ascii_only?
-      str.tr(LOWER_CHARS, UPPER_CHARS)
-    end
+      # Upcase a UTF-8 string that might contain accented characters.
+      def self.upcase(str)
+        str = str.upcase
+        return str if str.ascii_only?
+        str.tr(LOWER_CHARS, UPPER_CHARS)
+      end
 
-    # Downcase a UTF-8 string that might contain accented characters.
-    def self.downcase(str)
-      str = str.downcase
-      return str if str.ascii_only?
-      str.tr(UPPER_CHARS, LOWER_CHARS)
-    end
+      # Downcase a UTF-8 string that might contain accented characters.
+      def self.downcase(str)
+        str = str.downcase
+        return str if str.ascii_only?
+        str.tr(UPPER_CHARS, LOWER_CHARS)
+      end
     
-    # Capilalize a UTF-8 string that might contain accented characters.
-    def self.capitalize(str)
-      return str.capitalize if str.ascii_only? || !str.match(/\A(.)(.*)\z/)
-      upcase($1) + downcase($2)
+      # Capilalize a UTF-8 string that might contain accented characters.
+      def self.capitalize(str)
+        return str.capitalize if str.ascii_only? || !str.match(/\A(.)(.*)\z/)
+        upcase($1) + downcase($2)
+      end
+    
+      # Transliterate Latin-1 accented characters to ASCII.
+      def self.transliterate(str)
+        return str.dup if str.ascii_only?
+        str.tr(ACCENTED_CHARS, UNACCENTED_CHARS)
+      end
     end
     
-    # Transliterate Latin-1 accented characters to ASCII.
-    def self.transliterate(str)
-      return str.dup if str.ascii_only?
-      str.tr(ACCENTED_CHARS, UNACCENTED_CHARS)
+    # For generating SQL queries relating to alternative first or last names.
+    module AlternativeNames
+      def last_name_like(last, first)
+        ICU::Name.new(first, last).alternatives(:last).push(last).map do |nam|
+          "last_name LIKE '%#{quote_str(nam)}%'"
+        end.sort.join(" OR ")
+      end
+
+      def first_name_like(first, last)
+        ICU::Name.new(first, last).alternatives(:first).push(first).map do |nam|
+          "first_name LIKE '%#{quote_str(nam)}%'"
+        end.sort.join(" OR ")
+      end
+
+      private
+
+      # Same as Rails version (ActiveRecord::ConnectionAdapters::Quoting).
+      def quote_str(s)
+        s.gsub(/\\/, '\&\&').gsub(/'/, "''")
+      end
     end
   end
 end

data/lib/icu_name/version.rb

@@ -2,6 +2,6 @@
 
 module ICU
   class Name
-    VERSION = "1.1.1"
+    VERSION = "1.2.0"
   end
 end

data/spec/name_spec.rb

@@ -3,7 +3,8 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 module ICU
   describe Name do
-    def load_alt_test(*types)
+    def load_alt_test(reset, *types)
+      Name.reset_alternatives if reset
       types.each do |type|
         file = File.expand_path(File.dirname(__FILE__) + "/../config/test_#{type}_alts.yaml")
         data = File.open(file) { |fd| YAML.load(fd) }
@@ -351,13 +352,13 @@ module ICU
         Name.new('Gerard', 'Orr').match('Gerald', 'Orr').should be_false
       end
 
-      it "should by default be cautious about misspellings" do
-        Name.new('Steven', 'Brady').match('Stephen', 'Brady').should be_false
-        Name.new('Philip', 'Short').match('Phillip', 'Short').should be_false
+      it "should handle some common misspellings" do
+        Name.new('Steven', 'Brady').match('Stephen', 'Brady').should be_true
+        Name.new('Philip', 'Short').match('Phillip', 'Short').should be_true
       end
 
-      it "should by default have no conditional matches" do
-        Name.new('Sean', 'Bradley').match('John', 'Bradley').should be_false
+      it "should have some conditional matches" do
+        Name.new('Sean', 'Bradley').match('John', 'Bradley').should be_true
       end
 
       it "should not mix up nick names" do
@@ -379,9 +380,9 @@ module ICU
         Name.new('Darko', 'Polimac').match('Darko', 'Polimc').should be_false
       end
 
-      it "should by defaut have no conditional matches" do
-        Name.new('Debbie', 'Quinn').match('Debbie', 'Benjamin').should be_false
-        Name.new('Mairead', "O'Siochru").match('Mairead', 'King').should be_false
+      it "should have some conditional matches" do
+        Name.new('Debbie', 'Quinn').match('Debbie', 'Benjamin').should be_true
+        Name.new('Mairead', "O'Siochru").match('Mairead', 'King').should be_true
       end
     end
 
@@ -404,7 +405,11 @@ module ICU
 
     context "configuring new first name alternatives" do
       before(:all) do
-        load_alt_test(:first)
+        load_alt_test(true, :first)
+      end
+
+      after(:all) do
+        Name.reset_alternatives
       end
 
       it "should match some spelling errors" do
@@ -421,7 +426,11 @@ module ICU
 
     context "configuring new last name alternatives" do
       before(:all) do
-        load_alt_test(:last)
+        load_alt_test(true, :last)
+      end
+
+      after(:all) do
+        Name.reset_alternatives
       end
 
       it "should match some spelling errors" do
@@ -444,7 +453,11 @@ module ICU
 
     context "configuring new first and new last name alternatives" do
       before(:all) do
-        load_alt_test(:first, :last)
+        load_alt_test(true, :first, :last)
+      end
+
+      after(:all) do
+        Name.reset_alternatives
       end
 
       it "should allow some awesome matches" do
@@ -455,16 +468,20 @@ module ICU
 
     context "reverting to the default configuration" do
       before(:all) do
-        load_alt_test(:first, :last)
+        load_alt_test(true, :first, :last)
       end
 
-      it "should not match so boldly after reverting" do
-        Name.new('french, steven').match('Stephen', 'Ffrench').should be_true
+      after(:all) do
+        Name.reset_alternatives
+      end
+
+      it "should not match after reverting" do
+        Name.new('avril, demeter').match('Ceres', 'Avril').should be_true
         Name.load_alternatives(:first)
-        Name.new('Patrick', 'Murphy').match('Padraic', 'Murchadha').should be_false
-        Name.new('Patrick', 'Murphy').match('Patrick', 'Murchadha').should be_true
+        Name.new('avril, demeter').match('Ceres', 'Avril').should be_false
+        Name.new('Patrick', 'Ares').match('Patrick', 'Mars').should be_true
         Name.load_alternatives(:last)
-        Name.new('Patrick', 'Murphy').match('Patrick', 'Murchadha').should be_false
+        Name.new('Patrick', 'Ares').match('Patrick', 'Mars').should be_false
       end
     end
 
@@ -472,35 +489,39 @@ module ICU
       it "should show common nicknames" do
         Name.new('William', 'Ffrench').alternatives(:first).should =~ %w{Bill Willy Willie Will}
         Name.new('Bill', 'Ffrench').alternatives(:first).should =~ %w{William Willy Will Willie}
-        Name.new('Steven', 'Ffrench').alternatives(:first).should =~ %w{Steve}
-        Name.new('Stephen', 'Ffrench').alternatives(:first).should =~ %w{Steve}
-        Name.new('Michael Stephen', 'Ffrench').alternatives(:first).should =~ %w{Steve Mike Mick Mikey}
-        Name.new('Stephen M.', 'Ffrench').alternatives(:first).should =~ %w{Steve}
+        Name.new('Steven', 'Ffrench').alternatives(:first).should =~ %w{Steve Stephen}
+        Name.new('Stephen', 'Ffrench').alternatives(:first).should =~ %w{Stef Stefan Stefen Stephan Steve Steven}
+        Name.new('Michael Stephen', 'Ffrench').alternatives(:first).should =~ %w{Micheal Mick Mickie Micky Mike Mikey Stef Stefan Stefen Stephan Steve Steven}
+        Name.new('Stephen M.', 'Ffrench').alternatives(:first).should =~ %w{Stef Stefan Stefen Stephan Steve Steven}
+        Name.new('Sean', 'Bradley').alternatives(:first).should =~ %w{John}
         Name.new('S.', 'Ffrench').alternatives(:first).should =~ []
-        Name.new('Sean', 'Bradley').alternatives(:first).should =~ []
       end
 
       it "should have automatic last name alternatives for apostrophes to cater for FIDE's habits" do
-        Name.new('Mairead', "O'Siochru").alternatives(:last).should =~ ["O`Siochru"]
-        Name.new('Erwin E.', "L`Ami").alternatives(:last).should =~ ["L`Ami"]
+        Name.new('Mairead', "O'Siochru").alternatives(:last).should =~ %w{King O`Siochru}
+        Name.new('Erwin E.', "L`Ami").alternatives(:last).should =~ %w{L`Ami}
       end
 
-      it "should not have any last name alternatives" do
-        Name.new('William', 'Ffrench').alternatives(:last).should =~ []
-        Name.new('Oissine', 'Murphy').alternatives(:last).should =~ []
-        Name.new('Debbie', 'Quinn').alternatives(:last).should =~ []
+      it "should not have some last name alternatives" do
+        Name.new('William', 'Ffrench').alternatives(:last).should =~ %w{French}
+        Name.new('Oissine', 'Murphy').alternatives(:last).should =~ %w{Murchadha}
+        Name.new('Debbie', 'Quinn').alternatives(:last).should =~ %w{Benjamin}
       end
     end
 
     context "name alternatives with more adventurous configuration" do
       before(:all) do
-        load_alt_test(:first, :last)
+        load_alt_test(true, :first, :last)
+      end
+
+      after(:all) do
+        Name.reset_alternatives
       end
 
-      it "should show additional nicknames" do
+      it "should show different nicknames" do
         Name.new('Steven', 'Ffrench').alternatives(:first).should =~ %w{Stephen Steve}
-        Name.new('Stephen', 'Ffrench').alternatives(:first).should =~ %w{Stef Stefan Stefen Stephan Steve Steven}
-        Name.new('Stephen Mike', 'Ffrench').alternatives(:first).should =~ %w{Michael Mick Mickie Micky Mikey Stef Stefan Stefen Stephan Steve Steven}
+        Name.new('Stephen', 'Ffrench').alternatives(:first).should =~ %w{Steve Steven}
+        Name.new('Stephen Mike', 'Ffrench').alternatives(:first).should =~ %w{Michael Steve Steven}
         Name.new('Sean', 'Bradley').alternatives(:first).should =~ %w{John}
         Name.new('Sean', 'McDonagh').alternatives(:first).should =~ []
         Name.new('John', 'Bradley').alternatives(:first).should =~ %w{Sean Johnny}
@@ -521,6 +542,10 @@ module ICU
         Name.reset_alternatives
       end
 
+      after(:all) do
+        Name.reset_alternatives
+      end
+
       it "should be no more than necessary" do
         alt_compilations(:first).should == 0
         alt_compilations(:last).should == 0
@@ -530,16 +555,10 @@ module ICU
         Name.new('Debbie', 'Quinn').match('Deborah', 'Benjamin')
         alt_compilations(:first).should == 1
         alt_compilations(:last).should == 1
-        load_alt_test(:first)
+        load_alt_test(false, :first)
         alt_compilations(:first).should == 2
         alt_compilations(:last).should == 1
-        load_alt_test(:last)
-        alt_compilations(:first).should == 2
-        alt_compilations(:last).should == 2
-        Name.new('William', 'Ffrench').match('Bill', 'French')
-        Name.new('Debbie', 'Quinn').match('Deborah', 'Benjamin')
-        Name.new('Mark', 'Orr').alternatives(:first)
-        Name.new('Mark', 'Orr').alternatives(:last)
+        load_alt_test(false, :last)
         alt_compilations(:first).should == 2
         alt_compilations(:last).should == 2
       end

data/spec/util_spec.rb

@@ -2,63 +2,86 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 module ICU
-  describe Util do
-    context "#is_utf8" do
-      it "recognises some encodings as a special case of UTF-8" do
-        expect(Util.is_utf8("Resume".encode("US-ASCII"))).to be_true
-        expect(Util.is_utf8("Resume".encode("ASCII-8BIT"))).to be_true
-        expect(Util.is_utf8("Resume".encode("BINARY"))).to be_true
-      end
+  module Util
+    describe String do
+      context "#is_utf8" do
+        it "recognises some encodings as a special case of UTF-8" do
+          expect(String.is_utf8("Resume".encode("US-ASCII"))).to be_true
+          expect(String.is_utf8("Resume".encode("ASCII-8BIT"))).to be_true
+          expect(String.is_utf8("Resume".encode("BINARY"))).to be_true
+        end
+
+        it "recognises UTF-8" do
+          expect(String.is_utf8("Résumé")).to be_true
+          expect(String.is_utf8("δog")).to be_true
+        end
 
-      it "recognises UTF-8" do
-        expect(Util.is_utf8("Résumé")).to be_true
-        expect(Util.is_utf8("δog")).to be_true
+        it "should recognize other encodings as not being UTF-8" do
+          expect(String.is_utf8("Résumé".encode("ISO-8859-1"))).to be_false
+          expect(String.is_utf8("€50".encode("Windows-1252"))).to be_false
+          expect(String.is_utf8("ひらがな".encode("Shift_JIS"))).to be_false
+          expect(String.is_utf8("\xa3")).to be_false
+        end
       end
 
-      it "should recognize other encodings as not being UTF-8" do
-        expect(Util.is_utf8("Résumé".encode("ISO-8859-1"))).to be_false
-        expect(Util.is_utf8("€50".encode("Windows-1252"))).to be_false
-        expect(Util.is_utf8("ひらがな".encode("Shift_JIS"))).to be_false
-        expect(Util.is_utf8("\xa3")).to be_false
+      context "#to_utf8" do
+        it "converts to UTF-8" do
+          expect(String.to_utf8("Resume")).to eq "Resume"
+          expect(String.to_utf8("Resume".force_encoding("US-ASCII")).encoding.name).to eq "UTF-8"
+          expect(String.to_utf8("Résumé".encode("ISO-8859-1"))).to eq "Résumé"
+          expect(String.to_utf8("Résumé".encode("Windows-1252"))).to eq "Résumé"
+          expect(String.to_utf8("€50".encode("Windows-1252"))).to eq "€50"
+          expect(String.to_utf8("\xa350".force_encoding("ASCII-8BIT"))).to eq "£50"
+          expect(String.to_utf8("\xa350")).to eq "£50"
+          expect(String.to_utf8("ひらがな".encode("Shift_JIS"))).to eq "ひらがな"
+        end
       end
-    end
 
-    context "#to_utf8" do
-      it "converts to UTF-8" do
-        expect(Util.to_utf8("Resume")).to eq "Resume"
-        expect(Util.to_utf8("Resume".force_encoding("US-ASCII")).encoding.name).to eq "UTF-8"
-        expect(Util.to_utf8("Résumé".encode("ISO-8859-1"))).to eq "Résumé"
-        expect(Util.to_utf8("Résumé".encode("Windows-1252"))).to eq "Résumé"
-        expect(Util.to_utf8("€50".encode("Windows-1252"))).to eq "€50"
-        expect(Util.to_utf8("\xa350".force_encoding("ASCII-8BIT"))).to eq "£50"
-        expect(Util.to_utf8("\xa350")).to eq "£50"
-        expect(Util.to_utf8("ひらがな".encode("Shift_JIS"))).to eq "ひらがな"
+      context "#downcase" do
+        it "downcases characters in the Latin-1 range" do
+          expect(String.downcase("Eric")).to eq "eric"
+          expect(String.downcase("Éric")).to eq "éric"
+          expect(String.downcase("ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÑÒÓÔÕÖØÙÚÛÜÝÞ")).to eq "àáâãäåæçèéêëìíîïñòóôõöøùúûüýþ"
+        end
       end
-    end
 
-    context "#downcase" do
-      it "downcases characters in the Latin-1 range" do
-        expect(Util.downcase("Eric")).to eq "eric"
-        expect(Util.downcase("Éric")).to eq "éric"
-        expect(Util.downcase("ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÑÒÓÔÕÖØÙÚÛÜÝÞ")).to eq "àáâãäåæçèéêëìíîïñòóôõöøùúûüýþ"
+      context "#upcase" do
+        it "upcases characters in the Latin-1 range" do
+          expect(String.upcase("Gearoidin")).to eq "GEAROIDIN"
+          expect(String.upcase("Gearóidín")).to eq "GEARÓIDÍN"
+          expect(String.upcase("àáâãäåæçèéêëìíîïñòóôõöøùúûüýþ")).to eq "ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÑÒÓÔÕÖØÙÚÛÜÝÞ"
+        end
       end
-    end
 
-    context "#upcase" do
-      it "upcases characters in the Latin-1 range" do
-        expect(Util.upcase("Gearoidin")).to eq "GEAROIDIN"
-        expect(Util.upcase("Gearóidín")).to eq "GEARÓIDÍN"
-        expect(Util.upcase("àáâãäåæçèéêëìíîïñòóôõöøùúûüýþ")).to eq "ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÑÒÓÔÕÖØÙÚÛÜÝÞ"
+      context "#capitalize" do
+        it "capitalizes strings that might contain accented characters" do
+          expect(String.capitalize("gearoidin")).to eq "Gearoidin"
+          expect(String.capitalize("GEAROIDIN")).to eq "Gearoidin"
+          expect(String.capitalize("gEAróiDÍn")).to eq "Gearóidín"
+          expect(String.capitalize("ériC")).to eq "Éric"
+          expect(String.capitalize("ÉRIc")).to eq "Éric"
+        end
       end
     end
+    
+    describe AlternativeNames do
+      context "extends" do
+        class Dummy
+          extend AlternativeNames
+        end
+        
+        it "#last_name_like" do
+          expect(Dummy.last_name_like("Murphy", "Oissine")).to eq "last_name LIKE '%Murchadha%' OR last_name LIKE '%Murphy%'"
+          expect(Dummy.last_name_like("O'Connor", "Jonathan")).to eq "last_name LIKE '%O''Connor%' OR last_name LIKE '%O`Connor%'"
+          expect(Dummy.last_name_like("Orr", "Mark")).to eq "last_name LIKE '%Orr%'"
+          expect(Dummy.last_name_like("", "Mark")).to eq "last_name LIKE '%%'"
+        end
 
-    context "#capitalize" do
-      it "capitalizes strings that might contain accented characters" do
-        expect(Util.capitalize("gearoidin")).to eq "Gearoidin"
-        expect(Util.capitalize("GEAROIDIN")).to eq "Gearoidin"
-        expect(Util.capitalize("gEAróiDÍn")).to eq "Gearóidín"
-        expect(Util.capitalize("ériC")).to eq "Éric"
-        expect(Util.capitalize("ÉRIc")).to eq "Éric"
+        it "#first_name_like" do
+          expect(Dummy.first_name_like("sean", "bradley")).to eq "first_name LIKE '%John%' OR first_name LIKE '%sean%'"
+          expect(Dummy.first_name_like("Jonathan", "O'Connor")).to eq "first_name LIKE '%Jon%' OR first_name LIKE '%Jonathan%'"
+          expect(Dummy.first_name_like("", "O'Connor")).to eq "first_name LIKE '%%'"
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: icu_name
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-22 00:00:00.000000000 Z
+date: 2013-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -112,7 +112,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3751186445395685587
+      hash: 1642061693049790720
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: