grosser-fast_gettext 0.1.0 → 0.2.0

data/README.markdown

@@ -12,6 +12,7 @@ Tell Gettext where your mo-files lie:
 
 Choose text domain, and locale for translation
     FastGettext.text_domain = 'my_app'
+    FastGettext.available_locales = ['de','en','fr','en_US','en_UK'] # only allow these locales to be set (optional)
     FastGettext.locale = 'de'
 
 Start translating
@@ -21,11 +22,6 @@ Start translating
     s_('Namespace|no-found') == 'not-found'
     n_('Axis','Axis',3) == 'Achsen' #German plural of Axis
 
-Thread-safety
-=============
-locale/text_domain/available_locales are not shared between threads.  
-But text_domains is, so that found translations can be reused.
-
 Speed
 =====
 FastGettext
@@ -54,7 +50,7 @@ ATM you have to use the [original GetText](http://github.com/mutoh/gettext) to c
 
 Author
 ======
-Mofile parsing from Masao Mutoh, see vender/README
+Mofile parsing from Masao Mutoh, see vendor/README
 
 Michael Grosser  
 grosser.michael@gmail.com  

data/VERSION.yml

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

data/lib/fast_gettext/storage.rb

@@ -1,24 +1,30 @@
 module FastGettext
   module Storage
-    [:locale,:text_domain,:available_locales].each do |method|
-      key = "FastGettext.#{method}"
+    [:text_domain,:available_locales,:text_domains].each do |method|
       define_method method do
-        Thread.current[key]
+        thread_store(method)
       end
       define_method "#{method}=" do |value|
-        Thread.current[key] = value
+        write_thread_store(method,value)
       end
     end
 
-    #NOT THREADSAFE, for speed/caching
-    @@text_domains = {}
-    
-    def text_domains
-      @@text_domains
+    def locale
+      thread_store(:locale) || (available_locales||[]).first || 'en'
     end
 
-    def text_domains=(value)
-      @@text_domains=value
+    def locale=(value)
+      write_thread_store(:locale,value) if not available_locales or available_locales.include?(value)
+    end
+
+    private
+
+    def thread_store(key)
+      Thread.current["FastGettext.#{key}"]
+    end
+
+    def write_thread_store(key,value)
+      Thread.current["FastGettext.#{key}"]=value
     end
   end
 end

data/lib/fast_gettext.rb

@@ -1,5 +1,6 @@
 require 'fast_gettext/mo_file'
 require 'fast_gettext/storage'
+require File.join(File.dirname(__FILE__),'..','vendor','string')
 
 module FastGettext
   include FastGettext::Storage
@@ -35,6 +36,16 @@ module FastGettext
     end
   end
 
+  #tell gettext: this string need translation (will be found during parsing)
+  def N_(translate)
+    translate
+  end
+
+  #tell gettext: this string need translation (will be found during parsing)
+  def Nn_(singular,plural)
+    [singular,plural]
+  end
+
   def add_text_domain(name,options)
     self.text_domains ||= {}
     domain = self.text_domains[name] = {:path=>options.delete(:path),:mo_files=>{}}

data/spec/fast_gettext/storage_spec.rb

@@ -5,25 +5,41 @@ include FastGettext::Storage
 
 describe Storage do
   def thread_save(method)
-    send("#{method}=",1)
+    send("#{method}=",'de')
 
     # mess around with other threads
-    threads = []
     100.times do |i|
-      threads << Thread.new {send("#{method}=",i)}
+      Thread.new {FastGettext.send("#{method}=",'en')}
     end
-    threads.each(&:join)
     
-    send(method) == 1
+    send(method) == 'de'
   end
 
-  [:locale, :available_locales, :text_domain].each do |method|
+  [:locale, :available_locales, :text_domain, :text_domains].each do |method|
     it "stores #{method} thread-save" do
-      thread_save(:locale).should == true
+      thread_save(method).should == true
     end
   end
 
-  it "does not store text_domains thread-save" do
-    thread_save(:text_domains).should == false
+  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
+      Thread.current['FastGettext.locale']=nil
+      self.available_locales = 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
   end
 end

data/spec/fast_gettext_spec.rb

@@ -40,4 +40,16 @@ describe FastGettext do
       s_("XXX/not found",'/').should == "not found"
     end
   end
+
+  describe :N_ do
+    it "returns the msgid" do
+      N_('XXXXX').should == 'XXXXX'
+    end
+  end
+
+  describe :Nn_ do
+    it "returns the msgids as array" do
+      Nn_('X','Y').should == ['X','Y']
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -1,5 +1,5 @@
 # ---- requirements
-$LOAD_PATH << File.expand_path("../lib", File.dirname(__FILE__))
+$LOAD_PATH.unshift File.expand_path("../lib", File.dirname(__FILE__))
 require 'fast_gettext'
 
 # ---- bugfix

data/spec/vendor/string_spec.rb

@@ -0,0 +1,12 @@
+current_folder = File.dirname(__FILE__)
+require File.join(current_folder,'..','spec_helper')
+
+#just to make sure we did not mess up while copying...
+describe String do
+  it "substitudes using % + Hash" do
+    "x%{name}y" %{:name=>'a'}.should == 'xay'
+  end
+  it "substitudes using % + Array" do
+    ("x%sy%s" % ['a','b']).should == 'xayb'
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: grosser-fast_gettext
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Michael Grosser
@@ -40,6 +40,8 @@ files:
 - spec/fast_gettext
 - spec/fast_gettext/storage_spec.rb
 - spec/fast_gettext/mo_file_spec.rb
+- spec/vendor
+- spec/vendor/string_spec.rb
 has_rdoc: true
 homepage: http://github.com/grosser/fast_gettext
 post_install_message: