country_select 4.0.0 → 8.0.1

data/spec/country_select_spec.rb

@@ -20,7 +20,7 @@ describe "CountrySelect" do
   end
 
   let(:walrus) { Walrus.new }
-  let!(:template) { ActionView::Base.new }
+  let!(:template) { ActionView::Base.new(ActionView::LookupContext.new([]), {}, nil) }
 
   let(:builder) do
     if defined?(ActionView::Helpers::Tags::Base)
@@ -61,6 +61,23 @@ describe "CountrySelect" do
     end
   end
 
+  it 'falls back when given a country-specific locale' do
+    I18n.available_locales = [:en, :de, :'de-AT']
+    ISO3166.reset
+
+    tag = options_for_select([['Deutschland', 'DE']], 'DE')
+
+    walrus.country_code = 'DE'
+    original_locale = I18n.locale
+    begin
+      I18n.locale = :'de-AT'
+      t = builder.country_select(:country_code)
+      expect(t).to include(tag)
+    ensure
+      I18n.locale = original_locale
+    end
+  end
+
   it "accepts a locale option" do
     I18n.available_locales = [:fr]
     ISO3166.reset
@@ -75,9 +92,26 @@ describe "CountrySelect" do
   it "accepts priority countries" do
     tag = options_for_select(
       [
+        ['Denmark', 'DK'],
         ['Latvia','LV'],
         ['United States','US'],
+        ['-'*15,'-'*15]
+      ],
+      selected: 'US',
+      disabled: '-'*15
+    )
+
+    walrus.country_code = 'US'
+    t = builder.country_select(:country_code, priority_countries: ['LV','US','DK'])
+    expect(t).to include(tag)
+  end
+
+  it "priority countries are sorted by name by default" do
+    tag = options_for_select(
+      [
         ['Denmark', 'DK'],
+        ['Latvia','LV'],
+        ['United States','US'],
         ['-'*15,'-'*15]
       ],
       selected: 'US',
@@ -89,6 +123,41 @@ describe "CountrySelect" do
     expect(t).to include(tag)
   end
 
+  it "priority countries with `sort_provided: false` preserves the provided order" do
+    tag = options_for_select(
+      [
+        ['Latvia','LV'],
+        ['United States','US'],
+        ['Denmark', 'DK'],
+        ['-'*15,'-'*15]
+      ],
+      selected: 'US',
+      disabled: '-'*15
+    )
+
+    walrus.country_code = 'US'
+    t = builder.country_select(:country_code, priority_countries: ['LV','US','DK'], sort_provided: false)
+    expect(t).to include(tag)
+  end
+
+  it "priority countries with `sort_provided: false` still sorts the non-priority countries by name" do
+    tag = options_for_select(
+      [
+        ['Latvia','LV'],
+        ['United States','US'],
+        ['Denmark', 'DK'],
+        ['-'*15,'-'*15],
+        ['Afghanistan','AF']
+      ],
+      selected: 'AF',
+      disabled: '-'*15
+    )
+
+    walrus.country_code = 'AF'
+    t = builder.country_select(:country_code, priority_countries: ['LV','US','DK'], sort_provided: false)
+    expect(t).to include(tag)
+  end
+
   describe "when selected options is not an array" do
     it "selects only the first matching option" do
       tag = options_for_select([["United States", "US"],["Uruguay", "UY"]], "US")
@@ -100,7 +169,6 @@ describe "CountrySelect" do
 
   describe "when selected options is an array" do
     it "selects all options but only once" do
-      tag = options_for_select([["United States", "US"],["Uruguay", "UY"],["Spain", "ES"]], "US")
       walrus.country_code = 'US'
       t = builder.country_select(:country_code, {priority_countries: ['LV','US','ES'], selected: ['UY', 'US']}, multiple: true)
       expect(t.scan(options_for_select([["United States", "US"]], "US")).length).to be(1)
@@ -123,13 +191,42 @@ describe "CountrySelect" do
     expect(t).to_not include(tag)
   end
 
+  it "countries provided in `only` are sorted by name by default" do
+    t = builder.country_select(:country_code, only: ['PT','DE','AR'])
+    order = t.scan(/value="(\w{2})"/).map { |o| o[0] }
+    expect(order).to eq(['AR', 'DE', 'PT'])
+  end
+
+  it "countries provided in `only` with `sort_provided` to false keeps the order of the provided countries" do
+    t = builder.country_select(:country_code, only: ['PT','DE','AR'], sort_provided: false)
+    order = t.scan(/value="(\w{2})"/).map { |o| o[0] }
+    expect(order).to eq(['PT','DE','AR'])
+  end
+
+  context "when there is a default 'except' configured" do
+    around do |example|
+      old_value = ::CountrySelect::DEFAULTS[:except]
+      example.run
+      ::CountrySelect::DEFAULTS[:except] = old_value
+    end
+
+    it "discards countries when configured to" do
+      ::CountrySelect::DEFAULTS[:except] = ['US']
+
+      tag = options_for_select([['United States', 'US']])
+      walrus.country_code = 'DE'
+      t = builder.country_select(:country_code)
+      expect(t).to_not include(tag)
+    end
+  end
+
   context "using old 1.x syntax" do
     it "accepts priority countries" do
       tag = options_for_select(
         [
+          ['Denmark', 'DK'],
           ['Latvia','LV'],
           ['United States','US'],
-          ['Denmark', 'DK'],
           ['-'*15,'-'*15]
         ],
         selected: 'US',
@@ -183,7 +280,14 @@ describe "CountrySelect" do
     end
 
     it "supports the include_blank option" do
-      tag = '<option value=""></option>'
+      # Rails 6.1 more closely follows the HTML spec for
+      # empty option tags.
+      # https://github.com/rails/rails/pull/39808
+      tag = if ActionView::VERSION::STRING >= '6.1'
+              '<option value="" label=" "></option>'
+            else
+              '<option value=""></option>'
+            end
       t = builder.country_select(:country_code, include_blank: true)
       expect(t).to include(tag)
     end
@@ -195,27 +299,10 @@ describe "CountrySelect" do
     expect(order).to eq(['AF', 'AX', 'AL', 'ZW'])
   end
 
-  context "without sort_alphabetical" do
-    before do
-      Enumerable.send(:alias_method, :_sort_alphabetical, :sort_alphabetical)
-      Enumerable.send(:remove_method, :sort_alphabetical)
-    end
-
-    after do
-      Enumerable.send(:alias_method, :sort_alphabetical, :_sort_alphabetical)
-    end
-
-    it 'falls back to regular sort' do
-      tag = builder.country_select(:country_code, only: ['AX', 'AL', 'AF', 'ZW'])
-      order = tag.scan(/value="(\w{2})"/).map { |o| o[0] }
-      expect(order).to eq(['AF', 'AL', 'ZW', 'AX'])
-    end
-  end
-
   describe "custom formats" do
     it "accepts a custom formatter" do
       ::CountrySelect::FORMATS[:with_alpha2] = lambda do |country|
-        "#{country.name} (#{country.alpha2})"
+        "#{country.iso_short_name} (#{country.alpha2})"
       end
 
       tag = options_for_select([['United States of America (US)', 'US']], 'US')
@@ -227,7 +314,7 @@ describe "CountrySelect" do
 
     it "accepts an array for formatter" do
       ::CountrySelect::FORMATS[:with_alpha3] = lambda do |country|
-        [country.name, country.alpha3]
+        [country.iso_short_name, country.alpha3]
       end
 
       tag = options_for_select([['United States of America', 'USA']], 'USA')
@@ -238,7 +325,7 @@ describe "CountrySelect" do
 
     it "accepts an array for formatter + custom formatter" do
       ::CountrySelect::FORMATS[:with_alpha3] = lambda do |country|
-        ["#{country.name} (#{country.alpha2})", country.alpha3]
+        ["#{country.iso_short_name} (#{country.alpha2})", country.alpha3]
       end
 
       tag = options_for_select([['United States of America (US)', 'USA']], 'USA')
@@ -249,7 +336,7 @@ describe "CountrySelect" do
 
     it "marks priority countries as selected only once" do
       ::CountrySelect::FORMATS[:with_alpha3] = lambda do |country|
-        [country.name, country.alpha3]
+        [country.iso_short_name, country.alpha3]
       end
 
       tag = options_for_select([['United States of America', 'USA']], 'USA')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: country_select
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 8.0.1
 platform: ruby
 authors:
 - Stefan Penner
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-12-20 00:00:00.000000000 Z
+date: 2023-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '7.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -42,16 +42,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -66,50 +66,22 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
-- !ruby/object:Gem::Dependency
-  name: wwtd
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: countries
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: sort_alphabetical
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-description: Provides a simple helper to get an HTML select list of countries.  The
-  list of countries comes from the ISO 3166 standard.  While it is a relatively neutral
+        version: '5.0'
+description: Provides a simple helper to get an HTML select list of countries. The
+  list of countries comes from the ISO 3166 standard. While it is a relatively neutral
   source of country names, it will still offend some users.
 email:
 - stefan.penner@gmail.com
@@ -117,9 +89,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/build.yml"
+- ".github/workflows/codeql-analysis.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -128,36 +101,30 @@ files:
 - Rakefile
 - UPGRADING.md
 - country_select.gemspec
-- gemfiles/actionpack.edge.gemfile
-- gemfiles/actionpack.edge.gemfile.lock
-- gemfiles/actionpack3.2.gemfile
-- gemfiles/actionpack3.2.gemfile.lock
-- gemfiles/actionpack4.0.gemfile
-- gemfiles/actionpack4.0.gemfile.lock
-- gemfiles/actionpack4.1.gemfile
-- gemfiles/actionpack4.1.gemfile.lock
-- gemfiles/actionpack4.2.gemfile
-- gemfiles/actionpack4.2.gemfile.lock
-- gemfiles/actionpack5.0.gemfile
-- gemfiles/actionpack5.0.gemfile.lock
-- gemfiles/actionpack5.1.gemfile
-- gemfiles/actionpack5.1.gemfile.lock
-- gemfiles/actionpack5.2.gemfile
-- gemfiles/actionpack5.2.gemfile.lock
+- gemfiles/actionpack-5.2.gemfile
+- gemfiles/actionpack-5.2.gemfile.lock
+- gemfiles/actionpack-6.0.gemfile
+- gemfiles/actionpack-6.0.gemfile.lock
+- gemfiles/actionpack-6.1.gemfile
+- gemfiles/actionpack-6.1.gemfile.lock
+- gemfiles/actionpack-7.0.gemfile
+- gemfiles/actionpack-7.0.gemfile.lock
 - lib/country_select.rb
 - lib/country_select/country_select_helper.rb
+- lib/country_select/defaults.rb
 - lib/country_select/formats.rb
-- lib/country_select/rails3/country_select_helper.rb
 - lib/country_select/tag_helper.rb
 - lib/country_select/version.rb
-- lib/country_select_without_sort_alphabetical.rb
 - spec/country_select_spec.rb
 - spec/spec_helper.rb
-homepage: https://github.com/stefanpenner/country_select
+homepage: https://github.com/countries/country_select
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  bug_tracker_uri: http://github.com/countries/country_select/issues
+  changelog_uri: https://github.com/countries/country_select/blob/master/CHANGELOG.md
+  source_code_uri: https://github.com/countries/country_select
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -165,16 +132,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: country_select
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.4.2
+signing_key:
 specification_version: 4
 summary: Country Select Plugin
 test_files:

data/.travis.yml

@@ -1,41 +0,0 @@
-sudo: false
-cache: bundler
-language: ruby
-script: "bundle exec rspec"
-rvm:
-  - 2.0
-  - 2.1
-  - 2.2
-  - 2.3
-  - 2.4
-  - 2.5
-  - ruby-head
-gemfile:
-  - gemfiles/actionpack3.2.gemfile
-  - gemfiles/actionpack4.0.gemfile
-  - gemfiles/actionpack4.1.gemfile
-  - gemfiles/actionpack4.2.gemfile
-  - gemfiles/actionpack5.0.gemfile
-  - gemfiles/actionpack5.1.gemfile
-  - gemfiles/actionpack5.2.gemfile
-  - gemfiles/actionpack.edge.gemfile
-matrix:
-  allow_failures:
-    - rvm: ruby-head
-  exclude:
-    - rvm: 2.0
-      gemfile: gemfiles/actionpack.edge.gemfile
-    - rvm: 2.0
-      gemfile: gemfiles/actionpack5.0.gemfile
-    - rvm: 2.0
-      gemfile: gemfiles/actionpack5.1.gemfile
-    - rvm: 2.0
-      gemfile: gemfiles/actionpack5.2.gemfile
-    - rvm: 2.1
-      gemfile: gemfiles/actionpack.edge.gemfile
-    - rvm: 2.1
-      gemfile: gemfiles/actionpack5.0.gemfile
-    - rvm: 2.1
-      gemfile: gemfiles/actionpack5.1.gemfile
-    - rvm: 2.1
-      gemfile: gemfiles/actionpack5.2.gemfile

data/gemfiles/actionpack.edge.gemfile

@@ -1,15 +0,0 @@
-source "https://rubygems.org"
-
-gemspec :path => "../"
-
-git "https://github.com/rails/rails.git" do
-  gem "actionpack"
-  gem "actionview"
-  gem "activesupport"
-end
-
-platforms :rbx do
-  gem "racc"
-  gem "rubysl", "~> 2.0"
-  gem "psych"
-end