country_select 1.2.0 → 1.3.1

data/lib/country_select.rb

@@ -42,14 +42,21 @@ module ActionView
       # have to wrap this call in a regular HTML
       # select tag.
       #
-      def country_options_for_select(selected = nil, priority_countries = nil, use_iso_codes = false)
+      def country_options_for_select(selected = nil, priority_countries = nil, use_iso_codes = false, use_locale = nil)
         country_options = "".html_safe
 
         if priority_countries
-          priority_countries_options = if use_iso_codes
+          priority_countries_options = if use_iso_codes || ::CountrySelect.use_iso_codes
+                                         # Codes should not be downcased, but they were previous to 1.3
+                                         # which means they should continue to be until 2.0 is released in
+                                         # order to prevent breakage with existing implementations
+                                         #
+                                         # In 2.0.0, this map should actually be upcasing the codes
+                                         priority_countries.map! { |code| code.to_s.downcase }
+
                                          priority_countries.map do |code|
                                            [
-                                             ::CountrySelect::COUNTRIES[code],
+                                             ::CountrySelect::countries(use_locale)[code],
                                              code
                                            ]
                                          end
@@ -70,13 +77,13 @@ module ActionView
           selected = nil if priority_countries.include?(selected)
         end
 
-        values = if use_iso_codes
-                   ::CountrySelect::ISO_COUNTRIES_FOR_SELECT
+        values = if use_iso_codes || ::CountrySelect.use_iso_codes
+                   ::CountrySelect::countries(use_locale).invert
                  else
-                   ::CountrySelect::COUNTRIES_FOR_SELECT
+                   ::CountrySelect::countries(use_locale).values
                  end
 
-        return country_options + options_for_select(values, selected)
+        return country_options + options_for_select(values.sort, selected)
       end
 
       # All the countries included in the country_options output.
@@ -85,12 +92,13 @@ module ActionView
     module ToCountrySelectTag
       def to_country_select_tag(priority_countries, options, html_options)
         use_iso_codes = options.delete(:iso_codes)
+        use_locale = options.delete(:locale)
         html_options = html_options.stringify_keys
         add_default_name_and_id(html_options)
         value = value(object)
         content_tag("select",
           add_options(
-            country_options_for_select(value, priority_countries, use_iso_codes),
+            country_options_for_select(value, priority_countries, use_iso_codes, use_locale),
             options, value
           ), html_options
         )

data/lib/country_select/countries.rb

@@ -1,256 +1,34 @@
 # encoding: utf-8
+require 'countries'
+
 module CountrySelect
-  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",
-  } unless const_defined?("COUNTRIES")
+  def self.use_iso_codes
+    Thread.current[:country_select_use_iso_codes] ||= false
+  end
+
+  def self.use_iso_codes=(val)
+    Thread.current[:country_select_use_iso_codes] = val
+  end
+
+  def self.locale
+    I18n.locale
+  end
+
+  #Localized Countries list
+  def self.countries(with_locale=nil)
+    with_locale ||= locale
+
+    ISO3166::Country.all.inject({}) do |hash,country_pair|
+      default_name = country_pair.first
+      code = country_pair.last
+      country = Country.new(code)
+      localized_name = country.translations[with_locale.to_s]
 
-  ISO_COUNTRIES_FOR_SELECT = COUNTRIES.invert unless const_defined?("ISO_COUNTRIES_FOR_SELECT")
-  COUNTRIES_FOR_SELECT = COUNTRIES.values unless const_defined?("COUNTRIES_FOR_SELECT")
+      # Codes should not be downcased, but they were previous to 1.3
+      # which means they should continue to be until 2.0 is released in
+      # order to prevent breakage with existing implementations
+      hash[code.downcase] = localized_name || default_name
+      hash
+    end
+  end
 end

data/lib/country_select/version.rb

@@ -1,3 +1,3 @@
 module CountrySelect
-  VERSION = "1.2.0"
+  VERSION = "1.3.1"
 end

data/spec/country_select_spec.rb

@@ -23,17 +23,17 @@ module ActionView
 
       let(:selected_us_option) do
         if defined?(Tags::Base)
-          content_tag(:option, 'United States', :selected => :selected, :value => "United States")
+          content_tag(:option, 'United States of America', :selected => :selected, :value => "United States of America")
         else
-          "<option value=\"United States\" selected=\"selected\">United States</option>"
+          "<option value=\"United States of America\" selected=\"selected\">United States of America</option>"
         end
       end
 
       let(:selected_iso_us_option) do
         if defined?(Tags::Base)
-          content_tag(:option, 'United States', :selected => :selected, :value => 'us')
+          content_tag(:option, 'United States of America', :selected => :selected, :value => 'us')
         else
-          "<option value=\"us\" selected=\"selected\">United States</option>"
+          "<option value=\"us\" selected=\"selected\">United States of America</option>"
         end
       end
 
@@ -54,33 +54,33 @@ module ActionView
           end
 
           it "creates option tags of the countries" do
-            ::CountrySelect::COUNTRIES.each do |code,name|
+            ::CountrySelect::countries("en").each do |code,name|
               tag.should include(content_tag(:option, name, :value => name))
             end
           end
 
           it "selects the value of country_name" do
-            walrus.country_name = 'United States'
+            walrus.country_name = 'United States of America'
             t = builder.country_select(:country_name)
             t.should include(selected_us_option)
           end
         end
 
         describe "#priority_countries" do
-          let(:tag) { builder.country_select(:country_name, ['United States']) }
+          let(:tag) { builder.country_select(:country_name, ['United States of America']) }
 
           it "puts the countries at the top" do
-            tag.should include("#{select_tag}<option value=\"United States")
+            tag.should include("#{select_tag}<option value=\"United States of America")
           end
 
           it "inserts a divider" do
-            tag.should include(">United States</option><option value=\"\" disabled=\"disabled\">-------------</option>")
+            tag.should include(">United States of America</option><option value=\"\" disabled=\"disabled\">-------------</option>")
           end
 
           it "does not mark two countries as selected" do
-            walrus.country_name = "United States"
+            walrus.country_name = "United States of America"
             str = <<-EOS.strip
-              </option>\n<option value="United States" selected="selected">United States</option>
+              </option>\n<option value="United States of America" selected="selected">United States of America</option>
             EOS
             tag.should_not include(str)
           end
@@ -96,7 +96,7 @@ module ActionView
           end
 
           it "creates option tags of the countries" do
-            ::CountrySelect::COUNTRIES.each do |code,name|
+            ::CountrySelect::countries("en").each do |code,name|
               tag.should include(content_tag(:option, name, :value => code))
             end
           end
@@ -108,6 +108,30 @@ module ActionView
           end
         end
 
+        describe "#country_select with global option" do
+          before do
+            ::CountrySelect.use_iso_codes = true
+          end
+
+          after do
+            ::CountrySelect.use_iso_codes = false
+          end
+
+          let(:tag) { builder.country_select(:country_name, nil) }
+
+          it "creates option tags of the countries" do
+            ::CountrySelect::countries("en").each do |code,name|
+              tag.should include(content_tag(:option, name, :value => code))
+            end
+          end
+
+          it "selects the value of country_name" do
+            walrus.country_name = 'us'
+            t = builder.country_select(:country_name)
+            t.should include(selected_iso_us_option)
+          end
+        end
+
         describe "#priority_countries" do
           let(:tag) { builder.country_select(:country_name, ['us'], :iso_codes => true) }
 
@@ -116,18 +140,27 @@ module ActionView
           end
 
           it "inserts a divider" do
-            tag.should include(">United States</option><option value=\"\" disabled=\"disabled\">-------------</option>")
+            tag.should include(">United States of America</option><option value=\"\" disabled=\"disabled\">-------------</option>")
           end
 
           it "does not mark two countries as selected" do
             walrus.country_name = "us"
             str = <<-EOS.strip
-              </option>\n<option value="us" selected="selected">United States</option>
+              </option>\n<option value="us" selected="selected">United States of America</option>
             EOS
             tag.should_not include(str)
           end
         end
       end
+      context "different language selected" do
+        describe "'es' selected as the instance language" do
+          let(:tag) { builder.country_select(:country_name, ['us'], {:iso_codes => true, :locale => 'es'}) }
+
+          it "displays spanish names" do
+            tag.should include(">Estados Unidos</option><option value=\"\" disabled=\"disabled\">-------------</option>")
+          end
+        end
+      end
     end
   end
 end