countries 0.9.1 → 0.9.2

data/lib/countries/select_helper.rb

@@ -7,25 +7,26 @@ module ActionView
         InstanceTag.new(object, method, self, options.delete(:object)).to_country_select_tag(priority_countries, options, html_options)
       end
 
-      def country_options_for_select(selected = nil, priority_countries = nil)
+      def country_options_for_select(selected_country_code = nil, priority_countries = nil)
         country_options = ""
 
         if priority_countries
-          priority_countries = [*priority_countries].map {|x| [x,ISO3166::Country::NameIndex[x]] }
-          country_options += options_for_select(priority_countries, selected)
+          priority_countries = [*priority_countries].map { |x| [x,ISO3166::Country::NameIndex[x]] }
+          country_options += options_for_select(priority_countries, selected_country_code)
           country_options += "<option value=\"\" disabled=\"disabled\">-------------</option>\n"
 
-          # prevent selected from being included twice in the HTML which causes
+          # prevent selected_country_code 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])
+          if selected_country = ISO3166::Country[selected_country_code]
+            selected_country_code = nil if priority_countries.include?([selected_country.name, selected_country_code])
+          end
         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] }
 
-        countries = ISO3166::Country::Names.map{|(name,alpha2)| [name.html_safe,alpha2] }
-
-        return country_options + options_for_select(countries, selected)
+        country_options + options_for_select(countries, selected_country_code)
       end
     end
 

data/lib/countries/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: countries
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-22 00:00:00.000000000 Z
+date: 2013-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: currencies