countries 0.9.0 → 0.9.1

data/countries.gemspec

@@ -2,7 +2,7 @@
 require File.expand_path('../lib/countries/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["hexorx", "Joe Corcoran"]
+  gem.authors       = ["Josh Robinson", "Joe Corcoran"]
   gem.email         = ["hexorx@gmail.com"]
   gem.description   = %q{All sorts of useful information about every country packaged as pretty little country objects. It includes data from ISO 3166}
   gem.summary       = %q{Gives you a country object full of all sorts of useful information.}

data/lib/countries/select_helper.rb

@@ -8,14 +8,21 @@ module ActionView
       end
 
       def country_options_for_select(selected = nil, priority_countries = nil)
-        country_options = "".html_safe
+        country_options = ""
 
         if priority_countries
-          priority_countries = [*priority_countries].map {|x| [x.html_safe,ISO3166::Country::NameIndex[x]] }
+          priority_countries = [*priority_countries].map {|x| [x,ISO3166::Country::NameIndex[x]] }
           country_options += options_for_select(priority_countries, selected)
-          country_options += raw("<option value=\"\" disabled=\"disabled\">-------------</option>\n")
+          country_options += "<option value=\"\" disabled=\"disabled\">-------------</option>\n"
+
+          # prevent 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?([ISO3166::Country[selected].name, selected])
         end
 
+        country_options = country_options.html_safe if country_options.respond_to?(:html_safe)
+
         countries = ISO3166::Country::Names.map{|(name,alpha2)| [name.html_safe,alpha2] }
 
         return country_options + options_for_select(countries, selected)

data/lib/countries/version.rb

@@ -1,3 +1,3 @@
 module Countries
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 end

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: countries
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
   prerelease: 
 platform: ruby
 authors:
-- hexorx
+- Josh Robinson
 - Joe Corcoran
 autorequire: 
 bindir: bin