grosser-fast_gettext 0.2.6 → 0.2.7

data/README.markdown

@@ -1,6 +1,8 @@
 FastGettext
 ===========
-GetText but 8.21 times faster, simple, clean namespace (7 vs 34) and threadsave!
+GetText but 8 times faster, simple, clean namespace (7 vs 34) and threadsave!
+
+[Example Rails application](https://github.com/grosser/gettext_i18n_rails_example)
 
 Setup
 =====
@@ -22,41 +24,37 @@ Start translating
     s_('Namespace|no-found') == 'not-found'
     n_('Axis','Axis',3) == 'Achsen' #German plural of Axis
 
+Disable translation errors(like no text domain setup) while doing e.g. console session
+    FastGettext.silence_errors
+
 Speed
 =====
-50_000 translations:
-Ideal: (primitive Hash lookup)
-    small translation file:
-    1.080000   0.190000   1.270000 (  1.274699)
-    mapped: 5832K    writeable/private: 3016K    shared: 28K
-
-    large translation file:
-    1.110000   0.200000   1.310000 (  1.305616)
-    mapped: 5832K    writeable/private: 3016K    shared: 28K
-
-FastGettext:
-    small translation file:
-    1.980000   0.310000   2.290000 (  2.285980)
-    mapped: 5852K    writeable/private: 3036K    shared: 28K
-
-    large translation file:
-    1.990000   0.320000   2.310000 (  2.318801)
-    mapped: 5852K    writeable/private: 3036K    shared: 28K
-
-GetText:
-    small translation file:
-    16.210000   1.290000  17.500000 ( 17.511050)
-    mapped: 8908K    writeable/private: 5876K    shared: 28K
-
-    large translation file:
-    16.340000   1.330000  17.670000 ( 17.679807)
-    mapped: 9028K    writeable/private: 5996K    shared: 28K
+50_000 translations
+small translation file <-> large translation file
+    Baseline: (doing nothing in a loop)
+    0.390000s / 2904K
+
+    Ideal: (primitive Hash lookup)
+    1.010000s / 3016K <-> 1.040000s / 3016K
+
+    FastGettext:
+    1.860000s / 3040K <-> 1.830000s / 3040K
+
+    GetText:
+    14.880000s / 5816K <-> 14.810000s / 6008K
+
+    Rails I18n Simple:
+    31.200000s / 10044K
+
 
 Thread Safety and Rails
 =======================
 `text_domains` is not stored thread-save, so that they can be added inside the `environment.rb`,  
 and do not need to be readded for every thread (parsing takes time...).
 
+###Rails
+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.
 
@@ -72,7 +70,7 @@ then e.g. controllers, so set them inside your application_controller.
       def set_locale
         FastGettext.available_locales = ['de','en',...]
         FastGettext.text_domain = 'frontend'
-        sessions[:locale] = I18n.locale = FastGettext.locale = params[:locale] || sessions[:locale] || 'en'
+        sessions[:locale] = I18n.locale = FastGettext.set_locale(params[:locale] || sessions[:locale] || 'en')
       end
 
     #application_helper.rb
@@ -80,8 +78,6 @@ then e.g. controllers, so set them inside your application_controller.
       include FastGettext::Translation
       ...
 
-Try the [gettext_i18n_rails plugin](http://github.com/grosser/gettext_i18n_rails), it simplifies the setup.
-
 Updating translations
 =====================
 ATM you have to use the [original GetText](http://github.com/mutoh/gettext) to create and manage your po/mo-files.

data/VERSION.yml

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

data/lib/fast_gettext/storage.rb

@@ -52,6 +52,13 @@ module FastGettext
       locale
     end
 
+    #turn off translation if none was defined to disable all resulting errors
+    def silence_errors
+      if not self.current_translations or self.current_translations == NoTextDomainConfigured
+        self.current_translations = MoFile.empty
+      end
+    end
+
     private
 
     def update_current_translations

data/spec/aa_unconfigued_spec.rb

@@ -2,6 +2,7 @@ require File.join(File.dirname(__FILE__),'spec_helper')
 
 describe 'unconfigured' do
   it "gives a useful error message when trying to just translate" do
+    FastGettext.text_domain = nil
     x=1
     begin
       FastGettext._('x')

data/spec/fast_gettext/storage_spec.rb

@@ -54,4 +54,24 @@ describe Storage do
       self.set_locale('en').should == 'de'
     end
   end
+
+  describe :silence_errors do
+    before do
+      FastGettext.text_domain = 'xxx'
+    end
+    it "raises when a textdomain was empty" do
+      begin 
+        FastGettext._('x')
+        x=2
+      rescue
+        x=1
+      end
+      x.should == 1
+    end
+    
+    it "can silence erros" do
+      FastGettext.silence_errors
+      FastGettext._('x').should == 'x'
+    end
+  end
 end

data/spec/fast_gettext_spec.rb

@@ -16,4 +16,17 @@ describe FastGettext do
     N_('XXXXX').should == 'XXXXX'
     Nn_('X','Y').should == ['X','Y']
   end
+  it "is extended to a class and included into a class" do
+    class IncludeTest
+      include FastGettext::Translation
+      def self.ext
+        _('car')
+      end
+      def inc
+        _('car')
+      end
+    end
+    IncludeTest.ext.should == 'Auto'
+    IncludeTest.new.inc.should == 'Auto'
+  end
 end

data/vendor/iconv.rb

@@ -21,11 +21,14 @@
 begin
   require 'iconv'
 rescue LoadError
-  # Pseudo Iconv class
-  # 
-  # Provides Iconv.iconv which uses Ruby/GLib(1) functions. This library also required from 'gettext'.
-  # If you require 'gettext/iconv', Iconv.iconv try to call Ruby/GLib function 
-  # when it doesn't find original Iconv class(iconv.so).
+  # Provides Iconv.iconv which normally is provided through Ruby/GLib(1) functions.
+  # This library is required for 'gettext'.
+  # If you require 'gettext/iconv', it tries to call Ruby/GLib function
+  # when it doesn't find original Iconv class(iconv.so) it adds a pseudo class.
+  #
+  # One-click Ruby Installer for Win32 hadn’t had iconv and there hadn’t been a way to install iconv.so itself for Win32.
+  # And JRuby hadn’t had Iconv.
+  # I’ve not checked them currently, but if they’ve supported iconv now, we don’t need this anymore...
   #
   # (1) Ruby/GLib is a module which is provided from Ruby-GNOME2 Project. 
   # You can get binaries for Win32(One-Click Ruby Installer).

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: grosser-fast_gettext
 version: !ruby/object:Gem::Version 
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors: 
 - Michael Grosser
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-20 00:00:00 -08:00
+date: 2009-02-24 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -22,37 +22,37 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- vendor/iconv.rb
-- vendor/string.rb
-- vendor/mofile.rb
-- vendor/empty.mo
-- vendor/README.rdoc
-- lib/fast_gettext.rb
+- README.markdown
+- VERSION.yml
 - lib/fast_gettext
-- lib/fast_gettext/translation.rb
-- lib/fast_gettext/storage.rb
+- lib/fast_gettext.rb
 - lib/fast_gettext/mo_file.rb
+- lib/fast_gettext/storage.rb
+- lib/fast_gettext/translation.rb
+- spec/aa_unconfigued_spec.rb
+- spec/fast_gettext
+- spec/fast_gettext/mo_file_spec.rb
+- spec/fast_gettext/storage_spec.rb
+- spec/fast_gettext/translation_spec.rb
 - spec/fast_gettext_spec.rb
-- spec/spec_helper.rb
 - spec/locale
-- spec/locale/en
-- spec/locale/en/LC_MESSAGES
-- spec/locale/en/LC_MESSAGES/test.mo
 - spec/locale/de
 - spec/locale/de/LC_MESSAGES
 - spec/locale/de/LC_MESSAGES/test.mo
-- spec/fast_gettext
-- 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/locale/en
+- spec/locale/en/LC_MESSAGES
+- spec/locale/en/LC_MESSAGES/test.mo
+- spec/spec_helper.rb
 - spec/vendor
-- spec/vendor/iconv_spec.rb
 - spec/vendor/fake_load_path
 - spec/vendor/fake_load_path/iconv.rb
+- spec/vendor/iconv_spec.rb
 - spec/vendor/string_spec.rb
-- VERSION.yml
-- README.markdown
+- vendor/README.rdoc
+- vendor/empty.mo
+- vendor/iconv.rb
+- vendor/mofile.rb
+- vendor/string.rb
 has_rdoc: true
 homepage: http://github.com/grosser/fast_gettext
 post_install_message: