country_select 1.2.0 → 1.3.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 85cd9956d8ad64b2416fb3709b58b6cbd0690594
+  data.tar.gz: 46a5e1a828ccd13f6bb7fcccb481a4abfd23a905
+SHA512:
+  metadata.gz: 3f23d5d029d2c64cd52415d184c369d2c9e78224946a886cde30e7905ad08de1370cc02efdbda7dd7ae1284f1dd3bbd38f8c3f9a3ee4965651500ffb57383d55
+  data.tar.gz: 875ea57ddb1bfd27a1eb7e7571124e9df206ba8e02ca46f6c60b5701110eabdcb3ded1407422d5f5ab5bb1f6943a15eb27c32a391c67ea6c19cd9c82a9ff5487

checksums.yaml.gz.sig

@@ -0,0 +1 @@
+c����0�SeXxlx��䔸�0��8T_B~7h���݌���6���,z"*�B�Yb�F�ŭ똓1��-AR�_UV5�.�.�Ii>!�����00��cf��b����X���T�C������pwخ[��(�v�����1&��V���=�m�D��na������x��5o�7n��V�F��-p*a{���W�x\a�6�]m�]��C��V	�~�����e�=��?ʏ����T�,|�g�@c��cX|��ȵ�[���3]�8{�%#gU

data/.gitignore

@@ -3,3 +3,4 @@
 .bundle
 Gemfile.lock
 pkg/*
+.ruby-version

data/.travis.yml

@@ -1,17 +1,19 @@
 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
+  - 1.9.2
+  - 1.9.3
+  - 2.0.0
+  - 2.1.0
   - jruby-18mode
-  - rbx-19mode
-  - rbx-18mode
+  - jruby-19mode
+  - jruby-head
+  - rbx
+  - ree
+  - ruby-head
 matrix:
   allow_failures:
     - rvm: ruby-head
+    - rvm: jruby-head
+    - rvm: rbx

data/Appraisals

@@ -1,7 +1,3 @@
-# appraise 'actionpack2.3' do
-#   gem 'actionpack', '~> 2.3.0'
-# end
-
 appraise 'actionpack3.0' do
   gem 'actionpack', '~> 3.0.0'
 end
@@ -17,3 +13,7 @@ end
 appraise 'actionpack4.0' do
   gem 'actionpack', '~> 4.0.0'
 end
+
+appraise 'actionpack4.1' do
+  gem 'actionpack', '~> 4.1.0.beta1'
+end

data/Gemfile

@@ -2,3 +2,14 @@ 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'
+  gem 'psych'
+end

data/README.md

@@ -27,7 +27,7 @@ Or put the following in your Gemfile
 gem 'country_select'
 ```
 
-## Example
+## Usage
 
 Simple use supplying model and attribute as parameters:
 
@@ -41,10 +41,24 @@ Supplying priority countries to be placed at the top of the list:
 country_select("user", "country", [ "Great Britain", "France", "Germany" ])
 ```
 
+### 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").
+
+The locale can be overridden locally:
+```ruby
+country_select(:country_name, ['US'], {:iso_codes => true, :locale => 'es'}) 
+```
+
 ### 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>`
+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
@@ -55,7 +69,14 @@ country_select("user", "country_code", nil, iso_codes: true)
 ```
 
 ```ruby
-country_select("user", "country_code", [ "gb", "fr", "de" ], iso_codes: true)
+country_select("user", "country_code", [ "GB", "FR", "DE" ], iso_codes: true)
+```
+
+#### Global configuration to always use ISO codes
+Add the following configuration to an initializer.
+
+```ruby
+::CountrySelect.use_iso_codes = true
 ```
 
 #### Getting the Country from ISO codes
@@ -64,12 +85,18 @@ country_select("user", "country_code", [ "gb", "fr", "de" ], iso_codes: true)
 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
-    ::CountrySelect::COUNTRIES[country_code]
+    country = 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).
 
 ## Tests
 

data/Rakefile

@@ -13,7 +13,7 @@ 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'
+      if RUBY_VERSION < '1.9.3' && appraisal.name =~ /actionpack4/
         # skip rails 4 for ruby < 1.9.3
       else
         appraisal.install

data/country_select.gemspec

@@ -5,6 +5,7 @@ require 'country_select/version'
 Gem::Specification.new do |s|
   s.name        = 'country_select'
   s.version     = CountrySelect::VERSION
+  s.licenses    = ['MIT']
   s.authors     = ['Stefan Penner']
   s.email       = ['stefan.penner@gmail.com']
   s.homepage    = 'https://github.com/stefanpenner/country_select'
@@ -19,12 +20,15 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   # specify any dependencies here; for example:
-  s.add_development_dependency 'rspec'
+  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'
+    s.add_development_dependency 'actionpack', '~> 3'
   end
-  s.add_development_dependency 'appraisal'
-  s.add_development_dependency 'pry'
+  # 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 'pry', '~> 0'
+  s.add_dependency 'countries', '0.9.3'
 end

data/gemfiles/actionpack3.0.gemfile

@@ -2,6 +2,13 @@
 
 source "https://rubygems.org"
 
+gem "appraisal", :github=>"thoughtbot/appraisal", :ref=>"6d599f"
 gem "actionpack", "~> 3.0.0"
 
-gemspec :path=>"../"
+platforms :rbx do
+  gem "racc"
+  gem "rubysl", "~> 2.0"
+  gem "psych"
+end
+
+gemspec :path=>".././"

data/gemfiles/actionpack3.0.gemfile.lock

@@ -1,7 +1,18 @@
+GIT
+  remote: git://github.com/thoughtbot/appraisal.git
+  revision: 6d599ff1f2418d199ba2357b7c0297a63521ab13
+  ref: 6d599f
+  specs:
+    appraisal (1.0.0.beta2)
+      bundler
+      rake
+      thor (>= 0.14.0)
+
 PATH
-  remote: /Users/scudco/projects/country_select
+  remote: ../
   specs:
-    country_select (1.1.3)
+    country_select (1.3.1)
+      countries (= 0.9.3)
 
 GEM
   remote: https://rubygems.org/
@@ -22,20 +33,23 @@ GEM
       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)
+    countries (0.9.3)
+      currencies (~> 0.4.2)
+    currencies (0.4.2)
     diff-lcs (1.2.4)
     erubis (2.6.6)
       abstract (>= 1.0.0)
+    ffi2-generators (0.1.1)
     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)
+    psych (2.0.2)
+    racc (1.4.11)
     rack (1.2.8)
     rack-mount (0.6.14)
       rack (>= 1.0.0)
@@ -50,7 +64,210 @@ GEM
     rspec-expectations (2.13.0)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.13.1)
+    rubysl (2.0.15)
+      rubysl-abbrev (~> 2.0)
+      rubysl-base64 (~> 2.0)
+      rubysl-benchmark (~> 2.0)
+      rubysl-bigdecimal (~> 2.0)
+      rubysl-cgi (~> 2.0)
+      rubysl-cgi-session (~> 2.0)
+      rubysl-cmath (~> 2.0)
+      rubysl-complex (~> 2.0)
+      rubysl-continuation (~> 2.0)
+      rubysl-coverage (~> 2.0)
+      rubysl-csv (~> 2.0)
+      rubysl-curses (~> 2.0)
+      rubysl-date (~> 2.0)
+      rubysl-delegate (~> 2.0)
+      rubysl-digest (~> 2.0)
+      rubysl-drb (~> 2.0)
+      rubysl-e2mmap (~> 2.0)
+      rubysl-english (~> 2.0)
+      rubysl-enumerator (~> 2.0)
+      rubysl-erb (~> 2.0)
+      rubysl-etc (~> 2.0)
+      rubysl-expect (~> 2.0)
+      rubysl-fcntl (~> 2.0)
+      rubysl-fiber (~> 2.0)
+      rubysl-fileutils (~> 2.0)
+      rubysl-find (~> 2.0)
+      rubysl-forwardable (~> 2.0)
+      rubysl-getoptlong (~> 2.0)
+      rubysl-gserver (~> 2.0)
+      rubysl-io-console (~> 2.0)
+      rubysl-io-nonblock (~> 2.0)
+      rubysl-io-wait (~> 2.0)
+      rubysl-ipaddr (~> 2.0)
+      rubysl-irb (~> 2.0)
+      rubysl-logger (~> 2.0)
+      rubysl-mathn (~> 2.0)
+      rubysl-matrix (~> 2.0)
+      rubysl-mkmf (~> 2.0)
+      rubysl-monitor (~> 2.0)
+      rubysl-mutex_m (~> 2.0)
+      rubysl-net-ftp (~> 2.0)
+      rubysl-net-http (~> 2.0)
+      rubysl-net-imap (~> 2.0)
+      rubysl-net-pop (~> 2.0)
+      rubysl-net-protocol (~> 2.0)
+      rubysl-net-smtp (~> 2.0)
+      rubysl-net-telnet (~> 2.0)
+      rubysl-nkf (~> 2.0)
+      rubysl-observer (~> 2.0)
+      rubysl-open-uri (~> 2.0)
+      rubysl-open3 (~> 2.0)
+      rubysl-openssl (~> 2.0)
+      rubysl-optparse (~> 2.0)
+      rubysl-ostruct (~> 2.0)
+      rubysl-pathname (~> 2.0)
+      rubysl-prettyprint (~> 2.0)
+      rubysl-prime (~> 2.0)
+      rubysl-profile (~> 2.0)
+      rubysl-profiler (~> 2.0)
+      rubysl-pstore (~> 2.0)
+      rubysl-pty (~> 2.0)
+      rubysl-rational (~> 2.0)
+      rubysl-readline (~> 2.0)
+      rubysl-resolv (~> 2.0)
+      rubysl-rexml (~> 2.0)
+      rubysl-rinda (~> 2.0)
+      rubysl-rss (~> 2.0)
+      rubysl-scanf (~> 2.0)
+      rubysl-securerandom (~> 2.0)
+      rubysl-set (~> 2.0)
+      rubysl-shellwords (~> 2.0)
+      rubysl-singleton (~> 2.0)
+      rubysl-socket (~> 2.0)
+      rubysl-stringio (~> 2.0)
+      rubysl-strscan (~> 2.0)
+      rubysl-sync (~> 2.0)
+      rubysl-syslog (~> 2.0)
+      rubysl-tempfile (~> 2.0)
+      rubysl-thread (~> 2.0)
+      rubysl-thwait (~> 2.0)
+      rubysl-time (~> 2.0)
+      rubysl-timeout (~> 2.0)
+      rubysl-tmpdir (~> 2.0)
+      rubysl-tsort (~> 2.0)
+      rubysl-un (~> 2.0)
+      rubysl-uri (~> 2.0)
+      rubysl-weakref (~> 2.0)
+      rubysl-webrick (~> 2.0)
+      rubysl-xmlrpc (~> 2.0)
+      rubysl-yaml (~> 2.0)
+      rubysl-zlib (~> 2.0)
+    rubysl-abbrev (2.0.4)
+    rubysl-base64 (2.0.0)
+    rubysl-benchmark (2.0.1)
+    rubysl-bigdecimal (2.0.2)
+    rubysl-cgi (2.0.1)
+    rubysl-cgi-session (2.0.1)
+    rubysl-cmath (2.0.0)
+    rubysl-complex (2.0.0)
+    rubysl-continuation (2.0.0)
+    rubysl-coverage (2.0.3)
+    rubysl-csv (2.0.2)
+      rubysl-english (~> 2.0)
+    rubysl-curses (2.0.1)
+    rubysl-date (2.0.6)
+    rubysl-delegate (2.0.1)
+    rubysl-digest (2.0.3)
+    rubysl-drb (2.0.1)
+    rubysl-e2mmap (2.0.0)
+    rubysl-english (2.0.0)
+    rubysl-enumerator (2.0.0)
+    rubysl-erb (2.0.1)
+    rubysl-etc (2.0.3)
+      ffi2-generators (~> 0.1)
+    rubysl-expect (2.0.0)
+    rubysl-fcntl (2.0.4)
+      ffi2-generators (~> 0.1)
+    rubysl-fiber (2.0.0)
+    rubysl-fileutils (2.0.3)
+    rubysl-find (2.0.1)
+    rubysl-forwardable (2.0.1)
+    rubysl-getoptlong (2.0.0)
+    rubysl-gserver (2.0.0)
+      rubysl-socket (~> 2.0)
+      rubysl-thread (~> 2.0)
+    rubysl-io-console (2.0.0)
+    rubysl-io-nonblock (2.0.0)
+    rubysl-io-wait (2.0.0)
+    rubysl-ipaddr (2.0.0)
+    rubysl-irb (2.0.4)
+      rubysl-e2mmap (~> 2.0)
+      rubysl-mathn (~> 2.0)
+      rubysl-readline (~> 2.0)
+      rubysl-thread (~> 2.0)
+    rubysl-logger (2.0.0)
+    rubysl-mathn (2.0.0)
+    rubysl-matrix (2.1.0)
+      rubysl-e2mmap (~> 2.0)
+    rubysl-mkmf (2.0.1)
+      rubysl-fileutils (~> 2.0)
+      rubysl-shellwords (~> 2.0)
+    rubysl-monitor (2.0.0)
+    rubysl-mutex_m (2.0.0)
+    rubysl-net-ftp (2.0.1)
+    rubysl-net-http (2.0.4)
+      rubysl-cgi (~> 2.0)
+      rubysl-erb (~> 2.0)
+      rubysl-singleton (~> 2.0)
+    rubysl-net-imap (2.0.1)
+    rubysl-net-pop (2.0.1)
+    rubysl-net-protocol (2.0.1)
+    rubysl-net-smtp (2.0.1)
+    rubysl-net-telnet (2.0.0)
+    rubysl-nkf (2.0.1)
+    rubysl-observer (2.0.0)
+    rubysl-open-uri (2.0.0)
+    rubysl-open3 (2.0.0)
+    rubysl-openssl (2.1.0)
+    rubysl-optparse (2.0.1)
+      rubysl-shellwords (~> 2.0)
+    rubysl-ostruct (2.0.4)
+    rubysl-pathname (2.0.0)
+    rubysl-prettyprint (2.0.2)
+    rubysl-prime (2.0.1)
+    rubysl-profile (2.0.0)
+    rubysl-profiler (2.0.1)
+    rubysl-pstore (2.0.0)
+    rubysl-pty (2.0.2)
+    rubysl-rational (2.0.1)
+    rubysl-readline (2.0.2)
+    rubysl-resolv (2.0.0)
+    rubysl-rexml (2.0.2)
+    rubysl-rinda (2.0.1)
+    rubysl-rss (2.0.0)
+    rubysl-scanf (2.0.0)
+    rubysl-securerandom (2.0.0)
+    rubysl-set (2.0.1)
+    rubysl-shellwords (2.0.0)
+    rubysl-singleton (2.0.0)
+    rubysl-socket (2.0.1)
+    rubysl-stringio (2.0.0)
+    rubysl-strscan (2.0.0)
+    rubysl-sync (2.0.0)
+    rubysl-syslog (2.0.1)
+      ffi2-generators (~> 0.1)
+    rubysl-tempfile (2.0.1)
+    rubysl-thread (2.0.2)
+    rubysl-thwait (2.0.0)
+    rubysl-time (2.0.3)
+    rubysl-timeout (2.0.0)
+    rubysl-tmpdir (2.0.0)
+    rubysl-tsort (2.0.1)
+    rubysl-un (2.0.0)
+      rubysl-fileutils (~> 2.0)
+      rubysl-optparse (~> 2.0)
+    rubysl-uri (2.0.0)
+    rubysl-weakref (2.0.0)
+    rubysl-webrick (2.0.0)
+    rubysl-xmlrpc (2.0.0)
+    rubysl-yaml (2.0.4)
+    rubysl-zlib (2.0.1)
     slop (3.4.5)
+    thor (0.18.1)
     tzinfo (0.3.37)
 
 PLATFORMS
@@ -58,7 +275,10 @@ PLATFORMS
 
 DEPENDENCIES
   actionpack (~> 3.0.0)
-  appraisal
+  appraisal!
   country_select!
-  pry
-  rspec
+  pry (~> 0)
+  psych
+  racc
+  rspec (~> 2)
+  rubysl (~> 2.0)