russian 0.0.4 → 0.0.5

data/README.textile

@@ -177,6 +177,8 @@ Russian.p(2, "вещь", "вещи", "вещей")
 => "вещи"
 Russian.p(10, "вещь", "вещи", "вещей")
 => "вещей"
+Russian.p(3.14, "вещь", "вещи", "вещей", "вещи") # последний вариант используется для дробных величин
+=> "вещи"
 </code></pre>
 
 -- упрощенная (без использования хешей I18n) плюрализация для русского языка

data/Rakefile

@@ -5,7 +5,7 @@ require 'rubygems/specification'
 require 'date'
 
 GEM = "russian"
-GEM_VERSION = "0.0.4"
+GEM_VERSION = "0.0.5"
 AUTHOR = "Yaroslav Markin"
 EMAIL = "yaroslav@markin.net"
 HOMEPAGE = "http://github.com/yaroslav/russian/"

data/lib/russian.rb

@@ -22,7 +22,7 @@ module Russian
   module VERSION
     MAJOR = 0
     MINOR = 0
-    TINY  = 4
+    TINY  = 5
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
@@ -46,7 +46,9 @@ module Russian
     # Init Russian i18n: set custom backend, set default locale to Russian locale, load all translations
     # shipped with library.
     def init_i18n
+      loaded_translations = I18n.backend.__send__(:translations)
       I18n.backend = Russian.i18n_backend_class.new
+      loaded_translations.each_pair { |locale, data| I18n.backend.store_translations(locale, data) }
       I18n.default_locale = LOCALE
       locale_files.each { |file| I18n.backend.load_translations(file) }
     end
@@ -72,7 +74,11 @@ module Russian
     #
     # Usage: 
     #   Russian.pluralize(1, "вещь", "вещи", "вещей")
+    #   Russian.pluralize(3.14, "вещь", "вещи", "вещей", "вещи")
     def pluralize(n, *variants)
+      raise ArgumentError, "Must have a Numeric as a first parameter" unless n.is_a?(Numeric)
+      raise ArgumentError, "Must have at least 3 variants for pluralization" if variants.size < 3
+      raise ArgumentError, "Must have at least 4 variants for pluralization" if (variants.size < 4 && n != n.round)
       variants_hash = pluralization_variants_to_hash(*variants)
       I18n.backend.send(:pluralize, LOCALE, variants_hash, n)
     end
@@ -84,15 +90,14 @@ module Russian
         Dir[File.join(File.dirname(__FILE__), "russian", "locale", "**/*")]
       end
       
-      # Converts an array of pluralization variants (3 entries) to a Hash that can be used
+      # Converts an array of pluralization variants to a Hash that can be used
       # with I18n pluralization.
       def pluralization_variants_to_hash(*variants)
-        raise ArgumentError, "Must have at least 3 variants for pluralization" if variants.size < 3
         {
           :one => variants[0],
           :few => variants[1],
           :many => variants[2],
-          :other => variants[1]
+          :other => variants[3]
         }
       end
   end

data/lib/russian/locale/pluralize.rb

@@ -11,18 +11,20 @@
       #   many -> n mod 10 is 0 or n mod 10 in 5..9 or n mod 100 in 11..14;
       #   other -> everything else
       #
-      # Examples
+      # Пример
       #
-      #   one	= 1, 21, 31, 41, 51, 61...
-      #   few	= 2-4, 22-24, 32-34...
-      #   many = 0, 5-20, 25-30, 35-40...
-      #   other = 1.31, 2.31, 5.31...
-      if n.modulo(10) == 1 && n.modulo(100) != 11
+      #   :one	= 1, 21, 31, 41, 51, 61...
+      #   :few	= 2-4, 22-24, 32-34...
+      #   :many = 0, 5-20, 25-30, 35-40...
+      #   :other = 1.31, 2.31, 5.31...
+      modulo10 = n.modulo(10)
+      modulo100 = n.modulo(100)
+      
+      if modulo10 == 1 && modulo100 != 11
         :one
-      elsif (n.modulo(10) >=2 && n.modulo(10) <= 4) && !(n.modulo(100) >=12 && n.modulo(100) <= 14)
+      elsif (modulo10 == 2 || modulo10 == 3 || modulo10 == 4) && !(modulo100 == 12 || modulo100 == 13 || modulo100 == 14)
         :few
-      elsif n.modulo(10) == 0 || (n.modulo(10) >=5 && n.modulo(10) <= 9) || 
-        (n.modulo(100) >= 11 && n.modulo(100) <= 14)
+      elsif modulo10 == 0 || (modulo10 == 5 || modulo10 == 6 || modulo10 == 7 || modulo10 == 8 || modulo10 == 9) || (modulo100 == 11 || modulo100 == 12 || modulo100 == 13 || modulo100 == 14)
         :many
       else
         :other

data/spec/i18n/locale/pluralization_spec.rb

@@ -2,22 +2,25 @@ require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe I18n, "Russian pluralization" do
   before(:each) do
-    @hash = {:one => 'вещь', :few => 'вещи', :many => 'вещей', :other => 'вещи'}
+    @hash = {}
+    %w(one few many other).each do |key|
+      @hash[key.to_sym] = key
+    end
     @backend = I18n.backend
   end
   
   it "should pluralize correctly" do
-    @backend.send(:pluralize, :'ru-RU', @hash, 1).should == 'вещь'
-    @backend.send(:pluralize, :'ru-RU', @hash, 2).should == 'вещи'
-    @backend.send(:pluralize, :'ru-RU', @hash, 3).should == 'вещи'
-    @backend.send(:pluralize, :'ru-RU', @hash, 5).should == 'вещей'
-    @backend.send(:pluralize, :'ru-RU', @hash, 10).should == 'вещей'
-    @backend.send(:pluralize, :'ru-RU', @hash, 21).should == 'вещь'
-    @backend.send(:pluralize, :'ru-RU', @hash, 29).should == 'вещей'
-    @backend.send(:pluralize, :'ru-RU', @hash, 129).should == 'вещей'
-    @backend.send(:pluralize, :'ru-RU', @hash, 131).should == 'вещь'
-    @backend.send(:pluralize, :'ru-RU', @hash, 1.31).should == 'вещи'
-    @backend.send(:pluralize, :'ru-RU', @hash, 2.31).should == 'вещи'
-    @backend.send(:pluralize, :'ru-RU', @hash, 3.31).should == 'вещи'
+    @backend.send(:pluralize, :'ru-RU', @hash, 1).should == 'one'
+    @backend.send(:pluralize, :'ru-RU', @hash, 2).should == 'few'
+    @backend.send(:pluralize, :'ru-RU', @hash, 3).should == 'few'
+    @backend.send(:pluralize, :'ru-RU', @hash, 5).should == 'many'
+    @backend.send(:pluralize, :'ru-RU', @hash, 10).should == 'many'
+    @backend.send(:pluralize, :'ru-RU', @hash, 11).should == 'many'
+    @backend.send(:pluralize, :'ru-RU', @hash, 21).should == 'one'
+    @backend.send(:pluralize, :'ru-RU', @hash, 29).should == 'many'
+    @backend.send(:pluralize, :'ru-RU', @hash, 131).should == 'one'
+    @backend.send(:pluralize, :'ru-RU', @hash, 1.31).should == 'other'
+    @backend.send(:pluralize, :'ru-RU', @hash, 2.31).should == 'other'
+    @backend.send(:pluralize, :'ru-RU', @hash, 3.31).should == 'other'
   end
 end

data/spec/russian_spec.rb

@@ -31,6 +31,12 @@ describe Russian do
       I18n.backend.class.should == Russian.i18n_backend_class
     end
     
+    it "should keep existing translations while switching backends" do
+      I18n.backend.store_translations(:'en-US', { :foo => "bar" })
+      Russian.init_i18n
+      I18n.t(:foo, :locale => :'en-US').should == "bar"
+    end
+    
     it "should set default locale to Russian locale" do
       Russian.init_i18n
       I18n.default_locale.should == Russian.locale
@@ -85,7 +91,7 @@ describe Russian do
   describe "with pluralization" do
     %w(p pluralize).each do |method|
       it "'#{method}' should pluralize with variants given" do
-        variants = %w(вещь вещи вещей)
+        variants = %w(вещь вещи вещей вещи)
         
         Russian.send(method, 1, *variants).should == "вещь"
         Russian.send(method, 2, *variants).should == 'вещи'
@@ -96,12 +102,21 @@ describe Russian do
         Russian.send(method, 29, *variants).should == 'вещей'
         Russian.send(method, 129, *variants).should == 'вещей'
         Russian.send(method, 131, *variants).should == 'вещь'
+        Russian.send(method, 3.14, *variants).should == 'вещи'
+      end
+      
+      it "should raise an exception when first parameter is not a number" do
+        lambda { Russian.send(method, nil, "вещь", "вещи", "вещей") }.should raise_error(ArgumentError)
+        lambda { Russian.send(method, "вещь", "вещь", "вещи", "вещей") }.should raise_error(ArgumentError)
       end
       
       it "should raise an exception when there are not enough variants" do
         lambda { Russian.send(method, 1) }.should raise_error(ArgumentError)
         lambda { Russian.send(method, 1, "вещь") }.should raise_error(ArgumentError)
         lambda { Russian.send(method, 1, "вещь", "вещи") }.should raise_error(ArgumentError)
+        lambda { Russian.send(method, 1, "вещь", "вещи", "вещей") }.should_not raise_error(ArgumentError)
+        lambda { Russian.send(method, 3.14, "вещь", "вещи", "вещей") }.should raise_error(ArgumentError)
+        lambda { Russian.send(method, 3.14, "вещь", "вещи", "вещей", "вещи") }.should_not raise_error(ArgumentError)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: russian
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Yaroslav Markin