carmen 1.1.2 → 1.1.3

data/iso_data/base/world/sm.yml

@@ -13,7 +13,7 @@
   type: municipalities
 - code: '07'
   type: municipalities
-- code: 08
+- code: '08'
   type: municipalities
-- code: 09
+- code: '09'
   type: municipalities

data/iso_data/base/world/tr.yml

@@ -13,9 +13,9 @@
   type: province
 - code: '07'
   type: province
-- code: 08
+- code: '08'
   type: province
-- code: 09
+- code: '09'
   type: province
 - code: '10'
   type: province

data/iso_data/base/world/tz.yml

@@ -13,9 +13,9 @@
   type: region
 - code: '07'
   type: region
-- code: 08
+- code: '08'
   type: region
-- code: 09
+- code: '09'
   type: region
 - code: '10'
   type: region

data/iso_data/base/world/ua.yml

@@ -3,7 +3,7 @@
   type: province
 - code: '07'
   type: province
-- code: 09
+- code: '09'
   type: province
 - code: '12'
   type: province

data/iso_data/base/world/vn.yml

@@ -13,7 +13,7 @@
   type: province
 - code: '07'
   type: province
-- code: 09
+- code: '09'
   type: province
 - code: '13'
   type: province

data/iso_data/base/world/za.yml

@@ -3,7 +3,7 @@
   type: province
 - code: FS
   type: province
-- code: GP
+- code: GT
   type: province
 - code: LP
   type: province
@@ -11,9 +11,9 @@
   type: province
 - code: NC
   type: province
+- code: NL
+  type: province
 - code: NW
   type: province
 - code: WC
   type: province
-- code: ZN
-  type: province

data/iso_data/base/world/zm.yml

@@ -13,7 +13,7 @@
   type: province
 - code: '07'
   type: province
-- code: 08
+- code: '08'
   type: province
-- code: 09
+- code: '09'
   type: province

data/lib/carmen/querying.rb

@@ -32,15 +32,20 @@ module Carmen
     def named(name, options={})
       case_fold = !options[:case] && name.respond_to?(:each_codepoint)
       # These only need to be built once
-      name = case_fold ? name.mb_chars.downcase.normalize : name
+      name = case_fold ? normalise_name(name) : name
       # For now, "fuzzy" just means substring, optionally case-insensitive (the second argument looks for nil, not falseness)
       regexp = options[:fuzzy] ? Regexp.new(name.split(/[-'\s]/).join("[-'\s]"), options[:case] ? nil : true) : nil
-      
+
       query_collection.find do |region|
-        found_literal = name === (case_fold && region.name ? region.name.mb_chars.downcase.normalize : region.name)
+        found_literal = name === (case_fold && region.name ? normalise_name(region.name) : region.name)
         found_literal || options[:fuzzy] && regexp === region.name
       end
     end
 
+    private
+
+    def normalise_name(name)
+      name.mb_chars.downcase.unicode_normalize(:nfkc)
+    end
   end
 end

data/lib/carmen/version.rb

@@ -1,3 +1,3 @@
 module Carmen
-  VERSION = '1.1.2'
+  VERSION = '1.1.3'
 end

data/locale/base/en/world.yml

@@ -340,7 +340,7 @@ en:
     gm:
       common_name: 
       name: Gambia
-      official_name: Islamic Republic of the Gambia
+      official_name: Republic of the Gambia
     gn:
       common_name: 
       name: Guinea
@@ -575,8 +575,8 @@ en:
       official_name: Republic of the Marshall Islands
     mk:
       common_name: 
-      name: Macedonia, Republic of
-      official_name: The Former Yugoslav Republic of Macedonia
+      name: North Macedonia
+      official_name: Republic of North Macedonia
     ml:
       common_name: 
       name: Mali
@@ -851,8 +851,8 @@ en:
       official_name: 
     sz:
       common_name: 
-      name: Swaziland
-      official_name: Kingdom of Swaziland
+      name: Eswatini
+      official_name: Kingdom of Eswatini
     tc:
       common_name: 
       name: Turks and Caicos Islands

data/locale/base/en/world/ad.yml

@@ -14,5 +14,5 @@ en:
         name: Sant Julià de Lòria
       '07':
         name: Andorra la Vella
-      08:
+      '08':
         name: Escaldes-Engordany

data/locale/base/en/world/ag.yml

@@ -12,7 +12,7 @@ en:
         name: Saint Paul
       '07':
         name: Saint Peter
-      08:
+      '08':
         name: Saint Philip
       '10':
         name: Barbuda

data/locale/base/en/world/al.yml

@@ -16,9 +16,9 @@ en:
         name: Korçë
       '07':
         name: Kukës
-      08:
+      '08':
         name: Lezhë
-      09:
+      '09':
         name: Dibër
       '10':
         name: Shkodër

data/locale/base/en/world/al/08.yml

@@ -2,7 +2,7 @@
 en:
   world:
     al:
-      08:
+      '08':
         kb:
           name: Kurbin
         le:

data/locale/base/en/world/al/09.yml

@@ -2,7 +2,7 @@
 en:
   world:
     al:
-      09:
+      '09':
         bu:
           name: Bulqizë
         di:

data/locale/base/en/world/ba/bih.yml

@@ -17,9 +17,9 @@ en:
           name: Srednjobosanski kanton
         '07':
           name: Hercegovačko-neretvanski kanton
-        08:
+        '08':
           name: Zapadnohercegovački kanton
-        09:
+        '09':
           name: Kanton Sarajevo
         '10':
           name: Kanton br. 10 (Livanjski kanton)

data/locale/base/en/world/bb.yml

@@ -16,9 +16,9 @@ en:
         name: Saint Joseph
       '07':
         name: Saint Lucy
-      08:
+      '08':
         name: Saint Michael
-      09:
+      '09':
         name: Saint Peter
       '10':
         name: Saint Philip

data/locale/base/en/world/bd/b.yml

@@ -7,9 +7,9 @@ en:
           name: Bandarban
         '04':
           name: Brahmanbaria
-        08:
+        '08':
           name: Comilla
-        09:
+        '09':
           name: Chandpur
         '10':
           name: Chittagong

data/locale/base/en/world/bf.yml

@@ -16,9 +16,9 @@ en:
         name: Centre-Ouest
       '07':
         name: Centre-Sud
-      08:
+      '08':
         name: Est
-      09:
+      '09':
         name: Hauts-Bassins
       '10':
         name: Nord

data/locale/base/en/world/bf/08.yml

@@ -2,7 +2,7 @@
 en:
   world:
     bf:
-      08:
+      '08':
         gna:
           name: Gnagna
         gou:

data/locale/base/en/world/bf/09.yml

@@ -2,7 +2,7 @@
 en:
   world:
     bf:
-      09:
+      '09':
         hou:
           name: Houet
         ken:

data/locale/base/en/world/bg.yml

@@ -16,9 +16,9 @@ en:
         name: Vratsa
       '07':
         name: Gabrovo
-      08:
+      '08':
         name: Dobrich
-      09:
+      '09':
         name: Kardzhali
       '10':
         name: Kyustendil

data/locale/base/en/world/ci.yml

@@ -16,9 +16,9 @@ en:
         name: 18 Montagnes (Région des)
       '07':
         name: Lacs (Région des)
-      08:
+      '08':
         name: Zanzan (Région du)
-      09:
+      '09':
         name: Bas-Sassandra (Région du)
       '10':
         name: Denguélé (Région du)

data/locale/base/en/world/cn.yml

@@ -2,71 +2,71 @@
 en:
   world:
     cn:
-      '11':
-        name: Beijing
-      '12':
-        name: Tianjin
-      '13':
-        name: Hebei
-      '14':
-        name: Shanxi
-      '15':
-        name: Nei Mongol
-      '21':
-        name: Liaoning
-      '22':
-        name: Jilin
-      '23':
-        name: Heilongjiang
-      '31':
-        name: Shanghai
-      '32':
-        name: Jiangsu
-      '33':
-        name: Zhejiang
-      '34':
-        name: Anhui
-      '35':
-        name: Fujian
-      '36':
-        name: Jiangxi
-      '37':
-        name: Shandong
-      '41':
-        name: Henan
-      '42':
-        name: Hubei
-      '43':
-        name: Hunan
-      '44':
-        name: Guangdong
-      '45':
-        name: Guangxi
-      '46':
-        name: Hainan
-      '50':
-        name: Chongqing
-      '51':
-        name: Sichuan
-      '52':
-        name: Guizhou
-      '53':
-        name: Yunnan
-      '54':
-        name: Xizang
-      '61':
-        name: Shaanxi
-      '62':
-        name: Gansu
-      '63':
-        name: Qinghai
-      '64':
-        name: Ningxia
-      '65':
-        name: Xinjiang
-      '71':
-        name: Taiwan
-      '91':
-        name: Xianggang (Hong-Kong)
-      '92':
-        name: Aomen (Macau)
+      ah:
+        name: Anhui Sheng
+      bj:
+        name: Beijing Shi
+      cq:
+        name: Chongqing Shi
+      fj:
+        name: Fujian Sheng
+      gd:
+        name: Guangdong Sheng
+      gs:
+        name: Gansu Sheng
+      gx:
+        name: Guangxi Zhuangzu Zizhiqu
+      gz:
+        name: Guizhou Sheng
+      ha:
+        name: Henan Sheng
+      hb:
+        name: Hubei Sheng
+      he:
+        name: Hebei Sheng
+      hi:
+        name: Hainan Sheng
+      hk:
+        name: Hong Kong SAR (see also separate country code entry under HK)
+      hl:
+        name: Heilongjiang Sheng
+      hn:
+        name: Hunan Sheng
+      jl:
+        name: Jilin Sheng
+      js:
+        name: Jiangsu Sheng
+      jx:
+        name: Jiangxi Sheng
+      ln:
+        name: Liaoning Sheng
+      mo:
+        name: Macao SAR (see also separate country code entry under MO)
+      nm:
+        name: Nei Mongol Zizhiqu
+      nx:
+        name: Ningxia Huizi Zizhiqu
+      qh:
+        name: Qinghai Sheng
+      sc:
+        name: Sichuan Sheng
+      sd:
+        name: Shandong Sheng
+      sh:
+        name: Shanghai Shi
+      sn:
+        name: Shaanxi Sheng
+      sx:
+        name: Shanxi Sheng
+      tj:
+        name: Tianjin Shi
+      tw:
+        name: Taiwan Sheng (see also separate country code entry under TW)
+      xj:
+        name: Xinjiang Uygur Zizhiqu
+      xz:
+        name: Xizang Zizhiqu
+      yn:
+        name: Yunnan Sheng
+      zj:
+        name: Zhejiang Sheng

data/locale/base/en/world/cu.yml

@@ -16,9 +16,9 @@ en:
         name: Cienfuegos
       '07':
         name: Sancti Spíritus
-      08:
+      '08':
         name: Ciego de Ávila
-      09:
+      '09':
         name: Camagüey
       '10':
         name: Las Tunas