fast_gettext 0.4.17 → 0.5.1

data/README.markdown

@@ -2,10 +2,43 @@ FastGettext
 ===========
 GetText but 3.5 x faster, 560 x less memory, simple, clean namespace (7 vs 34) and threadsave!  
 
-It supports multiple backends (atm: .mo files, .po files, Database(ActiveRecor + any other), Chain, Loggers) and can easily be extended.
+It supports multiple backends (.mo, .po, .yml files, Database(ActiveRecor + any other), Chain, Loggers) and can easily be extended.
 
 [Example Rails application](https://github.com/grosser/gettext_i18n_rails_example)
 
+Comparison
+==========
+<table>
+  <tr>
+    <td></td>
+    <td width="100">Hash</td>
+    <td width="150">FastGettext</td>
+    <td width="100">GetText</td>
+    <td width="100">ActiveSupport I18n::Simple</td>
+  </tr>
+  <tr>
+    <td>Speed*</td>
+    <td>0.82s</td>
+    <td>1.36s</td>
+    <td>4.88s</td>
+    <td>21.77s</td>
+  </tr>
+  <tr>
+    <td>RAM*</td>
+    <td>4K</td>
+    <td>8K</td>
+    <td>4480K</td>
+    <td>10100K</td>
+  </tr>
+  <tr>
+    <td>Included backends</td>
+    <td></td>
+    <td>db, yml, mo, po, logger, chain</td>
+    <td>mo</td>
+    <td>yml</td>
+  </tr>
+</table>
+<small>*50.000 translations with ruby enterprise 1.8.6 through `rake benchmark`</small>
 
 Setup
 =====
@@ -17,10 +50,14 @@ Setup
 From mo files (traditional/default)
     FastGettext.add_text_domain('my_app',:path=>'locale')
 
-Or po files (less maintenacnce than mo)
+Or po files (less maintenance than mo)
     FastGettext.add_text_domain('my_app',:path=>'locale', :type=>:po)
 
-Or database (scaleable, great for many locales/translators)
+Or yaml files (use I18n syntax/indentation)
+    FastGettext.add_text_domain('my_app',:path=>'config/locales', :type=>:yaml)
+
+Or database (scaleable, good for many locales/translators)
+    # db access is cached <-> only first lookup hits the db 
     require "fast_gettext/translation_repository/db"
     include FastGettext::TranslationRepository::Db.require_models #load and include default models
     FastGettext.add_text_domain('my_app', :type=>:db, :model=>TranslationKey)
@@ -51,7 +88,6 @@ Use the [original GetText](http://github.com/mutoh/gettext) to create and manage
 (Work on a po/mo parser & reader that is easier to use has started, contributions welcome @ [pomo](http://github.com/grosser/pomo) )
 
 ###Database
-!!!new/only short time in production, please report back any ideas/suggestions you have!!!  
 [Example migration for ActiveRecord](http://github.com/grosser/fast_gettext/blob/master/examples/db/migration.rb)  
 The default plural seperator is `||||` but you may overwrite it (or suggest a better one..).
 
@@ -60,28 +96,6 @@ If you want to use your own models, have a look at the [default models](http://g
 
 To manage translations via a Web GUI, use a [Rails application and the translation_db_engine](http://github.com/grosser/translation_db_engine)
 
-
-Performance
-===========
-50_000 translations speed / memory  
-small translation file <-> large translation file  
-(ruby enterprise 1.8.6, your results may vary, try `rake benchmark`)
-    Baseline: (doing nothing in a loop)
-    0.250000s / 0K <->
-
-    Ideal: (primitive Hash lookup)
-    0.820000s / 4K <-> 0.760000s / 4K
-
-    FastGettext:
-    1.360000s / 8K <-> 1.320000s / 8K
-
-    GetText 2.0.1:
-    4.880000s / 4480K <-> 4.810000s / 4480K
-
-    ActiveSupport I18n::Backend::Simple :
-    21.770000s / 10100K <->
-
-
 Rails
 =======================
 Try the [gettext_i18n_rails plugin](http://github.com/grosser/gettext_i18n_rails), it simplifies the setup.  
@@ -145,7 +159,7 @@ Unfound may not always mean missing, if you chose not to translate a word becaus
 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 version ?
+Want a xml version ?
 Write your own TranslationRepository!
     #fast_gettext/translation_repository/xxx.rb
     module FastGettext
@@ -174,6 +188,7 @@ Mo/Po-file parsing from Masao Mutoh, see vendor/README
 
 ###Contributors
  - [geekq](http://www.innoq.com/blog/vd)
+ - [Matt Sanford](http://blog.mzsanford.com)
  - Rudolf Gavlas
 
 [Michael Grosser](http://pragmatig.wordpress.com)  

data/Rakefile

@@ -1,9 +1,6 @@
-desc "Run all specs in spec directory"
-task :default do |t|
-  options = "--colour --format progress --loadby --reverse"
-  files = FileList['spec/**/*_spec.rb']
-  system("spec #{options} #{files}")
-end
+task :default => :spec
+require 'spec/rake/spectask'
+Spec::Rake::SpecTask.new {|t| t.spec_opts = ['--color']}
 
 task :benchmark do
   puts "Running on #{RUBY}"
@@ -27,16 +24,9 @@ begin
     gem.email = "grosser.michael@gmail.com"
     gem.homepage = "http://github.com/grosser/#{project_name}"
     gem.authors = ["Michael Grosser"]
-    gem.rubyforge_project = project_name.sub('_','-')
-  end
-
-  # fake task so that rubyforge:release works
-  task :rdoc do
-    `mkdir rdoc`
-    `echo documentation is at http://github.com/grosser/#{project_name} > rdoc/README.rdoc`
   end
 
-  Jeweler::RubyforgeTasks.new
+  Jeweler::GemcutterTasks.new
 rescue LoadError
-  puts "Jeweler, or one of its dependencies, is not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+  puts "Jeweler, or one of its dependencies, is not available. Install it with: sudo gem install jeweler"
 end

data/VERSION

@@ -1 +1 @@
-0.4.17
+0.5.1

data/fast_gettext.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{fast_gettext}
-  s.version = "0.4.17"
+  s.version = "0.5.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2009-10-16}
+  s.date = %q{2010-01-30}
   s.email = %q{grosser.michael@gmail.com}
   s.extra_rdoc_files = [
     "README.markdown"
@@ -48,7 +48,7 @@ Gem::Specification.new do |s|
      "lib/fast_gettext/translation_repository/logger.rb",
      "lib/fast_gettext/translation_repository/mo.rb",
      "lib/fast_gettext/translation_repository/po.rb",
-     "rdoc/README.rdoc",
+     "lib/fast_gettext/translation_repository/yaml.rb",
      "spec/aa_unconfigued_spec.rb",
      "spec/fast_gettext/mo_file_spec.rb",
      "spec/fast_gettext/storage_spec.rb",
@@ -58,6 +58,8 @@ Gem::Specification.new do |s|
      "spec/fast_gettext/translation_repository/logger_spec.rb",
      "spec/fast_gettext/translation_repository/mo_spec.rb",
      "spec/fast_gettext/translation_repository/po_spec.rb",
+     "spec/fast_gettext/translation_repository/yaml_spec.rb",
+     "spec/fast_gettext/translation_repository_spec.rb",
      "spec/fast_gettext/translation_spec.rb",
      "spec/fast_gettext_spec.rb",
      "spec/locale/de/LC_MESSAGES/test.mo",
@@ -66,6 +68,9 @@ Gem::Specification.new do |s|
      "spec/locale/en/LC_MESSAGES/test.mo",
      "spec/locale/en/plural_test.po",
      "spec/locale/en/test.po",
+     "spec/locale/yaml/de.yml",
+     "spec/locale/yaml/en.yml",
+     "spec/locale/yaml/notfound.yml",
      "spec/spec_helper.rb",
      "spec/vendor/fake_load_path/iconv.rb",
      "spec/vendor/iconv_spec.rb",
@@ -80,27 +85,28 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/grosser/fast_gettext}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubyforge_project = %q{fast-gettext}
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{A simple, fast and threadsafe implementation of GetText}
   s.test_files = [
-    "spec/fast_gettext_spec.rb",
-     "spec/spec_helper.rb",
-     "spec/fast_gettext/translation_spec.rb",
-     "spec/fast_gettext/storage_spec.rb",
-     "spec/fast_gettext/translation_repository/chain_spec.rb",
+    "spec/spec_helper.rb",
+     "spec/aa_unconfigued_spec.rb",
+     "spec/vendor/fake_load_path/iconv.rb",
+     "spec/vendor/iconv_spec.rb",
+     "spec/vendor/string_spec.rb",
+     "spec/fast_gettext_spec.rb",
+     "spec/fast_gettext/translation_repository_spec.rb",
+     "spec/fast_gettext/translation_repository/mo_spec.rb",
+     "spec/fast_gettext/translation_repository/db_spec.rb",
+     "spec/fast_gettext/translation_repository/yaml_spec.rb",
      "spec/fast_gettext/translation_repository/logger_spec.rb",
      "spec/fast_gettext/translation_repository/base_spec.rb",
      "spec/fast_gettext/translation_repository/po_spec.rb",
-     "spec/fast_gettext/translation_repository/db_spec.rb",
-     "spec/fast_gettext/translation_repository/mo_spec.rb",
+     "spec/fast_gettext/translation_repository/chain_spec.rb",
+     "spec/fast_gettext/translation_spec.rb",
      "spec/fast_gettext/mo_file_spec.rb",
-     "spec/aa_unconfigued_spec.rb",
-     "spec/vendor/iconv_spec.rb",
-     "spec/vendor/fake_load_path/iconv.rb",
-     "spec/vendor/string_spec.rb",
-     "examples/db/migration.rb",
-     "examples/missing_translation_logger.rb"
+     "spec/fast_gettext/storage_spec.rb",
+     "examples/missing_translation_logger.rb",
+     "examples/db/migration.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -113,3 +119,4 @@ Gem::Specification.new do |s|
   else
   end
 end
+

data/lib/fast_gettext/mo_file.rb

@@ -19,7 +19,7 @@ module FastGettext
       @data[key]
     end
 
-    #returns the plural forms or all singlgular translations that where found
+    #returns the plural forms or all singular translations that where found
     def plural(*msgids)
       translations = plural_translations(msgids)
       return translations unless translations.empty?

data/lib/fast_gettext/translation_repository.rb

@@ -5,11 +5,13 @@ module FastGettext
     extend self
 
     # only single-word types supported atm (mytype works, MyType will not)
-    def build(name,options)
+    def build(name, options)
       type = options[:type] || :mo
-      require "fast_gettext/translation_repository/#{type}"
-      klas = eval(type.to_s.capitalize)
-      klas.new(name,options)
+      class_name = type.to_s.capitalize
+      unless FastGettext::TranslationRepository.constants.map{|c|c.to_s}.include?(class_name)
+        require "fast_gettext/translation_repository/#{type}" 
+      end
+      eval(class_name).new(name,options)
     end
   end
 end

data/lib/fast_gettext/translation_repository/mo.rb

@@ -22,7 +22,7 @@ module FastGettext
 
       def find_and_store_files(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|
+        find_files_in_locale_folders(File.join('LC_MESSAGES',"#{name}.mo"), options[:path]) do |locale,file|
           @files[locale] = MoFile.new(file)
         end
       end

data/lib/fast_gettext/translation_repository/yaml.rb

@@ -0,0 +1,72 @@
+require 'fast_gettext/translation_repository/base'
+require 'yaml'
+
+module FastGettext
+  module TranslationRepository
+    # Responsibility:
+    #  - find and store yaml files
+    #  - provide access to translations in yaml files
+    class Yaml < Base
+      def initialize(name,options={})
+        find_and_store_files(options)
+        super
+      end
+
+      def available_locales
+        @files.keys
+      end
+
+      def plural(*keys)
+        ['one', 'other', 'plural2', 'plural3'].map do |name|
+          self[yaml_dot_notation(keys.first, name)]
+        end
+      end
+
+      def pluralisation_rule
+        self['pluralisation_rule'] ? lambda{|n| eval(self['pluralisation_rule']) } : nil
+      end
+
+      protected
+
+      MAX_FIND_DEPTH = 10
+
+      def find_and_store_files(options)
+        @files = {}
+        path = options[:path] || 'config/locales'
+        Dir["#{path}/??.yml"].each do |yaml_file|
+          locale = yaml_file.match(/([a-z]{2})\.yml$/)[1]
+          @files[locale] = load_yaml(yaml_file, locale)
+        end
+      end
+
+      def current_translations
+        @files[FastGettext.locale] || super
+      end
+
+      # Given a yaml file return a hash of key -> translation
+      def load_yaml(file, locale)
+        yaml = YAML.load_file(file)
+        yaml_hash_to_dot_notation(yaml[locale])
+      end
+
+      def yaml_hash_to_dot_notation(yaml_hash)
+        add_yaml_key({}, nil, yaml_hash)
+      end
+
+      def add_yaml_key(result, prefix, hash)
+        hash.each_pair do |key, value|
+          if value.kind_of?(Hash)
+            add_yaml_key(result, yaml_dot_notation(prefix, key), value)
+          else
+            result[yaml_dot_notation(prefix, key)] = value
+          end
+        end
+        result
+      end
+
+      def yaml_dot_notation(a,b)
+        a ? "#{a}.#{b}" : b
+      end
+    end
+  end
+end

data/spec/fast_gettext/mo_file_spec.rb

@@ -1,11 +1,10 @@
 current_folder = File.dirname(__FILE__)
 require File.join(current_folder,'..','spec_helper')
 
-include FastGettext
 de_file = File.join(current_folder,'..','locale','de','LC_MESSAGES','test.mo')
-de = MoFile.new(de_file)
+de = FastGettext::MoFile.new(de_file)
 
-describe MoFile do
+describe FastGettext::MoFile do
   before :all do
     File.exist?(de_file).should == true
   end

data/spec/fast_gettext/storage_spec.rb

@@ -1,9 +1,9 @@
 current_folder = File.dirname(__FILE__)
 require File.join(current_folder,'..','spec_helper')
 
-include FastGettext::Storage
-
 describe 'Storage' do
+  include FastGettext::Storage
+
   before do
     #reset everything to nil
     self.available_locales = nil
@@ -258,7 +258,7 @@ describe 'Storage' do
 
   describe :key_exist? do
     it "does not find default keys" do
-      _('abcde')
+      FastGettext._('abcde')
       key_exist?('abcde').should be_false
     end
 
@@ -291,19 +291,19 @@ describe 'Storage' do
     end
   end
 
-  describe NoTextDomainConfigured do
+  describe FastGettext::Storage::NoTextDomainConfigured do
     it "shows what to do" do
-      NoTextDomainConfigured.new.to_s.should =~ /FastGettext\.add_text_domain/
+      FastGettext::Storage::NoTextDomainConfigured.new.to_s.should =~ /FastGettext\.add_text_domain/
     end
 
     it "warns when text_domain is nil" do
       FastGettext.text_domain = nil
-      NoTextDomainConfigured.new.to_s.should =~ /\(nil\)/
+      FastGettext::Storage::NoTextDomainConfigured.new.to_s.should =~ /\(nil\)/
     end
 
     it "shows current text_domain" do
       FastGettext.text_domain = 'xxx'
-      NoTextDomainConfigured.new('xxx').to_s.should =~ /xxx/
+      FastGettext::Storage::NoTextDomainConfigured.new('xxx').to_s.should =~ /xxx/
     end
   end
 end

data/spec/fast_gettext/translation_repository/db_spec.rb

@@ -1,11 +1,12 @@
 current_folder = File.dirname(__FILE__)
 require File.join(current_folder,'..','..','spec_helper')
 
-require 'activerecord'
+require 'active_record'
 require 'fast_gettext/translation_repository/db'
-include FastGettext::TranslationRepository::Db.require_models
 
+include FastGettext::TranslationRepository::Db.require_models
 describe FastGettext::TranslationRepository::Db do
+
   before :all do
     ActiveRecord::Base.establish_connection({
       :adapter => "sqlite3",

data/spec/fast_gettext/translation_repository/mo_spec.rb

@@ -9,7 +9,7 @@ describe 'FastGettext::TranslationRepository::Mo' do
   end
 
   it "can be built" do
-    @rep.available_locales.should == ['de','en']
+    @rep.available_locales.sort.should == ['de','en']
   end
 
   it "can translate" do

data/spec/fast_gettext/translation_repository/po_spec.rb

@@ -9,7 +9,7 @@ describe 'FastGettext::TranslationRepository::Po' do
   end
 
   it "can be built" do
-    @rep.available_locales.should == ['de','en']
+    @rep.available_locales.sort.should == ['de','en']
   end
 
   it "can translate" do

data/spec/fast_gettext/translation_repository/yaml_spec.rb

@@ -0,0 +1,61 @@
+current_folder = File.dirname(__FILE__)
+require File.join(current_folder,'..','..','spec_helper')
+
+describe 'FastGettext::TranslationRepository::Yaml' do
+  before do
+    @rep = FastGettext::TranslationRepository.build('test', :path => File.join(current_folder,'..', '..', 'locale', 'yaml'), :type => :yaml)
+    @rep.is_a?(FastGettext::TranslationRepository::Yaml).should be_true
+    FastGettext.locale = 'de'
+  end
+
+  it "can be built" do
+    @rep.available_locales.sort.should == ['de', 'en']
+  end
+
+  it "translates nothing when locale is unsupported" do
+    FastGettext.locale = 'xx'
+    @rep['simple'].should == nil
+  end
+
+  it "does not translated categories" do
+    @rep['cars'].should == nil
+  end
+
+  it "can translate simple" do
+    @rep['simple'].should == 'einfach'
+  end
+
+  it "can translate nested" do
+    @rep['cars.car'].should == 'Auto'
+  end
+
+  it "can pluralize" do
+    @rep.plural('cars.axis').should == ['Achse', 'Achsen', nil, nil]
+  end
+
+  it "handles unfound plurals with nil" do
+    @rep.plural('cars.xxx').should == [nil, nil, nil, nil]
+  end
+
+  it "can be used to translate plural forms" do
+    FastGettext.stub!(:current_repository).and_return @rep
+    FastGettext.n_('cars.axis','cars.axis',2).should == 'Achsen'
+    FastGettext.n_('cars.axis',2).should == 'Achsen'
+    FastGettext.n_('cars.axis',1).should == 'Achse'
+  end
+
+  it "can be used to do wanky pluralisation rules" do
+    FastGettext.stub!(:current_repository).and_return @rep
+    4.times do |i|
+      @rep.stub!(:pluralisation_rule).and_return lambda{i}
+      FastGettext.n_('cars.silly',1).should == i.to_s
+    end
+  end
+
+  it "can use custom pluraliztion rules" do
+    FastGettext.locale = 'en'
+    {0 => 0, 1 => 1, 2 => 2, 3 => 0}.each do |input, expected|
+      @rep.pluralisation_rule.call(input).should == expected
+    end
+  end
+end

data/spec/fast_gettext/translation_repository_spec.rb

@@ -0,0 +1,34 @@
+current_folder = File.dirname(__FILE__)
+require File.join(current_folder,'..','spec_helper')
+
+module FastGettext
+  module TranslationRepository
+    class Dummy
+      attr_accessor :name, :options
+      def initialize(name, options)
+        @name = name
+        @options = options
+      end
+    end
+  end
+end
+
+describe FastGettext::TranslationRepository do
+  describe "build" do
+    it "auto requires class by default" do
+      lambda { FastGettext::TranslationRepository.build('xx', { :type => 'invalid'}) }.should raise_error(LoadError)
+    end
+
+    it "can have auto-require disabled" do
+      FastGettext::TranslationRepository.build('xx', { :type => 'dummy' })
+    end
+
+    it "makes a new repository" do
+      options = { :type => 'dummy', :external => true }
+      repo = FastGettext::TranslationRepository.build('xx', options)
+      repo.class.should == FastGettext::TranslationRepository::Dummy
+      repo.name.should == 'xx'
+      repo.options.should == options
+    end
+  end
+end

data/spec/fast_gettext/translation_spec.rb

@@ -1,9 +1,9 @@
 current_folder = File.dirname(__FILE__)
 require File.join(current_folder,'..','spec_helper')
 
-include FastGettext::Translation
-
 describe FastGettext::Translation do
+  include FastGettext::Translation
+
   before do
     default_setup
   end
@@ -107,11 +107,11 @@ describe FastGettext::Translation do
       before do
         FastGettext.translation_repositories.replace({})
         #singular cache keys
-        current_cache['xxx'] = '1'
+        FastGettext.current_cache['xxx'] = '1'
 
         #plural cache keys
-        current_cache['||||xxx'] = ['1','2']
-        current_cache['||||xxx||||yyy'] = ['1','2']
+        FastGettext.current_cache['||||xxx'] = ['1','2']
+        FastGettext.current_cache['||||xxx||||yyy'] = ['1','2']
       end
 
       it "uses the cache when translating with _" do

data/spec/fast_gettext_spec.rb

@@ -15,9 +15,8 @@ class IncludeTest
   end
 end
 
-include FastGettext
-
 describe FastGettext do
+  include FastGettext
   before :all do
     default_setup
   end

data/spec/locale/yaml/de.yml

@@ -0,0 +1,25 @@
+de:
+  simple: einfach
+  date:
+    relative: "vor %{relative_time}"
+
+  cars:
+    axis:
+      one: "Achse"
+      other: "Achsen"
+    silly:
+      one: '0'
+      other: '1'
+      plural2: '2'
+      plural3: '3'
+    model: "Modell"
+    wheel_count: "Räderzahl"
+    created: "Erstellt"
+    month: "Monat"
+    car: "Auto"
+    messages:
+      created: "Auto wurde erfolgreich gespeichert"
+      updated: "Auto wurde erfolgreich aktualisiert"
+
+  test_log:
+    phrases: "Dies ist eine dynamische Übersetzung, die durch gettext_test_log gefunden wurde!"

data/spec/locale/yaml/en.yml

@@ -0,0 +1,21 @@
+en:
+  pluralisation_rule: n<3?n:0
+  simple: easy
+  date:
+    relative: "%{relative_time} ago"
+
+  cars:
+    axis:
+      one: "Axis"
+      other: "Axis"
+    model: "Model"
+    wheel_count: "Wheels count"
+    created: "Created"
+    month: "Month"
+    car: "Car"
+    messages:
+      created: "Car was successfully created."
+      updated: "Car was successfully updated."
+
+  test_log:
+    phrases: "this is a dynamic translation which was found thorugh gettext_test_log!"

data/spec/locale/yaml/notfound.yml

@@ -0,0 +1,2 @@
+xx:
+  simple: FUUUU

data/spec/vendor/string_spec.rb

@@ -9,7 +9,7 @@ describe String do
 
   describe "old % style replacement" do
     it "substitudes using % + Hash" do
-      "x%{name}y" %{:name=>'a'}.should == 'xay'
+      ("x%{name}y" %{:name=>'a'}).should == 'xay'
     end
 
     it "does not substitute after %%" do
@@ -20,20 +20,22 @@ describe String do
       ("abc" % {:x=>1}).should == 'abc'
     end
 
-    it "sustitutes strings" do
-      ("a%{b}c" % {'b'=>1}).should == 'a1c'
-    end
+    if RUBY_VERSION < '1.9' # this does not longer work in 1.9, use :"my weird string"
+      it "sustitutes strings" do
+        ("a%{b}c" % {'b'=>1}).should == 'a1c'
+      end
 
-    it "sustitutes strings with -" do
-      ("a%{b-a}c" % {'b-a'=>1}).should == 'a1c'
-    end
+      it "sustitutes strings with -" do
+        ("a%{b-a}c" % {'b-a'=>1}).should == 'a1c'
+      end
 
-    it "sustitutes string with ." do
-      ("a%{b.a}c" % {'b.a'=>1}).should == 'a1c'
-    end
+      it "sustitutes string with ." do
+        ("a%{b.a}c" % {'b.a'=>1}).should == 'a1c'
+      end
 
-    it "sustitutes string with number" do
-      ("a%{1}c" % {'1'=>1}).should == 'a1c'
+      it "sustitutes string with number" do
+        ("a%{1}c" % {'1'=>1}).should == 'a1c'
+      end
     end
   end
 
@@ -42,12 +44,14 @@ describe String 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
+    if RUBY_VERSION < '1.9' # this does not longer work in 1.9, ArgumentError is raised
+      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"
+      it "does not remove %<> style replacement" do
+         ("%{name} %<num>f %s" % ['x']).should == "%{name} %<num>f x"
+      end
     end
   end
 
@@ -64,4 +68,10 @@ describe String do
       ("%<num>#b" % {:num => 1}).should == "0b1"
     end
   end
+
+  if RUBY_VERSION >= '1.9'
+    it "does not raise when key was not found" do
+      ("%{typo} xxx" % {:something=>1}).should == "%{typo} xxx"
+    end
+  end
 end

data/vendor/string.rb

@@ -56,3 +56,19 @@ rescue ArgumentError
     end
   end
 end
+
+# 1.9.1 if you misspell a %{key} your whole page would blow up, no thanks...
+begin
+  ("%{b}" % {:a=>'b'})
+rescue KeyError
+  class String
+    alias :_fast_gettext_old_format_m :%
+    def %(*args)
+      begin
+        _fast_gettext_old_format_m(*args)
+      rescue KeyError
+        self
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fast_gettext
 version: !ruby/object:Gem::Version 
-  version: 0.4.17
+  version: 0.5.1
 platform: ruby
 authors: 
 - Michael Grosser
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-16 00:00:00 +02:00
+date: 2010-01-30 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -55,7 +55,7 @@ files:
 - lib/fast_gettext/translation_repository/logger.rb
 - lib/fast_gettext/translation_repository/mo.rb
 - lib/fast_gettext/translation_repository/po.rb
-- rdoc/README.rdoc
+- lib/fast_gettext/translation_repository/yaml.rb
 - spec/aa_unconfigued_spec.rb
 - spec/fast_gettext/mo_file_spec.rb
 - spec/fast_gettext/storage_spec.rb
@@ -65,6 +65,8 @@ files:
 - spec/fast_gettext/translation_repository/logger_spec.rb
 - spec/fast_gettext/translation_repository/mo_spec.rb
 - spec/fast_gettext/translation_repository/po_spec.rb
+- spec/fast_gettext/translation_repository/yaml_spec.rb
+- spec/fast_gettext/translation_repository_spec.rb
 - spec/fast_gettext/translation_spec.rb
 - spec/fast_gettext_spec.rb
 - spec/locale/de/LC_MESSAGES/test.mo
@@ -73,6 +75,9 @@ files:
 - spec/locale/en/LC_MESSAGES/test.mo
 - spec/locale/en/plural_test.po
 - spec/locale/en/test.po
+- spec/locale/yaml/de.yml
+- spec/locale/yaml/en.yml
+- spec/locale/yaml/notfound.yml
 - spec/spec_helper.rb
 - spec/vendor/fake_load_path/iconv.rb
 - spec/vendor/iconv_spec.rb
@@ -106,26 +111,28 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: fast-gettext
+rubyforge_project: 
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: A simple, fast and threadsafe implementation of GetText
 test_files: 
-- spec/fast_gettext_spec.rb
 - spec/spec_helper.rb
-- spec/fast_gettext/translation_spec.rb
-- spec/fast_gettext/storage_spec.rb
-- spec/fast_gettext/translation_repository/chain_spec.rb
+- spec/aa_unconfigued_spec.rb
+- spec/vendor/fake_load_path/iconv.rb
+- spec/vendor/iconv_spec.rb
+- spec/vendor/string_spec.rb
+- spec/fast_gettext_spec.rb
+- spec/fast_gettext/translation_repository_spec.rb
+- spec/fast_gettext/translation_repository/mo_spec.rb
+- spec/fast_gettext/translation_repository/db_spec.rb
+- spec/fast_gettext/translation_repository/yaml_spec.rb
 - spec/fast_gettext/translation_repository/logger_spec.rb
 - spec/fast_gettext/translation_repository/base_spec.rb
 - spec/fast_gettext/translation_repository/po_spec.rb
-- spec/fast_gettext/translation_repository/db_spec.rb
-- spec/fast_gettext/translation_repository/mo_spec.rb
+- spec/fast_gettext/translation_repository/chain_spec.rb
+- spec/fast_gettext/translation_spec.rb
 - spec/fast_gettext/mo_file_spec.rb
-- spec/aa_unconfigued_spec.rb
-- spec/vendor/iconv_spec.rb
-- spec/vendor/fake_load_path/iconv.rb
-- spec/vendor/string_spec.rb
-- examples/db/migration.rb
+- spec/fast_gettext/storage_spec.rb
 - examples/missing_translation_logger.rb
+- examples/db/migration.rb

data/rdoc/README.rdoc

@@ -1 +0,0 @@
-documentation is at http://github.com/grosser/fast_gettext