icu_name 1.0.2 → 1.0.3

data/lib/icu_name/name.rb

@@ -136,7 +136,7 @@ module ICU
 
     # Clean up characters in any name keeping only letters (including accented), hyphens, and single quotes.
     def clean(name)
-      name.gsub!(/`/, "'")
+      name.gsub!(/[`‘’′‛]/, "'")
       name.gsub!(/./) do |m|
         if m.ord < 256
           # Keep Latin1 accented letters.
@@ -270,8 +270,15 @@ module ICU
           alts.push k if v == true || v.match(target)
         end
       end
+      alts.concat(automatic_alts(names))
       alts
     end
+    
+    # Add automatic alternatives - those not dependent on a compiled list.
+    # Currently only provides alternative for apostrophes, as backticks are often used instead by FIDE.
+    def automatic_alts(names)
+      names.find_all{|n| n.index("'")}.map{|n| n.gsub!("'", "`")}
+    end
 
     # Compile an alternative names hash (for either first names or last names) before matching is first attempted.
     def self.compile_alts(type, data=nil, force=false)

data/lib/icu_name/version.rb

@@ -2,6 +2,6 @@
 
 module ICU
   class Name
-    VERSION = "1.0.2"
+    VERSION = "1.0.3"
   end
 end

data/spec/name_spec.rb

@@ -108,14 +108,28 @@ module ICU
       end
     end
 
-    context "last names involving a quote" do
-      it "should be handled correctly" do
+    context "last names involving single quote-like characters" do
+      before(:each) do
+        @una = Name.new('Una', "O'Boyle")
+      end
+
+      it "should use apostrophe (0027) as the canonical choice" do
         Name.new('una', "O'boyle").name.should == "Una O'Boyle"
+        Name.new('Una', "o’boyle").name.should == "Una O'Boyle"
         Name.new('jonathan', 'd`arcy').name.should == "Jonathan D'Arcy"
-        Name.new('erwin e', "L'AMI").name.should == "Erwin E. L'Ami"
+        Name.new('erwin e', "L′AMI").name.should == "Erwin E. L'Ami"
         Name.new('cormac', "o brien").name.should == "Cormac O'Brien"
         Name.new('türko', "o özgür").name.should == "Türko O'Özgür"
-        Name.new('türko', "l`özgür").name.should == "Türko L'Özgür"
+        Name.new('türko', "l‘özgür").name.should == "Türko L'Özgür"
+      end
+
+      it "backticks (0060), opening (2018) and closing (2019) single quotes, primes (2032) and high reversed 9 quotes (201B) should be equivalent" do
+        @una.match("Una", "O`Boyle").should be_true
+        @una.match("Una", "O’Boyle").should be_true
+        @una.match("Una", "O‘Boyle").should be_true
+        @una.match("Una", "O′Boyle").should be_true
+        @una.match("Una", "O‛Boyle").should be_true
+        @una.match("Una", "O‚Boyle").should be_false
       end
     end
 
@@ -471,9 +485,13 @@ module ICU
         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"]
+      end
+
       it "should not have any last name alternatives" do
         Name.new('William', 'Ffrench').alternatives(:last).should =~ []
-        Name.new('Mairead', "O'Siochru").alternatives(:last).should =~ []
         Name.new('Oissine', 'Murphy').alternatives(:last).should =~ []
         Name.new('Debbie', 'Quinn').alternatives(:last).should =~ []
       end
@@ -495,7 +513,7 @@ module ICU
 
       it "should have some last name alternatives" do
         Name.new('William', 'Ffrench').alternatives(:last).should =~ %w{French}
-        Name.new('Mairead', "O'Siochru").alternatives(:last).should =~ %w{King}
+        Name.new('Mairead', "O'Siochru").alternatives(:last).should =~ %w{King O`Siochru}
         Name.new('Oissine', 'Murphy').alternatives(:last).should =~ %w{Murchadha}
         Name.new('Debbie', 'Quinn').alternatives(:last).should =~ %w{Benjamin}
         Name.new('Mark', 'Quinn').alternatives(:last).should =~ []

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 2
-  version: 1.0.2
+  - 3
+  version: 1.0.3
 platform: ruby
 authors: 
 - Mark Orr
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-17 00:00:00 +01:00
+date: 2011-05-28 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency