grosser-fast_gettext 0.2.10 → 0.2.11

data/README.markdown

@@ -1,6 +1,6 @@
 FastGettext
 ===========
-GetText but 8 times faster, simple, clean namespace (7 vs 34) and threadsave!
+GetText but 9.17 times faster, simple, clean namespace (7 vs 34) and threadsave!
 
 [Example Rails application](https://github.com/grosser/gettext_i18n_rails_example)
 
@@ -12,11 +12,14 @@ Or from source:
     git clone git://github.com/grosser/fast_gettext.git
     cd fast_gettext && rake install
 
-Tell Gettext where your mo-files lie:
-    #e.g. for locale/de/LC_MESSAGES/my_app.mo
+Generate .po or .mo files using GetText parser (example tasks at [gettext_i18n_rails](http://github.com/grosser/gettext_i18n_rails))
+
+Tell Gettext where your .mo or .po files lie:
+    #e.g. for locale/de/my_app.po and locale/de/LC_MESSAGES/my_app.mo
+    #add :type=>:po and it will read directly from po files (not recommended for production since po-parsing can crash!)
     FastGettext.add_text_domain('my_app',:path=>'locale')
 
-Choose text domain, and locale for translation
+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'
@@ -28,32 +31,32 @@ 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
+Disable translation errors(like no text domain setup) while doing e.g. console session / testing
     FastGettext.silence_errors
 
 Speed
 =====
-50_000 translations
+50_000 translations speed / memory
 small translation file <-> large translation file
     Baseline: (doing nothing in a loop)
-    0.390000s / 2904K
+    0.410000s / 2904K <->
 
     Ideal: (primitive Hash lookup)
-    1.010000s / 3016K <-> 1.040000s / 3016K
+    1.150000s / 3016K <-> 1.130000s / 3016K
 
     FastGettext:
-    1.860000s / 3040K <-> 1.830000s / 3040K
+    1.800000s / 3040K <-> 1.750000s / 3040K
 
     GetText:
-    14.880000s / 5816K <-> 14.810000s / 6008K
+    16.510000s / 5900K <-> 16.400000s / 6072K
 
-    Rails I18n Simple:
-    31.200000s / 10044K
+    ActiveSupport I18n::Backend::Simple :
+    31.880000s / 10028K <->
 
 
 Thread Safety and Rails
 =======================
-`text_domains` is not stored thread-save, so that they can be added inside the `environment.rb`,  
+`text_domains` repository are 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
@@ -86,9 +89,23 @@ Updating translations
 =====================
 ATM you have to use the [original GetText](http://github.com/mutoh/gettext) to create and manage your po/mo-files.
 
+Plugins
+=======
+Want a yml, xml, database version ?
+Write your own TranslationRepository!
+    #fast_gettext/translation_repository/xxx.rb
+    module FastGettext
+      module TranslationRepository
+        class Wtf
+          define initialize(name,options), available_locales, [key], plural(singular,plural,count)
+        end
+      end
+    end
+
+
 Author
 ======
-Mofile parsing from Masao Mutoh, see vendor/README
+Mo/Po-file parsing from Masao Mutoh, see vendor/README
 
 Michael Grosser  
 grosser.michael@gmail.com  

data/VERSION.yml

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

data/lib/fast_gettext/mo_file.rb

@@ -1,10 +1,17 @@
 require File.join(File.dirname(__FILE__),'..','..','vendor','mofile')
 module FastGettext
+  # Responsibility:
+  #  - abstract mo files for Mo Repository
   class MoFile
     PLURAL_SEPERATOR = "\000"
 
+    # file => path or FastGettext::GetText::MOFile
     def initialize(file)
-      @data = FastGettext::GetText::MOFile.open(file, "UTF-8")
+      if file.is_a? FastGettext::GetText::MOFile
+        @data = file
+      else
+        @data = FastGettext::GetText::MOFile.open(file, "UTF-8")
+      end
       make_singular_and_plural_available
     end
 
@@ -15,10 +22,10 @@ module FastGettext
     def plural(singular,plural,count)
       translations = plural_translations(singular,plural)
 
-      if count > 1
-        translations[1] || self[plural]
-      else
+      if count == 1
         translations[0] || self[singular]
+      else
+        translations[1] || self[plural]
       end
     end
 

data/lib/fast_gettext/storage.rb

@@ -1,46 +1,56 @@
 module FastGettext
+  # Responsibility:
+  #  - store data threadsave
+  #  - provide error messages when repositories are unconfigured
+  #  - accept/reject locales that are set by the user
   module Storage
     class NoTextDomainConfigured < Exception;end
 
-    [:available_locales,:text_domain].each do |method|
-      define_method method do
-        thread_store(method)
+    [:available_locales,:text_domain,:_locale,:current_cache].each do |method|
+      eval <<EOF
+      def #{method}
+        Thread.current[:fast_gettext_#{method}]
       end
-      define_method "#{method}=" do |value|
-        write_thread_store(method,value)
+      def #{method}=(value)
+        Thread.current[:fast_gettext_#{method}]=value
       end
+EOF
     end
+    private :_locale, :_locale=
+    #so initial translations does not crash
+    Thread.current[:fast_gettext_current_cache]={}
 
-    # 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
+    def text_domain=(new_domain)
+      Thread.current[:fast_gettext_text_domain]=new_domain
+      update_current_cache
     end
 
     #global, since re-parsing whole folders takes too much time...
-    @@text_domains={}
-    def text_domains
-      @@text_domains
+    @@translation_repositories={}
+    def translation_repositories
+      @@translation_repositories
+    end
+
+    # used to speedup simple translations, does not work for pluralisation
+    # caches[text_domain][locale][key]=translation
+    @@caches={}
+    def caches
+      @@caches
     end
 
-    def text_domain=(new_text_domain)
-      write_thread_store(:text_domain,new_text_domain)
-      update_current_translations
+    def current_repository
+      translation_repositories[text_domain] || NoTextDomainConfigured
     end
 
     def locale
-      thread_store(:locale) || (available_locales||[]).first || 'en'
+      _locale || (available_locales||[]).first || 'en'
     end
 
     def locale=(new_locale)
       new_locale = best_locale_in(new_locale)
       if new_locale
-        write_thread_store(:locale,new_locale)
-        update_current_translations
+        self._locale = new_locale
+        update_current_cache
       end
     end
 
@@ -78,27 +88,18 @@ module FastGettext
 
     #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
+      if not self.current_repository or self.current_repository == NoTextDomainConfigured
+        require 'fast_gettext/translation_repository/base'
+        translation_repositories[text_domain] = TranslationRepository::Base.new('x')
       end
     end
 
     private
 
-    def update_current_translations
-      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)
-      Thread.current["FastGettext.#{key}"]
-    end
-
-    def write_thread_store(key,value)
-      Thread.current["FastGettext.#{key}"]=value
+    def update_current_cache
+      caches[text_domain]||={}
+      caches[text_domain][locale]||={}
+      self.current_cache = caches[text_domain][locale]
     end
   end
 end

data/lib/fast_gettext/translation.rb

@@ -1,4 +1,9 @@
 module FastGettext
+  # this module should be included
+  # Responsibility:
+  #  - direct translation queries to the current repository
+  #  - handle untranslated values
+  #  - understand / enforce namespaces
   module Translation
     extend self
 
@@ -12,14 +17,16 @@ module FastGettext
     end
 
     def _(translate)
-      FastGettext.current_translations[translate] || translate
+      found = FastGettext.current_cache[translate] and return found
+      FastGettext.current_cache[translate] = FastGettext.current_repository[translate] || translate
     end
 
     #translate pluralized
     def n_(singular,plural,count)
-      if translation = FastGettext.current_translations.plural(singular,plural,count)
+      if translation = FastGettext.current_repository.plural(singular,plural,count)
         translation
       else
+        #TODO remove this repeated logic, e.g. return :plural / :singular or raise an exception ?
         count == 1 ? singular : plural
       end
     end
@@ -27,7 +34,7 @@ module FastGettext
     #translate, but discard namespace if nothing was found
     # Car|Tire -> Tire if no translation could be found
     def s_(translate,seperator=nil)
-      if translation = FastGettext.current_translations[translate]
+      if translation = FastGettext.current_repository[translate]
         translation
       else
         translate.split(seperator||NAMESPACE_SEPERATOR).last

data/lib/fast_gettext/translation_repository/base.rb

@@ -0,0 +1,46 @@
+module FastGettext
+  module TranslationRepository
+    # Responsibility:
+    #  - base for all repositories
+    #  - fallback as empty repository, that cannot translate anything but does not crash
+    class Base
+      attr_accessor :locale
+      def initialize(name,options={})
+        @name = name
+        @options = options
+      end
+
+      def available_locales
+        []
+      end
+
+      def [](key)
+        current_translations[key]
+      end
+
+      def plural(singular,plural,count)
+        current_translations.plural(singular,plural,count)
+      end
+
+      protected
+
+      def current_translations
+        MoFile.empty
+      end
+
+      def find_files_in_locale_folders(relative_file_path,path)
+        path ||= "locale"
+        raise "path #{path} cound not be found!" unless File.exist?(path)
+
+        @files = {}
+        Dir[File.join(path,'*')].each do |locale_folder|
+          next unless File.basename(locale_folder) =~ LOCALE_REX
+          file = File.join(locale_folder,relative_file_path)
+          next unless File.exist? file
+          locale = File.basename(locale_folder)
+          @files[locale] = yield(locale,file)
+        end
+      end
+    end
+  end
+end

data/lib/fast_gettext/translation_repository/mo.rb

@@ -0,0 +1,26 @@
+require 'fast_gettext/translation_repository/base'
+module FastGettext
+  module TranslationRepository
+     # Responsibility:
+    #  - find and store mo files
+    #  - provide access to translations in mo files
+    class Mo < Base
+      def initialize(name,options={})
+        # parse all .mo files with the right name, that sit in locale/LC_MESSAGES folders
+        find_files_in_locale_folders(File.join('LC_MESSAGES',"#{name}.mo"),options[:path]) do |locale,file|
+          @files[locale] = MoFile.new(file)
+        end
+      end
+
+      def available_locales
+        @files.keys
+      end
+
+      protected
+
+      def current_translations
+        @files[FastGettext.locale] || MoFile.empty
+      end
+    end
+  end
+end

data/lib/fast_gettext/translation_repository/po.rb

@@ -0,0 +1,20 @@
+require 'fast_gettext/translation_repository/base'
+require 'fast_gettext/translation_repository/mo'
+module FastGettext
+  module TranslationRepository
+     # Responsibility:
+    #  - find and store po files
+    #  - provide access to translations in po files
+    class Po < Mo
+      def initialize(name,options={})
+        require File.join(File.dirname(__FILE__),'..','..','..','vendor','poparser')
+        require 'fast_gettext/mo_file'
+        find_files_in_locale_folders("#{name}.po",options[:path]) do |locale,file|
+          mo_file = FastGettext::GetText::MOFile.new
+          FastGettext::GetText::PoParser.new.parse(File.read(file),mo_file)
+          @files[locale] = MoFile.new(mo_file)
+        end
+      end
+    end
+  end
+end

data/lib/fast_gettext/translation_repository.rb

@@ -0,0 +1,15 @@
+module FastGettext
+  # Responsibility:
+  #  - decide which repository to choose from given input
+  module TranslationRepository
+    extend self
+
+    # only single-word types supported atm (mytype works, MyType will not)
+    def build(name,options)
+      type = options[:type] || :mo
+      require "fast_gettext/translation_repository/#{type}"
+      klas = eval(type.to_s.capitalize)
+      klas.new(name,options)
+    end
+  end
+end

data/lib/fast_gettext.rb

@@ -1,6 +1,7 @@
 require 'fast_gettext/mo_file'
 require 'fast_gettext/storage'
 require 'fast_gettext/translation'
+require 'fast_gettext/translation_repository'
 require File.join(File.dirname(__FILE__),'..','vendor','string')
 
 module FastGettext
@@ -23,17 +24,6 @@ module FastGettext
   end
 
   def add_text_domain(name,options)
-    self.text_domains ||= {}
-    domain = self.text_domains[name] = {:path=>options.delete(:path),:mo_files=>{}}
-    
-    # parse all .mo files with the right name, that sit in locale/LC_MESSAGES folders
-    Dir[File.join(domain[:path],'*')].each do |locale_folder|
-      next unless File.basename(locale_folder) =~ LOCALE_REX
-      mo_file = File.join(locale_folder,'LC_MESSAGES',"#{name}.mo")
-      next unless File.exist? mo_file
-      locale = File.basename(locale_folder)
-      domain[:mo_files][locale] = MoFile.new(mo_file)
-    end
-    domain
+    translation_repositories[name] = TranslationRepository.build(name,options)
   end
 end

data/spec/fast_gettext/storage_spec.rb

@@ -3,7 +3,7 @@ require File.join(current_folder,'..','spec_helper')
 
 include FastGettext::Storage
 
-describe Storage do
+describe 'Storage' do
   def thread_save(method)
     send("#{method}=",'de')
 
@@ -15,17 +15,17 @@ describe Storage do
     send(method) == 'de'
   end
 
-  [:locale, :available_locales, :text_domain, :current_translations].each do |method|
+  [:locale, :available_locales, :text_domain].each do |method|
     it "stores #{method} thread-save" do
       thread_save(method).should == true
     end
   end
 
-  it "stores text_domains non-thread-safe" do
-    self.text_domains[:x]=1
-    t = Thread.new{self.text_domains[:x]=2}
+  it "stores translation_repositories non-thread-safe" do
+    self.translation_repositories[:x]=1
+    t = Thread.new{self.translation_repositories[:x]=2}
     t.join
-    self.text_domains[:x].should == 2
+    self.translation_repositories[:x].should == 2
   end
 
   describe :locale do
@@ -35,7 +35,7 @@ describe Storage do
       locale.should == 'XXX'
     end
     it "is en if no locale and no available_locale were set" do
-      Thread.current['FastGettext.locale']=nil
+      FastGettext.send(:_locale=,nil)
       self.available_locales = nil
       locale.should == 'en'
     end
@@ -99,4 +99,22 @@ describe Storage do
       FastGettext._('x').should == 'x'
     end
   end
+
+  describe :current_cache do
+    before do
+      FastGettext.available_locales = ['de','en']
+      FastGettext.locale = 'de'
+      FastGettext._('abc')
+      FastGettext.locale = 'en'
+    end
+
+    it "stores a translation seperatly" do
+      FastGettext.current_cache['abc'].should == nil
+    end
+
+    it "stores a translation permanently" do
+      FastGettext.locale = 'de'
+      FastGettext.current_cache['abc'].should == 'abc'
+    end
+  end
 end

data/spec/fast_gettext/translation_repository/base_spec.rb

@@ -0,0 +1,20 @@
+current_folder = File.dirname(__FILE__)
+require File.join(current_folder,'..','..','spec_helper')
+require 'fast_gettext/translation_repository/base'
+
+describe 'FastGettext::TranslationRepository::Base' do
+  before do
+    @rep = FastGettext::TranslationRepository::Base.new('x')
+  end
+  it "can be built" do
+    @rep.available_locales.should == []
+  end
+  it "cannot translate" do
+    @rep.locale = 'de'
+    @rep['car'].should == nil
+  end
+  it "cannot pluralize" do
+    @rep.locale = 'de'
+    @rep.plural('Axis','Axis',2).should == nil
+  end
+end

data/spec/fast_gettext/translation_repository/mo_spec.rb

@@ -0,0 +1,21 @@
+current_folder = File.dirname(__FILE__)
+require File.join(current_folder,'..','..','spec_helper')
+
+
+describe 'FastGettext::TranslationRepository::Mo' do
+  before do
+    @rep = FastGettext::TranslationRepository.build('test',:path=>File.join(current_folder,'..','..','locale'))
+    @rep.is_a? FastGettext::TranslationRepository::Mo
+  end
+  it "can be built" do
+    @rep.available_locales.should == ['de','en']
+  end
+  it "can translate" do
+    FastGettext.locale = 'de'
+    @rep['car'].should == 'Auto'
+  end
+  it "can pluralize" do
+    FastGettext.locale = 'de'
+    @rep.plural('Axis','Axis',2).should == 'Achsen'
+  end
+end

data/spec/fast_gettext/translation_repository/po_spec.rb

@@ -0,0 +1,21 @@
+current_folder = File.dirname(__FILE__)
+require File.join(current_folder,'..','..','spec_helper')
+
+
+describe 'FastGettext::TranslationRepository::Po' do
+  before do
+    @rep = FastGettext::TranslationRepository.build('test',:path=>File.join(current_folder,'..','..','locale'),:type=>:po)
+    @rep.is_a? FastGettext::TranslationRepository::Po
+  end
+  it "can be built" do
+    @rep.available_locales.should == ['de','en']
+  end
+  it "can translate" do
+    FastGettext.locale = 'de'
+    @rep['car'].should == 'Auto'
+  end
+  it "can pluralize" do
+    FastGettext.locale = 'de'
+    @rep.plural('Axis','Axis',2).should == 'Achsen'
+  end
+end

data/spec/fast_gettext/translation_spec.rb

@@ -1,16 +1,11 @@
 current_folder = File.dirname(__FILE__)
 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']
-
 include FastGettext::Translation
 
 describe FastGettext::Translation do
   before do
-    FastGettext.available_locales = ['en','de']
-    FastGettext.locale = 'de'
+    default_setup
   end
 
   describe "unknown locale" do
@@ -41,7 +36,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'
+      n_('Axis','Axis',0).should == 'Achsen'
     end
     it "returns the appropriate msgid if no translation was found" do
       n_('NOTFOUND','NOTFOUNDs',1).should == 'NOTFOUND'
@@ -72,4 +67,24 @@ describe FastGettext::Translation do
       Nn_('X','Y').should == ['X','Y']
     end
   end
+
+  describe :caching do
+    it "caches different locales seperatly" do
+      FastGettext.locale = 'en'
+      _('car').should == 'car'
+      FastGettext.locale = 'de'
+      _('car').should == 'Auto'
+    end
+
+    it "caches different textdomains seperatly" do
+      _('car').should == 'Auto'
+
+      FastGettext.translation_repositories['fake'] = {}
+      FastGettext.text_domain = 'fake'
+      _('car').should == 'car'
+
+      FastGettext.text_domain = 'test'
+      _('car').should == 'Auto'
+    end
+  end
 end

data/spec/fast_gettext_spec.rb

@@ -1,10 +1,6 @@
 require File.expand_path("spec_helper", File.dirname(__FILE__))
 
-FastGettext.add_text_domain('test',:path=>File.join(File.dirname(__FILE__),'locale'))
-FastGettext.text_domain = 'test'
-FastGettext.available_locales = ['en','de']
-FastGettext.locale = 'de'
-
+default_setup
 class IncludeTest
   include FastGettext::Translation
   @@xx = _('car')
@@ -22,6 +18,10 @@ end
 include FastGettext
 
 describe FastGettext do
+  before :all do
+    default_setup
+  end
+
   it "provides access to FastGettext::Translations methods" do
     FastGettext._('car').should == 'Auto'
     _('car').should == 'Auto'
@@ -30,6 +30,7 @@ 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
     IncludeTest.ext.should == 'Auto'
     IncludeTest.ext.should == 'Auto'

data/spec/locale/de/test.po

@@ -0,0 +1,61 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: version 0.0.1\n"
+"POT-Creation-Date: 2009-02-26 19:50+0100\n"
+"PO-Revision-Date: 2009-02-18 14:53+0100\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+
+#: app/helpers/translation_helper.rb:3
+msgid "%{relative_time} ago"
+msgstr "vor %{relative_time}"
+
+#: app/views/cars/show.html.erb:5
+msgid "Axis"
+msgid_plural "Axis"
+msgstr[0] "Achse"
+msgstr[1] "Achsen"
+
+#: app/controllers/cars_controller.rb:47
+msgid "Car was successfully created."
+msgstr "Auto wurde erfolgreich gespeichert"
+
+#: app/controllers/cars_controller.rb:64
+msgid "Car was successfully updated."
+msgstr "Auto wurde erfolgreich aktualisiert"
+
+#: app/views/cars/show.html.erb:1 locale/model_attributes.rb:3
+msgid "Car|Model"
+msgstr "Modell"
+
+#: app/views/cars/show.html.erb:3 locale/model_attributes.rb:4
+msgid "Car|Wheels count"
+msgstr "Räderzahl"
+
+#: app/views/cars/show.html.erb:7
+msgid "Created"
+msgstr "Erstellt"
+
+#: app/views/cars/show.html.erb:9
+msgid "Month"
+msgstr "Monat"
+
+#: locale/model_attributes.rb:2
+msgid "car"
+msgstr "Auto"
+
+#: locale/testlog_phrases.rb:2
+msgid "this is a dynamic translation which was found thorugh gettext_test_log!"
+msgstr ""
+"Dies ist eine dynamische Übersetzung, die durch gettext_test_log "
+"gefunden wurde!"

data/spec/locale/en/test.po

@@ -0,0 +1,59 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: version 0.0.1\n"
+"POT-Creation-Date: 2009-02-26 19:50+0100\n"
+"PO-Revision-Date: 2009-02-18 15:42+0100\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+
+#: app/helpers/translation_helper.rb:3
+msgid "%{relative_time} ago"
+msgstr ""
+
+#: app/views/cars/show.html.erb:5
+msgid "Axis"
+msgid_plural "Axis"
+msgstr[0] ""
+msgstr[1] ""
+
+#: app/controllers/cars_controller.rb:47
+msgid "Car was successfully created."
+msgstr ""
+
+#: app/controllers/cars_controller.rb:64
+msgid "Car was successfully updated."
+msgstr ""
+
+#: app/views/cars/show.html.erb:1 locale/model_attributes.rb:3
+msgid "Car|Model"
+msgstr ""
+
+#: app/views/cars/show.html.erb:3 locale/model_attributes.rb:4
+msgid "Car|Wheels count"
+msgstr ""
+
+#: app/views/cars/show.html.erb:7
+msgid "Created"
+msgstr ""
+
+#: app/views/cars/show.html.erb:9
+msgid "Month"
+msgstr ""
+
+#: locale/model_attributes.rb:2
+msgid "car"
+msgstr ""
+
+#: locale/testlog_phrases.rb:2
+msgid "this is a dynamic translation which was found thorugh gettext_test_log!"
+msgstr ""

data/spec/spec_helper.rb

@@ -13,9 +13,24 @@ module Test
   end
 end
 
+# ---- revert to defaults
+Spec::Runner.configure do |config|
+  config.before :all do
+    FastGettext.locale = 'de'
+    FastGettext.available_locales = nil
+  end
+end
+
 # ---- Helpers
 def pending_it(text,&block)
   it text do
     pending(&block)
   end
+end
+
+def default_setup
+  FastGettext.add_text_domain('test',:path=>File.join(File.dirname(__FILE__),'locale'))
+  FastGettext.text_domain = 'test'
+  FastGettext.available_locales = ['en','de']
+  FastGettext.locale = 'de'
 end

data/vendor/poparser.rb

@@ -0,0 +1,331 @@
+=begin
+  poparser.rb - Generate a .mo
+
+  Copyright (C) 2003-2009 Masao Mutoh <mutoh at highway.ne.jp>
+
+  You may redistribute it and/or modify it under the same
+  license terms as Ruby.
+=end
+
+#MODIFIED
+# removed include GetText etc
+# added stub translation method _(x)
+require 'racc/parser'
+
+module FastGettext
+module GetText
+
+  class PoParser < Racc::Parser
+
+    def _(x)
+      x
+    end
+
+module_eval <<'..end src/poparser.ry modeval..id7a99570e05', 'src/poparser.ry', 108
+  def unescape(orig)
+    ret = orig.gsub(/\\n/, "\n")
+    ret.gsub!(/\\t/, "\t")
+    ret.gsub!(/\\r/, "\r")
+    ret.gsub!(/\\"/, "\"")
+    ret
+  end
+  
+  def parse(str, data, ignore_fuzzy = true)
+    @comments = []
+    @data = data
+    @fuzzy = false
+    @msgctxt = ""
+    $ignore_fuzzy = ignore_fuzzy
+
+    str.strip!
+    @q = []
+    until str.empty? do
+      case str
+      when /\A\s+/
+	str = $'
+      when /\Amsgctxt/
+	@q.push [:MSGCTXT, $&]
+	str = $'
+      when /\Amsgid_plural/
+	@q.push [:MSGID_PLURAL, $&]
+	str = $'
+      when /\Amsgid/
+	@q.push [:MSGID, $&]
+	str = $'
+      when /\Amsgstr/
+	@q.push [:MSGSTR, $&]
+	str = $'
+      when /\A\[(\d+)\]/
+	@q.push [:PLURAL_NUM, $1]
+	str = $'
+      when /\A\#~(.*)/
+	$stderr.print _("Warning: obsolete msgid exists.\n")
+	$stderr.print "         #{$&}\n"
+	@q.push [:COMMENT, $&]
+	str = $'
+      when /\A\#(.*)/
+	@q.push [:COMMENT, $&]
+	str = $'      
+      when /\A\"(.*)\"/
+	@q.push [:STRING, $1]
+	str = $'
+      else
+	#c = str[0,1]
+	#@q.push [:STRING, c]
+	str = str[1..-1]
+      end
+    end 
+    @q.push [false, '$end']
+    if $DEBUG
+      @q.each do |a,b|
+      puts "[#{a}, #{b}]"
+      end
+    end
+    @yydebug = true if $DEBUG
+    do_parse
+
+    if @comments.size > 0
+      @data.set_comment(:last, @comments.join("\n"))
+    end
+    @data
+  end
+  
+  def next_token
+    @q.shift
+  end
+
+  def on_message(msgid, msgstr)
+    if msgstr.size > 0
+      @data[msgid] = msgstr
+      @data.set_comment(msgid, @comments.join("\n"))
+    end
+    @comments.clear
+    @msgctxt = ""
+  end
+      
+  def on_comment(comment)
+    @fuzzy = true if (/fuzzy/ =~ comment)
+    @comments << comment
+  end 
+
+
+..end src/poparser.ry modeval..id7a99570e05
+
+##### racc 1.4.5 generates ###
+
+racc_reduce_table = [
+ 0, 0, :racc_error,
+ 0, 10, :_reduce_none,
+ 2, 10, :_reduce_none,
+ 2, 10, :_reduce_none,
+ 2, 10, :_reduce_none,
+ 2, 12, :_reduce_5,
+ 1, 13, :_reduce_none,
+ 1, 13, :_reduce_none,
+ 4, 15, :_reduce_8,
+ 5, 16, :_reduce_9,
+ 2, 17, :_reduce_10,
+ 1, 17, :_reduce_none,
+ 3, 18, :_reduce_12,
+ 1, 11, :_reduce_13,
+ 2, 14, :_reduce_14,
+ 1, 14, :_reduce_15 ]
+
+racc_reduce_n = 16
+
+racc_shift_n = 26
+
+racc_action_table = [
+     3,    13,     5,     7,     9,    15,    16,    17,    20,    17,
+    13,    17,    13,    13,    11,    17,    23,    20,    13,    17 ]
+
+racc_action_check = [
+     1,    16,     1,     1,     1,    12,    12,    12,    18,    18,
+     7,    14,    15,     9,     3,    19,    20,    21,    23,    25 ]
+
+racc_action_pointer = [
+   nil,     0,   nil,    14,   nil,   nil,   nil,     3,   nil,     6,
+   nil,   nil,     0,   nil,     4,     5,    -6,   nil,     2,     8,
+     8,    11,   nil,    11,   nil,    12 ]
+
+racc_action_default = [
+    -1,   -16,    -2,   -16,    -3,   -13,    -4,   -16,    -6,   -16,
+    -7,    26,   -16,   -15,    -5,   -16,   -16,   -14,   -16,    -8,
+   -16,    -9,   -11,   -16,   -10,   -12 ]
+
+racc_goto_table = [
+    12,    22,    14,     4,    24,     6,     2,     8,    18,    19,
+    10,    21,     1,   nil,   nil,   nil,    25 ]
+
+racc_goto_check = [
+     5,     9,     5,     3,     9,     4,     2,     6,     5,     5,
+     7,     8,     1,   nil,   nil,   nil,     5 ]
+
+racc_goto_pointer = [
+   nil,    12,     5,     2,     4,    -7,     6,     9,    -7,   -17 ]
+
+racc_goto_default = [
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil ]
+
+racc_token_table = {
+ false => 0,
+ Object.new => 1,
+ :COMMENT => 2,
+ :MSGID => 3,
+ :MSGCTXT => 4,
+ :MSGID_PLURAL => 5,
+ :MSGSTR => 6,
+ :STRING => 7,
+ :PLURAL_NUM => 8 }
+
+racc_use_result_var = true
+
+racc_nt_base = 9
+
+Racc_arg = [
+ racc_action_table,
+ racc_action_check,
+ racc_action_default,
+ racc_action_pointer,
+ racc_goto_table,
+ racc_goto_check,
+ racc_goto_default,
+ racc_goto_pointer,
+ racc_nt_base,
+ racc_reduce_table,
+ racc_token_table,
+ racc_shift_n,
+ racc_reduce_n,
+ racc_use_result_var ]
+
+Racc_token_to_s_table = [
+'$end',
+'error',
+'COMMENT',
+'MSGID',
+'MSGCTXT',
+'MSGID_PLURAL',
+'MSGSTR',
+'STRING',
+'PLURAL_NUM',
+'$start',
+'msgfmt',
+'comment',
+'msgctxt',
+'message',
+'string_list',
+'single_message',
+'plural_message',
+'msgstr_plural',
+'msgstr_plural_line']
+
+Racc_debug_parser = true
+
+##### racc system variables end #####
+
+ # reduce 0 omitted
+
+ # reduce 1 omitted
+
+ # reduce 2 omitted
+
+ # reduce 3 omitted
+
+ # reduce 4 omitted
+
+module_eval <<'.,.,', 'src/poparser.ry', 25
+  def _reduce_5( val, _values, result )
+    @msgctxt = unescape(val[1]) + "\004"
+   result
+  end
+.,.,
+
+ # reduce 6 omitted
+
+ # reduce 7 omitted
+
+module_eval <<'.,.,', 'src/poparser.ry', 48
+  def _reduce_8( val, _values, result )
+    if @fuzzy and $ignore_fuzzy 
+      if val[1] != ""
+        $stderr.print _("Warning: fuzzy message was ignored.\n")
+        $stderr.print "         msgid '#{val[1]}'\n"
+      else
+        on_message('', unescape(val[3]))
+      end
+      @fuzzy = false
+    else
+      on_message(@msgctxt + unescape(val[1]), unescape(val[3]))
+    end
+    result = ""
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'src/poparser.ry', 65
+  def _reduce_9( val, _values, result )
+    if @fuzzy and $ignore_fuzzy
+      if val[1] != ""
+        $stderr.print _("Warning: fuzzy message was ignored.\n")
+        $stderr.print "msgid = '#{val[1]}\n"
+      else
+        on_message('', unescape(val[3]))
+      end
+      @fuzzy = false
+    else
+      on_message(@msgctxt + unescape(val[1]) + "\000" + unescape(val[3]), unescape(val[4]))
+    end
+    result = ""
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'src/poparser.ry', 76
+  def _reduce_10( val, _values, result )
+    if val[0].size > 0
+      result = val[0] + "\000" + val[1]
+    else
+      result = ""
+    end
+   result
+  end
+.,.,
+
+ # reduce 11 omitted
+
+module_eval <<'.,.,', 'src/poparser.ry', 84
+  def _reduce_12( val, _values, result )
+    result = val[2]
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'src/poparser.ry', 91
+  def _reduce_13( val, _values, result )
+    on_comment(val[0])
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'src/poparser.ry', 99
+  def _reduce_14( val, _values, result )
+    result = val.delete_if{|item| item == ""}.join
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'src/poparser.ry', 103
+  def _reduce_15( val, _values, result )
+    result = val[0]
+   result
+  end
+.,.,
+
+ def _reduce_none( val, _values, result )
+  result
+ end
+
+  end   # class PoParser
+
+end   # module GetText
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: grosser-fast_gettext
 version: !ruby/object:Gem::Version 
-  version: 0.2.10
+  version: 0.2.11
 platform: ruby
 authors: 
 - Michael Grosser
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-26 00:00:00 -08:00
+date: 2009-02-28 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -29,19 +29,30 @@ files:
 - lib/fast_gettext/mo_file.rb
 - lib/fast_gettext/storage.rb
 - lib/fast_gettext/translation.rb
+- lib/fast_gettext/translation_repository
+- lib/fast_gettext/translation_repository.rb
+- lib/fast_gettext/translation_repository/base.rb
+- lib/fast_gettext/translation_repository/mo.rb
+- lib/fast_gettext/translation_repository/po.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_repository
+- spec/fast_gettext/translation_repository/base_spec.rb
+- spec/fast_gettext/translation_repository/mo_spec.rb
+- spec/fast_gettext/translation_repository/po_spec.rb
 - spec/fast_gettext/translation_spec.rb
 - spec/fast_gettext_spec.rb
 - spec/locale
 - spec/locale/de
 - spec/locale/de/LC_MESSAGES
 - spec/locale/de/LC_MESSAGES/test.mo
+- spec/locale/de/test.po
 - spec/locale/en
 - spec/locale/en/LC_MESSAGES
 - spec/locale/en/LC_MESSAGES/test.mo
+- spec/locale/en/test.po
 - spec/spec_helper.rb
 - spec/vendor
 - spec/vendor/fake_load_path
@@ -52,6 +63,7 @@ files:
 - vendor/empty.mo
 - vendor/iconv.rb
 - vendor/mofile.rb
+- vendor/poparser.rb
 - vendor/string.rb
 has_rdoc: true
 homepage: http://github.com/grosser/fast_gettext