grosser-fast_gettext 0.4.0 → 0.4.2

data/README.markdown

@@ -1,6 +1,6 @@
 FastGettext
 ===========
-GetText but 8 x faster, 72 x less memory, simple, clean namespace (7 vs 34) and threadsave!
+GetText but 3.5 x faster, 20 x less memory, simple, clean namespace (7 vs 34) and threadsave!
 
 [Example Rails application](https://github.com/grosser/gettext_i18n_rails_example)
 
@@ -39,19 +39,20 @@ Performance
 50_000 translations speed / memory
 small translation file <-> large translation file
     Baseline: (doing nothing in a loop)
-    0.420000s / 0K <->
+    0.240000s / 1196K <->
 
     Ideal: (primitive Hash lookup)
-    1.170000s / 112K <-> 1.170000s / 112K
+    0.790000s / 1200K <-> 0.760000s / 1200K
 
     FastGettext:
-    1.960000s / 136K <-> 1.950000s / 268K
+    1.360000s / 1200K <-> 1.340000s / 1200K
 
-    GetText 2.0:
-    15.490000s / 8872K <-> 15.510000s / 9336K
+    GetText 2.0.1:
+    4.810000s / 6.176K <-> 4.770000s / 6.176K
 
     ActiveSupport I18n::Backend::Simple :
-    32.470000s / 9484K <->
+    21.800000s / 11296K <->
+
 
 
 
@@ -95,7 +96,7 @@ I already started work on a po/mo parser & reader that is easier to use, contrib
 Advanced features
 =================
 ###Abnormal pluralisation
-Pluralisation rules can be set directly via a lambda (see code/specs), or by using the Gettext
+Pluralisation rules can be set directly via a lambda (see 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
@@ -107,15 +108,15 @@ If the simple rule of "first `availble_locale` or 'en'" is not suficcient for yo
 
 ###Chains
 You can use any number of repositories to find a translation. Simply add them to a chain and when
-the first cannot translate a given key, the next is asked and so forth.
+the first cannot translate a given msgid, the next is asked and so forth.
     repos = [
-      FastGettext::TranslationRepository.build('old', :path=>'....'),
-      FastGettext::TranslationRepository.build('new', :path=>'....')
+      FastGettext::TranslationRepository.build('new', :path=>'....'),
+      FastGettext::TranslationRepository.build('old', :path=>'....')
     ]
     FastGettext.add_text_domain 'combined', :type=>:chain, :chain=>repos
 
-#Logger
-When you want to know which keys could not be translated, or where used, add a Logger to a Chain:
+###Logger
+When you want to know which keys could not be translated or were used, add a Logger to a Chain:
     repos = [
       FastGettext::TranslationRepository.build('app', :path=>'....')
       FastGettext::TranslationRepository.build('logger', :type=>:logger, :callback=>lamda{|msgid_or_array_of_ids| ... }),
@@ -123,7 +124,7 @@ When you want to know which keys could not be translated, or where used, add a L
     FastGettext.add_text_domain 'combined', :type=>:chain, :chain=>repos
 If the Logger is in position #1 it will see all translations, if it is in position #2 it will only see the unfound.
 Unfound may not always mean missing, if you chose not to translate a word because the msgid is a good translation, it will appear nevertheless.
-A lambda or anything that responds to `call` will do as callback.
+A lambda or anything that responds to `call` will do as callback. A good starting point may be `examples/missing_translations_logger.rb`.
 
 ###Plugins
 Want a yml, xml, database version ?
@@ -133,7 +134,7 @@ Write your own TranslationRepository!
       module TranslationRepository
         class Wtf
           define initialize(name,options), [key], plural(*msgids) and
-          either inherit from Base or define available_locales and pluralisation rule
+          either inherit from TranslationRepository::Base or define available_locales and pluralisation_rule
         end
       end
     end

data/VERSION.yml

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

data/lib/fast_gettext/mo_file.rb

@@ -43,13 +43,15 @@ module FastGettext
 
     #(if plural==singular, prefer singular)
     def make_singular_and_plural_available
+      data = {}
       @data.each do |key,translation|
         next unless key.include? PLURAL_SEPERATOR
         singular, plural = split_plurals(key)
         translation = split_plurals(translation)
-        @data[singular] ||= translation[0]
-        @data[plural] ||= translation[1]
+        data[singular] ||= translation[0]
+        data[plural] ||= translation[1]
       end
+      @data.merge!(data){|key,old,new| old}
     end
 
     def split_plurals(singular_plural)

data/spec/vendor/string_spec.rb

@@ -6,7 +6,30 @@ 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'
+
+  describe 'old sprintf style' do
+    it "substitudes using % + Array" do
+      ("x%sy%s" % ['a','b']).should == 'xayb'
+    end
+
+    it "does not remove %{} style replacements" do
+      ("%{name} x%sy%s" % ['a','b']).should == '%{name} xayb'
+    end
+
+    it "does not remove %<> style replacement" do
+       ("%{name} %<num>f %s" % ['x']).should == "%{name} %<num>f x"
+    end
+  end
+
+  describe 'ruby 1.9 style %< replacement' do
+    it "subsitutes %<something>d" do
+      ("x%<hello>dy" % {:hello=>1}).should == 'x1y'
+    end
+
+    it "substitutes #b" do
+      ("%<num>#b" % {:num => 1}).should == "0b1"
+    end
+
+
   end
 end

data/vendor/string.rb

@@ -19,17 +19,28 @@ rescue ArgumentError
     #  %(hash)
     #
     #  Default: "%s, %s" % ["Masao", "Mutoh"]
-    #  Extended: "%{firstname}, %{lastname}" % {:firstname=>"Masao",:lastname=>"Mutoh"}
-    #
+    #  Extended:
+    #     "%{firstname}, %{lastname}" % {:firstname=>"Masao",:lastname=>"Mutoh"} == "Masao Mutoh"
+    #     with field type such as d(decimal), f(float), ...
+    #     "%<age>d, %<weight>.1f" % {:age => 10, :weight => 43.4} == "10 43.4"
     # This is the recommanded way for Ruby-GetText
     # because the translators can understand the meanings of the msgids easily.
     def %(args)
-      if args.kind_of?(Hash)
+      if args.kind_of? Hash
         ret = dup
+        # %{something} type
         args.each {|key, value| ret.gsub!(/\%\{#{key}\}/, value.to_s)}
+
+        # %<..>d type
+        args.each {|key, value|
+          ret.gsub!(/\%<#{key}>([ #\+-0\*]?\d*\.?\d*[bBdiouxXeEfgGcps])/){
+            sprintf("%#{$1}", value)
+          }
+        }
+        ret.gsub(/%%/, "%")
         ret
       else
-        ret = gsub(/%\{/, '%%{')
+        ret = gsub(/%([{<])/, '%%\1')
         ret._fast_gettext_old_format_m(args)
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: grosser-fast_gettext
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  version: 0.4.2
 platform: ruby
 authors: 
 - Michael Grosser
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-19 00:00:00 -07:00
+date: 2009-04-22 00:00:00 -07:00
 default_executable: 
 dependencies: []