country_select 1.1.3 → 2.0.0.rc1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 401df54254b9c4583008b5911cccf52b5b3f2e58
+  data.tar.gz: 11545a1a878be17f4ecc0702f02d62654119469d
+SHA512:
+  metadata.gz: 673e9a647e516829b6aa503463d0af4d37fbbdad31fc94cedd4f98783947373d6eec776ac1521607113d7473dceb58bf22690c0a6f9c7525734557375da3ad23
+  data.tar.gz: 7a33b1de4fed4658a9cc9b6e0e13d98f4d9ac4ed094ceb239884369c823a336fbf04dc83eee7f030fee818069e741b5f036914ff19f32a7ba1c10f511facde3e

data/.gitignore

@@ -1,4 +1,6 @@
 *.gem
+*.sqlite
 .bundle
 Gemfile.lock
 pkg/*
+.ruby-version

data/.rspec

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

data/.travis.yml

@@ -0,0 +1,24 @@
+language: ruby
+script: "bundle exec rake appraisal:integration"
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - 2.1.2
+  - jruby-19mode
+  - jruby-head
+  - rbx-2
+  - ruby-head
+gemfile:
+  - gemfiles/actionpack3.2.gemfile
+  - gemfiles/actionpack4.0.gemfile
+  - gemfiles/actionpack4.1.gemfile
+matrix:
+  exclude:
+    - rvm: 1.9.3
+      gemfile: gemfiles/actionpack4.0.gemfile
+    - rvm: 1.9.3
+      gemfile: gemfiles/actionpack4.1.gemfile
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: jruby-head
+    - rvm: rbx-2

data/Appraisals

@@ -0,0 +1,19 @@
+appraise 'actionpack3.0' do
+  gem 'actionpack', '~> 3.0.20'
+end
+
+appraise 'actionpack3.1' do
+  gem 'actionpack', '~> 3.1.12'
+end
+
+appraise 'actionpack3.2' do
+  gem 'actionpack', '~> 3.2.17'
+end
+
+appraise 'actionpack4.0' do
+  gem 'actionpack', '~> 4.0.0'
+end
+
+appraise 'actionpack4.1' do
+  gem 'actionpack', '~> 4.1.0'
+end

data/CHANGELOG.md

@@ -0,0 +1,30 @@
+== 2.0.0 2014-08-10
+
+  * Removed support for Ruby < 1.9.3
+  * ISO-3166 alpha-2 codes are now on by default, stored in uppercase
+    (e.g., US)
+  * Localization is always on
+    * The `country_select` method will always attempt to localize
+      country names based on the value of `I18n.locale` via translations
+      stored in the `countries` gem
+  * Priority countries should now be set via the `priority_countries` option
+    * The original 1.x syntax is still available
+  * The list of countries can now be limited with the `only` and
+    `except` options
+  * Add best-guess support for country names when codes aren't provided
+    in options (e.g., priority_countries)
+
+== 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,10 @@
-source "http://rubygems.org"
-
-gem 'rake'
+source 'https://rubygems.org'
 
 # Specify your gem's dependencies in country_select.gemspec
 gemspec
+
+platforms :rbx do
+  gem 'racc'
+  gem 'rubysl', '~> 2.0'
+  gem 'psych'
+end

data/README.md

@@ -1,34 +1,122 @@
-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.
+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.
+
+## UPGRADING
+
+[**An important message about upgrading from 1.x**](UPGRADING.md)
 
 ## 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', github: 'stefanpenner/country_select'
+```
 
-## Example
+## Usage
 
 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", priority_countries: ["GB", "FR", "DE"])
+```
+
+Supplying only certain countries:
+
+```ruby
+country_select("user", "country", only: ["GB", "FR", "DE"])
+```
+
+Discarding certain countries:
+
+```ruby
+country_select("user", "country", except: ["GB", "FR", "DE"])
+```
+
+Supplying additional html options:
+
+```ruby
+country_select("user", "country", { priority_countries: ["GB", "FR"] }, { selected: "GB", class: 'form-control' })
+```
+
+### ISO 3166-1 alpha-2 codes
+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 of America</option>`
+
+Country names are automatically localized based on the value of
+`I18n.locale` thanks to the wonderful
+[countries gem](https://github.com/hexorx/countries/).
+
+Current translations include:
+
+  * en
+  * de
+  * es
+  * fr
+  * it
+  * ja
+  * nl
+
+In the event a translation is not available, it will revert to the
+globally assigned locale (by default, "en").
+
+This is the only way to use `country_select` as of version `2.0`. It
+is the recommended way to store your country data since it will be
+resistant to country names changing.
+
+The locale can be overridden locally:
+
+```ruby
+country_select("user", "country_code", locale: 'es')
+```
+
+#### Getting the Country Name from the countries gem
+
+```ruby
+class User < ActiveRecord::Base
+
+  # Assuming country_select is used with User attribute `country_code`
+  # This will attempt to translate the country name and use the default
+  # (usually English) name if no translation is available
+  def country_name
+    country = ISO3166::Country[country_code]
+    country.translations[I18n.locale.to_s] || country.name
+  end
+
+end
+```
+
+## Example Application
+
+An example Rails application demonstrating the different options is
+available at [scudco/country_select_test](https://github.com/scudco/country_select_test).
+The relevant view files live [here](https://github.com/scudco/country_select_test/tree/master/app/views/welcome).
 
-Specifying which country to be selected:
-United Kingdom will be selected.
+## Tests
 
-    country_select("user", "country_name", [ "+United Kingdom+", "France", "Germany" ])
+```shell
+bundle
+bundle exec appraisal
+bundle exec rake appraisal:integration
+```
 
 Copyright (c) 2008 Michael Koziarski, released under the MIT license

data/Rakefile

@@ -1 +1,20 @@
-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|
+      appraisal.install
+      Appraisal::Command.from_args(appraisal.gemfile_path).run
+    end
+  end
+end

data/UPGRADING.md

@@ -0,0 +1,69 @@
+# Upgrading from 1.x
+
+`country_select` 2.0 has brought a few small changes, but these changes
+can have a big impact on existing production systems. Please read these
+points carefully and consider whether upgrading to 2.0 is a good idea.
+
+Please post any implications we may have missed as a GitHub Issue
+or Pull Request.
+
+## ISO codes are always on
+
+If you upgrade to 2.0 and are currently storing countries by the names
+produced by this gem, your setup will break. It is recommended that you
+stick with 1.x until developing a data migration strategy that allows
+you to map your existing country names to country codes.
+
+## i18n country names are always on (when available)
+
+Country names will be generated using `I18n.locale` if a translation
+from the countries gem is available.
+
+## Codes are UPCASED
+
+The official ISO 3166-1 standard uses UPCASED codes. This is an easy
+data change, but may affect areas of code dependent on lowercase country
+codes.
+
+Here's a sample SQL migration that could address a `users` table with
+lowercased country codes stored in the `country_code` column:
+
+```sql
+UPDATE users SET country_code = UPPER(country_code);
+```
+
+## Priority countries are now in the options hash
+
+The priority countries syntax has changed from
+
+```ruby
+  country_select(:user, :country_code, ["GB","FR"])
+```
+
+to
+
+```ruby
+  country_select(:user, :country_code, priority_countries: ["GB","FR"])
+```
+
+### A note on 1.x Syntax
+
+In order to seamlessly support popular libraries dependent on
+`country_select`, specifically `formatstic` and `simple_form`, 1.x
+priority syntax is still supported, but will probably be removed in the
+next major release (i.e., 3.0). We'll be working with `simple_form` and
+`formtastic` maintainers to transition away from the old 1.x syntax.
+
+## You can choose to only display a chosen set of countries
+
+```ruby
+  country_select(:user, :country_code, only: ["LV","SG"])
+```
+
+```ruby
+  country_select(:user, :country_code, except: ["US","GB"])
+```
+
+## Ruby 1.9+
+
+`country_select` will no longer be tested in Ruby `< 1.9`.

data/country_select.gemspec

@@ -1,24 +1,28 @@
 # -*- 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.licenses    = ['MIT']
+  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', '~> 2'
+  s.add_development_dependency 'actionpack', '~> 3'
+  s.add_development_dependency 'appraisal', '~> 1.0', '>= 1.0.0'
+  s.add_development_dependency 'pry', '~> 0'
+
+  s.add_dependency 'countries', '~> 0.9', '>= 0.9.3'
 end

data/gemfiles/actionpack3.0.gemfile

@@ -0,0 +1,13 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "actionpack", "~> 3.0.20"
+
+platforms :rbx do
+  gem "racc"
+  gem "rubysl", "~> 2.0"
+  gem "psych"
+end
+
+gemspec :path => "../"

data/gemfiles/actionpack3.1.gemfile

@@ -0,0 +1,13 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "actionpack", "~> 3.1.12"
+
+platforms :rbx do
+  gem "racc"
+  gem "rubysl", "~> 2.0"
+  gem "psych"
+end
+
+gemspec :path => "../"

data/gemfiles/actionpack3.2.gemfile

@@ -0,0 +1,13 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "actionpack", "~> 3.2.17"
+
+platforms :rbx do
+  gem "racc"
+  gem "rubysl", "~> 2.0"
+  gem "psych"
+end
+
+gemspec :path => "../"

data/gemfiles/actionpack4.0.gemfile

@@ -0,0 +1,13 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "actionpack", "~> 4.0.0"
+
+platforms :rbx do
+  gem "racc"
+  gem "rubysl", "~> 2.0"
+  gem "psych"
+end
+
+gemspec :path => "../"

data/gemfiles/actionpack4.1.gemfile

@@ -0,0 +1,13 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "actionpack", "~> 4.1.0"
+
+platforms :rbx do
+  gem "racc"
+  gem "rubysl", "~> 2.0"
+  gem "psych"
+end
+
+gemspec :path => "../"

data/lib/country_select/country_select_helper.rb

@@ -0,0 +1,38 @@
+module ActionView
+  module Helpers
+    class FormBuilder
+      def country_select(method, priority_or_options = {}, options = {}, html_options = {})
+        if Hash === priority_or_options
+          html_options = options
+          options = priority_or_options
+        else
+          options[:priority_countries] = priority_or_options
+        end
+
+        @template.country_select(@object_name, method, objectify_options(options), @default_options.merge(html_options))
+      end
+    end
+
+    module FormOptionsHelper
+      def country_select(object, method, options = {}, html_options = {})
+        Tags::CountrySelect.new(object, method, self, options, html_options).render
+      end
+    end
+
+    module Tags
+      class CountrySelect < Base
+        include ::CountrySelect::TagHelper
+
+        def initialize(object_name, method_name, template_object, options, html_options)
+          @html_options = html_options
+
+          super(object_name, method_name, template_object, options)
+        end
+
+        def render
+          select_content_tag(country_option_tags, @options, @html_options)
+        end
+      end
+    end
+  end
+end

data/lib/country_select/rails3/country_select_helper.rb

@@ -0,0 +1,39 @@
+module ActionView
+  module Helpers
+    class FormBuilder
+      def country_select(method, priority_or_options = {}, options = {}, html_options = {})
+        if Hash === priority_or_options
+          html_options = options
+          options = priority_or_options
+        else
+          options[:priority_countries] = priority_or_options
+        end
+
+        @template.country_select(@object_name, method, objectify_options(options), @default_options.merge(html_options))
+      end
+    end
+
+    module FormOptionsHelper
+      def country_select(object, method, options = {}, html_options = {})
+        CountrySelect.new(object, method, self, options.delete(:object)).render(options, html_options)
+      end
+    end
+
+    class CountrySelect < InstanceTag
+      include ::CountrySelect::TagHelper
+
+      def render(options, html_options)
+        @options = options
+        @html_options = html_options
+
+        if self.respond_to?(:select_content_tag)
+          select_content_tag(country_option_tags, @options, @html_options)
+        else
+          html_options = @html_options.stringify_keys
+          add_default_name_and_id(html_options)
+          content_tag(:select, country_option_tags, html_options)
+        end
+      end
+    end
+  end
+end

data/lib/country_select/tag_helper.rb

@@ -0,0 +1,88 @@
+module CountrySelect
+  module TagHelper
+    def country_option_tags
+      option_tags_options = {
+        :selected => @options.fetch(:selected) { value(@object) },
+        :disabled => @options[:disabled]
+      }
+
+      if priority_countries.present?
+        priority_countries_options = country_options_for(priority_countries, false)
+
+        option_tags = options_for_select(priority_countries_options, option_tags_options)
+        option_tags += html_safe_newline + options_for_select([priority_countries_divider], disabled: priority_countries_divider)
+
+        if priority_countries.include?(option_tags_options[:selected])
+          option_tags_options[:selected] = nil
+        end
+
+        option_tags += html_safe_newline + options_for_select(country_options, option_tags_options)
+      else
+        option_tags = options_for_select(country_options, option_tags_options)
+      end
+    end
+
+    private
+    def locale
+      @options[:locale]
+    end
+
+    def priority_countries
+      @options[:priority_countries]
+    end
+
+    def priority_countries_divider
+      @options[:priority_countries_divider] || "-"*15
+    end
+
+    def only_country_codes
+      @options[:only]
+    end
+
+    def except_country_codes
+      @options[:except]
+    end
+
+    def country_options
+      country_options_for(all_country_codes, true)
+    end
+
+    def all_country_codes
+      codes = ISO3166::Country.all.map(&:last)
+
+      if only_country_codes.present?
+        codes & only_country_codes
+      elsif except_country_codes.present?
+        codes - except_country_codes
+      else
+        codes
+      end
+    end
+
+    def country_options_for(country_codes, sorted=true)
+      I18n.with_locale(locale) do
+        country_list = country_codes.map do |code|
+          code = code.to_s.upcase
+
+          unless country = ISO3166::Country.new(code)
+            code = ISO3166::Country.find_by_name(code).first
+          end
+
+          country ||= ISO3166::Country.new(code)
+          default_name = country.name
+          localized_name = country.translations[I18n.locale.to_s]
+
+          name = localized_name || default_name
+
+          [name,code]
+        end
+        sorted ? country_list.sort : country_list
+      end
+    end
+
+    def html_safe_newline
+      "\n".html_safe
+    end
+  end
+end
+

data/lib/country_select/version.rb

@@ -1,3 +1,3 @@
 module CountrySelect
-  VERSION = "1.1.3"
+  VERSION = "2.0.0.rc1"
 end

data/lib/country_select.rb

@@ -1,105 +1,12 @@
-# CountrySelect
-require 'country_select/version'
-
-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
-      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)
-        country_options = "".html_safe
-
-        if priority_countries
-          country_options += options_for_select(priority_countries, 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)
-        end
+# encoding: utf-8
 
-        return country_options + options_for_select(COUNTRIES, 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
+require 'iso3166'
 
-    module ToCountrySelectTag
-      def to_country_select_tag(priority_countries, options, html_options)
-        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),
-            options, value
-          ), html_options
-        )
-      end
-    end
-
-    if defined?(ActionView::Helpers::InstanceTag) && ActionView::Helpers::InstanceTag.instance_method(:initialize).arity != 0
-      class InstanceTag
-        include ToCountrySelectTag
-      end
-    else
-      class CountrySelect < Tags::Base
-        include ToCountrySelectTag
-      end
-    end
+require 'country_select/version'
+require 'country_select/tag_helper'
 
-    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)
-      end
-    end
-  end
+if defined?(ActionView::Helpers::Tags::Base)
+  require 'country_select/country_select_helper'
+else
+  require 'country_select/rails3/country_select_helper'
 end

data/spec/country_select_spec.rb

@@ -0,0 +1,139 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+require 'action_view'
+require 'country_select'
+
+describe "CountrySelect" do
+  include ActionView::Helpers::TagHelper
+  include ActionView::Helpers::FormOptionsHelper
+
+  class Walrus
+    attr_accessor :country_code
+  end
+
+  let(:walrus) { Walrus.new }
+  let!(:template) { ActionView::Base.new }
+
+  let(:builder) do
+    if defined?(ActionView::Helpers::Tags::Base)
+      ActionView::Helpers::FormBuilder.new(:walrus, walrus, template, {})
+    else
+      ActionView::Helpers::FormBuilder.new(:walrus, walrus, template, {}, Proc.new { })
+    end
+  end
+
+  let(:select_tag) do
+    <<-EOS.chomp.strip
+      <select id="walrus_country_code" name="walrus[country_code]">
+    EOS
+  end
+
+  it "selects the value of country_code" do
+    tag = options_for_select([['United States of America', 'US']], 'US')
+
+    walrus.country_code = 'US'
+    t = builder.country_select(:country_code)
+    expect(t).to include(tag)
+  end
+
+  it "uses the locale specified by I18n.locale" do
+    tag = options_for_select([['Estados Unidos', 'US']], 'US')
+
+    walrus.country_code = 'US'
+    original_locale = I18n.locale
+    begin
+      I18n.locale = :es
+      t = builder.country_select(:country_code)
+      expect(t).to include(tag)
+    ensure
+      I18n.locale = original_locale
+    end
+  end
+
+  it "accepts a locale option" do
+    tag = options_for_select([['États-Unis', 'US']], 'US')
+
+    walrus.country_code = 'US'
+    t = builder.country_select(:country_code, locale: :fr)
+    expect(t).to include(tag)
+  end
+
+  it "accepts priority countries" do
+    tag = options_for_select(
+      [
+        ['Latvia','LV'],
+        ['United States of America','US'],
+        ['Denmark', 'DK'],
+        ['-'*15,'-'*15]
+      ],
+      selected: 'US',
+      disabled: '-'*15
+    )
+
+    walrus.country_code = 'US'
+    t = builder.country_select(:country_code, priority_countries: ['LV','US','DK'])
+    expect(t).to include(tag)
+  end
+
+  it "selects only the first matching option" do
+    tag = options_for_select([["United States of America", "US"],["Uruguay", "UY"]], "US")
+    walrus.country_code = 'US'
+    t = builder.country_select(:country_code, priority_countries: ['LV','US'])
+    expect(t).to_not include(tag)
+  end
+
+  it "displays only the chosen countries" do
+    options = [["Denmark", "DK"],["Germany", "DE"]]
+    tag = builder.select(:country_code, options)
+    walrus.country_code = 'US'
+    t = builder.country_select(:country_code, only: ['DK','DE'])
+    expect(t).to eql(tag)
+  end
+
+  it "discards some countries" do
+    tag = options_for_select([["United States of America", "US"]])
+    walrus.country_code = 'DE'
+    t = builder.country_select(:country_code, except: ['US'])
+    expect(t).to_not include(tag)
+  end
+
+  context "using old 1.x syntax" do
+    it "accepts priority countries" do
+      tag = options_for_select(
+        [
+          ['Latvia','LV'],
+          ['United States of America','US'],
+          ['Denmark', 'DK'],
+          ['-'*15,'-'*15]
+        ],
+        selected: 'US',
+        disabled: '-'*15
+      )
+
+      walrus.country_code = 'US'
+      t = builder.country_select(:country_code, ['LV','US','DK'])
+      expect(t).to include(tag)
+    end
+
+    it "selects only the first matching option" do
+      tag = options_for_select([["United States of America", "US"],["Uruguay", "UY"]], "US")
+      walrus.country_code = 'US'
+      t = builder.country_select(:country_code, ['LV','US'])
+      expect(t).to_not include(tag)
+    end
+
+    it "supports the country names as provided by default in Formtastic" do
+      tag = options_for_select([
+        ["Australia", "AU"],
+        ["Canada", "CA"],
+        ["United Kingdom", "GB"],
+        ["United States of America", "US"]
+      ])
+      country_names = ["Australia", "Canada", "United Kingdom", "United States"]
+      t = builder.country_select(:country_code, country_names)
+      expect(t).to include(tag)
+    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,16 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: country_select
 version: !ruby/object:Gem::Version
-  version: 1.1.3
-  prerelease: 
+  version: 2.0.0.rc1
 platform: ruby
 authors:
 - Stefan Penner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-28 00:00:00.000000000 Z
-dependencies: []
+date: 2014-08-11 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: countries
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.3
 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.
@@ -20,43 +101,53 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
+- Appraisals
+- CHANGELOG.md
 - Gemfile
 - MIT-LICENSE
 - README.md
 - Rakefile
-- VERSION
+- UPGRADING.md
 - country_select.gemspec
+- gemfiles/actionpack3.0.gemfile
+- gemfiles/actionpack3.1.gemfile
+- gemfiles/actionpack3.2.gemfile
+- gemfiles/actionpack4.0.gemfile
+- gemfiles/actionpack4.1.gemfile
 - lib/country_select.rb
+- lib/country_select/country_select_helper.rb
+- lib/country_select/rails3/country_select_helper.rb
+- lib/country_select/tag_helper.rb
 - lib/country_select/version.rb
-homepage: ''
-licenses: []
+- spec/country_select_spec.rb
+- spec/spec_helper.rb
+homepage: https://github.com/stefanpenner/country_select
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !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
+      version: 1.3.1
 requirements: []
 rubyforge_project: country_select
-rubygems_version: 1.8.24
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 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