grosser-fast_gettext 0.3.4 → 0.3.5

data/README.markdown

@@ -64,7 +64,7 @@ and do not need to be readded for every thread (parsing takes time...).
 Try the [gettext_i18n_rails plugin](http://github.com/grosser/gettext_i18n_rails), it simplifies the setup.
 
 Setting `available_locales`,`text_domain` or `locale` will not work inside the `evironment.rb`, since it runs in a different thread
-then e.g. controllers, so set them inside your application_controller.
+then e.g. controllers, so set them inside your application_controller.  
 
     #environment.rb after initializers
     FastGettext.add_text_domain('accounting',:path=>'locale')
@@ -96,6 +96,10 @@ Advanced features
 Pluralisation rules can be set directly via a lambda (see code/specs), or by using the Gettext
 plural definition (see spec/locale/en/test_plural.po or [Plural expressions for all languages](http://translate.sourceforge.net/wiki/l10n/pluralforms).
 
+###default_text_domain
+If you only use one text domain, setting `FastGettext.default_text_domain = 'app'`
+is sufficient and no more `text_domain=` is needed
+
 ###Plugins
 Want a yml, xml, database version ?
 Write your own TranslationRepository!

data/VERSION.yml

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

data/lib/fast_gettext/storage.rb

@@ -10,7 +10,7 @@ module FastGettext
       end
     end
 
-    [:available_locales,:text_domain,:_locale,:current_cache].each do |method_name|
+    [:available_locales,:_locale,:current_cache].each do |method_name|
       key = "fast_gettext_#{method_name}".to_sym
       define_method method_name do
         Thread.current[key]
@@ -23,11 +23,26 @@ module FastGettext
     #so initial translations does not crash
     Thread.current[:fast_gettext_current_cache]={}
 
+    def text_domain
+      Thread.current[:fast_gettext_text_domain] || default_text_domain
+    end
+
     def text_domain=(new_domain)
       Thread.current[:fast_gettext_text_domain]=new_domain
       update_current_cache
     end
 
+    #-> cattr_accessor :default_text_domain
+    @@default_text_domain = nil
+    def default_text_domain=(domain)
+      @@default_text_domain = domain
+      update_current_cache
+    end
+
+    def default_text_domain
+      @@default_text_domain
+    end
+
     #global, since re-parsing whole folders takes too much time...
     @@translation_repositories={}
     def translation_repositories

data/spec/fast_gettext/storage_spec.rb

@@ -4,11 +4,15 @@ require File.join(current_folder,'..','spec_helper')
 include FastGettext::Storage
 
 describe 'Storage' do
+  before do
+    self.default_text_domain = nil
+  end
+
   def thread_save(method)
     send("#{method}=",'de')
 
     # mess around with other threads
-    100.times do |i|
+    100.times do
       Thread.new {FastGettext.send("#{method}=",'en')}
     end
     
@@ -28,35 +32,62 @@ describe 'Storage' do
     self.translation_repositories[:x].should == 2
   end
 
+  describe :default_text_domain do
+    it "stores default_text_domain non-thread-safe" do
+      self.default_text_domain=1
+      t = Thread.new{self.default_text_domain=2}
+      t.join
+      self.default_text_domain.should == 2
+    end
+
+    it "uses default_text_domain when text_domain is not set" do
+      self.text_domain = nil
+      self.default_text_domain = 'x'
+      text_domain.should == 'x'
+    end
+
+    it "does not use default when domain is set" do
+      self.text_domain = 'x'
+      self.default_text_domain = 'y'
+      text_domain.should == 'x'
+    end
+  end
+
   describe :locale do
     it "stores everything as long as available_locales is not set" do
       self.available_locales = nil
       self.locale = 'XXX'
       locale.should == 'XXX'
     end
+
     it "is en if no locale and no available_locale were set" do
       FastGettext.send(:_locale=,nil)
       self.available_locales = nil
       locale.should == 'en'
     end
+
     it "does not change the locale if locales was called with nil" do
       self.locale = nil
       locale.should == 'en'
     end
+
     it "is the first available_locale if one was set" do
       self.available_locales = ['de']
       locale.should == 'de'
     end
+
     it "does not store a locale if it is not available" do
       self.available_locales = ['de']
       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
+
     {
       'Opera' => "de-DE,de;q=0.9,en;q=0.8",
       'Firefox' => "de-de,de;q=0.8,en-us;q=0.5,en;q=0.3",
@@ -68,11 +99,13 @@ describe 'Storage' do
         FastGettext.locale.should == 'de_DE'
       end
     end
+
     it "sets a unimportant locale if it is the only available" do
       FastGettext.available_locales = ['en','xx']
       FastGettext.locale = "de-de,de;q=0.8,en-us;q=0.5,en;q=0.3"
       FastGettext.locale.should == 'en'
     end
+
     it "sets locale from comma seperated" do
       FastGettext.available_locales = ['de_DE','en','xx']
       FastGettext.locale = "de,de-de,en"
@@ -84,6 +117,7 @@ describe 'Storage' do
     before do
       FastGettext.text_domain = 'xxx'
     end
+
     it "raises when a textdomain was empty" do
       begin 
         FastGettext._('x')
@@ -91,7 +125,7 @@ describe 'Storage' do
       rescue FastGettext::Storage::NoTextDomainConfigured
       end
     end
-    
+
     it "can silence erros" do
       FastGettext.silence_errors
       FastGettext._('x').should == 'x'
@@ -100,16 +134,30 @@ describe 'Storage' do
 
   describe :current_cache do
     before do
+      FastGettext.text_domain = 'xxx'
       FastGettext.available_locales = ['de','en']
       FastGettext.locale = 'de'
       FastGettext._('abc')
       FastGettext.locale = 'en'
     end
 
-    it "stores a translation seperatly" do
+    it "stores a translation seperate by locale" do
       FastGettext.current_cache['abc'].should == nil
     end
 
+    it "stores a translation seperate by domain" do
+      FastGettext.locale = 'de'
+      FastGettext.text_domain = nil
+      FastGettext.current_cache['abc'].should == nil
+    end
+
+    it "cache is restored through setting of default_text_domain" do
+      FastGettext.locale = 'de'
+      FastGettext.text_domain = nil
+      FastGettext.default_text_domain = 'xxx'
+      FastGettext.current_cache['abc'].should == 'abc'
+    end
+
     it "stores a translation permanently" do
       FastGettext.locale = 'de'
       FastGettext.current_cache['abc'].should == 'abc'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: grosser-fast_gettext
 version: !ruby/object:Gem::Version 
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors: 
 - Michael Grosser