r18n-rails-api 1.0.1 → 1.1.0

data/lib/r18n-rails-api.rb

@@ -21,6 +21,7 @@ require 'pathname'
 require 'r18n-core'
 
 dir = Pathname(__FILE__).dirname.expand_path + 'r18n-rails-api'
+require dir + 'rails_plural'
 require dir + 'filters'
 require dir + 'loader'
 require dir + 'backend'

data/lib/r18n-rails-api/backend.rb

@@ -45,7 +45,7 @@ module R18n
         Array(default).each do |entry|
           if entry.is_a? Symbol
             value = lookup(scope, entry, separator, params)
-            return value if value.translated?
+            return value unless value.is_a? Untranslated
           else
             return entry
           end
@@ -85,15 +85,53 @@ module R18n
 
     protected
 
+    def format_value(result)
+      if result.is_a? TranslatedString
+        result.to_s
+      elsif result.is_a? UnpluralizetedTranslation
+        Utils.hash_map(result.to_hash) do |key, value|
+          [RailsPlural.from_r18n(key), value]
+        end
+      elsif result.is_a? Translation
+        translation_to_hash(result)
+      else
+        result
+      end
+    end
+
+    def translation_to_hash(translation)
+      Utils.hash_map(translation.to_hash) do |key, value|
+        value = if value.is_a? Hash
+          translation_to_hash(value)
+        else
+          format_value(value)
+        end
+        [key.to_sym, value]
+      end
+    end
+
     # Find translation by <tt>scope.key(params)</tt> in current R18n I18n
     # object.
     def lookup(scope, key, separator, params)
       keys = (Array(scope) + Array(key)).map { |k|
         k.to_s.split(separator || ::I18n.default_separator) }.flatten
-      last = keys.pop
+      last = keys.pop.to_sym
+
+      result = keys.inject(R18n.get.t) do |node, key|
+        if node.is_a? TranslatedString
+          node.get_untranslated(key)
+        else
+          node[key]
+        end
+      end
+
+      result = if result.is_a? TranslatedString
+        result.get_untranslated(key)
+      else
+        result[last, params]
+      end
 
-      result = keys.inject(R18n.get) { |result, key| result[key] }
-      result[last, params]
+      format_value(result)
     end
   end
 end

data/lib/r18n-rails-api/filters.rb

@@ -37,12 +37,30 @@ R18n::Filters.add(String, :named_variables) do |content, config, params|
   content
 end
 
+module R18n
+  # Class to mark unpluralized translation and convert Rails plural keys
+  class RailsUnpluralizetedTranslation < UnpluralizetedTranslation
+    def [](name, *params)
+      result = super
+      if result.is_a? Untranslated
+        fixed = super(RailsPlural.to_r18n(name), *params)
+        result = fixed unless fixed.is_a? Untranslated
+      end
+      result
+    end
+  end
+end
+
 # Pluralization by named variable <tt>%{count}</tt>.
 R18n::Filters.add('pl', :named_pluralization) do |content, config, param|
   if param.is_a? Hash and param.has_key? :count
+    hash = content.to_hash
     type = config[:locale].pluralize(param[:count])
-    type = 'n' if not content.has_key? type
-    content[type]
+    type = 'n' if not hash.has_key? type
+    hash[type]
+  elsif content.is_a? R18n::UnpluralizetedTranslation
+    R18n::RailsUnpluralizetedTranslation.new(config[:locale], config[:path],
+        :locale => config[:locale], :translations => content.to_hash)
   else
     content
   end

data/lib/r18n-rails-api/loader.rb

@@ -33,17 +33,14 @@ module R18n
     #   R18n::I18n.new('en',
     #                  R18n::Loader::Rails.new(I18n::Backend::ActiveRecord.new))
     class Rails
-      PLURAL_KEYS = { :zero  => 0, :one => 1, :few => 2, :many => 'n',
-                      :other => 'other' }
-
       # Create new loader for some +backend+ from Rails I18n. Backend must have
       # +reload!+, +init_translations+ and +translations+ methods.
       def initialize(backend = ::I18n::Backend::Simple.new)
         @backend = backend
-        @private_type_class = if ('1.8.' == RUBY_VERSION[0..3] || RUBY_PLATFORM == 'java')
-          ::YAML::PrivateType
+        if ('1.8.' == RUBY_VERSION[0..3] || RUBY_PLATFORM == 'java')
+          @private_type_class = ::YAML::PrivateType
         else
-          ::Syck::PrivateType
+          @private_type_class = ::Syck::PrivateType
         end
       end
 
@@ -85,12 +82,12 @@ module R18n
         if value.is_a? Hash
           if value.empty?
             value
-          elsif value.keys.inject(true) { |a, i| a and PLURAL_KEYS.include? i }
-            R18n::Typed.new('pl', R18n::Utils.hash_map(value) { |k, v|
-              [PLURAL_KEYS[k], transform(v)]
+          elsif value.keys.inject(true) { |a, i| a and RailsPlural.is_rails? i }
+            Typed.new('pl', R18n::Utils.hash_map(value) { |k, v|
+              [RailsPlural.to_r18n(k), transform(v)]
             })
           else
-            R18n::Utils.hash_map(value) { |k, v| [k.to_s, transform(v)] }
+            Utils.hash_map(value) { |k, v| [k.to_s, transform(v)] }
           end
         elsif value.is_a? @private_type_class
           Typed.new(value.type_id, value.value)

data/lib/r18n-rails-api/rails_plural.rb

@@ -0,0 +1,39 @@
+# encoding: utf-8
+=begin
+Converter between R18n and Rails I18n plural keys.
+
+Copyright (C) 2009 Andrey “A.I.” Sitnik <andrey@sitnik.ru>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+=end
+
+module R18n
+  # Converter between R18n and Rails I18n plural keys.
+  class RailsPlural
+    # Check, that +key+ is Rails plural key.
+    def self.is_rails?(k)
+      [:zero, :one, :few, :many, :other].include? k
+    end
+
+    # Convert Rails I18n plural key to R18n.
+    def self.to_r18n(k)
+      { :zero  => 0, :one => 1, :few => 2, :many => 'n', :other => 'n' }[k]
+    end
+
+    # Convert R18n plural key to Rails I18n.
+    def self.from_r18n(k)
+      { 0 => :zero, 1 => :one, 2 => :few, 'n' => :other }[k]
+    end
+  end
+end

data/r18n-rails-api.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
     R18n has nice Ruby-style syntax, filters, flexible locales, custom loaders,
     translation support for any classes, time and number localization, several
     user language support, agnostic core package with out-of-box support for
-    Rails, Sinatra, Merb and desktop applications.
+    Rails, Sinatra and desktop applications.
   EOF
 
   s.files            = `git ls-files`.split("\n")

data/spec/backend_spec.rb

@@ -32,9 +32,9 @@ describe R18n::Backend do
   end
 
   it "should use pluralization and variables" do
-    I18n.t(:users, :count => 0).should == '0 users'
-    I18n.t(:users, :count => 1).should == '1 user'
-    I18n.t(:users, :count => 5).should == '5 users'
+    I18n.t('users', :count => 0).should == '0 users'
+    I18n.t('users', :count => 1).should == '1 user'
+    I18n.t('users', :count => 5).should == '5 users'
   end
 
   it "should use another separator" do
@@ -68,4 +68,44 @@ describe R18n::Backend do
     I18n.t(:other).should == 'Other'
   end
 
+  it "should return plain classes" do
+    I18n.t('in.another.level').class.should == ActiveSupport::SafeBuffer
+    I18n.t('in.another').class.should == Hash
+  end
+
+  it "should return correct unpluralized hash" do
+    I18n.t('users').should == { :one => '1 user', :other => '%{count} users' }
+  end
+
+  it "should correct detect untranslated, whem path is deeper than string" do
+    lambda {
+      I18n.t('in.another.level.deeper')
+    }.should raise_error(::I18n::MissingTranslationData)
+
+    lambda {
+      I18n.t('in.another.level.go.deeper')
+    }.should raise_error(::I18n::MissingTranslationData)
+  end
+
+  it "should not call String methods" do
+    I18n.t('in.another').class.should == Hash
+  end
+
+  it "should not call object methods" do
+    lambda {
+      I18n.t('in.another.level.to_sym')
+    }.should raise_error(::I18n::MissingTranslationData)
+  end
+
+  it "should work deeper pluralization" do
+    I18n.t('users.other', :count => 5).should == '5 users'
+  end
+
+  it "should return hash with symbols keys" do
+    I18n.t('in').should == {
+      :another => { :level => 'Hierarchical' },
+      :default => 'Default'
+    }
+  end
+
 end

data/spec/data/general/en.yml

@@ -18,4 +18,4 @@ en:
 
   users:
     one: 1 user
-    many: "%{count} users"
+    other: "%{count} users"

data/spec/data/pl/ru.yml

@@ -0,0 +1,6 @@
+ru:
+  users:
+    zero: Ноль
+    one:  Один
+    few:  Несколько
+    many: Много

data/spec/data/simple/en.yml

@@ -3,5 +3,4 @@ en:
     zero: Zero
     one: One
     few: Few
-    many: Many
     other: Other

data/spec/loader_spec.rb

@@ -2,7 +2,7 @@
 require File.expand_path('../spec_helper', __FILE__)
 
 describe R18n::Loader::Rails do
-  before :all do
+  before do
     I18n.load_path = [SIMPLE]
     @loader = R18n::Loader::Rails.new
   end
@@ -18,7 +18,16 @@ describe R18n::Loader::Rails do
   it "should change pluralization" do
     @loader.load(EN).should == {
       'users' => R18n::Typed.new('pl', {
-        0 => 'Zero', 1 => 'One', 2 => 'Few', 'n' => 'Many', 'other' => 'Other'
+        0 => 'Zero', 1 => 'One', 2 => 'Few', 'n' => 'Other'
+       })
+    }
+  end
+
+  it "should change Russian pluralization" do
+    I18n.load_path = [PL]
+    @loader.load(RU).should == {
+      'users' => R18n::Typed.new('pl', {
+        0 => 'Ноль', 1 => 'Один', 2 => 'Несколько', 'n' => 'Много'
        })
     }
   end

data/spec/spec_helper.rb

@@ -11,3 +11,4 @@ RU = R18n.locale(:ru)
 GENERAL = Dir.glob(File.join(File.dirname(__FILE__), 'data/general/*'))
 SIMPLE  = Dir.glob(File.join(File.dirname(__FILE__), 'data/simple/*'))
 OTHER   = Dir.glob(File.join(File.dirname(__FILE__), 'data/other/*'))
+PL      = Dir.glob(File.join(File.dirname(__FILE__), 'data/pl/*'))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: r18n-rails-api
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-30 00:00:00.000000000 Z
+date: 2012-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: r18n-core
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -165,7 +165,7 @@ description: ! "    R18n backend for Rails I18n and R18n filters and loader to s
   Rails\n    translation format.\n    R18n has nice Ruby-style syntax, filters, flexible
   locales, custom loaders,\n    translation support for any classes, time and number
   localization, several\n    user language support, agnostic core package with out-of-box
-  support for\n    Rails, Sinatra, Merb and desktop applications.\n"
+  support for\n    Rails, Sinatra and desktop applications.\n"
 email: andrey@sitnik.ru
 executables: []
 extensions: []
@@ -182,11 +182,13 @@ files:
 - lib/r18n-rails-api/backend.rb
 - lib/r18n-rails-api/filters.rb
 - lib/r18n-rails-api/loader.rb
+- lib/r18n-rails-api/rails_plural.rb
 - r18n-rails-api.gemspec
 - spec/backend_spec.rb
 - spec/data/general/en.yml
 - spec/data/other/en.yml
 - spec/data/other/ru.yml
+- spec/data/pl/ru.yml
 - spec/data/simple/en.yml
 - spec/data/simple/ru.rb
 - spec/data/simple/russian.yml
@@ -207,7 +209,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3012698010051286464
+      hash: 3135207149384542194
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -216,7 +218,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3012698010051286464
+      hash: 3135207149384542194
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23