country_select 6.1.1 → 7.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (16) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/build.yml +1 -6
  3. data/.github/workflows/codeql-analysis.yml +70 -0
  4. data/CHANGELOG.md +5 -0
  5. data/Gemfile.lock +28 -33
  6. data/README.md +6 -3
  7. data/country_select.gemspec +6 -2
  8. data/gemfiles/actionpack-5.2.gemfile.lock +33 -38
  9. data/gemfiles/actionpack-6.0.gemfile.lock +34 -39
  10. data/gemfiles/actionpack-6.1.gemfile.lock +34 -39
  11. data/gemfiles/actionpack-7.0.gemfile.lock +34 -39
  12. data/gemfiles/actionpack-head.gemfile.lock +25 -30
  13. data/lib/country_select/formats.rb +1 -1
  14. data/lib/country_select/tag_helper.rb +2 -3
  15. data/lib/country_select/version.rb +1 -1
  16. metadata +11 -7
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: ca4f63875164172c98c1b54c7c4aef325ab363a0d8e863fcb49b2878320dfca5
4
- data.tar.gz: 6b5830267c05073fd5aa040894e6d0405777112d598260efabc29fee8ae5c44d
3
+ metadata.gz: c90fbc7dfe822e709d24caaa9f6ea4aadbc565d056acd04a83881fd456d77d04
4
+ data.tar.gz: b8b38e3f7c4b907df636ecb611db60c26aa95c7e355a102ce9b4b5b0395fc77a
5
5
  SHA512:
6
- metadata.gz: d749348579f486f25978eb5dce669bc316e7741061ed2296bf1ff6be7ca42a2a13a8d746b51bc36fb229570b61374296b7e15cd8c553d3468c47bd5d7b06c44a
7
- data.tar.gz: 683b72dffbe2de310f34be6b220f5773d70a196f11e8a1e0da639d7c19f5cc26fe4893502c339246984c4cdfbad30ac10cea202b95d0e6dcf343d845ad3843e5
6
+ metadata.gz: 6c467912e59762ce36aecdff5b9ff177b10745a5462437be8d4b3eb283d6e92d1629b3eaa08f1ac2581bb28b212e2b43114bfbcc88ee5118fd0290b596817dd8
7
+ data.tar.gz: c29e2c423c6cbf990ff80de5b1415945e90f1425ca5bc82a8cb819edca7438c22d4bba374fc52a6d467c29bab8b823d53b50ad8e70fe5d28afa8a8069ffff083
data/.github/workflows/build.yml CHANGED
@@ -12,13 +12,8 @@ jobs:
12
12
  strategy:
13
13
  fail-fast: false
14
14
  matrix:
15
- ruby: [2.6, 2.7, '3.0', 3.1]
15
+ ruby: [2.7, '3.0', 3.1]
16
16
  gemfile: [5.2, '6.0', 6.1, '7.0']
17
- exclude:
18
- - ruby: 2.6
19
- gemfile: head
20
- - ruby: 2.6
21
- gemfile: '7.0'
22
17
  env: # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps
23
18
  BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/actionpack-${{ matrix.gemfile }}.gemfile
24
19
  steps:
data/.github/workflows/codeql-analysis.yml ADDED
@@ -0,0 +1,70 @@
1
+ # For most projects, this workflow file will not need changing; you simply need
2
+ # to commit it to your repository.
3
+ #
4
+ # You may wish to alter this file to override the set of languages analyzed,
5
+ # or to provide custom queries or build logic.
6
+ #
7
+ # ******** NOTE ********
8
+ # We have attempted to detect the languages in your repository. Please check
9
+ # the `language` matrix defined below to confirm you have the correct set of
10
+ # supported CodeQL languages.
11
+ #
12
+ name: "CodeQL"
13
+
14
+ on:
15
+ push:
16
+ branches: [ master ]
17
+ pull_request:
18
+ # The branches below must be a subset of the branches above
19
+ branches: [ master ]
20
+ schedule:
21
+ - cron: '21 7 * * 5'
22
+
23
+ jobs:
24
+ analyze:
25
+ name: Analyze
26
+ runs-on: ubuntu-latest
27
+ permissions:
28
+ actions: read
29
+ contents: read
30
+ security-events: write
31
+
32
+ strategy:
33
+ fail-fast: false
34
+ matrix:
35
+ language: [ 'ruby' ]
36
+ # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
37
+ # Learn more about CodeQL language support at https://git.io/codeql-language-support
38
+
39
+ steps:
40
+ - name: Checkout repository
41
+ uses: actions/checkout@v3
42
+
43
+ # Initializes the CodeQL tools for scanning.
44
+ - name: Initialize CodeQL
45
+ uses: github/codeql-action/init@v1
46
+ with:
47
+ languages: ${{ matrix.language }}
48
+ # If you wish to specify custom queries, you can do so here or in a config file.
49
+ # By default, queries listed here will override any specified in a config file.
50
+ # Prefix the list here with "+" to use these queries and those in the config file.
51
+ # queries: ./path/to/local/query, your-org/your-repo/queries@main
52
+
53
+ # Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
54
+ # If this step fails, then you should remove it and run the build manually (see below)
55
+ - name: Autobuild
56
+ uses: github/codeql-action/autobuild@v1
57
+
58
+ # ℹ️ Command-line programs to run using the OS shell.
59
+ # 📚 https://git.io/JvXDl
60
+
61
+ # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
62
+ # and modify them (or add more) to build your code if your project
63
+ # uses a compiled language
64
+
65
+ #- run: |
66
+ # make bootstrap
67
+ # make release
68
+
69
+ - name: Perform CodeQL Analysis
70
+ uses: github/codeql-action/analyze@v1
data/CHANGELOG.md CHANGED
@@ -1,3 +1,8 @@
1
+ ## 7.0.0 2022-04-03
2
+
3
+ * #200 - Drop support for Ruby 2.5 and 2.6 (@pmor)
4
+ * #201 - Upgrade countries gem to 5.0.0 (@pmor)
5
+
1
6
  ## 6.1.1 2022-01-20
