i18n_country_select 1.0.17 → 1.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f78a5371b8fed10e962a95ac0b4659852ad5d8e5
-  data.tar.gz: 82aa7386276cb89f01b6a00d6c4a569d46d5fd2c
+  metadata.gz: 00d7fc9362f2f2ab078a89b44443418ab8d70bdf
+  data.tar.gz: 140c210775c90f0b92576a237b524580cb6deaef
 SHA512:
-  metadata.gz: fb4aca1a9644c0162a0ff101517bec239e051e947fd9d5a14714ea3650b87773db0db0c4d19af29efddd22e077b1caaf3c1d53a337af2e0695073e680bd3df33
-  data.tar.gz: 4da6f3d14a67df2bd0959d5642f2279e6028bc667226fbfe6c61ffe064f0ef45b2ad5c1fd69b3bb004ffcdc93c8034c1f04c429bbb156ff785d2a5ad111ab9ba
+  metadata.gz: 9ba8ebb357eef9ca79398f518932c76e66bf5cc55083d091068f07e0f3e5f236cf5ab641b3b1df6523175c64b713b938d4e8deac42b605a03633271421df7dbe
+  data.tar.gz: fdbb619aaeac2148dcfb7db2bc5fbae4114b0ceb786e3d9947092cd5f83ef9c0663d24fc00a3dd00b15b6689e7bcd8994622b387be97b0f8e9534b56f76365d8

data/README.rdoc

@@ -39,12 +39,13 @@ Supplying priority countries to be placed at the top of the list:
 Based on the deprecated country_code_select by: Russ Smith (russ@bashme.org) and Frank Wambutt (frank@mo-stud.io)
 
 == Version History
-1.0.17 - Removing duplicate country code IE
-1.0.16 - Removing unnecessary value attribute and corrected spelling error on the include_blank option tag
-1.0.15 - Removing more duplicate country codes
-1.0.14 - Removing duplicate country codes and adding Norway
-1.0.13 - Ignore missing translations from i18n-country-translations
-1.0.12 - Adds the ability to specify text to use in a blank option
+* 1.0.18 - Fixed translated sorting
+* 1.0.17 - Removing duplicate country code IE
+* 1.0.16 - Removing unnecessary value attribute and corrected spelling error on the include_blank option tag
+* 1.0.15 - Removing more duplicate country codes
+* 1.0.14 - Removing duplicate country codes and adding Norway
+* 1.0.13 - Ignore missing translations from i18n-country-translations
+* 1.0.12 - Adds the ability to specify text to use in a blank option
 
 == License
 

data/lib/i18n_country_select.rb

@@ -1,4 +1,6 @@
-require "sort_alphabetical"
+require 'unicode_utils/canonical_decomposition'
+require 'unicode_utils/general_category'
+
 require "i18n-country-translations"
 require "i18n_country_select/countries"
 require "i18n_country_select/form_builder"

data/lib/i18n_country_select/instance_tag.rb

@@ -13,7 +13,9 @@ module I18nCountrySelect
       country_translations = country_translations = COUNTRY_CODES.map do |code|
         translation = I18n.t(code, :scope => :countries, :default => 'missing')
         translation == 'missing' ? nil : [translation, code]
-      end.compact.sort_alphabetical_by(&:first)
+      end.compact.sort_by do |translation, code|
+        normalize_translation(translation)
+      end
 
       countries = ""
 
@@ -34,5 +36,12 @@ module I18nCountrySelect
 
       content_tag(:select, countries.html_safe, html_options)
     end
+
+    private
+      def normalize_translation(translation)
+        UnicodeUtils.canonical_decomposition(translation).split('').select do |c|
+          UnicodeUtils.general_category(c) =~ /Letter|Separator|Punctuation|Number/
+        end.join
+      end
   end
 end

data/lib/i18n_country_select/version.rb

@@ -1,3 +1,3 @@
 module I18nCountrySelect
-  VERSION = "1.0.17"
+  VERSION = "1.0.18"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n_country_select
 version: !ruby/object:Gem::Version
-  version: 1.0.17
+  version: 1.0.18
 platform: ruby
 authors:
 - Brian McQuay (brian@onomojo.com)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-05 00:00:00.000000000 Z
+date: 2013-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.0.9
 - !ruby/object:Gem::Dependency
-  name: sort_alphabetical
+  name: unicode_utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -128,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.5
 requirements: []
 rubyforge_project: '[none]'
-rubygems_version: 2.0.7
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: I18n country select helper