country_select 7.0.0 → 8.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c90fbc7dfe822e709d24caaa9f6ea4aadbc565d056acd04a83881fd456d77d04
-  data.tar.gz: b8b38e3f7c4b907df636ecb611db60c26aa95c7e355a102ce9b4b5b0395fc77a
+  metadata.gz: 674674f152073e1e9b8834bbe5bf012c704ac9f128c664a2b2b46891081bc502
+  data.tar.gz: 9b0670886ec8b5ad3961c446adf4a9a4497e5edbeb1822c7c5cb94fbf6694a04
 SHA512:
-  metadata.gz: 6c467912e59762ce36aecdff5b9ff177b10745a5462437be8d4b3eb283d6e92d1629b3eaa08f1ac2581bb28b212e2b43114bfbcc88ee5118fd0290b596817dd8
-  data.tar.gz: c29e2c423c6cbf990ff80de5b1415945e90f1425ca5bc82a8cb819edca7438c22d4bba374fc52a6d467c29bab8b823d53b50ad8e70fe5d28afa8a8069ffff083
+  metadata.gz: bd10c341e06f4f72318446e7f8115cf63da4800d2314955c755fab4f0328b53cecdf784385011d55c45edec12bca5d2929c7dd4f21605e46c10227db1d17871e
+  data.tar.gz: 93c7f859aada39e88724fed5a6b508bc84155191a168b1a007c0478b01339faf831752e5c22b25d3ddf98c3c5211e5b35bfd691581818e7e0edcb89ab88e765c

data/.github/workflows/build.yml

@@ -12,12 +12,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [2.7, '3.0', 3.1]
+        ruby: [2.7, '3.0', 3.1, 3.2]
         gemfile: [5.2, '6.0', 6.1, '7.0']
     env: # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps
       BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/actionpack-${{ matrix.gemfile }}.gemfile
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+## 8.0.1 2023-01-03
+
+* Update README.md by (@ron-shinall)
+* Update installation instructions by (@henrik)
+* Fix deprecated File.exists? on ruby 3.2.0 by (@JNajera212)
+* Fix priority country sorting bug by (@pmor)
+* Update countries gem to 5.3.0 (@pmor)
+
+## 8.0.0 2022-06-30
+
+* Update countries gem to 5.1.0 (@pmor)
+* Add deprecation warning for old priority country syntax (@pmor)
+* Allow option to preserve the sort order as inputted in the `only` array of countries (@pmor)
+* Remove `sort_alphabetical` dependency (@pmor)
+
 ## 7.0.0 2022-04-03
 
  * #200 - Drop support for Ruby 2.5 and 2.6 (@pmor)

data/Gemfile.lock

@@ -1,27 +1,26 @@
 PATH
   remote: .
   specs:
-    country_select (6.1.1)
+    country_select (8.0.1)
       countries (~> 5.0)
-      sort_alphabetical (~> 1.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (7.0.2.3)
-      actionview (= 7.0.2.3)
-      activesupport (= 7.0.2.3)
+    actionpack (7.0.4)
+      actionview (= 7.0.4)
+      activesupport (= 7.0.4)
       rack (~> 2.0, >= 2.2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (7.0.2.3)
-      activesupport (= 7.0.2.3)
+    actionview (7.0.4)
+      activesupport (= 7.0.4)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activesupport (7.0.2.3)
+    activesupport (7.0.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -29,59 +28,55 @@ GEM
     builder (3.2.4)
     coderay (1.1.3)
     concurrent-ruby (1.1.10)
-    countries (5.0.0)
-      i18n_data (~> 0.16.0)
-      sixarm_ruby_unaccent (~> 1.1)
+    countries (5.3.0)
+      unaccent (~> 0.3)
     crass (1.0.6)
     diff-lcs (1.5.0)
-    erubi (1.10.0)
-    i18n (1.10.0)
+    erubi (1.12.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    i18n_data (0.16.0)
-      simple_po_parser (~> 1.1)
-    loofah (2.16.0)
+    loofah (2.19.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     method_source (1.0.0)
-    minitest (5.15.0)
-    nokogiri (1.13.3-x86_64-darwin)
+    minitest (5.17.0)
+    nokogiri (1.14.0.rc1-x86_64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.14.0.rc1-x86_64-linux)
       racc (~> 1.4)
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    racc (1.6.0)
-    rack (2.2.3)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
+    racc (1.6.2)
+    rack (2.2.5)
+    rack-test (2.0.2)
+      rack (>= 1.3)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.2)
-      loofah (~> 2.3)
+    rails-html-sanitizer (1.4.4)
+      loofah (~> 2.19, >= 2.19.1)
     rake (13.0.6)
-    rspec (3.11.0)
-      rspec-core (~> 3.11.0)
-      rspec-expectations (~> 3.11.0)
-      rspec-mocks (~> 3.11.0)
-    rspec-core (3.11.0)
-      rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.0)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.0)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.1)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.0)
-    simple_po_parser (1.1.6)
-    sixarm_ruby_unaccent (1.2.0)
-    sort_alphabetical (1.1.0)
-      unicode_utils (>= 1.2.2)
-    tzinfo (2.0.4)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
+    tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
-    unicode_utils (1.4.0)
+    unaccent (0.4.0)
 
 PLATFORMS
-  x86_64-darwin-21
+  x86_64-darwin-22
+  x86_64-linux
 
 DEPENDENCIES
   actionpack (~> 7.0)
@@ -91,4 +86,4 @@ DEPENDENCIES
   rspec (~> 3)
 
 BUNDLED WITH
-   2.3.10
+   2.4.2

data/README.md

@@ -1,5 +1,5 @@
 # Rails – Country Select
-[![build](https://github.com/countries/country_select/actions/workflows/build.yml/badge.svg)](https://github.com/countries/country_select/actions/workflows/build.yml)
+[![Gem Version](https://badge.fury.io/rb/country_select.svg)](https://badge.fury.io/rb/countries) [![build](https://github.com/countries/country_select/actions/workflows/build.yml/badge.svg)](https://github.com/countries/country_select/actions/workflows/build.yml)
 [![Code Climate](https://codeclimate.com/github/countries/country_select.svg)](https://codeclimate.com/github/countries/country_select)
 [![CodeQL](https://github.com/countries/country_select/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/countries/country_select/actions/workflows/codeql-analysis.yml)
 
@@ -29,13 +29,7 @@ gem install country_select
 Or put the following in your Gemfile
 
 ```ruby
-gem 'country_select', '~> 6.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'
+gem 'country_select', '~> 8.0'
 ```
 
 ## Usage
@@ -57,13 +51,17 @@ country_select("user", "country")
 Supplying priority countries to be placed at the top of the list:
 
 ```ruby
-country_select("user", "country", priority_countries: ["GB", "FR", "DE"])
+country_select("user", "country", priority_countries: ["GB", "FR", "DE"]) # Countries will be sorted by name according to the current locale
+# or
+country_select("user", "country", priority_countries: ["GB", "FR", "DE"], sort_provided: false) # Countries will be displayed is the provided order
 ```
 
 Supplying only certain countries:
 
 ```ruby
-country_select("user", "country", only: ["GB", "FR", "DE"])
+country_select("user", "country", only: ["GB", "FR", "DE"]) # Countries will be sorted by name according to the current locale
+# or
+country_select("user", "country", only: ["GB", "FR", "DE"], sort_provided: false) # Countries will be displayed is the provided order
 ```
 
 Discarding certain countries:

data/Rakefile

@@ -8,3 +8,29 @@ require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 
 task default: 'spec'
+
+
+task :update_gemfiles do
+  require 'pry'
+  Dir.glob('gemfiles/*.gemfile').each do |gemfile|
+    puts "Updating #{gemfile}...\n\n"
+    ENV['BUNDLE_GEMFILE']=gemfile
+    puts `bundle install --gemfile=#{gemfile} --no-cache`
+    puts `bundle update --gemfile=#{gemfile}`
+
+    lockfile = "#{gemfile}.lock"
+
+    if File.exist? lockfile
+      parsed_lockfile = Bundler::LockfileParser.new(Bundler.read_file(lockfile))
+      # Ensure lockfile has x86_64-linux
+      if parsed_lockfile.platforms.map(&:to_s).none? {|p| p == 'x86_64-linux' }
+        puts "Adding platform x86_64-linux to #{lockfile}\n\n"
+        puts `bundle lock --add-platform x86_64-linux --gemfile=#{gemfile}`
+      end
+
+      puts ""
+    else
+      raise StandardError.new("Expected #{lockfile} to exist.")
+    end
+  end
+end

data/country_select.gemspec

@@ -29,5 +29,4 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec', '~> 3'
 
   s.add_dependency 'countries', '~> 5.0'
-  s.add_dependency 'sort_alphabetical', '~> 1.1'
 end

data/gemfiles/actionpack-5.2.gemfile

@@ -2,5 +2,6 @@ source "https://rubygems.org"
 
 gemspec :path => "../"
 
-gem "railties", "~> 5.2"
-gem "actionpack", "~> 5.2"
+gem "railties", "~> 5.2.0"
+gem "actionpack", "~> 5.2.0"
+gem 'nokogiri', '= 1.14.0.rc1'

data/gemfiles/actionpack-5.2.gemfile.lock

@@ -1,27 +1,26 @@
 PATH
   remote: ..
   specs:
-    country_select (7.0.0)
+    country_select (8.0.1)
       countries (~> 5.0)
-      sort_alphabetical (~> 1.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (5.2.7)
-      actionview (= 5.2.7)
-      activesupport (= 5.2.7)
+    actionpack (5.2.8.1)
+      actionview (= 5.2.8.1)
+      activesupport (= 5.2.8.1)
       rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.7)
-      activesupport (= 5.2.7)
+    actionview (5.2.8.1)
+      activesupport (= 5.2.8.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activesupport (5.2.7)
+    activesupport (5.2.8.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -29,78 +28,72 @@ GEM
     builder (3.2.4)
     coderay (1.1.3)
     concurrent-ruby (1.1.10)
-    countries (5.0.0)
-      i18n_data (~> 0.16.0)
-      sixarm_ruby_unaccent (~> 1.1)
+    countries (5.3.0)
+      unaccent (~> 0.3)
     crass (1.0.6)
     diff-lcs (1.5.0)
-    erubi (1.10.0)
-    i18n (1.10.0)
+    erubi (1.12.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    i18n_data (0.16.0)
-      simple_po_parser (~> 1.1)
-    loofah (2.16.0)
+    loofah (2.19.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     method_source (1.0.0)
-    minitest (5.15.0)
-    nokogiri (1.13.3-x86_64-darwin)
+    minitest (5.17.0)
+    nokogiri (1.14.0.rc1-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.13.3-x86_64-linux)
+    nokogiri (1.14.0.rc1-x86_64-linux)
       racc (~> 1.4)
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    racc (1.6.0)
-    rack (2.2.3)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
+    racc (1.6.2)
+    rack (2.2.5)
+    rack-test (2.0.2)
+      rack (>= 1.3)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.2)
-      loofah (~> 2.3)
-    railties (5.2.7)
-      actionpack (= 5.2.7)
-      activesupport (= 5.2.7)
+    rails-html-sanitizer (1.4.4)
+      loofah (~> 2.19, >= 2.19.1)
+    railties (5.2.8.1)
+      actionpack (= 5.2.8.1)
+      activesupport (= 5.2.8.1)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
     rake (13.0.6)
-    rspec (3.11.0)
-      rspec-core (~> 3.11.0)
-      rspec-expectations (~> 3.11.0)
-      rspec-mocks (~> 3.11.0)
-    rspec-core (3.11.0)
-      rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.0)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.0)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.1)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.0)
-    simple_po_parser (1.1.6)
-    sixarm_ruby_unaccent (1.2.0)
-    sort_alphabetical (1.1.0)
-      unicode_utils (>= 1.2.2)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
     thor (1.2.1)
     thread_safe (0.3.6)
-    tzinfo (1.2.9)
+    tzinfo (1.2.10)
       thread_safe (~> 0.1)
-    unicode_utils (1.4.0)
+    unaccent (0.4.0)
 
 PLATFORMS
-  x86_64-darwin-21
+  x86_64-darwin-22
   x86_64-linux
 
 DEPENDENCIES
-  actionpack (~> 5.2)
+  actionpack (~> 5.2.0)
   country_select!
+  nokogiri (= 1.14.0.rc1)
   pry (~> 0)
-  railties (~> 5.2)
+  railties (~> 5.2.0)
   rake (~> 13)
   rspec (~> 3)
 
 BUNDLED WITH
-   2.3.10
+   2.4.2

data/gemfiles/actionpack-6.0.gemfile

@@ -2,5 +2,6 @@ source "https://rubygems.org"
 
 gemspec :path => "../"
 
-gem "railties", "~> 6.0"
-gem "actionpack", "~> 6.0"
+gem "railties", "~> 6.0.0"
+gem "actionpack", "~> 6.0.0"
+gem 'nokogiri', '= 1.14.0.rc1'

data/gemfiles/actionpack-6.0.gemfile.lock

@@ -1,107 +1,101 @@
 PATH
   remote: ..
   specs:
-    country_select (7.0.0)
+    country_select (8.0.1)
       countries (~> 5.0)
-      sort_alphabetical (~> 1.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (6.1.4.6)
-      actionview (= 6.1.4.6)
-      activesupport (= 6.1.4.6)
-      rack (~> 2.0, >= 2.0.9)
+    actionpack (6.0.6)
+      actionview (= 6.0.6)
+      activesupport (= 6.0.6)
+      rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (6.1.4.6)
-      activesupport (= 6.1.4.6)
+    actionview (6.0.6)
+      activesupport (= 6.0.6)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activesupport (6.1.4.6)
+    activesupport (6.0.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+      zeitwerk (~> 2.2, >= 2.2.2)
     builder (3.2.4)
     coderay (1.1.3)
     concurrent-ruby (1.1.10)
-    countries (5.0.0)
-      i18n_data (~> 0.16.0)
-      sixarm_ruby_unaccent (~> 1.1)
+    countries (5.3.0)
+      unaccent (~> 0.3)
     crass (1.0.6)
     diff-lcs (1.5.0)
-    erubi (1.10.0)
-    i18n (1.10.0)
+    erubi (1.12.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    i18n_data (0.16.0)
-      simple_po_parser (~> 1.1)
-    loofah (2.16.0)
+    loofah (2.19.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     method_source (1.0.0)
-    minitest (5.15.0)
-    nokogiri (1.13.3-x86_64-darwin)
+    minitest (5.17.0)
+    nokogiri (1.14.0.rc1-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.13.3-x86_64-linux)
+    nokogiri (1.14.0.rc1-x86_64-linux)
       racc (~> 1.4)
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    racc (1.6.0)
-    rack (2.2.3)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
+    racc (1.6.2)
+    rack (2.2.5)
+    rack-test (2.0.2)
+      rack (>= 1.3)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.2)
-      loofah (~> 2.3)
-    railties (6.1.4.6)
-      actionpack (= 6.1.4.6)
-      activesupport (= 6.1.4.6)
+    rails-html-sanitizer (1.4.4)
+      loofah (~> 2.19, >= 2.19.1)
+    railties (6.0.6)
+      actionpack (= 6.0.6)
+      activesupport (= 6.0.6)
       method_source
-      rake (>= 0.13)
-      thor (~> 1.0)
+      rake (>= 0.8.7)
+      thor (>= 0.20.3, < 2.0)
     rake (13.0.6)
-    rspec (3.11.0)
-      rspec-core (~> 3.11.0)
-      rspec-expectations (~> 3.11.0)
-      rspec-mocks (~> 3.11.0)
-    rspec-core (3.11.0)
-      rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.0)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.0)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.1)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.0)
-    simple_po_parser (1.1.6)
-    sixarm_ruby_unaccent (1.2.0)
-    sort_alphabetical (1.1.0)
-      unicode_utils (>= 1.2.2)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
     thor (1.2.1)
-    tzinfo (2.0.4)
-      concurrent-ruby (~> 1.0)
-    unicode_utils (1.4.0)
-    zeitwerk (2.5.4)
+    thread_safe (0.3.6)
+    tzinfo (1.2.10)
+      thread_safe (~> 0.1)
+    unaccent (0.4.0)
+    zeitwerk (2.6.6)
 
 PLATFORMS
-  x86_64-darwin-21
+  x86_64-darwin-22
   x86_64-linux
 
 DEPENDENCIES
-  actionpack (~> 6.0)
+  actionpack (~> 6.0.0)
   country_select!
+  nokogiri (= 1.14.0.rc1)
   pry (~> 0)
-  railties (~> 6.0)
+  railties (~> 6.0.0)
   rake (~> 13)
   rspec (~> 3)
 
 BUNDLED WITH
-   2.3.10
+   2.4.2

data/gemfiles/actionpack-6.1.gemfile

@@ -2,5 +2,6 @@ source "https://rubygems.org"
 
 gemspec :path => "../"
 
-gem "railties", "~> 6.1"
-gem "actionpack", "~> 6.1"
+gem "railties", "~> 6.1.0"
+gem "actionpack", "~> 6.1.0"
+gem 'nokogiri', '= 1.14.0.rc1'

data/gemfiles/actionpack-6.1.gemfile.lock

@@ -1,27 +1,26 @@
 PATH
   remote: ..
   specs:
-    country_select (7.0.0)
+    country_select (8.0.1)
       countries (~> 5.0)
-      sort_alphabetical (~> 1.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (6.1.4.6)
-      actionview (= 6.1.4.6)
-      activesupport (= 6.1.4.6)
+    actionpack (6.1.7)
+      actionview (= 6.1.7)
+      activesupport (= 6.1.7)
       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.4.6)
-      activesupport (= 6.1.4.6)
+    actionview (6.1.7)
+      activesupport (= 6.1.7)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activesupport (6.1.4.6)
+    activesupport (6.1.7)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -30,78 +29,72 @@ GEM
     builder (3.2.4)
     coderay (1.1.3)
     concurrent-ruby (1.1.10)
-    countries (5.0.0)
-      i18n_data (~> 0.16.0)
-      sixarm_ruby_unaccent (~> 1.1)
+    countries (5.3.0)
+      unaccent (~> 0.3)
     crass (1.0.6)
     diff-lcs (1.5.0)
-    erubi (1.10.0)
-    i18n (1.10.0)
+    erubi (1.12.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    i18n_data (0.16.0)
-      simple_po_parser (~> 1.1)
-    loofah (2.16.0)
+    loofah (2.19.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     method_source (1.0.0)
-    minitest (5.15.0)
-    nokogiri (1.13.3-x86_64-darwin)
+    minitest (5.17.0)
+    nokogiri (1.14.0.rc1-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.13.3-x86_64-linux)
+    nokogiri (1.14.0.rc1-x86_64-linux)
       racc (~> 1.4)
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    racc (1.6.0)
-    rack (2.2.3)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
+    racc (1.6.2)
+    rack (2.2.5)
+    rack-test (2.0.2)
+      rack (>= 1.3)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.2)
-      loofah (~> 2.3)
-    railties (6.1.4.6)
-      actionpack (= 6.1.4.6)
-      activesupport (= 6.1.4.6)
+    rails-html-sanitizer (1.4.4)
+      loofah (~> 2.19, >= 2.19.1)
+    railties (6.1.7)
+      actionpack (= 6.1.7)
+      activesupport (= 6.1.7)
       method_source
-      rake (>= 0.13)
+      rake (>= 12.2)
       thor (~> 1.0)
     rake (13.0.6)
-    rspec (3.11.0)
-      rspec-core (~> 3.11.0)
-      rspec-expectations (~> 3.11.0)
-      rspec-mocks (~> 3.11.0)
-    rspec-core (3.11.0)
-      rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.0)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.0)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.1)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.0)
-    simple_po_parser (1.1.6)
-    sixarm_ruby_unaccent (1.2.0)
-    sort_alphabetical (1.1.0)
-      unicode_utils (>= 1.2.2)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
     thor (1.2.1)
-    tzinfo (2.0.4)
+    tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
-    unicode_utils (1.4.0)
-    zeitwerk (2.5.4)
+    unaccent (0.4.0)
+    zeitwerk (2.6.6)
 
 PLATFORMS
-  x86_64-darwin-21
+  x86_64-darwin-22
   x86_64-linux
 
 DEPENDENCIES
-  actionpack (~> 6.1)
+  actionpack (~> 6.1.0)
   country_select!
+  nokogiri (= 1.14.0.rc1)
   pry (~> 0)
-  railties (~> 6.1)
+  railties (~> 6.1.0)
   rake (~> 13)
   rspec (~> 3)
 
 BUNDLED WITH
-   2.3.10
+   2.4.2

data/gemfiles/actionpack-7.0.gemfile

@@ -2,5 +2,6 @@ source "https://rubygems.org"
 
 gemspec :path => "../"
 
-gem "railties", "~> 7.0"
-gem "actionpack", "~> 7.0"
+gem "railties", "~> 7.0.0"
+gem "actionpack", "~> 7.0.0"
+gem 'nokogiri', '= 1.14.0.rc1'

data/gemfiles/actionpack-7.0.gemfile.lock

@@ -1,27 +1,26 @@
 PATH
   remote: ..
   specs:
-    country_select (7.0.0)
+    country_select (8.0.1)
       countries (~> 5.0)
-      sort_alphabetical (~> 1.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (7.0.2.3)
-      actionview (= 7.0.2.3)
-      activesupport (= 7.0.2.3)
+    actionpack (7.0.4)
+      actionview (= 7.0.4)
+      activesupport (= 7.0.4)
       rack (~> 2.0, >= 2.2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (7.0.2.3)
-      activesupport (= 7.0.2.3)
+    actionview (7.0.4)
+      activesupport (= 7.0.4)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activesupport (7.0.2.3)
+    activesupport (7.0.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -29,79 +28,73 @@ GEM
     builder (3.2.4)
     coderay (1.1.3)
     concurrent-ruby (1.1.10)
-    countries (5.0.0)
-      i18n_data (~> 0.16.0)
-      sixarm_ruby_unaccent (~> 1.1)
+    countries (5.3.0)
+      unaccent (~> 0.3)
     crass (1.0.6)
     diff-lcs (1.5.0)
-    erubi (1.10.0)
-    i18n (1.10.0)
+    erubi (1.12.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    i18n_data (0.16.0)
-      simple_po_parser (~> 1.1)
-    loofah (2.16.0)
+    loofah (2.19.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     method_source (1.0.0)
-    minitest (5.15.0)
-    nokogiri (1.13.3-x86_64-darwin)
+    minitest (5.17.0)
+    nokogiri (1.14.0.rc1-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.13.3-x86_64-linux)
+    nokogiri (1.14.0.rc1-x86_64-linux)
       racc (~> 1.4)
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    racc (1.6.0)
-    rack (2.2.3)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
+    racc (1.6.2)
+    rack (2.2.5)
+    rack-test (2.0.2)
+      rack (>= 1.3)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.2)
-      loofah (~> 2.3)
-    railties (7.0.2.3)
-      actionpack (= 7.0.2.3)
-      activesupport (= 7.0.2.3)
+    rails-html-sanitizer (1.4.4)
+      loofah (~> 2.19, >= 2.19.1)
+    railties (7.0.4)
+      actionpack (= 7.0.4)
+      activesupport (= 7.0.4)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
       zeitwerk (~> 2.5)
     rake (13.0.6)
-    rspec (3.11.0)
-      rspec-core (~> 3.11.0)
-      rspec-expectations (~> 3.11.0)
-      rspec-mocks (~> 3.11.0)
-    rspec-core (3.11.0)
-      rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.0)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.0)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.1)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.0)
-    simple_po_parser (1.1.6)
-    sixarm_ruby_unaccent (1.2.0)
-    sort_alphabetical (1.1.0)
-      unicode_utils (>= 1.2.2)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
     thor (1.2.1)
-    tzinfo (2.0.4)
+    tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
-    unicode_utils (1.4.0)
-    zeitwerk (2.5.4)
+    unaccent (0.4.0)
+    zeitwerk (2.6.6)
 
 PLATFORMS
-  x86_64-darwin-21
+  x86_64-darwin-22
   x86_64-linux
 
 DEPENDENCIES
-  actionpack (~> 7.0)
+  actionpack (~> 7.0.0)
   country_select!
+  nokogiri (= 1.14.0.rc1)
   pry (~> 0)
-  railties (~> 7.0)
+  railties (~> 7.0.0)
   rake (~> 13)
   rspec (~> 3)
 
 BUNDLED WITH
-   2.3.10
+   2.4.2

data/lib/country_select/country_select_helper.rb

@@ -6,6 +6,11 @@ module ActionView
           html_options = options
           options = priority_or_options
         else
+          if RUBY_VERSION =~ /^3\.\d\.\d/
+            warn "DEPRECATION WARNING: Setting priority countries with the 1.x syntax is deprecated. Please use the `priority_countries:` option.", uplevel: 1, category: :deprecated
+          else
+            warn "DEPRECATION WARNING: Setting priority countries with the 1.x syntax is deprecated. Please use the `priority_countries:` option.", uplevel: 1
+          end
           options[:priority_countries] = priority_or_options
         end
 

data/lib/country_select/defaults.rb

@@ -5,6 +5,7 @@ module CountrySelect
     locale: nil,
     only: nil,
     priority_countries: nil,
-    priority_countries_divider: "-" * 15
+    priority_countries_divider: "-" * 15,
+    sort_provided: true
   }
 end

data/lib/country_select/tag_helper.rb

@@ -19,7 +19,7 @@ module CountrySelect
       }
 
       if priority_countries.present?
-        priority_countries_options = country_options_for(priority_countries, false)
+        priority_countries_options = country_options_for(priority_countries, @options.fetch(:sort_provided, ::CountrySelect::DEFAULTS[:sort_provided]))
 
         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)
@@ -59,19 +59,18 @@ module CountrySelect
     end
 
     def country_options
-      country_options_for(all_country_codes, true)
-    end
-
-    def all_country_codes
-      codes = ISO3166::Country.codes
-
       if only_country_codes.present?
-        codes & only_country_codes
+        codes = only_country_codes & ISO3166::Country.codes
+        sort = @options.fetch(:sort_provided, ::CountrySelect::DEFAULTS[:sort_provided])
       elsif except_country_codes.present?
-        codes - except_country_codes
+        codes = ISO3166::Country.codes - except_country_codes
+        sort = true
       else
-        codes
+        codes = ISO3166::Country.codes
+        sort = true
       end
+
+      country_options_for(codes, sort)
     end
 
     def country_options_for(country_codes, sorted=true)
@@ -99,11 +98,7 @@ module CountrySelect
         end
 
         if sorted
-          if country_list.respond_to?(:sort_alphabetical)
-            country_list.sort_alphabetical
-          else
-            country_list.sort
-          end
+          country_list.sort_by { |name, code| [I18n.transliterate(name), name] }
         else
           country_list
         end

data/lib/country_select/version.rb

@@ -1,3 +1,3 @@
 module CountrySelect
-  VERSION = '7.0.0'
+  VERSION = '8.0.1'
 end

