Merge pull request countries#34 from auzroz/master

Simple and verbose integration of hexorx/Countries
oceanshq · Oct 29, 2013 · 9c79378 · 9c79378
2 parents 1774f94 + 40fb4ca
commit 9c79378
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 257 deletions.
diff --git a/country_select.gemspec b/country_select.gemspec
@@ -27,4 +27,5 @@ Gem::Specification.new do |s|
   end
   s.add_development_dependency 'appraisal'
   s.add_development_dependency 'pry'
+  s.add_dependency 'countries', '0.9.3'
 end
diff --git a/gemfiles/actionpack3.0.gemfile.lock b/gemfiles/actionpack3.0.gemfile.lock
@@ -1,7 +1,8 @@
 PATH
-  remote: /Users/stefan/src/country_select
+  remote: /Users/Austin/Repositories/country_select
   specs:
     country_select (1.2.0)
+      countries (= 0.9.3)
 
 GEM
   remote: https://rubygems.org/
@@ -27,6 +28,9 @@ GEM
       rake
     builder (2.1.2)
     coderay (1.0.9)
+    countries (0.9.3)
+      currencies (~> 0.4.2)
+    currencies (0.4.2)
     diff-lcs (1.2.4)
     erubis (2.6.6)
       abstract (>= 1.0.0)

diff --git a/gemfiles/actionpack3.1.gemfile.lock b/gemfiles/actionpack3.1.gemfile.lock
@@ -1,7 +1,8 @@
 PATH
-  remote: /Users/stefan/src/country_select
+  remote: /Users/Austin/Repositories/country_select
   specs:
     country_select (1.2.0)
+      countries (= 0.9.3)
 
 GEM
   remote: https://rubygems.org/
@@ -28,6 +29,9 @@ GEM
       rake
     builder (3.0.4)
     coderay (1.0.9)
+    countries (0.9.3)
+      currencies (~> 0.4.2)
+    currencies (0.4.2)
     diff-lcs (1.2.4)
     erubis (2.7.0)
     hike (1.2.2)

diff --git a/gemfiles/actionpack3.2.gemfile.lock b/gemfiles/actionpack3.2.gemfile.lock
@@ -1,7 +1,8 @@
 PATH
-  remote: /Users/stefan/src/country_select
+  remote: /Users/Austin/Repositories/country_select
   specs:
     country_select (1.2.0)
+      countries (= 0.9.3)
 
 GEM
   remote: https://rubygems.org/
@@ -27,6 +28,9 @@ GEM
       rake
     builder (3.0.4)
     coderay (1.0.9)
+    countries (0.9.3)
+      currencies (~> 0.4.2)
+    currencies (0.4.2)
     diff-lcs (1.2.4)
     erubis (2.7.0)
     hike (1.2.2)

diff --git a/gemfiles/actionpack4.0.gemfile.lock b/gemfiles/actionpack4.0.gemfile.lock
@@ -1,7 +1,8 @@
 PATH
-  remote: /Users/stefan/src/country_select
+  remote: /Users/Austin/Repositories/country_select
   specs:
     country_select (1.2.0)
+      countries (= 0.9.3)
 
 GEM
   remote: https://rubygems.org/
@@ -24,6 +25,9 @@ GEM
     atomic (1.1.10)
     builder (3.1.4)
     coderay (1.0.9)
+    countries (0.9.3)
+      currencies (~> 0.4.2)
+    currencies (0.4.2)
     diff-lcs (1.2.4)
     erubis (2.7.0)
     i18n (0.6.4)

diff --git a/lib/country_select/countries.rb b/lib/country_select/countries.rb
@@ -1,4 +1,6 @@
 # encoding: utf-8
+require 'countries'
+
 module CountrySelect
   @@use_iso_codes = false
   def self.use_iso_codes
@@ -7,258 +9,12 @@ def self.use_iso_codes
   def self.use_iso_codes=(use_iso_codes)
     @@use_iso_codes = use_iso_codes
   end
-
-  COUNTRIES =  {
-    "AF" => "Afghanistan",
-    "AX" => "Åland Islands",
-    "AL" => "Albania",
-    "DZ" => "Algeria",
-    "AS" => "American Samoa",
-    "AD" => "Andorra",
-    "AO" => "Angola",
-    "AI" => "Anguilla",
-    "AQ" => "Antarctica",
-    "AG" => "Antigua and Barbuda",
-    "AR" => "Argentina",
-    "AM" => "Armenia",
-    "AW" => "Aruba",
-    "AU" => "Australia",
-    "AT" => "Austria",
-    "AZ" => "Azerbaijan",
-    "BS" => "Bahamas",
-    "BH" => "Bahrain",
-    "BD" => "Bangladesh",
-    "BB" => "Barbados",
-    "BY" => "Belarus",
-    "BE" => "Belgium",
-    "BZ" => "Belize",
-    "BJ" => "Benin",
-    "BM" => "Bermuda",
-    "BT" => "Bhutan",
-    "BO" => "Bolivia, Plurinational State of",
-    "BQ" => "Bonaire, Sint Eustatius and Saba",
-    "BA" => "Bosnia and Herzegovina",
-    "BW" => "Botswana",
-    "BV" => "Bouvet Island",
-    "BR" => "Brazil",
-    "IO" => "British Indian Ocean Territory",
-    "BN" => "Brunei Darussalam",
-    "BG" => "Bulgaria",
-    "BF" => "Burkina Faso",
-    "BI" => "Burundi",
-    "KH" => "Cambodia",
-    "CM" => "Cameroon",
-    "CA" => "Canada",
-    "CV" => "Cape Verde",
-    "KY" => "Cayman Islands",
-    "CF" => "Central African Republic",
-    "TD" => "Chad",
-    "CL" => "Chile",
-    "CN" => "China",
-    "CX" => "Christmas Island",
-    "CC" => "Cocos (Keeling) Islands",
-    "CO" => "Colombia",
-    "KM" => "Comoros",
-    "CG" => "Congo",
-    "CD" => "Congo, the Democratic Republic of the",
-    "CK" => "Cook Islands",
-    "CR" => "Costa Rica",
-    "CI" => "Côte d'Ivoire",
-    "HR" => "Croatia",
-    "CU" => "Cuba",
-    "CW" => "Curaçao",
-    "CY" => "Cyprus",
-    "CZ" => "Czech Republic",
-    "DK" => "Denmark",
-    "DJ" => "Djibouti",
-    "DM" => "Dominica",
-    "DO" => "Dominican Republic",
-    "EC" => "Ecuador",
-    "EG" => "Egypt",
-    "SV" => "El Salvador",
-    "GQ" => "Equatorial Guinea",
-    "ER" => "Eritrea",
-    "EE" => "Estonia",
-    "ET" => "Ethiopia",
-    "FK" => "Falkland Islands (Malvinas)",
-    "FO" => "Faroe Islands",
-    "FJ" => "Fiji",
-    "FI" => "Finland",
-    "FR" => "France",
-    "GF" => "French Guiana",
-    "PF" => "French Polynesia",
-    "TF" => "French Southern Territories",
-    "GA" => "Gabon",
-    "GM" => "Gambia",
-    "GE" => "Georgia",
-    "DE" => "Germany",
-    "GH" => "Ghana",
-    "GI" => "Gibraltar",
-    "GR" => "Greece",
-    "GL" => "Greenland",
-    "GD" => "Grenada",
-    "GP" => "Guadeloupe",
-    "GU" => "Guam",
-    "GT" => "Guatemala",
-    "GG" => "Guernsey",
-    "GN" => "Guinea",
-    "GW" => "Guinea-Bissau",
-    "GY" => "Guyana",
-    "HT" => "Haiti",
-    "HM" => "Heard Island and McDonald Islands",
-    "VA" => "Holy See (Vatican City State)",
-    "HN" => "Honduras",
-    "HK" => "Hong Kong",
-    "HU" => "Hungary",
-    "IS" => "Iceland",
-    "IN" => "India",
-    "ID" => "Indonesia",
-    "IR" => "Iran, Islamic Republic of",
-    "IQ" => "Iraq",
-    "IE" => "Ireland",
-    "IM" => "Isle of Man",
-    "IL" => "Israel",
-    "IT" => "Italy",
-    "JM" => "Jamaica",
-    "JP" => "Japan",
-    "JE" => "Jersey",
-    "JO" => "Jordan",
-    "KZ" => "Kazakhstan",
-    "KE" => "Kenya",
-    "KI" => "Kiribati",
-    "KP" => "Korea, Democratic People's Republic of",
-    "KR" => "Korea, Republic of",
-    "KW" => "Kuwait",
-    "KG" => "Kyrgyzstan",
-    "LA" => "Lao People's Democratic Republic",
-    "LV" => "Latvia",
-    "LB" => "Lebanon",
-    "LS" => "Lesotho",
-    "LR" => "Liberia",
-    "LY" => "Libya",
-    "LI" => "Liechtenstein",
-    "LT" => "Lithuania",
-    "LU" => "Luxembourg",
-    "MO" => "Macao",
-    "MK" => "Macedonia, the former Yugoslav Republic of",
-    "MG" => "Madagascar",
-    "MW" => "Malawi",
-    "MY" => "Malaysia",
-    "MV" => "Maldives",
-    "ML" => "Mali",
-    "MT" => "Malta",
-    "MH" => "Marshall Islands",
-    "MQ" => "Martinique",
-    "MR" => "Mauritania",
-    "MU" => "Mauritius",
-    "YT" => "Mayotte",
-    "MX" => "Mexico",
-    "FM" => "Micronesia, Federated States of",
-    "MD" => "Moldova, Republic of",
-    "MC" => "Monaco",
-    "MN" => "Mongolia",
-    "ME" => "Montenegro",
-    "MS" => "Montserrat",
-    "MA" => "Morocco",
-    "MZ" => "Mozambique",
-    "MM" => "Myanmar",
-    "NA" => "Namibia",
-    "NR" => "Nauru",
-    "NP" => "Nepal",
-    "NL" => "Netherlands",
-    "NC" => "New Caledonia",
-    "NZ" => "New Zealand",
-    "NI" => "Nicaragua",
-    "NE" => "Niger",
-    "NG" => "Nigeria",
-    "NU" => "Niue",
-    "NF" => "Norfolk Island",
-    "MP" => "Northern Mariana Islands",
-    "NO" => "Norway",
-    "OM" => "Oman",
-    "PK" => "Pakistan",
-    "PW" => "Palau",
-    "PS" => "Palestine, State of",
-    "PA" => "Panama",
-    "PG" => "Papua New Guinea",
-    "PY" => "Paraguay",
-    "PE" => "Peru",
-    "PH" => "Philippines",
-    "PN" => "Pitcairn",
-    "PL" => "Poland",
-    "PT" => "Portugal",
-    "PR" => "Puerto Rico",
-    "QA" => "Qatar",
-    "RE" => "Réunion",
-    "RO" => "Romania",
-    "RU" => "Russian Federation",
-    "RW" => "Rwanda",
-    "BL" => "Saint Barthélemy",
-    "SH" => "Saint Helena, Ascension and Tristan da Cunha",
-    "KN" => "Saint Kitts and Nevis",
-    "LC" => "Saint Lucia",
-    "MF" => "Saint Martin (French part)",
-    "PM" => "Saint Pierre and Miquelon",
-    "VC" => "Saint Vincent and the Grenadines",
-    "WS" => "Samoa",
-    "SM" => "San Marino",
-    "ST" => "Sao Tome and Principe",
-    "SA" => "Saudi Arabia",
-    "SN" => "Senegal",
-    "RS" => "Serbia",
-    "SC" => "Seychelles",
-    "SL" => "Sierra Leone",
-    "SG" => "Singapore",
-    "SX" => "Sint Maarten (Dutch part)",
-    "SK" => "Slovakia",
-    "SI" => "Slovenia",
-    "SB" => "Solomon Islands",
-    "SO" => "Somalia",
-    "ZA" => "South Africa",
-    "GS" => "South Georgia and the South Sandwich Islands",
-    "SS" => "South Sudan",
-    "ES" => "Spain",
-    "LK" => "Sri Lanka",
-    "SD" => "Sudan",
-    "SR" => "Suriname",
-    "SJ" => "Svalbard and Jan Mayen",
-    "SZ" => "Swaziland",
-    "SE" => "Sweden",
-    "CH" => "Switzerland",
-    "SY" => "Syrian Arab Republic",
-    "TW" => "Taiwan, Province of China",
-    "TJ" => "Tajikistan",
-    "TZ" => "Tanzania, United Republic of",
-    "TH" => "Thailand",
-    "TL" => "Timor-Leste",
-    "TG" => "Togo",
-    "TK" => "Tokelau",
-    "TO" => "Tonga",
-    "TT" => "Trinidad and Tobago",
-    "TN" => "Tunisia",
-    "TR" => "Turkey",
-    "TM" => "Turkmenistan",
-    "TC" => "Turks and Caicos Islands",
-    "TV" => "Tuvalu",
-    "UG" => "Uganda",
-    "UA" => "Ukraine",
-    "AE" => "United Arab Emirates",
-    "GB" => "United Kingdom",
-    "US" => "United States",
-    "UM" => "United States Minor Outlying Islands",
-    "UY" => "Uruguay",
-    "UZ" => "Uzbekistan",
-    "VU" => "Vanuatu",
-    "VE" => "Venezuela, Bolivarian Republic of",
-    "VN" => "Viet Nam",
-    "VG" => "Virgin Islands, British",
-    "VI" => "Virgin Islands, U.S.",
-    "WF" => "Wallis and Futuna",
-    "EH" => "Western Sahara",
-    "YE" => "Yemen",
-    "ZM" => "Zambia",
-    "ZW" => "Zimbabwe"
-  } unless const_defined?("COUNTRIES")
+
+  unless const_defined?("COUNTRIES")
+    COUNTRIES =  ISO3166::Country.all.inject({}) do |r,s| 
+        r.merge!({s[1] => s[0]})
+    end
+  end
 
   ISO_COUNTRIES_FOR_SELECT = COUNTRIES.invert unless const_defined?("ISO_COUNTRIES_FOR_SELECT")
   COUNTRIES_FOR_SELECT = COUNTRIES.values unless const_defined?("COUNTRIES_FOR_SELECT")

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -16,5 +16,5 @@
   # order dependency and want to debug it, you can fix the order by providing
   # the seed, which is printed after each run.
   #     --seed 1234
-  config.order = 'random'
+  # config.order = 'random'
 end