country_select 6.1.1 → 8.0.1

data/spec/country_select_spec.rb

@@ -92,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',
@@ -106,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")
@@ -139,6 +191,18 @@ 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]
@@ -160,9 +224,9 @@ describe "CountrySelect" do
     it "accepts priority countries" do
       tag = options_for_select(
         [
+          ['Denmark', 'DK'],
           ['Latvia','LV'],
           ['United States','US'],
-          ['Denmark', 'DK'],
           ['-'*15,'-'*15]
         ],
         selected: 'US',
@@ -235,23 +299,6 @@ 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|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: country_select
 version: !ruby/object:Gem::Version
-  version: 6.1.1
+  version: 8.0.1
 platform: ruby
 authors:
 - Stefan Penner
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-20 00:00:00.000000000 Z
+date: 2023-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -72,28 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
-- !ruby/object:Gem::Dependency
-  name: sort_alphabetical
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
+        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.
@@ -104,6 +90,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/workflows/build.yml"
+- ".github/workflows/codeql-analysis.yml"
 - ".gitignore"
 - ".rspec"
 - CHANGELOG.md
@@ -122,21 +109,21 @@ files:
 - gemfiles/actionpack-6.1.gemfile.lock
 - gemfiles/actionpack-7.0.gemfile
 - gemfiles/actionpack-7.0.gemfile.lock
-- gemfiles/actionpack-head.gemfile
-- gemfiles/actionpack-head.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/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/countries/country_select
 licenses:
 - MIT
-metadata: {}
+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:
@@ -145,14 +132,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.4.2
 signing_key:
 specification_version: 4
 summary: Country Select Plugin

data/gemfiles/actionpack-head.gemfile

@@ -1,9 +0,0 @@
-source "https://rubygems.org"
-
-gemspec :path => "../"
-
-git "https://github.com/rails/rails.git" do
-  gem "actionpack"
-  gem "actionview"
-  gem "activesupport"
-end

data/gemfiles/actionpack-head.gemfile.lock

@@ -1,109 +0,0 @@
-GIT
-  remote: https://github.com/rails/rails.git
-  revision: 10ef5321c1e0f783b58f26d238cd61145bc3cb96
-  specs:
-    actionpack (7.1.0.alpha)
-      actionview (= 7.1.0.alpha)
-      activesupport (= 7.1.0.alpha)
-      rack (~> 2.0, >= 2.2.0)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (7.1.0.alpha)
-      activesupport (= 7.1.0.alpha)
-      builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activesupport (7.1.0.alpha)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      tzinfo (~> 2.0)
-
-PATH
-  remote: ..
-  specs:
-    country_select (6.1.1)
-      countries (~> 4.2)
-      sort_alphabetical (~> 1.1)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    builder (3.2.4)
-    coderay (1.1.3)
-    concurrent-ruby (1.1.9)
-    countries (4.2.1)
-      i18n_data (~> 0.15.0)
-      sixarm_ruby_unaccent (~> 1.1)
-    crass (1.0.6)
-    diff-lcs (1.5.0)
-    erubi (1.10.0)
-    i18n (1.8.11)
-      concurrent-ruby (~> 1.0)
-    i18n_data (0.15.0)
-      simple_po_parser (~> 1.1)
-    loofah (2.13.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)
-      racc (~> 1.4)
-    nokogiri (1.13.1-arm64-darwin)
-      racc (~> 1.4)
-    nokogiri (1.13.1-x86_64-linux)
-      racc (~> 1.4)
-    pry (0.14.1)
-      coderay (~> 1.1)
-      method_source (~> 1.0)
-    racc (1.6.0)
-    rack (2.2.3)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.2)
-      loofah (~> 2.3)
-    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)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.3)
-    simple_po_parser (1.1.5)
-    sixarm_ruby_unaccent (1.2.0)
-    sort_alphabetical (1.1.0)
-      unicode_utils (>= 1.2.2)
-    tzinfo (2.0.4)
-      concurrent-ruby (~> 1.0)
-    unicode_utils (1.4.0)
-
-PLATFORMS
-  arm64-darwin-21
-  ruby
-  x86_64-linux
-
-DEPENDENCIES
-  actionpack!
-  actionview!
-  activesupport!
-  country_select!
-  pry (~> 0)
-  rake (~> 13)
-  rspec (~> 3)
-
-BUNDLED WITH
-   2.3.3

data/lib/country_select_without_sort_alphabetical.rb

@@ -1,9 +0,0 @@
-# encoding: utf-8
-
-require 'countries'
-
-require 'country_select/version'
-require 'country_select/defaults'
-require 'country_select/formats'
-require 'country_select/tag_helper'
-require 'country_select/country_select_helper'