Merge branch 'pr2'

Gemfile

@@ -1,7 +1,8 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
 gem 'hpricot'
 gem 'nokogiri'
-gem 'active_support'
+gem 'activesupport'
+gem 'builder'
 gem 'json'
-gem 'htmlentities'
+gem 'htmlentities'

Gemfile.lock_1.9

@@ -1,22 +1,32 @@
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    active_support (3.0.0)
-      activesupport (= 3.0.0)
-    activesupport (3.0.0)
+    activesupport (4.1.0)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
+    builder (3.2.2)
     hpricot (0.8.6)
     htmlentities (4.3.1)
-    json (1.7.3)
-    nokogiri (1.5.4)
-    nokogiri (1.5.4-x86-mingw32)
+    i18n (0.6.9)
+    json (1.8.1)
+    mini_portile (0.5.3)
+    minitest (5.3.3)
+    nokogiri (1.6.1)
+      mini_portile (~> 0.5.0)
+    thread_safe (0.3.3)
+    tzinfo (1.1.0)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
-  x86-mingw32
 
 DEPENDENCIES
-  active_support (= 3.0.0)
-  hpricot (= 0.8.6)
-  htmlentities (= 4.3.1)
-  json (= 1.7.3)
-  nokogiri (= 1.5.4)
+  activesupport
+  builder
+  hpricot
+  htmlentities
+  json
+  nokogiri

Gemfile.lock_2.0

@@ -1,21 +1,31 @@
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    active_support (3.0.0)
-      activesupport (= 3.0.0)
-    activesupport (3.0.0)
+    activesupport (4.1.0)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
+    builder (3.2.2)
     hpricot (0.8.6)
     htmlentities (4.3.1)
+    i18n (0.6.9)
     json (1.8.1)
-    mini_portile (0.5.2)
-    nokogiri (1.6.1-x86-mingw32)
+    mini_portile (0.5.3)
+    minitest (5.3.3)
+    nokogiri (1.6.1)
       mini_portile (~> 0.5.0)
+    thread_safe (0.3.3)
+    tzinfo (1.1.0)
+      thread_safe (~> 0.1)
 
 PLATFORMS
-  x86-mingw32
+  ruby
 
 DEPENDENCIES
-  active_support
+  activesupport
+  builder
   hpricot
   htmlentities
   json

LAST_UPDATED.txt

@@ -1 +1 @@
-2011-05-18 16:52:34 +1200
+2014-04-20 15:58:34 +1200

README.md

@@ -73,11 +73,8 @@ Using JSON as an example:
 To install the gems in the Gemfile:
 
     bundle install
-
-If you do not have Ruby installed you'll have to install that and then if you don't have Bundler installed you'll have to install that:
-    gem install bundler
-
-If you want to use a tested setup rename one of the Gemsfile.lock_xx to Gemsfile.lock (just choose the best one for your Ruby version) before running `bundle install`
+
+If you want to use a tested setup rename one of the Gemfile.lock_* files to Gemfile.lock (just choose the best one for your Ruby version) before running `bundle install`
 
 To run:
 
@@ -87,10 +84,11 @@ Note, due to file encoding issues the script should only be run using Ruby 1.9 o
 
 ### Timestamp
 
-* UN Statistical data retrieved 13 June 2012, from a document last revised 20 September 2011
-* Wikipedia data retrieved 13 June 2012, from a document last revised 10 May 2012
+* UN Statistical data retrieved 20 April 2014, from a document last revised 31 October 2013
+* Wikipedia data retrieved 20 April 2014, from a document last revised 14 April 2014
 
 ### Revisions
 
+* 20 April 2014 - `tag 3.0`
 * 13 June 2012 - `tag 2.0`
-* 18 May 2011 - `tag 1.0`
+* 18 May 2011 - `tag 1.0`

all/all.csv

@@ -1,6 +1,6 @@
 name,alpha-2,alpha-3,country-code,iso_3166-2,region-code,sub-region-code
 Afghanistan,AF,AFG,004,ISO 3166-2:AF,142,034
-Åland Islands,AX,ALA,248,ISO 3166-2:AX
+Åland Islands,AX,ALA,248,ISO 3166-2:AX,150,154
 Albania,AL,ALB,008,ISO 3166-2:AL,150,039
 Algeria,DZ,DZA,012,ISO 3166-2:DZ,002,015
 American Samoa,AS,ASM,016,ISO 3166-2:AS,009,061
