number_to_words_ru 0.2.2 → 0.2.3

data/lib/number_to_words_ru/array_additions/helpers.rb

@@ -15,6 +15,12 @@ module ArrayAdditions
       figures_array_in_capacity(capacity).reverse.join.to_i
     end
 
+    def number_for_gender capacity
+      figures = figures_array_in_capacity(capacity)
+      teens = figures.teens
+      teens ? teens.join.to_i : figures.first
+    end
+
     def is_a_thousand_capacity? capacity
       THOUSAND_CAPACITY == capacity
     end

data/lib/number_to_words_ru/strategies/en.rb

@@ -33,7 +33,7 @@ module Strategies
           strings
         end
 
-        if !number_in_capacity_by_words.empty?
+        unless number_in_capacity_by_words.empty?
           words.push translation_megs(capacity) if 0 < capacity
           words += number_in_capacity_by_words
         end

data/lib/number_to_words_ru/strategies/ru.rb

@@ -31,9 +31,9 @@ module Strategies
           strings figures.is_a_thousand_capacity?(capacity) ? :female : :male
         end
 
-        if !number_in_capacity_by_words.empty?
+        unless number_in_capacity_by_words.empty?
           if 0 < capacity
-            words.push translation_megs(capacity, figures.number_in_capacity(capacity))
+            words.push translation_megs(capacity, figures.number_for_gender(capacity))
           end
           words += number_in_capacity_by_words
         end

data/spec/number_to_words_ru/integer/ru_spec.rb

@@ -132,147 +132,161 @@ describe Integer do
             join(' ') }
         end
 
-        describe 'few' do
-          context '2000 as lower example' do
-            subject { 2000 }
+        context '21000 as uniq example' do
+          subject { 21000 }
 
-            its(:to_words) { should == [t(:ones_female)[2], t(:thousands, :count => 2)].
-              join(' ') }
-          end
-
-          context '4000 as upper example' do
-            subject { 4000 }
-
-            its(:to_words) { should == [t(:ones_female)[4], t(:thousands, :count => 4)].
-              join(' ') }
-          end
-        end
-
-        describe 'many' do
-          context '5000 as lower example' do
-            subject { 5000 }
-
-            its(:to_words) { should == [t(:ones_female)[5], t(:thousands, :count => 5)].
-              join(' ') }
-          end
-
-          context '999000 as upper example' do
-            subject { 999000 }
-
-            its(:to_words) { should == [t(:hundreds)[9],
-              t(:tens)[9],
-              t(:ones_female)[9],
-              t(:thousands, :count => 999)
-            ].join(' ') }
-          end
-        end
-
-        describe 'custom' do
-          context '999999 as example with first capacity' do
-            subject { 999999 }
-
-            its(:to_words) { should == [t(:hundreds)[9],
-              t(:tens)[9],
-              t(:ones_female)[9],
-              t(:thousands, :count => 999),
-              t(:hundreds)[9],
-              t(:tens)[9],
-              t(:ones_male)[9],
-            ].join(' ') }
-          end
+          its(:to_words) { should == [
+            t(:tens)[2], t(:ones_female)[1], t(:thousands, :count => 1)
+          ].join(' ') }
         end
       end
-    end
 
-    describe 'millions' do
-      describe 'one' do
-        context '1000000 as uniq example' do
-          subject { 1000000 }
+      describe 'few' do
+        context '2000 as lower example' do
+          subject { 2000 }
 
-          its(:to_words) { should == [t(:ones_male)[1], t(:millions, :count => 1)].
+          its(:to_words) { should == [t(:ones_female)[2], t(:thousands, :count => 2)].
             join(' ') }
         end
-      end
 
-      context 'few' do
-        context '2000000 as lower example in few' do
-          subject { 2000000 }
+        context '4000 as upper example' do
+          subject { 4000 }
 
-          its(:to_words) { should == [t(:ones_male)[2], t(:millions, :count => 2)].
+          its(:to_words) { should == [t(:ones_female)[4], t(:thousands, :count => 4)].
             join(' ') }
         end
+      end
 
-        context '4000000 as upper example in few' do
-          subject { 4000000 }
+      describe 'many' do
+        context '5000 as lower example' do
+          subject { 5000 }
 
-          its(:to_words) { should == [t(:ones_male)[4], t(:millions, :count => 4)].
+          its(:to_words) { should == [t(:ones_female)[5], t(:thousands, :count => 5)].
             join(' ') }
         end
-      end
 
-      context 'many' do
-        context '5000000 as lower example in many' do
-          subject { 5000000 }
+        context '11000 as uniq example' do
+          subject { 11000 }
 
-          its(:to_words) { should == [t(:ones_male)[5], t(:millions, :count => 5)].
-            join(' ') }
+          its(:to_words) { should == [t(:teens)[1], t(:thousands, :count => 11)].join(' ') }
         end
 
-        context '99900000 as upper example' do
-          subject { 999000000 }
+        context '999000 as upper example' do
+          subject { 999000 }
 
           its(:to_words) { should == [t(:hundreds)[9],
             t(:tens)[9],
-            t(:ones_male)[9],
-            t(:millions, :count => 999)
+            t(:ones_female)[9],
+            t(:thousands, :count => 999)
           ].join(' ') }
         end
       end
 
-      context 'custom' do
-        context '999000999 as example with first capacity' do
-          subject { 999000999 }
+      describe 'custom' do
+        context '999999 as example with first capacity' do
+          subject { 999999 }
 
           its(:to_words) { should == [t(:hundreds)[9],
             t(:tens)[9],
-            t(:ones_male)[9],
-            t(:millions, :count => 999),
+            t(:ones_female)[9],
+            t(:thousands, :count => 999),
             t(:hundreds)[9],
             t(:tens)[9],
             t(:ones_male)[9],
           ].join(' ') }
         end
+      end
+    end
+  end
 
-        context '999999000 as example with second capacity' do
-          subject { 999999000 }
+  describe 'millions' do
+    describe 'one' do
+      context '1000000 as uniq example' do
+        subject { 1000000 }
 
-          its(:to_words) { should == [t(:hundreds)[9],
-            t(:tens)[9],
-            t(:ones_male)[9],
-            t(:millions, :count => 999),
-            t(:hundreds)[9],
-            t(:tens)[9],
-            t(:ones_female)[9],
-            t(:thousands, :count => 999),
-          ].join(' ') }
-        end
+        its(:to_words) { should == [t(:ones_male)[1], t(:millions, :count => 1)].
+          join(' ') }
+      end
+    end
 
-        context '999999999 as example with first and second capacity' do
-          subject { 999999999 }
+    context 'few' do
+      context '2000000 as lower example in few' do
+        subject { 2000000 }
 
-          its(:to_words) { should == [t(:hundreds)[9],
-            t(:tens)[9],
-            t(:ones_male)[9],
-            t(:millions, :count => 999),
-            t(:hundreds)[9],
-            t(:tens)[9],
-            t(:ones_female)[9],
-            t(:thousands, :count => 999),
-            t(:hundreds)[9],
-            t(:tens)[9],
-            t(:ones_male)[9],
-          ].join(' ') }
-        end
+        its(:to_words) { should == [t(:ones_male)[2], t(:millions, :count => 2)].
+          join(' ') }
+      end
+
+      context '4000000 as upper example in few' do
+        subject { 4000000 }
+
+        its(:to_words) { should == [t(:ones_male)[4], t(:millions, :count => 4)].
+          join(' ') }
+      end
+    end
+
+    context 'many' do
+      context '5000000 as lower example in many' do
+        subject { 5000000 }
+
+        its(:to_words) { should == [t(:ones_male)[5], t(:millions, :count => 5)].
+          join(' ') }
+      end
+
+      context '99900000 as upper example' do
+        subject { 999000000 }
+
+        its(:to_words) { should == [t(:hundreds)[9],
+          t(:tens)[9],
+          t(:ones_male)[9],
+          t(:millions, :count => 999)
+        ].join(' ') }
+      end
+    end
+
+    context 'custom' do
+      context '999000999 as example with first capacity' do
+        subject { 999000999 }
+
+        its(:to_words) { should == [t(:hundreds)[9],
+          t(:tens)[9],
+          t(:ones_male)[9],
+          t(:millions, :count => 999),
+          t(:hundreds)[9],
+          t(:tens)[9],
+          t(:ones_male)[9],
+        ].join(' ') }
+      end
+
+      context '999999000 as example with second capacity' do
+        subject { 999999000 }
+
+        its(:to_words) { should == [t(:hundreds)[9],
+          t(:tens)[9],
+          t(:ones_male)[9],
+          t(:millions, :count => 999),
+          t(:hundreds)[9],
+          t(:tens)[9],
+          t(:ones_female)[9],
+          t(:thousands, :count => 999),
+        ].join(' ') }
+      end
+
+      context '999999999 as example with first and second capacity' do
+        subject { 999999999 }
+
+        its(:to_words) { should == [t(:hundreds)[9],
+          t(:tens)[9],
+          t(:ones_male)[9],
+          t(:millions, :count => 999),
+          t(:hundreds)[9],
+          t(:tens)[9],
+          t(:ones_female)[9],
+          t(:thousands, :count => 999),
+          t(:hundreds)[9],
+          t(:tens)[9],
+          t(:ones_male)[9],
+        ].join(' ') }
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: number_to_words_ru
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: number_to_words_ru
 bindir: bin
 cert_chain: []
-date: 2011-12-14 00:00:00.000000000Z
+date: 2011-12-15 00:00:00.000000000Z
 dependencies: []
 description: Simple convert number to russian words using I18N.
 email: k.s.lazarev@gmail.com
@@ -55,7 +55,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -459699541414322395
+      hash: 1036402517106089977
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: