country_select 1.1.3 → 1.2.0

data/.gitignore

@@ -1,4 +1,5 @@
 *.gem
+*.sqlite
 .bundle
 Gemfile.lock
 pkg/*

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--format progress

data/.travis.yml

@@ -0,0 +1,17 @@
+language: ruby
+script: "bundle exec rake appraisal:integration"
+rvm:
+  - ruby-head
+  - 2.0.0
+  - 1.9.3
+  - 1.9.2
+  - 1.8.7
+  - ree
+  - jruby-head
+  - jruby-19mode
+  - jruby-18mode
+  - rbx-19mode
+  - rbx-18mode
+matrix:
+  allow_failures:
+    - rvm: ruby-head

data/Appraisals

@@ -0,0 +1,19 @@
+# appraise 'actionpack2.3' do
+#   gem 'actionpack', '~> 2.3.0'
+# end
+
+appraise 'actionpack3.0' do
+  gem 'actionpack', '~> 3.0.0'
+end
+
+appraise 'actionpack3.1' do
+  gem 'actionpack', '~> 3.1.0'
+end
+
+appraise 'actionpack3.2' do
+  gem 'actionpack', '~> 3.2.0'
+end
+
+appraise 'actionpack4.0' do
+  gem 'actionpack', '~> 4.0.0'
+end

data/CHANGELOG.md

@@ -0,0 +1,14 @@
+== 1.2.0 2013-07-06
+
+  * Country names have been synced with UTF-8 encoding to the list of
+    countries on [Wikipedia's page for the ISO-3166 standard](https://en.wikipedia.org/wiki/ISO_3166-1).
+    * NOTE: This could be a breaking change with some of the country
+      names that have been fixed since the list was last updated.
+    * For more information you can checkout all country mappings with
+      `::CountrySelect::COUNTRIES`
+
+  * You can now store your country values using the
+    [ISO-3166 Alpha-2 codes](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2)
+    with the `iso_codes` option. See the README.md for details.
+    * This should help alleviate the problem of country names
+      in ISO-3166 being changed and/or corrected.

data/Gemfile

@@ -1,6 +1,4 @@
-source "http://rubygems.org"
-
-gem 'rake'
+source 'https://rubygems.org'
 
 # Specify your gem's dependencies in country_select.gemspec
 gemspec

data/README.md

@@ -1,34 +1,87 @@
-Country_Select
+# Rails – Country Select
+[![Build Status](https://travis-ci.org/stefanpenner/country_select.png?branch=master)](https://travis-ci.org/stefanpenner/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 may
-still offend some users.
+Provides a simple helper to get an HTML select list of countries using the
+[ISO 3166-1 standard](https://en.wikipedia.org/wiki/ISO_3166-1).
 
-Users are strongly advised to evaluate the suitability of this list given their user base.
+It is also configurable to use countries'
+[ISO 3166-1 alpha-2 codes](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2)
+as values and
+[ISO 3166-1 names](https://en.wikipedia.org/wiki/ISO_3166-1)
+as display strings.
+
+While the ISO 3166 standard is a relatively neutral source of country
+names, it may still offend some users. Developers are strongly advised
+to evaluate the suitability of this list given their user base.
 
 ## Installation
 
 Install as a gem using
 
-    gem install country_select
-
+```shell
+gem install country_select
+```
 Or put the following in your Gemfile
 
-    gem 'country_select'
+```ruby
+gem 'country_select'
+```
 
 ## Example
 
 Simple use supplying model and attribute as parameters:
 
-    country_select("user", "country_name")
+```ruby
+country_select("user", "country")
+```
 
 Supplying priority countries to be placed at the top of the list:
 
-    country_select("user", "country_name", [ "United Kingdom", "France", "Germany" ])
+```ruby
+country_select("user", "country", [ "Great Britain", "France", "Germany" ])
+```
+
+### Using ISO 3166-1 alpha-2 codes as values
+You can have the `option` tags use ISO 3166-1 alpha-2 codes as values
+and the country names as display strings. For example, the United States
+would appear as `<option value="us">United States</option>`
+
+If you're starting a new project, this is the recommended way to store
+your country data since it will be more resistant to country names
+changing.
+
+```ruby
+country_select("user", "country_code", nil, iso_codes: true)
+```
+
+```ruby
+country_select("user", "country_code", [ "gb", "fr", "de" ], iso_codes: true)
+```
+
+#### Getting the Country from ISO codes
+
+```ruby
+class User < ActiveRecord::Base
+
+  # Assuming country_select is used with User attribute `country_code`
+  def country_name
+    ::CountrySelect::COUNTRIES[country_code]
+  end
+
+end
+```
+
+## Tests
+
+```shell
+bundle
+bundle exec rspec
+```
 
-Specifying which country to be selected:
-United Kingdom will be selected.
+### Running with multiple versions of actionpack
 
-    country_select("user", "country_name", [ "+United Kingdom+", "France", "Germany" ])
+```shell
+bundle exec appraisal
+```
 
 Copyright (c) 2008 Michael Koziarski, released under the MIT license

data/Rakefile

@@ -1 +1,24 @@
-require "bundler/gem_tasks"
+require 'rubygems'
+require 'bundler/setup'
+require 'bundler/gem_tasks'
+
+require 'appraisal'
+
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec
+
+namespace :appraisal do
+  desc "Run the given task for a particular integration's appraisals"
+  task :integration do
+    Appraisal::File.each do |appraisal|
+      if RUBY_VERSION < '1.9.3' and appraisal.name  == 'actionpack4.0'
+        # skip rails 4 for ruby < 1.9.3
+      else
+        appraisal.install
+        Appraisal::Command.from_args(appraisal.gemfile_path).run
+      end
+    end
+  end
+end

data/country_select.gemspec

@@ -1,24 +1,30 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "country_select/version"
+$:.push File.expand_path('../lib', __FILE__)
+require 'country_select/version'
 
 Gem::Specification.new do |s|
-  s.name        = "country_select"
+  s.name        = 'country_select'
   s.version     = CountrySelect::VERSION
-  s.authors     = ["Stefan Penner"]
-  s.email       = ["stefan.penner@gmail.com"]
-  s.homepage    = ""
+  s.authors     = ['Stefan Penner']
+  s.email       = ['stefan.penner@gmail.com']
+  s.homepage    = 'https://github.com/stefanpenner/country_select'
   s.summary     = %q{Country Select Plugin}
   s.description = %q{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.}
 
-  s.rubyforge_project = "country_select"
+  s.rubyforge_project = 'country_select'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  s.require_paths = ['lib']
 
   # specify any dependencies here; for example:
-  # s.add_development_dependency "rspec"
-  # s.add_runtime_dependency "rest-client"
+  s.add_development_dependency 'rspec'
+  if RUBY_VERSION < '1.9.3'
+    s.add_development_dependency 'actionpack', '~> 3.2.13'
+  else
+    s.add_development_dependency 'actionpack'
+  end
+  s.add_development_dependency 'appraisal'
+  s.add_development_dependency 'pry'
 end

data/gemfiles/actionpack3.0.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "actionpack", "~> 3.0.0"
+
+gemspec :path=>"../"

data/gemfiles/actionpack3.0.gemfile.lock

@@ -0,0 +1,64 @@
+PATH
+  remote: /Users/scudco/projects/country_select
+  specs:
+    country_select (1.1.3)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    abstract (1.0.0)
+    actionpack (3.0.20)
+      activemodel (= 3.0.20)
+      activesupport (= 3.0.20)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.5.0)
+      rack (~> 1.2.5)
+      rack-mount (~> 0.6.14)
+      rack-test (~> 0.5.7)
+      tzinfo (~> 0.3.23)
+    activemodel (3.0.20)
+      activesupport (= 3.0.20)
+      builder (~> 2.1.2)
+      i18n (~> 0.5.0)
+    activesupport (3.0.20)
+    appraisal (0.5.2)
+      bundler
+      rake
+    builder (2.1.2)
+    coderay (1.0.9)
+    diff-lcs (1.2.4)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    i18n (0.5.0)
+    method_source (0.8.1)
+    pry (0.9.12.2)
+      coderay (~> 1.0.5)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+    rack (1.2.8)
+    rack-mount (0.6.14)
+      rack (>= 1.0.0)
+    rack-test (0.5.7)
+      rack (>= 1.0)
+    rake (10.0.4)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.1)
+    slop (3.4.5)
+    tzinfo (0.3.37)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  actionpack (~> 3.0.0)
+  appraisal
+  country_select!
+  pry
+  rspec

data/gemfiles/actionpack3.1.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "actionpack", "~> 3.1.0"
+
+gemspec :path=>"../"

data/gemfiles/actionpack3.1.gemfile.lock

@@ -0,0 +1,72 @@
+PATH
+  remote: /Users/scudco/projects/country_select
+  specs:
+    country_select (1.1.3)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionpack (3.1.12)
+      activemodel (= 3.1.12)
+      activesupport (= 3.1.12)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      i18n (~> 0.6)
+      rack (~> 1.3.6)
+      rack-cache (~> 1.2)
+      rack-mount (~> 0.8.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.0.4)
+    activemodel (3.1.12)
+      activesupport (= 3.1.12)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activesupport (3.1.12)
+      multi_json (~> 1.0)
+    appraisal (0.5.2)
+      bundler
+      rake
+    builder (3.0.4)
+    coderay (1.0.9)
+    diff-lcs (1.2.4)
+    erubis (2.7.0)
+    hike (1.2.2)
+    i18n (0.6.4)
+    method_source (0.8.1)
+    multi_json (1.7.3)
+    pry (0.9.12.2)
+      coderay (~> 1.0.5)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+    rack (1.3.10)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-mount (0.8.3)
+      rack (>= 1.0.0)
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rake (10.0.4)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.1)
+    slop (3.4.5)
+    sprockets (2.0.4)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    tilt (1.4.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  actionpack (~> 3.1.0)
+  appraisal
+  country_select!
+  pry
+  rspec

data/gemfiles/actionpack3.2.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "actionpack", "~> 3.2.0"
+
+gemspec :path=>"../"

data/gemfiles/actionpack3.2.gemfile.lock

@@ -0,0 +1,71 @@
+PATH
+  remote: /Users/scudco/projects/country_select
+  specs:
+    country_select (1.1.3)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionpack (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.4)
+      rack (~> 1.4.5)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.13)
+      activesupport (= 3.2.13)
+      builder (~> 3.0.0)
+    activesupport (3.2.13)
+      i18n (= 0.6.1)
+      multi_json (~> 1.0)
+    appraisal (0.5.2)
+      bundler
+      rake
+    builder (3.0.4)
+    coderay (1.0.9)
+    diff-lcs (1.2.4)
+    erubis (2.7.0)
+    hike (1.2.2)
+    i18n (0.6.1)
+    journey (1.0.4)
+    method_source (0.8.1)
+    multi_json (1.7.3)
+    pry (0.9.12.2)
+      coderay (~> 1.0.5)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+    rack (1.4.5)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rake (10.0.4)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.1)
+    slop (3.4.5)
+    sprockets (2.2.2)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    tilt (1.4.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  actionpack (~> 3.2.0)
+  appraisal
+  country_select!
+  pry
+  rspec

data/gemfiles/actionpack4.0.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "actionpack", "~> 4.0.0"
+
+gemspec :path=>"../"

data/gemfiles/actionpack4.0.gemfile.lock

@@ -0,0 +1,62 @@
+PATH
+  remote: /Users/scudco/projects/country_select
+  specs:
+    country_select (1.1.3)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionpack (4.0.0)
+      activesupport (= 4.0.0)
+      builder (~> 3.1.0)
+      erubis (~> 2.7.0)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    activesupport (4.0.0)
+      i18n (~> 0.6, >= 0.6.4)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    appraisal (0.5.2)
+      bundler
+      rake
+    atomic (1.1.10)
+    builder (3.1.4)
+    coderay (1.0.9)
+    diff-lcs (1.2.4)
+    erubis (2.7.0)
+    i18n (0.6.4)
+    method_source (0.8.1)
+    minitest (4.7.5)
+    multi_json (1.7.7)
+    pry (0.9.12.2)
+      coderay (~> 1.0.5)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+    rack (1.5.2)
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rake (10.1.0)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.1)
+    slop (3.4.5)
+    thread_safe (0.1.0)
+      atomic
+    tzinfo (0.3.37)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  actionpack (~> 4.0.0)
+  appraisal
+  country_select!
+  pry
+  rspec

data/lib/country_select.rb

@@ -1,92 +1,104 @@
 # CountrySelect
+#
+# Adds #country_select method to
+# ActionView::FormBuilder
+#
 require 'country_select/version'
+require 'country_select/countries'
 
 module ActionView
   module Helpers
     module FormOptionsHelper
-      # Return select and option tags for the given object and method, using country_options_for_select to generate the list of option tags.
-      def country_select(object, method, priority_countries = nil, options = {}, html_options = {})
-        # check if InstanceTag defined and accepts more than zero attributes in new method
-        if defined?(ActionView::Helpers::InstanceTag) && ActionView::Helpers::InstanceTag.instance_method(:initialize).arity != 0
-          InstanceTag.new(object, method, self, options.delete(:object)).to_country_select_tag(priority_countries, options, html_options)
-        else
-          CountrySelect.new(object, method, self, options).to_country_select_tag(priority_countries, options, html_options)
-        end
+      #
+      # Return select and option tags
+      # for the given object and method,
+      # using country_options_for_select to
+      # generate the list of option tags.
+      #
+      def country_select(object, method, priority_countries = nil,
+                                         options = {},
+                                         html_options = {})
+
+        tag = if defined?(ActionView::Helpers::InstanceTag) &&
+                ActionView::Helpers::InstanceTag.instance_method(:initialize).arity != 0
+
+                InstanceTag.new(object, method, self, options.delete(:object))
+              else
+                CountrySelect.new(object, method, self, options)
+              end
+
+        tag.to_country_select_tag(priority_countries, options, html_options)
       end
-      # Returns a string of option tags for pretty much any country in the world. Supply a country name as +selected+ to
-      # have it marked as the selected option tag. You can also supply an array of countries as +priority_countries+, so
-      # that they will be listed above the rest of the (long) list.
+
       #
-      # NOTE: Only the option tags are returned, you have to wrap this call in a regular HTML select tag.
-      def country_options_for_select(selected = nil, priority_countries = nil)
+      # Returns a string of option tags for
+      # pretty much any country in the world.
+      #
+      # You can also supply an array of countries as
+      # +priority_countries+ so that they will be
+      # listed above the rest of the (long) list.
+      #
+      # NOTE: Only the option tags are returned, you
+      # have to wrap this call in a regular HTML
+      # select tag.
+      #
+      def country_options_for_select(selected = nil, priority_countries = nil, use_iso_codes = false)
         country_options = "".html_safe
 
         if priority_countries
-          country_options += options_for_select(priority_countries, selected)
+          priority_countries_options = if use_iso_codes
+                                         priority_countries.map do |code|
+                                           [
+                                             ::CountrySelect::COUNTRIES[code],
+                                             code
+                                           ]
+                                         end
+                                       else
+                                         priority_countries
+                                       end
+
+          country_options += options_for_select(priority_countries_options, selected)
           country_options += "<option value=\"\" disabled=\"disabled\">-------------</option>\n".html_safe
-          # 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)
+          #
+          # 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)
+        values = if use_iso_codes
+                   ::CountrySelect::ISO_COUNTRIES_FOR_SELECT
+                 else
+                   ::CountrySelect::COUNTRIES_FOR_SELECT
+                 end
+
+        return country_options + options_for_select(values, 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",
-        "Azerbaijan", "Bahamas", "Bahrain", "Bangladesh", "Barbados", "Belarus", "Belgium", "Belize", "Benin",
-        "Bermuda", "Bhutan", "Bolivia", "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",
-        "Christmas Island", "Cocos (Keeling) Islands", "Colombia", "Comoros", "Congo",
-        "Congo, the Democratic Republic of the", "Cook Islands", "Costa Rica", "Cote d'Ivoire", "Croatia", "Cuba",
-        "Curacao", "Cyprus", "Czech Republic", "Denmark", "Djibouti", "Dominica", "Dominican Republic", "Ecuador", "Egypt",
-        "El Salvador", "Equatorial Guinea", "Eritrea", "Estonia", "Ethiopia", "Falkland Islands (Malvinas)",
-        "Faroe Islands", "Fiji", "Finland", "France", "French Guiana", "French Polynesia",
-        "French Southern Territories", "Gabon", "Gambia", "Georgia", "Germany", "Ghana", "Gibraltar", "Greece", "Greenland", "Grenada", "Guadeloupe", "Guam", "Guatemala", "Guernsey", "Guinea",
-        "Guinea-Bissau", "Guyana", "Haiti", "Heard and McDonald Islands", "Holy See (Vatican City State)",
-        "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",
-        "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",
-        "Monaco", "Mongolia", "Montenegro", "Montserrat", "Morocco", "Mozambique", "Myanmar", "Namibia", "Nauru",
-        "Nepal", "Netherlands", "New Caledonia", "New Zealand", "Nicaragua", "Niger",
-        "Nigeria", "Niue", "Norfolk Island", "Northern Mariana Islands", "Norway", "Oman", "Pakistan", "Palau",
-        "Palestinian Territory, Occupied", "Panama", "Papua New Guinea", "Paraguay", "Peru", "Philippines",
-        "Pitcairn", "Poland", "Portugal", "Puerto Rico", "Qatar", "Reunion", "Romania", "Russian Federation",
-        "Rwanda", "Saint Barthelemy", "Saint Helena", "Saint Kitts and Nevis", "Saint Lucia",
-        "Saint Pierre and Miquelon", "Saint Vincent and the Grenadines", "Samoa", "San Marino",
-        "Sao Tome and Principe", "Saudi Arabia", "Senegal", "Serbia", "Seychelles", "Sierra Leone", "Singapore",
-        "Sint Maarten","Slovakia", "Slovenia", "Solomon Islands", "Somalia", "South Africa",
-        "South Georgia and the South Sandwich Islands", "Spain", "Sri Lanka", "Sudan", "Suriname",
-        "Svalbard and Jan Mayen", "Swaziland", "Sweden", "Switzerland", "Syrian Arab Republic",
-        "Taiwan", "Tajikistan", "Tanzania, United Republic of", "Thailand", "Timor-Leste",
-        "Togo", "Tokelau", "Tonga", "Trinidad and Tobago", "Tunisia", "Turkey", "Turkmenistan",
-        "Turks and Caicos Islands", "Tuvalu", "Uganda", "Ukraine", "United Arab Emirates", "United Kingdom",
-        "United States", "United States Minor Outlying Islands", "Uruguay", "Uzbekistan", "Vanuatu", "Venezuela",
-        "Viet Nam", "Virgin Islands, British", "Virgin Islands, U.S.", "Wallis and Futuna", "Western Sahara",
-        "Yemen", "Zambia", "Zimbabwe"] unless const_defined?("COUNTRIES")
     end
 
     module ToCountrySelectTag
       def to_country_select_tag(priority_countries, options, html_options)
+        use_iso_codes = options.delete(:iso_codes)
         html_options = html_options.stringify_keys
         add_default_name_and_id(html_options)
         value = value(object)
         content_tag("select",
           add_options(
-            country_options_for_select(value, priority_countries),
+            country_options_for_select(value, priority_countries, use_iso_codes),
             options, value
           ), html_options
         )
       end
     end
 
-    if defined?(ActionView::Helpers::InstanceTag) && ActionView::Helpers::InstanceTag.instance_method(:initialize).arity != 0
+    if defined?(ActionView::Helpers::InstanceTag) &&
+        ActionView::Helpers::InstanceTag.instance_method(:initialize).arity != 0
       class InstanceTag
         include ToCountrySelectTag
       end
@@ -97,8 +109,13 @@ module ActionView
     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)
+      def country_select(method, priority_countries = nil,
+                                 options = {},
+                                 html_options = {})
+
+        @template.country_select(@object_name, method, priority_countries,
+                                                       options.merge(:object => @object),
+                                                       html_options)
       end
     end
   end

data/lib/country_select/countries.rb

@@ -0,0 +1,256 @@
+# encoding: utf-8
+module CountrySelect
+  COUNTRIES =  {
+    "af" => "Afghanistan",
+    "ax" => "Åland Islands",
+    "al" => "Albania",
+    "dz" => "Algeria",
+    "as" => "American Samoa",
+    "ad" => "Andorra",
+    "ao" => "Angola",
+    "ai" => "Anguilla",
+    "aq" => "Antarctica",
+    "ag" => "Antigua and Barbuda",
+    "ar" => "Argentina",
+    "am" => "Armenia",
+    "aw" => "Aruba",
+    "au" => "Australia",
+    "at" => "Austria",
+    "az" => "Azerbaijan",
+    "bs" => "Bahamas",
+    "bh" => "Bahrain",
+    "bd" => "Bangladesh",
+    "bb" => "Barbados",
+    "by" => "Belarus",
+    "be" => "Belgium",
+    "bz" => "Belize",
+    "bj" => "Benin",
+    "bm" => "Bermuda",
+    "bt" => "Bhutan",
+    "bo" => "Bolivia, Plurinational State of",
+    "bq" => "Bonaire, Sint Eustatius and Saba",
+    "ba" => "Bosnia and Herzegovina",
+    "bw" => "Botswana",
+    "bv" => "Bouvet Island",
+    "br" => "Brazil",
+    "io" => "British Indian Ocean Territory",
+    "bn" => "Brunei Darussalam",
+    "bg" => "Bulgaria",
+    "bf" => "Burkina Faso",
+    "bi" => "Burundi",
+    "kh" => "Cambodia",
+    "cm" => "Cameroon",
+    "ca" => "Canada",
+    "cv" => "Cape Verde",
+    "ky" => "Cayman Islands",
+    "cf" => "Central African Republic",
+    "td" => "Chad",
+    "cl" => "Chile",
+    "cn" => "China",
+    "cx" => "Christmas Island",
+    "cc" => "Cocos (Keeling) Islands",
+    "co" => "Colombia",
+    "km" => "Comoros",
+    "cg" => "Congo",
+    "cd" => "Congo, the Democratic Republic of the",
+    "ck" => "Cook Islands",
+    "cr" => "Costa Rica",
+    "ci" => "Côte d'Ivoire",
+    "hr" => "Croatia",
+    "cu" => "Cuba",
+    "cw" => "Curaçao",
+    "cy" => "Cyprus",
+    "cz" => "Czech Republic",
+    "dk" => "Denmark",
+    "dj" => "Djibouti",
+    "dm" => "Dominica",
+    "do" => "Dominican Republic",
+    "ec" => "Ecuador",
+    "eg" => "Egypt",
+    "sv" => "El Salvador",
+    "gq" => "Equatorial Guinea",
+    "er" => "Eritrea",
+    "ee" => "Estonia",
+    "et" => "Ethiopia",
+    "fk" => "Falkland Islands (Malvinas)",
+    "fo" => "Faroe Islands",
+    "fj" => "Fiji",
+    "fi" => "Finland",
+    "fr" => "France",
+    "gf" => "French Guiana",
+    "pf" => "French Polynesia",
+    "tf" => "French Southern Territories",
+    "ga" => "Gabon",
+    "gm" => "Gambia",
+    "ge" => "Georgia",
+    "de" => "Germany",
+    "gh" => "Ghana",
+    "gi" => "Gibraltar",
+    "gr" => "Greece",
+    "gl" => "Greenland",
+    "gd" => "Grenada",
+    "gp" => "Guadeloupe",
+    "gu" => "Guam",
+    "gt" => "Guatemala",
+    "gg" => "Guernsey",
+    "gn" => "Guinea",
+    "gw" => "Guinea-Bissau",
+    "gy" => "Guyana",
+    "ht" => "Haiti",
+    "hm" => "Heard Island and McDonald Islands",
+    "va" => "Holy See (Vatican City State)",
+    "hn" => "Honduras",
+    "hk" => "Hong Kong",
+    "hu" => "Hungary",
+    "is" => "Iceland",
+    "in" => "India",
+    "id" => "Indonesia",
+    "ir" => "Iran, Islamic Republic of",
+    "iq" => "Iraq",
+    "ie" => "Ireland",
+    "im" => "Isle of Man",
+    "il" => "Israel",
+    "it" => "Italy",
+    "jm" => "Jamaica",
+    "jp" => "Japan",
+    "je" => "Jersey",
+    "jo" => "Jordan",
+    "kz" => "Kazakhstan",
+    "ke" => "Kenya",
+    "ki" => "Kiribati",
+    "kp" => "Korea, Democratic People's Republic of",
+    "kr" => "Korea, Republic of",
+    "kw" => "Kuwait",
+    "kg" => "Kyrgyzstan",
+    "la" => "Lao People's Democratic Republic",
+    "lv" => "Latvia",
+    "lb" => "Lebanon",
+    "ls" => "Lesotho",
+    "lr" => "Liberia",
+    "ly" => "Libya",
+    "li" => "Liechtenstein",
+    "lt" => "Lithuania",
+    "lu" => "Luxembourg",
+    "mo" => "Macao",
+    "mk" => "Macedonia, the former Yugoslav Republic of",
+    "mg" => "Madagascar",
+    "mw" => "Malawi",
+    "my" => "Malaysia",
+    "mv" => "Maldives",
+    "ml" => "Mali",
+    "mt" => "Malta",
+    "mh" => "Marshall Islands",
+    "mq" => "Martinique",
+    "mr" => "Mauritania",
+    "mu" => "Mauritius",
+    "yt" => "Mayotte",
+    "mx" => "Mexico",
+    "fm" => "Micronesia, Federated States of",
+    "md" => "Moldova, Republic of",
+    "mc" => "Monaco",
+    "mn" => "Mongolia",
+    "me" => "Montenegro",
+    "ms" => "Montserrat",
+    "ma" => "Morocco",
+    "mz" => "Mozambique",
+    "mm" => "Myanmar",
+    "na" => "Namibia",
+    "nr" => "Nauru",
+    "np" => "Nepal",
+    "nl" => "Netherlands",
+    "nc" => "New Caledonia",
+    "nz" => "New Zealand",
+    "ni" => "Nicaragua",
+    "ne" => "Niger",
+    "ng" => "Nigeria",
+    "nu" => "Niue",
+    "nf" => "Norfolk Island",
+    "mp" => "Northern Mariana Islands",
+    "no" => "Norway",
+    "om" => "Oman",
+    "pk" => "Pakistan",
+    "pw" => "Palau",
+    "ps" => "Palestine, State of",
+    "pa" => "Panama",
+    "pg" => "Papua New Guinea",
+    "py" => "Paraguay",
+    "pe" => "Peru",
+    "ph" => "Philippines",
+    "pn" => "Pitcairn",
+    "pl" => "Poland",
+    "pt" => "Portugal",
+    "pr" => "Puerto Rico",
+    "qa" => "Qatar",
+    "re" => "Réunion",
+    "ro" => "Romania",
+    "ru" => "Russian Federation",
+    "rw" => "Rwanda",
+    "bl" => "Saint Barthélemy",
+    "sh" => "Saint Helena, Ascension and Tristan da Cunha",
+    "kn" => "Saint Kitts and Nevis",
+    "lc" => "Saint Lucia",
+    "mf" => "Saint Martin (French part)",
+    "pm" => "Saint Pierre and Miquelon",
+    "vc" => "Saint Vincent and the Grenadines",
+    "ws" => "Samoa",
+    "sm" => "San Marino",
+    "st" => "Sao Tome and Principe",
+    "sa" => "Saudi Arabia",
+    "sn" => "Senegal",
+    "rs" => "Serbia",
+    "sc" => "Seychelles",
+    "sl" => "Sierra Leone",
+    "sg" => "Singapore",
+    "sx" => "Sint Maarten (Dutch part)",
+    "sk" => "Slovakia",
+    "si" => "Slovenia",
+    "sb" => "Solomon Islands",
+    "so" => "Somalia",
+    "za" => "South Africa",
+    "gs" => "South Georgia and the South Sandwich Islands",
+    "ss" => "South Sudan",
+    "es" => "Spain",
+    "lk" => "Sri Lanka",
+    "sd" => "Sudan",
+    "sr" => "Suriname",
+    "sj" => "Svalbard and Jan Mayen",
+    "sz" => "Swaziland",
+    "se" => "Sweden",
+    "ch" => "Switzerland",
+    "sy" => "Syrian Arab Republic",
+    "tw" => "Taiwan, Province of China",
+    "tj" => "Tajikistan",
+    "tz" => "Tanzania, United Republic of",
+    "th" => "Thailand",
+    "tl" => "Timor-Leste",
+    "tg" => "Togo",
+    "tk" => "Tokelau",
+    "to" => "Tonga",
+    "tt" => "Trinidad and Tobago",
+    "tn" => "Tunisia",
+    "tr" => "Turkey",
+    "tm" => "Turkmenistan",
+    "tc" => "Turks and Caicos Islands",
+    "tv" => "Tuvalu",
+    "ug" => "Uganda",
+    "ua" => "Ukraine",
+    "ae" => "United Arab Emirates",
+    "gb" => "United Kingdom",
+    "us" => "United States",
+    "um" => "United States Minor Outlying Islands",
+    "uy" => "Uruguay",
+    "uz" => "Uzbekistan",
+    "vu" => "Vanuatu",
+    "ve" => "Venezuela, Bolivarian Republic of",
+    "vn" => "Viet Nam",
+    "vg" => "Virgin Islands, British",
+    "vi" => "Virgin Islands, U.S.",
+    "wf" => "Wallis and Futuna",
+    "eh" => "Western Sahara",
+    "ye" => "Yemen",
+    "zm" => "Zambia",
+  } unless const_defined?("COUNTRIES")
+
+  ISO_COUNTRIES_FOR_SELECT = COUNTRIES.invert unless const_defined?("ISO_COUNTRIES_FOR_SELECT")
+  COUNTRIES_FOR_SELECT = COUNTRIES.values unless const_defined?("COUNTRIES_FOR_SELECT")
+end

data/lib/country_select/version.rb

@@ -1,3 +1,3 @@
 module CountrySelect
-  VERSION = "1.1.3"
+  VERSION = "1.2.0"
 end

data/spec/country_select_spec.rb

@@ -0,0 +1,133 @@
+require 'spec_helper'
+
+require 'action_view'
+require 'country_select'
+
+module ActionView
+  module Helpers
+
+    describe CountrySelect do
+      include TagHelper
+
+      class Walrus
+        attr_accessor :country_name
+      end
+
+      let(:walrus) { Walrus.new }
+
+      let!(:template) { ActionView::Base.new }
+
+      let(:select_tag) do
+        "<select id=\"walrus_country_name\" name=\"walrus[country_name]\">"
+      end
+
+      let(:selected_us_option) do
+        if defined?(Tags::Base)
+          content_tag(:option, 'United States', :selected => :selected, :value => "United States")
+        else
+          "<option value=\"United States\" selected=\"selected\">United States</option>"
+        end
+      end
+
+      let(:selected_iso_us_option) do
+        if defined?(Tags::Base)
+          content_tag(:option, 'United States', :selected => :selected, :value => 'us')
+        else
+          "<option value=\"us\" selected=\"selected\">United States</option>"
+        end
+      end
+
+      let(:builder) do
+        if defined?(Tags::Base)
+          FormBuilder.new(:walrus, walrus, template, {})
+        else
+          FormBuilder.new(:walrus, walrus, template, {}, Proc.new { })
+        end
+      end
+
+      context "iso codes disabled" do
+        describe "#country_select" do
+          let(:tag) { builder.country_select(:country_name) }
+
+          it "creates a select tag" do
+            tag.should include(select_tag)
+          end
+
+          it "creates option tags of the countries" do
+            ::CountrySelect::COUNTRIES.each do |code,name|
+              tag.should include(content_tag(:option, name, :value => name))
+            end
+          end
+
+          it "selects the value of country_name" do
+            walrus.country_name = 'United States'
+            t = builder.country_select(:country_name)
+            t.should include(selected_us_option)
+          end
+        end
+
+        describe "#priority_countries" do
+          let(:tag) { builder.country_select(:country_name, ['United States']) }
+
+          it "puts the countries at the top" do
+            tag.should include("#{select_tag}<option value=\"United States")
+          end
+
+          it "inserts a divider" do
+            tag.should include(">United States</option><option value=\"\" disabled=\"disabled\">-------------</option>")
+          end
+
+          it "does not mark two countries as selected" do
+            walrus.country_name = "United States"
+            str = <<-EOS.strip
+              </option>\n<option value="United States" selected="selected">United States</option>
+            EOS
+            tag.should_not include(str)
+          end
+        end
+      end
+
+      context "iso codes enabled" do
+        describe "#country_select" do
+          let(:tag) { builder.country_select(:country_name, nil, :iso_codes => true) }
+
+          it "creates a select tag" do
+            tag.should include(select_tag)
+          end
+
+          it "creates option tags of the countries" do
+            ::CountrySelect::COUNTRIES.each do |code,name|
+              tag.should include(content_tag(:option, name, :value => code))
+            end
+          end
+
+          it "selects the value of country_name" do
+            walrus.country_name = 'us'
+            t = builder.country_select(:country_name, nil, :iso_codes => true)
+            t.should include(selected_iso_us_option)
+          end
+        end
+
+        describe "#priority_countries" do
+          let(:tag) { builder.country_select(:country_name, ['us'], :iso_codes => true) }
+
+          it "puts the countries at the top" do
+            tag.should include("#{select_tag}<option value=\"us")
+          end
+
+          it "inserts a divider" do
+            tag.should include(">United States</option><option value=\"\" disabled=\"disabled\">-------------</option>")
+          end
+
+          it "does not mark two countries as selected" do
+            walrus.country_name = "us"
+            str = <<-EOS.strip
+              </option>\n<option value="us" selected="selected">United States</option>
+            EOS
+            tag.should_not include(str)
+          end
+        end
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,20 @@
+# This file was generated by the `rspec --init` command. Conventionally, all
+# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
+# Require this file using `require "spec_helper"` to ensure that it is only
+# loaded once.
+#
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+
+require 'pry'
+
+RSpec.configure do |config|
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.run_all_when_everything_filtered = true
+  config.filter_run :focus
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = 'random'
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: country_select
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,72 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-28 00:00:00.000000000 Z
-dependencies: []
+date: 2013-07-07 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 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.
@@ -21,15 +85,29 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
+- .travis.yml
+- Appraisals
+- CHANGELOG.md
 - Gemfile
 - MIT-LICENSE
 - README.md
 - Rakefile
-- VERSION
 - country_select.gemspec
+- gemfiles/actionpack3.0.gemfile
+- gemfiles/actionpack3.0.gemfile.lock
+- gemfiles/actionpack3.1.gemfile
+- gemfiles/actionpack3.1.gemfile.lock
+- gemfiles/actionpack3.2.gemfile
+- gemfiles/actionpack3.2.gemfile.lock
+- gemfiles/actionpack4.0.gemfile
+- gemfiles/actionpack4.0.gemfile.lock
 - lib/country_select.rb
+- lib/country_select/countries.rb
 - lib/country_select/version.rb
-homepage: ''
+- spec/country_select_spec.rb
+- spec/spec_helper.rb
+homepage: https://github.com/stefanpenner/country_select
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -41,22 +119,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -229501016986175763
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -229501016986175763
 requirements: []
 rubyforge_project: country_select
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Country Select Plugin
-test_files: []
+test_files:
+- spec/country_select_spec.rb
+- spec/spec_helper.rb

data/VERSION

@@ -1 +0,0 @@
-0.1.0