@@ -185,7 +185,7 @@ Russian Federation,RU,RUS,643,ISO 3166-2:RU,150,151
 Rwanda,RW,RWA,646,ISO 3166-2:RW,002,014
 Saint Barthélemy,BL,BLM,652,ISO 3166-2:BL,019,029
 Saint Helena\, Ascension and Tristan da Cunha,SH,SHN,654,ISO 3166-2:SH,002,011
-Saint Kitts and Nevis,KN,KNA,659,ISO 3166-2:KN
+Saint Kitts and Nevis,KN,KNA,659,ISO 3166-2:KN,019,029
 Saint Lucia,LC,LCA,662,ISO 3166-2:LC,019,029
 Saint Martin (French part),MF,MAF,663,ISO 3166-2:MF,019,029
 Saint Pierre and Miquelon,PM,SPM,666,ISO 3166-2:PM,019,021
@@ -195,7 +195,7 @@ San Marino,SM,SMR,674,ISO 3166-2:SM,150,039
 Sao Tome and Principe,ST,STP,678,ISO 3166-2:ST,002,017
 Saudi Arabia,SA,SAU,682,ISO 3166-2:SA,142,145
 Senegal,SN,SEN,686,ISO 3166-2:SN,002,011
-Serbia,RS,SRB,688,ISO 3166-2:RS
+Serbia,RS,SRB,688,ISO 3166-2:RS,150,039
 Seychelles,SC,SYC,690,ISO 3166-2:SC,002,014
 Sierra Leone,SL,SLE,694,ISO 3166-2:SL,002,011
 Singapore,SG,SGP,702,ISO 3166-2:SG,142,035
@@ -216,7 +216,7 @@ Swaziland,SZ,SWZ,748,ISO 3166-2:SZ,002,018
 Sweden,SE,SWE,752,ISO 3166-2:SE,150,154
 Switzerland,CH,CHE,756,ISO 3166-2:CH,150,155
 Syrian Arab Republic,SY,SYR,760,ISO 3166-2:SY,142,145
-Taiwan\, Province of China,TW,TWN,158,ISO 3166-2:TW
+Taiwan\, Province of China,TW,TWN,158,ISO 3166-2:TW,142,030
 Tajikistan,TJ,TJK,762,ISO 3166-2:TJ,142,143
 Tanzania\, United Republic of,TZ,TZA,834,ISO 3166-2:TZ,002,014
 Thailand,TH,THA,764,ISO 3166-2:TH,142,035

all/all.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <countries>
   <country name="Afghanistan" alpha-2="AF" alpha-3="AFG" country-code="004" iso_3166-2="ISO 3166-2:AF" region-code="142" sub-region-code="034"/>
-  <country name="Åland Islands" alpha-2="AX" alpha-3="ALA" country-code="248" iso_3166-2="ISO 3166-2:AX"/>
+  <country name="Åland Islands" alpha-2="AX" alpha-3="ALA" country-code="248" iso_3166-2="ISO 3166-2:AX" region-code="150" sub-region-code="154"/>
   <country name="Albania" alpha-2="AL" alpha-3="ALB" country-code="008" iso_3166-2="ISO 3166-2:AL" region-code="150" sub-region-code="039"/>
   <country name="Algeria" alpha-2="DZ" alpha-3="DZA" country-code="012" iso_3166-2="ISO 3166-2:DZ" region-code="002" sub-region-code="015"/>
   <country name="American Samoa" alpha-2="AS" alpha-3="ASM" country-code="016" iso_3166-2="ISO 3166-2:AS" region-code="009" sub-region-code="061"/>
@@ -186,7 +186,7 @@
   <country name="Rwanda" alpha-2="RW" alpha-3="RWA" country-code="646" iso_3166-2="ISO 3166-2:RW" region-code="002" sub-region-code="014"/>
   <country name="Saint Barthélemy" alpha-2="BL" alpha-3="BLM" country-code="652" iso_3166-2="ISO 3166-2:BL" region-code="019" sub-region-code="029"/>
   <country name="Saint Helena, Ascension and Tristan da Cunha" alpha-2="SH" alpha-3="SHN" country-code="654" iso_3166-2="ISO 3166-2:SH" region-code="002" sub-region-code="011"/>
-  <country name="Saint Kitts and Nevis" alpha-2="KN" alpha-3="KNA" country-code="659" iso_3166-2="ISO 3166-2:KN"/>
+  <country name="Saint Kitts and Nevis" alpha-2="KN" alpha-3="KNA" country-code="659" iso_3166-2="ISO 3166-2:KN" region-code="019" sub-region-code="029"/>
   <country name="Saint Lucia" alpha-2="LC" alpha-3="LCA" country-code="662" iso_3166-2="ISO 3166-2:LC" region-code="019" sub-region-code="029"/>
   <country name="Saint Martin (French part)" alpha-2="MF" alpha-3="MAF" country-code="663" iso_3166-2="ISO 3166-2:MF" region-code="019" sub-region-code="029"/>
   <country name="Saint Pierre and Miquelon" alpha-2="PM" alpha-3="SPM" country-code="666" iso_3166-2="ISO 3166-2:PM" region-code="019" sub-region-code="021"/>
@@ -196,7 +196,7 @@
   <country name="Sao Tome and Principe" alpha-2="ST" alpha-3="STP" country-code="678" iso_3166-2="ISO 3166-2:ST" region-code="002" sub-region-code="017"/>
   <country name="Saudi Arabia" alpha-2="SA" alpha-3="SAU" country-code="682" iso_3166-2="ISO 3166-2:SA" region-code="142" sub-region-code="145"/>
   <country name="Senegal" alpha-2="SN" alpha-3="SEN" country-code="686" iso_3166-2="ISO 3166-2:SN" region-code="002" sub-region-code="011"/>
-  <country name="Serbia" alpha-2="RS" alpha-3="SRB" country-code="688" iso_3166-2="ISO 3166-2:RS"/>
+  <country name="Serbia" alpha-2="RS" alpha-3="SRB" country-code="688" iso_3166-2="ISO 3166-2:RS" region-code="150" sub-region-code="039"/>
   <country name="Seychelles" alpha-2="SC" alpha-3="SYC" country-code="690" iso_3166-2="ISO 3166-2:SC" region-code="002" sub-region-code="014"/>
   <country name="Sierra Leone" alpha-2="SL" alpha-3="SLE" country-code="694" iso_3166-2="ISO 3166-2:SL" region-code="002" sub-region-code="011"/>
   <country name="Singapore" alpha-2="SG" alpha-3="SGP" country-code="702" iso_3166-2="ISO 3166-2:SG" region-code="142" sub-region-code="035"/>
@@ -217,7 +217,7 @@
   <country name="Sweden" alpha-2="SE" alpha-3="SWE" country-code="752" iso_3166-2="ISO 3166-2:SE" region-code="150" sub-region-code="154"/>
   <country name="Switzerland" alpha-2="CH" alpha-3="CHE" country-code="756" iso_3166-2="ISO 3166-2:CH" region-code="150" sub-region-code="155"/>
   <country name="Syrian Arab Republic" alpha-2="SY" alpha-3="SYR" country-code="760" iso_3166-2="ISO 3166-2:SY" region-code="142" sub-region-code="145"/>
-  <country name="Taiwan, Province of China" alpha-2="TW" alpha-3="TWN" country-code="158" iso_3166-2="ISO 3166-2:TW"/>
+  <country name="Taiwan, Province of China" alpha-2="TW" alpha-3="TWN" country-code="158" iso_3166-2="ISO 3166-2:TW" region-code="142" sub-region-code="030"/>
   <country name="Tajikistan" alpha-2="TJ" alpha-3="TJK" country-code="762" iso_3166-2="ISO 3166-2:TJ" region-code="142" sub-region-code="143"/>
   <country name="Tanzania, United Republic of" alpha-2="TZ" alpha-3="TZA" country-code="834" iso_3166-2="ISO 3166-2:TZ" region-code="002" sub-region-code="014"/>
   <country name="Thailand" alpha-2="TH" alpha-3="THA" country-code="764" iso_3166-2="ISO 3166-2:TH" region-code="142" sub-region-code="035"/>