country_select 6.1.0 → 8.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71ba22546abd291ceafd67c542882513e11e5778a0cf4e51e0afbfbd8d89e8ad
-  data.tar.gz: 3d7d7c6cac8302237b651ef47ce0344cb337da19f240cc674e223238099eaa70
+  metadata.gz: c2e998f6961d73f6b512f6f2a8346f5f1b971b2fd48795772b9f2553970c2a7d
+  data.tar.gz: 72ecc080ff6e7c161d7e09686b170363fc29be7090e2541c41be0c8ab10ffde9
 SHA512:
-  metadata.gz: 599f0e30a41591ded1d11103887341ad9c374250eeee5a6f3e7a6a86f5fb5fa4178a0acdba62ea187527ba9dc1c2c2b08a34bccd3a73534d6717adafe7816981
-  data.tar.gz: 37cd7561ad08e569fa3133fcb9e740dce8dcef6c44cebbc26f6348808515e884af430073d5a911482df9695f7ec5867af28ddb4b5c1c578c5eb32dfadfbec470
+  metadata.gz: f69921ae492051bdad6a71fab965e03c71f6446e4fbeb6da5b583b5d70d2136302f7eb726aca6fb6e1a803491855fa94928b28face16161f44437dbe93c23e09
+  data.tar.gz: 87530ffdd430818801590107cdf6314cc32deb8f1ec42444ce4e0f8848c4a175934e7e4dac3c495d16b66633e7d819422297213d120014aabefb646b5b9639f0

data/.github/workflows/build.yml

@@ -12,13 +12,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [2.6, 2.7, '3.0', 3.1]
+        ruby: [2.7, '3.0', 3.1]
         gemfile: [5.2, '6.0', 6.1, '7.0']
-        exclude:
-          - ruby: 2.6
-            gemfile: head
-          - ruby: 2.6
-            gemfile: '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:

data/.github/workflows/codeql-analysis.yml

@@ -0,0 +1,70 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master ]
+  schedule:
+    - cron: '21 7 * * 5'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'ruby' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://git.io/codeql-language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+## 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)
+ * #201 - Upgrade countries gem to 5.0.0 (@pmor)
+
+## 6.1.1 2022-01-20
+
+  * #195 - Fix deprecation warning on find_by_name (@filipemendespi)
+
 ## 6.1.0 2022-01-16
 
   * #190 - Upgrade to countries 4.2 (@pmor)

data/Gemfile.lock

@@ -1,92 +1,79 @@
 PATH
   remote: .
   specs:
-    country_select (6.1.0)
-      countries (~> 4.2)
-      sort_alphabetical (~> 1.1)
+    country_select (7.0.0)
+      countries (~> 5.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (7.0.1)
-      actionview (= 7.0.1)
-      activesupport (= 7.0.1)
+    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.1)
-      activesupport (= 7.0.1)
+    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.1)
+    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.9)
-    countries (4.2.1)
-      i18n_data (~> 0.15.0)
+    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.8.11)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
-    i18n_data (0.15.0)
-      simple_po_parser (~> 1.1)
-    loofah (2.13.0)
+    loofah (2.18.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     method_source (1.0.0)
-    mini_portile2 (2.7.1)
-    minitest (5.15.0)
-    nokogiri (1.13.1)
-      mini_portile2 (~> 2.7.0)
-      racc (~> 1.4)
-    nokogiri (1.13.1-x86_64-linux)
+    minitest (5.16.1)
+    nokogiri (1.13.6-x86_64-darwin)
       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)
+    rack (2.2.3.1)
+    rack-test (2.0.0)
+      rack (>= 1.3)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.2)
+    rails-html-sanitizer (1.4.3)
       loofah (~> 2.3)
     rake (13.0.6)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.2)
+    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.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.3)
-    simple_po_parser (1.1.5)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
     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
-  ruby
-  x86_64-linux
+  x86_64-darwin-21
 
 DEPENDENCIES
   actionpack (~> 7.0)
@@ -96,4 +83,4 @@ DEPENDENCIES
   rspec (~> 3)
 
 BUNDLED WITH
-   2.3.3
+   2.3.10

data/README.md

@@ -1,5 +1,8 @@
 # Rails – Country Select
-[![build](https://github.com/stefanpenner/country_select/actions/workflows/build.yml/badge.svg)](https://github.com/stefanpenner/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)
+
 
 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).
@@ -14,7 +17,7 @@ to evaluate the suitability of this list given their user base.
 
 ## Reporting issues
 
-Open an issue on the [issue tracker](https://github.com/stefanpenner/country_select/issues/new). Ideally provide versions used, and code example that demonstrates the issue.
+Open an issue on the [issue tracker](https://github.com/countries/country_select/issues/new). Ideally provide versions used, and code example that demonstrates the issue.
 
 ## Installation
 
@@ -54,13 +57,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:
@@ -177,7 +184,7 @@ class User < ActiveRecord::Base
   # (usually English) name if no translation is available
   def country_name
     country = ISO3166::Country[country_code]
-    country.translations[I18n.locale.to_s] || country.iso_short_name
+    country.translations[I18n.locale.to_s] || country.common_name || country.iso_short_name
   end
 
 end

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.exists? 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

@@ -8,22 +8,25 @@ Gem::Specification.new do |s|
   s.licenses    = ['MIT']
   s.authors     = ['Stefan Penner']
   s.email       = ['stefan.penner@gmail.com']
-  s.homepage    = 'https://github.com/stefanpenner/country_select'
+  s.homepage    = 'https://github.com/countries/country_select'
   s.summary     = %q{Country Select Plugin}
   s.description = %q{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.}
 
+  s.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' }
+
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ['lib']
 
-  s.required_ruby_version = '>= 2.5'
+  s.required_ruby_version = '>= 2.7'
 
   s.add_development_dependency 'actionpack', '~> 7.0'
   s.add_development_dependency 'pry', '~> 0'
   s.add_development_dependency 'rake', '~> 13'
   s.add_development_dependency 'rspec', '~> 3'
 
-  s.add_dependency 'countries', '~> 4.2'
-  s.add_dependency 'sort_alphabetical', '~> 1.1'
+  s.add_dependency 'countries', '~> 5.0'
 end

data/gemfiles/actionpack-5.2.gemfile

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

data/gemfiles/actionpack-5.2.gemfile.lock

@@ -1,111 +1,98 @@
 PATH
   remote: ..
   specs:
-    country_select (6.1.0)
-      countries (~> 4.2)
-      sort_alphabetical (~> 1.1)
+    country_select (7.0.0)
+      countries (~> 5.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (5.2.6)
-      actionview (= 5.2.6)
-      activesupport (= 5.2.6)
+    actionpack (5.2.8)
+      actionview (= 5.2.8)
+      activesupport (= 5.2.8)
       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.6)
-      activesupport (= 5.2.6)
+    actionview (5.2.8)
+      activesupport (= 5.2.8)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activesupport (5.2.6)
+    activesupport (5.2.8)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     builder (3.2.4)
     coderay (1.1.3)
-    concurrent-ruby (1.1.9)
-    countries (4.2.1)
-      i18n_data (~> 0.15.0)
+    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.8.11)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
-    i18n_data (0.15.0)
-      simple_po_parser (~> 1.1)
-    loofah (2.13.0)
+    loofah (2.18.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     method_source (1.0.0)
-    mini_portile2 (2.7.1)
-    minitest (5.15.0)
-    nokogiri (1.13.1)
-      mini_portile2 (~> 2.7.0)
+    minitest (5.16.1)
+    nokogiri (1.13.6-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.13.1-arm64-darwin)
-      racc (~> 1.4)
-    nokogiri (1.13.1-x86_64-linux)
+    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)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
+    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.2)
+    rails-html-sanitizer (1.4.3)
       loofah (~> 2.3)
-    railties (5.2.6)
-      actionpack (= 5.2.6)
-      activesupport (= 5.2.6)
+    railties (5.2.8)
+      actionpack (= 5.2.8)
+      activesupport (= 5.2.8)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
     rake (13.0.6)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.2)
+    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.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.3)
-    simple_po_parser (1.1.5)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
     sixarm_ruby_unaccent (1.2.0)
-    sort_alphabetical (1.1.0)
-      unicode_utils (>= 1.2.2)
     thor (1.2.1)
     thread_safe (0.3.6)
     tzinfo (1.2.9)
       thread_safe (~> 0.1)
-    unicode_utils (1.4.0)
 
 PLATFORMS
-  arm64-darwin-21
-  ruby
+  x86_64-darwin-21
   x86_64-linux
 
 DEPENDENCIES
-  actionpack (~> 5.2)
+  actionpack (~> 5.2.0)
   country_select!
   pry (~> 0)
-  railties (~> 5.2)
+  railties (~> 5.2.0)
   rake (~> 13)
   rspec (~> 3)
 
 BUNDLED WITH
-   2.3.3
+   2.3.10

data/gemfiles/actionpack-6.0.gemfile

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