country_select 1.3.1 → 2.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85cd9956d8ad64b2416fb3709b58b6cbd0690594
-  data.tar.gz: 46a5e1a828ccd13f6bb7fcccb481a4abfd23a905
+  metadata.gz: 401df54254b9c4583008b5911cccf52b5b3f2e58
+  data.tar.gz: 11545a1a878be17f4ecc0702f02d62654119469d
 SHA512:
-  metadata.gz: 3f23d5d029d2c64cd52415d184c369d2c9e78224946a886cde30e7905ad08de1370cc02efdbda7dd7ae1284f1dd3bbd38f8c3f9a3ee4965651500ffb57383d55
-  data.tar.gz: 875ea57ddb1bfd27a1eb7e7571124e9df206ba8e02ca46f6c60b5701110eabdcb3ded1407422d5f5ab5bb1f6943a15eb27c32a391c67ea6c19cd9c82a9ff5487
+  metadata.gz: 673e9a647e516829b6aa503463d0af4d37fbbdad31fc94cedd4f98783947373d6eec776ac1521607113d7473dceb58bf22690c0a6f9c7525734557375da3ad23
+  data.tar.gz: 7a33b1de4fed4658a9cc9b6e0e13d98f4d9ac4ed094ceb239884369c823a336fbf04dc83eee7f030fee818069e741b5f036914ff19f32a7ba1c10f511facde3e

data/.travis.yml

@@ -1,19 +1,24 @@
 language: ruby
 script: "bundle exec rake appraisal:integration"
 rvm:
-  - 1.8.7
-  - 1.9.2
   - 1.9.3
   - 2.0.0
-  - 2.1.0
-  - jruby-18mode
+  - 2.1.2
   - jruby-19mode
   - jruby-head
-  - rbx
-  - ree
+  - 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
+    - rvm: rbx-2

data/Appraisals

@@ -1,13 +1,13 @@
 appraise 'actionpack3.0' do
-  gem 'actionpack', '~> 3.0.0'
+  gem 'actionpack', '~> 3.0.20'
 end
 
 appraise 'actionpack3.1' do
-  gem 'actionpack', '~> 3.1.0'
+  gem 'actionpack', '~> 3.1.12'
 end
 
 appraise 'actionpack3.2' do
-  gem 'actionpack', '~> 3.2.0'
+  gem 'actionpack', '~> 3.2.17'
 end
 
 appraise 'actionpack4.0' do
@@ -15,5 +15,5 @@ appraise 'actionpack4.0' do
 end
 
 appraise 'actionpack4.1' do
-  gem 'actionpack', '~> 4.1.0.beta1'
+  gem 'actionpack', '~> 4.1.0'
 end

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+== 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

data/Gemfile

@@ -3,11 +3,6 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in country_select.gemspec
 gemspec
 
-# Duplicating this in Gemfile until thoughtbot pushes latest version
-# that supports Bundler `platform` directive for rbx support in travis-ci
-# Once appraisal 1.0.0 is released, this line can be removed
-gem 'appraisal', :github => 'thoughtbot/appraisal', :ref => '6d599f'
-
 platforms :rbx do
   gem 'racc'
   gem 'rubysl', '~> 2.0'

data/README.md

@@ -4,16 +4,14 @@
 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).
 
-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.
 
+## UPGRADING
+
+[**An important message about upgrading from 1.x**](UPGRADING.md)
+
 ## Installation
 
 Install as a gem using
@@ -24,7 +22,7 @@ gem install country_select
 Or put the following in your Gemfile
 
 ```ruby
-gem 'country_select'
+gem 'country_select', github: 'stefanpenner/country_select'
 ```
 
 ## Usage
@@ -38,48 +36,60 @@ country_select("user", "country")
 Supplying priority countries to be placed at the top of the list:
 
 ```ruby
-country_select("user", "country", [ "Great Britain", "France", "Germany" ])
+country_select("user", "country", priority_countries: ["GB", "FR", "DE"])
 ```
 
-### Using Country Name Localization
-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, it, de, fr, es, ja, nl, but may not be complete. In the event a translation is 
-not available, it will revert to the globally assigned locale (by default, "en").
+Supplying only certain countries:
 
-The locale can be overridden locally:
 ```ruby
-country_select(:country_name, ['US'], {:iso_codes => true, :locale => 'es'}) 
+country_select("user", "country", only: ["GB", "FR", "DE"])
 ```
 
-### 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.
+Discarding certain countries:
 
 ```ruby
-country_select("user", "country_code", nil, iso_codes: true)
+country_select("user", "country", except: ["GB", "FR", "DE"])
 ```
 
+Supplying additional html options:
+
 ```ruby
-country_select("user", "country_code", [ "GB", "FR", "DE" ], iso_codes: true)
+country_select("user", "country", { priority_countries: ["GB", "FR"] }, { selected: "GB", class: 'form-control' })
 ```
 
-#### Global configuration to always use ISO codes
-Add the following configuration to an initializer.
+### 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
-::CountrySelect.use_iso_codes = true
+country_select("user", "country_code", locale: 'es')
 ```
 
-#### Getting the Country from ISO codes
+#### Getting the Country Name from the countries gem
 
 ```ruby
 class User < ActiveRecord::Base
@@ -88,27 +98,25 @@ class User < ActiveRecord::Base
   # This will attempt to translate the country name and use the default
   # (usually English) name if no translation is available
   def country_name
-    country = Country[country_code]
+    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 file lives [here](https://github.com/scudco/country_select_test/blob/master/app/views/welcome/index.html.erb).
+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).
 
 ## Tests
 
 ```shell
 bundle
-bundle exec rspec
-```
-
-### Running with multiple versions of actionpack
-
-```shell
 bundle exec appraisal
+bundle exec rake appraisal:integration
 ```
 
 Copyright (c) 2008 Michael Koziarski, released under the MIT license

data/Rakefile

@@ -7,18 +7,14 @@ require 'appraisal'
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :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' && appraisal.name =~ /actionpack4/
-        # skip rails 4 for ruby < 1.9.3
-      else
-        appraisal.install
-        Appraisal::Command.from_args(appraisal.gemfile_path).run
-      end
+      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

@@ -19,16 +19,10 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ['lib']
 
-  # specify any dependencies here; for example:
   s.add_development_dependency 'rspec', '~> 2'
-  if RUBY_VERSION < '1.9.3'
-    s.add_development_dependency 'actionpack', '~> 3.2.13'
-  else
-    s.add_development_dependency 'actionpack', '~> 3'
-  end
-  # Putting this directly in Gemfile until thoughtbot pushes latest version
-  # that supports Bundler `platform` directive for rbx support in travis-ci
-  #s.add_development_dependency 'appraisal'
+  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.3'
+
+  s.add_dependency 'countries', '~> 0.9', '>= 0.9.3'
 end

data/gemfiles/actionpack3.0.gemfile

@@ -2,8 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "appraisal", :github=>"thoughtbot/appraisal", :ref=>"6d599f"
-gem "actionpack", "~> 3.0.0"
+gem "actionpack", "~> 3.0.20"
 
 platforms :rbx do
   gem "racc"
@@ -11,4 +10,4 @@ platforms :rbx do
   gem "psych"
 end
 
-gemspec :path=>".././"
+gemspec :path => "../"

data/gemfiles/actionpack3.1.gemfile

@@ -2,8 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "appraisal", :github=>"thoughtbot/appraisal", :ref=>"6d599f"
-gem "actionpack", "~> 3.1.0"
+gem "actionpack", "~> 3.1.12"
 
 platforms :rbx do
   gem "racc"
@@ -11,4 +10,4 @@ platforms :rbx do
   gem "psych"
 end
 
-gemspec :path=>".././"
+gemspec :path => "../"

data/gemfiles/actionpack3.2.gemfile

@@ -2,8 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "appraisal", :github=>"thoughtbot/appraisal", :ref=>"6d599f"
-gem "actionpack", "~> 3.2.0"
+gem "actionpack", "~> 3.2.17"
 
 platforms :rbx do
   gem "racc"
@@ -11,4 +10,4 @@ platforms :rbx do
   gem "psych"
 end
 
-gemspec :path=>".././"
+gemspec :path => "../"

data/gemfiles/actionpack4.0.gemfile

@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "appraisal", :github=>"thoughtbot/appraisal", :ref=>"6d599f"
 gem "actionpack", "~> 4.0.0"
 
 platforms :rbx do
@@ -11,4 +10,4 @@ platforms :rbx do
   gem "psych"
 end
 
-gemspec :path=>".././"
+gemspec :path => "../"

data/gemfiles/actionpack4.1.gemfile

@@ -2,8 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "appraisal", :github=>"thoughtbot/appraisal", :ref=>"6d599f"
-gem "actionpack", "~> 4.1.0.beta1"
+gem "actionpack", "~> 4.1.0"
 
 platforms :rbx do
   gem "racc"
@@ -11,4 +10,4 @@ platforms :rbx do
   gem "psych"
 end
 
-gemspec :path=>".././"
+gemspec :path => "../"