localized_country_select 0.9.8 → 0.10.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 7ff1f5a996b282ec7a2493368727792702c0e4b48b8cdc0dcff579a726e42c1e
+  data.tar.gz: 8a7ca054c3d89883d6d683929ef7414065daf0be6c08a6a0f43bef38c818ebf9
+SHA512:
+  metadata.gz: ae940269acba150b3316fd38d775e9aa008562c74e55cbc704469acb14d3f3f4e16f0807a55582e5bc59a40b6fbd3336a0a2657d3cfd60a1eb7585efd0f512ad
+  data.tar.gz: b91d5323de3696d3d449c515dc14795a87ceeb479b83a02b572d20aeb72c401c2ef58ddf6feeacae6349636c27641b3e2e222c05c712d84c220ba0d77959441b

data/.gitignore

@@ -1,3 +1,4 @@
 .DS_Store
 */.DS_Store
-rdoc
+rdoc
+*.gem

data/README.rdoc

@@ -11,18 +11,24 @@ You can easily translate country codes in your application like this:
 
     <%= I18n.t @user.country, :scope => 'countries' %>
 
-Comes with a Rake task <tt>rake import:country_select LOCALE=de</tt> for importing country names
+Comes with a Rake task <tt>rails import:country_select LOCALE=de</tt> for importing country names
 from Unicode.org's CLDR repository (http://www.unicode.org/cldr/data/charts/summary/root.html)
 Don't forget to restart the application when you add new locale.
 
 ActionView helper code is adapted from Rails' default +country_select+ plugin (previously in core).
 See http://github.com/rails/country_select/tree/master/lib/country_select.rb
 
+== Rails 5 / Rails 6
+
+In your Gemfile add:
+
+    gem 'localized_country_select', '~> 0.10.0'
+
 == Rails 3 / Rails 4
 
 In your Gemfile add:
 
-    gem 'localized_country_select', '>= 0.9.8'
+    gem 'localized_country_select', '= 0.9.11'
 
 == Rails 2.3
 
@@ -35,7 +41,7 @@ In environment.rb add
 
 Show full country names:
 
-    <%= localized_country_select(:user, :country, [], {:include_blank => 'Please choose...'}) %>
+    <%= localized_country_select(:user, :country, [], {include_blank: 'Please choose...'}) %>
 
 will become:
 
@@ -50,7 +56,7 @@ will become:
 
 Show only country codes:
 
-   <%= localized_country_select(:user, :country, [], {:include_blank => 'Please choose...', :description => :abbreviated}) %>
+   <%= localized_country_select(:user, :country, [], {include_blank: 'Please choose...', description: :abbreviated}) %>
 
 will become:
 
@@ -68,7 +74,7 @@ for the en locale.
 
 You can exclude countries by code using the exclude option (a single code or an array of country codes):
 
-   localized_country_select(:user, :country, [], {:exclude => [:ZZ, :US]})
+   localized_country_select(:user, :country, [], {exclude: [:ZZ, :US]})
 
 
 == Formtastic and SimpleForm

data/lib/localized_country_select.rb

@@ -26,7 +26,7 @@ module LocalizedCountrySelect
     def localized_countries_array(options={})
       exclude = Array(options[:exclude]).map {|code| code.to_s.upcase }
 
-      if(options[:description]==:abbreviated)
+      if(options[:description] == :abbreviated)
         I18n.translate(:countries).map { |key, value| [key.to_s.upcase] if !exclude.include?(key.to_s.upcase) }
       else
         I18n.translate(:countries).map { |key, value| [value, key.to_s.upcase] if !exclude.include?(key.to_s.upcase) }
@@ -36,8 +36,8 @@ module LocalizedCountrySelect
     # == Example
     #   priority_countries_array([:TW, :CN])
     #   # => [ ['Taiwan', 'TW'], ['China', 'CN'] ]
-    def priority_countries_array(country_codes=[],options={})
-      if(options[:description]==:abbreviated)
+    def priority_countries_array(country_codes=[], options={})
+      if(options[:description] == :abbreviated)
         country_codes.map { |code| [code.to_s.upcase] }
       else
         countries = I18n.translate(:countries)
@@ -57,13 +57,7 @@ module ActionView
       # Country codes listed as an array of symbols in +priority_countries+ argument will be listed first
       # TODO : Implement pseudo-named args with a hash, not the "somebody said PHP?" multiple args sillines
       def localized_country_select(object, method, priority_countries = nil, options = {}, html_options = {})
-        tag = if defined?(ActionView::Helpers::InstanceTag) &&
-                ActionView::Helpers::InstanceTag.instance_method(:initialize).arity != 0
-
-                InstanceTag.new(object, method, self, options.delete(:object))
-              else
-                CountrySelect.new(object, method, self, options)
-              end
+        tag = CountrySelect.new(object, method, self, options)
 
         tag.to_localized_country_select_tag(priority_countries, options, html_options)
       end
@@ -99,7 +93,6 @@ module ActionView
       def to_localized_country_select_tag(priority_countries, options, html_options)
         html_options = html_options.stringify_keys
         add_default_name_and_id(html_options)
