country_select 8.0.1 → 8.0.3

data/gemfiles/actionpack-7.0.gemfile.lock

@@ -1,64 +1,69 @@
 PATH
   remote: ..
   specs:
-    country_select (8.0.1)
+    country_select (8.0.3)
       countries (~> 5.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (7.0.4)
-      actionview (= 7.0.4)
-      activesupport (= 7.0.4)
-      rack (~> 2.0, >= 2.2.0)
+    actionpack (7.0.8)
+      actionview (= 7.0.8)
+      activesupport (= 7.0.8)
+      rack (~> 2.0, >= 2.2.4)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (7.0.4)
-      activesupport (= 7.0.4)
+    actionview (7.0.8)
+      activesupport (= 7.0.8)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activesupport (7.0.4)
+    activesupport (7.0.8)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
     builder (3.2.4)
     coderay (1.1.3)
-    concurrent-ruby (1.1.10)
-    countries (5.3.0)
+    concurrent-ruby (1.2.2)
+    countries (5.6.0)
       unaccent (~> 0.3)
     crass (1.0.6)
     diff-lcs (1.5.0)
+    docile (1.4.0)
     erubi (1.12.0)
-    i18n (1.12.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    loofah (2.19.1)
+    loofah (2.21.3)
       crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
+      nokogiri (>= 1.12.0)
     method_source (1.0.0)
-    minitest (5.17.0)
-    nokogiri (1.14.0.rc1-x86_64-darwin)
+    minitest (5.20.0)
+    nokogiri (1.15.4-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.14.0.rc1-x86_64-linux)
+    nokogiri (1.15.4-x86_64-darwin)
       racc (~> 1.4)
-    pry (0.14.1)
+    nokogiri (1.15.4-x86_64-linux)
+      racc (~> 1.4)
+    pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    racc (1.6.2)
-    rack (2.2.5)
-    rack-test (2.0.2)
+    racc (1.7.1)
+    rack (2.2.8)
+    rack-test (2.1.0)
       rack (>= 1.3)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
+    rails-dom-testing (2.2.0)
+      activesupport (>= 5.0.0)
+      minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.4)
-      loofah (~> 2.19, >= 2.19.1)
-    railties (7.0.4)
-      actionpack (= 7.0.4)
-      activesupport (= 7.0.4)
+    rails-html-sanitizer (1.6.0)
+      loofah (~> 2.21)
+      nokogiri (~> 1.14)
+    railties (7.0.8)
+      actionpack (= 7.0.8)
+      activesupport (= 7.0.8)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
@@ -68,33 +73,41 @@ GEM
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)
       rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.0)
+    rspec-core (3.12.2)
       rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.1)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.1)
+    rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-support (3.12.0)
-    thor (1.2.1)
-    tzinfo (2.0.5)
+    rspec-support (3.12.1)
+    simplecov (0.22.0)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.4)
+    thor (1.2.2)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unaccent (0.4.0)
-    zeitwerk (2.6.6)
+    zeitwerk (2.6.12)
 
 PLATFORMS
+  arm64-darwin-22
   x86_64-darwin-22
   x86_64-linux
 
 DEPENDENCIES
   actionpack (~> 7.0.0)
   country_select!
-  nokogiri (= 1.14.0.rc1)
+  nokogiri (~> 1.15)
   pry (~> 0)
   railties (~> 7.0.0)
   rake (~> 13)
   rspec (~> 3)
+  simplecov (~> 0.22)
 
 BUNDLED WITH
-   2.4.2
+   2.4.19

data/gemfiles/actionpack-7.1.gemfile

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+gemspec path: '../'
+
+gem 'railties', '~> 7.1.0'
+gem 'actionpack', '~> 7.1.0'
+gem 'nokogiri', '~> 1.15'

data/gemfiles/actionpack-7.1.gemfile.lock

@@ -0,0 +1,145 @@
+PATH
+  remote: ..
+  specs:
+    country_select (8.0.3)
+      countries (~> 5.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionpack (7.1.0)
+      actionview (= 7.1.0)
+      activesupport (= 7.1.0)
+      nokogiri (>= 1.8.5)
+      rack (>= 2.2.4)
+      rack-session (>= 1.0.1)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    actionview (7.1.0)
+      activesupport (= 7.1.0)
+      builder (~> 3.1)
+      erubi (~> 1.11)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    activesupport (7.1.0)
+      base64
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      mutex_m
+      tzinfo (~> 2.0)
+    base64 (0.1.1)
+    bigdecimal (3.1.4)
+    builder (3.2.4)
+    coderay (1.1.3)
+    concurrent-ruby (1.2.2)
+    connection_pool (2.4.1)
+    countries (5.6.0)
+      unaccent (~> 0.3)
+    crass (1.0.6)
+    diff-lcs (1.5.0)
+    docile (1.4.0)
+    drb (2.1.1)
+      ruby2_keywords
+    erubi (1.12.0)
+    i18n (1.14.1)
+      concurrent-ruby (~> 1.0)
+    io-console (0.6.0)
+    irb (1.8.1)
+      rdoc
+      reline (>= 0.3.8)
+    loofah (2.21.3)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.12.0)
+    method_source (1.0.0)
+    minitest (5.20.0)
+    mutex_m (0.1.2)
+    nokogiri (1.15.4-arm64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.15.4-x86_64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.15.4-x86_64-linux)
+      racc (~> 1.4)
+    pry (0.14.2)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    psych (5.1.0)
+      stringio
+    racc (1.7.1)
+    rack (3.0.8)
+    rack-session (2.0.0)
+      rack (>= 3.0.0)
+    rack-test (2.1.0)
+      rack (>= 1.3)
+    rackup (2.1.0)
+      rack (>= 3)
+      webrick (~> 1.8)
+    rails-dom-testing (2.2.0)
+      activesupport (>= 5.0.0)
+      minitest
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.6.0)
+      loofah (~> 2.21)
+      nokogiri (~> 1.14)
+    railties (7.1.0)
+      actionpack (= 7.1.0)
+      activesupport (= 7.1.0)
+      irb
+      rackup (>= 1.0.0)
+      rake (>= 12.2)
+      thor (~> 1.0, >= 1.2.2)
+      zeitwerk (~> 2.6)
+    rake (13.0.6)
+    rdoc (6.5.0)
+      psych (>= 4.0.0)
+    reline (0.3.9)
+      io-console (~> 0.5)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.2)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.3)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.6)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.1)
+    ruby2_keywords (0.0.5)
+    simplecov (0.22.0)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.4)
+    stringio (3.0.8)
+    thor (1.2.2)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    unaccent (0.4.0)
+    webrick (1.8.1)
+    zeitwerk (2.6.12)
+
+PLATFORMS
+  arm64-darwin-22
+  x86_64-darwin-22
+  x86_64-linux
+
+DEPENDENCIES
+  actionpack (~> 7.1.0)
+  country_select!
+  nokogiri (~> 1.15)
+  pry (~> 0)
+  railties (~> 7.1.0)
+  rake (~> 13)
+  rspec (~> 3)
+  simplecov (~> 0.22)
+
+BUNDLED WITH
+   2.4.19

data/lib/country_select/country_select_helper.rb

@@ -1,15 +1,19 @@
+# frozen_string_literal: true
+
 module ActionView
   module Helpers
     class FormBuilder
       def country_select(method, priority_or_options = {}, options = {}, html_options = {})
-        if Hash === priority_or_options
+        if priority_or_options.is_a? Hash
           html_options = options
           options = priority_or_options
         else
           if RUBY_VERSION =~ /^3\.\d\.\d/
-            warn "DEPRECATION WARNING: Setting priority countries with the 1.x syntax is deprecated. Please use the `priority_countries:` option.", uplevel: 1, category: :deprecated
+            warn 'DEPRECATION WARNING: Setting priority countries with the 1.x syntax is deprecated. \
+                  Please use the `priority_countries:` option.', uplevel: 1, category: :deprecated
           else
-            warn "DEPRECATION WARNING: Setting priority countries with the 1.x syntax is deprecated. Please use the `priority_countries:` option.", uplevel: 1
+            warn 'DEPRECATION WARNING: Setting priority countries with the 1.x syntax is deprecated. \
+                  Please use the `priority_countries:` option.', uplevel: 1
           end
           options[:priority_countries] = priority_or_options
         end

data/lib/country_select/defaults.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module CountrySelect
   DEFAULTS = {
     except: nil,
@@ -5,7 +7,7 @@ module CountrySelect
     locale: nil,
     only: nil,
     priority_countries: nil,
-    priority_countries_divider: "-" * 15,
+    priority_countries_divider: '-' * 15,
     sort_provided: true
   }
 end

data/lib/country_select/formats.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module CountrySelect
   FORMATS = {}
 

data/lib/country_select/tag_helper.rb

@@ -1,12 +1,20 @@
+# frozen_string_literal: true
+
 module CountrySelect
-  class CountryNotFoundError < StandardError;end
+  class CountryNotFoundError < StandardError; end
+
   module TagHelper
+    unless respond_to?(:options_for_select)
+      include ActionView::Helpers::FormOptionsHelper
+      include ActionView::Helpers::Tags::SelectRenderer if defined?(ActionView::Helpers::Tags::SelectRenderer)
+    end
+
     def country_option_tags
       # In Rails 5.2+, `value` accepts no arguments and must also be called
       # with parens to avoid the local variable of the same name
       # https://github.com/rails/rails/pull/29791
       selected_option = @options.fetch(:selected) do
-        if self.method(:value).arity == 0
+        if self.method(:value).arity.zero?
           value()
         else
           value(@object)
@@ -14,26 +22,19 @@ module CountrySelect
       end
 
       option_tags_options = {
-        :selected => selected_option,
-        :disabled => @options[:disabled]
+        selected: selected_option,
+        disabled: @options[:disabled]
       }
 
       if priority_countries.present?
-        priority_countries_options = country_options_for(priority_countries, @options.fetch(:sort_provided, ::CountrySelect::DEFAULTS[:sort_provided]))
-
-        option_tags = options_for_select(priority_countries_options, option_tags_options)
-        option_tags += html_safe_newline + options_for_select([priority_countries_divider], disabled: priority_countries_divider)
-
-        option_tags_options[:selected] = [option_tags_options[:selected]] unless option_tags_options[:selected].kind_of?(Array)
-        option_tags_options[:selected].delete_if{|selected| priority_countries_options.map(&:second).include?(selected)}
-
-        option_tags += html_safe_newline + options_for_select(country_options, option_tags_options)
+        options_for_select_with_priority_countries(country_options, option_tags_options)
       else
-        option_tags = options_for_select(country_options, option_tags_options)
+        options_for_select(country_options, option_tags_options)
       end
     end
 
     private
+
     def locale
       @options.fetch(:locale, ::CountrySelect::DEFAULTS[:locale])
     end
@@ -59,54 +60,63 @@ module CountrySelect
     end
 
     def country_options
+      codes = ISO3166::Country.codes
+
       if only_country_codes.present?
-        codes = only_country_codes & ISO3166::Country.codes
+        codes = only_country_codes & codes
         sort = @options.fetch(:sort_provided, ::CountrySelect::DEFAULTS[:sort_provided])
-      elsif except_country_codes.present?
-        codes = ISO3166::Country.codes - except_country_codes
-        sort = true
       else
-        codes = ISO3166::Country.codes
+        codes -= except_country_codes if except_country_codes.present?
         sort = true
       end
 
-      country_options_for(codes, sort)
+      country_options_for(codes, sorted: sort)
     end
 
-    def country_options_for(country_codes, sorted=true)
+    def country_options_for(country_codes, sorted: true)
       I18n.with_locale(locale) do
-        country_list = country_codes.map do |code_or_name|
-          if country = ISO3166::Country.new(code_or_name)
-            code = country.alpha2
-          elsif country = ISO3166::Country.find_country_by_any_name(code_or_name)
-            code = country.alpha2
-          end
-
-          unless country.present?
-            msg = "Could not find Country with string '#{code_or_name}'"
-            raise CountryNotFoundError.new(msg)
-          end
-
-          formatted_country = ::CountrySelect::FORMATS[format].call(country)
-
-          if formatted_country.is_a?(Array)
-            formatted_country
-          else
-            [formatted_country, code]
-          end
+        country_list = country_codes.map { |code_or_name| get_formatted_country(code_or_name) }
 
-        end
+        country_list.sort_by! { |name, _| [I18n.transliterate(name.to_s), name] } if sorted
+        country_list
+      end
+    end
 
-        if sorted
-          country_list.sort_by { |name, code| [I18n.transliterate(name), name] }
-        else
-          country_list
-        end
+    def options_for_select_with_priority_countries(country_options, tags_options)
+      sorted = @options.fetch(:sort_provided, ::CountrySelect::DEFAULTS[:sort_provided])
+      priority_countries_options = country_options_for(priority_countries, sorted: sorted)
+
+      option_tags = priority_options_for_select(priority_countries_options, tags_options)
+
+      tags_options[:selected] = Array(tags_options[:selected]).delete_if do |selected|
+        priority_countries_options.map(&:second).include?(selected)
       end
+
+      option_tags += "\n".html_safe + options_for_select(country_options, tags_options)
+
+      option_tags
     end
 
-    def html_safe_newline
-      "\n".html_safe
+    def priority_options_for_select(priority_countries_options, tags_options)
+      option_tags = options_for_select(priority_countries_options, tags_options)
+      option_tags += "\n".html_safe +
+                     options_for_select([priority_countries_divider], disabled: priority_countries_divider)
+    end
+
+    def get_formatted_country(code_or_name)
+      country = ISO3166::Country.new(code_or_name) ||
+                ISO3166::Country.find_country_by_any_name(code_or_name)
+
+      raise(CountryNotFoundError, "Could not find Country with string '#{code_or_name}'") unless country.present?
+
+      code = country.alpha2
+      formatted_country = ::CountrySelect::FORMATS[format].call(country)
+
+      if formatted_country.is_a?(Array)
+        formatted_country
+      else
+        [formatted_country, code]
+      end
     end
   end
 end

data/lib/country_select/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module CountrySelect
-  VERSION = '8.0.1'
+  VERSION = '8.0.3'
 end

data/lib/country_select.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 require 'countries'