country_select 2.5.2 → 5.0.0.pre

data/gemfiles/actionpack6.0.gemfile

@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+
+gemspec :path => "../"
+
+gem "railties", "~> 6.0.2"
+gem "actionpack", "~> 6.0.2"

data/gemfiles/actionpack6.0.gemfile.lock

@@ -0,0 +1,108 @@
+PATH
+  remote: ..
+  specs:
+    country_select (5.0.0.pre)
+      countries (~> 3.0)
+      sort_alphabetical (~> 1.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionpack (6.0.3.5)
+      actionview (= 6.0.3.5)
+      activesupport (= 6.0.3.5)
+      rack (~> 2.0, >= 2.0.8)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actionview (6.0.3.5)
+      activesupport (= 6.0.3.5)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activesupport (6.0.3.5)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+      zeitwerk (~> 2.2, >= 2.2.2)
+    builder (3.2.4)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.8)
+    countries (3.0.1)
+      i18n_data (~> 0.10.0)
+      sixarm_ruby_unaccent (~> 1.1)
+      unicode_utils (~> 1.4)
+    crass (1.0.6)
+    diff-lcs (1.4.4)
+    erubi (1.10.0)
+    i18n (1.8.9)
+      concurrent-ruby (~> 1.0)
+    i18n_data (0.10.0)
+    loofah (2.9.0)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    method_source (1.0.0)
+    mini_portile2 (2.5.0)
+    minitest (5.14.4)
+    nokogiri (1.11.1)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
+    pry (0.14.0)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    racc (1.5.2)
+    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.3.0)
+      loofah (~> 2.3)
+    railties (6.0.3.5)
+      actionpack (= 6.0.3.5)
+      activesupport (= 6.0.3.5)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.20.3, < 2.0)
+    rake (13.0.3)
+    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.1)
+      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.2)
+    sixarm_ruby_unaccent (1.2.0)
+    sort_alphabetical (1.1.0)
+      unicode_utils (>= 1.2.2)
+    thor (1.1.0)
+    thread_safe (0.3.6)
+    tzinfo (1.2.9)
+      thread_safe (~> 0.1)
+    unicode_utils (1.4.0)
+    wwtd (1.4.1)
+    zeitwerk (2.4.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  actionpack (~> 6.0.2)
+  country_select!
+  pry (~> 0)
+  railties (~> 6.0.2)
+  rake (~> 13)
+  rspec (~> 3)
+  wwtd (~> 1)
+
+BUNDLED WITH
+   2.2.13

data/gemfiles/actionpack6.1.gemfile

@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+
+gemspec :path => "../"
+
+gem "railties", "~> 6.1.0"
+gem "actionpack", "~> 6.1.0"

data/gemfiles/actionpack6.1.gemfile.lock

@@ -0,0 +1,107 @@
+PATH
+  remote: ..
+  specs:
+    country_select (5.0.0.pre)
+      countries (~> 3.0)
+      sort_alphabetical (~> 1.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionpack (6.1.3)
+      actionview (= 6.1.3)
+      activesupport (= 6.1.3)
+      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.3)
+      activesupport (= 6.1.3)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activesupport (6.1.3)
+      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.8)
+    countries (3.0.1)
+      i18n_data (~> 0.10.0)
+      sixarm_ruby_unaccent (~> 1.1)
+      unicode_utils (~> 1.4)
+    crass (1.0.6)
+    diff-lcs (1.4.4)
+    erubi (1.10.0)
+    i18n (1.8.9)
+      concurrent-ruby (~> 1.0)
+    i18n_data (0.10.0)
+    loofah (2.9.0)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    method_source (1.0.0)
+    mini_portile2 (2.5.0)
+    minitest (5.14.4)
+    nokogiri (1.11.1)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
+    pry (0.14.0)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    racc (1.5.2)
+    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.3.0)
+      loofah (~> 2.3)
+    railties (6.1.3)
+      actionpack (= 6.1.3)
+      activesupport (= 6.1.3)
+      method_source
+      rake (>= 0.8.7)
+      thor (~> 1.0)
+    rake (13.0.3)
+    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.1)
+      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.2)
+    sixarm_ruby_unaccent (1.2.0)
+    sort_alphabetical (1.1.0)
+      unicode_utils (>= 1.2.2)
+    thor (1.1.0)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    unicode_utils (1.4.0)
+    wwtd (1.4.1)
+    zeitwerk (2.4.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  actionpack (~> 6.1.0)
+  country_select!
+  pry (~> 0)
+  railties (~> 6.1.0)
+  rake (~> 13)
+  rspec (~> 3)
+  wwtd (~> 1)
+
+BUNDLED WITH
+   2.2.13

data/lib/country_select.rb

@@ -6,9 +6,4 @@ require 'sort_alphabetical'
 require 'country_select/version'
 require 'country_select/formats'
 require 'country_select/tag_helper'
-
-if defined?(ActionView::Helpers::Tags::Base)
-  require 'country_select/country_select_helper'
-else
-  require 'country_select/rails3/country_select_helper'
-end
+require 'country_select/country_select_helper'

data/lib/country_select/formats.rb

@@ -2,6 +2,6 @@ module CountrySelect
   FORMATS = {}
 
   FORMATS[:default] = lambda do |country|
-    country.translations[I18n.locale.to_s] || country.name
+    country.translations&.dig(I18n.locale.to_s) || country.name
   end
 end

data/lib/country_select/tag_helper.rb

@@ -2,8 +2,19 @@ module CountrySelect
   class CountryNotFoundError < StandardError;end
   module TagHelper
     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
+          value()
+        else
+          value(@object)
+        end
+      end
+
       option_tags_options = {
-        :selected => @options.fetch(:selected) { value(@object) },
+        :selected => selected_option,
         :disabled => @options[:disabled]
       }
 
@@ -89,7 +100,11 @@ module CountrySelect
         end
 
         if sorted
-          country_list.sort_alphabetical
+          if country_list.respond_to?(:sort_alphabetical)
+            country_list.sort_alphabetical
+          else
+            country_list.sort
+          end
         else
           country_list
         end

data/lib/country_select/version.rb

@@ -1,3 +1,3 @@
 module CountrySelect
-  VERSION = "2.5.2"
+  VERSION = '5.0.0.pre'
 end

data/lib/country_select_without_sort_alphabetical.rb

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

data/spec/country_select_spec.rb

@@ -9,12 +9,18 @@ describe "CountrySelect" do
   include ActionView::Helpers::TagHelper
   include ActionView::Helpers::FormOptionsHelper
 
+  before do
+    I18n.available_locales = [:en]
+    I18n.locale = :en
+    ISO3166.reset
+  end
+
   class Walrus
     attr_accessor :country_code
   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)
