country_select 6.0.0 → 8.0.0

data/gemfiles/actionpack-6.1.gemfile.lock

@@ -0,0 +1,99 @@
+PATH
+  remote: ..
+  specs:
+    country_select (7.0.0)
+      countries (~> 5.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionpack (6.1.6)
+      actionview (= 6.1.6)
+      activesupport (= 6.1.6)
+      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.6)
+      activesupport (= 6.1.6)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activesupport (6.1.6)
+      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.10)
+    countries (5.1.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)
+    loofah (2.18.0)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    method_source (1.0.0)
+    minitest (5.16.1)
+    nokogiri (1.13.6-x86_64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.13.6-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.1)
+    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.3)
+      loofah (~> 2.3)
+    railties (6.1.6)
+      actionpack (= 6.1.6)
+      activesupport (= 6.1.6)
+      method_source
+      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)
+      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)
+    sixarm_ruby_unaccent (1.2.0)
+    thor (1.2.1)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    zeitwerk (2.6.0)
+
+PLATFORMS
+  x86_64-darwin-21
+  x86_64-linux
+
+DEPENDENCIES
+  actionpack (~> 6.1.0)
+  country_select!
+  pry (~> 0)
+  railties (~> 6.1.0)
+  rake (~> 13)
+  rspec (~> 3)
+
+BUNDLED WITH
+   2.3.10

data/gemfiles/actionpack-7.0.gemfile

@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+
+gemspec :path => "../"
+
+gem "railties", "~> 7.0.0"
+gem "actionpack", "~> 7.0.0"

data/gemfiles/actionpack-7.0.gemfile.lock

@@ -0,0 +1,99 @@
+PATH
+  remote: ..
+  specs:
+    country_select (7.0.0)
+      countries (~> 5.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionpack (7.0.3)
+      actionview (= 7.0.3)
+      activesupport (= 7.0.3)
+      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.3)
+      activesupport (= 7.0.3)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activesupport (7.0.3)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+    builder (3.2.4)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.10)
+    countries (5.1.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)
+    loofah (2.18.0)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    method_source (1.0.0)
+    minitest (5.16.1)
+    nokogiri (1.13.6-x86_64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.13.6-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.1)
+    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.3)
+      loofah (~> 2.3)
+    railties (7.0.3)
+      actionpack (= 7.0.3)
+      activesupport (= 7.0.3)
+      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)
+      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)
+    sixarm_ruby_unaccent (1.2.0)
+    thor (1.2.1)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    zeitwerk (2.6.0)
+
+PLATFORMS
+  x86_64-darwin-21
+  x86_64-linux
+
+DEPENDENCIES
+  actionpack (~> 7.0.0)
+  country_select!
+  pry (~> 0)
+  railties (~> 7.0.0)
+  rake (~> 13)
+  rspec (~> 3)
+
+BUNDLED WITH
+   2.3.10

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/formats.rb

@@ -4,6 +4,6 @@ module CountrySelect
   FORMATS[:default] = lambda do |country|
     # Need to use :[] specifically, not :dig, because country.translations is a
     # ISO3166::Translations object, which overrides :[] to support i18n locale fallbacks
-    country.translations&.send(:[], I18n.locale.to_s) || country.name
+    country.translations&.send(:[], I18n.locale.to_s) || country.common_name || country.iso_short_name
   end
 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,14 +59,14 @@ module CountrySelect
     end
 
     def country_options
-      country_options_for(all_country_codes, true)
+      country_options_for(all_country_codes, @options.fetch(:sort_provided, ::CountrySelect::DEFAULTS[:sort_provided]))
     end
 
     def all_country_codes
       codes = ISO3166::Country.codes
 
       if only_country_codes.present?
-        codes & only_country_codes
+        only_country_codes & codes
       elsif except_country_codes.present?
         codes - except_country_codes
       else
@@ -79,9 +79,8 @@ module CountrySelect
         country_list = country_codes.map do |code_or_name|
           if country = ISO3166::Country.new(code_or_name)
             code = country.alpha2
-          elsif country = ISO3166::Country.find_by_name(code_or_name)
-            code = country.first
-            country = ISO3166::Country.new(code)
+          elsif country = ISO3166::Country.find_country_by_any_name(code_or_name)
+            code = country.alpha2
           end
 
           unless country.present?
@@ -100,11 +99,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 = '6.0.0'
+  VERSION = '8.0.0'
 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,23 @@ 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
+
   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 +173,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 +206,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,27 +281,10 @@ 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|
-        "#{country.name} (#{country.alpha2})"
+        "#{country.iso_short_name} (#{country.alpha2})"
       end
 
       tag = options_for_select([['United States of America (US)', 'US']], 'US')
@@ -267,7 +296,7 @@ describe "CountrySelect" do
 
     it "accepts an array for formatter" do
       ::CountrySelect::FORMATS[:with_alpha3] = lambda do |country|
-        [country.name, country.alpha3]
+        [country.iso_short_name, country.alpha3]
       end
 
       tag = options_for_select([['United States of America', 'USA']], 'USA')
@@ -278,7 +307,7 @@ describe "CountrySelect" do
 
     it "accepts an array for formatter + custom formatter" do
       ::CountrySelect::FORMATS[:with_alpha3] = lambda do |country|
-        ["#{country.name} (#{country.alpha2})", country.alpha3]
+        ["#{country.iso_short_name} (#{country.alpha2})", country.alpha3]
       end
 
       tag = options_for_select([['United States of America (US)', 'USA']], 'USA')
@@ -289,7 +318,7 @@ describe "CountrySelect" do
 
     it "marks priority countries as selected only once" do
       ::CountrySelect::FORMATS[:with_alpha3] = lambda do |country|
-        [country.name, country.alpha3]
+        [country.iso_short_name, country.alpha3]
       end
 
       tag = options_for_select([['United States of America', 'USA']], 'USA')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: country_select
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 8.0.0
 platform: ruby
 authors:
 - Stefan Penner
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-28 00:00:00.000000000 Z
+date: 2022-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -66,48 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
-- !ruby/object:Gem::Dependency
-  name: wwtd
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
 - !ruby/object:Gem::Dependency
   name: countries
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: sort_alphabetical
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '5.0'
 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.
@@ -117,9 +89,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/build.yml"
+- ".github/workflows/codeql-analysis.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -128,28 +101,30 @@ files:
 - Rakefile
 - UPGRADING.md
 - country_select.gemspec
-- gemfiles/actionpack.edge.gemfile
-- gemfiles/actionpack.edge.gemfile.lock
-- gemfiles/actionpack5.2.gemfile
-- gemfiles/actionpack5.2.gemfile.lock
-- gemfiles/actionpack6.0.gemfile
-- gemfiles/actionpack6.0.gemfile.lock
-- gemfiles/actionpack6.1.gemfile
-- gemfiles/actionpack6.1.gemfile.lock
+- gemfiles/actionpack-5.2.gemfile
+- gemfiles/actionpack-5.2.gemfile.lock
+- gemfiles/actionpack-6.0.gemfile
+- gemfiles/actionpack-6.0.gemfile.lock
+- gemfiles/actionpack-6.1.gemfile
+- gemfiles/actionpack-6.1.gemfile.lock
+- gemfiles/actionpack-7.0.gemfile
+- gemfiles/actionpack-7.0.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/stefanpenner/country_select
+homepage: https://github.com/countries/country_select
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  bug_tracker_uri: http://github.com/countries/country_select/issues
+  changelog_uri: https://github.com/countries/country_select/blob/master/CHANGELOG.md
+  source_code_uri: https://github.com/countries/country_select
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -157,15 +132,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.13
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Country Select Plugin
 test_files:

data/.travis.yml

@@ -1,23 +0,0 @@
-os: linux
-cache: bundler
-language: ruby
-bundler_args: ""
-rvm:
-  - "2.5"
-  - "2.6"
-  - "2.7"
-  - "3.0"
-  - ruby-head
-gemfile:
-  - gemfiles/actionpack5.2.gemfile
-  - gemfiles/actionpack6.0.gemfile
-  - gemfiles/actionpack6.1.gemfile
-  - gemfiles/actionpack.edge.gemfile
-jobs:
-  exclude:
-    - rvm: "2.5"
-      gemfile: gemfiles/actionpack.edge.gemfile
-    - rvm: "2.6"
-      gemfile: gemfiles/actionpack.edge.gemfile
-  allow_failures:
-    - rvm: ruby-head

data/gemfiles/actionpack.edge.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