country_select 7.0.0 → 8.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c90fbc7dfe822e709d24caaa9f6ea4aadbc565d056acd04a83881fd456d77d04
-  data.tar.gz: b8b38e3f7c4b907df636ecb611db60c26aa95c7e355a102ce9b4b5b0395fc77a
+  metadata.gz: c801f19e2389f6c0fd8d88b666bc31b382e5b7321033b94de1378df8c020726b
+  data.tar.gz: 92d3b1031fb53cd0ae189e84391553436281680aaceaffd8540192d629ad5940
 SHA512:
-  metadata.gz: 6c467912e59762ce36aecdff5b9ff177b10745a5462437be8d4b3eb283d6e92d1629b3eaa08f1ac2581bb28b212e2b43114bfbcc88ee5118fd0290b596817dd8
-  data.tar.gz: c29e2c423c6cbf990ff80de5b1415945e90f1425ca5bc82a8cb819edca7438c22d4bba374fc52a6d467c29bab8b823d53b50ad8e70fe5d28afa8a8069ffff083
+  metadata.gz: 6a8ff3e9f846e6b2081e925f4edac27409eeb9c62918bb6dec07a0a39540ec5f501792da09299d8de3d340118ae227c8d09c408da04ee92dd489a72f76ea73c5
+  data.tar.gz: 9f56a57c00a86df1e5d38fc98b269764c6c7938951a77481dac5edfe57c09f9011fb386d5501296556f6d45ede72272199c70ec6140a2e9c5fa6a9f7e1127015

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: ['3.0', 3.1, 3.2]
+        gemfile: [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,28 @@
+## 8.0.3 2023-10-07
+
+* Fix when country name is nil. (@zerobearing2)
+
+## 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)
+* 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

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

data/Gemfile.lock

@@ -1,87 +1,115 @@
 PATH
   remote: .
   specs:
-    country_select (6.1.1)
+    country_select (8.0.3)
       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)
-      rack (~> 2.0, >= 2.2.0)
+    actionpack (7.1.0)
+      actionview (= 7.1.0)
+      activesupport (= 7.1.0)
+      nokogiri (>= 1.8.5)
+      rack (>= 2.2.4)
+      rack-session (>= 1.0.1)
       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)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    actionview (7.1.0)
+      activesupport (= 7.1.0)
       builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activesupport (7.0.2.3)
+      erubi (~> 1.11)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    activesupport (7.1.0)
+      base64
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
+      mutex_m
       tzinfo (~> 2.0)
+    base64 (0.1.1)
+    bigdecimal (3.1.4)
     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)
+    concurrent-ruby (1.2.2)
+    connection_pool (2.4.1)
+    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)
+    drb (2.1.1)
+      ruby2_keywords
+    erubi (1.12.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    i18n_data (0.16.0)
-      simple_po_parser (~> 1.1)
-    loofah (2.16.0)
+    loofah (2.21.3)
       crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
+      nokogiri (>= 1.12.0)
     method_source (1.0.0)
-    minitest (5.15.0)
-    nokogiri (1.13.3-x86_64-darwin)
+    mini_portile2 (2.8.4)
+    minitest (5.20.0)
+    mutex_m (0.1.2)
+    nokogiri (1.15.4)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    pry (0.14.1)
+    nokogiri (1.15.4-arm64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.15.4-x86_64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.15.4-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)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
+    racc (1.7.1)
+    rack (3.0.8)
+    rack-session (2.0.0)
+      rack (>= 3.0.0)
+    rack-test (2.1.0)
+      rack (>= 1.3)
+    rails-dom-testing (2.2.0)
+      activesupport (>= 5.0.0)
+      minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.2)
-      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)
-    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.1)
+    ruby2_keywords (0.0.5)
+    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)
-    unicode_utils (1.4.0)
+    unaccent (0.4.0)
 
 PLATFORMS
-  x86_64-darwin-21
+  arm64-darwin-22
+  ruby
+  x86_64-darwin-22
+  x86_64-linux
 
 DEPENDENCIES
   actionpack (~> 7.0)
@@ -89,6 +117,7 @@ DEPENDENCIES
   pry (~> 0)
   rake (~> 13)
   rspec (~> 3)
+  simplecov (~> 0.22)
 
 BUNDLED WITH
-   2.3.10
+   2.4.19

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/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
@@ -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:
@@ -189,8 +187,8 @@ end
 ## Example Application
 
 An example Rails application demonstrating the different options is
-available at [scudco/country_select_test](https://github.com/scudco/country_select_test).
-The relevant view files live [here](https://github.com/scudco/country_select_test/tree/master/app/views/welcome).
+available at [countries/country_select_demo](https://github.com/countries/country_select_demo) and deployed to [country-select-demo.onrender.com](https://country-select-demo.onrender.com).
+The relevant view files live [here](https://github.com/countries/country_select_demo/tree/master/app/views/demo).
 
 ## Contributing
 

data/Rakefile

@@ -8,3 +8,26 @@ 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"
+
+    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

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,7 +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'
-  s.add_dependency 'sort_alphabetical', '~> 1.1'
 end

data/gemfiles/actionpack-6.1.gemfile

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