country_select 5.0.1 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f79817c4bcf3df9e63c08756f84001c840be85c79ed8b07a4ff6d5cb9dd6b65
-  data.tar.gz: 7a6e4ac2b315dacc9788ef70264752f9d8013194eba5abd124abbb2475e0a1c5
+  metadata.gz: 18cae0fad3906e7184ab1c457ae1b7d162b087f35e14f816a2e4fef4fab200ae
+  data.tar.gz: ed929514c9aef114176258c46dc50805774358bd2b393716939d183f8d26575d
 SHA512:
-  metadata.gz: 31eb7c557942a0e88c44de468f7c54bc7345348f9f0330515db003b2ad78a70453d18133574ff2a6c1d419e1c8168a9998d62f7feb43661d139c16f8f644f921
-  data.tar.gz: a4623e97352b356ff04bddaeb70cccfd46e1510f61797e5a6aa17a7a58ce786b2d281498f436e360277aebc2bd44c0cfc54a110625b51b486d4ac8340d7ffd7b
+  metadata.gz: 0b84fa702b6a06a80a8e5dc035c6fc17434ec2b33d0775d5d132f02ac4ee578d9b7a29d4a1482408b9d07ca4a034597715319c59c81a1391f0b1f6060699f1aa
+  data.tar.gz: c66b11dcb9b1574e66951e320b82a0ba5d8b580d82c18ecb2b4b0bae97a8a1072ab1d387b33b08846cafbf47fc6028e58ac1cd586ee5558b57ebf2f4a3828c6a

data/.travis.yml

@@ -3,10 +3,10 @@ cache: bundler
 language: ruby
 bundler_args: ""
 rvm:
-  - 2.5
-  - 2.6
-  - 2.7
-  - 3.0
+  - "2.5"
+  - "2.6"
+  - "2.7"
+  - "3.0"
   - ruby-head
 gemfile:
   - gemfiles/actionpack5.2.gemfile
@@ -15,9 +15,9 @@ gemfile:
   - gemfiles/actionpack.edge.gemfile
 jobs:
   exclude:
-    - rvm: 2.5
+    - rvm: "2.5"
       gemfile: gemfiles/actionpack.edge.gemfile
-    - rvm: 2.6
+    - rvm: "2.6"
       gemfile: gemfiles/actionpack.edge.gemfile
   allow_failures:
     - rvm: ruby-head

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 5.1.0 2021-05-18
+
+  * #184 - Add ability to configure defaults (@p-wall)
+  * Upgrade to countries 3.1.0
+
 ## 5.0.1 2021-03-08
 
   * #181 - Fix i18n fallback in country translations (@lavaturtle)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    country_select (5.0.1)
+    country_select (5.1.0)
       countries (~> 3.0)
       sort_alphabetical (~> 1.1)
 
@@ -30,8 +30,8 @@ GEM
     builder (3.2.4)
     coderay (1.1.3)
     concurrent-ruby (1.1.8)
-    countries (3.0.1)
-      i18n_data (~> 0.10.0)
+    countries (3.1.0)
+      i18n_data (~> 0.11.0)
       sixarm_ruby_unaccent (~> 1.1)
       unicode_utils (~> 1.4)
     crass (1.0.6)
@@ -39,7 +39,7 @@ GEM
     erubi (1.10.0)
     i18n (1.8.9)
       concurrent-ruby (~> 1.0)
-    i18n_data (0.10.0)
+    i18n_data (0.11.0)
     loofah (2.9.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)

data/README.md

