localized_country_select 0.9.2 → 0.9.3

data/README.rdoc

@@ -18,24 +18,24 @@ 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 3
+== Rails 3 / Rails 4
 
 In your Gemfile add:
 
-    gem 'localized_country_select', '>= 0.9.2'
+    gem 'localized_country_select', '>= 0.9.3'
 
 == Rails 2.3
 
 No longer supported, but you can still use old version of gem.
 In environment.rb add
 
-    config.gem 'localized_country_select, , :version => '0.0.1'
+    config.gem 'localized_country_select', :version => '0.0.1'
 
 == Example
 
 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 +50,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:
 
@@ -66,6 +66,11 @@ will become:
 for the <tt>en</tt> 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]})
+
+
 == Formtastic and SimpleForm
 
 Gem supports (via alias_method) both formtastic and simple_form :country input

data/lib/localized_country_select.rb

@@ -24,13 +24,13 @@ module LocalizedCountrySelect
     # Returns array with codes and localized country names (according to <tt>I18n.locale</tt>)
     # for <tt><option></tt> tags
     def localized_countries_array(options={})
+      exclude = Array(options[:exclude]).map {|code| code.to_s.upcase }
+
       if(options[:description]==:abbreviated)
-        I18n.translate(:countries).map { |key, value| [key.to_s.upcase] }.
-          sort_by { |country| country.first.parameterize }
+        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] }.
-          sort_by { |country| country.first.parameterize }
-      end
+        I18n.translate(:countries).map { |key, value| [value, key.to_s.upcase] if !exclude.include?(key.to_s.upcase) }
+      end.compact.sort_by { |country| country.first.parameterize }
     end
     # Return array with codes and localized country names for array of country codes passed as argument
     # == Example
@@ -57,8 +57,15 @@ 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 = {})
-        InstanceTag.new(object, method, self, options.delete(:object)).
-          to_localized_country_select_tag(priority_countries, 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.to_localized_country_select_tag(priority_countries, options, html_options)
       end
       alias_method :country_select, :localized_country_select
 
@@ -88,7 +95,7 @@ module ActionView
 
     end
 
-    class InstanceTag
+    module ToCountrySelectTag
       def to_localized_country_select_tag(priority_countries, options, html_options)
         html_options = html_options.stringify_keys
         add_default_name_and_id(html_options)
@@ -102,6 +109,17 @@ 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
+    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)

data/lib/localized_country_select/version.rb

@@ -1,3 +1,3 @@
 module LocalizedCountrySelect
-  VERSION = "0.9.2"
+  VERSION = "0.9.3"
 end

data/lib/tasks/localized_country_select_tasks.rake

@@ -9,12 +9,18 @@ require 'open-uri'
 # 
 # Don't forget to restart the application when you add new locale to load it into Rails!
 # 
-# == Example
-#   rake import:country_select 'de'
+# == Parameters
+#   LOCALE (required): Sets the locale to use. Output file name will include this.
+#   FORMAT (optional): Output format, either 'rb' or 'yml'. Defaults to 'rb' if not specified.
+#   WEB_LOCALE (optional): Forces a locale code to use when querying the Unicode.org CLDR archive.
+#
+# == Examples
+#   rake import:country_select LOCALE=de
+#   rake import:country_select LOCALE=pt-BR WEB_LOCALE=pt FORMAT=yml
 # 
 # The code is deliberately procedural and simple, so it's easily
 # understandable by beginners as an introduction to Rake tasks power.
-# See http://github.com/joshmh/cldr/tree/master/converter.rb for much more robust solution
+# See https://github.com/svenfuchs/ruby-cldr for much more robust solution
 
 namespace :import do
 
@@ -36,12 +42,18 @@ namespace :import do
       exit 0
     end
 
+    # convert locale code to Unicode.org CLDR acceptable code
+    web_locale = if ENV['WEB_LOCALE'] then ENV['WEB_LOCALE']
+                 elsif %w(zht zhtw).include?(locale.downcase.gsub(/[-_]/,'')) then 'zh_Hant'
+                 elsif %w(zhs zhcn).include?(locale.downcase.gsub(/[-_]/,'')) then 'zh_Hans'
+                 else locale.underscore.split('_')[0] end
+
     # ----- Get the CLDR HTML     --------------------------------------------------
     begin
-      puts "... getting the HTML file for locale '#{locale}'"
-      doc = Hpricot( open("http://www.unicode.org/cldr/data/charts/summary/#{locale}.html") )
+      puts "... getting the HTML file for locale '#{web_locale}'"
+      doc = Hpricot( open("http://www.unicode.org/cldr/data/charts/summary/#{web_locale}.html") )
     rescue => e
-      puts "[!] Invalid locale name '#{locale}'! Not found in CLDR (#{e})"
+      puts "[!] Invalid locale name '#{web_locale}'! Not found in CLDR (#{e})"
       exit 0
     end
 
@@ -63,6 +75,25 @@ namespace :import do
 
 
     # ----- Prepare the output format     ------------------------------------------
+
+    format = if ENV['FORMAT'].nil?||%(rb ruby).include?(ENV['FORMAT'].downcase) then :rb
+             elsif %(yml yaml).include?(ENV['FORMAT'].downcase) then :yml end
+
+    unless format
+      puts "\n[!] FORMAT must be either 'rb' or 'yml'\n\n"
+      exit 0
+    end
+
+    if format==:yml
+      output =<<HEAD
+#{locale}:
+  countries:
+HEAD
+      countries.each do |country|
+        output << "    #{country[:code]}: \"#{country[:name]}\"\n"
+      end
+
+    else # rb format
     output = "#encoding: UTF-8\n"
     output <<<<HEAD
 { :#{locale} => {
@@ -78,11 +109,11 @@ HEAD
   }
 }
 TAIL
+    end
 
-    
     # ----- Write the parsed values into file      ---------------------------------
     puts "\n... writing the output"
-    filename = Rails.root.join('config', 'locales', "country_select_#{locale.downcase}.rb")
+    filename = Rails.root.join('config', 'locales', "countries.#{locale}.#{format}")
     if filename.exist?
       filename = Pathname.new("#{filename.to_s}.NEW")
     end

data/test/localized_country_select_test.rb

@@ -68,6 +68,18 @@ class LocalizedCountrySelectTest < Test::Unit::TestCase
     assert_equal 'Španělsko', I18n.t('ES', :scope => 'countries')
   end
 
+  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
+
+    assert_block do
+      not LocalizedCountrySelect::localized_countries_array(:exclude => [:ZZ, :US]).any? {|country| country.last == "ZZ" or country.last == "US"}
+    end
+  end
+
   def test_localized_countries_array_returns_correctly
     assert_nothing_raised { LocalizedCountrySelect::localized_countries_array() }
     # puts LocalizedCountrySelect::localized_countries_array.inspect

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: localized_country_select
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
   prerelease: 
 platform: ruby
 authors:
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-15 00:00:00.000000000 Z
+date: 2013-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -106,10 +106,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Localized "country_select" helper with Rake task for downloading locales
   from Unicode.org's CLDR
 test_files:
 - test/localized_country_select_test.rb
+has_rdoc: