country_select 8.0.1 → 8.0.2

data/spec/country_select_spec.rb

@@ -1,11 +1,15 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 require 'spec_helper'
 
 require 'action_view'
 require 'country_select'
 
-describe "CountrySelect" do
+class Walrus
+  attr_accessor :country_code
+end
+
+describe 'CountrySelect' do
   include ActionView::Helpers::TagHelper
   include ActionView::Helpers::FormOptionsHelper
 
@@ -15,10 +19,6 @@ describe "CountrySelect" do
     ISO3166.reset
   end
 
-  class Walrus
-    attr_accessor :country_code
-  end
-
   let(:walrus) { Walrus.new }
   let!(:template) { ActionView::Base.new(ActionView::LookupContext.new([]), {}, nil) }
 
@@ -26,17 +26,17 @@ describe "CountrySelect" do
     if defined?(ActionView::Helpers::Tags::Base)
       ActionView::Helpers::FormBuilder.new(:walrus, walrus, template, {})
     else
-      ActionView::Helpers::FormBuilder.new(:walrus, walrus, template, {}, Proc.new { })
+      ActionView::Helpers::FormBuilder.new(:walrus, walrus, template, {}, proc {})
     end
   end
 
   let(:select_tag) do
-    <<-EOS.chomp.strip
+    <<-HTML.chomp.strip
       <select id="walrus_country_code" name="walrus[country_code]">
-    EOS
+    HTML
   end
 
-  it "selects the value of country_code" do
+  it 'selects the value of country_code' do
     tag = options_for_select([['United States', 'US']], 'US')
 
     walrus.country_code = 'US'
@@ -44,8 +44,8 @@ describe "CountrySelect" do
     expect(t).to include(tag)
   end
 
-  it "uses the locale specified by I18n.locale" do
-    I18n.available_locales = [:en, :es]
+  it 'uses the locale specified by I18n.locale' do
+    I18n.available_locales = %i[en es]
     ISO3166.reset
 
     tag = options_for_select([['Estados Unidos', 'US']], 'US')
@@ -62,10 +62,10 @@ describe "CountrySelect" do
   end
 
   it 'falls back when given a country-specific locale' do
-    I18n.available_locales = [:en, :de, :'de-AT']
+    I18n.available_locales = %i[en de de-AT]
     ISO3166.reset
 
-    tag = options_for_select([['Deutschland', 'DE']], 'DE')
+    tag = options_for_select([%w[Deutschland DE]], 'DE')
 
     walrus.country_code = 'DE'
     original_locale = I18n.locale
@@ -78,140 +78,142 @@ describe "CountrySelect" do
     end
   end
 
-  it "accepts a locale option" do
+  it 'accepts a locale option' do
     I18n.available_locales = [:fr]
     ISO3166.reset
 
-    tag = options_for_select([['États-Unis', 'US']], 'US')
+    tag = options_for_select([%w[États-Unis US]], 'US')
 
     walrus.country_code = 'US'
     t = builder.country_select(:country_code, locale: :fr)
     expect(t).to include(tag)
   end
 
-  it "accepts priority countries" do
+  it 'accepts priority countries' do
     tag = options_for_select(
       [
         ['Denmark', 'DK'],
-        ['Latvia','LV'],
-        ['United States','US'],
-        ['-'*15,'-'*15]
+        ['Latvia', 'LV'],
+        ['United States', 'US'],
+        ['-' * 15, '-' * 15]
       ],
       selected: 'US',
-      disabled: '-'*15
+      disabled: '-' * 15
     )
 
     walrus.country_code = 'US'
-    t = builder.country_select(:country_code, priority_countries: ['LV','US','DK'])
+    t = builder.country_select(:country_code, priority_countries: %w[LV US DK])
     expect(t).to include(tag)
   end
 
-  it "priority countries are sorted by name by default" do
+  it 'priority countries are sorted by name by default' do
     tag = options_for_select(
       [
         ['Denmark', 'DK'],
-        ['Latvia','LV'],
-        ['United States','US'],
-        ['-'*15,'-'*15]
+        ['Latvia', 'LV'],
+        ['United States', 'US'],
+        ['-' * 15, '-' * 15]
       ],
       selected: 'US',
-      disabled: '-'*15
+      disabled: '-' * 15
     )
 
     walrus.country_code = 'US'
-    t = builder.country_select(:country_code, priority_countries: ['LV','US','DK'])
+    t = builder.country_select(:country_code, priority_countries: %w[LV US DK])
     expect(t).to include(tag)
   end
 
-  it "priority countries with `sort_provided: false` preserves the provided order" do
+  it 'priority countries with `sort_provided: false` preserves the provided order' do
     tag = options_for_select(
       [
-        ['Latvia','LV'],
-        ['United States','US'],
+        ['Latvia', 'LV'],
+        ['United States', 'US'],
         ['Denmark', 'DK'],
-        ['-'*15,'-'*15]
+        ['-' * 15, '-' * 15]
       ],
       selected: 'US',
-      disabled: '-'*15
+      disabled: '-' * 15
     )
 
     walrus.country_code = 'US'
-    t = builder.country_select(:country_code, priority_countries: ['LV','US','DK'], sort_provided: false)
+    t = builder.country_select(:country_code, priority_countries: %w[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
+  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'],
+        ['Latvia', 'LV'],
+        ['United States', 'US'],
         ['Denmark', 'DK'],
-        ['-'*15,'-'*15],
-        ['Afghanistan','AF']
+        ['-' * 15, '-' * 15],
+        ['Afghanistan', 'AF']
       ],
       selected: 'AF',
-      disabled: '-'*15
+      disabled: '-' * 15
     )
 
     walrus.country_code = 'AF'
-    t = builder.country_select(:country_code, priority_countries: ['LV','US','DK'], sort_provided: false)
+    t = builder.country_select(:country_code, priority_countries: %w[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")
+  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')
       walrus.country_code = 'US'
-      t = builder.country_select(:country_code, priority_countries: ['LV','US'])
+      t = builder.country_select(:country_code, priority_countries: %w[LV US])
       expect(t).to_not include(tag)
     end
   end
 
-  describe "when selected options is an array" do
-    it "selects all options but only once" do
+  describe 'when selected options is an array' do
+    it 'selects all options but only once' do
       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)
-      expect(t.scan(options_for_select([["Uruguay", "UY"]], "UY")).length).to be(1)
+      t = builder.country_select(:country_code,
+                                 { priority_countries: %w[LV US ES], selected: %w[UY US] },
+                                 multiple: true)
+      expect(t.scan(options_for_select([['United States', 'US']], 'US')).length).to be(1)
+      expect(t.scan(options_for_select([%w[Uruguay UY]], 'UY')).length).to be(1)
     end
   end
 
-  it "displays only the chosen countries" do
-    options = [["Denmark", "DK"],["Germany", "DE"]]
+  it 'displays only the chosen countries' do
+    options = [%w[Denmark DK], %w[Germany DE]]
     tag = builder.select(:country_code, options)
     walrus.country_code = 'US'
-    t = builder.country_select(:country_code, only: ['DK','DE'])
+    t = builder.country_select(:country_code, only: %w[DK DE])
     expect(t).to eql(tag)
   end
 
-  it "discards some countries" do
-    tag = options_for_select([["United States", "US"]])
+  it 'discards some countries' do
+    tag = options_for_select([['United States', 'US']])
     walrus.country_code = 'DE'
     t = builder.country_select(:country_code, except: ['US'])
     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'])
+  it 'countries provided in `only` are sorted by name by default' do
+    t = builder.country_select(:country_code, only: %w[PT DE AR])
     order = t.scan(/value="(\w{2})"/).map { |o| o[0] }
-    expect(order).to eq(['AR', 'DE', 'PT'])
+    expect(order).to eq(%w[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)
+  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: %w[PT DE AR], sort_provided: false)
     order = t.scan(/value="(\w{2})"/).map { |o| o[0] }
-    expect(order).to eq(['PT','DE','AR'])
+    expect(order).to eq(%w[PT DE AR])
   end
 
   context "when there is a default 'except' configured" do
     around do |example|
-      old_value = ::CountrySelect::DEFAULTS[:except]
+      old_value = CountrySelect::DEFAULTS[:except]
       example.run
-      ::CountrySelect::DEFAULTS[:except] = old_value
+      CountrySelect::DEFAULTS[:except] = old_value
     end
 
-    it "discards countries when configured to" do
-      ::CountrySelect::DEFAULTS[:except] = ['US']
+    it 'discards countries when configured to' do
+      CountrySelect::DEFAULTS[:except] = ['US']
 
       tag = options_for_select([['United States', 'US']])
       walrus.country_code = 'DE'
@@ -220,51 +222,49 @@ describe "CountrySelect" do
     end
   end
 
-  context "using old 1.x syntax" do
-    it "accepts priority countries" do
+  context 'using old 1.x syntax' do
+    it 'accepts priority countries' do
       tag = options_for_select(
         [
           ['Denmark', 'DK'],
-          ['Latvia','LV'],
-          ['United States','US'],
-          ['-'*15,'-'*15]
+          ['Latvia', 'LV'],
+          ['United States', 'US'],
+          ['-' * 15, '-' * 15]
         ],
         selected: 'US',
-        disabled: '-'*15
+        disabled: '-' * 15
       )
 
       walrus.country_code = 'US'
-      t = builder.country_select(:country_code, ['LV','US','DK'])
+      t = builder.country_select(:country_code, %w[LV US DK])
       expect(t).to include(tag)
     end
 
-    it "selects only the first matching option" do
-      tag = options_for_select([["United States", "US"],["Uruguay", "UY"]], "US")
+    it 'selects only the first matching option' do
+      tag = options_for_select([['United States', 'US'], ['Uruguay', 'UY']], 'US')
       walrus.country_code = 'US'
-      t = builder.country_select(:country_code, ['LV','US'])
+      t = builder.country_select(:country_code, %w[LV US])
       expect(t).to_not include(tag)
     end
 
-    it "supports the country names as provided by default in Formtastic" do
-      tag = options_for_select([
-        ["Australia", "AU"],
-        ["Canada", "CA"],
-        ["United Kingdom", "GB"],
-        ["United States", "US"]
-      ])
-      country_names = ["Australia", "Canada", "United Kingdom", "United States"]
+    it 'supports the country names as provided by default in Formtastic' do
+      tag = options_for_select([['Australia', 'AU'],
+                                ['Canada', 'CA'],
+                                ['United Kingdom', 'GB'],
+                                ['United States', 'US']])
+      country_names = ['Australia', 'Canada', 'United Kingdom', 'United States']
       t = builder.country_select(:country_code, country_names)
       expect(t).to include(tag)
     end
 
-    it "raises an error when a country code or name is not found" do
+    it 'raises an error when a country code or name is not found' do
       country_names = [
-        "United States",
-        "Canada",
-        "United Kingdom",
-        "Mexico",
-        "Australia",
-        "Freedonia"
+        'United States',
+        'Canada',
+        'United Kingdom',
+        'Mexico',
+        'Australia',
+        'Freedonia'
       ]
       error_msg = "Could not find Country with string 'Freedonia'"
 
@@ -273,13 +273,13 @@ describe "CountrySelect" do
       end.to raise_error(CountrySelect::CountryNotFoundError, error_msg)
     end
 
-    it "supports the select prompt" do
+    it 'supports the select prompt' do
       tag = '<option value="">Select your country</option>'
       t = builder.country_select(:country_code, prompt: 'Select your country')
       expect(t).to include(tag)
     end
 
-    it "supports the include_blank option" do
+    it 'supports the include_blank option' do
       # Rails 6.1 more closely follows the HTML spec for
       # empty option tags.
       # https://github.com/rails/rails/pull/39808
@@ -294,14 +294,14 @@ describe "CountrySelect" do
   end
 
   it 'sorts unicode' do
-    tag = builder.country_select(:country_code, only: ['AX', 'AL', 'AF', 'ZW'])
+    tag = builder.country_select(:country_code, only: %w[AX AL AF ZW])
     order = tag.scan(/value="(\w{2})"/).map { |o| o[0] }
-    expect(order).to eq(['AF', 'AX', 'AL', 'ZW'])
+    expect(order).to eq(%w[AF AX AL ZW])
   end
 
-  describe "custom formats" do
-    it "accepts a custom formatter" do
-      ::CountrySelect::FORMATS[:with_alpha2] = lambda do |country|
+  describe 'custom formats' do
+    it 'accepts a custom formatter' do
+      CountrySelect::FORMATS[:with_alpha2] = lambda do |country|
         "#{country.iso_short_name} (#{country.alpha2})"
       end
 
@@ -312,8 +312,8 @@ describe "CountrySelect" do
       expect(t).to include(tag)
     end
 
-    it "accepts an array for formatter" do
-      ::CountrySelect::FORMATS[:with_alpha3] = lambda do |country|
+    it 'accepts an array for formatter' do
+      CountrySelect::FORMATS[:with_alpha3] = lambda do |country|
         [country.iso_short_name, country.alpha3]
       end
 
@@ -323,8 +323,8 @@ describe "CountrySelect" do
       expect(t).to include(tag)
     end
 
-    it "accepts an array for formatter + custom formatter" do
-      ::CountrySelect::FORMATS[:with_alpha3] = lambda do |country|
+    it 'accepts an array for formatter + custom formatter' do
+      CountrySelect::FORMATS[:with_alpha3] = lambda do |country|
         ["#{country.iso_short_name} (#{country.alpha2})", country.alpha3]
       end
 
@@ -334,8 +334,8 @@ describe "CountrySelect" do
       expect(t).to include(tag)
     end
 
-    it "marks priority countries as selected only once" do
-      ::CountrySelect::FORMATS[:with_alpha3] = lambda do |country|
+    it 'marks priority countries as selected only once' do
+      CountrySelect::FORMATS[:with_alpha3] = lambda do |country|
         [country.iso_short_name, country.alpha3]
       end
 

data/spec/spec_helper.rb

@@ -1,4 +1,8 @@
+# frozen_string_literal: true
+
 require 'pry'
+require 'simplecov'
+SimpleCov.start
 
 # This file was generated by the `rspec --init` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
@@ -55,11 +59,11 @@ RSpec.configure do |config|
   #   - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
   #   - http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
   #   - http://myronmars.to/n/dev-blog/2014/05/notable-changes-in-rspec-3#new__config_option_to_disable_rspeccore_monkey_patching
-  #config.disable_monkey_patching!
+  # config.disable_monkey_patching!
 
   # This setting enables warnings. It's recommended, but in some cases may
   # be too noisy due to issues in dependencies.
-  #config.warnings = true
+  # config.warnings = true
 
   # Many RSpec users commonly either run the entire suite or an individual
   # file, and it's useful to allow more verbose output when running an
@@ -74,7 +78,7 @@ RSpec.configure do |config|
   # Print the 10 slowest examples and example groups at the
   # end of the spec run, to help surface which specs are running
   # particularly slow.
-  #config.profile_examples = 10
+  # config.profile_examples = 10
 
   # Run specs in random order to surface order dependencies. If you find an
   # order dependency and want to debug it, you can fix the order by providing

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: country_select
 version: !ruby/object:Gem::Version
-  version: 8.0.1
+  version: 8.0.2
 platform: ruby
 authors:
 - Stefan Penner
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-03 00:00:00.000000000 Z
+date: 2023-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.22'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.22'
 - !ruby/object:Gem::Dependency
   name: countries
   requirement: !ruby/object:Gem::Requirement
@@ -80,19 +94,22 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         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.
+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
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/build.yml"
+- ".codeclimate.yml"
 - ".github/workflows/codeql-analysis.yml"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -109,6 +126,8 @@ files:
 - gemfiles/actionpack-6.1.gemfile.lock
 - gemfiles/actionpack-7.0.gemfile
 - gemfiles/actionpack-7.0.gemfile.lock
+- gemfiles/actionpack-7.1.gemfile
+- gemfiles/actionpack-7.1.gemfile.lock
 - lib/country_select.rb
 - lib/country_select/country_select_helper.rb
 - lib/country_select/defaults.rb
@@ -124,6 +143,7 @@ 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
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -139,10 +159,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.2
+rubygems_version: 3.4.12
 signing_key:
 specification_version: 4
 summary: Country Select Plugin
-test_files:
-- spec/country_select_spec.rb
-- spec/spec_helper.rb
+test_files: []

data/.github/workflows/build.yml

@@ -1,25 +0,0 @@
-name: build
-on:
-  pull_request:
-    branches:
-      - '*'
-  push:
-    branches:
-      - master
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [2.7, '3.0', 3.1, 3.2]
-        gemfile: [5.2, '6.0', 6.1, '7.0']
-    env: # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps
-      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/actionpack-${{ matrix.gemfile }}.gemfile
-    steps:
-    - uses: actions/checkout@v3
-    - uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby }}
-        bundler-cache: true
-    - run: bundle exec rake