@@ -122,6 +122,19 @@ country_select("user", "country", format: :with_alpha2)
 country_select("user", "country", format: :with_data_attrs)
 ```
 
+### Using customized defaults
+
+You can configure overridable defaults for `except`, `format`, `locale`,
+`only`, `priority_countries` and `priority_countries_divider` in an initializer.
+
+````ruby
+# config/initializers/country_select.rb
+
+CountrySelect::DEFAULTS[:except] = [ "ZZ" ]
+````
+
+The example would exclude "ZZ" from every `country_select` tag, where no `except` option is given.
+
 ### ISO 3166-1 alpha-2 codes
 The `option` tags use ISO 3166-1 alpha-2 codes as values and the country
 names as display strings. For example, the United States would appear as

data/gemfiles/actionpack.edge.gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/rails/rails.git
-  revision: 14f35cde18de77cd7ab5d6f17d83fa8bc92ba383
+  revision: a34d64d82e213a4054fbb69ad5cd7a5137a5a252
   specs:
     actionpack (7.0.0.alpha)
       actionview (= 7.0.0.alpha)
@@ -25,7 +25,7 @@ GIT
 PATH
   remote: ..
   specs:
-    country_select (5.0.1)
+    country_select (5.1.0)
       countries (~> 3.0)
       sort_alphabetical (~> 1.1)
 
@@ -35,8 +35,8 @@ GEM
     builder (3.2.4)
     coderay (1.1.3)
     concurrent-ruby (1.1.8)
-    countries (3.0.1)
-      i18n_data (~> 0.10.0)
+    countries (3.1.0)
+      i18n_data (~> 0.11.0)
       sixarm_ruby_unaccent (~> 1.1)
       unicode_utils (~> 1.4)
     crass (1.0.6)
@@ -44,7 +44,7 @@ GEM
     erubi (1.10.0)
     i18n (1.8.9)
       concurrent-ruby (~> 1.0)
-    i18n_data (0.10.0)
+    i18n_data (0.11.0)
     loofah (2.9.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)

data/gemfiles/actionpack5.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    country_select (5.0.1)
+    country_select (5.1.0)
       countries (~> 3.0)
       sort_alphabetical (~> 1.1)
 
@@ -29,8 +29,8 @@ GEM
     builder (3.2.4)
     coderay (1.1.3)
     concurrent-ruby (1.1.8)
-    countries (3.0.1)
-      i18n_data (~> 0.10.0)
+    countries (3.1.0)
+      i18n_data (~> 0.11.0)
       sixarm_ruby_unaccent (~> 1.1)
       unicode_utils (~> 1.4)
     crass (1.0.6)
@@ -38,7 +38,7 @@ GEM
     erubi (1.10.0)
     i18n (1.8.9)
       concurrent-ruby (~> 1.0)
-    i18n_data (0.10.0)
+    i18n_data (0.11.0)
     loofah (2.9.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)

data/gemfiles/actionpack6.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    country_select (5.0.1)
+    country_select (5.1.0)
       countries (~> 3.0)
       sort_alphabetical (~> 1.1)
 
@@ -30,8 +30,8 @@ GEM
     builder (3.2.4)
     coderay (1.1.3)
     concurrent-ruby (1.1.8)
-    countries (3.0.1)
-      i18n_data (~> 0.10.0)
+    countries (3.1.0)
+      i18n_data (~> 0.11.0)
       sixarm_ruby_unaccent (~> 1.1)
       unicode_utils (~> 1.4)
     crass (1.0.6)
@@ -39,7 +39,7 @@ GEM
     erubi (1.10.0)
     i18n (1.8.9)
       concurrent-ruby (~> 1.0)
-    i18n_data (0.10.0)
+    i18n_data (0.11.0)
     loofah (2.9.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)

data/gemfiles/actionpack6.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    country_select (5.0.1)
+    country_select (5.1.0)
       countries (~> 3.0)
       sort_alphabetical (~> 1.1)
 
@@ -30,8 +30,8 @@ GEM
     builder (3.2.4)
     coderay (1.1.3)
     concurrent-ruby (1.1.8)
-    countries (3.0.1)
-      i18n_data (~> 0.10.0)
+    countries (3.1.0)
+      i18n_data (~> 0.11.0)
       sixarm_ruby_unaccent (~> 1.1)
       unicode_utils (~> 1.4)
     crass (1.0.6)
@@ -39,7 +39,7 @@ GEM
     erubi (1.10.0)
     i18n (1.8.9)
       concurrent-ruby (~> 1.0)
-    i18n_data (0.10.0)
+    i18n_data (0.11.0)
     loofah (2.9.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)

data/lib/country_select.rb

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

@@ -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 = '5.0.1'
+  VERSION = '5.1.0'
 end

data/lib/country_select_without_sort_alphabetical.rb

@@ -3,6 +3,7 @@
 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'

data/spec/country_select_spec.rb

@@ -139,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(

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: country_select
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 5.1.0
 platform: ruby
 authors:
 - Stefan Penner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-08 00:00:00.000000000 Z
+date: 2021-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -138,6 +138,7 @@ files:
 - 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/tag_helper.rb
 - lib/country_select/version.rb