country_select 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72a7ffe51f5fbddd1ce7ca73dbcf62d842645cf3
-  data.tar.gz: d8c97f5eb7b1530d405e4cf3705f724eaf1a497c
+  metadata.gz: d7d31ad272c6336aa0a415ad32bdb421bbe33a6d
+  data.tar.gz: 64e1071b675fe599b8f99fb2b6832ce016b49221
 SHA512:
-  metadata.gz: f07a44e5e84cb23dc0b3daa38e759ce3cf0cdaad59d1d316ebd2fdee24fa4fd55b5cbb16e535f29f0fb95191e7b9dc8c62433e470514aada8a8402c41b839443
-  data.tar.gz: 229b5545350af1b8af39defd14101133b092b401d793cd641224b60072125e93b6d1011195c27c25ed1bf54edd3f0cff7234aca68a94fd1408b95cdadc6ff62a
+  metadata.gz: 164c0d398827142767be0edf6a7a51bfa81779981a8b0d71ac97fda68583069912fca91308393438ab012120bae238b74763dc738f87fb47e3d69b5d5914b5f6
+  data.tar.gz: efc072970197346ffc68a40357b4efc4b4266a5fd18f03b1103e946649c7204677b270b0991bcfab18d527654b736761031def0c8a9f733ba90caf092e9cdef4

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.3.0 2015-08-25
+
+  * #107,#108 - Update countries gem to ~> v1.0.0
+
 ## 2.2.0 2015-03-19
 
   * #101 - Update countries gem to ~> v0.11.0

data/Gemfile.lock

@@ -2,7 +2,7 @@ PATH
   remote: .
   specs:
     country_select (2.2.0)
-      countries (~> 0.11.0)
+      countries (~> 1.0.0)
       sort_alphabetical (~> 1.0)
 
 GEM
@@ -26,16 +26,16 @@ GEM
       multi_json (~> 1.0)
     builder (3.0.4)
     coderay (1.1.0)
-    countries (0.11.2)
+    countries (1.0.0)
       currencies (~> 0.4.2)
-      i18n_data (~> 0.6.0)
+      i18n_data (~> 0.7.0)
     currencies (0.4.2)
     diff-lcs (1.2.5)
     erubis (2.7.0)
     ffi2-generators (0.1.1)
     hike (1.2.3)
     i18n (0.6.11)
-    i18n_data (0.6.2)
+    i18n_data (0.7.0)
     journey (1.0.4)
     method_source (0.8.2)
     multi_json (1.10.1)
@@ -266,7 +266,7 @@ GEM
     rubysl-yaml (2.0.4)
     rubysl-zlib (2.0.1)
     slop (3.6.0)
-    sort_alphabetical (1.0.1)
+    sort_alphabetical (1.0.2)
       unicode_utils (>= 1.2.2)
     sprockets (2.2.2)
       hike (~> 1.2)

data/README.md

@@ -12,6 +12,10 @@ to evaluate the suitability of this list given their user base.
 
 [**An important message about upgrading from 1.x**](UPGRADING.md)
 
+## Reporting issues
+
+Open an issue on the [issue tracker](https://github.com/stefanpenner/country_select/issues/new). Ideally provide versions used, and code example that demonstrates the issue.
+
 ## Installation
 
 Install as a gem using

data/country_select.gemspec

@@ -25,6 +25,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec', '~> 3'
   s.add_development_dependency 'wwtd'
 
-  s.add_dependency 'countries', '~> 0.11.0'
+  s.add_dependency 'countries', '~> 1.0.0'
   s.add_dependency 'sort_alphabetical', '~> 1.0'
 end

data/gemfiles/actionpack.edge.gemfile.lock

@@ -25,8 +25,8 @@ GIT
 PATH
   remote: ../
   specs:
-    country_select (2.2.0)
-      countries (~> 0.11.0)
+    country_select (2.3.0)
+      countries (~> 1.0.0)
       sort_alphabetical (~> 1.0)
 
 GEM
@@ -34,15 +34,15 @@ GEM
   specs:
     builder (3.2.2)
     coderay (1.1.0)
-    countries (0.11.2)
+    countries (1.0.0)
       currencies (~> 0.4.2)
-      i18n_data (~> 0.6.0)
+      i18n_data (~> 0.7.0)
     currencies (0.4.2)
     diff-lcs (1.2.5)
     erubis (2.7.0)
     ffi2-generators (0.1.1)
     i18n (0.7.0)
-    i18n_data (0.6.2)
+    i18n_data (0.7.0)
     json (1.8.2)
     loofah (2.0.1)
       nokogiri (>= 1.5.9)
@@ -281,7 +281,7 @@ GEM
     rubysl-yaml (2.1.0)
     rubysl-zlib (2.0.1)
     slop (3.6.0)
-    sort_alphabetical (1.0.1)
+    sort_alphabetical (1.0.2)
       unicode_utils (>= 1.2.2)
     thread_safe (0.3.4)
     tzinfo (1.2.2)

data/gemfiles/actionpack3.2.gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: ../
   specs:
-    country_select (2.2.0)
-      countries (~> 0.11.0)
+    country_select (2.3.0)
+      countries (~> 1.0.0)
       sort_alphabetical (~> 1.0)
 
 GEM
@@ -26,16 +26,16 @@ GEM
       multi_json (~> 1.0)
     builder (3.0.4)
     coderay (1.1.0)
-    countries (0.11.2)
+    countries (1.0.0)
       currencies (~> 0.4.2)
-      i18n_data (~> 0.6.0)
+      i18n_data (~> 0.7.0)
     currencies (0.4.2)
     diff-lcs (1.2.5)
     erubis (2.7.0)
     ffi2-generators (0.1.1)
     hike (1.2.3)
     i18n (0.7.0)
-    i18n_data (0.6.2)
+    i18n_data (0.7.0)
     journey (1.0.4)
     method_source (0.8.2)
     multi_json (1.10.1)
@@ -263,7 +263,7 @@ GEM
     rubysl-yaml (2.1.0)
     rubysl-zlib (2.0.1)
     slop (3.6.0)
-    sort_alphabetical (1.0.1)
+    sort_alphabetical (1.0.2)
       unicode_utils (>= 1.2.2)
     sprockets (2.2.3)
       hike (~> 1.2)

data/gemfiles/actionpack4.0.gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: ../
   specs:
-    country_select (2.2.0)
-      countries (~> 0.11.0)
+    country_select (2.3.0)
+      countries (~> 1.0.0)
       sort_alphabetical (~> 1.0)
 
 GEM
@@ -22,15 +22,15 @@ GEM
       tzinfo (~> 0.3.37)
     builder (3.1.4)
     coderay (1.1.0)
-    countries (0.11.2)
+    countries (1.0.0)
       currencies (~> 0.4.2)
-      i18n_data (~> 0.6.0)
+      i18n_data (~> 0.7.0)
     currencies (0.4.2)
     diff-lcs (1.2.5)
     erubis (2.7.0)
     ffi2-generators (0.1.1)
     i18n (0.7.0)
-    i18n_data (0.6.2)
+    i18n_data (0.7.0)
     method_source (0.8.2)
     minitest (4.7.5)
     multi_json (1.10.1)
@@ -256,7 +256,7 @@ GEM
     rubysl-yaml (2.1.0)
     rubysl-zlib (2.0.1)
     slop (3.6.0)
-    sort_alphabetical (1.0.1)
+    sort_alphabetical (1.0.2)
       unicode_utils (>= 1.2.2)
     thread_safe (0.3.4)
     tzinfo (0.3.43)

data/gemfiles/actionpack4.1.gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: ../
   specs:
-    country_select (2.2.0)
-      countries (~> 0.11.0)
+    country_select (2.3.0)
+      countries (~> 1.0.0)
       sort_alphabetical (~> 1.0)
 
 GEM
@@ -25,15 +25,15 @@ GEM
       tzinfo (~> 1.1)
     builder (3.2.2)
     coderay (1.1.0)
-    countries (0.11.2)
+    countries (1.0.0)
       currencies (~> 0.4.2)
-      i18n_data (~> 0.6.0)
+      i18n_data (~> 0.7.0)
     currencies (0.4.2)
     diff-lcs (1.2.5)
     erubis (2.7.0)
     ffi2-generators (0.1.1)
     i18n (0.7.0)
-    i18n_data (0.6.2)
+    i18n_data (0.7.0)
     json (1.8.2)
     method_source (0.8.2)
     minitest (5.5.1)
@@ -259,7 +259,7 @@ GEM
     rubysl-yaml (2.1.0)
     rubysl-zlib (2.0.1)
     slop (3.6.0)
-    sort_alphabetical (1.0.1)
+    sort_alphabetical (1.0.2)
       unicode_utils (>= 1.2.2)
     thread_safe (0.3.4)
     tzinfo (1.2.2)

data/gemfiles/actionpack4.2.gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: ../
   specs:
-    country_select (2.2.0)
-      countries (~> 0.11.0)
+    country_select (2.3.0)
+      countries (~> 1.0.0)
       sort_alphabetical (~> 1.0)
 
 GEM
@@ -29,15 +29,15 @@ GEM
       tzinfo (~> 1.1)
     builder (3.2.2)
     coderay (1.1.0)
-    countries (0.11.2)
+    countries (1.0.0)
       currencies (~> 0.4.2)
-      i18n_data (~> 0.6.0)
+      i18n_data (~> 0.7.0)
     currencies (0.4.2)
     diff-lcs (1.2.5)
     erubis (2.7.0)
     ffi2-generators (0.1.1)
     i18n (0.7.0)
-    i18n_data (0.6.2)
+    i18n_data (0.7.0)
     json (1.8.2)
     loofah (2.0.1)
       nokogiri (>= 1.5.9)
@@ -281,7 +281,7 @@ GEM
     rubysl-yaml (2.1.0)
     rubysl-zlib (2.0.1)
     slop (3.6.0)
-    sort_alphabetical (1.0.1)
+    sort_alphabetical (1.0.2)
       unicode_utils (>= 1.2.2)
     thor (0.19.1)
     thread_safe (0.3.4)

data/lib/country_select/tag_helper.rb

@@ -13,7 +13,7 @@ module CountrySelect
         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)
 
-        if priority_countries.include?(option_tags_options[:selected])
+        if priority_countries_options.map(&:second).include?(option_tags_options[:selected])
           option_tags_options[:selected] = nil
         end
 
@@ -53,7 +53,7 @@ module CountrySelect
     end
 
     def all_country_codes
-      codes = ISO3166::Country.all.map(&:last)
+      codes = ISO3166::Country.codes
 
       if only_country_codes.present?
         codes & only_country_codes
@@ -79,9 +79,14 @@ module CountrySelect
             raise CountryNotFoundError.new(msg)
           end
 
-          name = ::CountrySelect::FORMATS[format].call(country)
+          formatted_country = ::CountrySelect::FORMATS[format].call(country)
+
+          if formatted_country.is_a?(Array)
+            formatted_country
+          else
+            [formatted_country, code]
+          end
 
-          [name,code]
         end
 
         if sorted
@@ -97,4 +102,3 @@ module CountrySelect
     end
   end
 end
-

data/lib/country_select/version.rb

@@ -1,3 +1,3 @@
 module CountrySelect
-  VERSION = "2.2.0"
+  VERSION = "2.3.0"
 end

data/spec/country_select_spec.rb

@@ -143,9 +143,9 @@ describe "CountrySelect" do
         "United Kingdom",
         "Mexico",
         "Australia",
-        "South Korea"
+        "Freedonia"
       ]
-      error_msg = "Could not find Country with string 'South Korea'"
+      error_msg = "Could not find Country with string 'Freedonia'"
 
       expect do
         builder.country_select(:country_code, country_names)
@@ -183,5 +183,38 @@ describe "CountrySelect" do
       t = builder.country_select(:country_code, format: :with_alpha2)
       expect(t).to include(tag)
     end
+
+    it "accepts an array for formatter" do
+      ::CountrySelect::FORMATS[:with_alpha3] = lambda do |country|
+        [country.name, country.alpha3]
+      end
+
+      tag = options_for_select([['United States', 'USA']], 'USA')
+      walrus.country_code = 'USA'
+      t = builder.country_select(:country_code, format: :with_alpha3)
+      expect(t).to include(tag)
+    end
+
+    it "accepts an array for formatter + custom formatter" do
+      ::CountrySelect::FORMATS[:with_alpha3] = lambda do |country|
+        ["#{country.name} (#{country.alpha2})", country.alpha3]
+      end
+
+      tag = options_for_select([['United States (US)', 'USA']], 'USA')
+      walrus.country_code = 'USA'
+      t = builder.country_select(:country_code, format: :with_alpha3)
+      expect(t).to include(tag)
+    end
+
+    it "marks priority countries as selected only once" do
+      ::CountrySelect::FORMATS[:with_alpha3] = lambda do |country|
+        [country.name, country.alpha3]
+      end
+
+      tag = options_for_select([['United States', '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
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: country_select
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Stefan Penner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-19 00:00:00.000000000 Z
+date: 2015-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: sort_alphabetical
   requirement: !ruby/object:Gem::Requirement