@@ -39,6 +45,9 @@ describe "CountrySelect" do
   end
 
   it "uses the locale specified by I18n.locale" do
+    I18n.available_locales = [:en, :es]
+    ISO3166.reset
+
     tag = options_for_select([['Estados Unidos', 'US']], 'US')
 
     walrus.country_code = 'US'
@@ -53,6 +62,9 @@ describe "CountrySelect" do
   end
 
   it "accepts a locale option" do
+    I18n.available_locales = [:fr]
+    ISO3166.reset
+
     tag = options_for_select([['États-Unis', 'US']], 'US')
 
     walrus.country_code = 'US'
@@ -88,7 +100,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)
@@ -171,7 +182,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
@@ -183,13 +201,30 @@ 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})"
       end
 
-      tag = options_for_select([['United States (US)', 'US']], 'US')
+      tag = options_for_select([['United States of America (US)', 'US']], 'US')
 
       walrus.country_code = 'US'
       t = builder.country_select(:country_code, format: :with_alpha2)
@@ -201,7 +236,7 @@ describe "CountrySelect" do
         [country.name, country.alpha3]
       end
 
-      tag = options_for_select([['United States', 'USA']], 'USA')
+      tag = options_for_select([['United States of America', 'USA']], 'USA')
       walrus.country_code = 'USA'
       t = builder.country_select(:country_code, format: :with_alpha3)
       expect(t).to include(tag)
@@ -212,7 +247,7 @@ describe "CountrySelect" do
         ["#{country.name} (#{country.alpha2})", country.alpha3]
       end
 
-      tag = options_for_select([['United States (US)', 'USA']], 'USA')
+      tag = options_for_select([['United States of America (US)', 'USA']], 'USA')
       walrus.country_code = 'USA'
       t = builder.country_select(:country_code, format: :with_alpha3)
       expect(t).to include(tag)
@@ -223,7 +258,7 @@ describe "CountrySelect" do
         [country.name, country.alpha3]
       end
 
-      tag = options_for_select([['United States', 'USA']], 'USA')
+      tag = options_for_select([['United States of America', 'USA']], 'USA')
       walrus.country_code = 'USA'
       t = builder.country_select(:country_code, format: :with_alpha3, priority_countries: ['US'])
       expect(t.scan(Regexp.new(Regexp.escape(tag))).size).to eq 1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: country_select
 version: !ruby/object:Gem::Version
-  version: 2.5.2
+  version: 5.0.0.pre
 platform: ruby
 authors:
 - Stefan Penner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-03 00:00:00.000000000 Z
+date: 2021-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '6.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '6.1'
 - !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
@@ -70,46 +70,46 @@ dependencies:
   name: wwtd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: countries
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: sort_alphabetical
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   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: '1.1'
+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
@@ -130,20 +130,18 @@ files:
 - 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.2.gemfile
+- gemfiles/actionpack5.2.gemfile.lock
+- gemfiles/actionpack6.0.gemfile
+- gemfiles/actionpack6.0.gemfile.lock
+- gemfiles/actionpack6.1.gemfile
+- gemfiles/actionpack6.1.gemfile.lock
 - lib/country_select.rb
 - lib/country_select/country_select_helper.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
@@ -158,15 +156,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubyforge_project: country_select
-rubygems_version: 2.4.5.1
+rubygems_version: 3.2.13
 signing_key: 
 specification_version: 4
 summary: Country Select Plugin