country_select 2.1.1 → 2.2.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (16) hide show
  1. checksums.yaml +4 -4
  2. data/.travis.yml +10 -1
  3. data/CHANGELOG.md +4 -0
  4. data/Gemfile.lock +9 -3
  5. data/README.md +8 -2
  6. data/country_select.gemspec +2 -1
  7. data/gemfiles/actionpack.edge.gemfile.lock +54 -51
  8. data/gemfiles/actionpack3.2.gemfile.lock +37 -34
  9. data/gemfiles/actionpack4.0.gemfile.lock +34 -31
  10. data/gemfiles/actionpack4.1.gemfile.lock +38 -35
  11. data/gemfiles/actionpack4.2.gemfile.lock +59 -52
  12. data/lib/country_select.rb +1 -0
  13. data/lib/country_select/tag_helper.rb +7 -3
  14. data/lib/country_select/version.rb +1 -1
  15. data/spec/country_select_spec.rb +13 -7
  16. metadata +19 -11
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: c40998d65bf71826c3ed98ed474ee7785377d592
4
- data.tar.gz: 1d5be6a00bec2a2c239a6e7f8f2293e3dbbcdd46
3
+ metadata.gz: 72a7ffe51f5fbddd1ce7ca73dbcf62d842645cf3
4
+ data.tar.gz: d8c97f5eb7b1530d405e4cf3705f724eaf1a497c
5
5
  SHA512:
6
- metadata.gz: 0c0e216ebd88d29a05a54ceead788abfe6ba0686086801dc468f138c12f3d4f23164247655de121bb91b898aefc33fcaced6e40f607950c0142c48bd9cbd941c
7
- data.tar.gz: e44add543c6a7c4b9cc757e055716f3db2c1479a7f9c7982750d6a70733db70bea8d0b4b0b86582a51227dbf6272057bf9bebf01c0e1830b97d2356cb9126452
6
+ metadata.gz: f07a44e5e84cb23dc0b3daa38e759ce3cf0cdaad59d1d316ebd2fdee24fa4fd55b5cbb16e535f29f0fb95191e7b9dc8c62433e470514aada8a8402c41b839443
7
+ data.tar.gz: 229b5545350af1b8af39defd14101133b092b401d793cd641224b60072125e93b6d1011195c27c25ed1bf54edd3f0cff7234aca68a94fd1408b95cdadc6ff62a
data/.travis.yml CHANGED
@@ -1,10 +1,12 @@
1
+ sudo: false
2
+ cache: bundler
1
3
  language: ruby
2
4
  script: "bundle exec rspec"
3
5
  rvm:
4
6
  - 1.9.3
5
7
  - 2.0.0
6
8
  - 2.1.5
7
- - 2.2.0
9
+ - 2.2.1
8
10
  - jruby-19mode
9
11
  - jruby-head
10
12
  - rbx-2
@@ -20,3 +22,10 @@ matrix:
20
22
  - rvm: ruby-head
21
23
  - rvm: jruby-head
22
24
  - rvm: rbx-2
25
+ exclude:
26
+ - rvm: 1.9.3
27
+ gemfile: gemfiles/actionpack.edge.gemfile
28
+ - rvm: 2.0.0
29
+ gemfile: gemfiles/actionpack.edge.gemfile
30
+ - rvm: jruby-19mode
31
+ gemfile: gemfiles/actionpack.edge.gemfile
data/CHANGELOG.md CHANGED
@@ -1,3 +1,7 @@
1
+ ## 2.2.0 2015-03-19
2
+
3
+ * #101 - Update countries gem to ~> v0.11.0
4
+
1
5
  ## 2.1.1 2015-02-02
2
6
 
3
7
  * #94 - Prevent usage of countries v0.10.0 due to poor performance
data/Gemfile.lock CHANGED
@@ -1,8 +1,9 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- country_select (2.1.0)
5
- countries (>= 0.9.3, < 0.10.0)
4
+ country_select (2.2.0)
5
+ countries (~> 0.11.0)
6
+ sort_alphabetical (~> 1.0)
6
7
 
7
8
  GEM
8
9
  remote: https://rubygems.org/
@@ -25,14 +26,16 @@ GEM
25
26
  multi_json (~> 1.0)
26
27
  builder (3.0.4)
27
28
  coderay (1.1.0)
28
- countries (0.9.3)
29
+ countries (0.11.2)
29
30
  currencies (~> 0.4.2)
31
+ i18n_data (~> 0.6.0)
30
32
  currencies (0.4.2)
31
33
  diff-lcs (1.2.5)
32
34
  erubis (2.7.0)
33
35
  ffi2-generators (0.1.1)
34
36
  hike (1.2.3)
35
37
  i18n (0.6.11)
38
+ i18n_data (0.6.2)
36
39
  journey (1.0.4)
37
40
  method_source (0.8.2)
38
41
  multi_json (1.10.1)
@@ -263,12 +266,15 @@ GEM
263
266
  rubysl-yaml (2.0.4)
264
267
  rubysl-zlib (2.0.1)
265
268
  slop (3.6.0)
269
+ sort_alphabetical (1.0.1)
270
+ unicode_utils (>= 1.2.2)
266
271
  sprockets (2.2.2)
267
272
  hike (~> 1.2)
268
273
  multi_json (~> 1.0)
269
274
  rack (~> 1.0)
270
275
  tilt (~> 1.1, != 1.3.0)
271
276
  tilt (1.4.1)
277
+ unicode_utils (1.4.0)
272
278
  wwtd (0.5.5)
273
279
 
274
280
  PLATFORMS
data/README.md CHANGED
@@ -51,13 +51,19 @@ Discarding certain countries:
51
51
  country_select("user", "country", except: ["GB", "FR", "DE"])
52
52
  ```
53
53
 
54
+ Pre-selecting a particular country:
55
+
56
+ ```ruby
57
+ country_select("user", "country", selected: "GB")
58
+ ```
59
+
54
60
  Supplying additional html options:
55
61
 
56
62
  ```ruby
57
- country_select("user", "country", { priority_countries: ["GB", "FR"] }, { selected: "GB", class: 'form-control' })
63
+ country_select("user", "country", { priority_countries: ["GB", "FR"], selected: "GB" }, { class: 'form-control', data: { attribute: "value" } })
58
64
  ```
59
65
 
60
- Using a custom formatter
66
+ ### Using a custom formatter
61
67
 
62
68
  You can define a custom formatter which will receive an
63
69
  [`ISO3166::Country`](https://github.com/hexorx/countries/blob/master/lib/countries/country.rb)
data/country_select.gemspec CHANGED
@@ -25,5 +25,6 @@ Gem::Specification.new do |s|
25
25
  s.add_development_dependency 'rspec', '~> 3'
26
26
  s.add_development_dependency 'wwtd'
27
27
 
28
- s.add_dependency 'countries', '>= 0.9.3', '< 0.10.0'
28
+ s.add_dependency 'countries', '~> 0.11.0'
29
+ s.add_dependency 'sort_alphabetical', '~> 1.0'
29
30
  end
data/gemfiles/actionpack.edge.gemfile.lock CHANGED
@@ -1,84 +1,87 @@
1
1
  GIT
2
2
  remote: https://github.com/rails/rails.git
3
- revision: 42e69c352fc58f9af2c09dd7e8a7fa70bfe46898
3
+ revision: 186418724c6da41caeb0fd304894bcfcc154b8bb
4
4
  specs:
5
- actionpack (4.2.0.beta1)
6
- actionview (= 4.2.0.beta1)
7
- activesupport (= 4.2.0.beta1)
8
- rack (~> 1.6.0.beta)
5
+ actionpack (5.0.0.alpha)
6
+ actionview (= 5.0.0.alpha)
7
+ activesupport (= 5.0.0.alpha)
8
+ rack (~> 1.6)
9
9
  rack-test (~> 0.6.2)
10
- rails-dom-testing (~> 1.0, >= 1.0.2)
11
- rails-html-sanitizer (~> 1.0)
12
- actionview (4.2.0.beta1)
13
- activesupport (= 4.2.0.beta1)
10
+ rails-dom-testing (~> 1.0, >= 1.0.5)
11
+ rails-html-sanitizer (~> 1.0, >= 1.0.1)
12
+ actionview (5.0.0.alpha)
13
+ activesupport (= 5.0.0.alpha)
14
14
  builder (~> 3.1)
15
15
  erubis (~> 2.7.0)
16
- rails-dom-testing (~> 1.0, >= 1.0.2)
17
- rails-html-sanitizer (~> 1.0)
18
- activesupport (4.2.0.beta1)
19
- i18n (>= 0.7.0.beta1, < 0.8)
16
+ rails-dom-testing (~> 1.0, >= 1.0.5)
17
+ rails-html-sanitizer (~> 1.0, >= 1.0.1)
18
+ activesupport (5.0.0.alpha)
19
+ i18n (~> 0.7)
20
20
  json (~> 1.7, >= 1.7.7)
21
21
  minitest (~> 5.1)
22
- thread_safe (~> 0.1)
22
+ thread_safe (~> 0.3, >= 0.3.4)
23
23
  tzinfo (~> 1.1)
24
24
 
25
25
  PATH
26
26
  remote: ../
27
27
  specs:
28
- country_select (2.1.0)
29
- countries (~> 0.9, >= 0.9.3)
28
+ country_select (2.2.0)
29
+ countries (~> 0.11.0)
30
+ sort_alphabetical (~> 1.0)
30
31
 
31
32
  GEM
32
33
  remote: https://rubygems.org/
33
34
  specs:
34
35
  builder (3.2.2)
35
36
  coderay (1.1.0)
36
- countries (0.9.3)
37
+ countries (0.11.2)
37
38
  currencies (~> 0.4.2)
39
+ i18n_data (~> 0.6.0)
38
40
  currencies (0.4.2)
39
41
  diff-lcs (1.2.5)
40
42
  erubis (2.7.0)
41
43
  ffi2-generators (0.1.1)
42
- i18n (0.7.0.beta1)
43
- json (1.8.1)
44
+ i18n (0.7.0)
45
+ i18n_data (0.6.2)
46
+ json (1.8.2)
44
47
  loofah (2.0.1)
45
48
  nokogiri (>= 1.5.9)
46
49
  method_source (0.8.2)
47
- mini_portile (0.6.0)
48
- minitest (5.4.1)
49
- nokogiri (1.6.3.1)
50
- mini_portile (= 0.6.0)
50
+ mini_portile (0.6.2)
51
+ minitest (5.5.1)
52
+ nokogiri (1.6.6.2)
53
+ mini_portile (~> 0.6.0)
51
54
  pry (0.10.1)
52
55
  coderay (~> 1.1.0)
53
56
  method_source (~> 0.8.1)
54
57
  slop (~> 3.4)
55
- psych (2.0.5)
58
+ psych (2.0.12)
56
59
  racc (1.4.12)
57
- rack (1.6.0.beta)
58
- rack-test (0.6.2)
60
+ rack (1.6.0)
61
+ rack-test (0.6.3)
59
62
  rack (>= 1.0)
60
- rails-deprecated_sanitizer (1.0.2)
63
+ rails-deprecated_sanitizer (1.0.3)
61
64
  activesupport (>= 4.2.0.alpha)
62
- rails-dom-testing (1.0.2)
63
- activesupport
65
+ rails-dom-testing (1.0.5)
66
+ activesupport (>= 4.2.0.beta, < 5.0)
64
67
  nokogiri (~> 1.6.0)
65
68
  rails-deprecated_sanitizer (>= 1.0.1)
66
- rails-html-sanitizer (1.0.0)
69
+ rails-html-sanitizer (1.0.1)
67
70
  loofah (~> 2.0)
68
- rake (10.3.2)
71
+ rake (10.4.2)
69
72
  rspec (3.1.0)
70
73
  rspec-core (~> 3.1.0)
71
74
  rspec-expectations (~> 3.1.0)
72
75
  rspec-mocks (~> 3.1.0)
73
- rspec-core (3.1.1)
76
+ rspec-core (3.1.7)
74
77
  rspec-support (~> 3.1.0)
75
- rspec-expectations (3.1.0)
78
+ rspec-expectations (3.1.2)
76
79
  diff-lcs (>= 1.2.0, < 2.0)
77
80
  rspec-support (~> 3.1.0)
78
- rspec-mocks (3.1.0)
81
+ rspec-mocks (3.1.3)
79
82
  rspec-support (~> 3.1.0)
80
- rspec-support (3.1.0)
81
- rubysl (2.0.15)
83
+ rspec-support (3.1.2)
84
+ rubysl (2.1.0)
82
85
  rubysl-abbrev (~> 2.0)
83
86
  rubysl-base64 (~> 2.0)
84
87
  rubysl-benchmark (~> 2.0)
@@ -112,7 +115,7 @@ GEM
112
115
  rubysl-io-nonblock (~> 2.0)
113
116
  rubysl-io-wait (~> 2.0)
114
117
  rubysl-ipaddr (~> 2.0)
115
- rubysl-irb (~> 2.0)
118
+ rubysl-irb (~> 2.1)
116
119
  rubysl-logger (~> 2.0)
117
120
  rubysl-mathn (~> 2.0)
118
121
  rubysl-matrix (~> 2.0)
@@ -141,7 +144,6 @@ GEM
141
144
  rubysl-pstore (~> 2.0)
142
145
  rubysl-pty (~> 2.0)
143
146
  rubysl-rational (~> 2.0)
144
- rubysl-readline (~> 2.0)
145
147
  rubysl-resolv (~> 2.0)
146
148
  rubysl-rexml (~> 2.0)
147
149
  rubysl-rinda (~> 2.0)
@@ -183,14 +185,14 @@ GEM
183
185
  rubysl-csv (2.0.2)
184
186
  rubysl-english (~> 2.0)
185
187
  rubysl-curses (2.0.1)
186
- rubysl-date (2.0.8)
188
+ rubysl-date (2.0.9)
187
189
  rubysl-delegate (2.0.1)
188
190
  rubysl-digest (2.0.3)
189
191
  rubysl-drb (2.0.1)
190
192
  rubysl-e2mmap (2.0.0)
191
193
  rubysl-english (2.0.0)
192
194
  rubysl-enumerator (2.0.0)
193
- rubysl-erb (2.0.1)
195
+ rubysl-erb (2.0.2)
194
196
  rubysl-etc (2.0.3)
195
197
  ffi2-generators (~> 0.1)
196
198
  rubysl-expect (2.0.0)
@@ -208,12 +210,11 @@ GEM
208
210
  rubysl-io-nonblock (2.0.0)
209
211
  rubysl-io-wait (2.0.0)
210
212
  rubysl-ipaddr (2.0.0)
211
- rubysl-irb (2.0.4)
213
+ rubysl-irb (2.1.1)
212
214
  rubysl-e2mmap (~> 2.0)
213
215
  rubysl-mathn (~> 2.0)
214
- rubysl-readline (~> 2.0)
215
216
  rubysl-thread (~> 2.0)
216
- rubysl-logger (2.0.0)
217
+ rubysl-logger (2.1.0)
217
218
  rubysl-mathn (2.0.0)
218
219
  rubysl-matrix (2.1.0)
219
220
  rubysl-e2mmap (~> 2.0)
@@ -236,21 +237,20 @@ GEM
236
237
  rubysl-observer (2.0.0)
237
238
  rubysl-open-uri (2.0.0)
238
239
  rubysl-open3 (2.0.0)
239
- rubysl-openssl (2.1.0)
240
+ rubysl-openssl (2.2.1)
240
241
  rubysl-optparse (2.0.1)
241
242
  rubysl-shellwords (~> 2.0)
242
243
  rubysl-ostruct (2.0.4)
243
- rubysl-pathname (2.0.0)
244
+ rubysl-pathname (2.1.0)
244
245
  rubysl-prettyprint (2.0.3)
245
246
  rubysl-prime (2.0.1)
246
247
  rubysl-profile (2.0.0)
247
248
  rubysl-profiler (2.0.1)
248
249
  rubysl-pstore (2.0.0)
249
- rubysl-pty (2.0.2)
250
+ rubysl-pty (2.0.3)
250
251
  rubysl-rational (2.0.1)
251
- rubysl-readline (2.0.2)
252
252
  rubysl-resolv (2.1.0)
253
- rubysl-rexml (2.0.2)
253
+ rubysl-rexml (2.0.4)
254
254
  rubysl-rinda (2.0.1)
255
255
  rubysl-rss (2.0.0)
256
256
  rubysl-scanf (2.0.0)
@@ -262,7 +262,7 @@ GEM
262
262
  rubysl-stringio (2.0.0)
263
263
  rubysl-strscan (2.0.0)
264
264
  rubysl-sync (2.0.0)
265
- rubysl-syslog (2.0.1)
265
+ rubysl-syslog (2.1.0)
266
266
  ffi2-generators (~> 0.1)
267
267
  rubysl-tempfile (2.0.1)
268
268
  rubysl-thread (2.0.2)
@@ -278,13 +278,16 @@ GEM
278
278
  rubysl-weakref (2.0.0)
279
279
  rubysl-webrick (2.0.0)
280
280
  rubysl-xmlrpc (2.0.0)
281
- rubysl-yaml (2.0.4)
281
+ rubysl-yaml (2.1.0)
282
282
  rubysl-zlib (2.0.1)
283
283
  slop (3.6.0)
284
+ sort_alphabetical (1.0.1)
285
+ unicode_utils (>= 1.2.2)
284
286
  thread_safe (0.3.4)
285
287
  tzinfo (1.2.2)
286
288
  thread_safe (~> 0.1)
287
- wwtd (0.5.5)
289
+ unicode_utils (1.4.0)
290
+ wwtd (0.7.0)
288
291
 
289
292
  PLATFORMS
290
293
  ruby
data/gemfiles/actionpack3.2.gemfile.lock CHANGED
@@ -1,15 +1,16 @@
1
1
  PATH
2
2
  remote: ../
3
3
  specs:
4
- country_select (2.1.0)
5
- countries (~> 0.9, >= 0.9.3)
4
+ country_select (2.2.0)
5
+ countries (~> 0.11.0)
6
+ sort_alphabetical (~> 1.0)
6
7
 
7
8
  GEM
8
9
  remote: https://rubygems.org/
9
10
  specs:
10
- actionpack (3.2.19)
11
- activemodel (= 3.2.19)
12
- activesupport (= 3.2.19)
11
+ actionpack (3.2.21)
12
+ activemodel (= 3.2.21)
13
+ activesupport (= 3.2.21)
13
14
  builder (~> 3.0.0)
14
15
  erubis (~> 2.7.0)
15
16
  journey (~> 1.0.4)
@@ -17,22 +18,24 @@ GEM
17
18
  rack-cache (~> 1.2)
18
19
  rack-test (~> 0.6.1)
19
20
  sprockets (~> 2.2.1)
20
- activemodel (3.2.19)
21
- activesupport (= 3.2.19)
21
+ activemodel (3.2.21)
22
+ activesupport (= 3.2.21)
22
23
  builder (~> 3.0.0)
23
- activesupport (3.2.19)
24
+ activesupport (3.2.21)
24
25
  i18n (~> 0.6, >= 0.6.4)
25
26
  multi_json (~> 1.0)
26
27
  builder (3.0.4)
27
28
  coderay (1.1.0)
28
- countries (0.9.3)
29
+ countries (0.11.2)
29
30
  currencies (~> 0.4.2)
31
+ i18n_data (~> 0.6.0)
30
32
  currencies (0.4.2)
31
33
  diff-lcs (1.2.5)
32
34
  erubis (2.7.0)
33
35
  ffi2-generators (0.1.1)
34
36
  hike (1.2.3)
35
- i18n (0.6.11)
37
+ i18n (0.7.0)
38
+ i18n_data (0.6.2)
36
39
  journey (1.0.4)
37
40
  method_source (0.8.2)
38
41
  multi_json (1.10.1)
@@ -40,27 +43,27 @@ GEM
40
43
  coderay (~> 1.1.0)
41
44
  method_source (~> 0.8.1)
42
45
  slop (~> 3.4)
43
- psych (2.0.5)
46
+ psych (2.0.12)
44
47
  racc (1.4.12)
45
48
  rack (1.4.5)
46
49
  rack-cache (1.2)
47
50
  rack (>= 0.4)
48
- rack-test (0.6.2)
51
+ rack-test (0.6.3)
49
52
  rack (>= 1.0)
50
- rake (10.3.2)
53
+ rake (10.4.2)
51
54
  rspec (3.1.0)
52
55
  rspec-core (~> 3.1.0)
53
56
  rspec-expectations (~> 3.1.0)
54
57
  rspec-mocks (~> 3.1.0)
55
- rspec-core (3.1.1)
58
+ rspec-core (3.1.7)
56
59
  rspec-support (~> 3.1.0)
57
- rspec-expectations (3.1.0)
60
+ rspec-expectations (3.1.2)
58
61
  diff-lcs (>= 1.2.0, < 2.0)
59
62
  rspec-support (~> 3.1.0)
60
- rspec-mocks (3.1.0)
63
+ rspec-mocks (3.1.3)
61
64
  rspec-support (~> 3.1.0)
62
- rspec-support (3.1.0)
63
- rubysl (2.0.15)
65
+ rspec-support (3.1.2)
66
+ rubysl (2.1.0)
64
67
  rubysl-abbrev (~> 2.0)
65
68
  rubysl-base64 (~> 2.0)
66
69
  rubysl-benchmark (~> 2.0)
@@ -94,7 +97,7 @@ GEM
94
97
  rubysl-io-nonblock (~> 2.0)
95
98
  rubysl-io-wait (~> 2.0)
96
99
  rubysl-ipaddr (~> 2.0)
97
- rubysl-irb (~> 2.0)
100
+ rubysl-irb (~> 2.1)
98
101
  rubysl-logger (~> 2.0)
99
102
  rubysl-mathn (~> 2.0)
100
103
  rubysl-matrix (~> 2.0)
@@ -123,7 +126,6 @@ GEM
123
126
  rubysl-pstore (~> 2.0)
124
127
  rubysl-pty (~> 2.0)
125
128
  rubysl-rational (~> 2.0)
126
- rubysl-readline (~> 2.0)
127
129
  rubysl-resolv (~> 2.0)
128
130
  rubysl-rexml (~> 2.0)
129
131
  rubysl-rinda (~> 2.0)
@@ -165,14 +167,14 @@ GEM
165
167
  rubysl-csv (2.0.2)
166
168
  rubysl-english (~> 2.0)
167
169
  rubysl-curses (2.0.1)
168
- rubysl-date (2.0.8)
170
+ rubysl-date (2.0.9)
169
171
  rubysl-delegate (2.0.1)
170
172
  rubysl-digest (2.0.3)
171
173
  rubysl-drb (2.0.1)
172
174
  rubysl-e2mmap (2.0.0)
173
175
  rubysl-english (2.0.0)
174
176
  rubysl-enumerator (2.0.0)
175
- rubysl-erb (2.0.1)
177
+ rubysl-erb (2.0.2)
176
178
  rubysl-etc (2.0.3)
177
179
  ffi2-generators (~> 0.1)
178
180
  rubysl-expect (2.0.0)
@@ -190,12 +192,11 @@ GEM
190
192
  rubysl-io-nonblock (2.0.0)
191
193
  rubysl-io-wait (2.0.0)
192
194
  rubysl-ipaddr (2.0.0)
193
- rubysl-irb (2.0.4)
195
+ rubysl-irb (2.1.1)
194
196
  rubysl-e2mmap (~> 2.0)
195
197
  rubysl-mathn (~> 2.0)
196
- rubysl-readline (~> 2.0)
197
198
  rubysl-thread (~> 2.0)
198
- rubysl-logger (2.0.0)
199
+ rubysl-logger (2.1.0)
199
200
  rubysl-mathn (2.0.0)
200
201
  rubysl-matrix (2.1.0)
201
202
  rubysl-e2mmap (~> 2.0)
@@ -218,21 +219,20 @@ GEM
218
219
  rubysl-observer (2.0.0)
219
220
  rubysl-open-uri (2.0.0)
220
221
  rubysl-open3 (2.0.0)
221
- rubysl-openssl (2.1.0)
222
+ rubysl-openssl (2.2.1)
222
223
  rubysl-optparse (2.0.1)
223
224
  rubysl-shellwords (~> 2.0)
224
225
  rubysl-ostruct (2.0.4)
225
- rubysl-pathname (2.0.0)
226
+ rubysl-pathname (2.1.0)
226
227
  rubysl-prettyprint (2.0.3)
227
228
  rubysl-prime (2.0.1)
228
229
  rubysl-profile (2.0.0)
229
230
  rubysl-profiler (2.0.1)
230
231
  rubysl-pstore (2.0.0)
231
- rubysl-pty (2.0.2)
232
+ rubysl-pty (2.0.3)
232
233
  rubysl-rational (2.0.1)
233
- rubysl-readline (2.0.2)
234
234
  rubysl-resolv (2.1.0)
235
- rubysl-rexml (2.0.2)
235
+ rubysl-rexml (2.0.4)
236
236
  rubysl-rinda (2.0.1)
237
237
  rubysl-rss (2.0.0)
238
238
  rubysl-scanf (2.0.0)
@@ -244,7 +244,7 @@ GEM
244
244
  rubysl-stringio (2.0.0)
245
245
  rubysl-strscan (2.0.0)
246
246
  rubysl-sync (2.0.0)
247
- rubysl-syslog (2.0.1)
247
+ rubysl-syslog (2.1.0)
248
248
  ffi2-generators (~> 0.1)
249
249
  rubysl-tempfile (2.0.1)
250
250
  rubysl-thread (2.0.2)
@@ -260,16 +260,19 @@ GEM
260
260
  rubysl-weakref (2.0.0)
261
261
  rubysl-webrick (2.0.0)
262
262
  rubysl-xmlrpc (2.0.0)
263
- rubysl-yaml (2.0.4)
263
+ rubysl-yaml (2.1.0)
264
264
  rubysl-zlib (2.0.1)
265
265
  slop (3.6.0)
266
- sprockets (2.2.2)
266
+ sort_alphabetical (1.0.1)
267
+ unicode_utils (>= 1.2.2)
268
+ sprockets (2.2.3)
267
269
  hike (~> 1.2)
268
270
  multi_json (~> 1.0)
269
271
  rack (~> 1.0)
270
272
  tilt (~> 1.1, != 1.3.0)
271
273
  tilt (1.4.1)
272
- wwtd (0.5.5)
274
+ unicode_utils (1.4.0)
275
+ wwtd (0.7.0)
273
276
 
274
277
  PLATFORMS
275
278
  ruby
data/gemfiles/actionpack4.0.gemfile.lock CHANGED
@@ -1,19 +1,20 @@
1
1
  PATH
2
2
  remote: ../
3
3
  specs:
4
- country_select (2.1.0)
5
- countries (~> 0.9, >= 0.9.3)
4
+ country_select (2.2.0)
5
+ countries (~> 0.11.0)
6
+ sort_alphabetical (~> 1.0)
6
7
 
7
8
  GEM
8
9
  remote: https://rubygems.org/
9
10
  specs:
10
- actionpack (4.0.9)
11
- activesupport (= 4.0.9)
11
+ actionpack (4.0.13)
12
+ activesupport (= 4.0.13)
12
13
  builder (~> 3.1.0)
13
14
  erubis (~> 2.7.0)
14
15
  rack (~> 1.5.2)
15
16
  rack-test (~> 0.6.2)
16
- activesupport (4.0.9)
17
+ activesupport (4.0.13)
17
18
  i18n (~> 0.6, >= 0.6.9)
18
19
  minitest (~> 4.2)
19
20
  multi_json (~> 1.3)
@@ -21,13 +22,15 @@ GEM
21
22
  tzinfo (~> 0.3.37)
22
23
  builder (3.1.4)
23
24
  coderay (1.1.0)
24
- countries (0.9.3)
25
+ countries (0.11.2)
25
26
  currencies (~> 0.4.2)
27
+ i18n_data (~> 0.6.0)
26
28
  currencies (0.4.2)
27
29
  diff-lcs (1.2.5)
28
30
  erubis (2.7.0)
29
31
  ffi2-generators (0.1.1)
30
- i18n (0.6.11)
32
+ i18n (0.7.0)
33
+ i18n_data (0.6.2)
31
34
  method_source (0.8.2)
32
35
  minitest (4.7.5)
33
36
  multi_json (1.10.1)
@@ -35,25 +38,25 @@ GEM
35
38
  coderay (~> 1.1.0)
36
39
  method_source (~> 0.8.1)
37
40
  slop (~> 3.4)
38
- psych (2.0.5)
41
+ psych (2.0.12)
39
42
  racc (1.4.12)
40
43
  rack (1.5.2)
41
- rack-test (0.6.2)
44
+ rack-test (0.6.3)
42
45
  rack (>= 1.0)
43
- rake (10.3.2)
46
+ rake (10.4.2)
44
47
  rspec (3.1.0)
45
48
  rspec-core (~> 3.1.0)
46
49
  rspec-expectations (~> 3.1.0)
47
50
  rspec-mocks (~> 3.1.0)
48
- rspec-core (3.1.1)
51
+ rspec-core (3.1.7)
49
52
  rspec-support (~> 3.1.0)
50
- rspec-expectations (3.1.0)
53
+ rspec-expectations (3.1.2)
51
54
  diff-lcs (>= 1.2.0, < 2.0)
52
55
  rspec-support (~> 3.1.0)
53
- rspec-mocks (3.1.0)
56
+ rspec-mocks (3.1.3)
54
57
  rspec-support (~> 3.1.0)
55
- rspec-support (3.1.0)
56
- rubysl (2.0.15)
58
+ rspec-support (3.1.2)
59
+ rubysl (2.1.0)
57
60
  rubysl-abbrev (~> 2.0)
58
61
  rubysl-base64 (~> 2.0)
59
62
  rubysl-benchmark (~> 2.0)
@@ -87,7 +90,7 @@ GEM
87
90
  rubysl-io-nonblock (~> 2.0)
88
91
  rubysl-io-wait (~> 2.0)
89
92
  rubysl-ipaddr (~> 2.0)
90
- rubysl-irb (~> 2.0)
93
+ rubysl-irb (~> 2.1)
91
94
  rubysl-logger (~> 2.0)
92
95
  rubysl-mathn (~> 2.0)
93
96
  rubysl-matrix (~> 2.0)
@@ -116,7 +119,6 @@ GEM
116
119
  rubysl-pstore (~> 2.0)
117
120
  rubysl-pty (~> 2.0)
118
121
  rubysl-rational (~> 2.0)
119
- rubysl-readline (~> 2.0)
120
122
  rubysl-resolv (~> 2.0)
121
123
  rubysl-rexml (~> 2.0)
122
124
  rubysl-rinda (~> 2.0)
@@ -158,14 +160,14 @@ GEM
158
160
  rubysl-csv (2.0.2)
159
161
  rubysl-english (~> 2.0)
160
162
  rubysl-curses (2.0.1)
161
- rubysl-date (2.0.8)
163
+ rubysl-date (2.0.9)
162
164
  rubysl-delegate (2.0.1)
163
165
  rubysl-digest (2.0.3)
164
166
  rubysl-drb (2.0.1)
165
167
  rubysl-e2mmap (2.0.0)
166
168
  rubysl-english (2.0.0)
167
169
  rubysl-enumerator (2.0.0)
168
- rubysl-erb (2.0.1)
170
+ rubysl-erb (2.0.2)
169
171
  rubysl-etc (2.0.3)
170
172
  ffi2-generators (~> 0.1)
171
173
  rubysl-expect (2.0.0)
@@ -183,12 +185,11 @@ GEM
183
185
  rubysl-io-nonblock (2.0.0)
184
186
  rubysl-io-wait (2.0.0)
185
187
  rubysl-ipaddr (2.0.0)
186
- rubysl-irb (2.0.4)
188
+ rubysl-irb (2.1.1)
187
189
  rubysl-e2mmap (~> 2.0)
188
190
  rubysl-mathn (~> 2.0)
189
- rubysl-readline (~> 2.0)
190
191
  rubysl-thread (~> 2.0)
191
- rubysl-logger (2.0.0)
192
+ rubysl-logger (2.1.0)
192
193
  rubysl-mathn (2.0.0)
193
194
  rubysl-matrix (2.1.0)
194
195
  rubysl-e2mmap (~> 2.0)
@@ -211,21 +212,20 @@ GEM
211
212
  rubysl-observer (2.0.0)
212
213
  rubysl-open-uri (2.0.0)
213
214
  rubysl-open3 (2.0.0)
214
- rubysl-openssl (2.1.0)
215
+ rubysl-openssl (2.2.1)
215
216
  rubysl-optparse (2.0.1)
216
217
  rubysl-shellwords (~> 2.0)
217
218
  rubysl-ostruct (2.0.4)
218
- rubysl-pathname (2.0.0)
219
+ rubysl-pathname (2.1.0)
219
220
  rubysl-prettyprint (2.0.3)
220
221
  rubysl-prime (2.0.1)
221
222
  rubysl-profile (2.0.0)
222
223
  rubysl-profiler (2.0.1)
223
224
  rubysl-pstore (2.0.0)
224
- rubysl-pty (2.0.2)
225
+ rubysl-pty (2.0.3)
225
226
  rubysl-rational (2.0.1)
226
- rubysl-readline (2.0.2)
227
227
  rubysl-resolv (2.1.0)
228
- rubysl-rexml (2.0.2)
228
+ rubysl-rexml (2.0.4)
229
229
  rubysl-rinda (2.0.1)
230
230
  rubysl-rss (2.0.0)
231
231
  rubysl-scanf (2.0.0)
@@ -237,7 +237,7 @@ GEM
237
237
  rubysl-stringio (2.0.0)
238
238
  rubysl-strscan (2.0.0)
239
239
  rubysl-sync (2.0.0)
240
- rubysl-syslog (2.0.1)
240
+ rubysl-syslog (2.1.0)
241
241
  ffi2-generators (~> 0.1)
242
242
  rubysl-tempfile (2.0.1)
243
243
  rubysl-thread (2.0.2)
@@ -253,12 +253,15 @@ GEM
253
253
  rubysl-weakref (2.0.0)
254
254
  rubysl-webrick (2.0.0)
255
255
  rubysl-xmlrpc (2.0.0)
256
- rubysl-yaml (2.0.4)
256
+ rubysl-yaml (2.1.0)
257
257
  rubysl-zlib (2.0.1)
258
258
  slop (3.6.0)
259
+ sort_alphabetical (1.0.1)
260
+ unicode_utils (>= 1.2.2)
259
261
  thread_safe (0.3.4)
260
- tzinfo (0.3.41)
261
- wwtd (0.5.5)
262
+ tzinfo (0.3.43)
263
+ unicode_utils (1.4.0)
264
+ wwtd (0.7.0)
262
265
 
263
266
  PLATFORMS
264
267
  ruby
data/gemfiles/actionpack4.1.gemfile.lock CHANGED
@@ -1,22 +1,23 @@
1
1
  PATH
2
2
  remote: ../
3
3
  specs:
4
- country_select (2.1.0)
5
- countries (~> 0.9, >= 0.9.3)
4
+ country_select (2.2.0)
5
+ countries (~> 0.11.0)
6
+ sort_alphabetical (~> 1.0)
6
7
 
7
8
  GEM
8
9
  remote: https://rubygems.org/
9
10
  specs:
10
- actionpack (4.1.5)
11
- actionview (= 4.1.5)
12
- activesupport (= 4.1.5)
11
+ actionpack (4.1.9)
12
+ actionview (= 4.1.9)
13
+ activesupport (= 4.1.9)
13
14
  rack (~> 1.5.2)
14
15
  rack-test (~> 0.6.2)
15
- actionview (4.1.5)
16
- activesupport (= 4.1.5)
16
+ actionview (4.1.9)
17
+ activesupport (= 4.1.9)
17
18
  builder (~> 3.1)
18
19
  erubis (~> 2.7.0)
19
- activesupport (4.1.5)
20
+ activesupport (4.1.9)
20
21
  i18n (~> 0.6, >= 0.6.9)
21
22
  json (~> 1.7, >= 1.7.7)
22
23
  minitest (~> 5.1)
@@ -24,39 +25,41 @@ GEM
24
25
  tzinfo (~> 1.1)
25
26
  builder (3.2.2)
26
27
  coderay (1.1.0)
27
- countries (0.9.3)
28
+ countries (0.11.2)
28
29
  currencies (~> 0.4.2)
30
+ i18n_data (~> 0.6.0)
29
31
  currencies (0.4.2)
30
32
  diff-lcs (1.2.5)
31
33
  erubis (2.7.0)
32
34
  ffi2-generators (0.1.1)
33
- i18n (0.6.11)
34
- json (1.8.1)
35
+ i18n (0.7.0)
36
+ i18n_data (0.6.2)
37
+ json (1.8.2)
35
38
  method_source (0.8.2)
36
- minitest (5.4.1)
39
+ minitest (5.5.1)
37
40
  pry (0.10.1)
38
41
  coderay (~> 1.1.0)
39
42
  method_source (~> 0.8.1)
40
43
  slop (~> 3.4)
41
- psych (2.0.5)
44
+ psych (2.0.12)
42
45
  racc (1.4.12)
43
46
  rack (1.5.2)
44
- rack-test (0.6.2)
47
+ rack-test (0.6.3)
45
48
  rack (>= 1.0)
46
- rake (10.3.2)
49
+ rake (10.4.2)
47
50
  rspec (3.1.0)
48
51
  rspec-core (~> 3.1.0)
49
52
  rspec-expectations (~> 3.1.0)
50
53
  rspec-mocks (~> 3.1.0)
51
- rspec-core (3.1.1)
54
+ rspec-core (3.1.7)
52
55
  rspec-support (~> 3.1.0)
53
- rspec-expectations (3.1.0)
56
+ rspec-expectations (3.1.2)
54
57
  diff-lcs (>= 1.2.0, < 2.0)
55
58
  rspec-support (~> 3.1.0)
56
- rspec-mocks (3.1.0)
59
+ rspec-mocks (3.1.3)
57
60
  rspec-support (~> 3.1.0)
58
- rspec-support (3.1.0)
59
- rubysl (2.0.15)
61
+ rspec-support (3.1.2)
62
+ rubysl (2.1.0)
60
63
  rubysl-abbrev (~> 2.0)
61
64
  rubysl-base64 (~> 2.0)
62
65
  rubysl-benchmark (~> 2.0)
@@ -90,7 +93,7 @@ GEM
90
93
  rubysl-io-nonblock (~> 2.0)
91
94
  rubysl-io-wait (~> 2.0)
92
95
  rubysl-ipaddr (~> 2.0)
93
- rubysl-irb (~> 2.0)
96
+ rubysl-irb (~> 2.1)
94
97
  rubysl-logger (~> 2.0)
95
98
  rubysl-mathn (~> 2.0)
96
99
  rubysl-matrix (~> 2.0)
@@ -119,7 +122,6 @@ GEM
119
122
  rubysl-pstore (~> 2.0)
120
123
  rubysl-pty (~> 2.0)
121
124
  rubysl-rational (~> 2.0)
122
- rubysl-readline (~> 2.0)
123
125
  rubysl-resolv (~> 2.0)
124
126
  rubysl-rexml (~> 2.0)
125
127
  rubysl-rinda (~> 2.0)
@@ -161,14 +163,14 @@ GEM
161
163
  rubysl-csv (2.0.2)
162
164
  rubysl-english (~> 2.0)
163
165
  rubysl-curses (2.0.1)
164
- rubysl-date (2.0.8)
166
+ rubysl-date (2.0.9)
165
167
  rubysl-delegate (2.0.1)
166
168
  rubysl-digest (2.0.3)
167
169
  rubysl-drb (2.0.1)
168
170
  rubysl-e2mmap (2.0.0)
169
171
  rubysl-english (2.0.0)
170
172
  rubysl-enumerator (2.0.0)
171
- rubysl-erb (2.0.1)
173
+ rubysl-erb (2.0.2)
172
174
  rubysl-etc (2.0.3)
173
175
  ffi2-generators (~> 0.1)
174
176
  rubysl-expect (2.0.0)
@@ -186,12 +188,11 @@ GEM
186
188
  rubysl-io-nonblock (2.0.0)
187
189
  rubysl-io-wait (2.0.0)
188
190
  rubysl-ipaddr (2.0.0)
189
- rubysl-irb (2.0.4)
191
+ rubysl-irb (2.1.1)
190
192
  rubysl-e2mmap (~> 2.0)
191
193
  rubysl-mathn (~> 2.0)
192
- rubysl-readline (~> 2.0)
193
194
  rubysl-thread (~> 2.0)
194
- rubysl-logger (2.0.0)
195
+ rubysl-logger (2.1.0)
195
196
  rubysl-mathn (2.0.0)
196
197
  rubysl-matrix (2.1.0)
197
198
  rubysl-e2mmap (~> 2.0)
@@ -214,21 +215,20 @@ GEM
214
215
  rubysl-observer (2.0.0)
215
216
  rubysl-open-uri (2.0.0)
216
217
  rubysl-open3 (2.0.0)
217
- rubysl-openssl (2.1.0)
218
+ rubysl-openssl (2.2.1)
218
219
  rubysl-optparse (2.0.1)
219
220
  rubysl-shellwords (~> 2.0)
220
221
  rubysl-ostruct (2.0.4)
221
- rubysl-pathname (2.0.0)
222
+ rubysl-pathname (2.1.0)
222
223
  rubysl-prettyprint (2.0.3)
223
224
  rubysl-prime (2.0.1)
224
225
  rubysl-profile (2.0.0)
225
226
  rubysl-profiler (2.0.1)
226
227
  rubysl-pstore (2.0.0)
227
- rubysl-pty (2.0.2)
228
+ rubysl-pty (2.0.3)
228
229
  rubysl-rational (2.0.1)
229
- rubysl-readline (2.0.2)
230
230
  rubysl-resolv (2.1.0)
231
- rubysl-rexml (2.0.2)
231
+ rubysl-rexml (2.0.4)
232
232
  rubysl-rinda (2.0.1)
233
233
  rubysl-rss (2.0.0)
234
234
  rubysl-scanf (2.0.0)
@@ -240,7 +240,7 @@ GEM
240
240
  rubysl-stringio (2.0.0)
241
241
  rubysl-strscan (2.0.0)
242
242
  rubysl-sync (2.0.0)
243
- rubysl-syslog (2.0.1)
243
+ rubysl-syslog (2.1.0)
244
244
  ffi2-generators (~> 0.1)
245
245
  rubysl-tempfile (2.0.1)
246
246
  rubysl-thread (2.0.2)
@@ -256,13 +256,16 @@ GEM
256
256
  rubysl-weakref (2.0.0)
257
257
  rubysl-webrick (2.0.0)
258
258
  rubysl-xmlrpc (2.0.0)
259
- rubysl-yaml (2.0.4)
259
+ rubysl-yaml (2.1.0)
260
260
  rubysl-zlib (2.0.1)
261
261
  slop (3.6.0)
262
+ sort_alphabetical (1.0.1)
263
+ unicode_utils (>= 1.2.2)
262
264
  thread_safe (0.3.4)
263
265
  tzinfo (1.2.2)
264
266
  thread_safe (~> 0.1)
265
- wwtd (0.5.5)
267
+ unicode_utils (1.4.0)
268
+ wwtd (0.7.0)
266
269
 
267
270
  PLATFORMS
268
271
  ruby
data/gemfiles/actionpack4.2.gemfile.lock CHANGED
@@ -1,80 +1,87 @@
1
1
  PATH
2
2
  remote: ../
3
3
  specs:
4
- country_select (2.1.0)
5
- countries (~> 0.9, >= 0.9.3)
4
+ country_select (2.2.0)
5
+ countries (~> 0.11.0)
6
+ sort_alphabetical (~> 1.0)
6
7
 
7
8
  GEM
8
9
  remote: https://rubygems.org/
9
10
  specs:
10
- actionpack (4.2.0.beta1)
11
- actionview (= 4.2.0.beta1)
12
- activesupport (= 4.2.0.beta1)
13
- rack (~> 1.6.0.beta)
11
+ actionpack (4.2.0)
12
+ actionview (= 4.2.0)
13
+ activesupport (= 4.2.0)
14
+ rack (~> 1.6.0)
14
15
  rack-test (~> 0.6.2)
15
- rails-deprecated_sanitizer (~> 1.0, >= 1.0.2)
16
- rails-dom-testing (~> 1.0, >= 1.0.2)
17
- actionview (4.2.0.beta1)
18
- activesupport (= 4.2.0.beta1)
16
+ rails-dom-testing (~> 1.0, >= 1.0.5)
17
+ rails-html-sanitizer (~> 1.0, >= 1.0.1)
18
+ actionview (4.2.0)
19
+ activesupport (= 4.2.0)
19
20
  builder (~> 3.1)
20
21
  erubis (~> 2.7.0)
21
- rails-deprecated_sanitizer (~> 1.0, >= 1.0.2)
22
- rails-dom-testing (~> 1.0, >= 1.0.2)
23
- activesupport (4.2.0.beta1)
24
- i18n (>= 0.7.0.beta1, < 0.8)
22
+ rails-dom-testing (~> 1.0, >= 1.0.5)
23
+ rails-html-sanitizer (~> 1.0, >= 1.0.1)
24
+ activesupport (4.2.0)
25
+ i18n (~> 0.7)
25
26
  json (~> 1.7, >= 1.7.7)
26
27
  minitest (~> 5.1)
27
- thread_safe (~> 0.1)
28
+ thread_safe (~> 0.3, >= 0.3.4)
28
29
  tzinfo (~> 1.1)
29
30
  builder (3.2.2)
30
31
  coderay (1.1.0)
31
- countries (0.9.3)
32
+ countries (0.11.2)
32
33
  currencies (~> 0.4.2)
34
+ i18n_data (~> 0.6.0)
33
35
  currencies (0.4.2)
34
36
  diff-lcs (1.2.5)
35
37
  erubis (2.7.0)
36
38
  ffi2-generators (0.1.1)
37
- i18n (0.7.0.beta1)
38
- json (1.8.1)
39
+ i18n (0.7.0)
40
+ i18n_data (0.6.2)
41
+ json (1.8.2)
42
+ loofah (2.0.1)
43
+ nokogiri (>= 1.5.9)
39
44
  method_source (0.8.2)
40
- mini_portile (0.6.0)
41
- minitest (5.4.1)
42
- nokogiri (1.6.3.1)
43
- mini_portile (= 0.6.0)
45
+ mini_portile (0.6.2)
46
+ minitest (5.5.1)
47
+ nokogiri (1.6.6.2)
48
+ mini_portile (~> 0.6.0)
44
49
  pry (0.10.1)
45
50
  coderay (~> 1.1.0)
46
51
  method_source (~> 0.8.1)
47
52
  slop (~> 3.4)
48
- psych (2.0.5)
53
+ psych (2.0.12)
49
54
  racc (1.4.12)
50
- rack (1.6.0.beta)
51
- rack-test (0.6.2)
55
+ rack (1.6.0)
56
+ rack-test (0.6.3)
52
57
  rack (>= 1.0)
53
- rails-deprecated_sanitizer (1.0.2)
58
+ rails-deprecated_sanitizer (1.0.3)
54
59
  activesupport (>= 4.2.0.alpha)
55
- rails-dom-testing (1.0.2)
56
- activesupport
60
+ rails-dom-testing (1.0.5)
61
+ activesupport (>= 4.2.0.beta, < 5.0)
57
62
  nokogiri (~> 1.6.0)
58
63
  rails-deprecated_sanitizer (>= 1.0.1)
59
- railties (4.2.0.beta1)
60
- actionpack (= 4.2.0.beta1)
61
- activesupport (= 4.2.0.beta1)
64
+ rails-html-sanitizer (1.0.1)
65
+ loofah (~> 2.0)
66
+ railties (4.2.0)
67
+ actionpack (= 4.2.0)
68
+ activesupport (= 4.2.0)
62
69
  rake (>= 0.8.7)
63
70
  thor (>= 0.18.1, < 2.0)
64
- rake (10.3.2)
71
+ rake (10.4.2)
65
72
  rspec (3.1.0)
66
73
  rspec-core (~> 3.1.0)
67
74
  rspec-expectations (~> 3.1.0)
68
75
  rspec-mocks (~> 3.1.0)
69
- rspec-core (3.1.1)
76
+ rspec-core (3.1.7)
70
77
  rspec-support (~> 3.1.0)
71
- rspec-expectations (3.1.0)
78
+ rspec-expectations (3.1.2)
72
79
  diff-lcs (>= 1.2.0, < 2.0)
73
80
  rspec-support (~> 3.1.0)
74
- rspec-mocks (3.1.0)
81
+ rspec-mocks (3.1.3)
75
82
  rspec-support (~> 3.1.0)
76
- rspec-support (3.1.0)
77
- rubysl (2.0.15)
83
+ rspec-support (3.1.2)
84
+ rubysl (2.1.0)
78
85
  rubysl-abbrev (~> 2.0)
79
86
  rubysl-base64 (~> 2.0)
80
87
  rubysl-benchmark (~> 2.0)
@@ -108,7 +115,7 @@ GEM
108
115
  rubysl-io-nonblock (~> 2.0)
109
116
  rubysl-io-wait (~> 2.0)
110
117
  rubysl-ipaddr (~> 2.0)
111
- rubysl-irb (~> 2.0)
118
+ rubysl-irb (~> 2.1)
112
119
  rubysl-logger (~> 2.0)
113
120
  rubysl-mathn (~> 2.0)
114
121
  rubysl-matrix (~> 2.0)
@@ -137,7 +144,6 @@ GEM
137
144
  rubysl-pstore (~> 2.0)
138
145
  rubysl-pty (~> 2.0)
139
146
  rubysl-rational (~> 2.0)
140
- rubysl-readline (~> 2.0)
141
147
  rubysl-resolv (~> 2.0)
142
148
  rubysl-rexml (~> 2.0)
143
149
  rubysl-rinda (~> 2.0)
@@ -179,14 +185,14 @@ GEM
179
185
  rubysl-csv (2.0.2)
180
186
  rubysl-english (~> 2.0)
181
187
  rubysl-curses (2.0.1)
182
- rubysl-date (2.0.8)
188
+ rubysl-date (2.0.9)
183
189
  rubysl-delegate (2.0.1)
184
190
  rubysl-digest (2.0.3)
185
191
  rubysl-drb (2.0.1)
186
192
  rubysl-e2mmap (2.0.0)
187
193
  rubysl-english (2.0.0)
188
194
  rubysl-enumerator (2.0.0)
189
- rubysl-erb (2.0.1)
195
+ rubysl-erb (2.0.2)
190
196
  rubysl-etc (2.0.3)
191
197
  ffi2-generators (~> 0.1)
192
198
  rubysl-expect (2.0.0)
@@ -204,12 +210,11 @@ GEM
204
210
  rubysl-io-nonblock (2.0.0)
205
211
  rubysl-io-wait (2.0.0)
206
212
  rubysl-ipaddr (2.0.0)
207
- rubysl-irb (2.0.4)
213
+ rubysl-irb (2.1.1)
208
214
  rubysl-e2mmap (~> 2.0)
209
215
  rubysl-mathn (~> 2.0)
210
- rubysl-readline (~> 2.0)
211
216
  rubysl-thread (~> 2.0)
212
- rubysl-logger (2.0.0)
217
+ rubysl-logger (2.1.0)
213
218
  rubysl-mathn (2.0.0)
214
219
  rubysl-matrix (2.1.0)
215
220
  rubysl-e2mmap (~> 2.0)
@@ -232,21 +237,20 @@ GEM
232
237
  rubysl-observer (2.0.0)
233
238
  rubysl-open-uri (2.0.0)
234
239
  rubysl-open3 (2.0.0)
235
- rubysl-openssl (2.1.0)
240
+ rubysl-openssl (2.2.1)
236
241
  rubysl-optparse (2.0.1)
237
242
  rubysl-shellwords (~> 2.0)
238
243
  rubysl-ostruct (2.0.4)
239
- rubysl-pathname (2.0.0)
244
+ rubysl-pathname (2.1.0)
240
245
  rubysl-prettyprint (2.0.3)
241
246
  rubysl-prime (2.0.1)
242
247
  rubysl-profile (2.0.0)
243
248
  rubysl-profiler (2.0.1)
244
249
  rubysl-pstore (2.0.0)
245
- rubysl-pty (2.0.2)
250
+ rubysl-pty (2.0.3)
246
251
  rubysl-rational (2.0.1)
247
- rubysl-readline (2.0.2)
248
252
  rubysl-resolv (2.1.0)
249
- rubysl-rexml (2.0.2)
253
+ rubysl-rexml (2.0.4)
250
254
  rubysl-rinda (2.0.1)
251
255
  rubysl-rss (2.0.0)
252
256
  rubysl-scanf (2.0.0)
@@ -258,7 +262,7 @@ GEM
258
262
  rubysl-stringio (2.0.0)
259
263
  rubysl-strscan (2.0.0)
260
264
  rubysl-sync (2.0.0)
261
- rubysl-syslog (2.0.1)
265
+ rubysl-syslog (2.1.0)
262
266
  ffi2-generators (~> 0.1)
263
267
  rubysl-tempfile (2.0.1)
264
268
  rubysl-thread (2.0.2)
@@ -274,14 +278,17 @@ GEM
274
278
  rubysl-weakref (2.0.0)
275
279
  rubysl-webrick (2.0.0)
276
280
  rubysl-xmlrpc (2.0.0)
277
- rubysl-yaml (2.0.4)
281
+ rubysl-yaml (2.1.0)
278
282
  rubysl-zlib (2.0.1)
279
283
  slop (3.6.0)
284
+ sort_alphabetical (1.0.1)
285
+ unicode_utils (>= 1.2.2)
280
286
  thor (0.19.1)
281
287
  thread_safe (0.3.4)
282
288
  tzinfo (1.2.2)
283
289
  thread_safe (~> 0.1)
284
- wwtd (0.5.5)
290
+ unicode_utils (1.4.0)
291
+ wwtd (0.7.0)
285
292
 
286
293
  PLATFORMS
287
294
  ruby
data/lib/country_select.rb CHANGED
@@ -1,6 +1,7 @@
1
1
  # encoding: utf-8
2
2
 
3
3
  require 'iso3166'
4
+ require 'sort_alphabetical'
4
5
 
5
6
  require 'country_select/version'
6
7
  require 'country_select/formats'
data/lib/country_select/tag_helper.rb CHANGED
@@ -71,10 +71,9 @@ module CountrySelect
71
71
  code = country.alpha2
72
72
  elsif country = ISO3166::Country.find_by_name(code_or_name)
73
73
  code = country.first
74
+ country = ISO3166::Country.new(code)
74
75
  end
75
76
 
76
- country = ISO3166::Country.new(code)
77
-
78
77
  unless country.present?
79
78
  msg = "Could not find Country with string '#{code_or_name}'"
80
79
  raise CountryNotFoundError.new(msg)
@@ -84,7 +83,12 @@ module CountrySelect
84
83
 
85
84
  [name,code]
86
85
  end
87
- sorted ? country_list.sort : country_list
86
+
87
+ if sorted
88
+ country_list.sort_alphabetical
89
+ else
90
+ country_list
91
+ end
88
92
  end
89
93
  end
90
94
 
data/lib/country_select/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module CountrySelect
2
- VERSION = "2.1.1"
2
+ VERSION = "2.2.0"
3
3
  end
data/spec/country_select_spec.rb CHANGED
@@ -31,7 +31,7 @@ describe "CountrySelect" do
31
31
  end
32
32
 
33
33
  it "selects the value of country_code" do
34
- tag = options_for_select([['United States of America', 'US']], 'US')
34
+ tag = options_for_select([['United States', 'US']], 'US')
35
35
 
36
36
  walrus.country_code = 'US'
37
37
  t = builder.country_select(:country_code)
@@ -64,7 +64,7 @@ describe "CountrySelect" do
64
64
  tag = options_for_select(
65
65
  [
66
66
  ['Latvia','LV'],
67
- ['United States of America','US'],
67
+ ['United States','US'],
68
68
  ['Denmark', 'DK'],
69
69
  ['-'*15,'-'*15]
70
70
  ],
@@ -78,7 +78,7 @@ describe "CountrySelect" do
78
78
  end
79
79
 
80
80
  it "selects only the first matching option" do
81
- tag = options_for_select([["United States of America", "US"],["Uruguay", "UY"]], "US")
81
+ tag = options_for_select([["United States", "US"],["Uruguay", "UY"]], "US")
82
82
  walrus.country_code = 'US'
83
83
  t = builder.country_select(:country_code, priority_countries: ['LV','US'])
84
84
  expect(t).to_not include(tag)
@@ -93,7 +93,7 @@ describe "CountrySelect" do
93
93
  end
94
94
 
95
95
  it "discards some countries" do
96
- tag = options_for_select([["United States of America", "US"]])
96
+ tag = options_for_select([["United States", "US"]])
97
97
  walrus.country_code = 'DE'
98
98
  t = builder.country_select(:country_code, except: ['US'])
99
99
  expect(t).to_not include(tag)
@@ -104,7 +104,7 @@ describe "CountrySelect" do
104
104
  tag = options_for_select(
105
105
  [
106
106
  ['Latvia','LV'],
107
- ['United States of America','US'],
107
+ ['United States','US'],
108
108
  ['Denmark', 'DK'],
109
109
  ['-'*15,'-'*15]
110
110
  ],
@@ -118,7 +118,7 @@ describe "CountrySelect" do
118
118
  end
119
119
 
120
120
  it "selects only the first matching option" do
121
- tag = options_for_select([["United States of America", "US"],["Uruguay", "UY"]], "US")
121
+ tag = options_for_select([["United States", "US"],["Uruguay", "UY"]], "US")
122
122
  walrus.country_code = 'US'
123
123
  t = builder.country_select(:country_code, ['LV','US'])
124
124
  expect(t).to_not include(tag)
@@ -129,7 +129,7 @@ describe "CountrySelect" do
129
129
  ["Australia", "AU"],
130
130
  ["Canada", "CA"],
131
131
  ["United Kingdom", "GB"],
132
- ["United States of America", "US"]
132
+ ["United States", "US"]
133
133
  ])
134
134
  country_names = ["Australia", "Canada", "United Kingdom", "United States"]
135
135
  t = builder.country_select(:country_code, country_names)
@@ -165,6 +165,12 @@ describe "CountrySelect" do
165
165
  end
166
166
  end
167
167
 
168
+ it 'sorts unicode' do
169
+ tag = builder.country_select(:country_code, only: ['AX', 'AL', 'AF', 'ZW'])
170
+ order = tag.scan(/value="(\w{2})"/).map { |o| o[0] }
171
+ expect(order).to eq(['AF', 'AX', 'AL', 'ZW'])
172
+ end
173
+
168
174
  describe "custom formats" do
169
175
  it "accepts a custom formatter" do
170
176
  ::CountrySelect::FORMATS[:with_alpha2] = lambda do |country|
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: 2.1.1
4
+ version: 2.2.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: 2015-02-03 00:00:00.000000000 Z
11
+ date: 2015-03-19 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: actionpack
@@ -84,22 +84,30 @@ dependencies:
84
84
  name: countries
85
85
  requirement: !ruby/object:Gem::Requirement
86
86
  requirements:
87
- - - ">="
88
- - !ruby/object:Gem::Version
89
- version: 0.9.3
90
- - - "<"
87
+ - - "~>"
91
88
  - !ruby/object:Gem::Version
92
- version: 0.10.0
89
+ version: 0.11.0
93
90
  type: :runtime
94
91
  prerelease: false
95
92
  version_requirements: !ruby/object:Gem::Requirement
96
93
  requirements:
97
- - - ">="
94
+ - - "~>"
98
95
  - !ruby/object:Gem::Version
99
- version: 0.9.3
100
- - - "<"
96
+ version: 0.11.0
97
+ - !ruby/object:Gem::Dependency
98
+ name: sort_alphabetical
99
+ requirement: !ruby/object:Gem::Requirement
100
+ requirements:
101
+ - - "~>"
102
+ - !ruby/object:Gem::Version
103
+ version: '1.0'
104
+ type: :runtime
105
+ prerelease: false
106
+ version_requirements: !ruby/object:Gem::Requirement
107
+ requirements:
108
+ - - "~>"
101
109
  - !ruby/object:Gem::Version
102
- version: 0.10.0
110
+ version: '1.0'
103
111
  description: Provides a simple helper to get an HTML select list of countries. The
104
112
  list of countries comes from the ISO 3166 standard. While it is a relatively neutral
105
113
  source of country names, it will still offend some users.