Skip to content

Commit

Permalink
Merge pull request #201 from countries/update_countries_v5
Browse files Browse the repository at this point in the history 
Upgrade countries gem to 5.0.0
  • Loading branch information
@pmor
pmor authored Apr 3, 2022
2 parents 8f55661 + 170b264 commit 2d8533f
Show file tree
Hide file tree
Showing 10 changed files with 166 additions and 197 deletions.
17 changes: 6 additions & 11 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ PATH
remote: .
specs:
country_select (6.1.1)
countries (~> 4.2)
countries (~> 5.0)
sort_alphabetical (~> 1.1)

GEM
Expand All @@ -29,7 +29,7 @@ GEM
builder (3.2.4)
coderay (1.1.3)
concurrent-ruby (1.1.10)
countries (4.2.3)
countries (5.0.0)
i18n_data (~> 0.16.0)
sixarm_ruby_unaccent (~> 1.1)
crass (1.0.6)
Expand All @@ -39,16 +39,12 @@ GEM
concurrent-ruby (~> 1.0)
i18n_data (0.16.0)
simple_po_parser (~> 1.1)
loofah (2.15.0)
loofah (2.16.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
method_source (1.0.0)
mini_portile2 (2.8.0)
minitest (5.15.0)
nokogiri (1.13.3)
mini_portile2 (~> 2.8.0)
racc (~> 1.4)
nokogiri (1.13.3-x86_64-linux)
nokogiri (1.13.3-x86_64-darwin)
racc (~> 1.4)
pry (0.14.1)
coderay (~> 1.1)
Expand Down Expand Up @@ -85,8 +81,7 @@ GEM
unicode_utils (1.4.0)

PLATFORMS
ruby
x86_64-linux
x86_64-darwin-21

DEPENDENCIES
actionpack (~> 7.0)
Expand All @@ -96,4 +91,4 @@ DEPENDENCIES
rspec (~> 3)

BUNDLED WITH
2.3.3
2.3.10
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ class User < ActiveRecord::Base
# (usually English) name if no translation is available
def country_name
country = ISO3166::Country[country_code]
country.translations[I18n.locale.to_s] || country.iso_short_name
country.translations[I18n.locale.to_s] || country.common_name || country.iso_short_name
end

end
Expand Down
2 changes: 1 addition & 1 deletion country_select.gemspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@ Gem::Specification.new do |s|
s.add_development_dependency 'rake', '~> 13'
s.add_development_dependency 'rspec', '~> 3'

s.add_dependency 'countries', '~> 4.2'
s.add_dependency 'countries', '~> 5.0'
s.add_dependency 'sort_alphabetical', '~> 1.1'
end
69 changes: 32 additions & 37 deletions gemfiles/actionpack-5.2.gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,55 +2,51 @@ PATH
remote: ..
specs:
country_select (6.1.1)
countries (~> 4.2)
countries (~> 5.0)
sort_alphabetical (~> 1.1)

GEM
remote: https://rubygems.org/
specs:
actionpack (5.2.6)
actionview (= 5.2.6)
activesupport (= 5.2.6)
actionpack (5.2.7)
actionview (= 5.2.7)
activesupport (= 5.2.7)
rack (~> 2.0, >= 2.0.8)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.2.6)
activesupport (= 5.2.6)
actionview (5.2.7)
activesupport (= 5.2.7)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activesupport (5.2.6)
activesupport (5.2.7)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
builder (3.2.4)
coderay (1.1.3)
concurrent-ruby (1.1.9)
countries (4.2.1)
i18n_data (~> 0.15.0)
concurrent-ruby (1.1.10)
countries (5.0.0)
i18n_data (~> 0.16.0)
sixarm_ruby_unaccent (~> 1.1)
crass (1.0.6)
diff-lcs (1.5.0)
erubi (1.10.0)
i18n (1.8.11)
i18n (1.10.0)
concurrent-ruby (~> 1.0)
i18n_data (0.15.0)
i18n_data (0.16.0)
simple_po_parser (~> 1.1)
loofah (2.13.0)
loofah (2.16.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
method_source (1.0.0)
mini_portile2 (2.7.1)
minitest (5.15.0)
nokogiri (1.13.1)
mini_portile2 (~> 2.7.0)
nokogiri (1.13.3-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.13.1-arm64-darwin)
racc (~> 1.4)
nokogiri (1.13.1-x86_64-linux)
nokogiri (1.13.3-x86_64-linux)
racc (~> 1.4)
pry (0.14.1)
coderay (~> 1.1)
Expand All @@ -64,27 +60,27 @@ GEM
nokogiri (>= 1.6)
rails-html-sanitizer (1.4.2)
loofah (~> 2.3)
railties (5.2.6)
actionpack (= 5.2.6)
activesupport (= 5.2.6)
railties (5.2.7)
actionpack (= 5.2.7)
activesupport (= 5.2.7)
method_source
rake (>= 0.8.7)
thor (>= 0.19.0, < 2.0)
rake (13.0.6)
rspec (3.10.0)
rspec-core (~> 3.10.0)
rspec-expectations (~> 3.10.0)
rspec-mocks (~> 3.10.0)
rspec-core (3.10.1)
rspec-support (~> 3.10.0)
rspec-expectations (3.10.2)
rspec (3.11.0)
rspec-core (~> 3.11.0)
rspec-expectations (~> 3.11.0)
rspec-mocks (~> 3.11.0)
rspec-core (3.11.0)
rspec-support (~> 3.11.0)
rspec-expectations (3.11.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.10.0)
rspec-mocks (3.10.2)
rspec-support (~> 3.11.0)
rspec-mocks (3.11.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.10.0)
rspec-support (3.10.3)
simple_po_parser (1.1.5)
rspec-support (~> 3.11.0)
rspec-support (3.11.0)
simple_po_parser (1.1.6)
sixarm_ruby_unaccent (1.2.0)
sort_alphabetical (1.1.0)
unicode_utils (>= 1.2.2)
Expand All @@ -95,8 +91,7 @@ GEM
unicode_utils (1.4.0)

PLATFORMS
arm64-darwin-21
ruby
x86_64-darwin-21
x86_64-linux

DEPENDENCIES
Expand All @@ -108,4 +103,4 @@ DEPENDENCIES
rspec (~> 3)

BUNDLED WITH
2.3.3
2.3.10
71 changes: 33 additions & 38 deletions gemfiles/actionpack-6.0.gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,56 +2,52 @@ PATH
remote: ..
specs:
country_select (6.1.1)
countries (~> 4.2)
countries (~> 5.0)
sort_alphabetical (~> 1.1)

GEM
remote: https://rubygems.org/
specs:
actionpack (6.1.4.4)
actionview (= 6.1.4.4)
activesupport (= 6.1.4.4)
actionpack (6.1.4.6)
actionview (= 6.1.4.6)
activesupport (= 6.1.4.6)
rack (~> 2.0, >= 2.0.9)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actionview (6.1.4.4)
activesupport (= 6.1.4.4)
actionview (6.1.4.6)
activesupport (= 6.1.4.6)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
activesupport (6.1.4.4)
activesupport (6.1.4.6)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
zeitwerk (~> 2.3)
builder (3.2.4)
coderay (1.1.3)
concurrent-ruby (1.1.9)
countries (4.2.1)
i18n_data (~> 0.15.0)
concurrent-ruby (1.1.10)
countries (5.0.0)
i18n_data (~> 0.16.0)
sixarm_ruby_unaccent (~> 1.1)
crass (1.0.6)
diff-lcs (1.5.0)
erubi (1.10.0)
i18n (1.8.11)
i18n (1.10.0)
concurrent-ruby (~> 1.0)
i18n_data (0.15.0)
i18n_data (0.16.0)
simple_po_parser (~> 1.1)
loofah (2.13.0)
loofah (2.16.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
method_source (1.0.0)
mini_portile2 (2.7.1)
minitest (5.15.0)
nokogiri (1.13.1)
mini_portile2 (~> 2.7.0)
nokogiri (1.13.3-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.13.1-arm64-darwin)
racc (~> 1.4)
nokogiri (1.13.1-x86_64-linux)
nokogiri (1.13.3-x86_64-linux)
racc (~> 1.4)
pry (0.14.1)
coderay (~> 1.1)
Expand All @@ -65,39 +61,38 @@ GEM
nokogiri (>= 1.6)
rails-html-sanitizer (1.4.2)
loofah (~> 2.3)
railties (6.1.4.4)
actionpack (= 6.1.4.4)
activesupport (= 6.1.4.4)
railties (6.1.4.6)
actionpack (= 6.1.4.6)
activesupport (= 6.1.4.6)
method_source
rake (>= 0.13)
thor (~> 1.0)
rake (13.0.6)
rspec (3.10.0)
rspec-core (~> 3.10.0)
rspec-expectations (~> 3.10.0)
rspec-mocks (~> 3.10.0)
rspec-core (3.10.1)
rspec-support (~> 3.10.0)
rspec-expectations (3.10.2)
rspec (3.11.0)
rspec-core (~> 3.11.0)
rspec-expectations (~> 3.11.0)
rspec-mocks (~> 3.11.0)
rspec-core (3.11.0)
rspec-support (~> 3.11.0)
rspec-expectations (3.11.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.10.0)
rspec-mocks (3.10.2)
rspec-support (~> 3.11.0)
rspec-mocks (3.11.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.10.0)
rspec-support (3.10.3)
simple_po_parser (1.1.5)
rspec-support (~> 3.11.0)
rspec-support (3.11.0)
simple_po_parser (1.1.6)
sixarm_ruby_unaccent (1.2.0)
sort_alphabetical (1.1.0)
unicode_utils (>= 1.2.2)
thor (1.2.1)
tzinfo (2.0.4)
concurrent-ruby (~> 1.0)
unicode_utils (1.4.0)
zeitwerk (2.5.3)
zeitwerk (2.5.4)

PLATFORMS
arm64-darwin-21
ruby
x86_64-darwin-21
x86_64-linux

DEPENDENCIES
Expand All @@ -109,4 +104,4 @@ DEPENDENCIES
rspec (~> 3)

BUNDLED WITH
2.3.3
2.3.10
Loading

0 comments on commit 2d8533f

Please sign in to comment.