country_select 8.0.0 → 8.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2e998f6961d73f6b512f6f2a8346f5f1b971b2fd48795772b9f2553970c2a7d
-  data.tar.gz: 72ecc080ff6e7c161d7e09686b170363fc29be7090e2541c41be0c8ab10ffde9
+  metadata.gz: b0ab413cfc742ffce2e82b682f27a55857426b0ddfa7f3c8aa8b5d1ffb1714a7
+  data.tar.gz: 42cf3f9594fd3c9a1dc60856c9374937f9903e9f515348e7bf53952c84d1128f
 SHA512:
-  metadata.gz: f69921ae492051bdad6a71fab965e03c71f6446e4fbeb6da5b583b5d70d2136302f7eb726aca6fb6e1a803491855fa94928b28face16161f44437dbe93c23e09
-  data.tar.gz: 87530ffdd430818801590107cdf6314cc32deb8f1ec42444ce4e0f8848c4a175934e7e4dac3c495d16b66633e7d819422297213d120014aabefb646b5b9639f0
+  metadata.gz: 6eb1c29bef6dd596bbc38233cf41472293c49027fc9b226b70895e26c8aed0af5d055d9ad4af4ed51cda6c186b47f129327dabb3cefb57b191ddaf7116f58ce1
+  data.tar.gz: 87f2779bd161ca535964364f75afe4eb1ddd064e18628e9901ba01dfaf6a28893de2c7944dfb69ff8e77cc1b3e8f59b60bead3e678999909ed26d21e79620b8d

data/.codeclimate.yml

@@ -0,0 +1,61 @@
+version: "2"
+checks:
+  argument-count:
+    enabled: true
+    config:
+      threshold: 4
+  complex-logic:
+    enabled: true
+    config:
+      threshold: 4
+  file-lines:
+    enabled: true
+    config:
+      threshold: 250
+  method-complexity:
+    enabled: true
+    config:
+      threshold: 5
+  method-count:
+    enabled: true
+    config:
+      threshold: 20
+  method-lines:
+    enabled: true
+    config:
+      threshold: 25
+  nested-control-flow:
+    enabled: true
+    config:
+      threshold: 4
+  return-statements:
+    enabled: true
+    config:
+      threshold: 4
+plugins:
+  rubocop:
+    enabled: true
+    channel: rubocop-1-48-1
+  reek:
+    enabled: true
+    checks:
+      IrresponsibleModule:
+        enabled: false
+      TooManyStatements:
+        max_statements: 7
+  flog:
+    enabled: true
+  bundler-audit:
+    enabled: true
+exclude_patterns:
+- "config/"
+- "db/"
+- "dist/"
+- "features/"
+- "**/node_modules/"
+- "script/"
+- "**/spec/"
+- "**/test/"
+- "**/tests/"
+- "**/vendor/"
+- "**/*.d.ts"

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

@@ -42,7 +42,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v2
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -53,7 +53,7 @@ jobs:
     # 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
+      uses: github/codeql-action/autobuild@v2
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -67,4 +67,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2

data/.github/workflows/test.yml

@@ -0,0 +1,36 @@
+name: Tests
+
+on:
+  pull_request:
+    paths-ignore:
+      - 'README.md'
+      - 'CHANGELOG.md'
+  push:
+    paths-ignore:
+      - 'README.md'
+      - 'CHANGELOG.md'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [2.7, '3.0', 3.1, 3.2]
+        gemfile: [5.2, '6.0', 6.1, '7.0', 7.1]
+    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
+      CC_TEST_REPORTER_ID: 0d09e6611c01dedd75511b1c60f62329d01729289e06375cfe67cefe67013d9f
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Ruby ${{ matrix.ruby-version }}
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
+    - name: Run tests
+
+      run: bundle exec rake
+    - name: Publish code coverage
+      uses: paambaati/codeclimate-action@v4.0.0
+

data/.gitignore

@@ -4,3 +4,4 @@
 pkg/*
 .ruby-version
 vendor/bundle
+coverage

data/.rubocop.yml

@@ -0,0 +1,34 @@
+AllCops:
+  NewCops: enable
+  TargetRubyVersion: 2.7
+
+Metrics/MethodLength:
+  Enabled: false
+
+Layout/LineLength:
+  Max: 120
+  AllowedPatterns: ['^ *# ']
+
+Style/Documentation:
+  Enabled: false
+
+Bundler/OrderedGems:
+  Enabled: false
+
+Naming/FileName:
+  Exclude:
+    - 'gemfiles/*'
+
+Metrics/BlockLength:
+  Exclude:
+    - 'spec/**/*'
+
+Style/MutableConstant:
+  Exclude:
+    - 'lib/country_select/defaults.rb'
+    - 'lib/country_select/formats.rb'
+
+Style/MethodCallWithoutArgsParentheses:
+  Exclude:
+    - 'lib/country_select/tag_helper.rb'
+

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## 8.0.2 2023-08-01
+
+* Code cleanup (@pmor)
+* Update CodeQL to V2 (@scudco)
+* Adding support for Rails 7.1 after recent Form Options helper changes (@ron-shinall)
+
+## 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)

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gemspec

data/Gemfile.lock

@@ -1,79 +1,94 @@
 PATH
   remote: .
   specs:
-    country_select (7.0.0)
+    country_select (8.0.1)
       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)
+    actionpack (7.0.6)
+      actionview (= 7.0.6)
+      activesupport (= 7.0.6)
+      rack (~> 2.0, >= 2.2.4)
       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)
+    actionview (7.0.6)
+      activesupport (= 7.0.6)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activesupport (7.0.3)
+    activesupport (7.0.6)
       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)
+    concurrent-ruby (1.2.2)
+    countries (5.6.0)
+      unaccent (~> 0.3)
     crass (1.0.6)
     diff-lcs (1.5.0)
-    erubi (1.10.0)
-    i18n (1.10.0)
+    docile (1.4.0)
+    erubi (1.12.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    loofah (2.18.0)
+    loofah (2.21.3)
       crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
+      nokogiri (>= 1.12.0)
     method_source (1.0.0)
-    minitest (5.16.1)
-    nokogiri (1.13.6-x86_64-darwin)
+    minitest (5.19.0)
+    nokogiri (1.15.3-arm64-darwin)
       racc (~> 1.4)
-    pry (0.14.1)
+    nokogiri (1.15.3-x86_64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.15.3-x86_64-linux)
+      racc (~> 1.4)
+    pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    racc (1.6.0)
-    rack (2.2.3.1)
-    rack-test (2.0.0)
+    racc (1.7.1)
+    rack (2.2.8)
+    rack-test (2.1.0)
       rack (>= 1.3)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
+    rails-dom-testing (2.1.1)
+      activesupport (>= 5.0.0)
+      minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.3)
-      loofah (~> 2.3)
+    rails-html-sanitizer (1.6.0)
+      loofah (~> 2.21)
+      nokogiri (~> 1.14)
     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.2)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.3)
       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.6)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.0)
-    sixarm_ruby_unaccent (1.2.0)
-    tzinfo (2.0.4)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.1)
+    simplecov (0.22.0)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.4)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
+    unaccent (0.4.0)
 
 PLATFORMS
-  x86_64-darwin-21
+  arm64-darwin-22
+  x86_64-darwin-22
+  x86_64-linux
 
 DEPENDENCIES
   actionpack (~> 7.0)
@@ -81,6 +96,7 @@ DEPENDENCIES
   pry (~> 0)
   rake (~> 13)
   rspec (~> 3)
+  simplecov (~> 0.22)
 
 BUNDLED WITH
-   2.3.10
+   2.4.12

data/README.md

@@ -1,5 +1,5 @@
 # Rails – Country Select
-[![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)
+[![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/test.yml/badge.svg)](https://github.com/countries/country_select/actions/workflows/test.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

data/Rakefile

@@ -9,28 +9,25 @@ 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
+    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.")
+    raise(StandardError, "Expected #{lockfile} to exist.") unless 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 ''
   end
-end
+end

data/country_select.gemspec

@@ -1,5 +1,6 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+$LOAD_PATH.push File.expand_path('lib', __dir__)
 require 'country_select/version'
 
 Gem::Specification.new do |s|
@@ -9,16 +10,18 @@ Gem::Specification.new do |s|
   s.authors     = ['Stefan Penner']
   s.email       = ['stefan.penner@gmail.com']
   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.summary     = 'Country Select Plugin'
+  s.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.'
 
   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' }
+                      'changelog_uri' => 'https://github.com/countries/country_select/blob/master/CHANGELOG.md',
+                      'source_code_uri' => 'https://github.com/countries/country_select',
+                      'rubygems_mfa_required' => 'true' }
 
   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.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_paths = ['lib']
 
   s.required_ruby_version = '>= 2.7'
@@ -27,6 +30,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'pry', '~> 0'
   s.add_development_dependency 'rake', '~> 13'
   s.add_development_dependency 'rspec', '~> 3'
+  s.add_development_dependency 'simplecov', '~> 0.22'
 
   s.add_dependency 'countries', '~> 5.0'
 end

data/gemfiles/actionpack-5.2.gemfile

@@ -1,6 +1,9 @@
-source "https://rubygems.org"
+# frozen_string_literal: true
 
-gemspec :path => "../"
+source 'https://rubygems.org'
 
-gem "railties", "~> 5.2.0"
-gem "actionpack", "~> 5.2.0"
+gemspec path: '../'
+
+gem 'railties', '~> 5.2.0'
+gem 'actionpack', '~> 5.2.0'
+gem 'nokogiri', '= 1.14.0.rc1'

data/gemfiles/actionpack-5.2.gemfile.lock

@@ -1,98 +1,110 @@
 PATH
   remote: ..
   specs:
-    country_select (7.0.0)
+    country_select (8.0.1)
       countries (~> 5.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (5.2.8)
-      actionview (= 5.2.8)
-      activesupport (= 5.2.8)
+    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.8)
-      activesupport (= 5.2.8)
+    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.8)
+    activesupport (5.2.8.1)
       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.10)
-    countries (5.1.0)
-      sixarm_ruby_unaccent (~> 1.1)
+    concurrent-ruby (1.2.2)
+    countries (5.4.0)
+      unaccent (~> 0.3)
     crass (1.0.6)
     diff-lcs (1.5.0)
-    erubi (1.10.0)
-    i18n (1.10.0)
+    docile (1.4.0)
+    erubi (1.12.0)
+    i18n (1.13.0)
       concurrent-ruby (~> 1.0)
-    loofah (2.18.0)
+    loofah (2.20.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)
+    minitest (5.18.0)
+    nokogiri (1.14.0.rc1-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.13.6-x86_64-linux)
+    nokogiri (1.14.0.rc1-x86_64-darwin)
       racc (~> 1.4)
-    pry (0.14.1)
+    nokogiri (1.14.0.rc1-x86_64-linux)
+      racc (~> 1.4)
+    pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    racc (1.6.0)
-    rack (2.2.3.1)
-    rack-test (2.0.2)
+    racc (1.6.2)
+    rack (2.2.7)
+    rack-test (2.1.0)
       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 (5.2.8)
-      actionpack (= 5.2.8)
-      activesupport (= 5.2.8)
+    rails-html-sanitizer (1.5.0)
+      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.2)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.3)
       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.5)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.0)
-    sixarm_ruby_unaccent (1.2.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
+    simplecov (0.22.0)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.4)
     thor (1.2.1)
     thread_safe (0.3.6)
-    tzinfo (1.2.9)
+    tzinfo (1.2.11)
       thread_safe (~> 0.1)
+    unaccent (0.4.0)
 
 PLATFORMS
-  x86_64-darwin-21
+  arm64-darwin-22
+  x86_64-darwin-22
   x86_64-linux
 
 DEPENDENCIES
   actionpack (~> 5.2.0)
   country_select!
+  nokogiri (= 1.14.0.rc1)
   pry (~> 0)
   railties (~> 5.2.0)
   rake (~> 13)
   rspec (~> 3)
+  simplecov (~> 0.22)
 
 BUNDLED WITH
-   2.3.10
+   2.4.2

data/gemfiles/actionpack-6.0.gemfile

@@ -1,6 +1,9 @@
-source "https://rubygems.org"
+# frozen_string_literal: true
 
-gemspec :path => "../"
+source 'https://rubygems.org'
 
-gem "railties", "~> 6.0.0"
-gem "actionpack", "~> 6.0.0"
+gemspec path: '../'
+
+gem 'railties', '~> 6.0.0'
+gem 'actionpack', '~> 6.0.0'
+gem 'nokogiri', '= 1.14.0.rc1'