brainsome_localized_country_select 0.9.10 → 0.9.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa7f88f79da92af82183bb6c113c73087b6407d4
-  data.tar.gz: 4e42189f21f557902411ef36feb6e2eec5400196
+  metadata.gz: ed07560553cc9d1e88798bf27c1106d8dd87a7d3
+  data.tar.gz: 35734cace6c5350f83600feca2a453a21a170ae1
 SHA512:
-  metadata.gz: 70a864ff607803432057e72772f8645b9e988f44af3fccb4a4e25b83155689272bb68c9c3e8926c5f32e6b1ddf5af7373bbe78507bcab510045147e2e77534fa
-  data.tar.gz: d44e34c3c28722686974e218f93b4157c7871467ec9e5b202a962f56df8a1efd18a09d50307945fd7182254ef2f645c377c91c024b8ffba3c7ce9e07e00fd2d7
+  metadata.gz: ca03b78aa6dcaa87ecbb11f0f3d941cda8421887da420634158d085f2040cafc905325a57c03bad266fb24d27585bea2a459433657eb901da79e89eed315151a
+  data.tar.gz: 740733393d6c432f63495aaf413c209e5c3d003cdc63debec211485c3790ff00cde418ad792cf8217f9297f114b1d880d843077ed716cc09547dc86d05ac52e3

data/README.rdoc

@@ -22,7 +22,7 @@ See http://github.com/rails/country_select/tree/master/lib/country_select.rb
 
 In your Gemfile add:
 
-    gem 'localized_country_select', '>= 0.9.9'
+    gem 'localized_country_select', '>= 0.9.11'
 
 == Rails 2.3
 

data/lib/localized_country_select.rb

@@ -25,7 +25,7 @@ module LocalizedCountrySelect
     # for <tt><option></tt> tags
     def localized_countries_array(options={})
       exclude = Array(options[:exclude]).map {|code| code.to_s.upcase }
-      locale = options.delete(:locale) || I18n.locale
+      locale = options[:locale] || I18n.locale
 
       if(options[:description]==:abbreviated)
         I18n.translate(:countries, locale: locale).map { |key, value| [key.to_s.upcase] if !exclude.include?(key.to_s.upcase) }
@@ -39,10 +39,12 @@ module LocalizedCountrySelect
     #   priority_countries_array([:TW, :CN])
     #   # => [ ['Taiwan', 'TW'], ['China', 'CN'] ]
     def priority_countries_array(country_codes=[],options={})
+      locale = options[:locale] || I18n.locale
+
       if(options[:description]==:abbreviated)
         country_codes.map { |code| [code.to_s.upcase] }
       else
-        countries = I18n.translate(:countries)
+        countries = I18n.translate(:countries, locale: locale)
         country_codes.map { |code| [countries[code.to_s.upcase.to_sym], code.to_s.upcase] }
       end
     end

data/lib/localized_country_select/version.rb

@@ -1,3 +1,3 @@
 module LocalizedCountrySelect
-  VERSION = "0.9.10"
+  VERSION = "0.9.11"
 end

data/lib/tasks/localized_country_select_tasks.rake

@@ -1,6 +1,7 @@
 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).
@@ -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(", ")
 
 
@@ -136,7 +142,7 @@ 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 >= 6 && 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']:not([@title])").inner_text
@@ -163,7 +169,7 @@ 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 >= 6 && 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' and not(@title)]").map(&:content).join

data/test/localized_country_select_test.rb

@@ -62,6 +62,16 @@ class LocalizedCountrySelectTest < Test::Unit::TestCase
       Regexp.escape("<option value=\"ES\">Spain</option>\n<option value=\"CZ\">Czech Republic</option><option value=\"\" disabled=\"disabled\">-------------</option>\n<option value=\"AF\">Afghanistan</option>\n"))
   end
 
+  def test_should_passing_locale_option
+    country_options_cz = localized_country_options_for_select(nil, nil, locale: :cz)
+    country_options_en = localized_country_options_for_select(nil, nil, locale: :en)
+    assert_not_equal country_options_cz, country_options_en
+
+    country_options_cz = localized_country_options_for_select(nil, [:ES, :CZ], locale: :cz)
+    country_options_en = localized_country_options_for_select(nil, [:ES, :CZ], locale: :en)
+    assert_not_equal country_options_cz, country_options_en
+  end
+
   def test_i18n_should_know_about_countries
     assert_equal 'Spain', I18n.t('ES', :scope => 'countries')
     I18n.locale = 'cz'
@@ -113,6 +123,12 @@ class LocalizedCountrySelectTest < Test::Unit::TestCase
     assert_equal [ ['United States', 'US'], ['Canada', 'CA'] ], LocalizedCountrySelect::priority_countries_array([:us, :ca])
   end
 
+  def test_priority_countries_allows_passing_locale_option
+    I18n.locale = 'cz'
+    assert_not_equal [ ['Taiwan', 'TW'], ['China', 'CN'] ], LocalizedCountrySelect::priority_countries_array([:TW, :CN])
+    assert_equal [ ['Taiwan', 'TW'], ['China', 'CN'] ], LocalizedCountrySelect::priority_countries_array([:TW, :CN], locale: :en)
+  end
+
   def test_should_list_countries_with_accented_names_in_correct_order
     I18n.locale = 'cz'
     assert_match Regexp.new(Regexp.escape(%Q{<option value="BI">Burundi</option>\n<option value="TD">Čad</option>})), localized_country_select(:user, :country)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brainsome_localized_country_select
 version: !ruby/object:Gem::Version
-  version: 0.9.10
+  version: 0.9.11
 platform: ruby
 authors:
 - karmi
@@ -15,22 +15,36 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-09 00:00:00.000000000 Z
+date: 2015-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: actionpack
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
+        version: '1.6'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -45,6 +59,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: Localized "country_select" helper with Rake task for downloading locales
   from Unicode.org's CLDR
 email:
@@ -60,8 +88,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
 - MIT-LICENSE
 - README.rdoc
 - Rakefile

data/.gitignore

@@ -1,21 +0,0 @@
-.DS_Store
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
-.ruby-gemset
-.ruby-version
-.rvmrc

data/.travis.yml

@@ -1,13 +0,0 @@
-language: ruby
-rvm:
-  - 2.1.2
-  - 2.1.1
-  - 2.0.0
-  - 1.9.3
-  - 1.9.2
-  - jruby-18mode
-  - jruby-19mode
-  - ruby-head
-  - jruby-head
-  - 1.8.7
-  - ree