-        value = value(object)
         content_tag("select",
           add_options(
             localized_country_options_for_select(value, priority_countries, options).html_safe,
@@ -109,20 +102,13 @@ module ActionView
       end
     end
 
-    if defined?(ActionView::Helpers::InstanceTag) &&
-        ActionView::Helpers::InstanceTag.instance_method(:initialize).arity != 0
-      class InstanceTag
-        include ToCountrySelectTag
-      end
-    else
-      class CountrySelect < Tags::Base
-        include ToCountrySelectTag
-      end
+    class CountrySelect < Tags::Base
+      include ToCountrySelectTag
     end
 
     class FormBuilder
       def localized_country_select(method, priority_countries = nil, options = {}, html_options = {})
-        @template.localized_country_select(@object_name, method, priority_countries, options.merge(:object => @object), html_options)
+        @template.localized_country_select(@object_name, method, priority_countries, options.merge(object: @object), html_options)
       end
       alias_method :country_select, :localized_country_select
     end

data/lib/localized_country_select/version.rb

@@ -1,3 +1,3 @@
 module LocalizedCountrySelect
-  VERSION = "0.9.8"
+  VERSION = '0.10.1'
 end

data/lib/tasks/localized_country_select_tasks.rake

@@ -1,9 +1,10 @@
 require 'rubygems'
 require 'open-uri'
 require 'active_support/inflector'
+require 'csv'
 
 # Rake task for importing country names from Unicode.org's CLDR repository
-# (http://www.unicode.org/cldr/data/charts/summary/root.html).
+# (https://unicode-org.github.io/cldr-staging/charts/37/summary/root.html).
 #
 # It parses a HTML file from Unicode.org for given locale and saves the
 # Rails' I18n hash in the plugin +locale+ directory
@@ -33,7 +34,7 @@ namespace :import do
     # Setup variables
     locale = ENV['LOCALE']
     unless locale
-      puts "\n[!] Usage: rake import:country_select LOCALE=de\n\n"
+      puts "\n[!] Usage: rails import:country_select LOCALE=de\n\n"
       exit 0
     end
 
@@ -46,7 +47,7 @@ namespace :import do
     # ----- Get the CLDR HTML     --------------------------------------------------
     begin
       puts "... getting the HTML file for locale '#{web_locale}'"
-      url = "http://www.unicode.org/cldr/data/charts/summary/#{web_locale}.html"
+      url = "https://unicode-org.github.io/cldr-staging/charts/37/summary/#{web_locale}.html"
       html = open(url).read
     rescue => e
       puts "[!] Invalid locale name '#{web_locale}'! Not found in CLDR (#{e})"
@@ -56,9 +57,14 @@ namespace :import do
 
     set_parser(ENV['PARSER']) if ENV['PARSER']
     puts "... parsing the HTML file using #{parser.name.split("::").last}"
-    countries = parser.parse(html).inject([]) { |arr, (code, attrs)| arr << attrs }
+    countries = parser.parse(html).inject([]) { |arr, (_code, attrs)| arr << attrs }
     countries.sort_by! { |c| c[:code] }
+    puts '... fetching correct list of country codes and filtering translations'
+    correct_list = CSV.parse(open('https://raw.githubusercontent.com/datasets/un-locode/master/data/country-codes.csv').string)
+    country_codes = correct_list.map { |c| c[0] }
+    countries.delete_if { |c| !country_codes.member?(c[:code].to_s) }
     puts "\n\n... imported #{countries.count} countries:"
+
     puts countries.map { |c| "#{c[:code]}: #{c[:name]}" }.join(", ")
 
 
@@ -78,7 +84,7 @@ namespace :import do
   countries:
 HEAD
       countries.each do |country|
-        output << "    #{country[:code]}: \"#{country[:name]}\"\n"
+        output << "    \"#{country[:code]}\": \"#{country[:name]}\"\n"
       end
 
     else # rb format
@@ -136,10 +142,10 @@ TAIL
         document.search("//tr").inject({}) do |hash, row|
           n = row.search("td[@class='n']")
           g = row.search("td")
-          if n.inner_html =~ /NamesTerritories/ && g.count >= 7 && g[4].inner_html =~ /^[A-Z]{2}/
+          if n.inner_html =~ /Locale Display Names/ && g.count >= 6 && g[4].inner_html =~ /^[A-Z]{2}$/
             code = g[4].inner_text
             code = code[-code.size, 2].to_sym
-            name = row.search("td[@class='v']").inner_text
+            name = row.search("td[@class='v']:not([@title])").inner_text
 
             hash[code] = {:code => code, :name => name.to_s}
           end
@@ -163,10 +169,10 @@ TAIL
         document.find("//tr").inject({}) do |hash, row|
           n = row.find("td[@class='n']")
           g = row.find("td")
-          if n.map(&:content).join =~ /NamesTerritories/ && g.count >= 7 && g[4].inner_xml =~ /^[A-Z]{2}/
+          if n.map(&:content).join =~ /Locale Display Names/ && g.count >= 6 && g[4].inner_xml =~ /^[A-Z]{2}/
             code = g[4].content
             code = code[-code.size, 2].to_sym
-            name = row.find("td[@class='v']").map(&:content).join
+            name = row.find("td[@class='v' and not(@title)]").map(&:content).join
 
             hash[code] ||= {:code => code, :name => name.to_s}
           end

data/locale/cz.rb

@@ -95,7 +95,6 @@
 			:GU => "Guam",
 			:GW => "Guinea-Bissau",
 			:GY => "Guyana",
-			:HK => "Hongkong, zvláštní administrativní oblast Číny",
 			:HK => "Hongkong",
 			:HM => "Ostrovy Heard a McDonald",
 			:HN => "Honduras",
@@ -149,7 +148,6 @@
 			:ML => "Mali",
 			:MM => "Myanmar",
 			:MN => "Mongolsko",
-			:MO => "Zvláštní administrativní oblast Číny Macao",
 			:MO => "Macao",
 			:MP => "Severní Mariany",
 			:MQ => "Martinik",
@@ -253,7 +251,7 @@
 			:ZM => "Zambie",
 			:ZW => "Zimbabwe",
 			:ZZ => "Neznámá nebo neplatná oblast",
-    } 
+    }
 
   }
 }

data/locale/en.rb

@@ -100,7 +100,6 @@
 			:GU => "Guam",
 			:GW => "Guinea-Bissau",
 			:GY => "Guyana",
-			:HK => "Hong Kong SAR China",
 			:HK => "Hong Kong",
 			:HM => "Heard Island and McDonald Islands",
 			:HN => "Honduras",
@@ -156,7 +155,6 @@
 			:ML => "Mali",
 			:MM => "Myanmar",
 			:MN => "Mongolia",
-			:MO => "Macau SAR China",
 			:MO => "Macau",
 			:MP => "Northern Mariana Islands",
 			:MQ => "Martinique",
@@ -269,7 +267,7 @@
 			:ZM => "Zambia",
 			:ZW => "Zimbabwe",
 			:ZZ => "Unknown or Invalid Region",
-    } 
+    }
 
   }
 }

data/test/localized_country_select_test.rb

@@ -34,17 +34,15 @@ class LocalizedCountrySelectTest < Test::Unit::TestCase
   end
 
   def test_should_return_select_tag_with_proper_name_for_object
-    # puts localized_country_select(:user, :country)
     assert localized_country_select(:user, :country) =~
-              Regexp.new(Regexp.escape('<select id="user_country" name="user[country]">')),
+              Regexp.new(Regexp.escape('<select name="user[country]" id="user_country">')),
               "Should have proper name for object"
   end
 
   def test_should_return_select_tag_with_proper_name
-    # puts localized_country_select_tag( "competition_submission[data][citizenship]", nil)
     assert localized_country_select_tag( "competition_submission[data][citizenship]", nil) =~
               Regexp.new(
-              Regexp.escape('<select id="competition_submission_data_citizenship" name="competition_submission[data][citizenship]">') ),
+              Regexp.escape('<select name="competition_submission[data][citizenship]" id="competition_submission_data_citizenship">') ),
               "Should have proper name"
   end
 
@@ -70,7 +68,7 @@ class LocalizedCountrySelectTest < Test::Unit::TestCase
 
   def test_excludes_countries
     assert_nothing_raised { LocalizedCountrySelect::localized_countries_array(:exclude => :ZZ) }
-    
+
     assert_block do
       not LocalizedCountrySelect::localized_countries_array(:exclude => :ZZ).any? {|country| country.last == "ZZ"}
     end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: localized_country_select
 version: !ruby/object:Gem::Version
-  version: 0.9.8
-  prerelease: 
+  version: 0.10.1
 platform: ruby
 authors:
 - karmi
@@ -10,54 +9,42 @@ authors:
 - LIM SAS
 - Damien MATHIEU
 - Julien SANCHEZ
-- Hervé GAUCHER
-- ! 'RainerBlessing '
-autorequire: 
+- Herv\303\251 GAUCHER
+- RainerBlessing
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-03-28 00:00:00.000000000 Z
+date: 2020-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.0.0
-description: Localized "country_select" helper with Rake task for downloading locales
-  from Unicode.org's CLDR
+        version: '5.0'
+description: ' Localized "country_select" helper with Rake task for downloading locales
+  from Unicode.org''s CLDR '
 email:
+-
 - maciej@litwiniuk.net
+-
+-
+-
+-
+-
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
@@ -73,27 +60,25 @@ files:
 homepage: https://github.com/mlitwiniuk/localized_country_select
 licenses:
 - MIT
-post_install_message: 
+metadata: {}
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.23.2
-signing_key: 
-specification_version: 3
+rubygems_version: 3.0.3
+signing_key:
+specification_version: 4
 summary: Localized "country_select" helper with Rake task for downloading locales
   from Unicode.org's CLDR
 test_files: