grosser-fast_gettext 0.2.5 → 0.2.6

data/README.markdown

@@ -1,6 +1,6 @@
 FastGettext
 ===========
-GetText but 4 times faster, simple, clean namespace (7 vs 34) and threadsave!
+GetText but 8.21 times faster, simple, clean namespace (7 vs 34) and threadsave!
 
 Setup
 =====
@@ -27,32 +27,30 @@ Speed
 50_000 translations:
 Ideal: (primitive Hash lookup)
     small translation file:
-    1.100000   0.180000   1.280000 (  1.287230)
+    1.080000   0.190000   1.270000 (  1.274699)
     mapped: 5832K    writeable/private: 3016K    shared: 28K
 
     large translation file:
-    1.150000   0.150000   1.300000 (  1.296114)
+    1.110000   0.200000   1.310000 (  1.305616)
     mapped: 5832K    writeable/private: 3016K    shared: 28K
 
 FastGettext:
     small translation file:
-    3.980000   0.430000   4.410000 (  4.407260)
+    1.980000   0.310000   2.290000 (  2.285980)
     mapped: 5852K    writeable/private: 3036K    shared: 28K
 
     large translation file:
-    4.070000   0.450000   4.520000 (  4.515585)
-    mapped: 5972K    writeable/private: 3156K    shared: 28K
+    1.990000   0.320000   2.310000 (  2.318801)
+    mapped: 5852K    writeable/private: 3036K    shared: 28K
 
 GetText:
     small translation file:
-    16.280000   1.340000  17.620000 ( 17.630391)
-    mapped: 8976K    writeable/private: 5944K    shared: 28K
+    16.210000   1.290000  17.500000 ( 17.511050)
+    mapped: 8908K    writeable/private: 5876K    shared: 28K
 
     large translation file:
-    16.590000   1.430000  18.020000 ( 18.042926)
-    mapped: 9024K    writeable/private: 5992K    shared: 28K
-
-
+    16.340000   1.330000  17.670000 ( 17.679807)
+    mapped: 9028K    writeable/private: 5996K    shared: 28K
 
 Thread Safety and Rails
 =======================

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 2
-:patch: 5
+:patch: 6
 :major: 0

data/lib/fast_gettext.rb

@@ -5,11 +5,7 @@ require File.join(File.dirname(__FILE__),'..','vendor','string')
 
 module FastGettext
   include FastGettext::Storage
-  
   extend self
-  def self.included(mod)  #:nodoc:
-    mod.extend self
-  end
 
   LOCALE_REX =  /^[a-z]{2}$|^[a-z]{2}_[A-Z]{2}$/
   NAMESPACE_SEPERATOR = '|'

data/lib/fast_gettext/mo_file.rb

@@ -22,6 +22,10 @@ module FastGettext
       end
     end
 
+    def self.empty
+      MoFile.new(File.join(File.dirname(__FILE__),'..','..','vendor','empty.mo'))
+    end
+
     private
 
     #(if plural==singular, prefer singular)

data/lib/fast_gettext/storage.rb

@@ -1,6 +1,8 @@
 module FastGettext
   module Storage
-    [:current_translations,:available_locales].each do |method|
+    class NoTextDomainConfigured < Exception;end
+
+    [:available_locales,:text_domain].each do |method|
       define_method method do
         thread_store(method)
       end
@@ -9,16 +11,22 @@ module FastGettext
       end
     end
 
+    # speed hack, twice as fast as
+    # Thread.current['FastGettext.'<<'current_translations']
+    Thread.current[:fast_gettext_current_translations] = NoTextDomainConfigured
+    def current_translations
+      Thread.current[:fast_gettext_current_translations]
+    end
+    def current_translations=x
+      Thread.current[:fast_gettext_current_translations]=x
+    end
+
     #global, since re-parsing whole folders takes too much time...
     @@text_domains={}
     def text_domains
       @@text_domains
     end
 
-    def text_domain
-      thread_store(:text_domain)
-    end
-
     def text_domain=(new_text_domain)
       write_thread_store(:text_domain,new_text_domain)
       update_current_translations
@@ -36,10 +44,22 @@ module FastGettext
       end
     end
 
+    # for chaining: puts set_locale('xx') == 'xx' ? 'applied' : 'rejected'
+    # returns the current locale, not the one that was supplied
+    # like locale=(), whoes behavior cannot be changed
+    def set_locale(new_locale)
+      self.locale = new_locale
+      locale
+    end
+
     private
 
     def update_current_translations
-      self.current_translations = text_domains[text_domain][:mo_files][locale] || {} if text_domains[text_domain]
+      if text_domains[text_domain]
+        self.current_translations = text_domains[text_domain][:mo_files][locale] || MoFile.empty
+      else
+        self.current_translations = NoTextDomainConfigured
+      end
     end
 
     def thread_store(key)

data/lib/fast_gettext/translation.rb

@@ -11,7 +11,7 @@ module FastGettext
       if translation = FastGettext.current_translations.plural(singular,plural,count)
         translation
       else
-        count > 1 ? plural : singular
+        count == 1 ? singular : plural
       end
     end
 

data/spec/aa_unconfigued_spec.rb

@@ -0,0 +1,23 @@
+require File.join(File.dirname(__FILE__),'spec_helper')
+
+describe 'unconfigured' do
+  it "gives a useful error message when trying to just translate" do
+    x=1
+    begin
+      FastGettext._('x')
+    rescue
+      x=$!
+    end
+    x.to_s.should =~ /NoTextDomainConfigured/
+  end
+  it "gives a useful error message when only locale was set" do
+    FastGettext.locale = 'de'
+    x=1
+    begin
+      FastGettext._('x')
+    rescue
+      x=$!
+    end
+    x.to_s.should =~ /NoTextDomainConfigured/
+  end
+end

data/spec/fast_gettext/storage_spec.rb

@@ -48,5 +48,10 @@ describe Storage do
       self.locale = 'en'
       locale.should == 'de'
     end
+    it "set_locale returns the old locale if the new could not be set" do
+      self.locale = 'de'
+      self.available_locales = ['de']
+      self.set_locale('en').should == 'de'
+    end
   end
 end

data/spec/fast_gettext/translation_spec.rb

@@ -4,11 +4,30 @@ require File.join(current_folder,'..','spec_helper')
 FastGettext.add_text_domain('test',:path=>File.join(File.dirname(__FILE__),'..','locale'))
 FastGettext.text_domain = 'test'
 FastGettext.available_locales = ['en','de']
-FastGettext.locale = 'de'
 
 include FastGettext::Translation
 
 describe FastGettext::Translation do
+  before do
+    FastGettext.available_locales = ['en','de']
+    FastGettext.locale = 'de'
+  end
+
+  describe "unknown locale" do
+    before do
+      FastGettext.available_locales = nil
+      FastGettext.locale = 'xx'
+    end
+
+    it "does not translate" do
+      _('car').should == 'car'
+    end
+
+    it "does not translate plurals" do
+      n_('car','cars',2).should == 'cars'
+    end
+  end
+
   describe :_ do
     it "translates simple text" do
       _('car').should == 'Auto'
@@ -22,6 +41,7 @@ describe FastGettext::Translation do
     it "translates pluralized" do
       n_('Axis','Axis',1).should == 'Achse'
       n_('Axis','Axis',2).should == 'Achsen'
+      n_('Axis','Axis',0).should == 'Achse'
     end
     it "returns the appropriate msgid if no translation was found" do
       n_('NOTFOUND','NOTFOUNDs',1).should == 'NOTFOUND'

data/spec/fast_gettext_spec.rb

@@ -9,6 +9,7 @@ include FastGettext
 
 describe FastGettext do
   it "provides access to FastGettext::Translations methods" do
+    FastGettext._('car').should == 'Auto'
     _('car').should == 'Auto'
     s_("XXX|not found").should == "not found"
     n_('Axis','Axis',1).should == 'Achse'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: grosser-fast_gettext
 version: !ruby/object:Gem::Version 
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors: 
 - Michael Grosser
@@ -25,6 +25,7 @@ files:
 - vendor/iconv.rb
 - vendor/string.rb
 - vendor/mofile.rb
+- vendor/empty.mo
 - vendor/README.rdoc
 - lib/fast_gettext.rb
 - lib/fast_gettext
@@ -44,6 +45,7 @@ files:
 - spec/fast_gettext/translation_spec.rb
 - spec/fast_gettext/storage_spec.rb
 - spec/fast_gettext/mo_file_spec.rb
+- spec/aa_unconfigued_spec.rb
 - spec/vendor
 - spec/vendor/iconv_spec.rb
 - spec/vendor/fake_load_path