data/lib/country_select.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 require 'countries'
-require 'sort_alphabetical'
 
 require 'country_select/version'
 require 'country_select/defaults'

data/spec/country_select_spec.rb

@@ -92,9 +92,26 @@ describe "CountrySelect" do
   it "accepts priority countries" do
     tag = options_for_select(
       [
+        ['Denmark', 'DK'],
         ['Latvia','LV'],
         ['United States','US'],
+        ['-'*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 "priority countries are sorted by name by default" do
+    tag = options_for_select(
+      [
         ['Denmark', 'DK'],
+        ['Latvia','LV'],
+        ['United States','US'],
         ['-'*15,'-'*15]
       ],
       selected: 'US',
@@ -106,6 +123,41 @@ describe "CountrySelect" do
     expect(t).to include(tag)
   end
 
+  it "priority countries with `sort_provided: false` preserves the provided order" do
+    tag = options_for_select(
+      [
+        ['Latvia','LV'],
+        ['United States','US'],
+        ['Denmark', 'DK'],
+        ['-'*15,'-'*15]
+      ],
+      selected: 'US',
+      disabled: '-'*15
+    )
+
+    walrus.country_code = 'US'
+    t = builder.country_select(:country_code, priority_countries: ['LV','US','DK'], sort_provided: false)
+    expect(t).to include(tag)
+  end
+
+  it "priority countries with `sort_provided: false` still sorts the non-priority countries by name" do
+    tag = options_for_select(
+      [
+        ['Latvia','LV'],
+        ['United States','US'],
+        ['Denmark', 'DK'],
+        ['-'*15,'-'*15],
+        ['Afghanistan','AF']
+      ],
+      selected: 'AF',
+      disabled: '-'*15
+    )
+
+    walrus.country_code = 'AF'
+    t = builder.country_select(:country_code, priority_countries: ['LV','US','DK'], sort_provided: false)
+    expect(t).to include(tag)
+  end
+
   describe "when selected options is not an array" do
     it "selects only the first matching option" do
       tag = options_for_select([["United States", "US"],["Uruguay", "UY"]], "US")
@@ -139,6 +191,18 @@ describe "CountrySelect" do
     expect(t).to_not include(tag)
   end
 
+  it "countries provided in `only` are sorted by name by default" do
+    t = builder.country_select(:country_code, only: ['PT','DE','AR'])
+    order = t.scan(/value="(\w{2})"/).map { |o| o[0] }
+    expect(order).to eq(['AR', 'DE', 'PT'])
+  end
+
+  it "countries provided in `only` with `sort_provided` to false keeps the order of the provided countries" do
+    t = builder.country_select(:country_code, only: ['PT','DE','AR'], sort_provided: false)
+    order = t.scan(/value="(\w{2})"/).map { |o| o[0] }
+    expect(order).to eq(['PT','DE','AR'])
+  end
+
   context "when there is a default 'except' configured" do
     around do |example|
       old_value = ::CountrySelect::DEFAULTS[:except]
@@ -160,9 +224,9 @@ describe "CountrySelect" do
     it "accepts priority countries" do
       tag = options_for_select(
         [
+          ['Denmark', 'DK'],
           ['Latvia','LV'],
           ['United States','US'],
-          ['Denmark', 'DK'],
           ['-'*15,'-'*15]
         ],
         selected: 'US',
@@ -235,23 +299,6 @@ describe "CountrySelect" do
     expect(order).to eq(['AF', 'AX', 'AL', 'ZW'])
   end
 
-  context "without sort_alphabetical" do
-    before do
-      Enumerable.send(:alias_method, :_sort_alphabetical, :sort_alphabetical)
-      Enumerable.send(:remove_method, :sort_alphabetical)
-    end
-
-    after do
-      Enumerable.send(:alias_method, :sort_alphabetical, :_sort_alphabetical)
-    end
-
-    it 'falls back to regular sort' do
-      tag = builder.country_select(:country_code, only: ['AX', 'AL', 'AF', 'ZW'])
-      order = tag.scan(/value="(\w{2})"/).map { |o| o[0] }
-      expect(order).to eq(['AF', 'AL', 'ZW', 'AX'])
-    end
-  end
-
   describe "custom formats" do
     it "accepts a custom formatter" do
       ::CountrySelect::FORMATS[:with_alpha2] = lambda do |country|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: country_select
 version: !ruby/object:Gem::Version
-  version: 7.0.0
+  version: 8.0.1
 platform: ruby
 authors:
 - Stefan Penner
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-03 00:00:00.000000000 Z
+date: 2023-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -80,20 +80,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: sort_alphabetical
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
 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.
@@ -123,15 +109,12 @@ files:
 - gemfiles/actionpack-6.1.gemfile.lock
 - gemfiles/actionpack-7.0.gemfile
 - gemfiles/actionpack-7.0.gemfile.lock
-- gemfiles/actionpack-head.gemfile
-- gemfiles/actionpack-head.gemfile.lock
 - lib/country_select.rb
 - lib/country_select/country_select_helper.rb
 - lib/country_select/defaults.rb
 - lib/country_select/formats.rb
 - lib/country_select/tag_helper.rb
 - lib/country_select/version.rb
-- lib/country_select_without_sort_alphabetical.rb
 - spec/country_select_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/countries/country_select
@@ -156,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.2
 signing_key:
 specification_version: 4
 summary: Country Select Plugin

data/gemfiles/actionpack-head.gemfile

@@ -1,9 +0,0 @@
-source "https://rubygems.org"
-
-gemspec :path => "../"
-
-git "https://github.com/rails/rails.git" do
-  gem "actionpack"
-  gem "actionview"
-  gem "activesupport"
-end

data/gemfiles/actionpack-head.gemfile.lock

@@ -1,104 +0,0 @@
-GIT
-  remote: https://github.com/rails/rails.git
-  revision: bb4a8a91884f3eff2b22d4deb3727d3cc267ddc4
-  specs:
-    actionpack (7.1.0.alpha)
-      actionview (= 7.1.0.alpha)
-      activesupport (= 7.1.0.alpha)
-      rack (~> 2.0, >= 2.2.0)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (7.1.0.alpha)
-      activesupport (= 7.1.0.alpha)
-      builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activesupport (7.1.0.alpha)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      tzinfo (~> 2.0)
-
-PATH
-  remote: ..
-  specs:
-    country_select (7.0.0)
-      countries (~> 5.0)
-      sort_alphabetical (~> 1.1)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    builder (3.2.4)
-    coderay (1.1.3)
-    concurrent-ruby (1.1.10)
-    countries (5.0.0)
-      i18n_data (~> 0.16.0)
-      sixarm_ruby_unaccent (~> 1.1)
-    crass (1.0.6)
-    diff-lcs (1.5.0)
-    erubi (1.10.0)
-    i18n (1.10.0)
-      concurrent-ruby (~> 1.0)
-    i18n_data (0.16.0)
-      simple_po_parser (~> 1.1)
-    loofah (2.16.0)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    method_source (1.0.0)
-    minitest (5.15.0)
-    nokogiri (1.13.3-x86_64-darwin)
-      racc (~> 1.4)
-    nokogiri (1.13.3-x86_64-linux)
-      racc (~> 1.4)
-    pry (0.14.1)
-      coderay (~> 1.1)
-      method_source (~> 1.0)
-    racc (1.6.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.4.2)
-      loofah (~> 2.3)
-    rake (13.0.6)
-    rspec (3.11.0)
-      rspec-core (~> 3.11.0)
-      rspec-expectations (~> 3.11.0)
-      rspec-mocks (~> 3.11.0)
-    rspec-core (3.11.0)
-      rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.0)
-    simple_po_parser (1.1.6)
-    sixarm_ruby_unaccent (1.2.0)
-    sort_alphabetical (1.1.0)
-      unicode_utils (>= 1.2.2)
-    tzinfo (2.0.4)
-      concurrent-ruby (~> 1.0)
-    unicode_utils (1.4.0)
-
-PLATFORMS
-  x86_64-darwin-21
-  x86_64-linux
-
-DEPENDENCIES
-  actionpack!
-  actionview!
-  activesupport!
-  country_select!
-  pry (~> 0)
-  rake (~> 13)
-  rspec (~> 3)
-
-BUNDLED WITH
-   2.3.10

data/lib/country_select_without_sort_alphabetical.rb

@@ -1,9 +0,0 @@
-# encoding: utf-8
-
-require 'countries'
-
-require 'country_select/version'
-require 'country_select/defaults'
-require 'country_select/formats'
-require 'country_select/tag_helper'
-require 'country_select/country_select_helper'