country-select 1.0.5 → 1.1.0

data/README.md

@@ -6,11 +6,11 @@ Users are strongly advised to evaluate the suitability of this list given their
 
 ## Latest Changes
 
-As of version 1.0.5 a runtime error will be raised if any of the user-supplied priority countries do not correlate with those in the main country list.
+**1.1.0**
 
-**Note:** this may cause existing applications using country-select to fail, but such failures will highlight incorrect usage, enabling the implementation to be corrected so that correct and accurate data may be gathered.
-
-Thanks to Steve Purcell (http://github.com/purcell) for this addition.
+- Updated the country list to change the name of *Libyan Arab Jamahiriya* to *Libya* according to the [latest ISO 3166 newsletter](http://www.iso.org/iso/nl_vi-11_name_change_for_libya.pdf)
+- A country in the priority list will be selected there and not in the main list (thanks to [yyyc514](https://github.com/jamesds/country-select/pull/3))
+- Removed relics from the pre-gem days
 
 ## Installation
 
@@ -32,9 +32,16 @@ Supplying priority countries to be placed at the top of the list:
 
     country_select("user", "country_name", [ "United Kingdom", "France", "Germany" ])
 
-## Changelist
+## Version History
+
+**1.0.5**
+
+- Runtime error raised if any of the user-supplied priority countries do not correlate with those in the main country list.
+
+**Note:** this may cause existing applications using country-select to fail, but such failures will highlight incorrect usage, enabling the implementation to be corrected so that correct and accurate data may be gathered.
+
+Thanks to Steve Purcell (http://github.com/purcell) for this addition.
 
- - **1.0.5** - runtime error raised if any priority countries do not match those in the main country list
  - **1.0.4** - updated the country list to match the latest ISO 3166 specification
  - **1.0.3** - changed gem name from 'iso-3166-country-select' to just 'country-select'
  - **1.0.2** - forked the plugin and made it into a gem

data/lib/country-select.rb

@@ -20,10 +20,16 @@ module ActionView
           end
           country_options += options_for_select(priority_countries, selected)
           country_options += "<option value=\"\" disabled=\"disabled\">-------------</option>\n"
+					
+          # prevents selected from being included twice in the HTML which causes
+          # some browsers to select the second selected option (not priority)
+          # which makes it harder to select an alternative priority country
+          selected = nil if priority_countries.include?(selected)
         end
 
         return country_options + options_for_select(COUNTRIES, selected)
       end
+
       # All the countries included in the country_options output.
       COUNTRIES = ["Afghanistan", "Aland Islands", "Albania", "Algeria", "American Samoa", "Andorra", "Angola",
         "Anguilla", "Antarctica", "Antigua And Barbuda", "Argentina", "Armenia", "Aruba", "Australia", "Austria",
@@ -43,7 +49,7 @@ module ActionView
         "Honduras", "Hong Kong", "Hungary", "Iceland", "India", "Indonesia", "Iran, Islamic Republic of", "Iraq",
         "Ireland", "Isle of Man", "Israel", "Italy", "Jamaica", "Japan", "Jersey", "Jordan", "Kazakhstan", "Kenya",
         "Kiribati", "Korea, Democratic People's Republic of", "Korea, Republic of", "Kuwait", "Kyrgyzstan",
-        "Lao People's Democratic Republic", "Latvia", "Lebanon", "Lesotho", "Liberia", "Libyan Arab Jamahiriya",
+        "Lao People's Democratic Republic", "Latvia", "Lebanon", "Lesotho", "Liberia", "Libya",
         "Liechtenstein", "Lithuania", "Luxembourg", "Macao", "Macedonia, The Former Yugoslav Republic Of",
         "Madagascar", "Malawi", "Malaysia", "Maldives", "Mali", "Malta", "Marshall Islands", "Martinique",
         "Mauritania", "Mauritius", "Mayotte", "Mexico", "Micronesia, Federated States of", "Moldova, Republic of",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: country-select
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-13 00:00:00.000000000 +01:00
+date: 2012-01-06 00:00:00.000000000 +00:00
 default_executable: 
 dependencies: []
 description: Provides a form helper to insert a country select box using the ISO 3166