i18n_data 0.3.3 → 0.4.0

data/Gemfile

@@ -1,5 +1,6 @@
 source :rubygems
 gemspec
 
+gem "bump"
 gem "rake"
 gem "rspec", "~>2"

data/Gemfile.lock

@@ -1,26 +1,28 @@
 PATH
   remote: .
   specs:
-    i18n_data (0.3.3)
+    i18n_data (0.4.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
+    bump (0.3.9)
     diff-lcs (1.1.3)
-    rake (0.9.2.2)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
+    rake (10.0.3)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.2)
+    rspec-expectations (2.12.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.12.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  bump
   i18n_data!
   rake
   rspec (~> 2)

data/Rakefile

@@ -1,4 +1,5 @@
 require 'bundler/gem_tasks'
+require 'bump/tasks'
 $LOAD_PATH << "lib"
 require 'i18n_data'
 
@@ -74,20 +75,3 @@ task :write_cache_for_file_data_provider do
   puts "writing new caches, this can take a few minutes..."
   I18nData::FileDataProvider.write_cache(I18nData::LiveDataProvider)
 end
-
-# extracted from https://github.com/grosser/project_template
-rule /^version:bump:.*/ do |t|
-  sh "git status | grep 'nothing to commit'" # ensure we are not dirty
-  index = ['major', 'minor','patch'].index(t.name.split(':').last)
-  file = 'lib/i18n_data/version.rb'
-
-  version_file = File.read(file)
-  old_version, *version_parts = version_file.match(/(\d+)\.(\d+)\.(\d+)/).to_a
-  version_parts[index] = version_parts[index].to_i + 1
-  version_parts[2] = 0 if index < 2 # remove patch for minor
-  version_parts[1] = 0 if index < 1 # remove minor for major
-  new_version = version_parts * '.'
-  File.open(file,'w'){|f| f.write(version_file.sub(old_version, new_version)) }
-
-  sh "bundle && git add #{file} Gemfile.lock && git commit -m 'bump version to #{new_version}'"
-end

data/Readme.md

@@ -57,5 +57,5 @@ Author
 [Michael Grosser](http://grosser.it)<br/>
 michael@grosser.it<br/>
 License: MIT<br/>
-[![Build Status](https://secure.travis-ci.org/grosser/i18n_data.png)](http://travis-ci.org/grosser/i18n_data)
+[![Build Status](https://travis-ci.org/grosser/i18n_data.png)](https://travis-ci.org/grosser/i18n_data)
 

data/gem-public_cert.pem

@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDMjCCAhqgAwIBAgIBADANBgkqhkiG9w0BAQUFADA/MRAwDgYDVQQDDAdtaWNo
+YWVsMRcwFQYKCZImiZPyLGQBGRYHZ3Jvc3NlcjESMBAGCgmSJomT8ixkARkWAml0
+MB4XDTEzMDIwMzE4MTMxMVoXDTE0MDIwMzE4MTMxMVowPzEQMA4GA1UEAwwHbWlj
+aGFlbDEXMBUGCgmSJomT8ixkARkWB2dyb3NzZXIxEjAQBgoJkiaJk/IsZAEZFgJp
+dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMorXo/hgbUq97+kII9H
+MsQcLdC/7wQ1ZP2OshVHPkeP0qH8MBHGg6eYisOX2ubNagF9YTCZWnhrdKrwpLOO
+cPLaZbjUjljJ3cQR3B8Yn1veV5IhG86QseTBjymzJWsLpqJ1UZGpfB9tXcsFtuxO
+6vHvcIHdzvc/OUkICttLbH+1qb6rsHUceqh+JrH4GrsJ5H4hAfIdyS2XMK7YRKbh
+h+IBu6dFWJJByzFsYmV1PDXln3UBmgAt65cmCu4qPfThioCGDzbSJrGDGLmw/pFX
+FPpVCm1zgYSb1v6Qnf3cgXa2f2wYGm17+zAVyIDpwryFru9yF/jJxE38z/DRsd9R
+/88CAwEAAaM5MDcwCQYDVR0TBAIwADAdBgNVHQ4EFgQUsiNnXHtKeMYYcr4yJVmQ
+WONL+IwwCwYDVR0PBAQDAgSwMA0GCSqGSIb3DQEBBQUAA4IBAQAlyN7kKo/NQCQ0
+AOzZLZ3WAePvStkCFIJ53tsv5Kyo4pMAllv+BgPzzBt7qi605mFSL6zBd9uLou+W
+Co3s48p1dy7CjjAfVQdmVNHF3MwXtfC2OEyvSQPi4xKR8iba8wa3xp9LVo1PuLpw
+/6DsrChWw74HfsJN6qJOK684hJeT8lBYAUfiC3wD0owoPSg+XtyAAddisR+KV5Y1
+NmVHuLtQcNTZy+gRht3ahJRMuC6QyLmkTsf+6MaenwAMkAgHdswGsJztOnNnBa3F
+y0kCSWmK6D+x/SbfS6r7Ke07MRqziJdB9GuE1+0cIRuFh8EQ+LN6HXCKM5pon/GU
+ycwMXfl0
+-----END CERTIFICATE-----

data/i18n_data.gemspec

@@ -6,7 +6,9 @@ Gem::Specification.new name, I18nData::VERSION do |s|
   s.summary = "country/language names and 2-letter-code pairs, in 85 languages"
   s.authors = ["Michael Grosser"]
   s.email = "michael@grosser.it"
-  s.homepage = "http://github.com/grosser/#{name}"
+  s.homepage = "https://github.com/grosser/#{name}"
   s.files = `git ls-files`.split("\n")
   s.license = "MIT"
+  s.signing_key = File.expand_path("~/.ssh/gem-private_key.pem")
+  s.cert_chain = ["gem-public_cert.pem"]
 end

data/lib/i18n_data/version.rb

@@ -1,3 +1,3 @@
 module I18nData
-  VERSION = Version = "0.3.3"
+  VERSION = Version = "0.4.0"
 end

data/lib/i18n_data.rb

@@ -1,71 +1,85 @@
 require 'i18n_data/version'
 
 module I18nData
-  extend self
-  
-  def languages(language_code='EN')
-    data_provider.codes(:languages, normal_to_region_code(language_code.to_s.upcase))
+  class NoTranslationAvailable < Exception
+    def to_s
+      "NoTranslationAvailable -- #{super}"
+    end
   end
 
-  def countries(language_code='EN')
-    data_provider.codes(:countries, normal_to_region_code(language_code.to_s.upcase))
-  end
+  class << self
+    def languages(language_code='EN')
+      fetch :languages, language_code do
+        data_provider.codes(:languages, normal_to_region_code(language_code.to_s.upcase))
+      end
+    end
 
-  def country_code(name)
-    recognise_code(:countries, name)
-  end
+    def countries(language_code='EN')
+      fetch :countries, language_code do
+        data_provider.codes(:countries, normal_to_region_code(language_code.to_s.upcase))
+      end
+    end
 
-  def language_code(name)
-    recognise_code(:languages, name)
-  end
+    def country_code(name)
+      recognise_code(:countries, name)
+    end
 
-  def data_provider
-    if @data_provider
-      @data_provider
-    else
-      require 'i18n_data/file_data_provider'
-      FileDataProvider
+    def language_code(name)
+      recognise_code(:languages, name)
     end
-  end
 
-  def data_provider=(provider)
-    @data_provider = provider
-  end
+    def data_provider
+      if @data_provider
+        @data_provider
+      else
+        require 'i18n_data/file_data_provider'
+        FileDataProvider
+      end
+    end
+
+    def data_provider=(provider)
+      @cache = nil
+      @data_provider = provider
+    end
 
-  private
+    private
 
-  # hardcode languages that do not have a default type
-  # e.g. zh does not exist, but zh_CN does
-  def normal_to_region_code(normal)
-    {
-      "ZH" => "zh_CN",
-      "BN" => "bn_IN",
-    }[normal] || normal
-  end
+    def fetch(*args)
+      @cache ||= {}
+      if @cache.key?(args)
+        @cache[args]
+      else
+        @cache[args] = yield
+      end
+    end
+
+    # hardcode languages that do not have a default type
+    # e.g. zh does not exist, but zh_CN does
+    def normal_to_region_code(normal)
+      {
+        "ZH" => "zh_CN",
+        "BN" => "bn_IN",
+      }[normal] || normal
+    end
+
+    def recognise_code(type, search)
+      search = search.strip
 
-  def recognise_code(type, search)
-    search = search.strip
+      # common languages first <-> faster in majority of cases
+      common_languages = ['EN','ES','FR','DE','ZH']
+      langs = (common_languages + (languages.keys - common_languages))
 
-    # 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|
-          # 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
+      langs.each do |code|
+        begin
+          send(type, code).each do |code, 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
-      rescue NoTranslationAvailable
       end
-    end
-    nil
-  end
-  
-  class NoTranslationAvailable < Exception
-    def to_s
-      "NoTranslationAvailable -- #{super}"
+      nil
     end
   end
 end

data/spec/i18n_data_spec.rb

@@ -18,12 +18,18 @@ describe I18nData do
         I18nData.data_provider = provider
       end
 
-      describe :languages do
+      describe ".languages" do
         it "raises NoTranslationAvailable for unavailable languages" do
           lambda{I18nData.languages('XX')}.should raise_error(I18nData::NoTranslationAvailable)
         end
 
-        describe :english do
+        it "is cached" do
+          id = I18nData.languages.object_id
+          I18nData.languages.object_id.should == id
+          I18nData.languages("DE").object_id.should_not == id
+        end
+
+        describe "english" do
           it "does not contain blanks" do
             blank_keys_or_values(I18nData.languages).should == nil
           end
@@ -37,7 +43,7 @@ describe I18nData do
           end
         end
 
-        describe :translated do
+        describe "translated" do
           it "is translated" do
             I18nData.languages('DE')['DE'].should == 'Deutsch'
           end
@@ -68,8 +74,14 @@ describe I18nData do
         end
       end
 
-      describe :countries do
-        describe :english do
+      describe ".countries" do
+        it "is cached" do
+          id = I18nData.countries.object_id
+          I18nData.countries.object_id.should == id
+          I18nData.countries("DE").object_id.should_not == id
+        end
+
+        describe "english" do
           it "has english as default" do
             I18nData.countries['DE'].should == 'Germany'
           end
@@ -83,7 +95,7 @@ describe I18nData do
           end
         end
 
-        describe :translated do
+        describe "translated" do
           it "is translated" do
             I18nData.countries('DE')['DE'].should == 'Deutschland'
           end

data.tar.gz.sig

@@ -0,0 +1,2 @@
+��!��;�1��
����җ�����.�z��FmP�;0[��fIb
u��=�]^}Y4�(�T)s���l��6b�{��`!�����nX_n�%ҏd��/�GI�,�%Z��jDH��:�����4���fwE�u�<a1<�LE���C���\��yޮ
(�������ȵ�
+��!/�H���"y/�ӣ�{	k,���s�w�}}F�
���EXu,�'��5�tctB������r�M��',����!

metadata

@@ -1,15 +1,42 @@
 --- !ruby/object:Gem::Specification
 name: i18n_data
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
-cert_chain: []
-date: 2012-09-25 00:00:00.000000000 Z
+cert_chain:
+- !binary |-
+  LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURNakNDQWhxZ0F3SUJB
+  Z0lCQURBTkJna3Foa2lHOXcwQkFRVUZBREEvTVJBd0RnWURWUVFEREFkdGFX
+  Tm8KWVdWc01SY3dGUVlLQ1pJbWlaUHlMR1FCR1JZSFozSnZjM05sY2pFU01C
+  QUdDZ21TSm9tVDhpeGtBUmtXQW1sMApNQjRYRFRFek1ESXdNekU0TVRNeE1W
+  b1hEVEUwTURJd016RTRNVE14TVZvd1B6RVFNQTRHQTFVRUF3d0hiV2xqCmFH
+  RmxiREVYTUJVR0NnbVNKb21UOGl4a0FSa1dCMmR5YjNOelpYSXhFakFRQmdv
+  SmtpYUprL0lzWkFFWkZnSnAKZERDQ0FTSXdEUVlKS29aSWh2Y05BUUVCQlFB
+  RGdnRVBBRENDQVFvQ2dnRUJBTW9yWG8vaGdiVXE5NytrSUk5SApNc1FjTGRD
+  Lzd3UTFaUDJPc2hWSFBrZVAwcUg4TUJIR2c2ZVlpc09YMnViTmFnRjlZVENa
+  V25ocmRLcndwTE9PCmNQTGFaYmpVamxqSjNjUVIzQjhZbjF2ZVY1SWhHODZR
+  c2VUQmp5bXpKV3NMcHFKMVVaR3BmQjl0WGNzRnR1eE8KNnZIdmNJSGR6dmMv
+  T1VrSUN0dExiSCsxcWI2cnNIVWNlcWgrSnJINEdyc0o1SDRoQWZJZHlTMlhN
+  SzdZUktiaApoK0lCdTZkRldKSkJ5ekZzWW1WMVBEWGxuM1VCbWdBdDY1Y21D
+  dTRxUGZUaGlvQ0dEemJTSnJHREdMbXcvcEZYCkZQcFZDbTF6Z1lTYjF2NlFu
+  ZjNjZ1hhMmYyd1lHbTE3K3pBVnlJRHB3cnlGcnU5eUYvakp4RTM4ei9EUnNk
+  OVIKLzg4Q0F3RUFBYU01TURjd0NRWURWUjBUQkFJd0FEQWRCZ05WSFE0RUZn
+  UVVzaU5uWEh0S2VNWVljcjR5SlZtUQpXT05MK0l3d0N3WURWUjBQQkFRREFn
+  U3dNQTBHQ1NxR1NJYjNEUUVCQlFVQUE0SUJBUUFseU43a0tvL05RQ1EwCkFP
+  elpMWjNXQWVQdlN0a0NGSUo1M3RzdjVLeW80cE1BbGx2K0JnUHp6QnQ3cWk2
+  MDVtRlNMNnpCZDl1TG91K1cKQ28zczQ4cDFkeTdDampBZlZRZG1WTkhGM013
+  WHRmQzJPRXl2U1FQaTR4S1I4aWJhOHdhM3hwOUxWbzFQdUxwdwovNkRzckNo
+  V3c3NEhmc0pONnFKT0s2ODRoSmVUOGxCWUFVZmlDM3dEMG93b1BTZytYdHlB
+  QWRkaXNSK0tWNVkxCk5tVkh1THRRY05UWnkrZ1JodDNhaEpSTXVDNlF5TG1r
+  VHNmKzZNYWVud0FNa0FnSGRzd0dzSnp0T25ObkJhM0YKeTBrQ1NXbUs2RCt4
+  L1NiZlM2cjdLZTA3TVJxemlKZEI5R3VFMSswY0lSdUZoOEVRK0xONkhYQ0tN
+  NXBvbi9HVQp5Y3dNWGZsMAotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
+date: 2013-02-13 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: michael@grosser.it
@@ -200,6 +227,7 @@ files:
 - example_output/all_names_for_FR.txt
 - example_output/all_names_for_GB.txt
 - example_output/all_names_for_US.txt
+- gem-public_cert.pem
 - i18n_data.gemspec
 - lib/i18n_data.rb
 - lib/i18n_data/file_data_provider.rb
@@ -209,7 +237,7 @@ files:
 - spec/i18n_data/live_data_provider_spec.rb
 - spec/i18n_data_spec.rb
 - spec/spec_helper.rb
-homepage: http://github.com/grosser/i18n_data
+homepage: https://github.com/grosser/i18n_data
 licenses:
 - MIT
 post_install_message: 
@@ -224,7 +252,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2858300428554998618
+      hash: 3936433807610975866
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -233,7 +261,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2858300428554998618
+      hash: 3936433807610975866
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24