i18n_country_select 1.0.11 → 1.0.12

data/README.rdoc

@@ -26,12 +26,18 @@ Supplying priority countries to be placed at the top of the list:
 
 == Contributors
 
-* Brian McQuay from Onomojo
+* Brian McQuay (https://github.com/onomojo)
 * Brad Carson from Base 3 Media
 * Russ Smith
 * Frank Wambutt
-* https://github.com/dmilisic
+* (https://github.com/dmilisic)
+* Andreas Wolff (https://github.com/rubyphunk)
+
+== Version History
+
+1.0.12 - Adds the ability to specify text to use in a blank option
 
 == License
 
 MIT license
+

data/lib/i18n_country_select/instance_tag.rb

@@ -1,7 +1,7 @@
 module I18nCountrySelect
   module InstanceTag
     include Countries
-    
+
     def to_country_code_select_tag(priority_countries, options = {}, html_options = {})
       country_code_select(priority_countries, options, html_options)
     end
@@ -9,20 +9,23 @@ module I18nCountrySelect
     # Adapted from Rails country_select. Just uses country codes instead of full names.
     def country_code_select(priority_countries, options, html_options)
       selected = object.send(@method_name) if object.respond_to?(@method_name)
-      
+
       country_translations = COUNTRY_CODES.map{|code| [I18n.t(code, :scope => :countries), code]}.sort_alphabetical_by(&:first)
 
       countries = ""
+
+      if options[:include_blank]
+        option = options[:include_blank] == true ? "" : options[:include_blank]
+        countries += "<option value=\"\">#{option}</options>\n"
+      end
+
       if priority_countries
         countries += options_for_select(priority_countries, selected)
         countries += "<option value=\"\" disabled=\"disabled\">-------------</option>\n"
-      elsif options[:include_blank]
-        countries += "<option value=\"\">" + options[:include_blank] + "</options>\n"
-        countries += "<option value=\"\" disabled=\"disabled\">-------------</option>\n"
       end
 
       countries = countries + options_for_select(country_translations, selected)
-      
+
       html_options = html_options.stringify_keys
       add_default_name_and_id(html_options)
 

data/lib/i18n_country_select/version.rb

@@ -1,3 +1,3 @@
 module I18nCountrySelect
-  VERSION = "1.0.11"
+  VERSION = "1.0.12"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: i18n_country_select
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.0.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-22 00:00:00.000000000Z
+date: 2012-06-03 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70160517095240 !ruby/object:Gem::Requirement
+  requirement: &70200280014920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '0.5'
   type: :runtime
   prerelease: false
-  version_requirements: *70160517095240
+  version_requirements: *70200280014920
 - !ruby/object:Gem::Dependency
   name: i18n-country-translations
-  requirement: &70160517094780 !ruby/object:Gem::Requirement
+  requirement: &70200280014460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *70160517094780
+  version_requirements: *70200280014460
 - !ruby/object:Gem::Dependency
   name: sort_alphabetical
-  requirement: &70160517094320 !ruby/object:Gem::Requirement
+  requirement: &70200280014000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *70160517094320
+  version_requirements: *70200280014000
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70160517093860 !ruby/object:Gem::Requirement
+  requirement: &70200280013540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *70160517093860
+  version_requirements: *70200280013540
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70160517125120 !ruby/object:Gem::Requirement
+  requirement: &70200280013080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *70160517125120
+  version_requirements: *70200280013080
 - !ruby/object:Gem::Dependency
   name: spork
-  requirement: &70160517124660 !ruby/object:Gem::Requirement
+  requirement: &70200280044360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,7 +76,7 @@ dependencies:
         version: 1.0rc
   type: :development
   prerelease: false
-  version_requirements: *70160517124660
+  version_requirements: *70200280044360
 description: A simple country code select helper that works with I18n translations.
   Works exactly the same as country_select but uses country codes instead.
 email: brian@onomojo.com