country_select 2.5.2 → 5.0.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1dea784fe1d78c8a7b7d35502636b0de1b64879e
-  data.tar.gz: ca5c6e5be03c82625ae7396a126759b456e5d04f
+SHA256:
+  metadata.gz: f7929d56cb96d106c263de9f596ef9d20029854b0c54ca1a9fc94a9a5e8f6bfa
+  data.tar.gz: 2acbe530cc471153bffdb7c9f93607447dceb2ffa76b968b18ed85ca327ce8e7
 SHA512:
-  metadata.gz: df7361d081db570f9195f0bd04e079a3ddd82a2083bfafb7fe1c9b2c6c20462b986001d17e551b54707a0bf02c5dbef98a178f6a32348b6650160df9e0b8c818
-  data.tar.gz: 1019eeb1f5d5b9b323bed52bb37253a330829ad09093649b86291b070f67a27efd55406dfbd23f889f246638b923e57d86b0bb51bc087a0cdbab30e9c55de450
+  metadata.gz: c93615f51d59bf29e2cbddbacc24cca744509a549c0e8db782b58f98f3983524d43f3288f597b7ffaf391f9722f9b684be78b3100ef79bb858dfc78e82c30030
+  data.tar.gz: 9ab7c4635015ba8038a1b63700b895156d5efac80caa44e379dbc62fb876734c82e995c74cb0f72990257564002032f3b2707ab7cef860137109cc384ecc481b

data/.travis.yml

@@ -1,31 +1,23 @@
-sudo: false
+os: linux
 cache: bundler
 language: ruby
-script: "bundle exec rspec"
+bundler_args: ""
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.5
-  - 2.2.1
-  - jruby-19mode
-  - jruby-head
-  - rbx-2
+  - 2.5
+  - 2.6
+  - 2.7
+  - 3.0
   - ruby-head
 gemfile:
-  - gemfiles/actionpack3.2.gemfile
-  - gemfiles/actionpack4.0.gemfile
-  - gemfiles/actionpack4.1.gemfile
-  - gemfiles/actionpack4.2.gemfile
+  - gemfiles/actionpack5.2.gemfile
+  - gemfiles/actionpack6.0.gemfile
+  - gemfiles/actionpack6.1.gemfile
   - gemfiles/actionpack.edge.gemfile
-matrix:
-  allow_failures:
-    - rvm: ruby-head
-    - rvm: jruby-head
-    - rvm: rbx-2
+jobs:
   exclude:
-    - rvm: 1.9.3
-      gemfile: gemfiles/actionpack.edge.gemfile
-    - rvm: 2.0.0
+    - rvm: 2.5
       gemfile: gemfiles/actionpack.edge.gemfile
-    - rvm: jruby-19mode
+    - rvm: 2.6
       gemfile: gemfiles/actionpack.edge.gemfile
+  allow_failures:
+    - rvm: ruby-head

data/CHANGELOG.md

@@ -1,3 +1,28 @@
+## 5.0.0 2021-03-03
+
+  * #164,#172 - Remove support for EOL versions of Ruby and ruby on rails
+    * Ruby >= 2.5, Rails >= 5.2
+  * #175 - Add Rails 6.1 Support *(@andrehjr)
+  * #173 - Fallback even if translations cannot be loaded (@mikepluquin)
+
+## 4.0.0 2018-12-20
+
+  * #160 - Upgrade to countries 3.0 - @gssbzn
+    * https://github.com/hexorx/countries/blob/master/CHANGELOG.md#v220-yanked-and-re-released-as-300-20181217-1020-0000
+
+## 3.1.1 2017-09-20
+
+  * #146 - Fix value call on Rails edge (5.2+) - @ybart
+
+## 3.1.0 2017-07-18
+
+  * #144 - Provide a possibility to opt out of `sort_alphabetical` - @fschwahn
+
+## 3.0.0 2016-11-25
+
+  * #138 - Upgrade to Countries 2.0
+  * #136 - Drop support for Ruby 1.9.3 as countries 2.0 no longer supports it
+
 ## 2.5.2 2015-11-10
 
   * #127 - Fix multi-selects - @jjballano

data/Gemfile.lock

@@ -1,70 +1,85 @@
 PATH
   remote: .
   specs:
-    country_select (2.5.1)
-      countries (~> 1.2.0)
-      sort_alphabetical (~> 1.0)
+    country_select (5.0.0.pre)
+      countries (~> 3.0)
+      sort_alphabetical (~> 1.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (3.2.22)
-      activemodel (= 3.2.22)
-      activesupport (= 3.2.22)
-      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.22)
-      activesupport (= 3.2.22)
-      builder (~> 3.0.0)
-    activesupport (3.2.22)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
-    builder (3.0.4)
-    coderay (1.1.0)
-    countries (1.2.1)
-      currencies (~> 0.4.2)
-      i18n_data (~> 0.7.0)
-    currencies (0.4.2)
-    diff-lcs (1.2.5)
-    erubis (2.7.0)
+    actionpack (6.1.1)
+      actionview (= 6.1.1)
+      activesupport (= 6.1.1)
+      rack (~> 2.0, >= 2.0.9)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actionview (6.1.1)
+      activesupport (= 6.1.1)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activesupport (6.1.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    builder (3.2.4)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.8)
+    countries (3.0.1)
+      i18n_data (~> 0.10.0)
+      sixarm_ruby_unaccent (~> 1.1)
+      unicode_utils (~> 1.4)
+    crass (1.0.6)
+    diff-lcs (1.4.4)
+    erubi (1.10.0)
     ffi2-generators (0.1.1)
-    hike (1.2.3)
-    i18n (0.7.0)
-    i18n_data (0.7.0)
-    journey (1.0.4)
-    method_source (0.8.2)
-    multi_json (1.11.2)
-    pry (0.10.1)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    psych (2.0.15)
-    racc (1.4.12)
-    rack (1.4.7)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rake (10.4.2)
-    rspec (3.3.0)
-      rspec-core (~> 3.3.0)
-      rspec-expectations (~> 3.3.0)
-      rspec-mocks (~> 3.3.0)
-    rspec-core (3.3.2)
-      rspec-support (~> 3.3.0)
-    rspec-expectations (3.3.1)
+    i18n (1.8.7)
+      concurrent-ruby (~> 1.0)
+    i18n_data (0.10.0)
+    loofah (2.9.0)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    method_source (1.0.0)
+    mini_portile2 (2.5.0)
+    minitest (5.14.3)
+    nokogiri (1.11.1)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
+    nokogiri (1.11.1-x86_64-darwin)
+      racc (~> 1.4)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    psych (3.2.0)
+    racc (1.5.0)
+    rack (2.2.3)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
+    rake (13.0.1)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-mocks (3.3.2)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-support (3.3.0)
-    rubysl (2.1.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.3)
+    rubysl (2.2.0)
       rubysl-abbrev (~> 2.0)
       rubysl-base64 (~> 2.0)
       rubysl-benchmark (~> 2.0)
@@ -149,6 +164,7 @@ GEM
       rubysl-tmpdir (~> 2.0)
       rubysl-tsort (~> 2.0)
       rubysl-un (~> 2.0)
+      rubysl-unicode_normalize (~> 2.0)
       rubysl-uri (~> 2.0)
       rubysl-weakref (~> 2.0)
       rubysl-webrick (~> 2.0)
@@ -160,17 +176,17 @@ GEM
     rubysl-benchmark (2.0.1)
     rubysl-bigdecimal (2.0.2)
     rubysl-cgi (2.0.1)
-    rubysl-cgi-session (2.0.1)
+    rubysl-cgi-session (2.1.0)
     rubysl-cmath (2.0.0)
     rubysl-complex (2.0.0)
     rubysl-continuation (2.0.0)
-    rubysl-coverage (2.0.3)
+    rubysl-coverage (2.1)
     rubysl-csv (2.0.2)
       rubysl-english (~> 2.0)
     rubysl-curses (2.0.1)
     rubysl-date (2.0.9)
     rubysl-delegate (2.0.1)
-    rubysl-digest (2.0.8)
+    rubysl-digest (2.1)
     rubysl-drb (2.0.1)
     rubysl-e2mmap (2.0.0)
     rubysl-english (2.0.0)
@@ -201,10 +217,10 @@ GEM
     rubysl-mathn (2.0.0)
     rubysl-matrix (2.1.0)
       rubysl-e2mmap (~> 2.0)
-    rubysl-mkmf (2.0.1)
+    rubysl-mkmf (2.1)
       rubysl-fileutils (~> 2.0)
       rubysl-shellwords (~> 2.0)
-    rubysl-monitor (2.0.0)
+    rubysl-monitor (2.1)
     rubysl-mutex_m (2.0.0)
     rubysl-net-ftp (2.0.1)
     rubysl-net-http (2.0.4)
@@ -220,15 +236,15 @@ GEM
     rubysl-observer (2.0.0)
     rubysl-open-uri (2.0.0)
     rubysl-open3 (2.0.0)
-    rubysl-openssl (2.3.0)
+    rubysl-openssl (2.13)
     rubysl-optparse (2.0.1)
       rubysl-shellwords (~> 2.0)
-    rubysl-ostruct (2.0.4)
-    rubysl-pathname (2.1.0)
+    rubysl-ostruct (2.1.0)
+    rubysl-pathname (2.3)
     rubysl-prettyprint (2.0.3)
     rubysl-prime (2.0.1)
     rubysl-profile (2.0.0)
-    rubysl-profiler (2.0.1)
+    rubysl-profiler (2.1)
     rubysl-pstore (2.0.0)
     rubysl-pty (2.0.3)
     rubysl-rational (2.0.1)
@@ -241,14 +257,15 @@ GEM
     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-socket (2.2.1)
+      rubysl-fcntl (~> 2.0)
+    rubysl-stringio (2.3)
     rubysl-strscan (2.0.0)
     rubysl-sync (2.0.0)
     rubysl-syslog (2.1.0)
       ffi2-generators (~> 0.1)
     rubysl-tempfile (2.0.1)
-    rubysl-thread (2.0.3)
+    rubysl-thread (2.1)
     rubysl-thwait (2.0.0)
     rubysl-time (2.0.3)
     rubysl-timeout (2.0.0)
@@ -257,37 +274,36 @@ GEM
     rubysl-un (2.0.0)
       rubysl-fileutils (~> 2.0)
       rubysl-optparse (~> 2.0)
+    rubysl-unicode_normalize (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.1.0)
     rubysl-zlib (2.0.1)
-    slop (3.6.0)
-    sort_alphabetical (1.0.2)
+    sixarm_ruby_unaccent (1.2.0)
+    sort_alphabetical (1.1.0)
       unicode_utils (>= 1.2.2)
-    sprockets (2.2.3)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    tilt (1.4.1)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
     unicode_utils (1.4.0)
-    wwtd (1.1.1)
+    wwtd (1.4.1)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
+  x86_64-darwin-19
 
 DEPENDENCIES
-  actionpack (~> 3)
+  actionpack (~> 6.1)
   country_select!
   pry (~> 0)
   psych
   racc
-  rake
+  rake (~> 13)
   rspec (~> 3)
   rubysl (~> 2.0)
-  wwtd
+  wwtd (~> 1)
 
 BUNDLED WITH
-   1.10.6
+   2.1.4

data/README.md

@@ -26,11 +26,25 @@ gem install country_select
 Or put the following in your Gemfile
 
 ```ruby
-gem 'country_select'
+gem 'country_select', '~> 4.0'
+```
+
+If you don't want to require `sort_alphabetical` (it depends on `unicode_utils` which is known to use lots of memory) you can opt out of using it as follows:
+
+```ruby
+gem 'country_select', require: 'country_select_without_sort_alphabetical'
 ```
 
 ## Usage
 
+Within `form_for` you can use this select like other form elements:
+
+```ruby
+<%= form_for User.new, url: root_url do |f| %>
+  <%= f.country_select :country_code %>
+<% end %>
+```
+
 Simple use supplying model and attribute as parameters:
 
 ```ruby
@@ -61,6 +75,11 @@ Pre-selecting a particular country:
 country_select("user", "country", selected: "GB")
 ```
 
+Changing the divider when priority_countries is active.
+```ruby
+country_select("user", "country", priority_countries: ["AR", "US"], priority_countries_divider: "~~~~~~")
+```
+
 Using existing `select` options:
 ```ruby
 country_select("user", "country", include_blank: true)
@@ -79,13 +98,28 @@ You can define a custom formatter which will receive an
 [`ISO3166::Country`](https://github.com/hexorx/countries/blob/master/lib/countries/country.rb)
 ```ruby
 # config/initializers/country_select.rb
+
+# Return a string to customize the text in the <option> tag, `value` attribute will remain unchanged
 CountrySelect::FORMATS[:with_alpha2] = lambda do |country|
   "#{country.name} (#{country.alpha2})"
 end
+
+# Return an array to customize <option> text, `value` and other HTML attributes
+CountrySelect::FORMATS[:with_data_attrs] = lambda do |country|
+  [
+    country.name,
+    country.alpha2,
+    {
+      'data-country-code' => country.country_code,
+      'data-alpha3' => country.alpha3
+    }
+  ]
+end
 ```
 
 ```ruby
 country_select("user", "country", format: :with_alpha2)
+country_select("user", "country", format: :with_data_attrs)
 ```
 
 ### ISO 3166-1 alpha-2 codes
@@ -159,7 +193,7 @@ changing the dependencies in the gemspec.
 ```shell
 for i in gemfiles/*.gemfile
 do
-BUNDLE_GEMFILE=$i bundle install --no-deployment
+BUNDLE_GEMFILE=$i bundle install --local
 done
 ```
 

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/setup'
 require 'rake'
 require 'bundler/gem_tasks'
@@ -7,4 +9,4 @@ require 'wwtd/tasks'
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 
-task default: "wwtd:local"
+task default: 'spec'