i18n_data 0.2.4 → 0.2.5

data/cache/file_data_provider/languages-TH.txt

@@ -24,7 +24,7 @@ BG;;บัลแกเรีย
 PL;;โปแลนด์
 HE;;ฮีบรู
 NA;;นาอูรู
-BH;;พิหาร
+BH;;ภาษาปรากฤต
 MN;;มองโกเลีย
 VI;;เวียดนาม
 RW;;คินยาวันดา

data/cache/file_data_provider/languages-TI.txt

@@ -24,7 +24,7 @@ BG;;ቡልጋሪኛ
 PL;;ፖሊሽ
 HE;;ዕብራስጥ
 NA;;ናኡሩ
-BH;;ቢሃሪ
+BH;;ኮሪያኛ
 MN;;ሞንጎላዊኛ
 VI;;ቪትናምኛ
 RW;;ኪንያርዋንድኛ

data/cache/file_data_provider/languages-TR.txt

@@ -24,7 +24,7 @@ BG;;Bulgarca
 PL;;Polonyaca
 HE;;İbranice
 NA;;Nauru
-BH;;Bihari (Hindistan)
+BH;;Chamic dilleri (Malay)
 MN;;Moğol Dili
 VI;;Vietnamca
 RW;;Kinyarwanda

data/cache/file_data_provider/languages-TT.txt

@@ -24,7 +24,7 @@ BG;;Bulgarça
 PL;;Polça
 HE;;Yähüdçä
 NA;;Nauruça
-BH;;Biharça
+BH;;Ğosman telläre
 MN;;Moğolça
 VI;;Vietnamça
 RW;;Kinyarwandaça

data/cache/file_data_provider/languages-UK.txt

@@ -24,7 +24,7 @@ BG;;Болгарська
 PL;;Польська
 HE;;Давньоєврейська
 NA;;Науру
-BH;;Біхарі
+BH;;Хамітські мови
 MN;;Монгольська
 VI;;В'єтнамська
 RW;;Кіньяруанда

data/cache/file_data_provider/languages-VE.txt

@@ -24,7 +24,7 @@ BG;;Bulgarian
 PL;;Polish
 HE;;Hebrew
 NA;;Nauru
-BH;;Bihari
+BH;;Malagasy
 MN;;Mongolian
 VI;;Vietnamese
 RW;;Kinyarwanda

data/cache/file_data_provider/languages-VI.txt

@@ -24,7 +24,7 @@ BG;;Tiếng Bảo Gai Lơi
 PL;;Tiếng Ba Lan
 HE;;Tiếng Do Thái
 NA;;Tiếng Nau-ru
-BH;;Tiếng Bi-ha-ri
+BH;;Hệ ngôn ngữ Tai
 MN;;Tiếng Mông Cổ
 VI;;Tiếng Việt
 RW;;Tiếng Kin-ia-ouanh-đa

data/cache/file_data_provider/languages-WA.txt

@@ -24,7 +24,7 @@ BG;;Bulgåre
 PL;;Polonès
 HE;;Ebreu
 NA;;Nawouryin
-BH;;Bihari
+BH;;Lingaedjes toupi
 MN;;Mongol
 VI;;Vietnamyin
 RW;;Kinyarwanda

data/cache/file_data_provider/languages-XH.txt

@@ -24,7 +24,7 @@ BG;;isiBulgarian
 PL;;isiPolish
 HE;;isiHebhere
 NA;;Nauru
-BH;;isiThai
+BH;;isiBosnian
 MN;;isiMacedonian
 VI;;isiVietnamese
 RW;;Kinyarwanda

data/cache/file_data_provider/languages-ZU.txt

@@ -24,7 +24,7 @@ BG;;Isi-Buligariyana
 PL;;Isi-Pholishi
 HE;;Isi-Hebheru
 NA;;Nauru
-BH;;Isi-Thayi
+BH;;Isi-Koreyani
 MN;;Isi-Makhedoniya
 VI;;Isi-Vitheyinamise
 RW;;Kinyarwanda

data/i18n_data.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{i18n_data}
-  s.version = "0.2.4"
+  s.version = "0.2.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
@@ -92,6 +92,7 @@ Gem::Specification.new do |s|
      "cache/file_data_provider/countries-SV.txt",
      "cache/file_data_provider/countries-SW.txt",
      "cache/file_data_provider/countries-TA.txt",
+     "cache/file_data_provider/countries-TE.txt",
      "cache/file_data_provider/countries-TH.txt",
      "cache/file_data_provider/countries-TI.txt",
      "cache/file_data_provider/countries-TK.txt",
@@ -129,6 +130,7 @@ Gem::Specification.new do |s|
      "cache/file_data_provider/languages-FR.txt",
      "cache/file_data_provider/languages-GA.txt",
      "cache/file_data_provider/languages-GL.txt",
+     "cache/file_data_provider/languages-GU.txt",
      "cache/file_data_provider/languages-HE.txt",
      "cache/file_data_provider/languages-HI.txt",
      "cache/file_data_provider/languages-HR.txt",
@@ -150,6 +152,7 @@ Gem::Specification.new do |s|
      "cache/file_data_provider/languages-NL.txt",
      "cache/file_data_provider/languages-NN.txt",
      "cache/file_data_provider/languages-OC.txt",
+     "cache/file_data_provider/languages-PA.txt",
      "cache/file_data_provider/languages-PL.txt",
      "cache/file_data_provider/languages-PS.txt",
      "cache/file_data_provider/languages-PT.txt",

data/lib/i18n_data.rb

@@ -1,16 +1,24 @@
 require 'activesupport'
 
 module I18nData
-  VERSION = File.read( File.join(File.dirname(__FILE__),'..','VERSION') ).strip
+  VERSION = File.read( File.join(File.dirname(__FILE__), '..', 'VERSION') ).strip
   
   extend self
   
   def languages(language_code='EN')
-    data_provider.codes(:languages,language_code.to_s.upcase)
+    data_provider.codes(:languages, language_code.to_s.upcase)
   end
 
   def countries(language_code='EN')
-    data_provider.codes(:countries,language_code.to_s.upcase)
+    data_provider.codes(:countries, language_code.to_s.upcase)
+  end
+
+  def country_code(name)
+    recognise_code(:countries, name)
+  end
+
+  def language_code(name)
+    recognise_code(:languages, name)
   end
 
   def data_provider
@@ -25,6 +33,21 @@ module I18nData
   def data_provider=(provider)
     @data_provider = provider
   end
+
+  private
+
+  def recognise_code(type, search)
+    search = search.strip
+    languages.keys.each do |code|
+      begin
+        send(type, code).each do |code, name|
+          return code if search == name
+        end
+      rescue NoTranslationAvailable
+      end
+    end
+    nil
+  end
   
   class NoTranslationAvailable < Exception
     def to_s

data/lib/i18n_data/file_data_provider.rb

@@ -3,54 +3,54 @@ module I18nData
     DATA_SEPERATOR = ";;"
     extend self
 
-    def codes(type,language_code)
-      unless data = read_from_file(type,language_code)
+    def codes(type, language_code)
+      unless data = read_from_file(type, language_code)
         raise NoTranslationAvailable.new("#{type}-#{language_code}")
       end
       data
     end
 
     def write_cache(provider)
-      languages = provider.codes(:languages,'EN').keys
-      languages.each{|language_code|
-        [:languages,:countries].each {|type|
+      languages = provider.codes(:languages, 'EN').keys
+      languages.each do |language_code|
+        [:languages, :countries].each do |type|
           begin
-            data = provider.send(:codes,type,language_code)
-            write_to_file(data,type,language_code)
+            data = provider.send(:codes, type, language_code)
+            write_to_file(data, type, language_code)
           rescue NoTranslationAvailable
           end
-        }
-      }
+        end
+      end
     end
 
   private
 
-    def read_from_file(type,language_code)
-      file = cache_for(type,language_code)
+    def read_from_file(type, language_code)
+      file = cache_for(type, language_code)
       return nil unless File.exist?(file)
       data = {}
-      IO.read(file).split("\n").each{|line|
+      IO.read(file).split("\n").each do |line|
         code, translation = line.split(DATA_SEPERATOR)
         data[code] = translation
-      }
+      end
       data
     end
 
-    def write_to_file(data,type,language_code)
+    def write_to_file(data, type, language_code)
       return if data.empty?
-      file = cache_for(type,language_code)
-      FileUtils.mkdir_p(File.dirname(file))
+      file = cache_for(type, language_code)
+      FileUtils.mkdir_p File.dirname(file)
       File.open(file,'w') do |f|
-        f.puts data.map{|code,translation|"#{code}#{DATA_SEPERATOR}#{translation}"} * "\n"
+        f.puts data.map{|code, translation| "#{code}#{DATA_SEPERATOR}#{translation}" } * "\n"
       end
     end
 
     def cache_for(type,language_code)
-      cache("#{type}-#{language_code}")
+      cache "#{type}-#{language_code}"
     end
 
     def cache(file)
-      File.join(File.dirname(__FILE__),'..','..','cache','file_data_provider',"#{file}.txt")
+      File.join(File.dirname(__FILE__), '..', '..', 'cache', 'file_data_provider', "#{file}.txt")
     end
   end
 end

data/lib/i18n_data/live_data_provider.rb

@@ -8,60 +8,63 @@ module I18nData
   module LiveDataProvider
     extend ActiveSupport::Memoizable
     extend self
-    
+
+    ROOT = "http://git.debian.org/?p=iso-codes/iso-codes.git;a=blob_plain;f="
+
     XML_CODES = {
-      :countries => 'http://svn.debian.org/viewsvn/*checkout*/pkg-isocodes/trunk/iso-codes/iso_3166/iso_3166.xml',
-      :languages => 'http://svn.debian.org/viewsvn/*checkout*/pkg-isocodes/trunk/iso-codes/iso_639/iso_639.xml'
+      :countries => ROOT + 'iso_3166/iso_3166.xml',
+      :languages => ROOT + 'iso_639/iso_639.xml'
     }
     TRANSLATIONS = {
-      :languages => 'http://svn.debian.org/viewsvn/*checkout*/pkg-isocodes/trunk/iso-codes/iso_639/',
-      :countries => 'http://svn.debian.org/viewsvn/*checkout*/pkg-isocodes/trunk/iso-codes/iso_3166/'
+      :countries => ROOT + 'iso_3166/',
+      :languages => ROOT + 'iso_639/'
     }
 
-    def codes(type,language_code)
+    def codes(type, language_code)
       language_code = language_code.upcase
       if language_code == 'EN'
         send("english_#{type}")
       else
-        translated(type,language_code)
+        translated(type, language_code)
       end
     end
 
   private
 
-    def translate(type,language,to_language_code)
-      translated = translations(type,to_language_code)[language]
-      translated.to_s.empty? ? nil : translated
+    def translate(type, language, to_language_code)
+      translated = translations(type, to_language_code)[language]
+      translated.blank? ? nil : translated
     end
 
-    def translated(type,language_code)
+    def translated(type, language_code)
       translations = {}
       send("english_#{type}").each do |code,name|
-        translation = translate(type,name,language_code)
+        translation = translate(type, name, language_code)
         translations[code] = translation ? translation : name
       end
       translations
     end
     memoize :translated
 
-    def translations(type,language_code)
+    def translations(type, language_code)
       begin
-        data = open(TRANSLATIONS[type]+"#{language_code.downcase}.po").readlines
+        url = TRANSLATIONS[type]+"#{language_code.downcase}.po"
+        data = open(url).readlines
       rescue
         raise NoTranslationAvailable.new("for #{type} and language code = #{language_code}")
       end
 
-      po_to_hash(data)
+      po_to_hash data
     end
     memoize :translations
 
     def english_languages
       codes = {}
       xml(:languages).elements.each('*/iso_639_entry') do |entry|
-        name = entry.attributes['name'].to_s.gsub("'","\\'")
+        name = entry.attributes['name'].to_s.gsub("'", "\\'")
         code = entry.attributes['iso_639_1_code'].to_s.upcase
         next if code.empty? or name.empty?
-        codes[code]=name
+        codes[code] = name
       end
       codes
     end
@@ -70,17 +73,17 @@ module I18nData
     def english_countries
       codes = {}
       xml(:countries).elements.each('*/iso_3166_entry') do |entry|
-        name = entry.attributes['name'].to_s.gsub("'","\\'")
+        name = entry.attributes['name'].to_s.gsub("'", "\\'")
         code = entry.attributes['alpha_2_code'].to_s.upcase
-        codes[code]=name
+        codes[code] = name
       end
       codes
     end
     memoize :english_countries
 
     def po_to_hash(data)
-      names = data.select{|l| l =~ /^msgid/}.map{|line| line.match(/^msgid "(.*?)"/)[1]}
-      translations = data.select{|l| l =~ /^msgstr/}.map{|line| line.match(/^msgstr "(.*?)"/)[1]}
+      names = data.select{|l| l =~ /^msgid/ }.map{|line| line.match(/^msgid "(.*?)"/)[1] }
+      translations = data.select{|l| l =~ /^msgstr/ }.map{|line| line.match(/^msgstr "(.*?)"/)[1] }
 
       translated = {}
       names.each_with_index do |name,index|

data/spec/i18n_data_spec.rb

@@ -93,6 +93,42 @@ describe I18nData do
         end
       end
     end
+
+    describe :country_code do
+      before :all do
+        I18nData.data_provider = I18nData::FileDataProvider
+      end
+
+      it "recognises a countries name" do
+        I18nData.country_code('Germany').should == 'DE'
+      end
+
+      it "recognises with blanks" do
+        I18nData.country_code("   Germany \n\r ").should == 'DE'
+      end
+
+      it "returns nil when it cannot recognise" do
+        I18nData.country_code('XY').should == nil
+      end
+    end
+
+    describe :language_code do
+      before :all do
+        I18nData.data_provider = I18nData::FileDataProvider
+      end
+
+      it "recognises a countries name" do
+        I18nData.language_code('Deutsch').should == 'DE'
+      end
+
+      it "recognises with blanks" do
+        I18nData.language_code("   Deutsch \n\r ").should == 'DE'
+      end
+
+      it "returns nil when it cannot recognise" do
+        I18nData.language_code('XY').should == nil
+      end
+    end
   end
 
   it "has a VERSION" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: i18n_data
 version: !ruby/object:Gem::Version 
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors: 
 - Michael Grosser
@@ -108,6 +108,7 @@ files:
 - cache/file_data_provider/countries-SV.txt
 - cache/file_data_provider/countries-SW.txt
 - cache/file_data_provider/countries-TA.txt
+- cache/file_data_provider/countries-TE.txt
 - cache/file_data_provider/countries-TH.txt
 - cache/file_data_provider/countries-TI.txt
 - cache/file_data_provider/countries-TK.txt
@@ -145,6 +146,7 @@ files:
 - cache/file_data_provider/languages-FR.txt
 - cache/file_data_provider/languages-GA.txt
 - cache/file_data_provider/languages-GL.txt
+- cache/file_data_provider/languages-GU.txt
 - cache/file_data_provider/languages-HE.txt
 - cache/file_data_provider/languages-HI.txt
 - cache/file_data_provider/languages-HR.txt
@@ -166,6 +168,7 @@ files:
 - cache/file_data_provider/languages-NL.txt
 - cache/file_data_provider/languages-NN.txt
 - cache/file_data_provider/languages-OC.txt
+- cache/file_data_provider/languages-PA.txt
 - cache/file_data_provider/languages-PL.txt
 - cache/file_data_provider/languages-PS.txt
 - cache/file_data_provider/languages-PT.txt