country_select 4.0.0 → 6.0.0

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,106 @@
+PATH
+  remote: ..
+  specs:
+    country_select (5.1.0)
+      countries (~> 4.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 (4.0.0)
+      i18n_data (~> 0.13.0)
+      sixarm_ruby_unaccent (~> 1.1)
+    crass (1.0.6)
+    diff-lcs (1.4.4)
+    erubi (1.10.0)
+    i18n (1.8.9)
+      concurrent-ruby (~> 1.0)
+    i18n_data (0.13.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.15

data/lib/country_select.rb

@@ -4,11 +4,7 @@ require 'countries'
 require 'sort_alphabetical'
 
 require 'country_select/version'
+require 'country_select/defaults'
 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/defaults.rb

@@ -0,0 +1,10 @@
+module CountrySelect
+  DEFAULTS = {
+    except: nil,
+    format: :default,
+    locale: nil,
+    only: nil,
+    priority_countries: nil,
+    priority_countries_divider: "-" * 15
+  }
+end

data/lib/country_select/formats.rb

@@ -2,6 +2,8 @@ module CountrySelect
   FORMATS = {}
 
   FORMATS[:default] = lambda do |country|
-    country.translations[I18n.locale.to_s] || country.name
+    # Need to use :[] specifically, not :dig, because country.translations is a
+    # ISO3166::Translations object, which overrides :[] to support i18n locale fallbacks
+    country.translations&.send(:[], I18n.locale.to_s) || country.name
   end
 end

data/lib/country_select/tag_helper.rb

@@ -3,7 +3,7 @@ module CountrySelect
   module TagHelper
     def country_option_tags
       # In Rails 5.2+, `value` accepts no arguments and must also be called
-      # called with parens to avoid the local variable of the same name
+      # 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
@@ -35,27 +35,27 @@ module CountrySelect
 
     private
     def locale
-      @options[:locale]
+      @options.fetch(:locale, ::CountrySelect::DEFAULTS[:locale])
     end
 
     def priority_countries
-      @options[:priority_countries]
+      @options.fetch(:priority_countries, ::CountrySelect::DEFAULTS[:priority_countries])
     end
 
     def priority_countries_divider
-      @options[:priority_countries_divider] || "-"*15
+      @options.fetch(:priority_countries_divider, ::CountrySelect::DEFAULTS[:priority_countries_divider])
     end
 
     def only_country_codes
-      @options[:only]
+      @options.fetch(:only, ::CountrySelect::DEFAULTS[:only])
     end
 
     def except_country_codes
-      @options[:except]
+      @options.fetch(:except, ::CountrySelect::DEFAULTS[:except])
     end
 
     def format
-      @options[:format] || :default
+      @options.fetch(:format, ::CountrySelect::DEFAULTS[:format])
     end
 
     def country_options

data/lib/country_select/version.rb

@@ -1,3 +1,3 @@
 module CountrySelect
-  VERSION = '4.0.0'
+  VERSION = '6.0.0'
 end

data/lib/country_select_without_sort_alphabetical.rb

@@ -3,11 +3,7 @@
 require 'countries'
 
 require 'country_select/version'
+require 'country_select/defaults'
 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/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
@@ -100,7 +117,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,6 +139,23 @@ describe "CountrySelect" do
     expect(t).to_not include(tag)
   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(
@@ -183,7 +216,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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: country_select
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 6.0.0
 platform: ruby
 authors:
 - Stefan Penner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-20 00:00:00.000000000 Z
+date: 2021-06-28 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: '6.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        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: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.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,24 +130,16 @@ 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.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/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/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
@@ -165,15 +157,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: country_select
-rubygems_version: 2.7.6
+rubygems_version: 3.2.13
 signing_key: 
 specification_version: 4
 summary: Country Select Plugin