country-select 1.1.0 → 1.1.1

data/README.md

@@ -1,11 +1,15 @@
 # Country-Select
 
-Provides a simple helper to get an HTML select list of countries.  The list of countries comes from the ISO 3166 standard.  While it is a relatively neutral source of country names, it will still offend some users.
+Provides a simple helper to get an HTML select list of countries.  The list of countries comes from the ISO 3166 standard.  While it is a relatively neutral source of country names, it may still offend some users.
 
 Users are strongly advised to evaluate the suitability of this list given their user base.
 
 ## Latest Changes
 
+**1.1.1**
+
+- Fixed incompatibility with Rails 3.2.2 (thanks to [jmazzi](https://github.com/jamesds/country-select/pull/4))
+
 **1.1.0**
 
 - 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)
@@ -34,14 +38,7 @@ Supplying priority countries to be placed at the top of the list:
 
 ## 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 of the user-supplied priority countries do not correlate with 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,13 +20,15 @@ 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
 
+        country_options = country_options.html_safe if country_options.respond_to?(:html_safe)
+
         return country_options + options_for_select(COUNTRIES, selected)
       end
 
@@ -34,7 +36,7 @@ module ActionView
       COUNTRIES = ["Afghanistan", "Aland Islands", "Albania", "Algeria", "American Samoa", "Andorra", "Angola",
         "Anguilla", "Antarctica", "Antigua And Barbuda", "Argentina", "Armenia", "Aruba", "Australia", "Austria",
         "Azerbaijan", "Bahamas", "Bahrain", "Bangladesh", "Barbados", "Belarus", "Belgium", "Belize", "Benin",
-        "Bermuda", "Bhutan", "Bolivia, Plurinational State of", "Bonaire, Sint Eustatius and Saba", "Bosnia and Herzegovina", 
+        "Bermuda", "Bhutan", "Bolivia, Plurinational State of", "Bonaire, Sint Eustatius and Saba", "Bosnia and Herzegovina",
 				"Botswana", "Bouvet Island", "Brazil",
         "British Indian Ocean Territory", "Brunei Darussalam", "Bulgaria", "Burkina Faso", "Burundi", "Cambodia",
         "Cameroon", "Canada", "Cape Verde", "Cayman Islands", "Central African Republic", "Chad", "Chile", "China",
@@ -71,7 +73,7 @@ module ActionView
 				"Venezuela, Bolivarian Republic of", "Viet Nam", "Virgin Islands, British", "Virgin Islands, U.S.",
 				"Wallis and Futuna", "Western Sahara", "Yemen", "Zambia", "Zimbabwe"] unless const_defined?("COUNTRIES")
     end
-    
+
     class InstanceTag
       def to_country_select_tag(priority_countries, options, html_options)
         html_options = html_options.stringify_keys
@@ -85,7 +87,7 @@ module ActionView
         )
       end
     end
-    
+
     class FormBuilder
       def country_select(method, priority_countries = nil, options = {}, html_options = {})
         @template.country_select(@object_name, method, priority_countries, options.merge(:object => @object), html_options)

metadata

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