fast_gettext 0.5.13 → 0.6.0

data/CHANGELOG

@@ -1,6 +1,7 @@
+0.6.0 -- plurals use singular translations as fallack e.g. you translated 'Axis' then n_('Axis','Axis',1) would return the translation for 'Axis' if no plural translation was found
 0.4.14 -- "" is translated as "", not as gettext meta information
 0.4.0 -- pluralisation_rules is no longer stored in each repository, only retrived. Added Chain and Logger repository.
 0.3.6 -- FastGettext.default_locale=
 0.3.5 -- FastGettext.default_text_domain=
 0.3.4 -- Exceptions are thrown, not returned when translating without text domain
-0.3 -- pluralisation methods accept/return n plural forms, contrary to singular/plural before
+0.3 -- pluralisation methods accept/return n plural forms, contrary to singular/plural before

data/Gemfile

@@ -5,5 +5,5 @@ group :dev do
   gem 'sqlite3'
   gem 'rspec', '~>2'
   gem 'jeweler'
-  gem 'activerecord'
-end
+  gem 'activerecord', ENV['AR']
+end

data/Gemfile.lock

@@ -1,35 +1,39 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.9)
-      activesupport (= 3.0.9)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.9)
-      activemodel (= 3.0.9)
-      activesupport (= 3.0.9)
-      arel (~> 2.0.10)
-      tzinfo (~> 0.3.23)
-    activesupport (3.0.9)
-    arel (2.0.10)
-    builder (2.1.2)
-    diff-lcs (1.1.2)
+    activemodel (3.1.0)
+      activesupport (= 3.1.0)
+      bcrypt-ruby (~> 3.0.0)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.0)
+      activemodel (= 3.1.0)
+      activesupport (= 3.1.0)
+      arel (~> 2.2.1)
+      tzinfo (~> 0.3.29)
+    activesupport (3.1.0)
+      multi_json (~> 1.0)
+    arel (2.2.1)
+    bcrypt-ruby (3.0.1)
+    builder (3.0.0)
+    diff-lcs (1.1.3)
     git (1.2.5)
-    i18n (0.5.0)
-    jeweler (1.5.2)
-      bundler (~> 1.0.0)
+    i18n (0.6.0)
+    jeweler (1.6.4)
+      bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    rake (0.8.7)
-    rspec (2.5.0)
-      rspec-core (~> 2.5.0)
-      rspec-expectations (~> 2.5.0)
-      rspec-mocks (~> 2.5.0)
-    rspec-core (2.5.1)
-    rspec-expectations (2.5.0)
+    multi_json (1.0.3)
+    rake (0.9.2)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.5.0)
-    sqlite3 (1.3.3)
+    rspec-mocks (2.6.0)
+    sqlite3 (1.3.4)
     tzinfo (0.3.29)
 
 PLATFORMS

data/Rakefile

@@ -1,7 +1,6 @@
-task :default => :spec
-require "rspec/core/rake_task"
-RSpec::Core::RakeTask.new(:spec) do |t|
-  t.rspec_opts = '--backtrace --color'
+task :default do
+  sh "AR='~>2' bundle && bundle exec rspec spec" # ActiveRecord 2
+  sh "AR='~>3' bundle && bundle exec rspec spec" # ActiveRecord 3
 end
 
 task :benchmark do
@@ -29,5 +28,5 @@ begin
 
   Jeweler::GemcutterTasks.new
 rescue LoadError
-  puts "Jeweler, or one of its dependencies, is not available. Install it with: sudo gem install jeweler"
+  puts "Jeweler, or one of its dependencies, is not available. Install it with: gem install jeweler"
 end

data/Readme.md

@@ -125,10 +125,20 @@ since it runs in a different thread then e.g. controllers, so set them inside yo
 
 Advanced features
 =================
-###Abnormal pluralisation
-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).
+### Abnormal pluralisation
+Plurals are selected by index, think of it as `['car', 'cars'][index]`<br/>
+A pluralisation rules decides which form to use e.g. in english its `count == 1 ? 0 : 1`.<br/>
+If you have any languages that do not fit this rule, you have to add a custom pluralisation rule.
 
+Via Ruby:
+
+    FastGettext.pluralisation_rule = lamda{|count| count > 5 ? 1 : (count > 2 ? 0 : 2)}
+
+Via mo/pofile:
+
+    Plural-Forms: nplurals=2; plural=n==2?3:4;
+
+[Plural expressions for all languages](http://translate.sourceforge.net/wiki/l10n/pluralforms).
 
 ###default_text_domain
 If you only use one text domain, setting `FastGettext.default_text_domain = 'app'`

data/VERSION

@@ -1 +1 @@
-0.5.13
+0.6.0

data/fast_gettext.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fast_gettext}
-  s.version = "0.5.13"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2011-06-30}
+  s.date = %q{2011-10-03}
   s.email = %q{michael@grosser.it}
   s.files = [
     "CHANGELOG",
@@ -55,6 +55,8 @@ Gem::Specification.new do |s|
     "lib/fast_gettext/vendor/poparser.rb",
     "lib/fast_gettext/vendor/string.rb",
     "spec/aa_unconfigued_spec.rb",
+    "spec/cases/interpolate_i18n_after_fast_gettext.rb",
+    "spec/cases/interpolate_i18n_before_fast_gettext.rb",
     "spec/fast_gettext/mo_file_spec.rb",
     "spec/fast_gettext/storage_spec.rb",
     "spec/fast_gettext/translation_repository/base_spec.rb",
@@ -89,27 +91,6 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.6.2}
   s.summary = %q{A simple, fast, memory-efficient and threadsafe implementation of GetText}
-  s.test_files = [
-    "examples/db/migration.rb",
-    "examples/missing_translation_logger.rb",
-    "spec/aa_unconfigued_spec.rb",
-    "spec/fast_gettext/mo_file_spec.rb",
-    "spec/fast_gettext/storage_spec.rb",
-    "spec/fast_gettext/translation_repository/base_spec.rb",
-    "spec/fast_gettext/translation_repository/chain_spec.rb",
-    "spec/fast_gettext/translation_repository/db_spec.rb",
-    "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/vendor/fake_load_path/iconv.rb",
-    "spec/fast_gettext/vendor/iconv_spec.rb",
-    "spec/fast_gettext/vendor/string_spec.rb",
-    "spec/fast_gettext_spec.rb",
-    "spec/spec_helper.rb"
-  ]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/lib/fast_gettext/mo_file.rb

@@ -20,10 +20,9 @@ module FastGettext
     end
 
     #returns the plural forms or all singular translations that where found
+    # Car, Cars => [Auto,Autos] or []
     def plural(*msgids)
-      translations = plural_translations(msgids)
-      return translations unless translations.empty?
-      msgids.map{|msgid| self[msgid] || msgid} #try to translate each id
+      split_plurals(self[msgids*PLURAL_SEPERATOR].to_s)
     end
 
     def pluralisation_rule
@@ -57,11 +56,5 @@ module FastGettext
     def split_plurals(singular_plural)
       singular_plural.split(PLURAL_SEPERATOR)
     end
-
-    # Car, Cars => [Auto,Autos] or []
-    def plural_translations(msgids)
-      plurals = self[msgids*PLURAL_SEPERATOR]
-      if plurals then split_plurals(plurals) else [] end
-    end
   end
 end

data/lib/fast_gettext/storage.rb

@@ -95,15 +95,21 @@ module FastGettext
 
     def cached_find(key)
       translation = current_cache[key]
-      return translation if translation or translation == false #found or was not found before
-      current_cache[key] = current_repository[key] || false
+      if translation.nil? # uncached
+        current_cache[key] = current_repository[key] || false
+      else
+        translation
+      end
     end
 
     def cached_plural_find(*keys)
       key = '||||' + keys * '||||'
       translation = current_cache[key]
-      return translation if translation or translation == false #found or was not found before
-      current_cache[key] = current_repository.plural(*keys) || false
+      if translation.nil? # uncached
+        current_cache[key] = current_repository.plural(*keys) || false
+      else
+        translation
+      end
     end
 
     def locale

data/lib/fast_gettext/translation.rb

@@ -28,9 +28,18 @@ module FastGettext
     def n_(*keys)
       count = keys.pop
       translations = FastGettext.cached_plural_find *keys
+
       selected = FastGettext.pluralisation_rule.call(count)
-      selected = selected ? 1 : 0 unless selected.is_a? Numeric #convert booleans to numbers
-      translations[selected] || keys[selected] || keys.last
+      selected = (selected ? 1 : 0) unless selected.is_a? Numeric #convert booleans to numbers
+
+      result = translations[selected]
+      if result
+        result
+      elsif keys[selected]
+        _(keys[selected])
+      else
+        keys.last
+      end
     end
 
     #translate, but discard namespace if nothing was found

data/spec/cases/interpolate_i18n_after_fast_gettext.rb

@@ -0,0 +1,7 @@
+$LOAD_PATH.unshift 'lib'
+require 'fast_gettext'
+raise unless "%{a}" % {:a => 1} == '1'
+require 'i18n/core_ext/string/interpolate'
+require 'active_support/core_ext/string/output_safety'
+raise unless "%{a}" % {:a => 1} == '1'
+raise unless "%{a}".html_safe % {:a => 1} == '1'

data/spec/cases/interpolate_i18n_before_fast_gettext.rb

@@ -0,0 +1,9 @@
+$LOAD_PATH.unshift 'lib'
+
+require 'i18n/core_ext/string/interpolate'
+require 'active_support/core_ext/string/output_safety'
+raise unless "%{a}" %{:a => 1} == '1'
+raise unless "%{a}".html_safe % {:a => 1} == '1'
+require 'fast_gettext'
+raise unless "%{a}" %{:a => 1} == '1'
+raise unless "%{a}".html_safe % {:a => 1} == '1'

data/spec/fast_gettext/mo_file_spec.rb