2
7
 
3
8
  * #195 - Fix deprecation warning on find_by_name (@filipemendespi)
data/Gemfile.lock CHANGED
@@ -2,53 +2,49 @@ PATH
2
2
  remote: .
3
3
  specs:
4
4
  country_select (6.1.1)
5
- countries (~> 4.2)
5
+ countries (~> 5.0)
6
6
  sort_alphabetical (~> 1.1)
7
7
 
8
8
  GEM
9
9
  remote: https://rubygems.org/
10
10
  specs:
11
- actionpack (7.0.1)
12
- actionview (= 7.0.1)
13
- activesupport (= 7.0.1)
11
+ actionpack (7.0.2.3)
12
+ actionview (= 7.0.2.3)
13
+ activesupport (= 7.0.2.3)
14
14
  rack (~> 2.0, >= 2.2.0)
15
15
  rack-test (>= 0.6.3)
16
16
  rails-dom-testing (~> 2.0)
17
17
  rails-html-sanitizer (~> 1.0, >= 1.2.0)
18
- actionview (7.0.1)
19
- activesupport (= 7.0.1)
18
+ actionview (7.0.2.3)
19
+ activesupport (= 7.0.2.3)
20
20
  builder (~> 3.1)
21
21
  erubi (~> 1.4)
22
22
  rails-dom-testing (~> 2.0)
23
23
  rails-html-sanitizer (~> 1.1, >= 1.2.0)
24
- activesupport (7.0.1)
24
+ activesupport (7.0.2.3)
25
25
  concurrent-ruby (~> 1.0, >= 1.0.2)
26
26
  i18n (>= 1.6, < 2)
27
27
  minitest (>= 5.1)
28
28
  tzinfo (~> 2.0)
29
29
  builder (3.2.4)
30
30
  coderay (1.1.3)
31
- concurrent-ruby (1.1.9)
32
- countries (4.2.1)
33
- i18n_data (~> 0.15.0)
31
+ concurrent-ruby (1.1.10)
32
+ countries (5.0.0)
33
+ i18n_data (~> 0.16.0)
34
34
  sixarm_ruby_unaccent (~> 1.1)
35
35
  crass (1.0.6)
36
36
  diff-lcs (1.5.0)
37
37
  erubi (1.10.0)
38
- i18n (1.8.11)
38
+ i18n (1.10.0)
39
39
  concurrent-ruby (~> 1.0)
40
- i18n_data (0.15.0)
40
+ i18n_data (0.16.0)
41
41
  simple_po_parser (~> 1.1)
42
- loofah (2.13.0)
42
+ loofah (2.16.0)
43
43
  crass (~> 1.0.2)
44
44
  nokogiri (>= 1.5.9)
45
45
  method_source (1.0.0)
46
- mini_portile2 (2.7.1)
47
46
  minitest (5.15.0)
48
- nokogiri (1.13.1)
49
- mini_portile2 (~> 2.7.0)
50
- racc (~> 1.4)
51
- nokogiri (1.13.1-x86_64-linux)
47
+ nokogiri (1.13.3-x86_64-darwin)
52
48
  racc (~> 1.4)
53
49
  pry (0.14.1)
54
50
  coderay (~> 1.1)
@@ -63,20 +59,20 @@ GEM
63
59
  rails-html-sanitizer (1.4.2)
64
60
  loofah (~> 2.3)
65
61
  rake (13.0.6)
66
- rspec (3.10.0)
67
- rspec-core (~> 3.10.0)
68
- rspec-expectations (~> 3.10.0)
69
- rspec-mocks (~> 3.10.0)
70
- rspec-core (3.10.1)
71
- rspec-support (~> 3.10.0)
72
- rspec-expectations (3.10.2)
62
+ rspec (3.11.0)
63
+ rspec-core (~> 3.11.0)
64
+ rspec-expectations (~> 3.11.0)
65
+ rspec-mocks (~> 3.11.0)
66
+ rspec-core (3.11.0)
67
+ rspec-support (~> 3.11.0)
68
+ rspec-expectations (3.11.0)
73
69
  diff-lcs (>= 1.2.0, < 2.0)
74
- rspec-support (~> 3.10.0)
75
- rspec-mocks (3.10.2)
70
+ rspec-support (~> 3.11.0)
71
+ rspec-mocks (3.11.1)
76
72
  diff-lcs (>= 1.2.0, < 2.0)
77
- rspec-support (~> 3.10.0)
78
- rspec-support (3.10.3)
79
- simple_po_parser (1.1.5)
73
+ rspec-support (~> 3.11.0)
74
+ rspec-support (3.11.0)
75
+ simple_po_parser (1.1.6)
80
76
  sixarm_ruby_unaccent (1.2.0)
81
77
  sort_alphabetical (1.1.0)
82
78
  unicode_utils (>= 1.2.2)
@@ -85,8 +81,7 @@ GEM
85
81
  unicode_utils (1.4.0)
86
82
 
87
83
  PLATFORMS
88
- ruby
89
- x86_64-linux
84
+ x86_64-darwin-21
90
85
 
91
86
  DEPENDENCIES
92
87
  actionpack (~> 7.0)
@@ -96,4 +91,4 @@ DEPENDENCIES
96
91
  rspec (~> 3)
97
92
 
98
93
  BUNDLED WITH
99
- 2.3.3
94
+ 2.3.10
data/README.md CHANGED
@@ -1,5 +1,8 @@
1
1
  # Rails – Country Select
2
- [![build](https://github.com/stefanpenner/country_select/actions/workflows/build.yml/badge.svg)](https://github.com/stefanpenner/country_select/actions/workflows/build.yml)
2
+ [![build](https://github.com/countries/country_select/actions/workflows/build.yml/badge.svg)](https://github.com/countries/country_select/actions/workflows/build.yml)
3
+ [![Code Climate](https://codeclimate.com/github/countries/country_select.svg)](https://codeclimate.com/github/countries/country_select)
4
+ [![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)
5
+
3
6
 
4
7
  Provides a simple helper to get an HTML select list of countries using the
5
8
  [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.
14
17
 
15
18
  ## Reporting issues
16
19
 
17
- 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.
20
+ 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.
18
21
 
19
22
  ## Installation
20
23
 
@@ -177,7 +180,7 @@ class User < ActiveRecord::Base
177
180
  # (usually English) name if no translation is available
178
181
  def country_name
179
182
  country = ISO3166::Country[country_code]
180
- country.translations[I18n.locale.to_s] || country.iso_short_name
183
+ country.translations[I18n.locale.to_s] || country.common_name || country.iso_short_name
181
184
  end
182
185
 
183
186
  end
data/country_select.gemspec CHANGED
@@ -12,18 +12,22 @@ Gem::Specification.new do |s|
12
12
  s.summary = %q{Country Select Plugin}
13
13
  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.}
14
14
 
15
+ s.metadata = { 'bug_tracker_uri' => 'http://github.com/countries/country_select/issues',
16
+ 'changelog_uri' => 'https://github.com/countries/country_select/blob/master/CHANGELOG.md',
17
+ 'source_code_uri' => 'https://github.com/countries/country_select' }
18
+
15
19
  s.files = `git ls-files`.split("\n")
16
20
  s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
17
21
  s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
18
22
  s.require_paths = ['lib']
19
23
 
20
- s.required_ruby_version = '>= 2.5'
24
+ s.required_ruby_version = '>= 2.7'
21
25
 
22
26
  s.add_development_dependency 'actionpack', '~> 7.0'
23
27
  s.add_development_dependency 'pry', '~> 0'
24
28
  s.add_development_dependency 'rake', '~> 13'
25
29
  s.add_development_dependency 'rspec', '~> 3'
26
30
 
27
- s.add_dependency 'countries', '~> 4.2'
31
+ s.add_dependency 'countries', '~> 5.0'
28
32
  s.add_dependency 'sort_alphabetical', '~> 1.1'
29
33
  end
data/gemfiles/actionpack-5.2.gemfile.lock CHANGED
@@ -1,56 +1,52 @@
1
1
  PATH
2
2
  remote: ..
3
3
  specs:
4
- country_select (6.1.1)
5
- countries (~> 4.2)
4
+ country_select (7.0.0)
5
+ countries (~> 5.0)
6
6
  sort_alphabetical (~> 1.1)
7
7
 
8
8
  GEM
9
9
  remote: https://rubygems.org/
10
10
  specs:
11
- actionpack (5.2.6)
12
- actionview (= 5.2.6)
13
- activesupport (= 5.2.6)
11
+ actionpack (5.2.7)
12
+ actionview (= 5.2.7)
13
+ activesupport (= 5.2.7)
14
14
  rack (~> 2.0, >= 2.0.8)
15
15
  rack-test (>= 0.6.3)
16
16
  rails-dom-testing (~> 2.0)
17
17
  rails-html-sanitizer (~> 1.0, >= 1.0.2)
18
- actionview (5.2.6)
19
- activesupport (= 5.2.6)
18
+ actionview (5.2.7)
19
+ activesupport (= 5.2.7)
20
20
  builder (~> 3.1)
21
21
  erubi (~> 1.4)
22
22
  rails-dom-testing (~> 2.0)
23
23
  rails-html-sanitizer (~> 1.0, >= 1.0.3)
24
- activesupport (5.2.6)
24
+ activesupport (5.2.7)
25
25
  concurrent-ruby (~> 1.0, >= 1.0.2)
26
26
  i18n (>= 0.7, < 2)
27
27
  minitest (~> 5.1)
28
28
  tzinfo (~> 1.1)
29
29
  builder (3.2.4)
30
30
  coderay (1.1.3)
31
- concurrent-ruby (1.1.9)
32
- countries (4.2.1)
33
- i18n_data (~> 0.15.0)
31
+ concurrent-ruby (1.1.10)
32
+ countries (5.0.0)
33
+ i18n_data (~> 0.16.0)
34
34
  sixarm_ruby_unaccent (~> 1.1)
35
35
  crass (1.0.6)
36
36
  diff-lcs (1.5.0)
37
37
  erubi (1.10.0)
38
- i18n (1.8.11)
38
+ i18n (1.10.0)
39
39
  concurrent-ruby (~> 1.0)
40
- i18n_data (0.15.0)
40
+ i18n_data (0.16.0)
41
41
  simple_po_parser (~> 1.1)
42
- loofah (2.13.0)
42
+ loofah (2.16.0)
43
43
  crass (~> 1.0.2)
44
44
  nokogiri (>= 1.5.9)
45
45
  method_source (1.0.0)
46
- mini_portile2 (2.7.1)
47
46
  minitest (5.15.0)
48
- nokogiri (1.13.1)
49
- mini_portile2 (~> 2.7.0)
47
+ nokogiri (1.13.3-x86_64-darwin)
50
48
  racc (~> 1.4)
51
- nokogiri (1.13.1-arm64-darwin)
52
- racc (~> 1.4)
53
- nokogiri (1.13.1-x86_64-linux)
49
+ nokogiri (1.13.3-x86_64-linux)
54
50
  racc (~> 1.4)
55
51
  pry (0.14.1)
56
52
  coderay (~> 1.1)
@@ -64,27 +60,27 @@ GEM
64
60
  nokogiri (>= 1.6)
65
61
  rails-html-sanitizer (1.4.2)
66
62
  loofah (~> 2.3)
67
- railties (5.2.6)
68
- actionpack (= 5.2.6)
69
- activesupport (= 5.2.6)
63
+ railties (5.2.7)
64
+ actionpack (= 5.2.7)
65
+ activesupport (= 5.2.7)
70
66
  method_source
71
67
  rake (>= 0.8.7)
72
68
  thor (>= 0.19.0, < 2.0)
73
69
  rake (13.0.6)
74
- rspec (3.10.0)
75
- rspec-core (~> 3.10.0)
76
- rspec-expectations (~> 3.10.0)
77
- rspec-mocks (~> 3.10.0)
78
- rspec-core (3.10.1)
79
- rspec-support (~> 3.10.0)
80
- rspec-expectations (3.10.2)
70
+ rspec (3.11.0)
71
+ rspec-core (~> 3.11.0)
72
+ rspec-expectations (~> 3.11.0)
73
+ rspec-mocks (~> 3.11.0)
74
+ rspec-core (3.11.0)
75
+ rspec-support (~> 3.11.0)
76
+ rspec-expectations (3.11.0)
81
77
  diff-lcs (>= 1.2.0, < 2.0)
82
- rspec-support (~> 3.10.0)
83
- rspec-mocks (3.10.2)
78
+ rspec-support (~> 3.11.0)
79
+ rspec-mocks (3.11.1)
84
80
  diff-lcs (>= 1.2.0, < 2.0)
85
- rspec-support (~> 3.10.0)
86
- rspec-support (3.10.3)
87
- simple_po_parser (1.1.5)
81
+ rspec-support (~> 3.11.0)
82
+ rspec-support (3.11.0)
83
+ simple_po_parser (1.1.6)
88
84
  sixarm_ruby_unaccent (1.2.0)
89
85
  sort_alphabetical (1.1.0)
90
86
  unicode_utils (>= 1.2.2)
@@ -95,8 +91,7 @@ GEM
95
91
  unicode_utils (1.4.0)
96
92
 
97
93
  PLATFORMS
98
- arm64-darwin-21
99
- ruby
94
+ x86_64-darwin-21
100
95
  x86_64-linux
101
96
 
102
97
  DEPENDENCIES
@@ -108,4 +103,4 @@ DEPENDENCIES
108
103
  rspec (~> 3)
109
104
 
110
105
  BUNDLED WITH
111
- 2.3.3
106
+ 2.3.10
data/gemfiles/actionpack-6.0.gemfile.lock CHANGED
@@ -1,27 +1,27 @@
1
1
  PATH
2
2
  remote: ..
3
3
  specs:
4
- country_select (6.1.1)
5
- countries (~> 4.2)
4
+ country_select (7.0.0)
5
+ countries (~> 5.0)
6
6
  sort_alphabetical (~> 1.1)
7
7
 
8
8
  GEM
9
9
  remote: https://rubygems.org/
10
10
  specs:
11
- actionpack (6.1.4.4)
12
- actionview (= 6.1.4.4)
13
- activesupport (= 6.1.4.4)
11
+ actionpack (6.1.4.6)
12
+ actionview (= 6.1.4.6)
13
+ activesupport (= 6.1.4.6)
14
14
  rack (~> 2.0, >= 2.0.9)
15
15
  rack-test (>= 0.6.3)
16
16
  rails-dom-testing (~> 2.0)
17
17
  rails-html-sanitizer (~> 1.0, >= 1.2.0)
18
- actionview (6.1.4.4)
19
- activesupport (= 6.1.4.4)
18
+ actionview (6.1.4.6)
19
+ activesupport (= 6.1.4.6)
20
20
  builder (~> 3.1)
21
21
  erubi (~> 1.4)
22
22
  rails-dom-testing (~> 2.0)
23
23
  rails-html-sanitizer (~> 1.1, >= 1.2.0)
24
- activesupport (6.1.4.4)
24
+ activesupport (6.1.4.6)
25
25
  concurrent-ruby (~> 1.0, >= 1.0.2)
26
26
  i18n (>= 1.6, < 2)
27
27
  minitest (>= 5.1)
@@ -29,29 +29,25 @@ GEM
29
29
  zeitwerk (~> 2.3)
30
30
  builder (3.2.4)
31
31
  coderay (1.1.3)
32
- concurrent-ruby (1.1.9)
33
- countries (4.2.1)
34
- i18n_data (~> 0.15.0)
32
+ concurrent-ruby (1.1.10)
33
+ countries (5.0.0)
34
+ i18n_data (~> 0.16.0)
35
35
  sixarm_ruby_unaccent (~> 1.1)
36
36
  crass (1.0.6)
37
37
  diff-lcs (1.5.0)
38
38
  erubi (1.10.0)
39
- i18n (1.8.11)
39
+ i18n (1.10.0)
40
40
  concurrent-ruby (~> 1.0)
41
- i18n_data (0.15.0)
41
+ i18n_data (0.16.0)
42
42
  simple_po_parser (~> 1.1)
43
- loofah (2.13.0)
43
+ loofah (2.16.0)
44
44
  crass (~> 1.0.2)
45
45
  nokogiri (>= 1.5.9)
46
46
  method_source (1.0.0)
47
- mini_portile2 (2.7.1)
48
47
  minitest (5.15.0)
49
- nokogiri (1.13.1)
50
- mini_portile2 (~> 2.7.0)
48
+ nokogiri (1.13.3-x86_64-darwin)
51
49
  racc (~> 1.4)
52
- nokogiri (1.13.1-arm64-darwin)
53
- racc (~> 1.4)
54
- nokogiri (1.13.1-x86_64-linux)
50
+ nokogiri (1.13.3-x86_64-linux)
55
51
  racc (~> 1.4)
56
52
  pry (0.14.1)
57
53
  coderay (~> 1.1)
@@ -65,27 +61,27 @@ GEM
65
61
  nokogiri (>= 1.6)
66
62
  rails-html-sanitizer (1.4.2)
67
63
  loofah (~> 2.3)
68
- railties (6.1.4.4)
69
- actionpack (= 6.1.4.4)
70
- activesupport (= 6.1.4.4)
64
+ railties (6.1.4.6)
65
+ actionpack (= 6.1.4.6)
66
+ activesupport (= 6.1.4.6)
71
67
  method_source
72
68
  rake (>= 0.13)
73
69
  thor (~> 1.0)
74
70
  rake (13.0.6)
75
- rspec (3.10.0)
76
- rspec-core (~> 3.10.0)
77
- rspec-expectations (~> 3.10.0)
78
- rspec-mocks (~> 3.10.0)
79
- rspec-core (3.10.1)
80
- rspec-support (~> 3.10.0)
81
- rspec-expectations (3.10.2)
71
+ rspec (3.11.0)
72
+ rspec-core (~> 3.11.0)
73
+ rspec-expectations (~> 3.11.0)
74
+ rspec-mocks (~> 3.11.0)
75
+ rspec-core (3.11.0)
76
+ rspec-support (~> 3.11.0)
77
+ rspec-expectations (3.11.0)
82
78
  diff-lcs (>= 1.2.0, < 2.0)
83
- rspec-support (~> 3.10.0)
84
- rspec-mocks (3.10.2)
79
+ rspec-support (~> 3.11.0)
80
+ rspec-mocks (3.11.1)
85
81
  diff-lcs (>= 1.2.0, < 2.0)
86
- rspec-support (~> 3.10.0)
87
- rspec-support (3.10.3)
88
- simple_po_parser (1.1.5)
82
+ rspec-support (~> 3.11.0)
83
+ rspec-support (3.11.0)
84
+ simple_po_parser (1.1.6)
89
85
  sixarm_ruby_unaccent (1.2.0)
90
86
  sort_alphabetical (1.1.0)
91
87
  unicode_utils (>= 1.2.2)
@@ -93,11 +89,10 @@ GEM
93
89
  tzinfo (2.0.4)
94
90
  concurrent-ruby (~> 1.0)
95
91
  unicode_utils (1.4.0)
96
- zeitwerk (2.5.3)
92
+ zeitwerk (2.5.4)
97
93
 
98
94
  PLATFORMS
99
- arm64-darwin-21
100
- ruby
95
+ x86_64-darwin-21
101
96
  x86_64-linux
102
97
 
103
98
  DEPENDENCIES
@@ -109,4 +104,4 @@ DEPENDENCIES
109
104
  rspec (~> 3)
110
105
 
111
106
  BUNDLED WITH
112
- 2.3.3
107
+ 2.3.10
data/gemfiles/actionpack-6.1.gemfile.lock CHANGED
@@ -1,27 +1,27 @@
1
1
  PATH
2
2
  remote: ..
3
3
  specs:
4
- country_select (6.1.1)
5
- countries (~> 4.2)
4
+ country_select (7.0.0)
5
+ countries (~> 5.0)
6
6
  sort_alphabetical (~> 1.1)
7
7
 
8
8
  GEM
9
9
  remote: https://rubygems.org/
10
10
  specs:
11
- actionpack (6.1.4.4)
12
- actionview (= 6.1.4.4)
13
- activesupport (= 6.1.4.4)
11
+ actionpack (6.1.4.6)
12
+ actionview (= 6.1.4.6)
13
+ activesupport (= 6.1.4.6)
14
14
  rack (~> 2.0, >= 2.0.9)
15
15
  rack-test (>= 0.6.3)
16
16
  rails-dom-testing (~> 2.0)
17
17
  rails-html-sanitizer (~> 1.0, >= 1.2.0)
18
- actionview (6.1.4.4)
19
- activesupport (= 6.1.4.4)
18
+ actionview (6.1.4.6)
19
+ activesupport (= 6.1.4.6)
20
20
  builder (~> 3.1)
21
21
  erubi (~> 1.4)
22
22
  rails-dom-testing (~> 2.0)
23
23
  rails-html-sanitizer (~> 1.1, >= 1.2.0)
24
- activesupport (6.1.4.4)
24
+ activesupport (6.1.4.6)
25
25
  concurrent-ruby (~> 1.0, >= 1.0.2)
26
26
  i18n (>= 1.6, < 2)
27
27
  minitest (>= 5.1)
@@ -29,29 +29,25 @@ GEM
29
29
  zeitwerk (~> 2.3)
30
30
  builder (3.2.4)
31
31
  coderay (1.1.3)
32
- concurrent-ruby (1.1.9)
33
- countries (4.2.1)
34
- i18n_data (~> 0.15.0)
32
+ concurrent-ruby (1.1.10)
33
+ countries (5.0.0)
34
+ i18n_data (~> 0.16.0)
35
35
  sixarm_ruby_unaccent (~> 1.1)
36
36
  crass (1.0.6)
37
37
  diff-lcs (1.5.0)
38
38
  erubi (1.10.0)
39
- i18n (1.8.11)
39
+ i18n (1.10.0)
40
40
  concurrent-ruby (~> 1.0)
41
- i18n_data (0.15.0)
41
+ i18n_data (0.16.0)
42
42
  simple_po_parser (~> 1.1)
43
- loofah (2.13.0)
43
+ loofah (2.16.0)
44
44
  crass (~> 1.0.2)
45
45
  nokogiri (>= 1.5.9)
46
46
  method_source (1.0.0)
47
- mini_portile2 (2.7.1)
48
47
  minitest (5.15.0)
49
- nokogiri (1.13.1)
50
- mini_portile2 (~> 2.7.0)
48
+ nokogiri (1.13.3-x86_64-darwin)
51
49
  racc (~> 1.4)
52
- nokogiri (1.13.1-arm64-darwin)
53
- racc (~> 1.4)
54
- nokogiri (1.13.1-x86_64-linux)
50
+ nokogiri (1.13.3-x86_64-linux)
55
51
  racc (~> 1.4)
56
52
  pry (0.14.1)
57
53
  coderay (~> 1.1)
@@ -65,27 +61,27 @@ GEM
65
61
  nokogiri (>= 1.6)
66
62
  rails-html-sanitizer (1.4.2)
67
63
  loofah (~> 2.3)
68
- railties (6.1.4.4)
69
- actionpack (= 6.1.4.4)
70
- activesupport (= 6.1.4.4)
64
+ railties (6.1.4.6)
65
+ actionpack (= 6.1.4.6)
66
+ activesupport (= 6.1.4.6)
71
67
  method_source
72
68
  rake (>= 0.13)
73
69
  thor (~> 1.0)
74
70
  rake (13.0.6)
75
- rspec (3.10.0)
76
- rspec-core (~> 3.10.0)
77
- rspec-expectations (~> 3.10.0)
78
- rspec-mocks (~> 3.10.0)
79
- rspec-core (3.10.1)
80
- rspec-support (~> 3.10.0)
81
- rspec-expectations (3.10.2)
71
+ rspec (3.11.0)
72
+ rspec-core (~> 3.11.0)
73
+ rspec-expectations (~> 3.11.0)
74
+ rspec-mocks (~> 3.11.0)
75
+ rspec-core (3.11.0)
76
+ rspec-support (~> 3.11.0)
77
+ rspec-expectations (3.11.0)
82
78
  diff-lcs (>= 1.2.0, < 2.0)
83
- rspec-support (~> 3.10.0)
84
- rspec-mocks (3.10.2)
79
+ rspec-support (~> 3.11.0)
80
+ rspec-mocks (3.11.1)
85
81
  diff-lcs (>= 1.2.0, < 2.0)
86
- rspec-support (~> 3.10.0)
87
- rspec-support (3.10.3)
88
- simple_po_parser (1.1.5)
82
+ rspec-support (~> 3.11.0)
83
+ rspec-support (3.11.0)
84
+ simple_po_parser (1.1.6)
89
85
  sixarm_ruby_unaccent (1.2.0)
90
86
  sort_alphabetical (1.1.0)
91
87
  unicode_utils (>= 1.2.2)
@@ -93,11 +89,10 @@ GEM
93
89
  tzinfo (2.0.4)
94
90
  concurrent-ruby (~> 1.0)
95
91
  unicode_utils (1.4.0)
96
- zeitwerk (2.5.3)
92
+ zeitwerk (2.5.4)
97
93
 
98
94
  PLATFORMS
99
- arm64-darwin-21
100
- ruby
95
+ x86_64-darwin-21
101
96
  x86_64-linux
102
97
 
103
98
  DEPENDENCIES
@@ -109,4 +104,4 @@ DEPENDENCIES
109
104
  rspec (~> 3)
110
105
 
111
106
  BUNDLED WITH
112
- 2.3.3
107
+ 2.3.10
data/gemfiles/actionpack-7.0.gemfile.lock CHANGED
@@ -1,56 +1,52 @@
1
1
  PATH
2
2
  remote: ..
3
3
  specs:
4
- country_select (6.1.1)
5
- countries (~> 4.2)
4
+ country_select (7.0.0)
5
+ countries (~> 5.0)
6
6
  sort_alphabetical (~> 1.1)
7
7
 
8
8
  GEM
9
9
  remote: https://rubygems.org/
10
10
  specs:
11
- actionpack (7.0.1)
12
- actionview (= 7.0.1)
13
- activesupport (= 7.0.1)
11
+ actionpack (7.0.2.3)
12
+ actionview (= 7.0.2.3)
13
+ activesupport (= 7.0.2.3)
14
14
  rack (~> 2.0, >= 2.2.0)
15
15
  rack-test (>= 0.6.3)
16
16
  rails-dom-testing (~> 2.0)
17
17
  rails-html-sanitizer (~> 1.0, >= 1.2.0)
18
- actionview (7.0.1)
19
- activesupport (= 7.0.1)
18
+ actionview (7.0.2.3)
19
+ activesupport (= 7.0.2.3)
20
20
  builder (~> 3.1)
21
21
  erubi (~> 1.4)
22
22
  rails-dom-testing (~> 2.0)
23
23
  rails-html-sanitizer (~> 1.1, >= 1.2.0)
24
- activesupport (7.0.1)
24
+ activesupport (7.0.2.3)
25
25
  concurrent-ruby (~> 1.0, >= 1.0.2)
26
26
  i18n (>= 1.6, < 2)
27
27
  minitest (>= 5.1)
28
28
  tzinfo (~> 2.0)
29
29
  builder (3.2.4)
30
30
  coderay (1.1.3)
31
- concurrent-ruby (1.1.9)
32
- countries (4.2.1)
33
- i18n_data (~> 0.15.0)
31
+ concurrent-ruby (1.1.10)
32
+ countries (5.0.0)
33
+ i18n_data (~> 0.16.0)
34
34
  sixarm_ruby_unaccent (~> 1.1)
35
35
  crass (1.0.6)
36
36
  diff-lcs (1.5.0)
37
37
  erubi (1.10.0)
38
- i18n (1.8.11)
38
+ i18n (1.10.0)
39
39
  concurrent-ruby (~> 1.0)
40
- i18n_data (0.15.0)
40
+ i18n_data (0.16.0)
41
41
  simple_po_parser (~> 1.1)
42
- loofah (2.13.0)
42
+ loofah (2.16.0)
43
43
  crass (~> 1.0.2)
44
44
  nokogiri (>= 1.5.9)
45
45
  method_source (1.0.0)
46
- mini_portile2 (2.7.1)
47
46
  minitest (5.15.0)
48
- nokogiri (1.13.1)
49
- mini_portile2 (~> 2.7.0)
47
+ nokogiri (1.13.3-x86_64-darwin)
50
48
  racc (~> 1.4)
51
- nokogiri (1.13.1-arm64-darwin)
52
- racc (~> 1.4)
53
- nokogiri (1.13.1-x86_64-linux)
49
+ nokogiri (1.13.3-x86_64-linux)
54
50
  racc (~> 1.4)
55
51
  pry (0.14.1)
56
52
  coderay (~> 1.1)
@@ -64,28 +60,28 @@ GEM
64
60
  nokogiri (>= 1.6)
65
61
  rails-html-sanitizer (1.4.2)
66
62
  loofah (~> 2.3)
67
- railties (7.0.1)
68
- actionpack (= 7.0.1)
69
- activesupport (= 7.0.1)
63
+ railties (7.0.2.3)
64
+ actionpack (= 7.0.2.3)
65
+ activesupport (= 7.0.2.3)
70
66
  method_source
71
67
  rake (>= 12.2)
72
68
  thor (~> 1.0)
73
69
  zeitwerk (~> 2.5)
74
70
  rake (13.0.6)
75
- rspec (3.10.0)
76
- rspec-core (~> 3.10.0)
77
- rspec-expectations (~> 3.10.0)
78
- rspec-mocks (~> 3.10.0)
79
- rspec-core (3.10.1)
80
- rspec-support (~> 3.10.0)
81
- rspec-expectations (3.10.2)
71
+ rspec (3.11.0)
72
+ rspec-core (~> 3.11.0)
73
+ rspec-expectations (~> 3.11.0)
74
+ rspec-mocks (~> 3.11.0)
75
+ rspec-core (3.11.0)
76
+ rspec-support (~> 3.11.0)
77
+ rspec-expectations (3.11.0)
82
78
  diff-lcs (>= 1.2.0, < 2.0)
83
- rspec-support (~> 3.10.0)
84
- rspec-mocks (3.10.2)
79
+ rspec-support (~> 3.11.0)
80
+ rspec-mocks (3.11.1)
85
81
  diff-lcs (>= 1.2.0, < 2.0)
86
- rspec-support (~> 3.10.0)
87
- rspec-support (3.10.3)
88
- simple_po_parser (1.1.5)
82
+ rspec-support (~> 3.11.0)
83
+ rspec-support (3.11.0)
84
+ simple_po_parser (1.1.6)
89
85
  sixarm_ruby_unaccent (1.2.0)
90
86
  sort_alphabetical (1.1.0)
91
87
  unicode_utils (>= 1.2.2)
@@ -93,11 +89,10 @@ GEM
93
89
  tzinfo (2.0.4)
94
90
  concurrent-ruby (~> 1.0)
95
91
  unicode_utils (1.4.0)
96
- zeitwerk (2.5.3)
92
+ zeitwerk (2.5.4)
97
93
 
98
94
  PLATFORMS
99
- arm64-darwin-21
100
- ruby
95
+ x86_64-darwin-21
101
96
  x86_64-linux
102
97
 
103
98
  DEPENDENCIES
@@ -109,4 +104,4 @@ DEPENDENCIES
109
104
  rspec (~> 3)
110
105
 
111
106
  BUNDLED WITH
112
- 2.3.3
107
+ 2.3.10
data/gemfiles/actionpack-head.gemfile.lock CHANGED
@@ -1,6 +1,6 @@
1
1
  GIT
2
2
  remote: https://github.com/rails/rails.git
3
- revision: 10ef5321c1e0f783b58f26d238cd61145bc3cb96
3
+ revision: bb4a8a91884f3eff2b22d4deb3727d3cc267ddc4
4
4
  specs:
5
5
  actionpack (7.1.0.alpha)
6
6
  actionview (= 7.1.0.alpha)
@@ -24,8 +24,8 @@ GIT
24
24
  PATH
25
25
  remote: ..
26
26
  specs:
27
- country_select (6.1.1)
28
- countries (~> 4.2)
27
+ country_select (7.0.0)
28
+ countries (~> 5.0)
29
29
  sort_alphabetical (~> 1.1)
30
30
 
31
31
  GEM
@@ -33,29 +33,25 @@ GEM
33
33
  specs:
34
34
  builder (3.2.4)
35
35
  coderay (1.1.3)
36
- concurrent-ruby (1.1.9)
37
- countries (4.2.1)
38
- i18n_data (~> 0.15.0)
36
+ concurrent-ruby (1.1.10)
37
+ countries (5.0.0)
38
+ i18n_data (~> 0.16.0)
39
39
  sixarm_ruby_unaccent (~> 1.1)
40
40
  crass (1.0.6)
41
41
  diff-lcs (1.5.0)
42
42
  erubi (1.10.0)
43
- i18n (1.8.11)
43
+ i18n (1.10.0)
44
44
  concurrent-ruby (~> 1.0)
45
- i18n_data (0.15.0)
45
+ i18n_data (0.16.0)
46
46
  simple_po_parser (~> 1.1)
47
- loofah (2.13.0)
47
+ loofah (2.16.0)
48
48
  crass (~> 1.0.2)
49
49
  nokogiri (>= 1.5.9)
50
50
  method_source (1.0.0)
51
- mini_portile2 (2.7.1)
52
51
  minitest (5.15.0)
53
- nokogiri (1.13.1)
54
- mini_portile2 (~> 2.7.0)
52
+ nokogiri (1.13.3-x86_64-darwin)
55
53
  racc (~> 1.4)
56
- nokogiri (1.13.1-arm64-darwin)
57
- racc (~> 1.4)
58
- nokogiri (1.13.1-x86_64-linux)
54
+ nokogiri (1.13.3-x86_64-linux)
59
55
  racc (~> 1.4)
60
56
  pry (0.14.1)
61
57
  coderay (~> 1.1)
@@ -70,20 +66,20 @@ GEM
70
66
  rails-html-sanitizer (1.4.2)
71
67
  loofah (~> 2.3)
72
68
  rake (13.0.6)
73
- rspec (3.10.0)
74
- rspec-core (~> 3.10.0)
75
- rspec-expectations (~> 3.10.0)
76
- rspec-mocks (~> 3.10.0)
77
- rspec-core (3.10.1)
78
- rspec-support (~> 3.10.0)
79
- rspec-expectations (3.10.2)
69
+ rspec (3.11.0)
70
+ rspec-core (~> 3.11.0)
71
+ rspec-expectations (~> 3.11.0)
72
+ rspec-mocks (~> 3.11.0)
73
+ rspec-core (3.11.0)
74
+ rspec-support (~> 3.11.0)
75
+ rspec-expectations (3.11.0)
80
76
  diff-lcs (>= 1.2.0, < 2.0)
81
- rspec-support (~> 3.10.0)
82
- rspec-mocks (3.10.2)
77
+ rspec-support (~> 3.11.0)
78
+ rspec-mocks (3.11.1)
83
79
  diff-lcs (>= 1.2.0, < 2.0)
84
- rspec-support (~> 3.10.0)
85
- rspec-support (3.10.3)
86
- simple_po_parser (1.1.5)
80
+ rspec-support (~> 3.11.0)
81
+ rspec-support (3.11.0)
82
+ simple_po_parser (1.1.6)
87
83
  sixarm_ruby_unaccent (1.2.0)
88
84
  sort_alphabetical (1.1.0)
89
85
  unicode_utils (>= 1.2.2)
@@ -92,8 +88,7 @@ GEM
92
88
  unicode_utils (1.4.0)
93
89
 
94
90
  PLATFORMS
95
- arm64-darwin-21
96
- ruby
91
+ x86_64-darwin-21
97
92
  x86_64-linux
98
93
 
99
94
  DEPENDENCIES
@@ -106,4 +101,4 @@ DEPENDENCIES
106
101
  rspec (~> 3)
107
102
 
108
103
  BUNDLED WITH
109
- 2.3.3
104
+ 2.3.10
data/lib/country_select/formats.rb CHANGED
@@ -4,6 +4,6 @@ module CountrySelect
4
4
  FORMATS[:default] = lambda do |country|
5
5
  # Need to use :[] specifically, not :dig, because country.translations is a
6
6
  # ISO3166::Translations object, which overrides :[] to support i18n locale fallbacks
7
- country.translations&.send(:[], I18n.locale.to_s) || country.iso_short_name
7
+ country.translations&.send(:[], I18n.locale.to_s) || country.common_name || country.iso_short_name
8
8
  end
9
9
  end
data/lib/country_select/tag_helper.rb CHANGED
@@ -79,9 +79,8 @@ module CountrySelect
79
79
  country_list = country_codes.map do |code_or_name|
80
80
  if country = ISO3166::Country.new(code_or_name)
81
81
  code = country.alpha2
82
- elsif country = ISO3166::Country.find_by_unofficial_names(code_or_name)
83
- code = country.first
84
- country = ISO3166::Country.new(code)
82
+ elsif country = ISO3166::Country.find_country_by_any_name(code_or_name)
83
+ code = country.alpha2
85
84
  end
86
85
 
87
86
  unless country.present?
data/lib/country_select/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module CountrySelect
2
- VERSION = '6.1.1'
2
+ VERSION = '7.0.0'
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: country_select
3
3
  version: !ruby/object:Gem::Version
4
- version: 6.1.1
4
+ version: 7.0.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Stefan Penner
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2022-01-20 00:00:00.000000000 Z
11
+ date: 2022-04-03 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: actionpack
@@ -72,14 +72,14 @@ dependencies:
72
72
  requirements:
73
73
  - - "~>"
74
74
  - !ruby/object:Gem::Version
75
- version: '4.2'
75
+ version: '5.0'
76
76
  type: :runtime
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
80
  - - "~>"
81
81
  - !ruby/object:Gem::Version
82
- version: '4.2'
82
+ version: '5.0'
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: sort_alphabetical
85
85
  requirement: !ruby/object:Gem::Requirement
@@ -104,6 +104,7 @@ extensions: []
104
104
  extra_rdoc_files: []
105
105
  files:
106
106
  - ".github/workflows/build.yml"
107
+ - ".github/workflows/codeql-analysis.yml"
107
108
  - ".gitignore"
108
109
  - ".rspec"
109
110
  - CHANGELOG.md
@@ -136,7 +137,10 @@ files:
136
137
  homepage: https://github.com/countries/country_select
137
138
  licenses:
138
139
  - MIT
139
- metadata: {}
140
+ metadata:
141
+ bug_tracker_uri: http://github.com/countries/country_select/issues
142
+ changelog_uri: https://github.com/countries/country_select/blob/master/CHANGELOG.md
143
+ source_code_uri: https://github.com/countries/country_select
140
144
  post_install_message:
141
145
  rdoc_options: []
142
146
  require_paths:
@@ -145,14 +149,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
145
149
  requirements:
146
150
  - - ">="
147
151
  - !ruby/object:Gem::Version
148
- version: '2.5'
152
+ version: '2.7'
149
153
  required_rubygems_version: !ruby/object:Gem::Requirement
150
154
  requirements:
151
155
  - - ">="
152
156
  - !ruby/object:Gem::Version
153
157
  version: '0'
154
158
  requirements: []
155
- rubygems_version: 3.3.3
159
+ rubygems_version: 3.3.7
156
160
  signing_key:
157
161
  specification_version: 4
158
162
  summary: Country Select Plugin