i18n_data 0.2.6 → 0.2.7

data/Rakefile

@@ -85,5 +85,5 @@ begin
 
   Jeweler::GemcutterTasks.new
 rescue LoadError
-  puts "Jeweler, or one of its dependencies, is not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+  puts "Jeweler, or one of its dependencies, is not available. Install it with: sudo gem install jeweler"
 end

data/VERSION

@@ -1 +1 @@
-0.2.6
+0.2.7

data/i18n_data.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{i18n_data}
-  s.version = "0.2.6"
+  s.version = "0.2.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2009-12-13}
+  s.date = %q{2010-03-22}
   s.email = %q{grosser.michael@gmail.com}
   s.extra_rdoc_files = [
     "README.markdown"
@@ -190,7 +190,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/grosser/i18n_data}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{country/language names and 2-letter-code pairs, in 85 languages}
   s.test_files = [
     "spec/spec_helper.rb",

data/lib/i18n_data/file_data_provider.rb

@@ -4,8 +4,8 @@ module I18nData
     extend self
 
     def codes(type, language_code)
-      unless data = read_from_file(type, language_code)
-        raise NoTranslationAvailable.new("#{type}-#{language_code}")
+      unless data = read_from_file(cache_file_for(type, language_code))
+        raise NoTranslationAvailable, "#{type}-#{language_code}"
       end
       data
     end
@@ -16,7 +16,7 @@ module I18nData
         [:languages, :countries].each do |type|
           begin
             data = provider.send(:codes, type, language_code)
-            write_to_file(data, type, language_code)
+            write_to_file(data, cache_file_for(type, language_code))
           rescue NoTranslationAvailable
           end
         end
@@ -25,31 +25,26 @@ module I18nData
 
   private
 
-    def read_from_file(type, language_code)
-      file = cache_for(type, language_code)
+    def read_from_file(file)
       return nil unless File.exist?(file)
       data = {}
-      IO.read(file).split("\n").each do |line|
-        code, translation = line.split(DATA_SEPERATOR)
+      File.readlines(file).each do |line|
+        code, translation = line.strip.split(DATA_SEPERATOR, 2)
         data[code] = translation
       end
       data
     end
 
-    def write_to_file(data, type, language_code)
+    def write_to_file(data, file)
       return if data.empty?
-      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.write data.map{|code, translation| "#{code}#{DATA_SEPERATOR}#{translation}" } * "\n"
       end
     end
 
-    def cache_for(type,language_code)
-      cache "#{type}-#{language_code}"
-    end
-
-    def cache(file)
+    def cache_file_for(type,language_code)
+      file = "#{type}-#{language_code}"
       File.join(File.dirname(__FILE__), '..', '..', 'cache', 'file_data_provider', "#{file}.txt")
     end
   end

data/lib/i18n_data/live_data_provider.rb

@@ -33,14 +33,14 @@ module I18nData
 
     def translate(type, language, to_language_code)
       translated = translations(type, to_language_code)[language]
-      translated.blank? ? nil : translated
+      translated.to_s.empty? ? nil : translated
     end
 
     def translated(type, language_code)
       translations = {}
       send("english_#{type}").each do |code,name|
         translation = translate(type, name, language_code)
-        translations[code] = translation ? translation : name
+        translations[code] = translation || name
       end
       translations
     end
@@ -51,7 +51,7 @@ module I18nData
         url = TRANSLATIONS[type]+"#{language_code.downcase}.po"
         data = open(url).readlines
       rescue
-        raise NoTranslationAvailable.new("for #{type} and language code = #{language_code}")
+        raise NoTranslationAvailable, "for #{type} and language code = #{language_code}"
       end
 
       po_to_hash data

data/lib/i18n_data.rb

@@ -1,5 +1,3 @@
-require 'active_support'
-
 module I18nData
   VERSION = File.read( File.join(File.dirname(__FILE__), '..', 'VERSION') ).strip
   
@@ -38,10 +36,17 @@ module I18nData
 
   def recognise_code(type, search)
     search = search.strip
-    languages.keys.each do |code|
+
+    # common languages first <-> faster in majority of cases
+    common_languages = ['EN','ES','FR','DE','ZH']
+    langs = (common_languages + (languages.keys - common_languages))
+    
+    langs.each do |code|
       begin
         send(type, code).each do |code, name|
-          return code if search == name
+          # supports "Dutch" and "Dutch; Flemish", checks for inclusion first -> faster
+          match_found = (name.include?(search) and name.split(';').map{|s| s.strip }.include?(search))
+          return code if match_found
         end
       rescue NoTranslationAvailable
       end

data/spec/i18n_data/file_data_provider_spec.rb

@@ -3,7 +3,8 @@ require 'i18n_data/file_data_provider'
 
 describe I18nData::FileDataProvider do
   before do
-    `rm -f #{I18nData::FileDataProvider.send(:cache_for,"XX","YY")}`
+    @cache_file = I18nData::FileDataProvider.send(:cache_file_for,"XX","YY")
+    `rm -f #{@cache_file}`
   end
 
   def read(x,y)
@@ -12,12 +13,12 @@ describe I18nData::FileDataProvider do
 
   it "preserves data when writing and then reading" do
     data = {"x"=>"y","z"=>"w"}
-    I18nData::FileDataProvider.send(:write_to_file,data,"XX","YY")
+    I18nData::FileDataProvider.send(:write_to_file, data, @cache_file)
     read("XX","YY").should == data
   end
 
   it "does not write empty data sets" do
-    I18nData::FileDataProvider.send(:write_to_file,{},"XX","YY")
+    I18nData::FileDataProvider.send(:write_to_file,{}, @cache_file)
     lambda{read("XX","YY")}.should raise_error I18nData::NoTranslationAvailable
   end
 end

data/spec/i18n_data_spec.rb

@@ -7,6 +7,10 @@ describe I18nData do
   require "i18n_data/live_data_provider"
   require "i18n_data/file_data_provider"
 
+  def blank_keys_or_values(hash)
+    hash.detect{|k,v| k.to_s.empty? or v.to_s.empty?}
+  end
+
   providers =   [I18nData::FileDataProvider]
   providers << I18nData::LiveDataProvider unless ENV['RUN_CODE_RUN']
   providers.each do |provider|
@@ -22,7 +26,7 @@ describe I18nData do
 
         describe :english do
           it "does not contain blanks" do
-            I18nData.languages.detect {|k,v| k.blank? or v.blank?}.should == nil
+            blank_keys_or_values(I18nData.languages).should == nil
           end
 
           it "has english as default" do
@@ -48,7 +52,7 @@ describe I18nData do
           end
 
           it "does not contain blanks" do
-            I18nData.languages('GL').detect {|k,v| k.blank? or v.blank?}.should == nil
+            blank_keys_or_values(I18nData.languages('GL')).should == nil
           end
 
           it "is written in unicode" do
@@ -64,7 +68,7 @@ describe I18nData do
           end
 
           it "does not contain blanks" do
-            I18nData.countries.detect {|k,v| k.blank? or v.blank?}.should == nil
+            blank_keys_or_values(I18nData.countries).should == nil
           end
 
           it "contains all countries" do
@@ -86,7 +90,7 @@ describe I18nData do
           end
 
           it "does not contain blanks" do
-            I18nData.countries('GL').detect {|k,v| k.blank? or v.blank?}.should == nil
+            blank_keys_or_values(I18nData.countries('GL')).should == nil
           end
 
           it "is written in unicode" do
@@ -95,41 +99,46 @@ describe I18nData do
         end
       end
     end
+  end
 
-    describe :country_code do
-      before :all do
-        I18nData.data_provider = I18nData::FileDataProvider
-      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 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 "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
+    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
+  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 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 "recognizes languages that are ; seperated" do
+      I18nData.language_code('Dutch').should == 'NL'
+      I18nData.language_code('Flemish').should == 'NL'
+    end
 
-      it "returns nil when it cannot recognise" do
-        I18nData.language_code('XY').should == nil
-      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
 

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: i18n_data
 version: !ruby/object:Gem::Version 
-  version: 0.2.6
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 7
+  version: 0.2.7
 platform: ruby
 authors: 
 - Michael Grosser
@@ -9,19 +14,21 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-13 00:00:00 +01:00
+date: 2010-03-22 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 description: 
 email: grosser.michael@gmail.com
 executables: []
@@ -215,18 +222,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: country/language names and 2-letter-code pairs, in 85 languages