@@ -20,15 +20,11 @@ describe FastGettext::MoFile do
     de.plural('Axis','Axis').should == ['Achse','Achsen']
   end
 
-  it "returns singular translations when pluralisation could not be found" do
-    de.plural('Axis','Axis','Axis').should == ['Achse','Achse','Achse']
-  end
-
-  it "returns ids when not plural and singular translations could not be found" do
-    de.plural('Axis','Axis','NOTFOUND').should == ['Achse','Achse','NOTFOUND']
+  it "returns empty array when pluralisation could not be found" do
+    de.plural('Axis','Axis','Axis').should == []
   end
 
   it "can access plurals through []" do
     de['Axis'].should == 'Achse' #singular
   end
-end
+end

data/spec/fast_gettext/translation_repository/base_spec.rb

@@ -15,6 +15,6 @@ describe 'FastGettext::TranslationRepository::Base' do
   end
 
   it "cannot pluralize" do
-    @rep.plural('Axis','Axis').should == ['Axis','Axis']
+    @rep.plural('Axis','Axis').should == []
   end
-end
+end

data/spec/fast_gettext/translation_repository/chain_spec.rb

@@ -56,7 +56,7 @@ describe 'FastGettext::TranslationRepository::Chain' do
       end
 
       it "uses the second repo in the chain if the first does not respond" do
-        @one.should_receive(:plural).with('a','b').and_return [nil,nil]
+        @one.should_receive(:plural).with('a','b').and_return []
         @two.should_receive(:plural).with('a','b').and_return ['A','B']
         @rep.plural('a','b').should == ['A','B']
       end
@@ -78,4 +78,4 @@ describe 'FastGettext::TranslationRepository::Chain' do
       end
     end
   end
-end
+end

data/spec/fast_gettext/translation_spec.rb

@@ -63,7 +63,11 @@ describe FastGettext::Translation do
         n_('singular','plural','c','d',2).should == 'plural'
       end
     end
-    
+
+    it "returns a simple translation when no combined was found" do
+      n_('Axis','NOTFOUNDs',1).should == 'Achse'
+    end
+
     it "returns the appropriate key if no translation was found" do
       n_('NOTFOUND','NOTFOUNDs',1).should == 'NOTFOUND'
       n_('NOTFOUND','NOTFOUNDs',2).should == 'NOTFOUNDs'
@@ -155,4 +159,4 @@ describe FastGettext::Translation do
       _('car').should == 'Auto'
     end
   end
-end
+end

data/spec/fast_gettext/vendor/string_spec.rb

@@ -1,6 +1,5 @@
 require File.expand_path('spec/spec_helper')
 
-#just to make sure we did not mess up while copying...
 describe String do
   before :all do
     if "i18n gem overwrites % method".respond_to?(:interpolate_without_ruby_19_syntax)
@@ -83,4 +82,18 @@ describe String do
       ("%{typo} xxx" % {:something=>1}).should == "%{typo} xxx"
     end
   end
-end
+
+  describe 'with i18n loaded' do
+    it "interpolates if i18n is loaded before" do
+      pending do
+        system("bundle exec ruby spec/cases/interpolate_i18n_before_fast_gettext.rb  > /dev/null 2>&1").should == true
+      end
+    end
+
+    it "interpolates if i18n is loaded before" do
+      pending do
+        system("bundle exec ruby spec/cases/interpolate_i18n_after_fast_gettext.rb > /dev/null 2>&1").should == true
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -11,13 +11,6 @@ RSpec.configure do |config|
   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'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fast_gettext
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 7
   prerelease: 
   segments: 
   - 0
-  - 5
-  - 13
-  version: 0.5.13
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Michael Grosser
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-30 00:00:00 +02:00
+date: 2011-10-03 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -71,6 +71,8 @@ files:
 - lib/fast_gettext/vendor/poparser.rb
 - lib/fast_gettext/vendor/string.rb
 - spec/aa_unconfigued_spec.rb
+- spec/cases/interpolate_i18n_after_fast_gettext.rb
+- spec/cases/interpolate_i18n_before_fast_gettext.rb
 - spec/fast_gettext/mo_file_spec.rb
 - spec/fast_gettext/storage_spec.rb
 - spec/fast_gettext/translation_repository/base_spec.rb
@@ -134,23 +136,5 @@ rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A simple, fast, memory-efficient and threadsafe implementation of GetText
-test_files: 
-- examples/db/migration.rb
-- examples/missing_translation_logger.rb
-- spec/aa_unconfigued_spec.rb
-- spec/fast_gettext/mo_file_spec.rb
-- spec/fast_gettext/storage_spec.rb
-- spec/fast_gettext/translation_repository/base_spec.rb
-- spec/fast_gettext/translation_repository/chain_spec.rb
-- spec/fast_gettext/translation_repository/db_spec.rb
-- 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/vendor/fake_load_path/iconv.rb
-- spec/fast_gettext/vendor/iconv_spec.rb
-- spec/fast_gettext/vendor/string_spec.rb
-- spec/fast_gettext_spec.rb
-- spec/spec_helper.rb
+test_files: []
+