countries_and_languages 0.1.4 → 0.1.5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    countries_and_languages (0.1.4)
+    countries_and_languages (0.1.5)
       i18n_data
 
 GEM
@@ -29,8 +29,7 @@ GEM
     erubis (2.7.0)
     hike (1.2.1)
     i18n (0.6.0)
-    i18n_data (0.2.8)
-      activesupport (>= 2.2)
+    i18n_data (0.3.1)
     multi_json (1.0.3)
     rack (1.3.5)
     rack-cache (1.1)

data/lib/countries_and_languages.rb

@@ -25,8 +25,9 @@ module CountriesAndLanguages
   end
 
   def clean_and_sort(data)
-    data = data.to_a.sort_by{|code,name| convert_umlaut_to_base(name)}
-    data.map!{|code,name|[clean_name(name),code]}
+    data = data.to_a
+    data.map!{|code,name| [clean_name(name), code] }
+    data.sort_by{|code,name| convert_umlaut_to_base(code) }
   end
 
   def clean_name(name)
@@ -41,11 +42,23 @@ module CountriesAndLanguages
     name
   end
 
+  CONVERSIONS = [
+    ['áä', 'a'],
+    ['ÁÄÅ', 'A'],
+    ['óö', 'o'],
+    ['ÓÖ', 'O'],
+    ['í', 'i'],
+    ['Í', 'I'],
+    ['úü', 'u'],
+    ['ÚÜ', 'U'],
+    ['é', 'e'],
+    ['É', 'E'],
+    ['ß', 's'],
+  ]
+
   def convert_umlaut_to_base(input)
-    $KCODE='u' if RUBY_VERSION < '1.9'
-    %w(aáä AÁÄÅ oóö OÓÖ ií IÍ uúü UÚÜ eé EÉ sß).inject(input.dup) do |input, set|
-      to, *from = set.split('')
-      input.gsub(/[#{from}]/, to)
-    end
+    input = input.dup
+    CONVERSIONS.each { |from, to| input.tr!(from, to) }
+    input
   end
 end

data/lib/countries_and_languages/version.rb

@@ -1,3 +1,3 @@
 module CountriesAndLanguages
-  VERSION = Version = '0.1.4'
+  VERSION = Version = '0.1.5'
 end

data/spec/countries_and_languages_spec.rb

@@ -8,7 +8,10 @@ describe CountriesAndLanguages do
     I18n.locale = :en
   end
 
-  {:country=>['Germany','Deutschland'],:language=>['German','Deutsch']}.each do |method,translation|
+  {
+    :country => ['Germany','Deutschland'],
+    :language => ['German','Deutsch']
+  }.each do |method,translation|
     it "translates #{method}" do
       send(method,'DE').should == translation[0]
       I18n.locale = :de
@@ -20,15 +23,17 @@ describe CountriesAndLanguages do
     end
   end
 
-  describe 'clean names' do
+  describe "clean names" do
     it "removes everything in braces" do
       country('va').should == 'Holy See'
       language('IA').should == 'Interlingua'
     end
+
     it "removes everything behind comma" do
       country('IR').should == 'Iran'
       language('ND').should == 'Ndebele'
     end
+
     it "removes everything behind semicolon" do
       language('nb').should == 'Bokmål'
       language('ca').should == 'Catalan'
@@ -37,25 +42,28 @@ describe CountriesAndLanguages do
 
   it "sorts umlaut-aware" do
     I18n.locale = :de
-    countries[1][0].should == 'Ägypten'
+    countries.map(&:first)[0..5].should == ["Afghanistan", "Ägypten", "Åland-Inseln", "Albanien", "Algerien", "Amerikanische Jungferninseln"]
   end
 
-  describe 'misc fixes' do
-    describe 'German' do
+  describe "misc fixes" do
+    describe "German" do
       before {I18n.locale = :de}
+
       it "removes -Sprache aditions" do
         language('ZU').should == "Zulu"
       end
+
       it "knows Kongo" do
         country('CD').should == 'Kongo'
       end
+
       it "knows Lao" do
         country('LA').should == 'Lao'
       end
     end
   end
 
-  describe :select_tag do
+  describe "#select_tag" do
     def h
       ActionController::Base.helpers
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: countries_and_languages
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-20 00:00:00.000000000 Z
+date: 2012-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n_data
@@ -59,7 +59,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4092638733407512705
+      hash: 4563603787577617020
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -68,7 +68,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4092638733407512705
+      hash: 4563603787577617020
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24