country_select 10.0.1 → 11.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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 92a0226c36caabca861d829d8963d164ad480a27b80c58d36a4605739d7439a5
4
- data.tar.gz: e7f8b5698150f44c52a0442b2f32954477842bf10312ac547b70ff72ad01b634
3
+ metadata.gz: 7a466635fed31b8e5cec2aa2e027b660fbe29192ea904148b0868d9e02de0c32
4
+ data.tar.gz: ec49cffffa6bfef5fbae3ce77534ef0d287d4dab4eb1657b26d51fd21be4873a
5
5
  SHA512:
6
- metadata.gz: 6510b6f1e6a7201e9d436440d0be0b69d769a739a0141d8966c3a6dc286973c9d03bcc1bf3bc4e395dfeede6a65f9d31300792e35c6e31f9cc2fd98658969204
7
- data.tar.gz: 9deebc2b901857e5d7fa46f04dc7016794e4dc44fc67d344d87f90b263f32c7f0374fcf0a4453279c7dfb2ad89929427709771f04b4c274455cc5dbd01eca57c
6
+ metadata.gz: 3f4b1672b7fa38662430f15305ae861864152767b78fc1df8b88918c967f5f32c54ac7c29b813225b2d0476a0af19043b3ae3817742a069d4e9ac12ae4e3304b
7
+ data.tar.gz: 756db308e0954e380982a08c2df10d9b58437e537c4502ac51e79bdfad8ff41437713760d4da9865d2e65a995d6ad5030860428ba943801670e036c850103555
@@ -16,11 +16,8 @@ jobs:
16
16
  strategy:
17
17
  fail-fast: false
18
18
  matrix:
19
- ruby: [3.1, 3.2, 3.3, 3.4]
20
- gemfile: ['7.0', 7.1, 7.2, '8.0']
21
- exclude:
22
- - ruby: 3.1
23
- gemfile: '8.0'
19
+ ruby: [3.2, 3.3, 3.4]
20
+ gemfile: [7.1, 7.2, '8.0']
24
21
  env: # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps
25
22
  BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/actionpack-${{ matrix.gemfile }}.gemfile
26
23
  CC_TEST_REPORTER_ID: 0d09e6611c01dedd75511b1c60f62329d01729289e06375cfe67cefe67013d9f
@@ -31,7 +28,7 @@ jobs:
31
28
  with:
32
29
  ruby-version: ${{ matrix.ruby }}
33
30
  bundler-cache: true
34
- cache-version: 9
31
+ cache-version: 10
35
32
  - name: Run tests
36
33
 
37
34
  run: bundle exec rake
data/CHANGELOG.md CHANGED
@@ -1,3 +1,9 @@
1
+ ## 11.0.0 2025-05-31
2
+
3
+ * fix: Improve sorting for non-Latin country names by @kiyohara in https://github.com/countries/country_select/pull/230
4
+ * Drop support for Ruby 3.1, Rails 7.0 and countries gem 5.x. Allow countries gem 8.x by @pmor in https://github.com/countries/country_select/pull/232
5
+ * Use <hr> as divider by @ursm in https://github.com/countries/country_select/pull/229
6
+
1
7
  ## 10.0.1 2025-01-04
2
8
 
3
9
  * Add Ruby 3.4 and Rails 8.0 to the test matrix and drop Rails 6.1 tests. by @pmor in https://github.com/countries/country_select/pull/228
data/Gemfile CHANGED
@@ -3,3 +3,5 @@
3
3
  source 'https://rubygems.org'
4
4
 
5
5
  gemspec
6
+
7
+ gem 'actionpack', '> 7.0'
data/Gemfile.lock CHANGED
@@ -1,15 +1,15 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- country_select (10.0.0)
5
- countries (> 5.0, < 8.0)
4
+ country_select (10.0.1)
5
+ countries (> 6.0, < 9.0)
6
6
 
7
7
  GEM
8
8
  remote: https://rubygems.org/
9
9
  specs:
10
- actionpack (8.0.1)
11
- actionview (= 8.0.1)
12
- activesupport (= 8.0.1)
10
+ actionpack (8.0.2)
11
+ actionview (= 8.0.2)
12
+ activesupport (= 8.0.2)
13
13
  nokogiri (>= 1.8.5)
14
14
  rack (>= 2.2.4)
15
15
  rack-session (>= 1.0.1)
@@ -17,13 +17,13 @@ GEM
17
17
  rails-dom-testing (~> 2.2)
18
18
  rails-html-sanitizer (~> 1.6)
19
19
  useragent (~> 0.16)
20
- actionview (8.0.1)
21
- activesupport (= 8.0.1)
20
+ actionview (8.0.2)
21
+ activesupport (= 8.0.2)
22
22
  builder (~> 3.1)
23
23
  erubi (~> 1.11)
24
24
  rails-dom-testing (~> 2.2)
25
25
  rails-html-sanitizer (~> 1.6)
26
- activesupport (8.0.1)
26
+ activesupport (8.0.2)
27
27
  base64
28
28
  benchmark (>= 0.3)
29
29
  bigdecimal
@@ -36,79 +36,79 @@ GEM
36
36
  securerandom (>= 0.3)
37
37
  tzinfo (~> 2.0, >= 2.0.5)
38
38
  uri (>= 0.13.1)
39
- base64 (0.2.0)
40
- benchmark (0.4.0)
41
- bigdecimal (3.1.9)
39
+ base64 (0.3.0)
40
+ benchmark (0.4.1)
41
+ bigdecimal (3.2.1)
42
42
  builder (3.3.0)
43
43
  coderay (1.1.3)
44
- concurrent-ruby (1.3.4)
45
- connection_pool (2.4.1)
46
- countries (7.1.0)
44
+ concurrent-ruby (1.3.5)
45
+ connection_pool (2.5.3)
46
+ countries (8.0.0)
47
47
  unaccent (~> 0.3)
48
48
  crass (1.0.6)
49
- diff-lcs (1.5.1)
49
+ diff-lcs (1.6.2)
50
50
  docile (1.4.1)
51
- drb (2.2.1)
51
+ drb (2.2.3)
52
52
  erubi (1.13.1)
53
- i18n (1.14.6)
53
+ i18n (1.14.7)
54
54
  concurrent-ruby (~> 1.0)
55
- logger (1.6.4)
56
- loofah (2.24.0)
55
+ logger (1.7.0)
56
+ loofah (2.24.1)
57
57
  crass (~> 1.0.2)
58
58
  nokogiri (>= 1.12.0)
59
59
  method_source (1.1.0)
60
- mini_portile2 (2.8.8)
61
- minitest (5.25.4)
62
- nokogiri (1.18.1)
60
+ mini_portile2 (2.8.9)
61
+ minitest (5.25.5)
62
+ nokogiri (1.18.8)
63
63
  mini_portile2 (~> 2.8.2)
64
64
  racc (~> 1.4)
65
- nokogiri (1.18.1-aarch64-linux-gnu)
65
+ nokogiri (1.18.8-aarch64-linux-gnu)
66
66
  racc (~> 1.4)
67
- nokogiri (1.18.1-aarch64-linux-musl)
67
+ nokogiri (1.18.8-aarch64-linux-musl)
68
68
  racc (~> 1.4)
69
- nokogiri (1.18.1-arm-linux-gnu)
69
+ nokogiri (1.18.8-arm-linux-gnu)
70
70
  racc (~> 1.4)
71
- nokogiri (1.18.1-arm-linux-musl)
71
+ nokogiri (1.18.8-arm-linux-musl)
72
72
  racc (~> 1.4)
73
- nokogiri (1.18.1-arm64-darwin)
73
+ nokogiri (1.18.8-arm64-darwin)
74
74
  racc (~> 1.4)
75
- nokogiri (1.18.1-x86_64-darwin)
75
+ nokogiri (1.18.8-x86_64-darwin)
76
76
  racc (~> 1.4)
77
- nokogiri (1.18.1-x86_64-linux-gnu)
77
+ nokogiri (1.18.8-x86_64-linux-gnu)
78
78
  racc (~> 1.4)
79
- nokogiri (1.18.1-x86_64-linux-musl)
79
+ nokogiri (1.18.8-x86_64-linux-musl)
80
80
  racc (~> 1.4)
81
81
  pry (0.15.2)
82
82
  coderay (~> 1.1)
83
83
  method_source (~> 1.0)
84
84
  racc (1.8.1)
85
- rack (3.1.8)
86
- rack-session (2.1.0)
85
+ rack (3.1.15)
86
+ rack-session (2.1.1)
87
87
  base64 (>= 0.1.0)
88
88
  rack (>= 3.0.0)
89
89
  rack-test (2.2.0)
90
90
  rack (>= 1.3)
91
- rails-dom-testing (2.2.0)
91
+ rails-dom-testing (2.3.0)
92
92
  activesupport (>= 5.0.0)
93
93
  minitest
94
94
  nokogiri (>= 1.6)
95
95
  rails-html-sanitizer (1.6.2)
96
96
  loofah (~> 2.21)
97
97
  nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
98
- rake (13.2.1)
99
- rspec (3.13.0)
98
+ rake (13.3.0)
99
+ rspec (3.13.1)
100
100
  rspec-core (~> 3.13.0)
101
101
  rspec-expectations (~> 3.13.0)
102
102
  rspec-mocks (~> 3.13.0)
103
- rspec-core (3.13.2)
103
+ rspec-core (3.13.4)
104
104
  rspec-support (~> 3.13.0)
105
- rspec-expectations (3.13.3)
105
+ rspec-expectations (3.13.5)
106
106
  diff-lcs (>= 1.2.0, < 2.0)
107
107
  rspec-support (~> 3.13.0)
108
- rspec-mocks (3.13.2)
108
+ rspec-mocks (3.13.5)
109
109
  diff-lcs (>= 1.2.0, < 2.0)
110
110
  rspec-support (~> 3.13.0)
111
- rspec-support (3.13.2)
111
+ rspec-support (3.13.4)
112
112
  securerandom (0.4.1)
113
113
  simplecov (0.22.0)
114
114
  docile (~> 1.1)
@@ -119,7 +119,7 @@ GEM
119
119
  tzinfo (2.0.6)
120
120
  concurrent-ruby (~> 1.0)
121
121
  unaccent (0.4.0)
122
- uri (1.0.2)
122
+ uri (1.0.3)
123
123
  useragent (0.16.11)
124
124
 
125
125
  PLATFORMS
data/README.md CHANGED
@@ -76,11 +76,6 @@ Pre-selecting a particular country:
76
76
  country_select("user", "country", selected: "GB")
77
77
  ```
78
78
 
79
- Changing the divider when priority_countries is active.
80
- ```ruby
81
- country_select("user", "country", priority_countries: ["AR", "US"], priority_countries_divider: "~~~~~~")
82
- ```
83
-
84
79
  Using existing `select` options:
85
80
  ```ruby
86
81
  country_select("user", "country", include_blank: true)
@@ -126,7 +121,7 @@ country_select("user", "country", format: :with_data_attrs)
126
121
  ### Using customized defaults
127
122
 
128
123
  You can configure overridable defaults for `except`, `format`, `locale`,
129
- `only`, `priority_countries` and `priority_countries_divider` in an initializer.
124
+ `only` and `priority_countries` in an initializer.
130
125
 
131
126
  ````ruby
132
127
  # config/initializers/country_select.rb
@@ -24,13 +24,12 @@ Gem::Specification.new do |s|
24
24
  s.executables = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
25
25
  s.require_paths = ['lib']
26
26
 
27
- s.required_ruby_version = '>= 3.1'
27
+ s.required_ruby_version = '>= 3.2'
28
28
 
29
- s.add_development_dependency 'actionpack', '> 7.0'
30
29
  s.add_development_dependency 'pry', '~> 0'
31
30
  s.add_development_dependency 'rake', '~> 13'
32
31
  s.add_development_dependency 'rspec', '~> 3'
33
32
  s.add_development_dependency 'simplecov', '~> 0.22'
34
33
 
35
- s.add_dependency 'countries', '> 5.0', '< 8.0'
34
+ s.add_dependency 'countries', '> 6.0', '< 9.0'
36
35
  end
@@ -2,7 +2,7 @@ PATH
2
2
  remote: ..
3
3
  specs:
4
4
  country_select (10.0.1)
5
- countries (> 5.0, < 8.0)
5
+ countries (> 6.0, < 9.0)
6
6
 
7
7
  GEM
8
8
  remote: https://rubygems.org/
@@ -36,66 +36,71 @@ GEM
36
36
  mutex_m
37
37
  securerandom (>= 0.3)
38
38
  tzinfo (~> 2.0)
39
- base64 (0.2.0)
40
- benchmark (0.4.0)
41
- bigdecimal (3.1.9)
39
+ base64 (0.3.0)
40
+ benchmark (0.4.1)
41
+ bigdecimal (3.2.1)
42
42
  builder (3.3.0)
43
43
  coderay (1.1.3)
44
- concurrent-ruby (1.3.4)
45
- connection_pool (2.4.1)
46
- countries (7.1.0)
44
+ concurrent-ruby (1.3.5)
45
+ connection_pool (2.5.3)
46
+ countries (8.0.0)
47
47
  unaccent (~> 0.3)
48
48
  crass (1.0.6)
49
49
  date (3.4.1)
50
- diff-lcs (1.5.1)
50
+ diff-lcs (1.6.2)
51
51
  docile (1.4.1)
52
- drb (2.2.1)
52
+ drb (2.2.3)
53
+ erb (5.0.1)
53
54
  erubi (1.13.1)
54
- i18n (1.14.6)
55
+ i18n (1.14.7)
55
56
  concurrent-ruby (~> 1.0)
56
57
  io-console (0.8.0)
57
- irb (1.14.3)
58
+ irb (1.15.2)
59
+ pp (>= 0.6.0)
58
60
  rdoc (>= 4.0.0)
59
61
  reline (>= 0.4.2)
60
- logger (1.6.4)
61
- loofah (2.24.0)
62
+ logger (1.7.0)
63
+ loofah (2.24.1)
62
64
  crass (~> 1.0.2)
63
65
  nokogiri (>= 1.12.0)
64
66
  method_source (1.1.0)
65
- minitest (5.25.4)
67
+ minitest (5.25.5)
66
68
  mutex_m (0.3.0)
67
- nokogiri (1.18.1-aarch64-linux-gnu)
69
+ nokogiri (1.18.8-aarch64-linux-gnu)
68
70
  racc (~> 1.4)
69
- nokogiri (1.18.1-aarch64-linux-musl)
71
+ nokogiri (1.18.8-aarch64-linux-musl)
70
72
  racc (~> 1.4)
71
- nokogiri (1.18.1-arm-linux-gnu)
73
+ nokogiri (1.18.8-arm-linux-gnu)
72
74
  racc (~> 1.4)
73
- nokogiri (1.18.1-arm-linux-musl)
75
+ nokogiri (1.18.8-arm-linux-musl)
74
76
  racc (~> 1.4)
75
- nokogiri (1.18.1-arm64-darwin)
77
+ nokogiri (1.18.8-arm64-darwin)
76
78
  racc (~> 1.4)
77
- nokogiri (1.18.1-x86_64-darwin)
79
+ nokogiri (1.18.8-x86_64-darwin)
78
80
  racc (~> 1.4)
79
- nokogiri (1.18.1-x86_64-linux-gnu)
81
+ nokogiri (1.18.8-x86_64-linux-gnu)
80
82
  racc (~> 1.4)
81
- nokogiri (1.18.1-x86_64-linux-musl)
83
+ nokogiri (1.18.8-x86_64-linux-musl)
82
84
  racc (~> 1.4)
85
+ pp (0.6.2)
86
+ prettyprint
87
+ prettyprint (0.2.0)
83
88
  pry (0.15.2)
84
89
  coderay (~> 1.1)
85
90
  method_source (~> 1.0)
86
- psych (5.2.2)
91
+ psych (5.2.6)
87
92
  date
88
93
  stringio
89
94
  racc (1.8.1)
90
- rack (3.1.8)
91
- rack-session (2.1.0)
95
+ rack (3.1.15)
96
+ rack-session (2.1.1)
92
97
  base64 (>= 0.1.0)
93
98
  rack (>= 3.0.0)
94
99
  rack-test (2.2.0)
95
100
  rack (>= 1.3)
96
101
  rackup (2.2.1)
97
102
  rack (>= 3)
98
- rails-dom-testing (2.2.0)
103
+ rails-dom-testing (2.3.0)
99
104
  activesupport (>= 5.0.0)
100
105
  minitest
101
106
  nokogiri (>= 1.6)
@@ -110,24 +115,25 @@ GEM
110
115
  rake (>= 12.2)
111
116
  thor (~> 1.0, >= 1.2.2)
112
117
  zeitwerk (~> 2.6)
113
- rake (13.2.1)
114
- rdoc (6.10.0)
118
+ rake (13.3.0)
119
+ rdoc (6.14.0)
120
+ erb
115
121
  psych (>= 4.0.0)
116
- reline (0.6.0)
122
+ reline (0.6.1)
117
123
  io-console (~> 0.5)
118
- rspec (3.13.0)
124
+ rspec (3.13.1)
119
125
  rspec-core (~> 3.13.0)
120
126
  rspec-expectations (~> 3.13.0)
121
127
  rspec-mocks (~> 3.13.0)
122
- rspec-core (3.13.2)
128
+ rspec-core (3.13.4)
123
129
  rspec-support (~> 3.13.0)
124
- rspec-expectations (3.13.3)
130
+ rspec-expectations (3.13.5)
125
131
  diff-lcs (>= 1.2.0, < 2.0)
126
132
  rspec-support (~> 3.13.0)
127
- rspec-mocks (3.13.2)
133
+ rspec-mocks (3.13.5)
128
134
  diff-lcs (>= 1.2.0, < 2.0)
129
135
  rspec-support (~> 3.13.0)
130
- rspec-support (3.13.2)
136
+ rspec-support (3.13.4)
131
137
  securerandom (0.4.1)
132
138
  simplecov (0.22.0)
133
139
  docile (~> 1.1)
@@ -135,12 +141,12 @@ GEM
135
141
  simplecov_json_formatter (~> 0.1)
136
142
  simplecov-html (0.13.1)
137
143
  simplecov_json_formatter (0.1.4)
138
- stringio (3.1.2)
144
+ stringio (3.1.7)
139
145
  thor (1.3.2)
140
146
  tzinfo (2.0.6)
141
147
  concurrent-ruby (~> 1.0)
142
148
  unaccent (0.4.0)
143
- zeitwerk (2.7.1)
149
+ zeitwerk (2.7.3)
144
150
 
145
151
  PLATFORMS
146
152
  aarch64-linux-gnu
@@ -2,7 +2,7 @@ PATH
2
2
  remote: ..
3
3
  specs:
4
4
  country_select (10.0.1)
5
- countries (> 5.0, < 8.0)
5
+ countries (> 6.0, < 9.0)
6
6
 
7
7
  GEM
8
8
  remote: https://rubygems.org/
@@ -36,69 +36,74 @@ GEM
36
36
  minitest (>= 5.1)
37
37
  securerandom (>= 0.3)
38
38
  tzinfo (~> 2.0, >= 2.0.5)
39
- base64 (0.2.0)
40
- benchmark (0.4.0)
41
- bigdecimal (3.1.9)
39
+ base64 (0.3.0)
40
+ benchmark (0.4.1)
41
+ bigdecimal (3.2.1)
42
42
  builder (3.3.0)
43
43
  coderay (1.1.3)
44
- concurrent-ruby (1.3.4)
45
- connection_pool (2.4.1)
46
- countries (7.1.0)
44
+ concurrent-ruby (1.3.5)
45
+ connection_pool (2.5.3)
46
+ countries (8.0.0)
47
47
  unaccent (~> 0.3)
48
48
  crass (1.0.6)
49
49
  date (3.4.1)
50
- diff-lcs (1.5.1)
50
+ diff-lcs (1.6.2)
51
51
  docile (1.4.1)
52
- drb (2.2.1)
52
+ drb (2.2.3)
53
+ erb (5.0.1)
53
54
  erubi (1.13.1)
54
- i18n (1.14.6)
55
+ i18n (1.14.7)
55
56
  concurrent-ruby (~> 1.0)
56
57
  io-console (0.8.0)
57
- irb (1.14.3)
58
+ irb (1.15.2)
59
+ pp (>= 0.6.0)
58
60
  rdoc (>= 4.0.0)
59
61
  reline (>= 0.4.2)
60
- logger (1.6.4)
61
- loofah (2.24.0)
62
+ logger (1.7.0)
63
+ loofah (2.24.1)
62
64
  crass (~> 1.0.2)
63
65
  nokogiri (>= 1.12.0)
64
66
  method_source (1.1.0)
65
- mini_portile2 (2.8.8)
66
- minitest (5.25.4)
67
- nokogiri (1.18.1)
67
+ mini_portile2 (2.8.9)
68
+ minitest (5.25.5)
69
+ nokogiri (1.18.8)
68
70
  mini_portile2 (~> 2.8.2)
69
71
  racc (~> 1.4)
70
- nokogiri (1.18.1-aarch64-linux-gnu)
72
+ nokogiri (1.18.8-aarch64-linux-gnu)
71
73
  racc (~> 1.4)
72
- nokogiri (1.18.1-aarch64-linux-musl)
74
+ nokogiri (1.18.8-aarch64-linux-musl)
73
75
  racc (~> 1.4)
74
- nokogiri (1.18.1-arm-linux-gnu)
76
+ nokogiri (1.18.8-arm-linux-gnu)
75
77
  racc (~> 1.4)
76
- nokogiri (1.18.1-arm-linux-musl)
78
+ nokogiri (1.18.8-arm-linux-musl)
77
79
  racc (~> 1.4)
78
- nokogiri (1.18.1-arm64-darwin)
80
+ nokogiri (1.18.8-arm64-darwin)
79
81
  racc (~> 1.4)
80
- nokogiri (1.18.1-x86_64-darwin)
82
+ nokogiri (1.18.8-x86_64-darwin)
81
83
  racc (~> 1.4)
82
- nokogiri (1.18.1-x86_64-linux-gnu)
84
+ nokogiri (1.18.8-x86_64-linux-gnu)
83
85
  racc (~> 1.4)
84
- nokogiri (1.18.1-x86_64-linux-musl)
86
+ nokogiri (1.18.8-x86_64-linux-musl)
85
87
  racc (~> 1.4)
88
+ pp (0.6.2)
89
+ prettyprint
90
+ prettyprint (0.2.0)
86
91
  pry (0.15.2)
87
92
  coderay (~> 1.1)
88
93
  method_source (~> 1.0)
89
- psych (5.2.2)
94
+ psych (5.2.6)
90
95
  date
91
96
  stringio
92
97
  racc (1.8.1)
93
- rack (3.1.8)
94
- rack-session (2.1.0)
98
+ rack (3.1.15)
99
+ rack-session (2.1.1)
95
100
  base64 (>= 0.1.0)
96
101
  rack (>= 3.0.0)
97
102
  rack-test (2.2.0)
98
103
  rack (>= 1.3)
99
104
  rackup (2.2.1)
100
105
  rack (>= 3)
101
- rails-dom-testing (2.2.0)
106
+ rails-dom-testing (2.3.0)
102
107
  activesupport (>= 5.0.0)
103
108
  minitest
104
109
  nokogiri (>= 1.6)
@@ -113,24 +118,25 @@ GEM
113
118
  rake (>= 12.2)
114
119
  thor (~> 1.0, >= 1.2.2)
115
120
  zeitwerk (~> 2.6)
116
- rake (13.2.1)
117
- rdoc (6.10.0)
121
+ rake (13.3.0)
122
+ rdoc (6.14.0)
123
+ erb
118
124
  psych (>= 4.0.0)
119
- reline (0.6.0)
125
+ reline (0.6.1)
120
126
  io-console (~> 0.5)
121
- rspec (3.13.0)
127
+ rspec (3.13.1)
122
128
  rspec-core (~> 3.13.0)
123
129
  rspec-expectations (~> 3.13.0)
124
130
  rspec-mocks (~> 3.13.0)
125
- rspec-core (3.13.2)
131
+ rspec-core (3.13.4)
126
132
  rspec-support (~> 3.13.0)
127
- rspec-expectations (3.13.3)
133
+ rspec-expectations (3.13.5)
128
134
  diff-lcs (>= 1.2.0, < 2.0)
129
135
  rspec-support (~> 3.13.0)
130
- rspec-mocks (3.13.2)
136
+ rspec-mocks (3.13.5)
131
137
  diff-lcs (>= 1.2.0, < 2.0)
132
138
  rspec-support (~> 3.13.0)
133
- rspec-support (3.13.2)
139
+ rspec-support (3.13.4)
134
140
  securerandom (0.4.1)
135
141
  simplecov (0.22.0)
136
142
  docile (~> 1.1)
@@ -138,13 +144,13 @@ GEM
138
144
  simplecov_json_formatter (~> 0.1)
139
145
  simplecov-html (0.13.1)
140
146
  simplecov_json_formatter (0.1.4)
141
- stringio (3.1.2)
147
+ stringio (3.1.7)
142
148
  thor (1.3.2)
143
149
  tzinfo (2.0.6)
144
150
  concurrent-ruby (~> 1.0)
145
151
  unaccent (0.4.0)
146
152
  useragent (0.16.11)
147
- zeitwerk (2.7.1)
153
+ zeitwerk (2.7.3)
148
154
 
149
155
  PLATFORMS
150
156
  aarch64-linux
@@ -2,14 +2,14 @@ PATH
2
2
  remote: ..
3
3
  specs:
4
4
  country_select (10.0.1)
5
- countries (> 5.0, < 8.0)
5
+ countries (> 6.0, < 9.0)
6
6
 
7
7
  GEM
8
8
  remote: https://rubygems.org/
9
9
  specs:
10
- actionpack (8.0.1)
11
- actionview (= 8.0.1)
12
- activesupport (= 8.0.1)
10
+ actionpack (8.0.2)
11
+ actionview (= 8.0.2)
12
+ activesupport (= 8.0.2)
13
13
  nokogiri (>= 1.8.5)
14
14
  rack (>= 2.2.4)
15
15
  rack-session (>= 1.0.1)
@@ -17,13 +17,13 @@ GEM
17
17
  rails-dom-testing (~> 2.2)
18
18
  rails-html-sanitizer (~> 1.6)
19
19
  useragent (~> 0.16)
20
- actionview (8.0.1)
21
- activesupport (= 8.0.1)
20
+ actionview (8.0.2)
21
+ activesupport (= 8.0.2)
22
22
  builder (~> 3.1)
23
23
  erubi (~> 1.11)
24
24
  rails-dom-testing (~> 2.2)
25
25
  rails-html-sanitizer (~> 1.6)
26
- activesupport (8.0.1)
26
+ activesupport (8.0.2)
27
27
  base64
28
28
  benchmark (>= 0.3)
29
29
  bigdecimal
@@ -36,97 +36,103 @@ GEM
36
36
  securerandom (>= 0.3)
37
37
  tzinfo (~> 2.0, >= 2.0.5)
38
38
  uri (>= 0.13.1)
39
- base64 (0.2.0)
40
- benchmark (0.4.0)
41
- bigdecimal (3.1.9)
39
+ base64 (0.3.0)
40
+ benchmark (0.4.1)
41
+ bigdecimal (3.2.1)
42
42
  builder (3.3.0)
43
43
  coderay (1.1.3)
44
- concurrent-ruby (1.3.4)
45
- connection_pool (2.4.1)
46
- countries (7.1.0)
44
+ concurrent-ruby (1.3.5)
45
+ connection_pool (2.5.3)
46
+ countries (8.0.0)
47
47
  unaccent (~> 0.3)
48
48
  crass (1.0.6)
49
49
  date (3.4.1)
50
- diff-lcs (1.5.1)
50
+ diff-lcs (1.6.2)
51
51
  docile (1.4.1)
52
- drb (2.2.1)
52
+ drb (2.2.3)
53
+ erb (5.0.1)
53
54
  erubi (1.13.1)
54
- i18n (1.14.6)
55
+ i18n (1.14.7)
55
56
  concurrent-ruby (~> 1.0)
56
57
  io-console (0.8.0)
57
- irb (1.14.3)
58
+ irb (1.15.2)
59
+ pp (>= 0.6.0)
58
60
  rdoc (>= 4.0.0)
59
61
  reline (>= 0.4.2)
60
- logger (1.6.4)
61
- loofah (2.24.0)
62
+ logger (1.7.0)
63
+ loofah (2.24.1)
62
64
  crass (~> 1.0.2)
63
65
  nokogiri (>= 1.12.0)
64
66
  method_source (1.1.0)
65
- minitest (5.25.4)
66
- nokogiri (1.18.1-aarch64-linux-gnu)
67
+ minitest (5.25.5)
68
+ nokogiri (1.18.8-aarch64-linux-gnu)
67
69
  racc (~> 1.4)
68
- nokogiri (1.18.1-aarch64-linux-musl)
70
+ nokogiri (1.18.8-aarch64-linux-musl)
69
71
  racc (~> 1.4)
70
- nokogiri (1.18.1-arm-linux-gnu)
72
+ nokogiri (1.18.8-arm-linux-gnu)
71
73
  racc (~> 1.4)
72
- nokogiri (1.18.1-arm-linux-musl)
74
+ nokogiri (1.18.8-arm-linux-musl)
73
75
  racc (~> 1.4)
74
- nokogiri (1.18.1-arm64-darwin)
76
+ nokogiri (1.18.8-arm64-darwin)
75
77
  racc (~> 1.4)
76
- nokogiri (1.18.1-x86_64-darwin)
78
+ nokogiri (1.18.8-x86_64-darwin)
77
79
  racc (~> 1.4)
78
- nokogiri (1.18.1-x86_64-linux-gnu)
80
+ nokogiri (1.18.8-x86_64-linux-gnu)
79
81
  racc (~> 1.4)
80
- nokogiri (1.18.1-x86_64-linux-musl)
82
+ nokogiri (1.18.8-x86_64-linux-musl)
81
83
  racc (~> 1.4)
84
+ pp (0.6.2)
85
+ prettyprint
86
+ prettyprint (0.2.0)
82
87
  pry (0.15.2)
83
88
  coderay (~> 1.1)
84
89
  method_source (~> 1.0)
85
- psych (5.2.2)
90
+ psych (5.2.6)
86
91
  date
87
92
  stringio
88
93
  racc (1.8.1)
89
- rack (3.1.8)
90
- rack-session (2.1.0)
94
+ rack (3.1.15)
95
+ rack-session (2.1.1)
91
96
  base64 (>= 0.1.0)
92
97
  rack (>= 3.0.0)
93
98
  rack-test (2.2.0)
94
99
  rack (>= 1.3)
95
100
  rackup (2.2.1)
96
101
  rack (>= 3)
97
- rails-dom-testing (2.2.0)
102
+ rails-dom-testing (2.3.0)
98
103
  activesupport (>= 5.0.0)
99
104
  minitest
100
105
  nokogiri (>= 1.6)
101
106
  rails-html-sanitizer (1.6.2)
102
107
  loofah (~> 2.21)
103
108
  nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
104
- railties (8.0.1)
105
- actionpack (= 8.0.1)
106
- activesupport (= 8.0.1)
109
+ railties (8.0.2)
110
+ actionpack (= 8.0.2)
111
+ activesupport (= 8.0.2)
107
112
  irb (~> 1.13)
108
113
  rackup (>= 1.0.0)
109
114
  rake (>= 12.2)
110
115
  thor (~> 1.0, >= 1.2.2)
111
116
  zeitwerk (~> 2.6)
112
- rake (13.2.1)
113
- rdoc (6.10.0)
117
+ rake (13.3.0)
118
+ rdoc (6.14.0)
119
+ erb
114
120
  psych (>= 4.0.0)
115
- reline (0.6.0)
121
+ reline (0.6.1)
116
122
  io-console (~> 0.5)
117
- rspec (3.13.0)
123
+ rspec (3.13.1)
118
124
  rspec-core (~> 3.13.0)
119
125
  rspec-expectations (~> 3.13.0)
120
126
  rspec-mocks (~> 3.13.0)
121
- rspec-core (3.13.2)
127
+ rspec-core (3.13.4)
122
128
  rspec-support (~> 3.13.0)
123
- rspec-expectations (3.13.3)
129
+ rspec-expectations (3.13.5)
124
130
  diff-lcs (>= 1.2.0, < 2.0)
125
131
  rspec-support (~> 3.13.0)
126
- rspec-mocks (3.13.2)
132
+ rspec-mocks (3.13.5)
127
133
  diff-lcs (>= 1.2.0, < 2.0)
128
134
  rspec-support (~> 3.13.0)
129
- rspec-support (3.13.2)
135
+ rspec-support (3.13.4)
130
136
  securerandom (0.4.1)
131
137
  simplecov (0.22.0)
132
138
  docile (~> 1.1)
@@ -134,14 +140,14 @@ GEM
134
140
  simplecov_json_formatter (~> 0.1)
135
141
  simplecov-html (0.13.1)
136
142
  simplecov_json_formatter (0.1.4)
137
- stringio (3.1.2)
143
+ stringio (3.1.7)
138
144
  thor (1.3.2)
139
145
  tzinfo (2.0.6)
140
146
  concurrent-ruby (~> 1.0)
141
147
  unaccent (0.4.0)
142
- uri (1.0.2)
148
+ uri (1.0.3)
143
149
  useragent (0.16.11)
144
- zeitwerk (2.7.1)
150
+ zeitwerk (2.7.3)
145
151
 
146
152
  PLATFORMS
147
153
  aarch64-linux-gnu
@@ -7,7 +7,6 @@ module CountrySelect
7
7
  locale: nil,
8
8
  only: nil,
9
9
  priority_countries: nil,
10
- priority_countries_divider: '-' * 15,
11
10
  sort_provided: true
12
11
  }
13
12
  end
@@ -43,10 +43,6 @@ module CountrySelect
43
43
  @options.fetch(:priority_countries, ::CountrySelect::DEFAULTS[:priority_countries])
44
44
  end
45
45
 
46
- def priority_countries_divider
47
- @options.fetch(:priority_countries_divider, ::CountrySelect::DEFAULTS[:priority_countries_divider])
48
- end
49
-
50
46
  def only_country_codes
51
47
  @options.fetch(:only, ::CountrySelect::DEFAULTS[:only])
52
48
  end
@@ -77,7 +73,14 @@ module CountrySelect
77
73
  I18n.with_locale(locale) do
78
74
  country_list = country_codes.map { |code_or_name| get_formatted_country(code_or_name) }
79
75
 
80
- country_list.sort_by! { |name, _| [I18n.transliterate(name.to_s), name] } if sorted
76
+ country_list.sort_by! { |name, _|
77
+ transliterated_name = I18n.transliterate(name.to_s)
78
+ if transliterated_name.include?('?') # For languages that cannot be transliterated (e.g. languages with non-Latin scripts)
79
+ [name, name] # If transliteration fails, duplicate the original name to maintain a consistent two-element array structure.
80
+ else
81
+ [transliterated_name, name]
82
+ end
83
+ } if sorted
81
84
  country_list
82
85
  end
83
86
  end
@@ -98,9 +101,7 @@ module CountrySelect
98
101
  end
99
102
 
100
103
  def priority_options_for_select(priority_countries_options, tags_options)
101
- option_tags = options_for_select(priority_countries_options, tags_options)
102
- option_tags += "\n".html_safe +
103
- options_for_select([priority_countries_divider], disabled: priority_countries_divider)
104
+ options_for_select(priority_countries_options, tags_options) + "\n<hr>".html_safe
104
105
  end
105
106
 
106
107
  def get_formatted_country(code_or_name)
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module CountrySelect
4
- VERSION = '10.0.1'
4
+ VERSION = '11.0.0'
5
5
  end
@@ -95,12 +95,10 @@ describe 'CountrySelect' do
95
95
  [
96
96
  ['Denmark', 'DK'],
97
97
  ['Latvia', 'LV'],
98
- ['United States', 'US'],
99
- ['-' * 15, '-' * 15]
98
+ ['United States', 'US']
100
99
  ],
101
- selected: 'US',
102
- disabled: '-' * 15
103
- )
100
+ selected: 'US'
101
+ ) + "\n<hr>".html_safe
104
102
 
105
103
  walrus.country_code = 'US'
106
104
  t = builder.country_select(:country_code, priority_countries: %w[LV US DK])
@@ -112,12 +110,10 @@ describe 'CountrySelect' do
112
110
  [
113
111
  ['Denmark', 'DK'],
114
112
  ['Latvia', 'LV'],
115
- ['United States', 'US'],
116
- ['-' * 15, '-' * 15]
113
+ ['United States', 'US']
117
114
  ],
118
- selected: 'US',
119
- disabled: '-' * 15
120
- )
115
+ selected: 'US'
116
+ ) + "\n<hr>".html_safe
121
117
 
122
118
  walrus.country_code = 'US'
123
119
  t = builder.country_select(:country_code, priority_countries: %w[LV US DK])
@@ -129,12 +125,10 @@ describe 'CountrySelect' do
129
125
  [
130
126
  ['Latvia', 'LV'],
131
127
  ['United States', 'US'],
132
- ['Denmark', 'DK'],
133
- ['-' * 15, '-' * 15]
128
+ ['Denmark', 'DK']
134
129
  ],
135
130
  selected: 'US',
136
- disabled: '-' * 15
137
- )
131
+ ) + "\n<hr>".html_safe
138
132
 
139
133
  walrus.country_code = 'US'
140
134
  t = builder.country_select(:country_code, priority_countries: %w[LV US DK], sort_provided: false)
@@ -146,12 +140,13 @@ describe 'CountrySelect' do
146
140
  [
147
141
  ['Latvia', 'LV'],
148
142
  ['United States', 'US'],
149
- ['Denmark', 'DK'],
150
- ['-' * 15, '-' * 15],
143
+ ['Denmark', 'DK']
144
+ ]
145
+ ) + "\n<hr>\n".html_safe + options_for_select(
146
+ [
151
147
  ['Afghanistan', 'AF']
152
148
  ],
153
- selected: 'AF',
154
- disabled: '-' * 15
149
+ selected: 'AF'
155
150
  )
156
151
 
157
152
  walrus.country_code = 'AF'
@@ -238,6 +233,16 @@ describe 'CountrySelect' do
238
233
  expect(order).to eq(%w[AF AX AL ZW])
239
234
  end
240
235
 
236
+ it 'sorts non-Latin strings' do
237
+ I18n.available_locales = [:ja]
238
+ I18n.locale = :ja
239
+ ISO3166.reset
240
+
241
+ tag = builder.country_select(:country_code, only: %w[US CN JP KR])
242
+ order = tag.scan(/value="(\w{2})"/).map { |o| o[0] }
243
+ expect(order).to eq(%w[CN KR JP US])
244
+ end
245
+
241
246
  describe 'custom formats' do
242
247
  it 'accepts a custom formatter' do
243
248
  CountrySelect::FORMATS[:with_alpha2] = lambda do |country|
metadata CHANGED
@@ -1,28 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: country_select
3
3
  version: !ruby/object:Gem::Version
4
- version: 10.0.1
4
+ version: 11.0.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Stefan Penner
8
8
  bindir: bin
9
9
  cert_chain: []
10
- date: 2025-01-04 00:00:00.000000000 Z
10
+ date: 1980-01-02 00:00:00.000000000 Z
11
11
  dependencies:
12
- - !ruby/object:Gem::Dependency
13
- name: actionpack
14
- requirement: !ruby/object:Gem::Requirement
15
- requirements:
16
- - - ">"
17
- - !ruby/object:Gem::Version
18
- version: '7.0'
19
- type: :development
20
- prerelease: false
21
- version_requirements: !ruby/object:Gem::Requirement
22
- requirements:
23
- - - ">"
24
- - !ruby/object:Gem::Version
25
- version: '7.0'
26
12
  - !ruby/object:Gem::Dependency
27
13
  name: pry
28
14
  requirement: !ruby/object:Gem::Requirement
@@ -85,20 +71,20 @@ dependencies:
85
71
  requirements:
86
72
  - - ">"
87
73
  - !ruby/object:Gem::Version
88
- version: '5.0'
74
+ version: '6.0'
89
75
  - - "<"
90
76
  - !ruby/object:Gem::Version
91
- version: '8.0'
77
+ version: '9.0'
92
78
  type: :runtime
93
79
  prerelease: false
94
80
  version_requirements: !ruby/object:Gem::Requirement
95
81
  requirements:
96
82
  - - ">"
97
83
  - !ruby/object:Gem::Version
98
- version: '5.0'
84
+ version: '6.0'
99
85
  - - "<"
100
86
  - !ruby/object:Gem::Version
101
- version: '8.0'
87
+ version: '9.0'
102
88
  description: |-
103
89
  Provides a simple helper to get an HTML select list of countries. \
104
90
  The list of countries comes from the ISO 3166 standard. \
@@ -123,8 +109,6 @@ files:
123
109
  - Rakefile
124
110
  - UPGRADING.md
125
111
  - country_select.gemspec
126
- - gemfiles/actionpack-7.0.gemfile
127
- - gemfiles/actionpack-7.0.gemfile.lock
128
112
  - gemfiles/actionpack-7.1.gemfile
129
113
  - gemfiles/actionpack-7.1.gemfile.lock
130
114
  - gemfiles/actionpack-7.2.gemfile
@@ -154,14 +138,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
154
138
  requirements:
155
139
  - - ">="
156
140
  - !ruby/object:Gem::Version
157
- version: '3.1'
141
+ version: '3.2'
158
142
  required_rubygems_version: !ruby/object:Gem::Requirement
159
143
  requirements:
160
144
  - - ">="
161
145
  - !ruby/object:Gem::Version
162
146
  version: '0'
163
147
  requirements: []
164
- rubygems_version: 3.6.2
148
+ rubygems_version: 3.6.8
165
149
  specification_version: 4
166
150
  summary: Country Select Plugin
167
151
  test_files: []
@@ -1,10 +0,0 @@
1
- # frozen_string_literal: true
2
-
3
- source 'https://rubygems.org'
4
-
5
- gemspec path: '../'
6
-
7
- gem 'railties', '~> 7.0.0'
8
- gem 'actionpack', '~> 7.0.0'
9
- gem 'nokogiri', '~> 1.18'
10
- gem 'mutex_m'
@@ -1,131 +0,0 @@
1
- PATH
2
- remote: ..
3
- specs:
4
- country_select (10.0.1)
5
- countries (> 5.0, < 8.0)
6
-
7
- GEM
8
- remote: https://rubygems.org/
9
- specs:
10
- actionpack (7.0.8.7)
11
- actionview (= 7.0.8.7)
12
- activesupport (= 7.0.8.7)
13
- rack (~> 2.0, >= 2.2.4)
14
- rack-test (>= 0.6.3)
15
- rails-dom-testing (~> 2.0)
16
- rails-html-sanitizer (~> 1.0, >= 1.2.0)
17
- actionview (7.0.8.7)
18
- activesupport (= 7.0.8.7)
19
- builder (~> 3.1)
20
- erubi (~> 1.4)
21
- rails-dom-testing (~> 2.0)
22
- rails-html-sanitizer (~> 1.1, >= 1.2.0)
23
- activesupport (7.0.8.7)
24
- concurrent-ruby (~> 1.0, >= 1.0.2)
25
- i18n (>= 1.6, < 2)
26
- minitest (>= 5.1)
27
- tzinfo (~> 2.0)
28
- builder (3.3.0)
29
- coderay (1.1.3)
30
- concurrent-ruby (1.3.4)
31
- countries (7.1.0)
32
- unaccent (~> 0.3)
33
- crass (1.0.6)
34
- diff-lcs (1.5.1)
35
- docile (1.4.1)
36
- erubi (1.13.1)
37
- i18n (1.14.6)
38
- concurrent-ruby (~> 1.0)
39
- loofah (2.24.0)
40
- crass (~> 1.0.2)
41
- nokogiri (>= 1.12.0)
42
- method_source (1.1.0)
43
- minitest (5.25.4)
44
- mutex_m (0.3.0)
45
- nokogiri (1.18.1-aarch64-linux-gnu)
46
- racc (~> 1.4)
47
- nokogiri (1.18.1-aarch64-linux-musl)
48
- racc (~> 1.4)
49
- nokogiri (1.18.1-arm-linux-gnu)
50
- racc (~> 1.4)
51
- nokogiri (1.18.1-arm-linux-musl)
52
- racc (~> 1.4)
53
- nokogiri (1.18.1-arm64-darwin)
54
- racc (~> 1.4)
55
- nokogiri (1.18.1-x86_64-darwin)
56
- racc (~> 1.4)
57
- nokogiri (1.18.1-x86_64-linux-gnu)
58
- racc (~> 1.4)
59
- nokogiri (1.18.1-x86_64-linux-musl)
60
- racc (~> 1.4)
61
- pry (0.15.2)
62
- coderay (~> 1.1)
63
- method_source (~> 1.0)
64
- racc (1.8.1)
65
- rack (2.2.10)
66
- rack-test (2.2.0)
67
- rack (>= 1.3)
68
- rails-dom-testing (2.2.0)
69
- activesupport (>= 5.0.0)
70
- minitest
71
- nokogiri (>= 1.6)
72
- rails-html-sanitizer (1.6.2)
73
- loofah (~> 2.21)
74
- nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
75
- railties (7.0.8.7)
76
- actionpack (= 7.0.8.7)
77
- activesupport (= 7.0.8.7)
78
- method_source
79
- rake (>= 12.2)
80
- thor (~> 1.0)
81
- zeitwerk (~> 2.5)
82
- rake (13.2.1)
83
- rspec (3.13.0)
84
- rspec-core (~> 3.13.0)
85
- rspec-expectations (~> 3.13.0)
86
- rspec-mocks (~> 3.13.0)
87
- rspec-core (3.13.2)
88
- rspec-support (~> 3.13.0)
89
- rspec-expectations (3.13.3)
90
- diff-lcs (>= 1.2.0, < 2.0)
91
- rspec-support (~> 3.13.0)
92
- rspec-mocks (3.13.2)
93
- diff-lcs (>= 1.2.0, < 2.0)
94
- rspec-support (~> 3.13.0)
95
- rspec-support (3.13.2)
96
- simplecov (0.22.0)
97
- docile (~> 1.1)
98
- simplecov-html (~> 0.11)
99
- simplecov_json_formatter (~> 0.1)
100
- simplecov-html (0.13.1)
101
- simplecov_json_formatter (0.1.4)
102
- thor (1.3.2)
103
- tzinfo (2.0.6)
104
- concurrent-ruby (~> 1.0)
105
- unaccent (0.4.0)
106
- zeitwerk (2.7.1)
107
-
108
- PLATFORMS
109
- aarch64-linux-gnu
110
- aarch64-linux-musl
111
- arm-linux-gnu
112
- arm-linux-musl
113
- arm64-darwin
114
- x86_64-darwin
115
- x86_64-linux
116
- x86_64-linux-gnu
117
- x86_64-linux-musl
118
-
119
- DEPENDENCIES
120
- actionpack (~> 7.0.0)
121
- country_select!
122
- mutex_m
123
- nokogiri (~> 1.18)
124
- pry (~> 0)
125
- railties (~> 7.0.0)
126
- rake (~> 13)
127
- rspec (~> 3)
128
- simplecov (~> 0.22)
129
-
130
- BUNDLED WITH
131
- 2.6.2